diff --git a/.clang-tidy b/.clang-tidy
index 19508860132..b83436861bd 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -18,18 +18,19 @@ Checks: >
         -objc-*,
         -openmp-*,
         -zircon-*,
-        cert-err34-c,
         cppcoreguidelines-pro-type-static-cast-downcast,
         cppcoreguidelines-rvalue-reference-param-not-moved,
         google-explicit-constructor,
         -bugprone-assignment-in-if-condition,
         -bugprone-branch-clone,
+        -bugprone-command-processor,
         -bugprone-easily-swappable-parameters,
         -bugprone-empty-catch,
         -bugprone-macro-parentheses,
         -bugprone-narrowing-conversions,
         -bugprone-signed-char-misuse,
         -bugprone-switch-missing-default-case,
+        -bugprone-throwing-static-initialization,
         -bugprone-unchecked-optional-access,
         -clang-analyzer-*,
         -concurrency-mt-unsafe,
@@ -41,7 +42,9 @@ Checks: >
         -modernize-avoid-c-arrays,
         -modernize-deprecated-ios-base-aliases,
         -misc-include-cleaner,
+        -misc-multiple-inheritance,
         -misc-unused-using-decls,
+        -modernize-avoid-c-style-cast,
         -modernize-loop-convert,
         -modernize-macro-to-enum,
         -modernize-raw-string-literal,
@@ -50,10 +53,12 @@ Checks: >
         -modernize-type-traits,
         -modernize-use-designated-initializers,
         -modernize-use-nodiscard,
+        -modernize-use-scoped-lock,
         -modernize-use-trailing-return-type,
         -performance-avoid-endl,
         -performance-inefficient-string-concatenation,
         -performance-no-automatic-move,
+        -portability-avoid-pragma-once,
         -portability-simd-intrinsics,
         -portability-std-allocator-const,
         -readability-avoid-nested-conditional-operator,
@@ -65,15 +70,25 @@ Checks: >
         -readability-identifier-length,
         -readability-identifier-naming,
         -readability-implicit-bool-conversion,
+        -readability-inconsistent-ifelse-braces,
         -readability-isolate-declaration,
         -readability-magic-numbers,
+        -readability-redundant-parentheses,
         -readability-suspicious-call-argument,
-        -readability-uppercase-literal-suffix
+        -readability-uppercase-literal-suffix,
+        -readability-use-concise-preprocessor-directives,
+        -misc-unconventional-assign-operator
 WarningsAsErrors: '*'
-HeaderFilterRegex: '(cli|gui|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
+HeaderFilterRegex: '(cli|gui|frontend|lib|oss-fuzz|test|triage)\/[a-z_]+\.h'
 ExcludeHeaderFilterRegex: 'ui_.*.h'
 CheckOptions:
   - key:             misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
     value:           '1'
   - key:             readability-simplify-boolean-expr.SimplifyDeMorgan
     value:           '0'
+  - key:             modernize-use-trailing-return-type.TransformFunctions
+    value:           false
+  - key:             misc-override-with-different-visibility.DisallowedVisibilityChange
+    value:           widening
+  - key:             misc-use-internal-linkage.AnalyzeTypes
+    value:           false
diff --git a/.github/workflows/CI-cygwin.yml b/.github/workflows/CI-cygwin.yml
index 93a77d70c33..6b0ad2cc5bd 100644
--- a/.github/workflows/CI-cygwin.yml
+++ b/.github/workflows/CI-cygwin.yml
@@ -37,20 +37,21 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Set up Cygwin
-        uses: cygwin/cygwin-install-action@master
+        uses: cygwin/cygwin-install-action@v6
         with:
+          site: https://mirrors.cicku.me/cygwin/
           platform: ${{ matrix.platform }}
           packages: ${{ matrix.packages }}
 
       # Cygwin will always link the binaries even if they already exist. The linking is also extremely slow. So just run the "check" target which includes all the binaries.
       - name: Build all and run test
         run: |
-          C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j%NUMBER_OF_PROCESSORS% check
+          C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j%NUMBER_OF_PROCESSORS% CXXOPTS="-Werror" test
 
       - name: Extra test for misra
         run: |
diff --git a/.github/workflows/CI-mingw.yml b/.github/workflows/CI-mingw.yml
index 8f6ff31182a..f308cfa5110 100644
--- a/.github/workflows/CI-mingw.yml
+++ b/.github/workflows/CI-mingw.yml
@@ -30,8 +30,10 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
+    timeout-minutes: 19 # max + 3*std of the last 7K runs
+
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -51,27 +53,23 @@ jobs:
         with:
           key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
 
-      # TODO: bail out on warning
       - name: Build cppcheck
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) cppcheck
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" cppcheck
 
       - name: Build test
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) testrunner
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" testrunner
 
       - name: Run test
         run: |
           export PATH="/mingw64/lib/ccache/bin:$PATH"
           # set RDYNAMIC to work around broken MinGW detection
-          make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) check
-        env:
-          LDFLAGS: -fuse-ld=lld # use lld for faster linking
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" test
diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml
index d3b4ba8a5f4..adf4a74c81b 100644
--- a/.github/workflows/CI-unixish-docker.yml
+++ b/.github/workflows/CI-unixish-docker.yml
@@ -20,13 +20,16 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04", "ubuntu:24.10"]
         include:
-          - build_gui: false
           - image: "ubuntu:24.04"
-            build_gui: true
-          - image: "ubuntu:24.10"
-            build_gui: true
+            with_gui: true
+            full_build: true
+          - image: "ubuntu:25.10"
+            with_gui: true
+            full_build: true
+          - image: "alpine:3.23"
+            with_gui: false  # it appears FindQt6.cmake is not provided by any package
+            full_build: false  # FIXME: test-signalhandler.cpp fails to build since feenableexcept() is missing
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -40,7 +43,7 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -51,10 +54,15 @@ jobs:
           apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
 
       - name: Install missing software (gui) on latest ubuntu
-        if: matrix.build_gui
+        if: contains(matrix.image, 'ubuntu')
         run: |
           apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
 
+      - name: Install missing software on Alpine
+        if: contains(matrix.image, 'alpine')
+        run: |
+          apk add cmake make g++ pcre-dev
+
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       - name: ccache
@@ -62,18 +70,13 @@ jobs:
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
-      - name: CMake build
-        if: ${{ !matrix.build_gui }}
+      - name: Run CMake
         run: |
-          mkdir cmake.output
-          cd cmake.output
-          cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
-          cmake --build . -- -j$(nproc)
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=${{ matrix.with_gui }} -DWITH_QCHART=On -DBUILD_TRIAGE=${{ matrix.with_gui }} -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-      - name: CMake build (with GUI)
-        if: matrix.build_gui
+      - name: CMake build
+        if: matrix.full_build
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
           cmake --build cmake.output -- -j$(nproc)
 
       - name: Run CMake test
@@ -84,7 +87,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04", "ubuntu:24.10"]
+        image: ["ubuntu:24.04", "ubuntu:25.10", "alpine:3.23"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -93,7 +96,7 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -103,6 +106,11 @@ jobs:
           apt-get update
           apt-get install -y g++ make python3 libxml2-utils libpcre3-dev
 
+      - name: Install missing software on Alpine
+        if: contains(matrix.image, 'alpine')
+        run: |
+          apk add make g++ pcre-dev bash python3 libxml2-utils
+
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
       - name: ccache
@@ -110,19 +118,21 @@ jobs:
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
+      # /usr/lib/ccache/bin - Alpine Linux
+
       - name: Build cppcheck
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) HAVE_RULES=yes CXXFLAGS="-w"
+          export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror"
 
       - name: Build test
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) testrunner HAVE_RULES=yes CXXFLAGS="-w"
+          export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror" testrunner
 
       - name: Run test
         run: |
-          make -j$(nproc) check HAVE_RULES=yes
+          make -j$(nproc) HAVE_RULES=yes test
 
       # requires python3
       - name: Run extra tests
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 62adc9a62c5..9bac980c853 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -30,7 +30,7 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -58,13 +58,13 @@ jobs:
       - name: CMake build on ubuntu (with GUI / system tinyxml2)
         if: contains(matrix.os, 'ubuntu')
         run: |
-          cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
           cmake --build cmake.output.tinyxml2 -- -j$(nproc)
 
       - name: CMake build on macos (with GUI / system tinyxml2)
         if: contains(matrix.os, 'macos')
         run: |
-          cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
+          cmake -S . -B cmake.output.tinyxml2 -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
           cmake --build cmake.output.tinyxml2 -- -j$(nproc)
 
       - name: Run CMake test (system tinyxml2)
@@ -75,7 +75,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -85,7 +85,7 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -97,7 +97,7 @@ jobs:
       # TODO: move latest compiler to separate step
       # TODO: bail out on warnings with latest GCC
       - name: Set up GCC
-        uses: egor-tensin/setup-gcc@v1
+        uses: egor-tensin/setup-gcc@v2
         if: false  # matrix.os == 'ubuntu-22.04'
         with:
           version: 13
@@ -127,12 +127,12 @@ jobs:
       - name: Run CMake on ubuntu (with GUI)
         if: contains(matrix.os, 'ubuntu')
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
 
       - name: Run CMake on macos (with GUI)
         if: contains(matrix.os, 'macos')
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
 
       - name: Run CMake build
         run: |
@@ -150,18 +150,122 @@ jobs:
       - name: Run CMake install
         run: |
           cmake --build cmake.output --target install
+          # TODO: validate the installed files
+
+      - name: Run CMake on ubuntu (no CLI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nocli -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_CLI=Off
+
+      - name: Run CMake on ubuntu (no CLI / with tests)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          # the test and CLI code are too intertwined so for now we need to reject that
+          if cmake -S . -B cmake.output_nocli_tests -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DBUILD_CLI=Off; then
+            exit 1
+          else
+            exit 0
+          fi
+
+      - name: Run CMake on ubuntu (no CLI / with GUI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nocli_gui -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=On
+
+      - name: Run CMake on ubuntu (no GUI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nogui -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_GUI=Off
+
+      - name: Run CMake on ubuntu (no GUI / with triage)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          # cannot build triage without GUI
+          if cmake -S . -B cmake.output_nogui_triage -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
+            exit 1
+          else
+            exit 0
+          fi
+
+      - name: Run CMake on ubuntu (no CLI / no GUI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nocli_nogui -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DBUILD_GUI=Off
+
+  build_cmake_cxxstd:
+
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, macos-15]
+        cxxstd: [14, 17, 20]
+        # FIXME: macos-15 fails to compile with C++20
+        #
+        # /Users/runner/work/cppcheck/cppcheck/cmake.output/gui/test/projectfile/moc_testprojectfile.cpp:84:1: error: 'constinit' specifier is incompatible with C++ standards before C++20 [-Werror,-Wc++20-compat]
+        #    84 | Q_CONSTINIT const QMetaObject TestProjectFile::staticMetaObject = { {
+        #       | ^
+        # /opt/homebrew/opt/qt/lib/QtCore.framework/Headers/qcompilerdetection.h:1409:23: note: expanded from macro 'Q_CONSTINIT'
+        exclude:
+          - os: macos-15
+            cxxstd: 20
+      fail-fast: false # Prefer quick result
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      # TODO: figure out why there are cache misses with PCH enabled
+      CCACHE_SLOPPINESS: pch_defines,time_macros
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.cxxstd }}
+
+      - name: Install missing software on ubuntu
+        if: contains(matrix.os, 'ubuntu')
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2-utils
+          # qt6-tools-dev-tools for lprodump
+          # qt6-l10n-tools for lupdate
+          sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
+
+      # coreutils contains "nproc"
+      - name: Install missing software on macos
+        if: contains(matrix.os, 'macos')
+        run: |
+          # pcre was removed from runner images in November 2022
+          brew install coreutils qt@6 pcre
+
+      - name: Run CMake on ubuntu (with GUI)
+        if: contains(matrix.os, 'ubuntu')
+        run: |
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+
+      - name: Run CMake on macos (with GUI)
+        if: contains(matrix.os, 'macos')
+        run: |
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
+
+      - name: Run CMake build
+        run: |
+          cmake --build cmake.output -- -j$(nproc)
 
   build_uchar:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -179,23 +283,23 @@ jobs:
       - name: Build with Unsigned char
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) CXXFLAGS=-funsigned-char testrunner
+          make -j$(nproc) CXXOPTS="-Werror -funsigned-char" testrunner
 
       - name: Test with Unsigned char
         run: |
-          ./testrunner TestSymbolDatabase
+          ./testrunner
 
   build_mathlib:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -213,23 +317,23 @@ jobs:
       - name: Build with TEST_MATHLIB_VALUE
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) CPPFLAGS=-DTEST_MATHLIB_VALUE all
+          make -j$(nproc) CXXOPTS="-Werror" CPPOPTS=-DTEST_MATHLIB_VALUE all
 
       - name: Test with TEST_MATHLIB_VALUE
         run: |
-          make -j$(nproc) CPPFLAGS=-DTEST_MATHLIB_VALUE check
+          make -j$(nproc) test
 
   check_nonneg:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -241,24 +345,123 @@ jobs:
 
       - name: Check syntax with NONNEG
         run: |
-          ls lib/*.cpp | xargs -n 1 -P $(nproc) g++ -fsyntax-only -std=c++0x -Ilib -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -DNONNEG
+          make check-nonneg CXXOPTS="-Werror"
+
+  build_cmake_boost:
+
+    strategy:
+      matrix:
+        os: [macos-15]  # non-macos platforms are already built with Boost in other contexts
+      fail-fast: false # Prefer quick result
+
+    runs-on: ${{ matrix.os }}
+
+    env:
+      # TODO: figure out why there are cache misses with PCH enabled
+      CCACHE_SLOPPINESS: pch_defines,time_macros
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
+
+      - name: Run CMake on macOS (force Boost)
+        run: |
+          # make sure we fail when Boost is requested and not available.
+          # will fail because no package configuration is available.
+          if cmake -S . -B cmake.output.boost-force-noavail -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DUSE_BOOST=On; then
+            exit 1
+          else
+            exit 0
+          fi
+
+      # coreutils contains "nproc"
+      - name: Install missing software on macOS
+        run: |
+          brew install coreutils boost
+
+      - name: Run CMake on macOS (force Boost)
+        run: |
+          cmake -S . -B cmake.output.boost-force -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DUSE_BOOST=On
+
+      - name: Run CMake on macOS (no Boost)
+        run: |
+          # make sure Boost is not used when disabled even though it is available
+          cmake -S . -B cmake.output.boost-no -Werror=dev --warn-uninitialized -DBUILD_TESTING=Off -DUSE_BOOST=Off
+          if grep -q '\-DHAVE_BOOST' ./cmake.output.boost-no/compile_commands.json; then
+            exit 1
+          else
+            exit 0
+          fi
+
+      - name: Run CMake on macOS (with Boost)
+        run: |
+          cmake -S . -B cmake.output.boost -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          grep -q '\-DHAVE_BOOST' ./cmake.output.boost/compile_commands.json
+
+      - name: Build with CMake on macOS (with Boost)
+        run: |
+          cmake --build cmake.output.boost -- -j$(nproc)
+
+  build_cmake_minimum:  # TODO: move to docker workflow?
+
+    runs-on: ubuntu-22.04  # use the oldest available runner
+
+    env:
+      CMAKE_VERSION: 3.22
+      CMAKE_VERSION_FULL: 3.22.6
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Install missing software
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2-utils
+          # qt6-tools-dev-tools for lprodump
+          # qt6-l10n-tools for lupdate
+          sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
+
+      - name: Install CMake
+        run: |
+          wget https://cmake.org/files/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64.tar.gz
+          tar xf cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64.tar.gz
+
+      - name: Run CMake (without GUI)
+        run: |
+          export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
+          # FIXME: cannot use --warn-uninitialized here as it completely breaks the build
+          cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On
+
+      - name: Run CMake (with GUI)
+        run: |
+          export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
+          # FIXME: cannot use --warn-uninitialized here as it completely breaks the build
+          cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
 
   build:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-22.04, macos-15]
         include:
           - xdist_n: auto
-          # FIXME: test_color_tty fails with xdist
-          - os: macos-13
+          # FIXME: test_color_tty fails with xdist - see #13278
+          - os: macos-15
             xdist_n: '1'
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -284,9 +487,10 @@ jobs:
         if: contains(matrix.os, 'macos')
         run: |
           # pcre was removed from runner images in November 2022
-          brew install coreutils python3 pcre gnu-sed
+          brew install coreutils pcre gnu-sed
 
-      - name: Install missing Python packages
+      - name: Install missing Python packages on ubuntu
+        if: contains(matrix.os, 'ubuntu')
         run: |
           python3 -m pip install pip --upgrade
           python3 -m pip install pytest
@@ -294,19 +498,32 @@ jobs:
           python3 -m pip install pytest-xdist
           python3 -m pip install psutil
 
+      # we need to use -break-system-packages --user because the common approaches do not work.
+      # using pip works but it appears to install the packages into a different Python installation so they are not found later on.
+      # using python3 -m pip without the additional flags fails since the packages are being managed by a different tool (brew) and that lacks some of the packages.
+      # using pipx also does not work.
+      - name: Install missing Python packages on macos
+        if: contains(matrix.os, 'macos')
+        run: |
+          python3 -m pip install --break-system-packages --user pip --upgrade
+          python3 -m pip install --break-system-packages --user pytest
+          python3 -m pip install --break-system-packages --user pytest-timeout
+          python3 -m pip install --break-system-packages --user pytest-xdist
+          python3 -m pip install --break-system-packages --user psutil
+
       - name: Build cppcheck
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) HAVE_RULES=yes
+          make -j$(nproc) CXXOPTS="-Werror" HAVE_RULES=yes
 
       - name: Build test
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) testrunner HAVE_RULES=yes
+          make -j$(nproc) CXXOPTS="-Werror" HAVE_RULES=yes testrunner
 
       - name: Run test
         run: |
-          make -j$(nproc) check HAVE_RULES=yes
+          make -j$(nproc) HAVE_RULES=yes test
 
       # requires "gnu-sed" installed on macos
       - name: Run extra tests
@@ -382,7 +599,7 @@ jobs:
 
       - name: Test Signalhandler
         run: |
-          cmake -S . -B build.cmake.signal -G "Unix Makefiles" -DBUILD_TESTS=On
+          cmake -S . -B build.cmake.signal -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
           cmake --build build.cmake.signal --target test-signalhandler -- -j$(nproc)
           # TODO: how to run this without copying the file?
           cp build.cmake.signal/bin/test-s* .
@@ -393,7 +610,7 @@ jobs:
       - name: Test Stacktrace
         if: contains(matrix.os, 'ubuntu')
         run: |
-          cmake -S . -B build.cmake.stack -G "Unix Makefiles" -DBUILD_TESTS=On
+          cmake -S . -B build.cmake.stack -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
           cmake --build build.cmake.stack --target test-stacktrace -- -j$(nproc)
           # TODO: how to run this without copying the file?
           cp build.cmake.stack/bin/test-s* .
@@ -456,6 +673,28 @@ jobs:
           warnings="-pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar"
           g++ $warnings -c -Ilib -Iexternals/tinyxml2 democlient/democlient.cpp
 
+      - name: Test disabled executors
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          g++ -Ilib -c cli/threadexecutor.cpp -DDISALLOW_THREAD_EXECUTOR
+          test -z "$(nm threadexecutor.o)"
+          g++ -Ilib -c cli/processexecutor.cpp -DDISALLOW_PROCESS_EXECUTOR
+          test -z "$(nm processexecutor.o)"
+          # TODO: test NO_* defines
+
+      - name: Test execinfo.h detection
+        run: |
+          make clean
+          make cli/stacktrace.o | grep HAVE_EXECINFO_H=1         
+          test -n "$(nm cli/stacktrace.o)"
+
+      - name: Test testrunner inclusion/exclusion
+        run: |
+          ! ./testrunner -d TestUtils | grep -v TestUtils > /dev/null
+          ! ./testrunner -d TestUtils::trim | grep -v TestUtils::trim > /dev/null
+          ! ./testrunner -d -x TestUtils | grep TestUtils > /dev/null
+          ! ./testrunner -d -x TestUtils:trim | grep TestUtils:trim > /dev/null
+
       - name: Show all ignored files
         if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
         run: |
@@ -473,7 +712,7 @@ jobs:
     runs-on: ubuntu-22.04 # run on the latest image only
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -494,11 +733,11 @@ jobs:
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           # compile with verification and ast matchers
-          make -j$(nproc) -s CPPFLAGS="-DCHECK_INTERNAL" CXXFLAGS="-g -O2 -w -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
+          make -j$(nproc) CXXOPTS="-Werror -g -O2" CPPOPTS="-DCHECK_INTERNAL -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
 
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
 
       - name: Generate dependencies
         run: |
@@ -508,28 +747,4 @@ jobs:
 
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude --exception-handling --debug-warnings --check-level=exhaustive"
-          cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
-          ec=0
-          
-          # TODO: add --check-config          
-         
-          # early exit
-          if [ $ec -eq 1 ]; then
-            exit $ec
-          fi
-          
-          # self check externals
-          ./cppcheck $selfcheck_options externals || ec=1
-          # self check lib/cli
-          mkdir b1
-          ./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json cli || ec=1
-          ./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json --enable=internal lib || ec=1
-          # check gui with qt settings
-          mkdir b2
-          ./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b2 -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui || ec=1
-          # self check test and tools
-          ./cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
-          # triage
-          ./cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
-          exit $ec
+          ./selfcheck.sh
diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
index e07cedbc9f3..66858c7afbe 100644
--- a/.github/workflows/CI-windows.yml
+++ b/.github/workflows/CI-windows.yml
@@ -19,21 +19,19 @@ defaults:
   run:
     shell: cmd
 
-# TODO: choose/add a step to bail out on compiler warnings (maybe even the release build)
-
 jobs:
 
   build_qt:
     strategy:
       matrix:
         os: [windows-2022, windows-2025]
-        qt_ver: [5.15.2, 6.9.0]
+        qt_ver: [6.10.0]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -49,37 +47,98 @@ jobs:
           modules: 'qtcharts'
           setup-python: 'false'
           cache: true
-          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
-
-      - name: Run CMake for GUI release (Qt 5)
-        if: startsWith(matrix.qt_ver, '5')
-        run: |
-          ; TODO: enable rules?
-          ; specify Release build so matchcompiler is used
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install || exit /b !errorlevel!
 
-      - name: Run CMake for GUI release (Qt 6)
-        if: startsWith(matrix.qt_ver, '6')
+      - name: Run CMake
         run: |
-          ; TODO: enable rules?
-          ; specify Release build so matchcompiler is used
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install || exit /b !errorlevel!
+          rem TODO: enable rules?
+          cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DISABLE_DMAKE=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
 
-      - name: Run CMake build
+      - name: Build GUI
         run: |
-          cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
+          cmake --build build --config Debug --target cppcheck-gui || exit /b !errorlevel!
 
+      # TODO: can this be done in CMake?
       - name: Deploy GUI
         run: |
-          windeployqt build\bin\Release || exit /b !errorlevel!
-          del build\bin\Release\cppcheck-gui.ilk || exit /b !errorlevel!
-          del build\bin\Release\cppcheck-gui.pdb || exit /b !errorlevel!
+          windeployqt --no-translations build\bin\Debug || exit /b !errorlevel!
+          del build\bin\Debug\cppcheck-gui.pdb || exit /b !errorlevel!
 
       # TODO: run GUI tests
 
       - name: Run CMake install
         run: |
-          cmake --build build --target install
+          rem TODO: the Qt DLLs are not being installed
+          cmake --build build --config Debug --target install
+          rem TODO: validate the installed files
+          rem TODO: the structure does not match an actual Windows installation
+
+  build_cmake_cxxstd:
+    strategy:
+      matrix:
+        os: [windows-2022, windows-2025]
+        cxxstd: [14, 17, 20]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Set up Visual Studio environment
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
+      - name: Run CMake
+        run: |
+          cmake -S . -B build.cxxstd -Werror=dev --warn-uninitialized -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+
+      - name: Build
+        run: |
+          cmake --build build.cxxstd --config Debug || exit /b !errorlevel!
+
+  build_cmake_minimum:
+
+    runs-on: windows-2022  # use the oldest available runner
+
+    env:
+      CMAKE_VERSION: 3.22
+      CMAKE_VERSION_FULL: 3.22.6
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Install CMake
+        run: |
+          curl -fsSL https://cmake.org/files/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64.zip -o cmake.zip || exit /b !errorlevel!
+          7z x cmake.zip || exit /b !errorlevel!
+
+      - name: Set up Visual Studio environment
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: 6.10.0
+          modules: 'qtcharts'
+          setup-python: 'false'
+          cache: true
+
+      - name: Run CMake (without GUI)
+        run: |
+          :: TODO: enable DHAVE_RULES?
+          cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On
+
+      - name: Run CMake (with GUI)
+        run: |
+          :: TODO: enable DHAVE_RULES?
+          cmake-${{ env.CMAKE_VERSION_FULL }}-windows-x86_64\bin\cmake.exe -S . -B cmake.output.gui -A x64 -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
 
   build:
     strategy:
@@ -95,15 +154,15 @@ jobs:
       PCRE_VERSION: 8.45
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
-      - name: Set up Python 3.13
+      - name: Set up Python
         if: matrix.config == 'release'
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.13'
+          python-version: '3.14'
           check-latest: true
 
       - name: Set up Visual Studio environment
@@ -113,7 +172,7 @@ jobs:
 
       - name: Cache PCRE
         id: cache-pcre
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             externals\pcre.h
@@ -133,7 +192,7 @@ jobs:
           7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
           cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
           git apply --ignore-space-change ..\externals\pcre.patch || exit /b !errorlevel!
-          cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5 || exit /b !errorlevel!
+          cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
           nmake || exit /b !errorlevel!
           copy pcre.h ..\externals || exit /b !errorlevel!
           copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
@@ -150,8 +209,6 @@ jobs:
           python -m pip install pytest-xdist || exit /b !errorlevel!
           python -m pip install psutil || exit /b !errorlevel!
 
-      # TODO: build with CMake
-
       - name: Build CLI debug configuration using MSBuild
         if: matrix.config == 'debug'
         run: |
@@ -162,7 +219,7 @@ jobs:
 
       - name: Run Debug test
         if: matrix.config == 'debug'
-        run: .\bin\debug\testrunner.exe || exit /b !errorlevel!
+        run: .\bin\debug\testrunner.exe -t || exit /b !errorlevel!
 
       - name: Build CLI release configuration using MSBuild
         if: matrix.config == 'release'
@@ -215,7 +272,7 @@ jobs:
       - name: Test SEH wrapper
         if: matrix.config == 'release'
         run: |
-          cmake -S . -B build.cmake.seh -DBUILD_TESTS=On || exit /b !errorlevel!
+          cmake -S . -B build.cmake.seh -Werror=dev --warn-uninitialized -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
           cmake --build build.cmake.seh --target test-sehwrapper || exit /b !errorlevel!
           :: TODO: how to run this without copying the file?
           copy build.cmake.seh\bin\Debug\test-sehwrapper.exe . || exit /b !errorlevel!
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
deleted file mode 100644
index 3e8fc4053f1..00000000000
--- a/.github/workflows/asan.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
-name: address sanitizer
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'releases/**'
-      - '2.*'
-    tags:
-      - '2.*'
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-22.04
-
-    env:
-      QT_VERSION: 6.9.0
-      ASAN_OPTIONS: detect_stack_use_after_return=1
-      # TODO: figure out why there are cache misses with PCH enabled
-      CCACHE_SLOPPINESS: pch_defines,time_macros
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
-
-      - name: Set up Python 3.13
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-          check-latest: true
-
-      - name: Install missing software on ubuntu
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake make libpcre3-dev libboost-container-dev libxml2-utils
-          sudo apt-get install -y libcups2-dev  # required for Qt6PrintSupport in CMake since Qt 6.7.3
-
-      - name: Install clang
-        run: |
-          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 20
-
-      - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          modules: 'qtcharts'
-          setup-python: 'false'
-          cache: true
-
-      - name: Install missing Python packages
-        run: |
-          python3 -m pip install pip --upgrade
-          python3 -m pip install pytest
-          python3 -m pip install pytest-timeout
-          python3 -m pip install pytest-xdist
-          python3 -m pip install psutil
-
-      # TODO: disable all warnings
-      - name: CMake
-        run: |
-          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        env:
-          CC: clang-20
-          CXX: clang++-20
-
-      - name: Build cppcheck
-        run: |
-          cmake --build cmake.output --target cppcheck -- -j $(nproc)
-
-      - name: Build test
-        run: |
-          cmake --build cmake.output --target testrunner -- -j $(nproc)
-
-      - name: Build GUI tests
-        run: |
-          cmake --build cmake.output --target gui-tests -- -j $(nproc)
-
-      - name: Run tests
-        run: ./cmake.output/bin/testrunner
-
-      - name: Run cfg tests
-        run: |
-          cmake --build cmake.output --target checkcfg -- -j $(nproc)
-
-      - name: Run CTest
-        run: |
-          ctest --test-dir cmake.output --output-on-failure -j$(nproc)
-
-      - name: Run test/cli
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-
-      - name: Run test/cli (-j2)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_J: 2
-
-      - name: Run test/cli (--clang)
-        if: false
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_CLANG: clang
-
-      - name: Run test/cli (--cppcheck-build-dir)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_BUILDDIR: injected
-
-      - name: Generate dependencies
-        if: false
-        run: |
-          # make sure auto-generated GUI files exist
-          make -C cmake.output autogen
-          make -C cmake.output gui-build-deps triage-build-ui-deps
-
-      # TODO: this is currently way too slow (~60 minutes) to enable it
-      # TODO: only fail the step on sanitizer issues - since we use processes it will only fail the underlying process which will result in an cppcheckError
-      - name: Self check
-        if: false
-        run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude --exception-handling --debug-warnings --check-level=exhaustive"
-          cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
-          ec=0
-          ./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
-          exit $ec
diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml
index b0b399dd851..e84cf4bffd9 100644
--- a/.github/workflows/buildman.yml
+++ b/.github/workflows/buildman.yml
@@ -19,7 +19,7 @@ jobs:
   convert_via_pandoc:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -38,7 +38,7 @@ jobs:
         with:
           args: --output=output/manual-premium.pdf man/manual-premium.md
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: output
           path: output
@@ -46,7 +46,7 @@ jobs:
   manpage:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -59,7 +59,7 @@ jobs:
         run: |
           make man
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: cppcheck.1
           path: cppcheck.1
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 7b462c688f0..400fb929786 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -10,7 +10,7 @@ permissions:
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
     steps:
     - name: Build Fuzzers
       id: build
@@ -27,7 +27,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 9f854cbad6f..4f2db4ab113 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -24,10 +24,10 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 6.9.0
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -43,8 +43,8 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
-          sudo apt-get install -y clang-tidy-20
+          sudo ./llvm.sh 22
+          sudo apt-get install -y clang-tidy-22
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -57,14 +57,14 @@ jobs:
 
       - name: Verify clang-tidy configuration
         run: |
-          clang-tidy-20 --verify-config
+          clang-tidy-22 --verify-config
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_COMPILE_WARNING_AS_ERROR=On
         env:
-          CC: clang-20
-          CXX: clang++-20
+          CC: clang-22
+          CXX: clang++-22
 
       - name: Prepare CMake dependencies
         run: |
@@ -86,7 +86,7 @@ jobs:
         run: |
           cmake --build cmake.output --target run-clang-tidy-csa 2> /dev/null
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Compilation Database
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 185ebe139c6..84d37423d2e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,20 +33,20 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
       
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
 
     - name: Build cppcheck
       if: matrix.language == 'cpp'
       run: |
-         make -j$(nproc) HAVE_RULES=yes cppcheck
+         make -j$(nproc) CXXOPTS="-Werror" HAVE_RULES=yes CPPCHK_GLIBCXX_DEBUG= cppcheck
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
diff --git a/.github/workflows/corpus.yml b/.github/workflows/corpus.yml
new file mode 100644
index 00000000000..2d9f1424fad
--- /dev/null
+++ b/.github/workflows/corpus.yml
@@ -0,0 +1,58 @@
+# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
+name: corpus
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  corpus:
+    runs-on: ubuntu-22.04
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.workflow }}-${{ runner.os }}
+
+      - name: Install missing software on ubuntu
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y fdupes
+
+      - name: build testrunner
+        run: |
+          store_dir=$(pwd)/store
+          mkdir $store_dir
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          make -j$(nproc) CXXOPTS="-Werror" CPPOPTS="-DSTORE_INPUT_DIR=\"\\\"$store_dir\\\"\"" testrunner
+
+      - name: run testrunner
+        run: |
+          ./testrunner -q
+
+      - name: de-duplicate files
+        run: |
+          set -x
+          ls -l ./store | wc -l
+          echo "removing duplicates"
+          fdupes -qdN ./store > /dev/null
+          ls -l ./store | wc -l
+          # print largest size
+          ls -l ./store | cut -d' ' -f5 | sort -u -n -r | head -n1
+
+      - uses: actions/upload-artifact@v7
+        if: success()
+        with:
+          name: corpus
+          path: ./store
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 3c0c8e1d1df..b5e496adcf6 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -43,7 +43,7 @@ jobs:
       - name: Compile instrumented
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) all CXXFLAGS="-g -fprofile-arcs -ftest-coverage" HAVE_RULES=yes
+          make -j$(nproc) CXXOPTS="-Werror -g -fprofile-arcs -ftest-coverage" HAVE_RULES=yes CPPCHK_GLIBCXX_DEBUG= all
 
       - name: Run instrumented tests
         run: |
@@ -57,12 +57,12 @@ jobs:
           lcov --extract lcov_tmp.info "$(pwd)/*" --output-file lcov.info
           genhtml lcov.info -o coverage_report --frame --legend --demangle-cpp
           
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
          name: Coverage results
          path: coverage_report
          
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           # file: ./coverage.xml # optional
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 3c07b61d7c7..4c62971e4c4 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -12,9 +12,9 @@ permissions:
 jobs:
   scan:
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Install missing software on ubuntu
diff --git a/.github/workflows/cppcheck-premium.yml b/.github/workflows/cppcheck-premium.yml
index 94481894c8f..b99cccd69da 100644
--- a/.github/workflows/cppcheck-premium.yml
+++ b/.github/workflows/cppcheck-premium.yml
@@ -18,21 +18,22 @@ on:
 
 permissions:
   contents: read
+  security-events: write
 
 jobs:
 
   build:
     runs-on: ubuntu-24.04 # run on the latest image only
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
-      - name: Download cppcheckpremium
+      - name: Download cppcheckpremium release
         run: |
           premium_version=${{ inputs.premium_version }}
           if [ -z $premium_version ]; then
-            premium_version=24.11.0
+            premium_version=26.3.0
             #wget https://files.cppchecksolutions.com/devdrop/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
             wget https://files.cppchecksolutions.com/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
           else
@@ -44,12 +45,28 @@ jobs:
       - name: Generate a license file
         run: |
           echo cppcheck > cppcheck.lic
-          echo 251231 >> cppcheck.lic
+          echo 261231 >> cppcheck.lic
           echo 80000 >> cppcheck.lic
-          echo 4f8dc8e7c8bb288f >> cppcheck.lic
+          echo 4b64673f03fb6230 >> cppcheck.lic
           echo path:lib >> cppcheck.lic
 
       - name: Check
         run: |
           cppcheckpremium/premiumaddon --check-loc-license cppcheck.lic > cppcheck-premium-loc
-          cppcheckpremium/cppcheck -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2023 --premium=cert-c++-2016 --inline-suppr --error-exitcode=1 lib
+          cppcheckpremium/cppcheck --premium=safety-off -j$(nproc) -D__GNUC__ -D__CPPCHECK__ --suppressions-list=cppcheckpremium-suppressions --platform=unix64 --enable=style --premium=misra-c++-2023 --premium=cert-c++-2016 --inline-suppr lib --error-exitcode=0 --output-format=sarif 2> results.sarif
+
+      - name: Cat results
+        run: |
+          #sed -i 's|"security-severity":.*||' results.sarif
+          cat results.sarif
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: results
+          path: results.sarif
+
+      - name: Upload report
+        uses: github/codeql-action/upload-sarif@v4
+        with:
+          sarif_file: results.sarif
+          category: cppcheckpremium
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 8ad9408a376..4ec72f935fd 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -24,12 +24,12 @@ jobs:
       UNCRUSTIFY_VERSION: 0.80.1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Cache uncrustify
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: cache-uncrustify
         with:
           path: |
@@ -50,6 +50,6 @@ jobs:
 
       - name: Uncrustify check
         run: |
-          ~/uncrustify/uncrustify -c .uncrustify.cfg -l CPP --no-backup --replace */*.cpp */*.h
+          UNCRUSTIFY=~/uncrustify/uncrustify ./runformat
           git diff
           git diff | diff - /dev/null &> /dev/null
diff --git a/.github/workflows/gcc-versions.yml b/.github/workflows/gcc-versions.yml
new file mode 100644
index 00000000000..3402bade743
--- /dev/null
+++ b/.github/workflows/gcc-versions.yml
@@ -0,0 +1,39 @@
+# the purpose of this github action is to test that cppcheck source code can be compiled using old gcc versions.
+# the gcc images we use here are copied from the official gcc images on docker hub
+
+name: gcc-versions
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    strategy:
+      matrix:
+        #image: ["ghcr.io/cppcheck-opensource/gcc:5.4", "ghcr.io/cppcheck-opensource/gcc:6.5", "ghcr.io/cppcheck-opensource/gcc:7.5", "ghcr.io/cppcheck-opensource/gcc:8.5", "ghcr.io/cppcheck-opensource/gcc:9.5"]
+        image: ["ghcr.io/cppcheck-opensource/gcc:5.4"]
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Build cppcheck
+        run: |
+          # FIXME: simplecpp-1.8.0 can't be compiled with gcc 5.4, so we can't run 'make test' now
+          #docker run --rm -v ${{ github.workspace }}:/cppcheck -w /cppcheck ${{ matrix.image }} make -j$(nproc) CXXOPTS="-Werror" test
+          docker run --rm -v ${{ github.workspace }}:/cppcheck -w /cppcheck ${{ matrix.image }} g++ -fsyntax-only -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -std=c++11 -Wno-multichar lib/*.cpp
diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
index ae084c446f8..2e54b92541e 100644
--- a/.github/workflows/iwyu.yml
+++ b/.github/workflows/iwyu.yml
@@ -15,31 +15,31 @@ jobs:
 
     strategy:
       matrix:
-        # "opensuse/tumbleweed:latest" / "fedora:latest" / "debian:unstable" / "archlinux:latest"
+        # "opensuse/tumbleweed:latest" / "fedora:rawhide" / "debian:unstable" / "archlinux:latest"
         include:
           - os: ubuntu-22.04
-            image: "fedora:latest"
+            image: "fedora:rawhide"
             stdlib: libstdc++
           - os: ubuntu-22.04
-            image: "fedora:latest"
+            image: "fedora:rawhide"
             stdlib: libc++
-          - os: macos-13
+          - os: macos-26
             image: ""
             stdlib: libc++  # no libstdc++ on macOS
             mapping_file_opt: '-Xiwyu --mapping_file=$(realpath ./macos.imp)'
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
 
     container:
       image: ${{ matrix.image }}
 
     env:
-      QT_VERSION: 6.9.0
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -71,11 +71,12 @@ jobs:
       - name: Install missing software on Fedora
         if: contains(matrix.image, 'fedora')
         run: |
-          dnf install -y cmake clang pcre-devel
+          dnf install -y cmake clang
           dnf install -y libglvnd-devel  # fixes missing dependency for Qt in CMake
           dnf install -y p7zip-plugins  # required as fallback for py7zr in Qt installation
           dnf install -y python3-pip  # fixes missing pip module in jurplel/install-qt-action
           dnf install -y python3-devel  # fixes building of wheels for jurplel/install-qt-action
+          dnf install -y cairo-devel gtk3-devel libcurl-devel lua-devel openssl-devel python3-devel sqlite-devel boost-devel cppunit-devel libsigc++20-devel  # for strict cfg checks
           dnf install -y iwyu
           ln -s iwyu_tool.py /usr/bin/iwyu_tool
 
@@ -96,18 +97,21 @@ jobs:
         if: contains(matrix.os, 'macos')
         run: |
           brew install include-what-you-use pcre coreutils
-          ln -s iwyu_tool.py /usr/local/bin/iwyu_tool
+          # on Apple Silicon files are symlinked under /opt/homebrew/bin
+          ln -s /opt/homebrew/bin/iwyu_tool.py /usr/local/bin/iwyu_tool
 
       # Fails on OpenSUSE:
       # Warning: Failed to restore: Tar failed with error: Unable to locate executable file: tar. Please verify either the file path exists or the file can be found within a directory specified by the PATH environment variable. Also check the file mode to verify the file is executable.
       # Also the shell is broken afterwards:
       # OCI runtime exec failed: exec failed: unable to start container process: exec: "sh": executable file not found in $PATH: unknown
+      #
+      # On macos-26 we need to perform the Python setup because the default installation is managed externally managed
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
-          setup-python: 'false'
+          setup-python: ${{ contains(matrix.os, 'macos') }}
           install-deps: false
           cache: true
 
@@ -121,8 +125,8 @@ jobs:
 
       - name: Prepare CMake
         run: |
-          # TODO: why does it build dmake in the next step?
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
+          # TODO: re-enable HAVE_RULES
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.stdlib == 'libc++' }}
         env:
           CC: clang
           CXX: clang++
@@ -144,17 +148,25 @@ jobs:
 
       - name: iwyu_tool
         run: |
-          # -isystem/usr/lib/clang/17/include
-          # TODO: remove -stdlib= - it should have been taken from the compilation database
-          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -stdlib=${{ matrix.stdlib }} ${{ matrix.mapping_file_opt }} > iwyu.log
+          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments ${{ matrix.mapping_file_opt }} ${{ matrix.clang_inc }} > iwyu.log
+
+      # TODO: run with all configurations
+      - name: test/cfg
+        if: matrix.stdlib == 'libstdc++'
+        run: |
+          # TODO: redirect to log
+          ./test/cfg/runtests.sh
+        env:
+          IWYU: include-what-you-use
+          IWYU_CLANG_INC: ${{ matrix.clang_inc }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Compilation Database (include-what-you-use - ${{ matrix.os }} ${{ matrix.stdlib }})
           path: ./cmake.output/compile_commands.json
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: ${{ contains(matrix.os, 'macos') && (success() || failure()) }}
         with:
           name: macOS Mappings
@@ -162,7 +174,7 @@ jobs:
             ./iwyu-mapgen-apple-libc.py
             ./macos.imp
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Logs (include-what-you-use - ${{ matrix.os }} ${{ matrix.stdlib }})
@@ -181,13 +193,13 @@ jobs:
       fail-fast: false
 
     runs-on: ubuntu-22.04
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
 
     env:
-      QT_VERSION: 6.9.0
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -202,13 +214,13 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
-          sudo apt-get install -y clang-tools-20
+          sudo ./llvm.sh 22
+          sudo apt-get install -y clang-tools-22
 
       - name: Install libc++
         if: matrix.stdlib == 'libc++'
         run: |
-          sudo apt-get install -y libc++-20-dev
+          sudo apt-get install -y libc++-22-dev
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -221,11 +233,11 @@ jobs:
 
       - name: Prepare CMake
         run: |
-          # TODO: why does it build dmake in the next step?
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
+          # TODO: re-enable HAVE_RULES
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=Off -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On -DUSE_LIBCXX=${{ matrix.use_libcxx }}
         env:
-          CC: clang-20
-          CXX: clang++-20
+          CC: clang-22
+          CXX: clang++-22
 
       - name: Prepare CMake dependencies
         run: |
@@ -242,15 +254,15 @@ jobs:
       - name: clang-include-cleaner
         run: |
           # TODO: run multi-threaded
-          find $PWD/cli $PWD/lib $PWD/test $PWD/gui -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-20 --print=changes --extra-arg=-w --extra-arg=-stdlib=${{ matrix.stdlib }} -p cmake.output > clang-include-cleaner.log 2>&1
+          find $PWD/cli $PWD/lib $PWD/test $PWD/gui -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-22 --print=changes --extra-arg=-w --extra-arg=-stdlib=${{ matrix.stdlib }} -p cmake.output > clang-include-cleaner.log 2>&1
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Compilation Database (clang-include-cleaner - ${{ matrix.stdlib }})
           path: ./cmake.output/compile_commands.json
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Logs (clang-include-cleaner - ${{ matrix.stdlib }})
diff --git a/.github/workflows/release-windows-mingw.yml b/.github/workflows/release-windows-mingw.yml
new file mode 100644
index 00000000000..8085990e39d
--- /dev/null
+++ b/.github/workflows/release-windows-mingw.yml
@@ -0,0 +1,69 @@
+# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
+name: release-windows-mingw
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
+
+permissions:
+  contents: read
+
+defaults:
+  run:
+    shell: msys2 {0}
+
+jobs:
+  # TODO: add CMake build
+  build_mingw:
+    strategy:
+      matrix:
+        # only use the latest windows-* as the installed toolchain is identical
+        os: [windows-2025]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    timeout-minutes: 19 # max + 3*std of the last 7K runs
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Set up MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          release: false # use pre-installed
+          # TODO: install mingw-w64-x86_64-make and use mingw32.make instead - currently fails with "Windows Subsystem for Linux has no installed distributions."
+          install: >-
+            mingw-w64-x86_64-lld
+            make
+            mingw-w64-x86_64-gcc
+            python
+
+      - name: Build cppcheck
+        run: |
+          export PATH="/mingw64/lib/ccache/bin:$PATH"
+          # set RDYNAMIC to work around broken MinGW detection
+          make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) CXXFLAGS=-O2 MATCHCOMPILER=yes cppcheck
+
+      - name: Package
+        run: |
+          mkdir cppcheck-mingw
+          cp cppcheck.exe cppcheck-mingw/
+          cp -R cfg platforms cppcheck-mingw/
+          cp /mingw64/bin/libgcc_s_seh-1.dll cppcheck-mingw/
+          cp /mingw64/bin/libstdc*.dll cppcheck-mingw/
+          cp /mingw64/bin/libwinpthread-1.dll cppcheck-mingw/
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: cppcheck-mingw
+          path: cppcheck-mingw
diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
index 5edbc8d6b67..aa467d7b875 100644
--- a/.github/workflows/release-windows.yml
+++ b/.github/workflows/release-windows.yml
@@ -22,18 +22,26 @@ jobs:
   build:
 
     runs-on: windows-2025
-    if: ${{ github.repository_owner == 'danmar' }}
+    if: ${{ github.repository_owner == 'cppcheck-opensource' }}
 
     env:
+      PYTHON_VERSION: 3.14
       # see https://www.pcre.org/original/changelog.txt
       PCRE_VERSION: 8.45
-      QT_VERSION: 6.9.0
+      QT_VERSION: 6.10.0
+      BOOST_MINOR_VERSION: 89
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          check-latest: true
+
       - name: Set up Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
 
@@ -47,28 +55,37 @@ jobs:
           7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
           cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
           git apply --ignore-space-change ..\externals\pcre.patch || exit /b !errorlevel!
-          cmake . -G "Visual Studio 17 2022" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 || exit /b !errorlevel!
-          msbuild -m PCRE.sln -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
+          cmake . -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          msbuild -m PCRE.slnx -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
           copy pcre.h ..\externals || exit /b !errorlevel!
           copy Release\pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
 
+      - name: Download Boost
+        run: |
+          curl -fsSL https://archives.boost.io/release/1.%BOOST_MINOR_VERSION%.0/source/boost_1_%BOOST_MINOR_VERSION%_0.7z -o boost.zip || exit /b !errorlevel!
+
+      - name: Install Boost
+        run: |
+          @echo on
+          7z x boost.zip boost_1_%BOOST_MINOR_VERSION%_0/boost || exit /b !errorlevel!
+          ren boost_1_%BOOST_MINOR_VERSION%_0 boost || exit /b !errorlevel!
+
       # available modules: https://github.com/miurahr/aqtinstall/blob/master/docs/getting_started.rst#installing-modules
       # available tools:   https://github.com/miurahr/aqtinstall/blob/master/docs/getting_started.rst#installing-tools
-      - name: Install Qt ${{ env.QT_VERSION }}
+      - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
           setup-python: 'false'
           tools: 'tools_opensslv3_x64'
-          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
 
       # TODO: build with multiple threads
       - name: Build x64 release GUI
         run: |
           :: TODO: enable rules?
           :: specify Release build so matchcompiler is used
-          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On || exit /b !errorlevel!
+          cmake -S . -B build -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_ONLINE_HELP=On -DUSE_BOOST=ON -DBOOST_INCLUDEDIR=%GITHUB_WORKSPACE%\boost -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
           cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
 
       # TODO: package PDBs
@@ -78,7 +95,7 @@ jobs:
           del build\bin\Release\cppcheck-gui.ilk || exit /b !errorlevel!
           del build\bin\Release\cppcheck-gui.pdb || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: deploy
           path: build\bin\Release
@@ -87,11 +104,12 @@ jobs:
         run: python tools\matchcompiler.py --write-dir lib || exit /b !errorlevel!
 
       # TODO: build with multiple threads
-      # TODO: build with boost enabled
       - name: Build CLI x64 release configuration using MSBuild
-        run: msbuild -m cppcheck.sln -t:cli -p:Configuration=Release-PCRE -p:Platform=x64 || exit /b !errorlevel!
+        run: msbuild -m cppcheck.sln -t:cli -p:Configuration=Release-PCRE -p:Platform=x64 -p:HaveBoost=HAVE_BOOST -p:BoostInclude=%GITHUB_WORKSPACE%\boost || exit /b !errorlevel!
+        env:
+          _CL_: /WX
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: bin
           path: bin
@@ -121,7 +139,6 @@ jobs:
           @echo on
           move build\bin\Release win_installer\files || exit /b !errorlevel!
           copy AUTHORS win_installer\files\authors.txt || exit /b !errorlevel!
-          copy readme.txt win_installer\files\ || exit /b !errorlevel!
           copy win_installer\GPLv3.txt win_installer\files\ || exit /b !errorlevel!
           copy externals\picojson\LICENSE win_installer\files\picojson-license.txt || exit /b !errorlevel!
           copy externals\simplecpp\LICENSE win_installer\files\simplecpp-license.txt || exit /b !errorlevel!
@@ -141,7 +158,7 @@ jobs:
           :: copy libcrypto-3-x64.dll and libssl-3-x64.dll
           copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSLv3\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: collect
           path: win_installer\files
@@ -156,7 +173,7 @@ jobs:
           @echo ProductVersion="%PRODUCTVER%" || exit /b !errorlevel!
           msbuild -m cppcheck.wixproj -p:Platform=x64,ProductVersion=%PRODUCTVER%.${{ github.run_number }} || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: installer
           path: win_installer/Build/
@@ -192,7 +209,7 @@ jobs:
           del win_installer\files\Qt6Svg.dll || exit /b !errorlevel!
           del win_installer\files\vc_redist.x64.exe || exit /b !errorlevel!
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: portable
           path: win_installer\files
diff --git a/.github/workflows/ubsan.yml b/.github/workflows/sanitizers.yml
similarity index 63%
rename from .github/workflows/ubsan.yml
rename to .github/workflows/sanitizers.yml
index 5720cbf35d5..6021d1237d2 100644
--- a/.github/workflows/ubsan.yml
+++ b/.github/workflows/sanitizers.yml
@@ -1,6 +1,6 @@
 # Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
-name: undefined behaviour sanitizers
+name: sanitizers
 
 on:
   push:
@@ -18,28 +18,51 @@ permissions:
 jobs:
   build:
 
+    strategy:
+      matrix:
+        include:
+          - sanitizer: 'asan'
+            cmake_opts: '-DANALYZE_ADDRESS=On'
+            run_ctest: true
+            inject_executor: 'process'
+            run_selfcheck: false  # TODO: this is currently way too slow (~60 minutes) to enable it
+          - sanitizer: 'tsan'
+            cmake_opts: '-DANALYZE_THREAD=On'
+            run_ctest: false   # TODO: test-filelist fails with data race in pthread_cond_destroy
+            inject_executor: 'thread'
+            run_selfcheck: false  # TODO: disabled for now as it takes around 40 minutes to finish
+            selfcheck_opts: '--executor=thread --error-exitcode=0'  # set --error-exitcode=0 so we only fail on sanitizer issues - since it uses threads for execution it will exit the whole process on the first issue
+          - sanitizer: 'ubsan'
+            cmake_opts: '-DANALYZE_UNDEFINED=On'
+            run_ctest: true
+            inject_executor: 'process'
+            run_selfcheck: true
+      fail-fast: false
+
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 6.9.0
+      QT_VERSION: 6.10.0
+      ASAN_OPTIONS: detect_stack_use_after_return=1
+      TSAN_OPTIONS: halt_on_error=1
       UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1:report_error_type=1
       # TODO: figure out why there are cache misses with PCH enabled
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
+          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.sanitizer }}
 
-      - name: Set up Python 3.13
-        uses: actions/setup-python@v5
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.13'
+          python-version: '3.14'
           check-latest: true
 
       - name: Install missing software on ubuntu
@@ -53,7 +76,7 @@ jobs:
           sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
+          sudo ./llvm.sh 22
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
@@ -71,13 +94,12 @@ jobs:
           python3 -m pip install pytest-xdist
           python3 -m pip install psutil
 
-      # TODO: disable warnings
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_UNDEFINED=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify ${{ matrix.cmake_opts }} -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         env:
-          CC: clang-20
-          CXX: clang++-20
+          CC: clang-22
+          CXX: clang++-22
 
       - name: Build cppcheck
         run: |
@@ -92,13 +114,14 @@ jobs:
           cmake --build cmake.output --target gui-tests -- -j $(nproc)
 
       - name: Run tests
-        run: ./cmake.output/bin/testrunner
+        run: ./cmake.output/bin/testrunner -t
 
       - name: Run cfg tests
         run: |
           cmake --build cmake.output --target checkcfg -- -j $(nproc)
 
       - name: Run CTest
+        if: matrix.run_ctest
         run: |
           ctest --test-dir cmake.output --output-on-failure -j$(nproc)
 
@@ -106,6 +129,8 @@ jobs:
         run: |
           pwd=$(pwd)
           TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
+        env:
+          TEST_CPPCHECK_INJECT_EXECUTOR: ${{ matrix.inject_executor }}
 
       - name: Run test/cli (-j2)
         run: |
@@ -130,6 +155,7 @@ jobs:
           TEST_CPPCHECK_INJECT_BUILDDIR: injected
 
       - name: Generate dependencies
+        if: matrix.run_selfcheck
         run: |
           # make sure auto-generated GUI files exist
           make -C cmake.output autogen
@@ -137,14 +163,6 @@ jobs:
 
       # TODO: only fail the step on sanitizer issues - since we use processes it will only fail the underlying process which will result in an cppcheckError
       - name: Self check
+        if: matrix.run_selfcheck
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude --exception-handling --debug-warnings --check-level=exhaustive"
-          cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
-          ec=0
-          ./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
-          exit $ec
+          ./selfcheck_san.sh ./cmake.output ${{ matrix.selfcheck_opts }}
diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml
index a02b8c09dc8..8cee3c5a5b4 100644
--- a/.github/workflows/scriptcheck.yml
+++ b/.github/workflows/scriptcheck.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -31,7 +31,7 @@ jobs:
           key: ${{ github.workflow }}-${{ runner.os }}
 
       - name: Cache Cppcheck
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: cppcheck
           key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
@@ -39,7 +39,7 @@ jobs:
       - name: build cppcheck
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) -s CXXFLAGS="-w"
+          make -j$(nproc) CXXOPTS="-Werror"
           strip -s ./cppcheck
 
   scriptcheck:
@@ -48,27 +48,27 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
+        python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13', '3.14']
         include:
-          - python-version: '3.13'
+          - python-version: '3.14'
             python-latest: true
 
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       # TODO: bailout on error
       - name: Restore Cppcheck
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: cppcheck
           key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -87,7 +87,7 @@ jobs:
           python -m pip install pip --upgrade
           python -m pip install natsort
           python -m pip install pexpect
-          python -m pip install 'pylint<=3.3.0'
+          python -m pip install 'pylint<4.1.0'
           python -m pip install unittest2
           python -m pip install pytest
           python -m pip install pytest-xdist
@@ -203,19 +203,19 @@ jobs:
   dmake:
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-13, windows-2025]
+        os: [ubuntu-22.04, macos-15, windows-2025]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: run dmake
         run: |
-          make -j3 CXXFLAGS="-w" run-dmake
+          make -j3 CXXOPTS="-Werror" run-dmake
 
       - name: check diff
         run: |
diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml
index 8e0c3859522..f16ce8d8332 100644
--- a/.github/workflows/selfcheck.yml
+++ b/.github/workflows/selfcheck.yml
@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 6.9.0
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -56,7 +56,7 @@ jobs:
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           # valgrind cannot handle DWARF 5 yet so force version 4
           # work around performance regression with -inline-deferral
-          make -j$(nproc) -s CXXFLAGS="-O2 -w -DHAVE_BOOST -gdwarf-4 -mllvm -inline-deferral" MATCHCOMPILER=yes
+          make -j$(nproc) CXXOPTS="-Werror -O2 -gdwarf-4" CPPOPTS="-DHAVE_BOOST -mllvm -inline-deferral" MATCHCOMPILER=yes CPPCHK_GLIBCXX_DEBUG=
         env:
           CC: clang-14
           CXX: clang++-14
@@ -64,7 +64,7 @@ jobs:
       # unusedFunction - start
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies
         run: |
@@ -76,11 +76,10 @@ jobs:
           # make sure the auto-generated GUI dependencies exist
           make -C cmake.output gui-build-deps
 
-      # TODO: find a way to report unmatched suppressions without need to add information checks
       - name: Self check (unusedFunction)
         if: false # TODO: fails with preprocessorErrorDirective - see #10667
         run: |
-          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
+          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
         env:
           DISABLE_VALUEFLOW: 1
           UNUSEDFUNCTION_ONLY: 1
@@ -91,7 +90,7 @@ jobs:
       # unusedFunction notest - start
       - name: CMake (no test)
         run: |
-          cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DUSE_QT6=On -DBUILD_TRIAGE=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
+          cmake -S . -B cmake.output.notest -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_GUI=ON -DBUILD_TRIAGE=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies (no test)
         run: |
@@ -102,10 +101,9 @@ jobs:
           # make sure the auto-generated GUI dependencies exist
           make -C cmake.output.notest gui-build-deps
 
-      # TODO: find a way to report unmatched suppressions without need to add information checks
       - name: Self check (unusedFunction / no test)
         run: |
-          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
+          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
         env:
           DISABLE_VALUEFLOW: 1
           UNUSEDFUNCTION_ONLY: 1
@@ -114,17 +112,34 @@ jobs:
       # unusedFunction notest nogui - start
       - name: CMake (no test / no gui)
         run: |
-          cmake -S . -B cmake.output.notest_nogui -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DENABLE_CHECK_INTERNAL=On
+          cmake -S . -B cmake.output.notest_nogui -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies (no test / no gui)
         run: |
           # make sure the precompiled headers exist
           make -C cmake.output.notest_nogui lib/CMakeFiles/cppcheck-core.dir/cmake_pch.hxx.cxx
 
-      # TODO: find a way to report unmatched suppressions without need to add information checks
       - name: Self check (unusedFunction / no test / no gui)
         run: |
-          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
+          echo '<?xml version="1.0"?>
+                <suppressions>
+                  <suppress>
+                    <id>unusedFunction</id>
+                    <fileName>lib/errorlogger.h</fileName>
+                    <symbolName>verboseMessage</symbolName>
+                  </suppress>
+                  <suppress>
+                    <id>unusedFunction</id>
+                    <fileName>lib/importproject.cpp</fileName>
+                    <symbolName>selectVsConfigurations</symbolName>
+                  </suppress>
+                  <suppress>
+                    <id>unusedFunction</id>
+                    <fileName>lib/importproject.cpp</fileName>
+                    <symbolName>getVSConfigs</symbolName>
+                  </suppress>
+                </suppressions>' > supprs.xml
+          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr --suppress-xml=supprs.xml
         env:
           DISABLE_VALUEFLOW: 1
           UNUSEDFUNCTION_ONLY: 1
@@ -133,7 +148,7 @@ jobs:
       # unusedFunction notest nocli - start
       - name: CMake (no test / no cli)
         run: |
-          cmake -S . -B cmake.output.notest_nocli -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
+          cmake -S . -B cmake.output.notest_nocli -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DBUILD_TRIAGE=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off
 
       - name: Generate dependencies (no test / no cli)
         run: |
@@ -144,24 +159,42 @@ jobs:
           # make sure the auto-generated GUI dependencies exist
           make -C cmake.output.notest_nocli gui-build-deps
 
-      # TODO: find a way to report unmatched suppressions without need to add information checks
       - name: Self check (unusedFunction / no test / no cli)
         if: false  # TODO: the findings are currently too intrusive
         run: |
-          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest_nocli/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
+          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nocli/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
         env:
           DISABLE_VALUEFLOW: 1
           UNUSEDFUNCTION_ONLY: 1
       # unusedFunction notest nocli - end
 
+      # unusedFunction notest nocli nogui - start
+      - name: CMake (no test / no cli / no gui)
+        run: |
+          cmake -S . -B cmake.output.notest_nocli_nogui -Werror=dev --warn-uninitialized -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=Off -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off
+
+      - name: Generate dependencies (no test / no cli / no gui)
+        run: |
+          # make sure the precompiled headers exist
+          make -C cmake.output.notest_nocli_nogui lib/CMakeFiles/cppcheck-core.dir/cmake_pch.hxx.cxx
+
+      - name: Self check (unusedFunction / no test / no cli / no gui)
+        if: false  # TODO: the findings are currently too intrusive
+        run: |
+          ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nocli_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
+        env:
+          DISABLE_VALUEFLOW: 1
+          UNUSEDFUNCTION_ONLY: 1
+      # unusedFunction notest nocli nogui - end
+
       - name: Fetch corpus
         run: |
-          wget https://github.com/danmar/cppcheck/archive/refs/tags/2.8.tar.gz
+          wget https://github.com/cppcheck-opensource/cppcheck/archive/refs/tags/2.8.tar.gz
           tar xvf 2.8.tar.gz
 
       - name: CMake (corpus / no test)
         run: |
-          cmake -S cppcheck-2.8 -B cmake.output.corpus -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+          cmake -S cppcheck-2.8 -B cmake.output.corpus -DHAVE_RULES=On -DBUILD_TESTING=Off -DBUILD_GUI=ON -DUSE_QT6=On -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
       - name: Generate dependencies (corpus)
         run: |
@@ -172,18 +205,30 @@ jobs:
           # make sure the auto-generated GUI dependencies exist
           make -C cmake.output.corpus gui-build-deps
 
-      # TODO: find a way to report unmatched suppressions without need to add information checks
       - name: Self check (unusedFunction / corpus / no test / callgrind)
         run: |
           # TODO: fix -rp so the suppressions actually work
-          valgrind --tool=callgrind ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 2>callgrind.log || (cat callgrind.log && false)
+          valgrind --tool=callgrind ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 2>callgrind.log || (cat callgrind.log && false)
           cat callgrind.log
           callgrind_annotate --auto=no > callgrind.annotated.log
           head -50 callgrind.annotated.log
         env:
           DISABLE_VALUEFLOW: 1
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: Callgrind Output
           path: ./callgrind.*
+
+      - name: Self check (unusedFunction / corpus / no test / memcheck)
+        run: |
+          # TODO: fix -rp so the suppressions actually work
+          valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --gen-suppressions=all --log-fd=9 --error-exitcode=42 ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 9>memcheck.log || (cat memcheck.log && false)
+          cat memcheck.log
+        env:
+          DISABLE_VALUEFLOW: 1
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: Memcheck Output
+          path: ./memcheck.*
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
deleted file mode 100644
index 2f6b1ef38e0..00000000000
--- a/.github/workflows/tsan.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-# Syntax reference https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
-name: thread sanitizer
-
-on:
-  push:
-    branches:
-      - 'main'
-      - 'releases/**'
-      - '2.*'
-    tags:
-      - '2.*'
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-22.04
-
-    env:
-      QT_VERSION: 6.9.0
-      TSAN_OPTIONS: halt_on_error=1
-      # TODO: figure out why there are cache misses with PCH enabled
-      CCACHE_SLOPPINESS: pch_defines,time_macros
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
-
-      - name: Set up Python 3.13
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-          check-latest: true
-
-      - name: Install missing software on ubuntu
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake make libpcre3-dev libboost-container-dev libxml2-utils
-          sudo apt-get install -y libcups2-dev  # required for Qt6PrintSupport in CMake since Qt 6.7.3
-
-      - name: Install clang
-        run: |
-          sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 20
-
-      - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          modules: 'qtcharts'
-          setup-python: 'false'
-          cache: true
-
-      - name: Install missing Python packages
-        run: |
-          python3 -m pip install pip --upgrade
-          python3 -m pip install pytest
-          python3 -m pip install pytest-timeout
-          python3 -m pip install pytest-xdist
-          python3 -m pip install psutil
-
-      - name: CMake
-        run: |
-          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_THREAD=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=Off -DDISABLE_DMAKE=On -DFILESDIR= -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        env:
-          CC: clang-20
-          CXX: clang++-20
-
-      - name: Build cppcheck
-        run: |
-          cmake --build cmake.output --target cppcheck -- -j $(nproc)
-
-      - name: Build test
-        run: |
-          cmake --build cmake.output --target testrunner -- -j $(nproc)
-
-      - name: Build GUI tests
-        run: |
-          cmake --build cmake.output --target gui-tests -- -j $(nproc)
-
-      - name: Run tests
-        run: ./cmake.output/bin/testrunner
-
-      - name: Run cfg tests
-        run: |
-          cmake --build cmake.output --target checkcfg -- -j $(nproc)
-
-      - name: Run CTest
-        if: false # TODO: test-filelist fails with data race in pthread_cond_destroy
-        run: |
-          ctest --test-dir cmake.output --output-on-failure -j$(nproc)
-
-      - name: Run test/cli
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_EXECUTOR: thread
-
-      - name: Run test/cli (-j2)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_J: 2
-
-      - name: Run test/cli (--clang)
-        if: false
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_CLANG: clang
-
-      - name: Run test/cli (--cppcheck-build-dir)
-        run: |
-          pwd=$(pwd)
-          TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv -n auto test/cli
-        env:
-          TEST_CPPCHECK_INJECT_BUILDDIR: injected
-
-      - name: Generate dependencies
-        if: false
-        run: |
-          # make sure auto-generated GUI files exist
-          make -C cmake.output autogen
-          make -C cmake.output gui-build-deps triage-build-ui-deps
-
-      # TODO: disabled for now as it takes around 40 minutes to finish
-      # set --error-exitcode=0 so we only fail on sanitizer issues - since it uses threads for execution it will exit the whole process on the first issue
-      - name: Self check
-        if: false
-        run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=0 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude --exception-handling --debug-warnings --check-level=exhaustive"
-          selfcheck_options="$selfcheck_options --executor=thread"
-          cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
-          ec=0
-          ./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --enable=internal lib || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/dmake/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
-          exit $ec
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
index 7fd16382802..25ef4dd63a2 100644
--- a/.github/workflows/valgrind.yml
+++ b/.github/workflows/valgrind.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -41,24 +41,30 @@ jobs:
       - name: Build cppcheck
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          CXXFLAGS="-O1 -g -w -DHAVE_BOOST" make -j$(nproc) HAVE_RULES=yes MATCHCOMPILER=yes
+          make -j$(nproc) CXXOPTS="-Werror -O1 -g" CPPOPTS="-DHAVE_BOOST" HAVE_RULES=yes MATCHCOMPILER=yes CPPCHK_GLIBCXX_DEBUG=
 
       - name: Build test
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          CXXFLAGS="-O1 -g -w -DHAVE_BOOST" make -j$(nproc) testrunner HAVE_RULES=yes MATCHCOMPILER=yes
+          make -j$(nproc) CXXOPTS="-Werror -O1 -g" CPPOPTS="-DHAVE_BOOST" HAVE_RULES=yes MATCHCOMPILER=yes CPPCHK_GLIBCXX_DEBUG= testrunner
 
       - name: Run valgrind
         run: |
           ec=0
-          valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --suppressions=valgrind/testrunner.supp --gen-suppressions=all --log-fd=9 --error-exitcode=42 ./testrunner TestGarbage TestOther TestSimplifyTemplate 9>memcheck.log || ec=1
+          # disabled all tests invoking processes because the child processes fail with still reachable memory.
+          # some of the TestProcessExecutor* tests are also extremely slow.
+          excluded_tests="TestProcessExecutorFS \
+            TestProcessExecutorFiles \
+            TestSuppressions::suppressionsSettingsProcessesFiles \
+            TestSuppressions::suppressionsSettingsProcessesFS"
+          valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --suppressions=valgrind/testrunner.supp --gen-suppressions=all -s --log-fd=9 --error-exitcode=42 ./testrunner -t -x $excluded_tests 9>memcheck.log || ec=1
           cat memcheck.log
           exit $ec
         # TODO: debuginfod.ubuntu.com is currently not responding to any requests causing it to run into a 40(!) minute timeout
         #env:
         #  DEBUGINFOD_URLS: https://debuginfod.ubuntu.com
           
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: Logs
diff --git a/.gitignore b/.gitignore
index a3e8838d5f6..a821204bf2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.bak
 *.gcno
+*.gch
 *.o
+*.a
 *.pyc
 /cppcheck
 /cppcheck.exe
@@ -15,6 +17,7 @@ tags
 tools/daca2*.html
 tools/errmsg
 tools/extracttests
+.DS_Store
 
 # dump files generated by Cppcheck
 *.*.dump
@@ -125,4 +128,4 @@ stage
 
 # PCRE Windows files
 /externals/pcre.h
-/externals/pcre64.lib
\ No newline at end of file
+/externals/pcre64.lib
diff --git a/.pylintrc b/.pylintrc
index 9b14fa2d00e..0ca3480c06f 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -63,4 +63,3 @@ reports=no
 ignored-classes=SQLObject,_socketobject
 [MASTER]
 init-hook='import sys; sys.path.append("./addons")'
-suggestion-mode=yes
diff --git a/.selfcheck_suppressions b/.selfcheck_suppressions
index 6a00f33655f..63d33fd2704 100644
--- a/.selfcheck_suppressions
+++ b/.selfcheck_suppressions
@@ -1,28 +1,69 @@
 missingIncludeSystem
-
-# temporary suppressions - fix the warnings!
-simplifyUsing:lib/valueptr.h
-varid0:gui/projectfile.cpp
-naming-privateMemberVariable:gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
-symbolDatabaseWarning:*/moc_*.cpp
-simplifyUsing:*/moc_*.cpp
+# should not be reported - see #13387
+checkersReport
 
 # warnings in Qt generated code we cannot fix
-funcArgNamesDifferent:*/moc_*.cpp
-naming-varname:*/ui_*.h
-functionStatic:*/ui_fileview.h
+funcArgNamesDifferentUnnamed:*/moc_aboutdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_applicationdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_applicationlist.cpp
+funcArgNamesDifferent:*/moc_checkthread.cpp
+funcArgNamesDifferentUnnamed:*/moc_checkthread.cpp
+funcArgNamesDifferentUnnamed:*/moc_codeeditor.cpp
+funcArgNamesDifferent:*/moc_codeeditstylecontrols.cpp
+funcArgNamesDifferentUnnamed:*/moc_codeeditstylecontrols.cpp
+funcArgNamesDifferentUnnamed:*/moc_compliancereportdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_codeeditstyledialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_fileviewdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_helpdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_libraryaddfunctiondialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_librarydialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_libraryeditargdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_mainwindow.cpp
+funcArgNamesDifferentUnnamed:*/moc_newsuppressiondialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_platforms.cpp
+funcArgNamesDifferentUnnamed:*/moc_projectfile.cpp
+funcArgNamesDifferentUnnamed:*/moc_projectfiledialog.cpp
+funcArgNamesDifferent:*/moc_resultstree.cpp
+funcArgNamesDifferentUnnamed:*/moc_resultstree.cpp
+funcArgNamesDifferent:*/moc_resultsview.cpp
+funcArgNamesDifferentUnnamed:*/moc_resultsview.cpp
+funcArgNamesDifferentUnnamed:*/moc_scratchpad.cpp
+funcArgNamesDifferentUnnamed:*/moc_settingsdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_statsdialog.cpp
+funcArgNamesDifferentUnnamed:*/moc_testcppchecklibrarydata.cpp
+funcArgNamesDifferentUnnamed:*/moc_testfilelist.cpp
+funcArgNamesDifferentUnnamed:*/moc_testprojectfile.cpp
+funcArgNamesDifferentUnnamed:*/moc_testresultstree.cpp
+funcArgNamesDifferentUnnamed:*/moc_testtranslationhandler.cpp
+funcArgNamesDifferentUnnamed:*/moc_testxmlreportv2.cpp
+funcArgNamesDifferentUnnamed:*/moc_threaddetails.cpp
+funcArgNamesDifferent:*/moc_threadhandler.cpp
+funcArgNamesDifferentUnnamed:*/moc_threadhandler.cpp
+funcArgNamesDifferent:*/moc_threadresult.cpp
+funcArgNamesDifferentUnnamed:*/moc_threadresult.cpp
+funcArgNamesDifferentUnnamed:*/moc_translationhandler.cpp
+funcArgNamesDifferentUnnamed:*/moc_txtreport.cpp
+naming-varname:*/gui/ui_*.h
+functionStatic:*/gui/ui_*.h
 
 # --debug-warnings suppressions
 valueFlowBailout
 valueFlowBailoutIncompleteVar
-autoNoType
+valueFlowMaxIterations:gui/resultstree.cpp
+autoNoType:externals/simplecpp/simplecpp.cpp
+autoNoType:cli/*.cpp
+autoNoType:lib/*.cpp
+autoNoType:lib/library.h
+autoNoType:gui/*.cpp
+autoNoType:test/*.cpp
+autoNoType:tools/triage/mainwindow.cpp
 # ticket 11631
 templateInstantiation:test/testutils.cpp
 
 naming-varname:externals/simplecpp/simplecpp.h
 naming-privateMemberVariable:externals/simplecpp/simplecpp.h
-
-valueFlowMaxIterations:externals/tinyxml2/tinyxml2.cpp
+# false positive; lambda captures its owner
+danglingLifetime:externals/simplecpp/simplecpp.h:505
 
 # TODO: these warnings need to be addressed upstream
 uninitMemberVar:externals/tinyxml2/tinyxml2.h
@@ -31,8 +72,12 @@ missingOverride:externals/tinyxml2/tinyxml2.h
 invalidPrintfArgType_sint:externals/tinyxml2/tinyxml2.h
 naming-privateMemberVariable:externals/tinyxml2/tinyxml2.h
 functionStatic:externals/tinyxml2/tinyxml2.cpp
-invalidPrintfArgType_uint:externals/tinyxml2/tinyxml2.cpp
 funcArgNamesDifferent:externals/tinyxml2/tinyxml2.cpp
+funcArgNamesDifferentUnnamed:externals/tinyxml2/tinyxml2.cpp
+funcArgNamesDifferentUnnamed:externals/tinyxml2/tinyxml2.h
 nullPointerRedundantCheck:externals/tinyxml2/tinyxml2.cpp
 knownConditionTrueFalse:externals/tinyxml2/tinyxml2.cpp
 useStlAlgorithm:externals/simplecpp/simplecpp.cpp
+funcArgNamesDifferentUnnamed:externals/simplecpp/simplecpp.h
+missingMemberCopy:externals/simplecpp/simplecpp.h
+shadowFunction:externals/simplecpp/simplecpp.h
diff --git a/.selfcheck_unused_suppressions b/.selfcheck_unused_suppressions
index ce685d8ab10..5da7c225dfa 100644
--- a/.selfcheck_unused_suppressions
+++ b/.selfcheck_unused_suppressions
@@ -1,8 +1,8 @@
+# should not be reported - see #13387
+checkersReport
+
 # we are not using all methods of their interfaces
 unusedFunction:externals/*/*
 
-# usage is disabled
-unusedFunction:lib/symboldatabase.cpp
-
 # Q_OBJECT functions which are not called in our code
 unusedFunction:cmake.output.notest/gui/cppcheck-gui_autogen/*/moc_aboutdialog.cpp
diff --git a/AUTHORS b/AUTHORS
index b0927e9d2e1..e804ab53e16 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 The cppcheck team, in alphabetical order:
 
 0x41head
+Aaron Danen
 Abhijit Sawant
 Abhishek Bharadwaj
 Abigail Buccaneer
@@ -22,6 +23,8 @@ Alexey Eryomenko
 Alexey Zhikhartsev
 Alfi Maulana
 Ali Can Demiralp
+Alvin Che-Chia Chang
+Allen Winter
 Alon Alexander
 Alon Liberman
 Ameen Ali
@@ -32,6 +35,7 @@ Andreas Lutsch
 Andreas Pokorny
 Andreas Rönnquist
 Andreas Vollenweider
+Andreas Wilhelm
 Andrei Karas
 Andrew C Aitchison
 Andrew C. Martin
@@ -79,6 +83,7 @@ Carlos Gomes Martinho
 Carl-Oskar Larsson
 Cary Converse
 Cary R
+Caspar Kielwein
 Changkyoon Kim
 Chris Lalancette
 Christian Ehrlicher
@@ -96,6 +101,7 @@ daisuke-chiba
 Daniel Friedrich
 David Korczynski
 Daniel Marjamäki
+Daschle Newberry
 David Hallas
 David Korth
 Dávid Slivka
@@ -103,6 +109,7 @@ Debrard Sebastien
 Deepak Gupta
 Degen's Regens
 dencat
+Devansh Varshney
 Diego de las Heras
 Dirk Jagdmann
 Dirk Mueller
@@ -128,14 +135,18 @@ Felipe Pena
 Felix Faber
 Felix Geyer
 Felix Passenberg
+Felix Patschkowski
 Felix Wolff
+Florian Mueller
 Florin Iucha
+flovent
 Francesc Elies
 François Berder
 Frank Winklmeier
 Frank Zingsheim
 Frederik Schwarzer
 fu7mu4
+Gaël Bonithon
 Galimov Albert
 Garrett Bodily
 Gary Leutheuser
@@ -148,7 +159,9 @@ Gerhard Zlabinger
 Gerik Rhoden
 Gianfranco Costamagna
 Gianluca Scacco
+Gilmar Santos Jr
 Gleydson Soares
+Goncalo Mao-Cheia
 Goran Džaferi
 Graham Whitted
 Greg Hewgill
@@ -186,7 +199,9 @@ Jesse Boswell
 Jim Kuhn
 Jim Zhou
 jlguardi
+Joel Johnson
 Johan Bertrand
+Johan Crone
 Johan Samuelson
 John Marshall
 John-Paul Ore
@@ -195,6 +210,7 @@ Jonathan Clohessy
 Jonathan Haehne
 Jonathan Neuschäfer
 Jonathan Thackray
+Jonny Paton
 José Martins
 Jose Roquette
 Joshua Beck
@@ -214,6 +230,7 @@ Ketil Skjerve
 Kevin Christian
 Kevin Kendzia
 Kimmo Varis
+Kitsios Konstantinos
 Kleber Tarcísio
 Konrad Grochowski
 Konrad Windszus
@@ -224,6 +241,7 @@ Lars Even Almaas
 larudwer
 Lau bakman
 Lauri Nurmi
+Leander Schulten
 Leandro Lisboa Penz
 Leila F. Rahman
 Lena Herscheid
@@ -236,6 +254,7 @@ Ludvig Gunne Lindström
 Luis Díaz Más
 Luís Pereira
 Lukas Grützmacher
+Lukas Hiesmayr
 Lukasz Czajczyk
 Łukasz Jankowski
 Luxon Jean-Pierre
@@ -243,6 +262,7 @@ Maarten van der Schrieck
 Maksim Derbasov
 Malcolm Parsons
 Marc-Antoine Perennou
+Marcel Petrick
 Marcel Raad
 Marco Trevisan
 Marek Zmysłowski
@@ -269,6 +289,7 @@ Matthias Schmieder
 Matt Johnson
 Maurice Gilden
 Mavik
+Melroy van den Berg
 Michael Drake
 Michael Løiten
 Miika-Petteri Matikainen
@@ -291,6 +312,7 @@ Nicolás Alvarez
 Nicolas Le Cam
 Nilesh Kumar
 Ogawa KenIchi
+Ola Söder
 Oleksandr Labetskyi
 Oleksandr Redko
 Oliver Schode
@@ -313,6 +335,7 @@ Philip Chimento
 Philipp Kloke
 Pierre Schweitzer
 Pieter Duchi
+Piotr Idzik
 Pino Toscano
 Pranav Khanna
 Radek Jarecki
@@ -321,6 +344,7 @@ Ramzan Bekbulatov
 Raphael Geissert
 Razvan Ioan Alexe
 Reijo Tomperi
+Reshma V Kumar
 Rainer Wiesenfarth
 Riccardo Ghetta
 Richard A. Smith
@@ -332,6 +356,7 @@ Robert Habrich
 Robert Morin
 Roberto Martelloni
 Robert Reif
+Robin Getz
 rofl0r
 Roman Zaytsev Borisovich
 Ronald Hiemstra
@@ -347,6 +372,7 @@ Samuel Degrande
 Samuel Poláček
 Sandeep Dutta
 Savvas Etairidis
+Sayed Kaif
 Scott Ehlert
 Scott Furry
 Seafarix Ltd.
@@ -400,9 +426,11 @@ Tobias Weibel
 Tomasz Kłoczko
 Tom Pollok
 Tomo Dote
+Tommy Bergman
 Toralf Förster
 Troshin V.S.
 Tyson Nottingham
+Usman Majid
 Valentin Batz
 Valerii Lashmanov
 Vasily Maslyukov
@@ -411,9 +439,12 @@ Vesa Pikki
 Ville-Pekka Vahteala
 Ville Skyttä
 Vincent Le Garrec
+Vít Kučera
 Vladimir Petrigo
 Wang Haoyu
+Wang Yang
 WenChung Chiu
+William Jakobsson
 Wolfgang Stöggl
 x29a
 XhmikosR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a47d5fc6257..b5857a8413a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.13)
-project(Cppcheck VERSION 2.17.99 LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.22)
+project(Cppcheck VERSION 2.21.99 LANGUAGES CXX)
 
 include(cmake/options.cmake)
 
@@ -11,11 +11,13 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(GNUInstallDirs)
+include(CTest)
 
 include(cmake/compilerCheck.cmake)
 include(cmake/versions.cmake)
 include(cmake/findDependencies.cmake)
 include(cmake/compileroptions.cmake)
+include(cmake/includechecks.cmake)
 include(cmake/compilerDefinitions.cmake)
 include(cmake/buildFiles.cmake)
 if(BUILD_GUI)
@@ -47,11 +49,13 @@ if(LIBXML2_XMLLINT_EXECUTABLE)
         add_dependencies(validatePlatforms validatePlatforms-${platformname})
     endforeach()
 
-    add_custom_target(errorlist-xml $<TARGET_FILE:cppcheck> --errorlist > ${CMAKE_BINARY_DIR}/errorlist.xml
-            DEPENDS cppcheck)
+    if(TARGET cppcheck)
+        add_custom_target(errorlist-xml $<TARGET_FILE:cppcheck> --errorlist > ${CMAKE_BINARY_DIR}/errorlist.xml
+                DEPENDS cppcheck)
 
-    add_custom_target(example-xml $<TARGET_FILE:cppcheck> --xml --enable=all --inconclusive --max-configs=1 ${CMAKE_SOURCE_DIR}/samples 2> ${CMAKE_BINARY_DIR}/example.xml
-            DEPENDS cppcheck)
+        add_custom_target(example-xml $<TARGET_FILE:cppcheck> --xml --enable=all --inconclusive --max-configs=1 ${CMAKE_SOURCE_DIR}/samples 2> ${CMAKE_BINARY_DIR}/example.xml
+                DEPENDS cppcheck)
+    endif()
 
     add_custom_target(createXMLExamples DEPENDS errorlist-xml example-xml)
 
@@ -75,10 +79,6 @@ endif()
 # - Cygwin handling
 # - MinGW handling
 
-if(BUILD_TESTS)
-    enable_testing()
-endif()
-
 add_custom_target(copy_cfg ALL
     ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/cfg"
         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/cfg"
@@ -90,9 +90,16 @@ add_custom_target(copy_addons ALL
         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/addons"
     COMMENT "Copying addons files to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
 
+add_custom_target(remove_unsigned_platforms ALL
+        ${CMAKE_COMMAND} -E remove -f
+        "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms/unix32-unsigned.xml"
+        "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms/unix64-unsigned.xml"
+        COMMENT "Removing unsigned platforms files from ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
+
 add_custom_target(copy_platforms ALL
     ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/platforms"
     "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms"
+    DEPENDS remove_unsigned_platforms
     COMMENT "Copying platforms files to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
 
 if(USE_BUNDLED_TINYXML2)
@@ -100,7 +107,9 @@ if(USE_BUNDLED_TINYXML2)
     add_subdirectory(externals/tinyxml2)
 endif()
 add_subdirectory(externals/simplecpp)
+add_subdirectory(externals/picojson)
 add_subdirectory(lib)   # CppCheck Library
+add_subdirectory(frontend)
 add_subdirectory(cli)   # Client application
 add_subdirectory(test)  # Tests
 add_subdirectory(gui)   # Graphical application
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e80e4a3b581..09e88f021e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ These are some guidelines *any* contributor should follow. They will help to mak
 
 ## Code Changes
 
-Code contributions are handled via GitHub pull requests: https://github.com/danmar/cppcheck/pulls.
+Code contributions are handled via GitHub pull requests: https://github.com/cppcheck-opensource/cppcheck/pulls.
 
 If you file a pull request you might not get a reply immediately. We are a very small team and it might not fit in the current scope or time.
 
@@ -18,7 +18,7 @@ Also after you filed a pull request please be ready to reply to questions and fe
 
 Please do not be discouraged if your change was rejected or if the review process might not have been as smooth as it could have been.
 
-Each change should be accompanied with a unit ([C++](https://github.com/danmar/cppcheck/tree/main/test)) or integration ([Python](https://github.com/danmar/cppcheck/tree/main/test/cli)) test to ensure that it doesn't regress with future changes. Negative tests (testing the opposite behavior) would be favorable but might not be required or might already exist depending on the change. Tests which introduce `TODO_ASSERT_` or `@pytest.mark.skip`/`@pytest.mark.xfail` should have tickets filed.
+Each change should be accompanied with a unit ([C++](https://github.com/cppcheck-opensource/cppcheck/tree/main/test)) or integration ([Python](https://github.com/cppcheck-opensource/cppcheck/tree/main/test/cli)) test to ensure that it doesn't regress with future changes. Negative tests (testing the opposite behavior) would be favorable but might not be required or might already exist depending on the change. Tests which introduce `TODO_ASSERT_` or `@pytest.mark.skip`/`@pytest.mark.xfail` should have tickets filed.
 
 If the change is modifying existing behavior (i.e. adding a feature or fixing a bug) it should be accompanied by an issue in the [tracker](https://trac.cppcheck.net) (if you do not have access we can assist with that). Depending on the change it might also warrant an entry in `releasenotes.txt`.
 
@@ -34,6 +34,8 @@ Note: Usually you can run the CI on your own fork to verify that it passes befor
 
 Cppcheck is tracking its issues at https://trac.cppcheck.net.
 
+The tickets are not really prioritized (except for non-synthetic crashing issues) but of most interest are the following types of tickets.
+
 [False Positives](https://trac.cppcheck.net/query?status=accepted&status=assigned&status=new&status=reopened&component=False+positive&col=id&col=summary&col=status&col=component&col=type&col=priority&col=milestone&order=priority)
 
 Since Cppcheck aims to be low on false positives, these kind of issues are obviously of the highest priority.
@@ -44,6 +46,18 @@ Changes might lead to fewer findings being reported. In very few cases this migh
 
 [Other Defects](https://trac.cppcheck.net/query?status=accepted&status=assigned&status=new&status=reopened&type=defect&component=!False+positive&col=id&col=summary&col=type&col=status&col=component&col=priority&col=milestone&order=priority)
 
+Note: If you start working on ticket, please assign yourself or request to be.
+
+## Source TODOs
+
+There are also various source-level TODOs. These might be related to already tracked issues (even if not explicitly noted) but may also be just exist exploratively, have even been added overzealously or might even be outdated.
+
+So if you start spending a lot of time on these, you might want to get into touch before proceeding further. 
+
+## simplecpp
+
+At its core Cppcheck is relying on the `simplecpp` library which is a preprocessor implementation which was spun off into its [separate project](https://github.com/cppcheck-opensource/simplecpp) with its own [bug tracker](https://github.com/cppcheck-opensource/simplecpp/issues). This is also maintained by the Cppcheck developers and contributions to it are also welcome.
+
 ## Translations
 
 We are also maintaining various translations for `cppcheck-gui`.
diff --git a/Makefile b/Makefile
index b3b65e504e7..5810fcc9aa3 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ ifdef FILESDIR
     override CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
 endif
 
-RDYNAMIC=-rdynamic
+RDYNAMIC?=-rdynamic
 # Set the CPPCHK_GLIBCXX_DEBUG flag. This flag is not used in release Makefiles.
 # The _GLIBCXX_DEBUG define doesn't work in Cygwin or other Win32 systems.
 ifndef COMSPEC
@@ -132,7 +132,7 @@ ifeq (clang++, $(findstring clang++,$(CXX)))
     CPPCHK_GLIBCXX_DEBUG=
 endif
 ifndef CXXFLAGS
-    CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-sign-compare -Wno-multichar -Woverloaded-virtual $(CPPCHK_GLIBCXX_DEBUG) -g
+    CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-sign-compare -Wno-multichar -Woverloaded-virtual -g
 endif
 
 ifeq (g++, $(findstring g++,$(CXX)))
@@ -144,7 +144,8 @@ ifeq ($(HAVE_RULES),yes)
     ifeq ($(PCRE_CONFIG),)
         $(error Did not find pcre-config)
     endif
-    override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)
+    override CXXFLAGS += $(shell $(PCRE_CONFIG) --cflags)
+    override CPPFLAGS += -DHAVE_RULES
     ifdef LIBS
         LIBS += $(shell $(PCRE_CONFIG) --libs)
     else
@@ -154,6 +155,19 @@ else ifneq ($(HAVE_RULES),)
     $(error invalid HAVE_RULES value '$(HAVE_RULES)')
 endif
 
+# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally
+REQUIRE_ESCAPE=$(shell echo "\#define DEF" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+ifeq ($(REQUIRE_ESCAPE),1)
+    HAVE_EXECINFO_H=$(shell echo "\#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+else
+    HAVE_EXECINFO_H=$(shell echo "#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+endif
+override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)
+
+override CXXFLAGS += $(CXXOPTS)
+override CPPFLAGS += $(CPPOPTS)
+override LDFLAGS += $(LDOPTS)
+
 ifndef PREFIX
     PREFIX=/usr
 endif
@@ -162,12 +176,20 @@ ifndef INCLUDE_FOR_LIB
     INCLUDE_FOR_LIB=-Ilib -isystem externals -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2
 endif
 
+ifndef INCLUDE_FOR_FE
+    INCLUDE_FOR_FE=-Ilib
+endif
+
 ifndef INCLUDE_FOR_CLI
-    INCLUDE_FOR_CLI=-Ilib -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2
+    INCLUDE_FOR_CLI=-Ilib -Ifrontend -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2
 endif
 
 ifndef INCLUDE_FOR_TEST
-    INCLUDE_FOR_TEST=-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml2
+    INCLUDE_FOR_TEST=-Ilib -Ifrontend -Icli -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2
+endif
+
+ifndef CFLAGS_FOR_TEST
+    CFLAGS_FOR_TEST=-Wno-dollar-in-identifier-extension
 endif
 
 BIN=$(DESTDIR)$(PREFIX)/bin
@@ -186,7 +208,6 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/addoninfo.o \
               $(libcppdir)/analyzerinfo.o \
               $(libcppdir)/astutils.o \
-              $(libcppdir)/check.o \
               $(libcppdir)/check64bit.o \
               $(libcppdir)/checkassert.o \
               $(libcppdir)/checkautovariables.o \
@@ -199,6 +220,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checkersreport.o \
               $(libcppdir)/checkexceptionsafety.o \
               $(libcppdir)/checkfunctions.o \
+              $(libcppdir)/checkimpl.o \
               $(libcppdir)/checkinternal.o \
               $(libcppdir)/checkio.o \
               $(libcppdir)/checkleakautovar.o \
@@ -206,6 +228,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checknullpointer.o \
               $(libcppdir)/checkother.o \
               $(libcppdir)/checkpostfixoperator.o \
+              $(libcppdir)/checks.o \
               $(libcppdir)/checksizeof.o \
               $(libcppdir)/checkstl.o \
               $(libcppdir)/checkstring.o \
@@ -234,7 +257,9 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/platform.o \
               $(libcppdir)/preprocessor.o \
               $(libcppdir)/programmemory.o \
+              $(libcppdir)/regex.o \
               $(libcppdir)/reverseanalyzer.o \
+              $(libcppdir)/sarifreport.o \
               $(libcppdir)/settings.o \
               $(libcppdir)/standards.o \
               $(libcppdir)/summaries.o \
@@ -252,6 +277,8 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
 EXTOBJ =      externals/simplecpp/simplecpp.o \
               externals/tinyxml2/tinyxml2.o
 
+FEOBJ =       frontend/frontend.o
+
 CLIOBJ =      cli/cmdlineparser.o \
               cli/cppcheckexecutor.o \
               cli/executor.o \
@@ -277,6 +304,7 @@ TESTOBJ =     test/fixture.o \
               test/testbufferoverrun.o \
               test/testcharvar.o \
               test/testcheck.o \
+              test/testcheckersreport.o \
               test/testclangimport.o \
               test/testclass.o \
               test/testcmdlineparser.o \
@@ -289,6 +317,7 @@ TESTOBJ =     test/fixture.o \
               test/testexecutor.o \
               test/testfilelister.o \
               test/testfilesettings.o \
+              test/testfrontend.o \
               test/testfunctions.o \
               test/testgarbage.o \
               test/testimportproject.o \
@@ -309,6 +338,8 @@ TESTOBJ =     test/fixture.o \
               test/testpreprocessor.o \
               test/testprocessexecutor.o \
               test/testprogrammemory.o \
+              test/testregex.o \
+              test/testsarifreport.o \
               test/testsettings.o \
               test/testsimplifytemplate.o \
               test/testsimplifytokens.o \
@@ -344,13 +375,13 @@ TESTOBJ =     test/fixture.o \
 
 ###### Targets
 
-cppcheck: $(EXTOBJ) $(LIBOBJ) $(CLIOBJ)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
+cppcheck: $(EXTOBJ) $(LIBOBJ) $(FEOBJ) $(CLIOBJ)
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
 
 all:	cppcheck testrunner
 
-testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) cli/cmdlineparser.o cli/cppcheckexecutor.o cli/executor.o cli/filelister.o cli/processexecutor.o cli/sehwrapper.o cli/signalhandler.o cli/singleexecutor.o cli/stacktrace.o cli/threadexecutor.o
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
+testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) $(FEOBJ) cli/cmdlineparser.o cli/cppcheckexecutor.o cli/executor.o cli/filelister.o cli/processexecutor.o cli/sehwrapper.o cli/signalhandler.o cli/singleexecutor.o cli/stacktrace.o cli/threadexecutor.o
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
 
 test:	all
 	./testrunner
@@ -368,7 +399,7 @@ run-dmake: dmake
 	./dmake
 
 clean:
-	rm -f build/*.cpp build/*.o lib/*.o cli/*.o test/*.o tools/dmake/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1
+	rm -f build/*.cpp build/*.o lib/*.o cli/*.o frontend/*.o test/*.o tools/dmake/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1
 
 man:	man/cppcheck.1
 
@@ -446,16 +477,19 @@ checkCWEEntries: /tmp/errorlist.xml
 .PHONY: validateRules
 validateRules:
 	xmllint --noout rules/*.xml
+.PHONY: check-nonneg
+check-nonneg:
+	ls lib/*.cpp | xargs -n 1 -P $$(nproc) g++ -fsyntax-only -DNONNEG $(CXXFLAGS) $(INCLUDE_FOR_LIB)
 
 ###### Build
 
-$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkers.h lib/checkuninitvar.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/forwardanalyzer.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/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_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkuninitvar.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/forwardanalyzer.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/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_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
 
-$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenize.cpp
 
-$(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/symboldatabase.cpp
 
 $(libcppdir)/addoninfo.o: lib/addoninfo.cpp externals/picojson/picojson.h lib/addoninfo.h lib/config.h lib/json.h lib/path.h lib/standards.h lib/utils.h
@@ -464,31 +498,28 @@ $(libcppdir)/addoninfo.o: lib/addoninfo.cpp externals/picojson/picojson.h lib/ad
 $(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
 
-$(libcppdir)/astutils.o: lib/astutils.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/config.h lib/errortypes.h lib/findtoken.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/astutils.o: lib/astutils.cpp lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/findtoken.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/astutils.cpp
 
-$(libcppdir)/check.o: lib/check.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check.cpp
-
-$(libcppdir)/check64bit.o: lib/check64bit.cpp lib/addoninfo.h lib/check.h lib/check64bit.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/check64bit.o: lib/check64bit.cpp lib/check.h lib/check64bit.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check64bit.cpp
 
-$(libcppdir)/checkassert.o: lib/checkassert.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkassert.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkassert.o: lib/checkassert.cpp lib/astutils.h lib/check.h lib/checkassert.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkassert.cpp
 
-$(libcppdir)/checkautovariables.o: lib/checkautovariables.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkautovariables.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkautovariables.o: lib/checkautovariables.cpp lib/astutils.h lib/check.h lib/checkautovariables.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkautovariables.cpp
 
-$(libcppdir)/checkbool.o: lib/checkbool.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkbool.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkbool.o: lib/checkbool.cpp lib/astutils.h lib/check.h lib/checkbool.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbool.cpp
 
-$(libcppdir)/checkbufferoverrun.o: lib/checkbufferoverrun.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/checkbufferoverrun.o: lib/checkbufferoverrun.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/checkimpl.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbufferoverrun.cpp
 
-$(libcppdir)/checkclass.o: lib/checkclass.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/checkclass.o: lib/checkclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkclass.cpp
 
-$(libcppdir)/checkcondition.o: lib/checkcondition.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkcondition.h lib/checkers.h lib/checkother.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkcondition.o: lib/checkcondition.cpp lib/astutils.h lib/check.h lib/checkcondition.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkcondition.cpp
 
 $(libcppdir)/checkers.o: lib/checkers.cpp lib/checkers.h lib/config.h
@@ -497,73 +528,79 @@ $(libcppdir)/checkers.o: lib/checkers.cpp lib/checkers.h lib/config.h
 $(libcppdir)/checkersidmapping.o: lib/checkersidmapping.cpp lib/checkers.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersidmapping.cpp
 
-$(libcppdir)/checkersreport.o: lib/checkersreport.cpp lib/addoninfo.h lib/checkers.h lib/checkersreport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
+$(libcppdir)/checkersreport.o: lib/checkersreport.cpp lib/addoninfo.h lib/checkers.h lib/checkersreport.h lib/config.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersreport.cpp
 
-$(libcppdir)/checkexceptionsafety.o: lib/checkexceptionsafety.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkexceptionsafety.o: lib/checkexceptionsafety.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkexceptionsafety.cpp
 
-$(libcppdir)/checkfunctions.o: lib/checkfunctions.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkfunctions.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkfunctions.o: lib/checkfunctions.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkfunctions.h lib/checkimpl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkfunctions.cpp
 
-$(libcppdir)/checkinternal.o: lib/checkinternal.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkinternal.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkimpl.o: lib/checkimpl.cpp lib/checkers.h lib/checkimpl.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkimpl.cpp
+
+$(libcppdir)/checkinternal.o: lib/checkinternal.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkinternal.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkinternal.cpp
 
-$(libcppdir)/checkio.o: lib/checkio.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkio.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkio.o: lib/checkio.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkio.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkio.cpp
 
-$(libcppdir)/checkleakautovar.o: lib/checkleakautovar.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkleakautovar.h lib/checkmemoryleak.h lib/checknullpointer.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkleakautovar.o: lib/checkleakautovar.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkleakautovar.h lib/checkmemoryleak.h lib/checknullpointer.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkleakautovar.cpp
 
-$(libcppdir)/checkmemoryleak.o: lib/checkmemoryleak.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkmemoryleak.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkmemoryleak.o: lib/checkmemoryleak.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkmemoryleak.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkmemoryleak.cpp
 
-$(libcppdir)/checknullpointer.o: lib/checknullpointer.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checknullpointer.o: lib/checknullpointer.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checknullpointer.cpp
 
-$(libcppdir)/checkother.o: lib/checkother.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkother.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkother.o: lib/checkother.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkother.cpp
 
-$(libcppdir)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkpostfixoperator.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkpostfixoperator.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkpostfixoperator.cpp
 
-$(libcppdir)/checksizeof.o: lib/checksizeof.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checksizeof.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checks.o: lib/checks.cpp lib/check.h lib/check64bit.h lib/checkassert.h lib/checkautovariables.h lib/checkbool.h lib/checkbufferoverrun.h lib/checkclass.h lib/checkcondition.h lib/checkexceptionsafety.h lib/checkfunctions.h lib/checkimpl.h lib/checkinternal.h lib/checkio.h lib/checkleakautovar.h lib/checkmemoryleak.h lib/checknullpointer.h lib/checkother.h lib/checkpostfixoperator.h lib/checks.h lib/checksizeof.h lib/checkstl.h lib/checkstring.h lib/checktype.h lib/checkuninitvar.h lib/checkunusedvar.h lib/checkvaarg.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/standards.h lib/vfvalue.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checks.cpp
+
+$(libcppdir)/checksizeof.o: lib/checksizeof.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checksizeof.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checksizeof.cpp
 
-$(libcppdir)/checkstl.o: lib/checkstl.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/checkstl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathanalysis.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkstl.o: lib/checkstl.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/checkstl.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathanalysis.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstl.cpp
 
-$(libcppdir)/checkstring.o: lib/checkstring.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkstring.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkstring.o: lib/checkstring.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkstring.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstring.cpp
 
-$(libcppdir)/checktype.o: lib/checktype.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checktype.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checktype.o: lib/checktype.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checktype.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checktype.cpp
 
-$(libcppdir)/checkuninitvar.o: lib/checkuninitvar.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/checkuninitvar.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkuninitvar.o: lib/checkuninitvar.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/checkuninitvar.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkuninitvar.cpp
 
-$(libcppdir)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/checkunusedfunctions.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/astutils.h lib/checkers.h lib/checkunusedfunctions.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedfunctions.cpp
 
-$(libcppdir)/checkunusedvar.o: lib/checkunusedvar.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkunusedvar.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/checkunusedvar.o: lib/checkunusedvar.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkunusedvar.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedvar.cpp
 
-$(libcppdir)/checkvaarg.o: lib/checkvaarg.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkvaarg.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkvaarg.o: lib/checkvaarg.cpp lib/astutils.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkvaarg.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/addoninfo.h lib/checkers.h lib/clangimport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/clangimport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/clangimport.cpp
 
 $(libcppdir)/color.o: lib/color.cpp lib/color.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/color.cpp
 
-$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkunusedfunctions.h lib/clangimport.h lib/color.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checks.h lib/checkunusedfunctions.h lib/clangimport.h lib/color.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/regex.h lib/rule.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
 
-$(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/ctu.cpp
 
-$(libcppdir)/errorlogger.o: lib/errorlogger.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/errorlogger.o: lib/errorlogger.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errorlogger.cpp
 
 $(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/utils.h
@@ -572,25 +609,25 @@ $(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/
 $(libcppdir)/findtoken.o: lib/findtoken.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/findtoken.h lib/library.h lib/mathlib.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/findtoken.cpp
 
-$(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp
 
-$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/tinyxml2/tinyxml2.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
-$(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.h lib/infer.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.h lib/infer.h lib/mathlib.h lib/smallvector.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/infer.cpp
 
 $(libcppdir)/keywords.o: lib/keywords.cpp lib/config.h lib/keywords.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/keywords.cpp
 
-$(libcppdir)/library.o: lib/library.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/library.o: lib/library.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/library.cpp
 
-$(libcppdir)/mathlib.o: lib/mathlib.cpp externals/simplecpp/simplecpp.h lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/mathlib.o: lib/mathlib.cpp externals/simplecpp/simplecpp.h lib/config.h lib/errortypes.h lib/mathlib.h lib/smallvector.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/mathlib.cpp
 
 $(libcppdir)/path.o: lib/path.cpp externals/simplecpp/simplecpp.h lib/config.h lib/path.h lib/standards.h lib/utils.h
@@ -599,314 +636,335 @@ $(libcppdir)/path.o: lib/path.cpp externals/simplecpp/simplecpp.h lib/config.h l
 $(libcppdir)/pathanalysis.o: lib/pathanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathanalysis.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathanalysis.cpp
 
-$(libcppdir)/pathmatch.o: lib/pathmatch.cpp lib/config.h lib/path.h lib/pathmatch.h lib/standards.h lib/utils.h
+$(libcppdir)/pathmatch.o: lib/pathmatch.cpp lib/config.h lib/path.h lib/pathmatch.h lib/standards.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathmatch.cpp
 
-$(libcppdir)/platform.o: lib/platform.cpp externals/tinyxml2/tinyxml2.h lib/config.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/xml.h
+$(libcppdir)/platform.o: lib/platform.cpp externals/tinyxml2/tinyxml2.h lib/config.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/platform.cpp
 
-$(libcppdir)/preprocessor.o: lib/preprocessor.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+$(libcppdir)/preprocessor.o: lib/preprocessor.cpp externals/simplecpp/simplecpp.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/preprocessor.cpp
 
-$(libcppdir)/programmemory.o: lib/programmemory.cpp lib/addoninfo.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/programmemory.o: lib/programmemory.cpp lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/programmemory.cpp
 
-$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/regex.o: lib/regex.cpp lib/config.h lib/regex.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/regex.cpp
+
+$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
 
-$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/sarifreport.o: lib/sarifreport.cpp externals/picojson/picojson.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/utils.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/sarifreport.cpp
+
+$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/rule.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/settings.cpp
 
 $(libcppdir)/standards.o: lib/standards.cpp externals/simplecpp/simplecpp.h lib/config.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/standards.cpp
 
-$(libcppdir)/summaries.o: lib/summaries.cpp lib/addoninfo.h lib/analyzerinfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/summaries.o: lib/summaries.cpp lib/analyzerinfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/summaries.cpp
 
-$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
+$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
-$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/templatesimplifier.cpp
 
-$(libcppdir)/timer.o: lib/timer.cpp lib/config.h lib/timer.h lib/utils.h
+$(libcppdir)/timer.o: lib/timer.cpp lib/config.h lib/timer.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/timer.cpp
 
-$(libcppdir)/token.o: lib/token.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(libcppdir)/token.o: lib/token.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/valueflow.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/token.cpp
 
-$(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenlist.cpp
 
 $(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
 
-$(libcppdir)/vf_analyzers.o: lib/vf_analyzers.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/vf_analyzers.o: lib/vf_analyzers.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_analyzers.cpp
 
-$(libcppdir)/vf_common.o: lib/vf_common.cpp lib/addoninfo.h lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/vf_common.o: lib/vf_common.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_common.cpp
 
-$(libcppdir)/vf_settokenvalue.o: lib/vf_settokenvalue.cpp lib/addoninfo.h lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
+$(libcppdir)/vf_settokenvalue.o: lib/vf_settokenvalue.cpp lib/astutils.h lib/calculate.h lib/checkers.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_settokenvalue.cpp
 
-$(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/smallvector.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
 
-cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h lib/xml.h
+frontend/frontend.o: frontend/frontend.cpp frontend/frontend.h lib/checkers.h lib/config.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
+	$(CXX) ${INCLUDE_FOR_FE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ frontend/frontend.cpp
+
+cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/checks.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/regex.h lib/rule.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cmdlineparser.cpp
 
-cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/sehwrapper.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h externals/picojson/picojson.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/sehwrapper.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h externals/picojson/picojson.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutor.cpp
 
-cli/executor.o: cli/executor.cpp cli/executor.h lib/addoninfo.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+cli/executor.o: cli/executor.cpp cli/executor.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/executor.cpp
 
 cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/filelister.cpp
 
-cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/config.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h
+cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/config.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/main.cpp
 
-cli/processexecutor.o: cli/processexecutor.cpp cli/executor.h cli/processexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/processexecutor.o: cli/processexecutor.cpp cli/executor.h cli/processexecutor.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/processexecutor.cpp
 
 cli/sehwrapper.o: cli/sehwrapper.cpp cli/sehwrapper.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/sehwrapper.cpp
 
-cli/signalhandler.o: cli/signalhandler.cpp cli/signalhandler.h cli/stacktrace.h lib/config.h lib/utils.h
+cli/signalhandler.o: cli/signalhandler.cpp cli/signalhandler.h cli/stacktrace.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/signalhandler.cpp
 
-cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h
+cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/singleexecutor.cpp
 
 cli/stacktrace.o: cli/stacktrace.cpp cli/stacktrace.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/stacktrace.cpp
 
-cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/threadexecutor.cpp
 
-test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/fixture.cpp
+test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/fixture.cpp
+
+test/helpers.o: test/helpers.cpp cli/filelister.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/checkers.h lib/config.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/helpers.cpp
+
+test/main.o: test/main.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/main.cpp
+
+test/options.o: test/options.cpp lib/config.h lib/timer.h test/options.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/options.cpp
+
+test/test64bit.o: test/test64bit.cpp lib/check.h lib/check64bit.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.cpp
 
-test/helpers.o: test/helpers.cpp cli/filelister.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/helpers.cpp
+test/testanalyzerinformation.o: test/testanalyzerinformation.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testanalyzerinformation.cpp
 
-test/main.o: test/main.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/main.cpp
+test/testassert.o: test/testassert.cpp lib/check.h lib/checkassert.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testassert.cpp
 
-test/options.o: test/options.cpp test/options.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/options.cpp
+test/testastutils.o: test/testastutils.cpp lib/astutils.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testastutils.cpp
 
-test/test64bit.o: test/test64bit.cpp lib/addoninfo.h lib/check.h lib/check64bit.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.cpp
+test/testautovariables.o: test/testautovariables.cpp lib/check.h lib/checkautovariables.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testautovariables.cpp
 
-test/testanalyzerinformation.o: test/testanalyzerinformation.cpp lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testanalyzerinformation.cpp
+test/testbool.o: test/testbool.cpp lib/check.h lib/checkbool.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbool.cpp
 
-test/testassert.o: test/testassert.cpp lib/addoninfo.h lib/check.h lib/checkassert.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testassert.cpp
+test/testbufferoverrun.o: test/testbufferoverrun.cpp lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbufferoverrun.cpp
 
-test/testastutils.o: test/testastutils.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testastutils.cpp
+test/testcharvar.o: test/testcharvar.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcharvar.cpp
 
-test/testautovariables.o: test/testautovariables.cpp lib/addoninfo.h lib/check.h lib/checkautovariables.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testautovariables.cpp
+test/testcheck.o: test/testcheck.cpp lib/check.h lib/checkers.h lib/checks.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheck.cpp
 
-test/testbool.o: test/testbool.cpp lib/addoninfo.h lib/check.h lib/checkbool.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbool.cpp
+test/testcheckersreport.o: test/testcheckersreport.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheckersreport.cpp
 
-test/testbufferoverrun.o: test/testbufferoverrun.cpp lib/addoninfo.h lib/check.h lib/checkbufferoverrun.h lib/checkers.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbufferoverrun.cpp
+test/testclangimport.o: test/testclangimport.cpp lib/check.h lib/checkers.h lib/clangimport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclangimport.cpp
 
-test/testcharvar.o: test/testcharvar.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcharvar.cpp
+test/testclass.o: test/testclass.cpp lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
 
-test/testcheck.o: test/testcheck.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheck.cpp
+test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/regex.h lib/rule.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
 
-test/testclangimport.o: test/testclangimport.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/clangimport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclangimport.cpp
+test/testcolor.o: test/testcolor.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcolor.cpp
 
-test/testclass.o: test/testclass.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/checkers.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
+test/testcondition.o: test/testcondition.cpp lib/check.h lib/checkcondition.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcondition.cpp
 
-test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
+test/testconstructors.o: test/testconstructors.cpp lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testconstructors.cpp
 
-test/testcolor.o: test/testcolor.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcolor.cpp
+test/testcppcheck.o: test/testcppcheck.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcppcheck.cpp
 
-test/testcondition.o: test/testcondition.cpp lib/addoninfo.h lib/check.h lib/checkcondition.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcondition.cpp
+test/testerrorlogger.o: test/testerrorlogger.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testerrorlogger.cpp
 
-test/testconstructors.o: test/testconstructors.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testconstructors.cpp
+test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexceptionsafety.cpp
 
-test/testcppcheck.o: test/testcppcheck.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcppcheck.cpp
+test/testexecutor.o: test/testexecutor.cpp cli/executor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexecutor.cpp
 
-test/testerrorlogger.o: test/testerrorlogger.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testerrorlogger.cpp
+test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.cpp
 
-test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkexceptionsafety.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexceptionsafety.cpp
+test/testfilesettings.o: test/testfilesettings.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilesettings.cpp
 
-test/testexecutor.o: test/testexecutor.cpp cli/executor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexecutor.cpp
+test/testfrontend.o: test/testfrontend.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfrontend.cpp
 
-test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.cpp
+test/testfunctions.o: test/testfunctions.cpp lib/check.h lib/checkers.h lib/checkfunctions.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfunctions.cpp
 
-test/testfilesettings.o: test/testfilesettings.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilesettings.cpp
+test/testgarbage.o: test/testgarbage.cpp lib/check.h lib/checkers.h lib/checks.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testgarbage.cpp
 
-test/testfunctions.o: test/testfunctions.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfunctions.cpp
+test/testimportproject.o: test/testimportproject.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h lib/xml.h test/fixture.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.cpp
 
-test/testgarbage.o: test/testgarbage.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testgarbage.cpp
+test/testincompletestatement.o: test/testincompletestatement.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testincompletestatement.cpp
 
-test/testimportproject.o: test/testimportproject.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.cpp
+test/testinternal.o: test/testinternal.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkinternal.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testinternal.cpp
 
-test/testincompletestatement.o: test/testincompletestatement.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testincompletestatement.cpp
+test/testio.o: test/testio.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkio.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.cpp
 
-test/testinternal.o: test/testinternal.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkinternal.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testinternal.cpp
+test/testleakautovar.o: test/testleakautovar.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkleakautovar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testleakautovar.cpp
 
-test/testio.o: test/testio.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkio.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.cpp
+test/testlibrary.o: test/testlibrary.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testlibrary.cpp
 
-test/testleakautovar.o: test/testleakautovar.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkleakautovar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testleakautovar.cpp
+test/testmathlib.o: test/testmathlib.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmathlib.cpp
 
-test/testlibrary.o: test/testlibrary.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testlibrary.cpp
+test/testmemleak.o: test/testmemleak.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmemleak.cpp
 
-test/testmathlib.o: test/testmathlib.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmathlib.cpp
+test/testnullpointer.o: test/testnullpointer.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testnullpointer.cpp
 
-test/testmemleak.o: test/testmemleak.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmemleak.cpp
+test/testoptions.o: test/testoptions.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testoptions.cpp
 
-test/testnullpointer.o: test/testnullpointer.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testnullpointer.cpp
+test/testother.o: test/testother.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testother.cpp
 
-test/testoptions.o: test/testoptions.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testoptions.cpp
+test/testpath.o: test/testpath.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpath.cpp
 
-test/testother.o: test/testother.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testother.cpp
+test/testpathmatch.o: test/testpathmatch.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpathmatch.cpp
 
-test/testpath.o: test/testpath.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpath.cpp
+test/testplatform.o: test/testplatform.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testplatform.cpp
 
-test/testpathmatch.o: test/testpathmatch.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpathmatch.cpp
+test/testpostfixoperator.o: test/testpostfixoperator.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkpostfixoperator.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpostfixoperator.cpp
 
-test/testplatform.o: test/testplatform.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testplatform.cpp
+test/testpreprocessor.o: test/testpreprocessor.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpreprocessor.cpp
 
-test/testpostfixoperator.o: test/testpostfixoperator.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkpostfixoperator.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpostfixoperator.cpp
+test/testprocessexecutor.o: test/testprocessexecutor.cpp cli/executor.h cli/processexecutor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprocessexecutor.cpp
 
-test/testpreprocessor.o: test/testpreprocessor.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpreprocessor.cpp
+test/testprogrammemory.o: test/testprogrammemory.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprogrammemory.cpp
 
-test/testprocessexecutor.o: test/testprocessexecutor.cpp cli/executor.h cli/processexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprocessexecutor.cpp
+test/testregex.o: test/testregex.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testregex.cpp
 
-test/testprogrammemory.o: test/testprogrammemory.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprogrammemory.cpp
+test/testsarifreport.o: test/testsarifreport.cpp externals/picojson/picojson.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/json.h lib/library.h lib/mathlib.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsarifreport.cpp
 
-test/testsettings.o: test/testsettings.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp
+test/testsettings.o: test/testsettings.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp
 
-test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytemplate.cpp
+test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytemplate.cpp
 
-test/testsimplifytokens.o: test/testsimplifytokens.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytokens.cpp
+test/testsimplifytokens.o: test/testsimplifytokens.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytokens.cpp
 
-test/testsimplifytypedef.o: test/testsimplifytypedef.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytypedef.cpp
+test/testsimplifytypedef.o: test/testsimplifytypedef.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytypedef.cpp
 
-test/testsimplifyusing.o: test/testsimplifyusing.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifyusing.cpp
+test/testsimplifyusing.o: test/testsimplifyusing.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifyusing.cpp
 
-test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsingleexecutor.cpp
+test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsingleexecutor.cpp
 
-test/testsizeof.o: test/testsizeof.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.cpp
+test/testsizeof.o: test/testsizeof.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.cpp
 
-test/teststandards.o: test/teststandards.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststandards.cpp
+test/teststandards.o: test/teststandards.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststandards.cpp
 
-test/teststl.o: test/teststl.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststl.cpp
+test/teststl.o: test/teststl.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststl.cpp
 
-test/teststring.o: test/teststring.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkstring.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststring.cpp
+test/teststring.o: test/teststring.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkstring.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststring.cpp
 
-test/testsummaries.o: test/testsummaries.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsummaries.cpp
+test/testsummaries.o: test/testsummaries.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsummaries.cpp
 
 test/testsuppressions.o: test/testsuppressions.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsuppressions.cpp
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsuppressions.cpp
 
-test/testsymboldatabase.o: test/testsymboldatabase.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsymboldatabase.cpp
+test/testsymboldatabase.o: test/testsymboldatabase.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsymboldatabase.cpp
 
-test/testthreadexecutor.o: test/testthreadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testthreadexecutor.cpp
+test/testthreadexecutor.o: test/testthreadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testthreadexecutor.cpp
 
-test/testtimer.o: test/testtimer.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtimer.cpp
+test/testtimer.o: test/testtimer.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h test/fixture.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtimer.cpp
 
-test/testtoken.o: test/testtoken.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtoken.cpp
+test/testtoken.o: test/testtoken.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtoken.cpp
 
-test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenize.cpp
+test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenize.cpp
 
-test/testtokenlist.o: test/testtokenlist.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenlist.cpp
+test/testtokenlist.o: test/testtokenlist.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenlist.cpp
 
-test/testtokenrange.o: test/testtokenrange.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenrange.cpp
+test/testtokenrange.o: test/testtokenrange.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenrange.cpp
 
-test/testtype.o: test/testtype.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checktype.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtype.cpp
+test/testtype.o: test/testtype.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checktype.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtype.cpp
 
-test/testuninitvar.o: test/testuninitvar.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testuninitvar.cpp
+test/testuninitvar.o: test/testuninitvar.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testuninitvar.cpp
 
-test/testunusedfunctions.o: test/testunusedfunctions.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedfunctions.cpp
+test/testunusedfunctions.o: test/testunusedfunctions.cpp lib/check.h lib/checkers.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedfunctions.cpp
 
-test/testunusedprivfunc.o: test/testunusedprivfunc.cpp lib/addoninfo.h lib/check.h lib/checkclass.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedprivfunc.cpp
+test/testunusedprivfunc.o: test/testunusedprivfunc.cpp lib/check.h lib/checkclass.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedprivfunc.cpp
 
-test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/checkunusedvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedvar.cpp
+test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/checkimpl.h lib/checkunusedvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedvar.cpp
 
-test/testutils.o: test/testutils.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testutils.cpp
+test/testutils.o: test/testutils.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testutils.cpp
 
-test/testvaarg.o: test/testvaarg.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvaarg.cpp
+test/testvaarg.o: test/testvaarg.cpp lib/check.h lib/checkers.h lib/checkimpl.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvaarg.cpp
 
-test/testvalueflow.o: test/testvalueflow.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvalueflow.cpp
+test/testvalueflow.o: test/testvalueflow.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvalueflow.cpp
 
-test/testvarid.o: test/testvarid.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvarid.cpp
+test/testvarid.o: test/testvarid.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvarid.cpp
 
-test/testvfvalue.o: test/testvfvalue.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/vfvalue.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvfvalue.cpp
+test/testvfvalue.o: test/testvfvalue.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvfvalue.cpp
 
 externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h
 	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ externals/simplecpp/simplecpp.cpp
diff --git a/TUNING.md b/TUNING.md
index 081846d9ea9..ba1f7f49738 100644
--- a/TUNING.md
+++ b/TUNING.md
@@ -28,9 +28,15 @@ Boost.Container (https://www.boost.org/doc/libs/release/libs/container) is being
 
 As the used library is header-only implementation you only need to install the package on the system you build the binary on but not on the system you run the analysis on.
 
-The official Windows binary is currently not using this (TODO: file ticket).
+The official Windows binary is always using this.
 
-(TODO: enable usage by default / bail out when it is enforced)
+This will be used by default if Boost is detected in CMake. If you want to enforce the usage, you can use the CMake option `-DUSE_BOOST=On` which will cause the build to fail if no Boost was detected.
+
+Using Visual Studio you need to provide a full Boost release (i.e. including binaries) for it to be detected by CMake. If you are not able to do this you can specify the CMake option `-DBOOST_INCLUDEDIR=<in>` (pointing to the directory which *contains* the `boost` include directory) to work around this (this is a Cppcheck specific hack) - see https://trac.cppcheck.net/ticket/13822 for more details.
+
+If you are using `make` instead you need to specify `-DHAVE_BOOST` in the flags.
+
+If you are using the Visual Studio project you need to specify the properties `HaveBoost` (always needs to be set to `HAVE_BOOST`) and `BoostInclude` (set to the Boost folder). On the command-line you would need to add `-p:HaveBoost=HAVE_BOOST -p:BoostInclude=<boostdir>`.
 
 ### Use A Different Compiler
 
@@ -40,7 +46,7 @@ In our case Clang is mostly faster than GCC. See https://trac.cppcheck.net/ticke
 
 ### Use More Advanced Optimizations
 
-By default we enforce the `-O2` optimization level. Even when using the `Release` build type in CMake which defaults to `-O3`. It might be possible that building with `-O3` might yield a perfomance increase.
+By default we enforce the `-O2` optimization level. Even when using the `Release` build type in CMake which defaults to `-O3`. It might be possible that building with `-O3` might yield a performance increase.
 
 There are also no additional code generation flags provided so the resulting binary can run on any system. You might be able to tune this and apply more optimization which is tailored to the system you will be running the binary on.
 
@@ -105,6 +111,18 @@ So if you do not require the additional safety you might want to switch to the u
 
 Note: For Windows binaries we currently do not provide the possibility of using processes so this does not apply.
 
+### Disable Analyzing Of Unused Templated Functions
+
+Currently all templated functions (either locally or in headers) will be analyzed regardless if they are instantiated or not. If you have template-heavy includes that might lead to unnecessary work and findings, and might slow down the analysis. This behavior can be disabled with `--no-check-unused-templates`.
+
+Note: This might lead to "false negatives" in such functions if they are never instantiated. You should make sure that you have proper coverage of the affected functions in your code before enabling this.
+
+### Limit Analysis Of Projects 
+
+If you specify a project all files will be analyzed by default. But in some cases you might only be interested in the results in a subset of those (e.g. in IDE integrations).
+
+Using the `--file-filter=<pattern>` CLI option you can select files using a globbing syntax. Using `--file-filter=-` you can provide the filters directly on the CLI.
+
 ## Advanced Tuning
 
 ### Re-order The Files
diff --git a/addons/README.md b/addons/README.md
index 563c0c793f6..05502f547b6 100644
--- a/addons/README.md
+++ b/addons/README.md
@@ -4,19 +4,19 @@ Addons are scripts that analyses Cppcheck dump files to check compatibility with
 
 ## Supported addons
 
-+ [misra.py](https://github.com/danmar/cppcheck/blob/main/addons/misra.py) 
-  Used to verify compliance with MISRA C 2012 - a proprietary set of guidelines to avoid such questionable code, developed for embedded systems. Since this standard is proprietary, cppcheck does not display error text by specifying only the number of violated rules (for example, [c2012-21.3]). If you want to display full texts for violated rules, you will need to create a text file containing MISRA rules, which you will have to pass when calling the script with `--rule-texts` key. Some examples of rule texts files available in [tests directory](https://github.com/danmar/cppcheck/blob/main/addons/test/misra/).
-+ [y2038.py](https://github.com/danmar/cppcheck/blob/main/addons/y2038.py) 
-  Checks Linux system for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety. This required [modified environment](https://github.com/3adev/y2038). See complete description [here](https://github.com/danmar/cppcheck/blob/main/addons/doc/y2038.txt).
-+ [threadsafety.py](https://github.com/danmar/cppcheck/blob/main/addons/threadsafety.py) 
++ [misra.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/misra.py) 
+  Used to verify compliance with MISRA C 2012 - a proprietary set of guidelines to avoid such questionable code, developed for embedded systems. Since this standard is proprietary, cppcheck does not display error text by specifying only the number of violated rules (for example, [c2012-21.3]). If you want to display full texts for violated rules, you will need to create a text file containing MISRA rules, which you will have to pass when calling the script with `--rule-texts` key. Some examples of rule texts files available in [tests directory](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/test/misra/).
++ [y2038.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/y2038.py) 
+  Checks code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety. See complete description [here](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/doc/y2038.md).
++ [threadsafety.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/threadsafety.py) 
   Analyse Cppcheck dump files to locate threadsafety issues like static local objects used by multiple threads.
-+ [naming.py](https://github.com/danmar/cppcheck/blob/main/addons/naming.py)
++ [naming.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/naming.py)
   Enforces naming conventions across the code.
-+ [namingng.py](https://github.com/danmar/cppcheck/blob/main/addons/namingng.py)
++ [namingng.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/namingng.py)
   Enforces naming conventions across the code. Enhanced version with support for type prefixes in variable and function names.
-+ [findcasts.py](https://github.com/danmar/cppcheck/blob/main/addons/findcasts.py)
++ [findcasts.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/findcasts.py)
   Locates casts in the code.
-+ [misc.py](https://github.com/danmar/cppcheck/blob/main/addons/misc.py)
++ [misc.py](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/misc.py)
   Performs miscellaneous checks.
 
 ### Other files
@@ -50,6 +50,11 @@ Addons are scripts that analyses Cppcheck dump files to check compatibility with
 cppcheck --addon=misc src/test.c
 ```
 
+For project-wide analysis with compile_commands.json:
+```bash
+cppcheck --project=build/compile_commands.json --addon=y2038
+```
+
 It is also possible to call scripts as follows:
 ```bash
 cppcheck --dump --quiet src/test.c
@@ -63,5 +68,5 @@ This allows you to add additional parameters when calling the script (for exampl
 
 When using the graphical interface `cppcheck-gui`, the selection and configuration of addons is carried out on the tab `Addons and tools` in the project settings (`Edit Project File`):
 
-![Screenshot](https://raw.githubusercontent.com/danmar/cppcheck/main/addons/doc/img/cppcheck-gui-addons.png)
+![Screenshot](https://raw.githubusercontent.com/cppcheck-opensource/cppcheck/main/addons/doc/img/cppcheck-gui-addons.png)
 
diff --git a/addons/cppcheckdata.py b/addons/cppcheckdata.py
index 88a4d8cb157..06028e2005c 100755
--- a/addons/cppcheckdata.py
+++ b/addons/cppcheckdata.py
@@ -166,7 +166,7 @@ class ValueType:
     Attributes:
         type             nonstd/pod/record/smart-pointer/container/iterator/void/bool/char/short/wchar_t/int/long/long long/unknown int/float/double/long double
         sign             signed/unsigned
-        bits
+        bits             bit count for bit-fields, otherwise None
         pointer
         constness
         reference
@@ -178,7 +178,7 @@ class ValueType:
 
     type = None
     sign = None
-    bits = 0
+    bits = None
     constness = 0
     pointer = 0
     typeScopeId = None
@@ -188,7 +188,8 @@ class ValueType:
     def __init__(self, element):
         self.type = element.get('valueType-type')
         self.sign = element.get('valueType-sign')
-        self.bits = int(element.get('valueType-bits', 0))
+        self.bits = element.get('valueType-bits', None)
+        self.bits = int(self.bits) if self.bits else None
         self.pointer = int(element.get('valueType-pointer', 0))
         self.constness = int(element.get('valueType-constness', 0))
         self.reference = element.get('valueType-reference')
@@ -262,6 +263,7 @@ class Token:
         isComplex
         isRestrict
         isAttributeExport
+        isAnonymous
         varId              varId for token, each variable has a unique non-zero id
         exprId             exprId for token, each expression has a unique non-zero id
         variable           Variable information for this token. See the Variable class.
@@ -272,7 +274,7 @@ class Token:
         astParent          ast parent
         astOperand1        ast operand1
         astOperand2        ast operand2
-        orriginalName      orriginal name of the token
+        orriginalName      original name of the token
         valueType          type information: container/..
         file               file name
         linenr             line number
@@ -323,6 +325,7 @@ class Token:
     isComplex = False
     isRestrict = False
     isAttributeExport = False
+    isAnonymous = False
     exprId = None
     varId = None
     variableId = None
@@ -406,6 +409,8 @@ def __init__(self, element):
             self.isRestrict = True
         if element.get('isAttributeExport'):
             self.isAttributeExport = True
+        if element.get('isAnonymous'):
+            self.isAnonymous = True
         self.linkId = element.get('link')
         self.link = None
         if element.get('varId'):
@@ -439,7 +444,7 @@ def __repr__(self):
                 "isChar", "isBoolean", "isOp", "isArithmeticalOp", "isAssignmentOp", 
                 "isComparisonOp", "isLogicalOp", "isCast", "externLang", "isExpandedMacro", 
                 "isRemovedVoidParameter", "isSplittedVarDeclComma", "isSplittedVarDeclEq", 
-                "isImplicitInt", "isComplex", "isRestrict", "isAttributeExport", "linkId", 
+                "isImplicitInt", "isComplex", "isRestrict", "isAttributeExport", "isAnonymous", "linkId",
                 "varId", "variableId", "functionId", "valuesId", "valueType",
                 "typeScopeId", "astParentId", "astOperand1Id", "file",
                 "linenr", "column"]
@@ -998,7 +1003,7 @@ def isMatch(self, file, line, message, errorId):
                 and (self.symbolName is None or fnmatch(message, '*'+self.symbolName+'*'))
                 and fnmatch(errorId, self.errorId)):
             return True
-        # Other Suppression (Globaly set via suppression file or cli command)
+        # Other Suppression (Globally set via suppression file or cli command)
         if ((self.fileName is None or fnmatch(file, self.fileName))
                 and (self.suppressionType is None)
                 and (self.symbolName is None or fnmatch(message, '*'+self.symbolName+'*'))
@@ -1336,7 +1341,7 @@ def iterconfigurations(self):
             # Parse tokens
             elif node.tag == 'tokenlist' and event == 'start':
                 continue
-            elif node.tag == 'token' and event == 'start' and not iter_directive:
+            elif node.tag == 'token' and event == 'start' and not iter_directive and not iter_typedef_info:
                 cfg.tokenlist.append(Token(node))
 
             # Parse scopes
diff --git a/addons/doc/y2038.md b/addons/doc/y2038.md
new file mode 100644
index 00000000000..5566c3936ba
--- /dev/null
+++ b/addons/doc/y2038.md
@@ -0,0 +1,166 @@
+# README of the Y2038 cppcheck addon
+
+## Contents
+
+- [README of the Y2038 cppcheck addon](#readme-of-the-y2038-cppcheck-addon)
+  - [Contents](#contents)
+  - [What is Y2038?](#what-is-y2038)
+  - [What is the Y2038 cppcheck addon?](#what-is-the-y2038-cppcheck-addon)
+  - [How does the Y2038 cppcheck addon work?](#how-does-the-y2038-cppcheck-addon-work)
+    - [Primary Usage: Cppcheck Addon Integration (`y2038.py`)](#primary-usage-cppcheck-addon-integration-y2038py)
+      - [Implementation Details](#implementation-details)
+  - [Requirements](#requirements)
+  - [How to use the Y2038 cppcheck addon](#how-to-use-the-y2038-cppcheck-addon)
+    - [**Auditing Your Project for Y2038 Compliance**](#auditing-your-project-for-y2038-compliance)
+    - [**CI/CD Integration**](#cicd-integration)
+  - [Testing](#testing)
+    - [Running Y2038 Addon Tests](#running-y2038-addon-tests)
+    - [Test Coverage](#test-coverage)
+    - [Test Structure](#test-structure)
+
+---
+
+## What is Y2038?
+
+In a few words:
+
+Most operating systems and programming environments represent the current time as the number of seconds since the Unix epoch. In C and C++ this is exposed by time() and std::time(), with the Unix epoch defined as 00:00:00 UTC on 1 January 1970.
+
+Typically this representation is stored as a 64-bit signed quantity.
+Some systems, mainly embedded systems and older systems, still use a 32-bit signed
+time_t representation.
+
+On January 19th, 2038 at 03:14:07 GMT, such 32-bit representations will reach
+their maximum positive value.
+
+What happens then is unpredictable: system time might roll back to December
+13th, 1901 at 19:55:13, or it might keep running on until February 7th, 2106
+at 06:28:15 GMT, or the computer may freeze, or just about anything you can
+think of, plus a few ones you can't.
+
+The workaround for this is to switch to a 64-bit signed representation of time
+as seconds from the Unix epoch. This representation will work for more than 250
+billion years.
+
+Working around Y2038 requires fixing the Linux kernel, the C libraries, and
+any user code around which uses 32-bit epoch representations.
+
+There is Y2038-proofing work in progress on the Linux and GNU glibc front.
+
+## What is the Y2038 cppcheck addon?
+
+The Y2038 cppcheck addon is a tool to help detect code which might need fixing
+because it is Y2038-unsafe. This may be because it uses types or functions from
+GNU libc or from the Linux kernel which are known not to be Y2038-proof.
+
+## How does the Y2038 cppcheck addon work?
+
+The Y2038 addon is a comprehensive tool designed to audit your project for Y2038 compliance. It provides a streamlined, intelligent approach to Y2038 analysis.
+
+### Primary Usage: Cppcheck Integration with Project Files
+
+The Y2038 addon integrates seamlessly with cppcheck's core project parsing infrastructure. For optimal analysis, use the addon with project files:
+
+```bash
+cppcheck --project=build/compile_commands.json --addon=y2038
+```
+
+For single files, you can also use:
+```bash
+cppcheck --addon=y2038 source_file.c
+```
+
+#### Implementation Details
+
+The addon leverages cppcheck's built-in project parsing capabilities:
+
+- **Core Integration**: Y2038-related compiler flags are extracted by cppcheck core during project parsing and passed through dump file configuration
+- **Automatic Flag Detection**: Cppcheck automatically detects Y2038-relevant flags (`-D_TIME_BITS=64`, `-D_FILE_OFFSET_BITS=64`, `-D_USE_TIME_BITS64`) from compilation commands
+- **Clean Architecture**: No redundant file parsing - cppcheck handles project files once, addon focuses on analysis
+- **Priority Logic**: Dump file configuration (from cppcheck's project parsing) takes precedence over source code `#define` statements
+- **Source Fallback**: When no project configuration is available, the addon analyzes source code `#define` statements
+
+This architecture ensures optimal performance and maintains clean separation of concerns between cppcheck core (project parsing) and addon (analysis logic).
+
+The output is the standard Cppcheck analysis report, focused on Y2038-related issues.
+
+## Requirements
+
+The Y2038 addon works with any cppcheck installation and requires no additional dependencies beyond cppcheck itself.
+
+For optimal Y2038 analysis, ensure your project uses a supported build system that generates `compile_commands.json`:
+
+- **CMake**: Use `-DCMAKE_EXPORT_COMPILE_COMMANDS=ON`
+- **Bear**: For Make/Autotools projects, use `bear` to generate compile commands
+- **Ninja**: Use `ninja -t compdb` to generate compile commands
+- **Bazel**: Use `bazel aquery` with appropriate flags
+
+If using `bear` for Make-based projects, install it via your package manager:
+
+```bash
+# On Debian/Ubuntu
+sudo apt-get install bear
+
+# On Fedora
+sudo dnf install bear
+
+# On macOS (using Homebrew)
+brew install bear
+```
+
+## How to use the Y2038 cppcheck addon
+
+### **Auditing Your Project for Y2038 Compliance**
+
+The Y2038 addon seamlessly integrates with your existing cppcheck workflow.
+
+**For projects with compile_commands.json (recommended):**
+
+```bash
+cppcheck --project=build/compile_commands.json --addon=y2038
+```
+
+**For single file analysis:**
+
+```bash
+cppcheck --addon=y2038 source_file.c
+```
+
+**For project-wide analysis without compile_commands.json:**
+
+```bash
+cppcheck --addon=y2038 src/
+```
+
+The integration automatically:
+
+1.  **Extracts Y2038 flags** from your project's compilation commands via cppcheck's project parsing
+2.  **Passes flag information** through dump file configuration to the addon
+3.  **Analyzes source code** with proper Y2038 context from both build system and source directives
+4.  **Reports Y2038 issues** using cppcheck's standard error reporting format
+
+### **CI/CD Integration**
+
+For CI/CD integration, use the Y2038 addon with your project's build configuration:
+
+```sh
+# Example CI script with compile_commands.json
+#!/bin/bash
+# Generate compile_commands.json (if not already available)
+cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -B build
+# or: bear -- make
+
+# Run Y2038 analysis
+cppcheck --project=build/compile_commands.json --addon=y2038 --error-exitcode=1
+
+# The addon will return a non-zero exit code if Y2038 issues are found.
+# The output is the standard Cppcheck report.
+```
+
+**For projects without compile_commands.json:**
+
+```sh
+# Example CI script for source-only analysis
+#!/bin/bash
+cppcheck --addon=y2038 --error-exitcode=1 src/
+```
diff --git a/addons/doc/y2038.txt b/addons/doc/y2038.txt
deleted file mode 100644
index 990b24bd483..00000000000
--- a/addons/doc/y2038.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-README of the Y2038 cppcheck addon
-==================================
-
-Contents
-
-1. What is Y2038?
-2. What is the Y2038 cppcheck addon?
-3. How does the Y2038 cppcheck addon work?
-4. How to use the Y2038 cppcheck addon
-
----
-
-1. What is Y2038?
-
-In a few words:
-
-In Linux, the current date and time is kept as the number of seconds elapsed
-since the Unix epoch, that is, since January 1st, 1970 at 00:00:00 GMT.
-
-Most of the time, this representation is stored as a 32-bit signed quantity.
-
-On January 19th, 2038 at 03:14:07 GMT, such 32-bit representations will reach
-their maximum positive value.
-
-What happens then is unpredictable: system time might roll back to December
-13th, 1901 at 19:55:13, or it might keep running on until February 7th, 2106
-at 06:28:15 GMT, or the computer may freeze, or just about anything you can
-think of, plus a few ones you can't.
-
-The workaround for this is to switch to a 64-bit signed representation of time
-as seconds from the Unix epoch. This representation will work for more than 250
-billion years.
-
-Working around Y2038 requires fixing the Linux kernel, the C libraries, and
-any user code around which uses 32-bit epoch representations.
-
-There is Y2038-proofing work in progress on the Linux and GNU glibc front.
-
-2. What is the Y2038 cppcheck addon?
-
-The Y2038 cppcheck addon is a tool to help detect code which might need fixing
-because it is Y2038-unsafe. This may be because it uses types or functions from
-GNU libc or from the Linux kernel which are known not to be Y2038-proof.
-
-3. How does the Y2038 cppcheck addon work?
-
-The Y2038 cppcheck addon takes XML dumps produced by cppcheck from source code
-files and looks for the names of types or functions which are known to be Y2038-
-unsafe, and emits diagnostics whenever it finds one.
-
-Of course, this is of little use if your code uses a Y2038-proof glibc and
-correctly configured Y2038-proof time support.
-
-This is why y2038.py takes into account two preprocessor directives:
-_TIME_BITS and __USE_TIME_BITS64.
-
-_TIME_BITS is defined equal to 64 by user code when it wants 64-bit time
-support from the GNU glibc. Code which does not define _TIME_BITS equal to 64
-(or defines it to something else than 64) runs a risk of not being Y2038-proof.
-
-__USE_TIME_BITS64 is defined by the GNU glibc when it actually provides 64-bit
-time support. When this is defined, then all glibc symbols, barring bugs, are
-Y2038-proof (but your code might have its own Y2038 bugs, if it handles signed
-32-bit Unix epoch values).
-
-The Y2038 cppcheck performs the following checks:
-
-  1. Upon meeting a definition for _TIME_BITS, if that definition does not
-     set it equal to 64, this error diagnostic is emitted:
-
-	Error: _TIME_BITS must be defined equal to 64
-
-     This case is very unlikely but might result from a typo, so pointing
-     it out is quite useful. Note that definitions of _TIME_BITS as an
-     expression evaluating to 64 will be flagged too.
-
-  2. Upon meeting a definition for _USE_TIME_BITS64, if _TIME_BITS is not
-     defined equal to 64, this information diagnostic is emitted:
-
-	Warning: _USE_TIME_BITS64 is defined but _TIME_BITS was not
-
-     This reflects the fact that even though the glibc checked default to
-     64-bit time support, this was not requested by the user code, and
-     therefore the user code might fail Y2038 if built against a glibc
-     which defaults to 32-bit time support.
-
-  3. Upon meeting a symbol (type or function) which is known to be Y2038-
-     unsafe, if _USE_TIME_BITS64 is undefined or _TIME_BITS not properly
-     defined, this warning diagnostic is emitted:
-
-	Warning: <symbol> is Y2038-unsafe
-
-     This reflects the fact that the user code is referring to a symbol
-     which, when glibc defaults to 32-bit time support, might fail Y2038.
-
-General note: y2038.py will handle multiple configurations, and will
-emit diagnostics for each configuration in turn.
-
-4. How to use the Y2038 cppcheck addon
-
-The Y2038 cppcheck addon is used like any other cppcheck addon:
-
-	cppcheck --dump file1.c [ file2.c [...]]]
-	y2038.py file1.c [ file2.c [...]]]
-
-Sample test C file is provided:
-
-	test/y2038-test-1-bad-time-bits.c
-	test/y2038-test-2-no-time-bits.c
-	test/y2038-test-3-no-use-time-bits.c
-	test/y2038-test-4-good.c
-
-These cover the cases described above. You can run them through cppcheck
-and y2038.py to see for yourself how the addon diagnostics look like. If
-this README is not outdated (and if it is, feel free to submit a patch),
-you can run cppcheck on these files as on any others:
-
-	cppcheck --dump addons/y2038/test/y2038-*.c
-	y2038.py addons/y2038/test/y2038-*.dump
-
-If you have not installed cppcheck yet, you will have to run these
-commands from the root of the cppcheck repository:
-
-    make
-    sudo make install
-	./cppcheck --dump addons/y2038/test/y2038-*.c
-    PYTHONPATH=addons python addons/y2038/y2038.py addons/y2038/test/y2038-*.c.dump
-
-In both cases, y2038.py execution should result in the following:
-
-Checking addons/y2038/test/y2038-test-1-bad-time-bits.c.dump...
-Checking addons/y2038/test/y2038-test-1-bad-time-bits.c.dump, config ""...
-Checking addons/y2038/test/y2038-test-2-no-time-bits.c.dump...
-Checking addons/y2038/test/y2038-test-2-no-time-bits.c.dump, config ""...
-Checking addons/y2038/test/y2038-test-3-no-use-time-bits.c.dump...
-Checking addons/y2038/test/y2038-test-3-no-use-time-bits.c.dump, config ""...
-Checking addons/y2038/test/y2038-test-4-good.c.dump...
-Checking addons/y2038/test/y2038-test-4-good.c.dump, config ""...
-# Configuration "":
-# Configuration "":
-[addons/y2038/test/y2038-test-1-bad-time-bits.c:8]: (error) _TIME_BITS must be defined equal to 64
-[addons/y2038/test/y2038-inc.h:9]: (warning) _USE_TIME_BITS64 is defined but _TIME_BITS was not
-[addons/y2038/test/y2038-test-1-bad-time-bits.c:10]: (information) addons/y2038/test/y2038-inc.h was included from here
-[addons/y2038/test/y2038-inc.h:9]: (warning) _USE_TIME_BITS64 is defined but _TIME_BITS was not
-[addons/y2038/test/y2038-test-2-no-time-bits.c:8]: (information) addons/y2038/test/y2038-inc.h was included from here
-[addons/y2038/test/y2038-test-3-no-use-time-bits.c:13]: (warning) timespec is Y2038-unsafe
-[addons/y2038/test/y2038-test-3-no-use-time-bits.c:15]: (warning) clock_gettime is Y2038-unsafe
-
-Note: y2038.py recognizes option --template as cppcheck does, including
-pre-defined templates 'gcc', 'vs' and 'edit'. The short form -t is also
-recognized.
diff --git a/addons/misra.py b/addons/misra.py
index 1bb190adeef..7abc99f365a 100755
--- a/addons/misra.py
+++ b/addons/misra.py
@@ -22,7 +22,6 @@
 import re
 import os
 import argparse
-import codecs
 import string
 import copy
 
@@ -539,6 +538,20 @@ def is_source_file(file):
     return file.endswith('.c')
 
 
+def has_prior_function_prototype(cfg, function):
+    """Return whether a global prototype precedes the function definition."""
+    for token in cfg.tokenlist:
+        if token == function.tokenDef:
+            break
+        if token.str != function.name or token.scope.type != 'Global':
+            continue
+        opening = token.next
+        if opening and opening.str == '(' and opening.link and \
+                opening.link.next and opening.link.next.str == ';':
+            return True
+    return False
+
+
 def is_header(file):
     return file.endswith('.h')
 
@@ -1823,20 +1836,6 @@ def misra_3_1(self, rawTokens):
                         self.reportError(token, 3, 1)
                         break
 
-    def misra_3_2(self, rawTokens):
-        for token in rawTokens:
-            if token.str.startswith('//'):
-                # Check for comment ends with trigraph which might be replaced
-                # by a backslash.
-                if token.str.endswith('??/'):
-                    self.reportError(token, 3, 2)
-                # Check for comment which has been merged with subsequent line
-                # because it ends with backslash.
-                # The last backslash is no more part of the comment token thus
-                # check if next token exists and compare line numbers.
-                elif (token.next is not None) and (token.linenr == token.next.linenr):
-                    self.reportError(token, 3, 2)
-
     def misra_4_1(self, rawTokens):
         for token in rawTokens:
             if (token.str[0] != '"') and (token.str[0] != '\''):
@@ -2017,7 +2016,7 @@ def misra_6_1(self, data):
         for token in data.tokenlist:
             if not token.valueType:
                 continue
-            if token.valueType.bits == 0:
+            if token.valueType.bits is None:
                 continue
             if not token.variable:
                 continue
@@ -2074,7 +2073,9 @@ def misra_7_2(self, data):
                 self.reportError(token, 7, 2)
 
     def misra_7_3(self, rawTokens):
-        compiled = re.compile(r'^[0-9.]+[Uu]*l+[Uu]*$')
+        # Match decimal digits, hex digits, decimal point, and e/E p/P floating
+        # point constant exponent separators.
+        compiled = re.compile(r'^(0[xX])?[0-9a-fA-FpP.]+[Uu]*l+[Uu]*$')
         for tok in rawTokens:
             if compiled.match(tok.str):
                 self.reportError(tok, 7, 3)
@@ -2262,6 +2263,8 @@ def misra_8_4(self, cfg):
                 continue
             if func.token != func.tokenDef:
                 continue
+            if has_prior_function_prototype(cfg, func):
+                continue
             if func.tokenDef.str == 'main':
                 continue
             self.reportError(func.tokenDef, 8, 4)
@@ -2473,20 +2476,38 @@ def get_category(essential_type):
                 if essential_type.split(' ')[0] in ('unsigned', 'signed'):
                     return essential_type.split(' ')[0]
             return None
+
         for tok in cfg.tokenlist:
-            if tok.isAssignmentOp:
-                lhs = getEssentialType(tok.astOperand1)
-                rhs = getEssentialType(tok.astOperand2)
-                #print(lhs)
-                #print(rhs)
-                if lhs is None or rhs is None:
+            if not tok.isAssignmentOp:
+                continue
+
+            lhs = getEssentialType(tok.astOperand1)
+            rhs = getEssentialType(tok.astOperand2)
+            if lhs is None or rhs is None:
+                continue
+
+            find_std = cfg.standards.c if cfg.standards and cfg.standards.c else self.stdversion
+
+            rhs_tok = tok.astOperand2
+            rhs_macro_name = rhs_tok.macroName if rhs_tok else None
+            rhs_spelling = rhs_macro_name if rhs_macro_name in ('true', 'false') else rhs_tok.str
+
+            rhs_is_source_bool_literal = rhs_spelling in ('true', 'false')
+            rhs_is_source_int_literal_0_1 = rhs_spelling in ('0', '1')
+
+            if lhs == 'bool':
+                if rhs_is_source_bool_literal:
+                    continue
+                if find_std == 'c89' and rhs_is_source_int_literal_0_1:
                     continue
-                lhs_category = get_category(lhs)
-                rhs_category = get_category(rhs)
-                if lhs_category and rhs_category and lhs_category != rhs_category and rhs_category not in ('signed','unsigned'):
-                    self.reportError(tok, 10, 3)
-                if bitsOfEssentialType(lhs) < bitsOfEssentialType(rhs) and (lhs != "bool" or tok.astOperand2.str not in ('0','1')):
-                    self.reportError(tok, 10, 3)
+
+            lhs_category = get_category(lhs)
+            rhs_category = get_category(rhs)
+            if lhs_category and rhs_category and lhs_category != rhs_category and rhs_category not in ('signed', 'unsigned'):
+                self.reportError(tok, 10, 3)
+
+            if bitsOfEssentialType(lhs) < bitsOfEssentialType(rhs):
+                self.reportError(tok, 10, 3)
 
     def misra_10_4(self, data):
         op = {'+', '-', '*', '/', '%', '&', '|', '^', '+=', '-=', ':'}
@@ -3493,8 +3514,9 @@ def misra_17_3(self, cfg):
 
         # Additional check for implicit function calls in expressions
         for token in cfg.tokenlist:
-            if token.isName and token.function is None and token.valueType is None:
-                if token.next and token.next.str == "(" and token.next.valueType is None:
+            if token.isName and token.scope.type != 'Global' and token.function is None and token.valueType is None:
+                if token.next and token.next.str == "(" and token.next.valueType is None and \
+                        isFunctionCall(token.next, cfg.standards.c):
                     if token.next.next.str == "*" and \
                         token.next.next.next.isName and token.next.next.next.valueType is not None and \
                         token.next.next.next.valueType.pointer > 0 :
@@ -4537,7 +4559,7 @@ def loadRuleTexts(self, filename):
         encodings = ['ascii', 'utf-8', 'windows-1250', 'windows-1252']
         for e in encodings:
             try:
-                file_stream = codecs.open(filename, 'r', encoding=e)
+                file_stream = open(filename, 'r', encoding=e)
                 file_stream.readlines()
                 file_stream.seek(0)
             except UnicodeDecodeError:
@@ -4716,7 +4738,7 @@ def fillVerifyExpected(verify_expected, tok):
             # data.rawTokens is same for all configurations
             if cfgNumber == 0:
                 self.executeCheck(301, self.misra_3_1, data.rawTokens)
-                self.executeCheck(302, self.misra_3_2, data.rawTokens)
+                #self.executeCheck(302, self.misra_3_2, data.rawTokens)
                 self.executeCheck(401, self.misra_4_1, data.rawTokens)
                 self.executeCheck(402, self.misra_4_2, data.rawTokens)
             self.executeCheck(501, self.misra_5_1, cfg)
diff --git a/addons/test/misra/crash10.c b/addons/test/misra/crash10.c
index 455d86e57ec..65e3a14ac96 100644
--- a/addons/test/misra/crash10.c
+++ b/addons/test/misra/crash10.c
@@ -2,7 +2,7 @@
 
 extern uint32_t end;
 
-//#define KEEP // if uncomment this then wont crash
+//#define KEEP // if uncomment this then won't crash
 
 KEEP static const int32_t ptr_to_end = &end;
 
diff --git a/addons/test/misra/misra-regression-prototypes.c b/addons/test/misra/misra-regression-prototypes.c
new file mode 100644
index 00000000000..11ce35c9fa0
--- /dev/null
+++ b/addons/test/misra/misra-regression-prototypes.c
@@ -0,0 +1,13 @@
+int regression_function(int value);
+
+int regression_function(int value)
+{
+    return value;
+}
+
+int main(void)
+{
+    int local_prototype(int value);
+    int (*callback)(int) = regression_function;
+    return callback(0);
+}
\ No newline at end of file
diff --git a/addons/test/misra/misra-test-c11.c b/addons/test/misra/misra-test-c11.c
index 031bc361e5f..aa00b2f0b42 100644
--- a/addons/test/misra/misra-test-c11.c
+++ b/addons/test/misra/misra-test-c11.c
@@ -2,6 +2,7 @@
 // ~/cppcheck/cppcheck --dump misra/misra-test-c11.c --std=c11
 // ~/cppcheck/cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test-c11.c --std=c11 --platform=unix64 && python3 ../misra.py -verify misra/misra-test-c11.c.dump
 
+#include <stdbool.h>
 #include <stdint.h>
 
 typedef unsigned int UINT_TYPEDEF;
@@ -23,3 +24,15 @@ static void misra6_1_fn(void) {
     struct_with_bitfields s;
     s.h = 61;
 }
+
+static void misra_10_3_c11(void) {
+    bool b = false;
+    bool b0 = 0; // 10.3
+    bool b1 = 1; // 10.3
+    bool bf = false; // no-warning
+    bool bt = true; // no-warning
+    b = 0; // 10.3
+    b = 1; // 10.3
+    b = false; // no-warning
+    b = true; // no-warning
+}
diff --git a/addons/test/misra/misra-test.c b/addons/test/misra/misra-test.c
index a1ccb8c4dee..6b6f52342aa 100644
--- a/addons/test/misra/misra-test.c
+++ b/addons/test/misra/misra-test.c
@@ -121,22 +121,6 @@ static void misra_2_7_b(int a, int b, int c, // 2.7
 static void misra_2_7_c(int a, ...) { (void)a; }
 static void misra_2_7_d(int) { } // 2.7 8.2
 
-static void misra_3_2(int enable)
-{
-    // This won't generate a violation because of subsequent blank line \
-
-    int y = 0;
-    int x = 0;  // 3.2 non-compliant comment ends with backslash \
-    if (enable != 0)
-    {
-        ++x;    // This is always executed
-        // 3.2 potentially non-compliant comment ends with trigraph resolved to backslash ??/
-        ++y;    // This is hidden if trigraph replacement is active
-    }
-
-    (void)printf("x=%i, y=%i\n", x, y); //21.6
-}
-
 extern int misra_5_1_extern_var_hides_var_x;
 extern int misra_5_1_extern_var_hides_var_y; //5.1
 int misra_5_1_var_hides_var________a; // 8.4
@@ -302,6 +286,20 @@ struct misra_7_3_s
 {
   uint32_t ul_clka;
   uint32_t test123l;
+  float t = 6.02E23l; // 7.3
+  float t1 = 6.02E23L;
+  float u = 0xa1B2.p12l; // 7.3
+  float u1 = 0xa1B2.p12L;
+  float v = 0xa1B2.P12l; // 7.3
+  float v1 = 0xa1B2.P12L;
+  float w = 6.02e23l; // 7.3
+  float w1 = 6.02e23L;
+  unsigned long  x = 0xabcul; // 7.3
+  unsigned long x1 = 0xabcuL;
+  unsigned long y = 0xABCUl; // 7.3
+  unsigned long y1 = 0xABCUL;
+  unsigned long z = 0XdeadBeEfUl; // 7.3
+  unsigned long z1 = 0XdeadBeEfUL;
 };
 
 static void misra_7_3(void) {
@@ -727,7 +725,11 @@ static void misra_10_3(uint32_t u32a, uint32_t u32b) {
     res = 0.1f; // 10.3
     const char c = '0'; // no-warning
     bool b = true; // no-warning
-    uint32_t u = UINT32_C(10); // 17.3 no-warning
+    uint32_t u = UINT32_C(10); // no-warning
+    bool b0 = 0; // no-warning
+    bool b1 = 1; // no-warning
+    b = 0; // no-warning
+    b = 1; // no-warning
 }
 
 static void misra_10_4(u32 x, s32 y) {
diff --git a/addons/test/misra_test.py b/addons/test/misra_test.py
index 55a24cb4b27..dc46d8beef8 100644
--- a/addons/test/misra_test.py
+++ b/addons/test/misra_test.py
@@ -11,6 +11,7 @@
 from addons.misra import C11_STDLIB_IDENTIFIERS, C99_STDLIB_IDENTIFIERS,C90_STDLIB_IDENTIFIERS, isStdLibId, isKeyword
 
 TEST_SOURCE_FILES = [os.path.join('addons','test','misra','misra-test.c')]
+REGRESSION_SOURCE_FILE = os.path.join('addons', 'test', 'misra', 'misra-regression-prototypes.c')
 
 
 def remove_misra_config(s:str):
@@ -93,6 +94,20 @@ def test_json_out(checker, capsys, test_files):
     assert("Required" in json_output['c2012-21.3'][0]['extra'])
     assert("Advisory" in json_output['c2012-20.1'][0]['extra'])
 
+def test_function_prototype_and_pointer_call_regressions(checker, capsys):
+    dump_create(REGRESSION_SOURCE_FILE)
+    sys.argv.append("--cli")
+    try:
+        checker.loadRuleTexts("./addons/test/misra/misra_rules_dummy.txt")
+        checker.parseDump(REGRESSION_SOURCE_FILE + ".dump")
+        captured = capsys.readouterr().out
+        json_output = convert_json_output(captured.splitlines())
+        assert "c2012-8.4" not in json_output
+        assert "c2012-17.3" not in json_output
+    finally:
+        sys.argv.remove("--cli")
+        dump_remove(REGRESSION_SOURCE_FILE)
+
 
 def test_rules_cppcheck_severity(checker, capsys, test_files):
     checker.loadRuleTexts("./addons/test/misra/misra_rules_dummy.txt")
diff --git a/addons/test/y2038/y2038-test-compiler-flags.c b/addons/test/y2038/y2038-test-compiler-flags.c
new file mode 100644
index 00000000000..99baa0e1582
--- /dev/null
+++ b/addons/test/y2038/y2038-test-compiler-flags.c
@@ -0,0 +1,25 @@
+/*
+ * Shared test case for Y2038 addon compiler flag testing
+ *
+ * This file tests various compiler flag scenarios:
+ * - Proper Y2038 configuration: -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 -D_USE_TIME_BITS64
+ * - Incorrect _TIME_BITS value: -D_TIME_BITS=32
+ * - Incomplete configuration: -D_USE_TIME_BITS64 (without _TIME_BITS)
+ *
+ * The same source code is used for all scenarios - differentiation happens
+ * through the compiler flags passed to cppcheck during dump creation.
+ */
+
+#include <time.h>
+
+int main(int argc, char **argv)
+{
+    time_t current_time;
+    struct timespec ts;
+
+    current_time = time(NULL);
+    clock_gettime(CLOCK_REALTIME, &ts);
+
+    return 0;
+}
+
diff --git a/addons/test/y2038_test.py b/addons/test/y2038_test.py
index 282e55650d7..861b006d8bf 100644
--- a/addons/test/y2038_test.py
+++ b/addons/test/y2038_test.py
@@ -21,18 +21,28 @@
                      './addons/test/y2038/y2038-test-4-good.c',
                      './addons/test/y2038/y2038-test-5-good-no-time-used.c']
 
+# Build system test file (for testing build system integration)
+BUILD_SYSTEM_TEST_FILE = './addons/test/y2038/y2038-test-buildsystem.c'
+
 
 def setup_module(module):
     sys.argv.append("--cli")
+
+    # Create dumps for regular test files
     for f in TEST_SOURCE_FILES:
         dump_create(f)
 
+    # For build system tests, we'll create dumps on-demand in each test
+    # to avoid conflicts from multiple dump_create calls on the same file
+
 
 def teardown_module(module):
     sys.argv.remove("--cli")
     for f in TEST_SOURCE_FILES:
         dump_remove(f)
 
+    # Build system test dumps are cleaned up individually in each test method
+
 
 def test_1_bad_time_bits(capsys):
     is_safe = check_y2038_safe('./addons/test/y2038/y2038-test-1-bad-time-bits.c.dump', quiet=True)
@@ -107,6 +117,31 @@ def test_5_good(capsys):
         assert(len([c for c in unsafe_calls if c['file'].endswith('.c')]) == 0)
 
 
+def test_build_system_integration():
+    """Test that Y2038 flags are properly parsed from cppcheck dump file configuration"""
+    from addons.y2038 import parse_dump_config
+
+    # Test Y2038-safe configuration string (as cppcheck would generate it)
+    config_string = "_TIME_BITS=64;_FILE_OFFSET_BITS=64;_USE_TIME_BITS64"
+    result = parse_dump_config(config_string)
+    # Y2038-safe flags should be detected
+    assert result['time_bits_defined'] is True
+    assert result['time_bits_value'] == 64
+    assert result['use_time_bits64_defined'] is True
+    assert result['file_offset_bits_defined'] is True
+    assert result['file_offset_bits_value'] == 64
+
+    # Test partial Y2038 configuration
+    partial_config = "_TIME_BITS=32;_FILE_OFFSET_BITS=64"
+    result = parse_dump_config(partial_config)
+    # Should detect the flags with their actual values
+    assert result['time_bits_defined'] is True
+    assert result['time_bits_value'] == 32  # Not Y2038-safe value
+    assert result['use_time_bits64_defined'] is False
+    assert result['file_offset_bits_defined'] is True
+    assert result['file_offset_bits_value'] == 64
+
+
 def test_arguments_regression():
     args_ok = ["-t=foo", "--template=foo",
                "-q", "--quiet",
@@ -137,4 +172,35 @@ def test_arguments_regression():
                 pytest.fail("Unexpected SystemExit with '%s'" % arg)
             sys.argv.remove(arg)
     finally:
-        sys.argv = sys_argv_old
\ No newline at end of file
+        sys.argv = sys_argv_old
+
+
+def test_parse_dump_config():
+    """Test the parse_dump_config function for cppcheck dump file integration"""
+    from addons.y2038 import parse_dump_config
+
+    # Test comprehensive Y2038 configuration
+    full_config = "_TIME_BITS=64;_FILE_OFFSET_BITS=64;_USE_TIME_BITS64;OTHER_FLAG=1"
+    result = parse_dump_config(full_config)
+
+    assert result['time_bits_defined'] is True
+    assert result['time_bits_value'] == 64
+    assert result['use_time_bits64_defined'] is True
+    assert result['file_offset_bits_defined'] is True
+    assert result['file_offset_bits_value'] == 64
+
+    # Test empty configuration
+    result = parse_dump_config("")
+    assert result['time_bits_defined'] is False
+    assert result['time_bits_value'] is None
+    assert result['use_time_bits64_defined'] is False
+    assert result['file_offset_bits_defined'] is False
+    assert result['file_offset_bits_value'] is None
+    # Test Y2038-unsafe configuration
+    unsafe_config = "_TIME_BITS=32;_FILE_OFFSET_BITS=32"
+    result = parse_dump_config(unsafe_config)
+    assert result['time_bits_defined'] is True
+    assert result['time_bits_value'] == 32
+    assert result['use_time_bits64_defined'] is False
+    assert result['file_offset_bits_defined'] is True
+    assert result['file_offset_bits_value'] == 32
\ No newline at end of file
diff --git a/addons/threadsafety.py b/addons/threadsafety.py
index 9475e1a5b0d..390a245d4e1 100755
--- a/addons/threadsafety.py
+++ b/addons/threadsafety.py
@@ -111,6 +111,8 @@
     'cuserid',
     'drand48',
     'ecvt',
+    'elf_fill',
+    'elf_flagelf',
     'encrypt',
     'endfsent',
     'endgrent',
diff --git a/addons/y2038.py b/addons/y2038.py
index 93d237afd06..b17d41dd330 100755
--- a/addons/y2038.py
+++ b/addons/y2038.py
@@ -2,14 +2,33 @@
 #
 # cppcheck addon for Y2038 safeness detection
 #
+# This addon provides comprehensive Y2038 (Year 2038 Problem) detection for C/C++ code.
+# It extracts compiler flags from cppcheck dump file configuration to determine
+# Y2038 safety, suppressing warnings when proper configuration is detected.
+#
+# Key Features:
+# - Extraction of Y2038-related flags from cppcheck dump file configuration
+# - Compiler flag parsing and validation from cppcheck's project parsing
+# - Warning suppression when proper Y2038 configuration is found
+# - Support for both _TIME_BITS=64 and _FILE_OFFSET_BITS=64 requirements
+# - Priority-based flag resolution (dump file configuration > source code directives)
+#
 # Detects:
 #
 # 1. _TIME_BITS being defined to something else than 64 bits
-# 2. _USE_TIME_BITS64 being defined when _TIME_BITS is not
-# 3. Any Y2038-unsafe symbol when _USE_TIME_BITS64 is not defined.
+# 2. _FILE_OFFSET_BITS being defined to something else than 64 bits
+# 3. _USE_TIME_BITS64 being defined when _TIME_BITS is not
+# 4. Any Y2038-unsafe symbol when proper Y2038 configuration is not present
+# 5. Dump file configurations that affect Y2038 safety
+#
+# Warning Suppression:
+# When both _TIME_BITS=64 AND _FILE_OFFSET_BITS=64 are detected (prioritizing dump file
+# configuration over source code directives), Y2038 warnings are suppressed and an
+# informational message is displayed instead.
 #
 # Example usage:
 # $ cppcheck --addon=y2038 path-to-src/test.c
+# $ cppcheck --dump file.c && python3 y2038.py file.c.dump
 #
 
 from __future__ import print_function
@@ -18,13 +37,23 @@
 import sys
 import re
 
+# Y2038 flags are extracted by cppcheck core during project parsing
+# and passed through dump file configuration - no redundant parsing needed
+
+# --------------------------------
+# Y2038 safety constants
+# --------------------------------
+
+# Y2038-safe bit values
+Y2038_SAFE_TIME_BITS = 64
+Y2038_SAFE_FILE_OFFSET_BITS = 64
 
 # --------------------------------------------
 # #define/#undef detection regular expressions
 # --------------------------------------------
 
 # test for '#define _TIME_BITS 64'
-re_define_time_bits_64 = re.compile(r'^\s*#\s*define\s+_TIME_BITS\s+64\s*$')
+re_define_time_bits_64 = re.compile(rf'^\s*#\s*define\s+_TIME_BITS\s+{Y2038_SAFE_TIME_BITS}\s*$')
 
 # test for '#define _TIME_BITS ...' (combine w/ above to test for 'not 64')
 re_define_time_bits = re.compile(r'^\s*#\s*define\s+_TIME_BITS\s+.*$')
@@ -38,6 +67,34 @@
 # test for '#undef _USE_TIME_BITS64' (if it ever happens)
 re_undef_use_time_bits64 = re.compile(r'^\s*#\s*undef\s+_USE_TIME_BITS64\s*$')
 
+# test for '#define _FILE_OFFSET_BITS 64'
+re_define_file_offset_bits_64 = re.compile(rf'^\s*#\s*define\s+_FILE_OFFSET_BITS\s+{Y2038_SAFE_FILE_OFFSET_BITS}\s*$')
+
+# test for '#define _FILE_OFFSET_BITS ...' (combine w/ above to test for 'not 64')
+re_define_file_offset_bits = re.compile(r'^\s*#\s*define\s+_FILE_OFFSET_BITS\s+.*$')
+
+# test for '#undef _FILE_OFFSET_BITS' (if it ever happens)
+re_undef_file_offset_bits = re.compile(r'^\s*#\s*undef\s+_FILE_OFFSET_BITS\s*$')
+
+# --------------------------------------------
+# Compiler flag parsing regular expressions
+# --------------------------------------------
+
+# test for '_TIME_BITS=64' in compiler flags
+re_flag_time_bits_64 = re.compile(rf'_TIME_BITS={Y2038_SAFE_TIME_BITS}(?:\s|$|;)')
+
+# test for '_TIME_BITS=...' in compiler flags (combine w/ above to test for 'not 64')
+re_flag_time_bits = re.compile(r'_TIME_BITS=(\d+)')
+
+# test for '_USE_TIME_BITS64' in compiler flags
+re_flag_use_time_bits64 = re.compile(r'_USE_TIME_BITS64(?:\s|$|=|;)')
+
+# test for '_FILE_OFFSET_BITS=64' in compiler flags
+re_flag_file_offset_bits_64 = re.compile(rf'_FILE_OFFSET_BITS={Y2038_SAFE_FILE_OFFSET_BITS}(?:\s|$|;)')
+
+# test for '_FILE_OFFSET_BITS=...' in compiler flags
+re_flag_file_offset_bits = re.compile(r'_FILE_OFFSET_BITS=(\d+)')
+
 # --------------------------------
 # List of Y2038-unsafe identifiers
 # --------------------------------
@@ -147,13 +204,142 @@
 }
 
 
+
+
+
+
+
+
+
+def parse_dump_config(config_name):
+    """
+    Parse Y2038-related flags from cppcheck dump file configuration name.
+    
+    This function analyzes the cppcheck dump file configuration name (which contains 
+    preprocessor definitions extracted by cppcheck from project files like compile_commands.json)
+    to extract Y2038-related definitions. It looks for _TIME_BITS, _USE_TIME_BITS64, and 
+    _FILE_OFFSET_BITS definitions and validates their values.
+
+    Args:
+        config_name (str): The cppcheck configuration name from dump file
+                          (e.g., "_TIME_BITS=64;_FILE_OFFSET_BITS=64")
+
+    Returns:
+        dict: Dictionary containing Y2038-related flag information with keys:
+            - 'time_bits_defined' (bool): Whether _TIME_BITS is defined
+            - 'time_bits_value' (int|None): Value of _TIME_BITS (None if not defined)
+            - 'use_time_bits64_defined' (bool): Whether _USE_TIME_BITS64 is defined
+            - 'file_offset_bits_defined' (bool): Whether _FILE_OFFSET_BITS is defined
+            - 'file_offset_bits_value' (int|None): Value of _FILE_OFFSET_BITS (None if not defined)
+
+    Example:
+        >>> parse_dump_config("_TIME_BITS=64;_FILE_OFFSET_BITS=64")
+        {
+            'time_bits_defined': True,
+            'time_bits_value': 64,
+            'use_time_bits64_defined': False,
+            'file_offset_bits_defined': True,
+            'file_offset_bits_value': 64
+        }
+    """
+    result = {
+        'time_bits_defined': False,
+        'time_bits_value': None,
+        'use_time_bits64_defined': False,
+        'file_offset_bits_defined': False,
+        'file_offset_bits_value': None
+    }
+
+    if not config_name:
+        return result
+
+    try:
+        # Check for _TIME_BITS=64 (correct value)
+        if re_flag_time_bits_64.search(config_name):
+            result['time_bits_defined'] = True
+            result['time_bits_value'] = Y2038_SAFE_TIME_BITS
+        else:
+            # Check for _TIME_BITS=other_value
+            match = re_flag_time_bits.search(config_name)
+            if match:
+                result['time_bits_defined'] = True
+                try:
+                    result['time_bits_value'] = int(match.group(1))
+                except (ValueError, IndexError):
+                    # Malformed _TIME_BITS value, treat as undefined
+                    result['time_bits_defined'] = False
+                    result['time_bits_value'] = None
+
+        # Check for _USE_TIME_BITS64
+        if re_flag_use_time_bits64.search(config_name):
+            result['use_time_bits64_defined'] = True
+
+        # Check for _FILE_OFFSET_BITS=64 (correct value)
+        if re_flag_file_offset_bits_64.search(config_name):
+            result['file_offset_bits_defined'] = True
+            result['file_offset_bits_value'] = Y2038_SAFE_FILE_OFFSET_BITS
+        else:
+            # Check for _FILE_OFFSET_BITS=other_value
+            match = re_flag_file_offset_bits.search(config_name)
+            if match:
+                result['file_offset_bits_defined'] = True
+                try:
+                    result['file_offset_bits_value'] = int(match.group(1))
+                except (ValueError, IndexError):
+                    # Malformed _FILE_OFFSET_BITS value, treat as undefined
+                    result['file_offset_bits_defined'] = False
+                    result['file_offset_bits_value'] = None
+
+    except (AttributeError, TypeError, ValueError):
+        # If any unexpected error occurs during parsing, return empty result
+        # This ensures the addon continues to work even with malformed configurations
+        # Note: We catch specific exceptions rather than broad Exception for better debugging
+        pass
+
+    return result
+
+
 def check_y2038_safe(dumpfile, quiet=False):
+    """
+    Main function to check Y2038 safety of C/C++ code from cppcheck dump files.
+
+    This function performs comprehensive Y2038 analysis including:
+    1. Extraction of Y2038-related compiler flags from cppcheck dump file configuration
+    2. Analysis of source code preprocessor directives
+    3. Warning suppression when proper Y2038 configuration is detected
+    4. Reporting of Y2038-unsafe symbols and configurations
+
+    The function implements a priority-based approach for Y2038 flag detection:
+    - Dump file configuration (from cppcheck's project parsing - highest priority)
+    - Source code #define directives (fallback)
+
+    Warning suppression occurs when both _TIME_BITS=64 AND _FILE_OFFSET_BITS=64
+    are detected from any source. When warnings are suppressed, an informational
+    message is displayed indicating the configuration source and suppression count.
+
+    Args:
+        dumpfile (str): Path to the cppcheck XML dump file (.dump extension)
+        quiet (bool, optional): If True, suppress informational messages. Defaults to False.
+
+    Returns:
+        bool: True if code is Y2038-safe, False if Y2038 issues were detected
+
+    Raises:
+        Exception: May raise exceptions from cppcheckdata parsing or file I/O operations
+
+    Example:
+        >>> check_y2038_safe("test.c.dump")  # Normal operation
+        True
+        >>> check_y2038_safe("test.c.dump", quiet=True)  # Suppress info messages
+        False
+    """
     # Assume that the code is Y2038 safe until proven otherwise
     y2038safe = True
     # load XML from .dump file
     data = cppcheckdata.CppcheckData(dumpfile)
 
     srcfile = data.files[0]
+
     for cfg in data.iterconfigurations():
         if not quiet:
             print('Checking %s, config %s...' % (srcfile, cfg.name))
@@ -162,56 +348,231 @@ def check_y2038_safe(dumpfile, quiet=False):
         time_bits_defined = False
         srclinenr = 0
 
+        # Priority-based flag detection: dump file configuration > source code directives
+        # 1. Check dump file configuration (from cppcheck's project parsing - highest priority)
+        dump_config_flags = parse_dump_config(cfg.name)
+        # Initialize effective flags with dump file configuration
+        effective_flags = {
+            'time_bits_defined': dump_config_flags['time_bits_defined'],
+            'time_bits_value': dump_config_flags['time_bits_value'],
+            'use_time_bits64_defined': dump_config_flags['use_time_bits64_defined'],
+            'file_offset_bits_defined': dump_config_flags['file_offset_bits_defined'],
+            'file_offset_bits_value': dump_config_flags['file_offset_bits_value']
+        }
+
+        # Determine configuration source for reporting
+        config_source = None
+        has_dump_config = (dump_config_flags['time_bits_defined'] or
+                          dump_config_flags['file_offset_bits_defined'] or
+                          dump_config_flags['use_time_bits64_defined'])
+        if has_dump_config:
+            config_source = "cppcheck configuration"
+
+        # Track time_bits_defined for _USE_TIME_BITS64 validation
+        time_bits_defined = effective_flags['time_bits_defined']
+
+        # Check effective _TIME_BITS value (from dump file configuration)
+        if effective_flags['time_bits_defined']:
+            if effective_flags['time_bits_value'] != Y2038_SAFE_TIME_BITS:
+                fake_directive = type('FakeDirective', (), {
+                    'file': srcfile, 'linenr': 0, 'column': 0,
+                    'str': 'cppcheck configuration: _TIME_BITS=%s' % effective_flags['time_bits_value']
+                })()
+                cppcheckdata.reportError(fake_directive, 'error',
+                                         '_TIME_BITS must be defined equal to 64 (found in cppcheck configuration: _TIME_BITS=%s)' % effective_flags['time_bits_value'],
+                                         'y2038',
+                                         'type-bits-not-64')
+                y2038safe = False
+
+        # Check effective _FILE_OFFSET_BITS value (from dump file configuration)
+        if effective_flags['file_offset_bits_defined']:
+            if effective_flags['file_offset_bits_value'] != Y2038_SAFE_FILE_OFFSET_BITS:
+                fake_directive = type('FakeDirective', (), {
+                    'file': srcfile, 'linenr': 0, 'column': 0,
+                    'str': 'cppcheck configuration: _FILE_OFFSET_BITS=%s' % effective_flags['file_offset_bits_value']
+                })()
+                cppcheckdata.reportError(fake_directive, 'error',
+                                         '_FILE_OFFSET_BITS must be defined equal to 64 (found in cppcheck configuration: _FILE_OFFSET_BITS=%s)' % effective_flags['file_offset_bits_value'],
+                                         'y2038',
+                                         'file-offset-bits-not-64')
+                y2038safe = False
+
+        # Check effective _USE_TIME_BITS64 (from dump file configuration)
+        if effective_flags['use_time_bits64_defined']:
+            if not time_bits_defined:
+                # _USE_TIME_BITS64 defined without _TIME_BITS is problematic
+                fake_directive = type('FakeDirective', (), {
+                    'file': srcfile, 'linenr': 0, 'column': 0,
+                    'str': 'cppcheck configuration: _USE_TIME_BITS64'
+                })()
+                cppcheckdata.reportError(fake_directive, 'warning',
+                                         '_USE_TIME_BITS64 is defined in cppcheck configuration but _TIME_BITS was not',
+                                         'y2038',
+                                         'type-bits-undef')
+                y2038safe = False
+            else:
+                # _USE_TIME_BITS64 defined WITH _TIME_BITS - this is correct
+                safe = 0  # Start of file is safe
+
+        # 2. Fallback to source code directives when dump file configuration is not available
+        source_time_bits_defined = False  # pylint: disable=unused-variable
+        source_file_offset_bits_defined = False  # pylint: disable=unused-variable
+        source_file_offset_bits_value = None  # pylint: disable=unused-variable
+        source_use_time_bits64_defined = False  # pylint: disable=unused-variable
+
+        # Track which flags came from source code for mixed scenario reporting
+        source_flags_used = {
+            'time_bits': False,
+            'file_offset_bits': False,
+            'use_time_bits64': False
+        }
         for directive in cfg.directives:
             # track source line number
             if directive.file == srcfile:
                 srclinenr = directive.linenr
+
+            # Process source code directives as fallback when dump config is not available
             # check for correct _TIME_BITS if present
             if re_define_time_bits_64.match(directive.str):
-                time_bits_defined = True
+                source_time_bits_defined = True
+                # Only use source directive if dump config doesn't define _TIME_BITS
+                if not effective_flags['time_bits_defined']:
+                    effective_flags['time_bits_defined'] = True
+                    effective_flags['time_bits_value'] = Y2038_SAFE_TIME_BITS
+                    time_bits_defined = True
+                    source_flags_used['time_bits'] = True
             elif re_define_time_bits.match(directive.str):
-                cppcheckdata.reportError(directive, 'error',
-                                         '_TIME_BITS must be defined equal to 64',
-                                         'y2038',
-                                         'type-bits-not-64')
-                time_bits_defined = False
-                y2038safe = False
+                source_time_bits_defined = False
+                # Only use source directive if dump config doesn't define _TIME_BITS
+                if not effective_flags['time_bits_defined']:
+                    source_flags_used['time_bits'] = True
+                    cppcheckdata.reportError(directive, 'error',
+                                             '_TIME_BITS must be defined equal to 64',
+                                             'y2038',
+                                             'type-bits-not-64')
+                    y2038safe = False
             elif re_undef_time_bits.match(directive.str):
-                time_bits_defined = False
+                source_time_bits_defined = False
+                # Only use source directive if dump config doesn't define _TIME_BITS
+                if not effective_flags['time_bits_defined']:
+                    time_bits_defined = False
+                    source_flags_used['time_bits'] = True
+            # check for correct _FILE_OFFSET_BITS if present
+            if re_define_file_offset_bits_64.match(directive.str):
+                source_file_offset_bits_defined = True
+                source_file_offset_bits_value = Y2038_SAFE_FILE_OFFSET_BITS
+                # Only use source directive if dump config doesn't define _FILE_OFFSET_BITS
+                if not effective_flags['file_offset_bits_defined']:
+                    effective_flags['file_offset_bits_defined'] = True
+                    effective_flags['file_offset_bits_value'] = Y2038_SAFE_FILE_OFFSET_BITS
+                    source_flags_used['file_offset_bits'] = True
+            elif re_define_file_offset_bits.match(directive.str):
+                source_file_offset_bits_defined = False
+                # Only use source directive if dump config doesn't define _FILE_OFFSET_BITS
+                if not effective_flags['file_offset_bits_defined']:
+                    source_flags_used['file_offset_bits'] = True
+                    cppcheckdata.reportError(directive, 'error',
+                                             '_FILE_OFFSET_BITS must be defined equal to 64',
+                                             'y2038',
+                                             'file-offset-bits-not-64')
+                    y2038safe = False
+            elif re_undef_file_offset_bits.match(directive.str):
+                source_file_offset_bits_defined = False
+                source_file_offset_bits_value = None
+                # Only use source directive if dump config doesn't define _FILE_OFFSET_BITS
+                if not effective_flags['file_offset_bits_defined']:
+                    effective_flags['file_offset_bits_defined'] = False
+                    effective_flags['file_offset_bits_value'] = None
+                    source_flags_used['file_offset_bits'] = True
+
             # check for _USE_TIME_BITS64 (un)definition
             if re_define_use_time_bits64.match(directive.str):
                 safe = int(srclinenr)
-                # warn about _TIME_BITS not being defined
-                if not time_bits_defined:
-                    cppcheckdata.reportError(directive, 'warning',
-                                             '_USE_TIME_BITS64 is defined but _TIME_BITS was not',
-                                             'y2038',
-                                             'type-bits-undef')
+                source_use_time_bits64_defined = True
+                # Only use source directive if dump config doesn't define _USE_TIME_BITS64
+                if not effective_flags['use_time_bits64_defined']:
+                    effective_flags['use_time_bits64_defined'] = True
+                    source_flags_used['use_time_bits64'] = True
+                    # warn about _TIME_BITS not being defined (check effective flags)
+                    if not time_bits_defined:
+                        cppcheckdata.reportError(directive, 'warning',
+                                                 '_USE_TIME_BITS64 is defined but _TIME_BITS was not',
+                                                 'y2038',
+                                                 'type-bits-undef')
             elif re_undef_use_time_bits64.match(directive.str):
                 unsafe = int(srclinenr)
+                source_use_time_bits64_defined = False
+                # Only use source directive if dump config doesn't define _USE_TIME_BITS64
+                if not effective_flags['use_time_bits64_defined']:
+                    source_flags_used['use_time_bits64'] = True
                 # do we have a safe..unsafe area?
-                if unsafe > safe > 0:
+                if unsafe > safe >= 0:
                     safe_ranges.append((safe, unsafe))
                     safe = -1
 
         # check end of source beyond last directive
         if len(cfg.tokenlist) > 0:
             unsafe = int(cfg.tokenlist[-1].linenr)
-            if unsafe > safe > 0:
+            if unsafe > safe >= 0:
                 safe_ranges.append((safe, unsafe))
 
+        # Determine if Y2038 warnings should be suppressed
+        # Require BOTH _TIME_BITS=64 AND _FILE_OFFSET_BITS=64 for complete Y2038 safety
+        y2038_safe_config = (
+            effective_flags['time_bits_defined'] and
+            effective_flags['time_bits_value'] == Y2038_SAFE_TIME_BITS and
+            effective_flags['file_offset_bits_defined'] and
+            effective_flags['file_offset_bits_value'] == Y2038_SAFE_FILE_OFFSET_BITS
+        )
+
+        # Update config_source for suppression reporting based on mixed scenarios
+        if y2038_safe_config:
+            # Determine configuration source for mixed scenarios
+            dump_flags_count = sum([
+                dump_config_flags['time_bits_defined'],
+                dump_config_flags['file_offset_bits_defined'],
+                dump_config_flags['use_time_bits64_defined']
+            ])
+            source_flags_count = sum(source_flags_used.values())
+
+            if dump_flags_count > 0 and source_flags_count > 0:
+                # Mixed scenario: both dump config and source directives used
+                config_source = "mixed configuration (cppcheck configuration and source code directives)"
+            elif dump_flags_count > 0:
+                # Only dump config used
+                config_source = "cppcheck configuration"
+            elif source_flags_count > 0:
+                # Only source directives used
+                config_source = "source code directives"
+            else:
+                # Fallback (shouldn't happen if y2038_safe_config is True)
+                config_source = "configuration"
+
         # go through all tokens
+        warnings_suppressed = 0
         for token in cfg.tokenlist:
             if token.str in id_Y2038:
-                if not any(lower <= int(token.linenr) <= upper
-                           for (lower, upper) in safe_ranges):
-                    cppcheckdata.reportError(token, 'warning',
-                                             token.str + ' is Y2038-unsafe',
-                                             'y2038',
-                                             'unsafe-call')
-                    y2038safe = False
+                is_in_safe_range = any(lower <= int(token.linenr) <= upper
+                                     for (lower, upper) in safe_ranges)
+
+                if not is_in_safe_range:
+                    if y2038_safe_config:
+                        # Count suppressed warnings but don't report them
+                        warnings_suppressed += 1
+                    else:
+                        # Report the warning as before
+                        cppcheckdata.reportError(token, 'warning',
+                                                 token.str + ' is Y2038-unsafe',
+                                                 'y2038',
+                                                 'unsafe-call')
+                        y2038safe = False
             token = token.next
 
+        # Print suppression message if warnings were suppressed
+        if warnings_suppressed > 0 and config_source and not quiet:
+            print('Y2038 warnings suppressed: Found proper Y2038 configuration in %s (_TIME_BITS=%d and _FILE_OFFSET_BITS=%d)' % (config_source, Y2038_SAFE_TIME_BITS, Y2038_SAFE_FILE_OFFSET_BITS))
+            print('Suppressed %d Y2038-unsafe function warning(s)' % warnings_suppressed)
+
     return y2038safe
 
 
diff --git a/cfg/boost.cfg b/cfg/boost.cfg
index d181860f0bc..b09d9ccd9e5 100644
--- a/cfg/boost.cfg
+++ b/cfg/boost.cfg
@@ -83,12 +83,12 @@
   <define name="BOOST_MATH_INT_TABLE_TYPE" value=""/>
   <define name="BOOST_MATH_INT_VALUE_SUFFIX" value=""/>
   <!-- Tell cppcheck to interpret BOOST_AUTO_TEST_CASE as a function definition -->
-  <define name="BOOST_AUTO_TEST_CASE(...)" value="void BOOST_AUTO_TEST_CASE_run(__VA_ARGS__)"/>
+  <define name="BOOST_AUTO_TEST_CASE(test_name, ...)" value="void BOOST_AUTO_TEST_CASE_run ## test_name ()"/>
   <define name="BOOST_AUTO_TEST_CASE_TEMPLATE(test_name, type_name, TL)" value="template&lt;typename type_name&gt;void test_name()"/>
   <define name="BOOST_FIXTURE_TEST_CASE(name, fixture, ...)" value="struct name : fixture { void test_method(); }; void name::test_method()" />
   <define name="BOOST_FIXTURE_TEST_CASE_TEMPLATE(test_name, type_name, TL, F)" value="template&lt;typename type_name&gt; struct test_name : public F { void test_method(); }; template&lt;typename type_name&gt; void test_name&lt;type_name&gt;::test_method()" />
-  <define name="BOOST_DATA_TEST_CASE(...)" value="void BOOST_DATA_TEST_CASE_run(__VA_ARGS__)"/>
-  <define name="BOOST_DATA_TEST_CASE_F(...)" value="void BOOST_DATA_TEST_CASE_F_run(__VA_ARGS__)"/>
+  <define name="BOOST_DATA_TEST_CASE(test_name, ...)" value="void BOOST_DATA_TEST_CASE_run ## test_name ()"/>
+  <define name="BOOST_DATA_TEST_CASE_F(test_name, ...)" value="void BOOST_DATA_TEST_CASE_F_run ## test_name ()"/>
   <define name="BOOST_PYTHON_MODULE(str)" value="void BOOST_PYTHON_MODULE_definition(str)"/>
   <define name="BOOST_SCOPED_ENUM_DECLARE_BEGIN(x)" value=""/>
   <define name="BOOST_SCOPED_ENUM_DECLARE_END(x)" value=""/>
diff --git a/cfg/cairo.cfg b/cfg/cairo.cfg
index e077c2fc40d..d766abffc2e 100644
--- a/cfg/cairo.cfg
+++ b/cfg/cairo.cfg
@@ -21,6 +21,7 @@
   <define name="CAIRO_MIME_TYPE_PNG" value="&quot;image/png&quot;"/>
   <define name="CAIRO_MIME_TYPE_URI" value="&quot;text/x-uri&quot;"/>
   <define name="CAIRO_MIME_TYPE_UNIQUE_ID" value="&quot;application/x-cairo.uuid&quot;"/>
+  <define name="CAIRO_VERSION_ENCODE(major, minor, micro)" value="(((major) * 10000) + ((minor) * 100) + ((micro) * 1))"/>
   <!-- ########## cairo Allocation / Deallocation ########## -->
   <!-- ########## cairo Functions ########## -->
   <!-- cairo_t * cairo_create (cairo_surface_t *target); -->
diff --git a/cfg/googletest.cfg b/cfg/googletest.cfg
index 36dd8a40669..c32eef7274b 100644
--- a/cfg/googletest.cfg
+++ b/cfg/googletest.cfg
@@ -29,11 +29,11 @@
   <define name="EXPECT_THROW(code, e)" value="try{code;}catch(e){}"/>
   <define name="ASSERT_NO_THROW(code)" value="code"/>
   <define name="EXPECT_NO_THROW(code)" value="code"/>
-  <define name="TEST(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TEST_F(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TEST_P(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TYPED_TEST(A,B)" value="void __ ## A ## _ ## B ( )"/>
-  <define name="TYPED_TEST_P(A,B)" value="void __ ## A ## _ ## B ( )"/>
+  <define name="TEST(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TEST_F(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TEST_P(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TYPED_TEST(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
+  <define name="TYPED_TEST_P(A,B)" value="class __ ## A ## _ ## B { public: static void testBody( ); }; __ ## A ## _ ## B::testBody()"/>
   <define name="GTEST_API_" value=""/>
   <define name="GTEST_FLAG(name)" value="FLAGS_gtest_##name"/>
   <define name="GTEST_DECLARE_bool_(name)" value="GTEST_API_ extern bool GTEST_FLAG(name)"/>
diff --git a/cfg/gtk.cfg b/cfg/gtk.cfg
index 722efb6b76b..a1d7763670e 100644
--- a/cfg/gtk.cfg
+++ b/cfg/gtk.cfg
@@ -4,16 +4,30 @@
 <def format="2">
   <define name="TRUE" value="(!FALSE)"/>
   <define name="FALSE" value="(0)"/>
-  <define name="g_return_if_fail(expr)" value="do{if(!(expr)){return;}}while(0);"/>
-  <define name="g_return_val_if_fail(expr,val)" value="do{if(!(expr)){return (val);}}while(0);"/>
-  <define name="g_return_if_reached()" value="do{return;}while(0);"/>
-  <define name="g_return_val_if_reached(val)" value="do{return (val);}while(0);"/>
+  <define name="g_return_if_fail(expr)" value="do{if(!(expr)){return;}}while(0)"/>
+  <define name="g_return_val_if_fail(expr,val)" value="do{if(!(expr)){return (val);}}while(0)"/>
+  <define name="g_return_if_reached()" value="do{return;}while(0)"/>
+  <define name="g_return_val_if_reached(val)" value="do{return (val);}while(0)"/>
   <define name="G_CALLBACK(cb)" value="cb"/>
   <define name="GTK_SIGNAL_FUNC(f)" value="G_CALLBACK(f)"/>
+  <define name="G_DIR_SEPARATOR_S" value="&quot;/&quot;"/>
+  <define name="G_GINT32_FORMAT" value="&quot;i&quot;"/>
+  <define name="G_GINT32_MODIFIER" value="&quot;&quot;"/>
+  <define name="G_GINT64_FORMAT" value="&quot;li&quot;"/>
+  <define name="G_GINT64_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_GSIZE_FORMAT" value="&quot;lu&quot;"/>
+  <define name="G_GSIZE_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_GSSIZE_FORMAT" value="&quot;li&quot;"/>
+  <define name="G_GSSIZE_MODIFIER" value="&quot;l&quot;"/>
+  <define name="G_GUINT32_FORMAT" value="&quot;u&quot;"/>
+  <define name="G_GUINT64_FORMAT" value="&quot;lu&quot;"/>
   <!-- https://developer.gnome.org/glib/stable/glib-Miscellaneous-Macros.html -->
   <!-- https://github.com/GNOME/glib/blob/master/glib/gmacros.h -->
+  <define name="G_GNUC_CHECK_VERSION(major, minor)" value="1"/>
   <define name="G_GNUC_BEGIN_IGNORE_DEPRECATIONS" value=""/>
   <define name="G_GNUC_END_IGNORE_DEPRECATIONS" value=""/>
+  <define name="G_GNUC_DEPRECATED" value="__attribute__((__deprecated__))"/>
+  <define name="G_GNUC_DEPRECATED_FOR(f)" value="__attribute__((deprecated(&quot;Use &quot; #f &quot; instead&quot;)))"/>
   <define name="G_GNUC_PRETTY_FUNCTION" value="__PRETTY_FUNCTION__"/>
   <define name="G_GNUC_PURE" value="__attribute__((__pure__))"/>
   <define name="G_GNUC_MALLOC" value="__attribute__((__malloc__))"/>
@@ -78,6 +92,7 @@
   <define name="G_LIKELY(expr)" value="(expr)"/>
   <define name="G_UNLIKELY(expr)" value="(expr)"/>
   <define name="G_DEPRECATED" value="__attribute__((__deprecated__))"/>
+  <define name="G_DEPRECATED_FOR(f)" value="__attribute__((__deprecated__(&quot;Use '&quot; #f &quot;' instead&quot;)))"/>
   <define name="G_STMT_START" value="do"/>
   <define name="G_STMT_END" value="while (0)"/>
   <define name="_G_TYPE_CIC(ip, gt, ct)" value="((ct*) ip)"/>
@@ -112,6 +127,7 @@
   <define name="g_try_new(struct_type, n_structs)" value="_G_NEW (struct_type, n_structs, try_malloc)"/>
   <define name="g_try_new0(struct_type, n_structs)" value="_G_NEW (struct_type, n_structs, try_malloc0)"/>
   <define name="g_try_renew(struct_type, mem, n_structs)" value="_G_RENEW (struct_type, mem, n_structs, try_realloc)"/>
+  <define name="G_ENCODE_VERSION(major, minor)" value="((major) &lt;&lt; 16 | (minor) &lt;&lt; 8)"/>
   <define name="GTK_BUTTON(obj)" value="((GtkButton*)(obj))"/>
   <define name="GTK_BOX(obj)" value="((GtkBox*)(obj))"/>
   <define name="GTK_CONTAINER(obj)" value="((GtkContainer*)(obj))"/>
@@ -234,6 +250,86 @@
   <define name="G_VARIANT_TYPE_BYTESTRING_ARRAY" value="((const GVariantType *) &quot;aay&quot;)"/>
   <define name="G_VARIANT_TYPE_VARDICT" value="((const GVariantType *) &quot;a{sv}&quot;)"/>
   <define name="G_VARIANT_TYPE(s)" value="((const GVariantType *) (s))"/>
+  <!-- gio/gfileinfo.h -->
+  <define name="G_FILE_ATTRIBUTE_STANDARD_TYPE" value="&quot;standard::type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN" value="&quot;standard::is-hidden&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP" value="&quot;standard::is-backup&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK" value="&quot;standard::is-symlink&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL" value="&quot;standard::is-virtual&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_IS_VOLATILE" value="&quot;standard::is-volatile&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_NAME" value="&quot;standard::name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME" value="&quot;standard::display-name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME" value="&quot;standard::edit-name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_COPY_NAME" value="&quot;standard::copy-name&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION" value="&quot;standard::description&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_ICON" value="&quot;standard::icon&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON" value="&quot;standard::symbolic-icon&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE" value="&quot;standard::content-type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE" value="&quot;standard::fast-content-type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SIZE" value="&quot;standard::size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE" value="&quot;standard::allocated-size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET" value="&quot;standard::symlink-target&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_TARGET_URI" value="&quot;standard::target-uri&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER" value="&quot;standard::sort-order&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ETAG_VALUE" value="&quot;etag::value&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ID_FILE" value="&quot;id::file&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ID_FILESYSTEM" value="&quot;id::filesystem&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_READ" value="&quot;access::can-read&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE" value="&quot;access::can-write&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE" value="&quot;access::can-execute&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE" value="&quot;access::can-delete&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH" value="&quot;access::can-trash&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME" value="&quot;access::can-rename&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT" value="&quot;mountable::can-mount&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT" value="&quot;mountable::can-unmount&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT" value="&quot;mountable::can-eject&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE" value="&quot;mountable::unix-device&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE" value="&quot;mountable::unix-device-file&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI" value="&quot;mountable::hal-udi&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED" value="&quot;time::modified&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC" value="&quot;time::modified-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED_NSEC" value="&quot;time::modified-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_ACCESS" value="&quot;time::access&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_ACCESS_USEC" value="&quot;time::access-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_ACCESS_NSEC" value="&quot;time::access-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CHANGED" value="&quot;time::changed&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CHANGED_USEC" value="&quot;time::changed-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CHANGED_NSEC" value="&quot;time::changed-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CREATED" value="&quot;time::created&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CREATED_USEC" value="&quot;time::created-usec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CREATED_NSEC" value="&quot;time::created-nsec&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_DEVICE" value="&quot;unix::device&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_INODE" value="&quot;unix::inode&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_MODE" value="&quot;unix::mode&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_NLINK" value="&quot;unix::nlink&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_UID" value="&quot;unix::uid&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_GID" value="&quot;unix::gid&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_RDEV" value="&quot;unix::rdev&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE" value="&quot;unix::block-size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_BLOCKS" value="&quot;unix::blocks&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT" value="&quot;unix::is-mountpoint&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE" value="&quot;dos::is-archive&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_IS_SYSTEM" value="&quot;dos::is-system&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_IS_MOUNTPOINT" value="&quot;dos::is-mountpoint&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_DOS_REPARSE_POINT_TAG" value="&quot;dos::reparse-point-tag&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_OWNER_USER" value="&quot;owner::user&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_OWNER_USER_REAL" value="&quot;owner::user-real&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_OWNER_GROUP" value="&quot;owner::group&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_THUMBNAIL_PATH" value="&quot;thumbnail::path&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_THUMBNAILING_FAILED" value="&quot;thumbnail::failed&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_PREVIEW_ICON" value="&quot;preview::icon&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_SIZE" value="&quot;filesystem::size&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_FREE" value="&quot;filesystem::free&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_TYPE" value="&quot;filesystem::type&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_READONLY" value="&quot;filesystem::readonly&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW" value="&quot;filesystem::use-preview&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE" value="&quot;filesystem::remote&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_GVFS_BACKEND" value="&quot;gvfs::backend&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_SELINUX_CONTEXT" value="&quot;selinux::context&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT" value="&quot;trash::item-count&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TRASH_ORIG_PATH" value="&quot;trash::orig-path&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_TRASH_DELETION_DATE" value="&quot;trash::deletion-date&quot;"/>
+  <define name="G_FILE_ATTRIBUTE_RECENT_MODIFIED" value="&quot;recent::modified&quot;"/>
   <memory>
     <alloc init="true" no-fail="true">g_thread_new</alloc>
     <alloc init="true" no-fail="false">g_thread_try_new</alloc>
@@ -807,7 +903,6 @@
     <alloc init="true" no-fail="true">g_app_info_get_default_for_uri_scheme</alloc>
     <alloc init="true" no-fail="true">g_application_new</alloc>
     <alloc init="true" no-fail="true">g_application_get_dbus_connection</alloc>
-    <alloc init="true" no-fail="true">g_application_get_default</alloc>
     <alloc init="true" no-fail="true">g_buffered_input_stream_new</alloc>
     <alloc init="true" no-fail="true">g_buffered_output_stream_new</alloc>
     <alloc init="true" no-fail="true">g_cancellable_new</alloc>
@@ -910,7 +1005,6 @@
     <alloc init="true" no-fail="true">g_zlib_decompressor_new</alloc>
     <use>g_object_ref</use>
     <dealloc>g_object_unref</dealloc>
-    <dealloc>gtk_widget_destroy</dealloc>
   </memory>
   <memory>
     <alloc init="true" no-fail="true">g_tree_new</alloc>
@@ -926,6 +1020,17 @@
     <use>g_file_attribute_matcher_ref</use>
     <dealloc>g_file_attribute_matcher_unref</dealloc>
   </memory>
+  <memory>
+    <alloc init="true" no-fail="true">gtk_window_new</alloc>
+    <dealloc>gtk_widget_destroy</dealloc>
+    <dealloc>gtk_window_destroy</dealloc>
+  </memory>
+  <function name="g_application_get_default">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <returnValue type="GApplication *"/>
+    <use-retval/>
+  </function>
   <function name="g_exit">
     <noreturn>true</noreturn>
   </function>
@@ -2148,6 +2253,7 @@
   </function>
   <!-- GList * g_list_find (GList *list, gconstpointer data); -->
   <function name="g_list_find">
+    <pure/>
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="GList"/>
@@ -6483,6 +6589,7 @@
   </function>
   <!-- gboolean g_error_matches(const GError *error, GQuark domain, gint code); -->
   <function name="g_error_matches">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="gboolean"/>
     <use-retval/>
@@ -8761,7 +8868,7 @@
   <function name="g_variant_builder_init">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
     <arg nr="2" direction="in">
@@ -9688,6 +9795,14 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gtk3: GtkWidget * gtk_window_new(GtkWindowType type)
+       gtk4: GtkWidget * gtk_window_new() -->
+  <function name="gtk_window_new">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="GtkWidget *"/>
+    <arg nr="1" direction="in" default="0"/>
+  </function>
   <function name="gtk_window_list_toplevels">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -21130,10 +21245,6 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="gtk_widget_destroy">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="gtk_widget_destroyed">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -21790,6 +21901,13 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <function name="gtk_window_destroy">
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
   <function name="gtk_window_fullscreen">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -22967,6 +23085,13 @@
   <define name="GTK_IMAGE_ICON_NAME" value="1"/>
   <define name="GTK_IMAGE_GICON" value="2"/>
   <define name="GTK_IMAGE_PAINTABLE" value="3"/>
+  <!-- gtk/gtklevelbar.h -->
+  <define name="GTK_LEVEL_BAR_OFFSET_FULL" value="&quot;full&quot;"/>
+  <define name="GTK_LEVEL_BAR_OFFSET_HIGH" value="&quot;high&quot;"/>
+  <define name="GTK_LEVEL_BAR_OFFSET_LOW" value="&quot;low&quot;"/>
+  <!-- gtk/gtkwindow.h -->
+  <define name="GTK_WINDOW_TOPLEVEL" value="0"/>
+  <define name="GTK_WINDOW_POPUP" value="1"/>
   <!-- gtk/gtk.h -->
   <define name="GTK_STOCK_ZOOM_IN" value="&quot;gtk-zoom-in&quot;"/>
   <define name="GTK_STOCK_ZOOM_FIT" value="&quot;gtk-zoom-fit&quot;"/>
@@ -23079,4 +23204,8 @@
   <define name="GTK_PRIORITY_HIGH" value="G_PRIORITY_HIGH"/>
   <define name="GTK_PRIORITY_RESIZE" value="(G_PRIORITY_HIGH_IDLE+10)"/>
   <define name="GTK_PRIORITY_REDRAW" value="(G_PRIORITY_HIGH_IDLE+20)"/>
+  <!-- version check for GLib, ATK and GTK -->
+  <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
+  <define name="ATK_CHECK_VERSION(major, minor, micro)" value="1"/>
+  <define name="GTK_CHECK_VERSION(major, minor, micro)" value="1"/>
 </def>
diff --git a/cfg/libcurl.cfg b/cfg/libcurl.cfg
index 381fbb237d7..949b6de0282 100644
--- a/cfg/libcurl.cfg
+++ b/cfg/libcurl.cfg
@@ -167,7 +167,7 @@
     <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3" direction="in">
+    <arg nr="3" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
diff --git a/cfg/microsoft_gsl.cfg b/cfg/microsoft_gsl.cfg
new file mode 100644
index 00000000000..07fbfcb74a6
--- /dev/null
+++ b/cfg/microsoft_gsl.cfg
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<def>
+  <define name="Expects(x)" value=""/>
+  <define name="Ensures(x)" value=""/>
+  <define name="GSL_SUPPRESS(x)" value=""/>
+  <podtype name="gsl::index" sign="s"/>
+  <podtype name="gsl::byte" sign="u" size="1"/><!-- Deprecated in GSL -->
+  <container id="gslSpan" startPattern="gsl :: span" inherits="stdSpan">
+  </container>
+  <smart-pointer class-name="gsl::owner"/>
+  <smart-pointer class-name="gsl::not_null"/>
+  <smart-pointer class-name="gsl::unique_ptr"><!-- Deprecated in GSL -->
+    <unique/>
+  </smart-pointer>
+  <smart-pointer class-name="gsl::shared_ptr"/><!-- Deprecated in GSL -->
+  <smart-pointer class-name="gsl::strict_not_null"/><!-- non-existing in C++ Core Guidelines -->
+</def>
diff --git a/cfg/posix.cfg b/cfg/posix.cfg
index 751142bacc1..e0de433e1f1 100644
--- a/cfg/posix.cfg
+++ b/cfg/posix.cfg
@@ -4600,6 +4600,142 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
       <not-uninit/>
     </arg>
   </function>
+  <function name="pthread_cond_wait">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cond_timedwait">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cond_init">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_cond_destroy">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cleanup_push">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="pthread_cleanup_pop">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <function name="pthread_mutexattr_init,pthread_mutexattr_destroy">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="inout">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_mutexattr_gettype">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_mutexattr_settype">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <valid>0:2</valid>
+    </arg>
+  </function>
+  <function name="pthread_setcancelstate">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0:2</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_setcanceltype">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0:2</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <function name="pthread_cancel">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- https://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_create.html -->
   <!-- int pthread_create(pthread_t * thread, const pthread_attr_t * attr, void *(*start_routine)(void*), void * arg); -->
   <function name="pthread_create">
@@ -6437,6 +6573,32 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
   <define name="R_OK" value="4"/>
   <define name="W_OK" value="2"/>
   <define name="X_OK" value="1"/>
+  <define name="PTHREAD_STACK_MIN" value="16384"/>
+  <define name="PTHREAD_CANCEL_ASYNCHRONOUS" value="1"/>
+  <define name="PTHREAD_CANCEL_ENABLE" value="0"/>
+  <define name="PTHREAD_CANCEL_DEFERRED" value="0"/>
+  <define name="PTHREAD_CANCEL_DISABLE" value="1"/>
+  <define name="PTHREAD_CANCELED" value="(void *)18446744073709551615U"/>
+  <define name="PTHREAD_COND_INITIALIZER" value="{ { {0}, {0}, {0, 0}, {0, 0}, 0, 0, {0, 0} } }"/>
+  <define name="PTHREAD_CREATE_DETACHED" value="1"/>
+  <define name="PTHREAD_CREATE_JOINABLE" value="0"/>
+  <define name="PTHREAD_EXPLICIT_SCHED" value="1"/>
+  <define name="PTHREAD_INHERIT_SCHED" value="0"/>
+  <define name="PTHREAD_MUTEX_DEFAULT" value="0"/>
+  <define name="PTHREAD_MUTEX_ERRORCHECK" value="2"/>
+  <define name="PTHREAD_MUTEX_NORMAL" value="0"/>
+  <define name="PTHREAD_MUTEX_TIMED_NP" value="0"/>
+  <define name="PTHREAD_MUTEX_INITIALIZER" value="{ { 0, 0, 0, 0, 0, 0, 0, { 0, 0 } } }"/>
+  <define name="PTHREAD_MUTEX_RECURSIVE" value="1"/>
+  <define name="PTHREAD_ONCE_INIT" value="{0, {0}}"/>
+  <define name="PTHREAD_PRIO_INHERIT" value="1"/>
+  <define name="PTHREAD_PRIO_NONE" value="0"/>
+  <define name="PTHREAD_PRIO_PROTECT" value="2"/>
+  <define name="PTHREAD_PROCESS_SHARED" value="1"/>
+  <define name="PTHREAD_PROCESS_PRIVATE" value="0"/>
+  <define name="PTHREAD_RWLOCK_INITIALIZER" value="{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0 }, 0, 0 } }"/>
+  <define name="PTHREAD_SCOPE_PROCESS" value="1"/>
+  <define name="PTHREAD_SCOPE_SYSTEM" value="0"/>
   <!-- https://man7.org/linux/man-pages/man3/lockf.3.html -->
   <define name="F_LOCK" value="1"/>
   <define name="F_TEST" value="3"/>
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index cf0727f1c7e..95dc022cf57 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -410,7 +410,6 @@
     </arg>
     <arg nr="4" default="0">
       <not-uninit/>
-      <not-bool/>
     </arg>
     <arg nr="5" default="0">
       <not-uninit/>
@@ -2319,10 +2318,28 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- bool QDir::mkdir(const QString &dirPath) const -->
+  <!-- bool QDir::mkpath(const QString &dirPath) const -->
+  <!-- do not mark as const as it is not const from a side effect standpoint-->
+  <function name="QDir::mkdir,QDir::mkpath">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <use-retval type="error-code"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- QString QDir::path() const -->
+  <function name="QDir::path">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="QString"/>
+  </function>
   <!-- QString absolutePath() const -->
   <!-- QString canonicalPath() const -->
   <!-- QString dirName() const -->
-  <function name="QDir::absoluteFilePath,QDir::canonicalPath,QDir::dirName">
+  <function name="QDir::absolutePath,QDir::canonicalPath,QDir::dirName">
     <noreturn>false</noreturn>
     <returnValue type="QString"/>
     <use-retval/>
@@ -2338,6 +2355,68 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- QString QDir::absoluteFilePath(const QString &fileName) -->
+  <function name="QDir::absoluteFilePath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <const/>
+  </function>
+  <!-- QString QDir::filePath(const QString &fileName) -->
+  <function name="QDir::filePath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <const/>
+  </function>
+  <!-- static QString QDir::cleanPath(const QString &path) -->
+  <function name="QDir::cleanPath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <const/>
+  </function>
+  <!-- static QString QDir::currentPath() -->
+  <!-- static QString QDir::tempPath() -->
+  <function name="QDir::currentPath,QDir::tempPath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QStringList QDir::entryList(const QStringList &nameFilters, QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const-->
+  <!-- QStringList QDir::entryList(QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort)const-->
+  <function name="QDir::entryList">
+    <noreturn>false</noreturn>
+    <returnValue type="QStringList"/>
+    <use-retval/>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+    <const/>
+  </function>
+  <!-- QFileInfoList QDir::entryInfoList(const QStringList &nameFilters, QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const -->
+  <!-- QFileInfoList QDir::entryInfoList(QDir::Filters filters = NoFilter, QDir::SortFlags sort = NoSort) const -->
+  <function name="QDir::entryInfoList">
+    <noreturn>false</noreturn>
+    <returnValue type="QFileInfoList"/>
+    <use-retval/>
+    <arg nr="any">
+      <not-uninit/>
+    </arg>
+    <const/>
+  </function>
   <!-- bool QDir::cdUp() -->
   <function name="QDir::cdUp">
     <noreturn>false</noreturn>
@@ -2346,8 +2425,9 @@
   </function>
   <!-- bool QDir::exists(QString &name) const -->
   <!-- bool QDir::exists() const -->
-  <function name="QDir">
+  <function name="QDir::exists">
     <noreturn>false</noreturn>
+    <pure/>
     <returnValue type="bool"/>
     <use-retval/>
     <leak-ignore/>
@@ -2356,17 +2436,11 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- uint QDir::count() const -->
-  <function name="QDir::count">
-    <noreturn>false</noreturn>
-    <returnValue type="uint"/>
-    <use-retval/>
-    <const/>
-  </function>
   <!-- bool QFile::exists(const QString &fileName) // static -->
   <!-- bool QFile::exists() const -->
   <function name="QFile::exists">
     <noreturn>false</noreturn>
+    <pure/>
     <returnValue type="bool"/>
     <use-retval/>
     <leak-ignore/>
@@ -2375,6 +2449,34 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- uint QDir::count() const -->
+  <function name="QDir::count">
+    <noreturn>false</noreturn>
+    <returnValue type="uint"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QChar QDir::separator() static -->
+  <function name="QDir::separator">
+    <noreturn>false</noreturn>
+    <returnValue type="QChar"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QDir QDir::home() static -->
+  <function name="QDir::home">
+    <noreturn>false</noreturn>
+    <returnValue type="QDir"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QString QDir::homePath() static -->
+  <function name="QDir::homePath">
+    <noreturn>false</noreturn>
+    <returnValue type="QString"/>
+    <use-retval/>
+    <const/>
+  </function>
   <!-- bool QFile::open(OpenMode mode) -->
   <!-- bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags = DontCloseHandle) -->
   <!-- bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags = DontCloseHandle) -->
@@ -2737,6 +2839,7 @@
     <arg nr="1" direction="in" default=""/>
     <arg nr="2" direction="in" default=""/>
     <arg nr="3" direction="in" default=""/>
+    <const/>
   </function>
   <!-- int QDate::month() const -->
   <function name="QDate::month">
@@ -3293,7 +3396,7 @@
     <returnValue type="bool"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -3304,7 +3407,7 @@
     <returnValue type="int"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in" default="">
+    <arg nr="1" default="">
       <not-uninit/>
     </arg>
   </function>
@@ -3320,7 +3423,7 @@
   <function name="QHash::find">
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -3328,10 +3431,10 @@
   <function name="QHash::insert">
     <noreturn>false</noreturn>
     <returnValue type="QHash::iterator"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
   </function>
@@ -3368,10 +3471,10 @@
     <noreturn>false</noreturn>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in" default="">
+    <arg nr="2" default="">
       <not-uninit/>
     </arg>
   </function>
@@ -3381,7 +3484,7 @@
     <noreturn>false</noreturn>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in" default="">
+    <arg nr="1" default="">
       <not-uninit/>
     </arg>
   </function>
@@ -5259,7 +5362,7 @@
       <function name="crend" yields="end-iterator"/>
     </access>
   </container>
-  <container id="qtMap" startPattern="QMap|QMultiMap &lt;" inherits="qtContainer">
+  <container id="qtMap" startPattern="QMap|QMultiMap|QHash &lt;" inherits="qtContainer">
     <type templateParameter="1" associative="std-like"/>
     <rangeItemRecordType>
       <member name="first" templateParameter="0"/>
@@ -5417,7 +5520,7 @@
   <define name="Q_OVERRIDE(x)" value=""/>
   <define name="Q_PLUGIN_METADATA(x)" value=""/>
   <define name="Q_ASSERT(condition)" value="assert(condition)"/>
-  <define name="Q_ASSERT_X(condition, where, what)" value="assert(condition)"/>
+  <define name="Q_ASSERT_X(condition, where, what)" value="assert(condition); (void)(where); (void)(what)"/>
   <define name="QTC_ASSERT_STRINGIFY_HELPER(x)" value="#x"/>
   <define name="QTC_ASSERT_STRINGIFY(x)" value="QTC_ASSERT_STRINGIFY_HELPER(x)"/>
   <define name="QTC_ASSERT_STRING(cond)" value="::Utils::writeAssertLocation( &quot;\&quot;&quot; cond&quot;\&quot; in file &quot; __FILE__ &quot;, line &quot; QTC_ASSERT_STRINGIFY(__LINE__))"/>
@@ -5427,6 +5530,8 @@
   <define name="Q_LOGGING_CATEGORY(name,...)" value=""/>
   <define name="QT_FORWARD_DECLARE_CLASS(name)" value="class name;"/>
   <define name="QT_FORWARD_DECLARE_STRUCT(name)" value="struct name;"/>
+  <define name="QT_VERSION_CHECK(major, minor, patch)" value="((major&lt;&lt;16)|(minor&lt;&lt;8)|(patch))"/>
+  <define name="QT_CONFIG(feature)" value="1"/>
   <!-- https://doc.qt.io/qt-6/qqmlintegration-h-qtqml-proxy.html -->
   <define name="QML_ADDED_IN_VERSION(MAJOR, MINOR)" value=""/>
   <define name="QML_ANONYMOUS" value=""/>
@@ -5451,6 +5556,11 @@
   <!-- https://doc.qt.io/qt-6/qqml-h-qtqml-proxy.html -->
   <define name="QML_DECLARE_TYPE" value=""/>
   <define name="QML_DECLARE_TYPEINFO(Type, Flags)" value=""/>
+  <!-- https://doc.qt.io/qt-6/qobjectbindableproperty.html -->
+  <define name="Q_OBJECT_BINDABLE_PROPERTY(containingClass, type, name, signal)" value=""/>
+  <define name="Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(containingClass, type, name, initialvalue, signal)" value=""/>
+  <!-- https://doc.qt.io/qt-6/qqmlengineextensionplugin.html -->
+  <define name="Q_IMPORT_QML_PLUGIN(PluginName)" value=""/>
   <!-- https://doc.qt.io/qt-5/qstring.html#QStringLiteral -->
   <define name="QStringLiteral(str)" value="QString::fromUtf8(str, sizeof(str) - 1)"/>
   <define name="QByteArrayLiteral(str)" value="QByteArray(str)"/>
diff --git a/cfg/selinux.cfg b/cfg/selinux.cfg
index e2d7ac34dc3..31a48c6da5e 100644
--- a/cfg/selinux.cfg
+++ b/cfg/selinux.cfg
@@ -219,7 +219,7 @@
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-uninit/>
       <not-null/>
     </arg>
diff --git a/cfg/std.cfg b/cfg/std.cfg
index 84cffb79828..6c434b8715c 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -3,16 +3,16 @@
   <!-- stdint.h -->
   <define name="INT8_MIN" value="-128"/>
   <define name="INT16_MIN" value="-32768"/>
-  <define name="INT32_MIN" value="-2147483648"/>
-  <define name="INT64_MIN" value="-9223372036854775808"/>
+  <define name="INT32_MIN" value="(-2147483647-1)"/>
+  <define name="INT64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_FAST8_MIN" value="-128"/>
-  <define name="INT_FAST16_MIN" value="-9223372036854775808"/>
-  <define name="INT_FAST32_MIN" value="-9223372036854775808"/>
-  <define name="INT_FAST64_MIN" value="-9223372036854775808"/>
+  <define name="INT_FAST16_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST32_MIN" value="(-9223372036854775807-1)"/>
+  <define name="INT_FAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT_LEAST8_MIN" value="-128"/>
   <define name="INT_LEAST16_MIN" value="-32768"/>
-  <define name="INT_LEAST32_MIN" value="-2147483648"/>
-  <define name="INT_LEAST64_MIN" value="-9223372036854775808"/>
+  <define name="INT_LEAST32_MIN" value="(-2147483647-1)"/>
+  <define name="INT_LEAST64_MIN" value="(-9223372036854775807-1)"/>
   <define name="INT8_MAX" value="127"/>
   <define name="INT16_MAX" value="32767"/>
   <define name="INT32_MAX" value="2147483647"/>
@@ -1665,7 +1665,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -1929,7 +1929,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2255,7 +2255,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3989,11 +3989,11 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- void * memcpy(void *ct, const void *cs, size_t n);-->
   <function name="memcpy,std::memcpy">
-    <returnValue type="void *"/>
+    <returnValue type="void *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
@@ -4010,7 +4010,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t* wmemcpy( wchar_t* dest, const wchar_t* src, std::size_t count ); -->
   <function name="wmemcpy,std::wmemcpy">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
@@ -4056,7 +4056,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- void * memmove(void *ct, const void *cs, size_t n); -->
   <function name="memmove,std::memmove">
     <noreturn>false</noreturn>
-    <returnValue type="void *"/>
+    <returnValue type="void *">arg1</returnValue>
     <leak-ignore/>
     <arg nr="1" direction="out">
       <not-null/>
@@ -4077,7 +4077,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- wchar_t * wmemmove(wchar_t *ct, const wchar_t *cs, size_t n); -->
   <function name="wmemmove,std::wmemmove">
     <noreturn>false</noreturn>
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <leak-ignore/>
     <arg nr="1" direction="out">
       <not-null/>
@@ -4100,7 +4100,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="errno_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="argvalue" arg="2"/>
     </arg>
@@ -4118,10 +4118,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- void *memset(void *s, int c, size_t n); -->
   <function name="memset,std::memset">
-    <returnValue type="void *"/>
+    <returnValue type="void *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
     </arg>
@@ -4136,7 +4136,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t *wmemset(wchar_t *s, wchar_t c, size_t n); -->
   <function name="wmemset,std::wmemset">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1" direction="out">
@@ -4411,7 +4411,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
@@ -4444,7 +4444,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
@@ -4812,7 +4812,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char * strcat(char *deststr, const char *srcstr); -->
   <function name="strcat,std::strcat">
-    <returnValue type="char *"/>
+    <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
@@ -4828,9 +4828,9 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <strz/>
     </arg>
   </function>
-  <!-- wchar_t wcscat(wchar_t *deststr, const wchar_t *srcstr); -->
+  <!-- wchar_t* wcscat(wchar_t *deststr, const wchar_t *srcstr); -->
   <function name="wcscat,std::wcscat">
-    <returnValue type="wchar_t"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
@@ -4861,7 +4861,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -4911,7 +4911,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <noreturn>false</noreturn>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
     <leak-ignore/>
-    <arg nr="1" direction="out">
+    <arg nr="1" direction="out" indirect="1">
       <not-null/>
       <minsize type="strlen" arg="2"/>
     </arg>
@@ -4942,7 +4942,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t *wcscpy(wchar_t *deststr, const wchar_t *srcstr); -->
   <function name="wcscpy,std::wcscpy">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" strlen-arg="2"/>
@@ -5044,7 +5044,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -5057,7 +5057,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char * strncat(char *ct, const char *s, size_t n); -->
   <function name="strncat,std::strncat">
-    <returnValue type="char *"/>
+    <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
@@ -5123,10 +5123,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <!-- wchar_t *wcsncat(wchar_t *ct, const wchar_t *cs, size_t n); -->
+  <!-- wchar_t* *wcsncat(wchar_t *ct, const wchar_t *cs, size_t n); -->
   <function name="wcsncat,std::wcsncat">
     <noreturn>false</noreturn>
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="inout">
@@ -5373,7 +5373,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- wchar_t * wcsncpy(wchar_t *s, const wchar_t *cs, size_t n); -->
   <function name="wcsncpy,std::wcsncpy">
-    <returnValue type="wchar_t *"/>
+    <returnValue type="wchar_t *">arg1</returnValue>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
@@ -5433,7 +5433,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -7130,6 +7130,16 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="const char *"/>
     <noreturn>false</noreturn>
   </function>
+  <!-- const wchar_t* c_str() const; // until C++11 -->
+  <!-- const wchar_t* c_str() const noexcept; // since C++11 -->
+  <!-- const wchar_t* data() const; // until C++11 -->
+  <!-- const wchar_t* data() const noexcept; // since C++11 -->
+  <function name="std::wstring::c_str,std::wstring::data">
+    <use-retval/>
+    <const/>
+    <returnValue type="const wchar_t *"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- char& front(); -->
   <!-- const char& front() const; -->
   <function name="std::string::front">
@@ -7137,6 +7147,13 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="char &amp;"/>
     <noreturn>false</noreturn>
   </function>
+  <!-- wchar_t& front(); -->
+  <!-- const wchar_t& front() const; -->
+  <function name="std::wstring::front">
+    <use-retval/>
+    <returnValue type="wchar_t &amp;"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- size_t find (const string& str, size_t pos = 0) const; -->
   <!-- size_t find (const char* s, size_t pos, size_t n) const; -->
   <!-- size_t find (char c, size_t pos = 0) const;-->
@@ -8326,9 +8343,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <leak-ignore/>
     <container yields="size"/>
     <returnValue type="size_t"/>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-    </arg>
+    <arg nr="1" direction="in" indirect="0"/>
   </function>
   <function name="std::ssize">
     <noreturn>false</noreturn>
@@ -8734,7 +8749,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <use-retval/>
     <leak-ignore/>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in"/>
+    <arg nr="1" direction="in" indirect="0"/>
     <container yields="start-iterator"/>
     <returnValue type="iterator" container="1"/>
   </function>
@@ -8742,7 +8757,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <use-retval/>
     <leak-ignore/>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in"/>
+    <arg nr="1" direction="in" indirect="0"/>
     <container yields="end-iterator"/>
     <returnValue type="iterator" container="1"/>
   </function>
@@ -8797,6 +8812,12 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <use-retval/>
     <leak-ignore/>
   </function>
+  <function name="std::throw_with_nested">
+    <arg nr="1" direction="in" indirect="0"/>
+    <returnValue type="void"/>
+    <noreturn>true</noreturn>
+    <leak-ignore/>
+  </function>
   <memory>
     <alloc init="false" buffer-size="malloc">malloc,std::malloc</alloc>
     <alloc init="true" buffer-size="calloc">calloc,std::calloc</alloc>
@@ -9009,6 +9030,16 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <container id="stdBasicStringView" startPattern="std :: basic_string_view &lt;" inherits="stdAllStringView">
     <type templateParameter="0"/>
   </container>
+  <container id="stdInitializerList" startPattern="std :: initializer_list &lt;" endPattern="&gt; !!::" opLessAllowed="false" itEndPattern="&gt; :: iterator|const_iterator" hasInitializerListConstructor="true">
+    <type templateParameter="0"/>
+    <size>
+      <function name="size" yields="size" returnType="std::size_t"/>
+    </size>
+    <access>
+      <function name="begin" yields="start-iterator"/>
+      <function name="end" yields="end-iterator"/>
+    </access>
+  </container>
   <container id="stdStringView" startPattern="std :: string_view|wstring_view|u16string_view|u32string_view" endPattern="" inherits="stdAllStringView"/>
   <container id="stdExperimentalStringView" startPattern="std :: experimental :: string_view|wstring_view|u16string_view|u32string_view" endPattern="" inherits="stdAllStringView"/>
   <container id="stdExperimentalBasicStringView" startPattern="std :: experimental :: basic_string_view &lt;" inherits="stdBasicStringView" />
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 343e12b3906..b2251900d42 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1331,6 +1331,11 @@
     <alloc init="true" arg="11">AllocateAndInitializeSid</alloc>
     <dealloc>FreeSid</dealloc>
   </memory>
+  <memory>
+    <alloc init="true">_create_locale</alloc>
+    <alloc init="true">_wcreate_locale</alloc>
+    <dealloc>_free_locale</dealloc>
+  </memory>
   <!--SIZE_T RtlCompareMemory(
   _In_ const VOID   *Source1,
   _In_ const VOID   *Source2,
@@ -3504,7 +3509,7 @@ HFONT CreateFont(
     <arg nr="10">
       <not-uninit/>
     </arg>
-    <arg nr="11" direction="in">
+    <arg nr="11">
       <not-uninit/>
     </arg>
   </function>
@@ -3559,7 +3564,7 @@ HFONT CreateFont(
     <arg nr="11">
       <not-uninit/>
     </arg>
-    <arg nr="12" direction="in">
+    <arg nr="12">
       <not-uninit/>
     </arg>
   </function>
@@ -4120,7 +4125,7 @@ HFONT CreateFont(
     <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3" direction="out"/>
@@ -5591,11 +5596,43 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
+  <!--_locale_t _create_locale(int category, const char *locale);
+      _locale_t _wcreate_locale(int category, const wchar_t *locale);
+      void _free_locale(_locale_t locale);-->
+  <function name="_create_locale">
+    <returnValue type="_locale_t"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="_wcreate_locale">
+    <returnValue type="_locale_t"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="_free_locale">
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
   <!--char * strlwr(_Inout_z_ char * _Str);-->
   <function name="strlwr">
     <returnValue type="char *">arg1</returnValue>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -5963,7 +6000,7 @@ HFONT CreateFont(
     <arg nr="2" direction="out">
       <not-null/>
     </arg>
-    <arg nr="3" direction="inout">
+    <arg nr="3" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -6009,7 +6046,7 @@ HFONT CreateFont(
     <arg nr="4" direction="out">
       <not-null/>
     </arg>
-    <arg nr="5" direction="inout">
+    <arg nr="5" direction="inout" indirect="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -7191,7 +7228,7 @@ HFONT CreateFont(
   <define name="AFX_EXT_CLASS" value=""/>
   <define name="DEBUG_NEW" value="new"/>
   <define name="INVALID_HANDLE_VALUE" value="-1"/>
-  <define name="INVALID_SOCKET" value="~0"/>
+  <define name="INVALID_SOCKET" value="-1"/>
   <define name="WINAPI" value="__stdcall"/>
   <define name="STDMETHODCALLTYPE" value="__stdcall"/>
   <define name="STDMETHODIMP" value="HRESULT STDMETHODCALLTYPE"/>
@@ -13345,9 +13382,9 @@ HFONT CreateFont(
   <define name="MiniDumpWithAvxXStateContext" value="0x0200000"/>
   <define name="MiniDumpWithIptTrace" value="0x0400000"/>
   <define name="MiniDumpValidTypeFlags" value="0x0800000"/>
-  <define name="MAKEINTRESOURCEA(i)" value="i"/>
-  <define name="MAKEINTRESOURCEW(i)" value="i"/>
-  <define name="MAKEINTRESOURCE(i)" value="i"/>
+  <define name="MAKEINTRESOURCEA(i)" value="((LPSTR)((ULONG_PTR)((WORD)(i))))"/>
+  <define name="MAKEINTRESOURCEW(i)" value="((LPWSTR)((ULONG_PTR)((WORD)(i))))"/>
+  <define name="MAKEINTRESOURCE(i)" value="((LPTSTR)((ULONG_PTR)((WORD)(i))))"/>
   <define name="FILE_ATTRIBUTE_ARCHIVE" value="0x20"/>
   <define name="FILE_ATTRIBUTE_COMPRESSED" value="0x800"/>
   <define name="FILE_ATTRIBUTE_DEVICE" value="0x40"/>
diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index 685750f7ff2..9dea60761d1 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -109,6 +109,8 @@
     <operatorEqVarError>
     </operatorEqVarError>
   </type-checks>
+  <!-- https://github.com/wxWidgets/wxWidgets/blob/master/include/wx/version.h -->
+  <define name="wxCHECK_VERSION(major,minor,release)" value="1"/>
   <!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__string.html#ga437ea6ba615b75dac8603e96ec864160 -->
   <!-- #define wxT(string) -->
   <define name="wxT(str)" value="str"/>
@@ -7251,6 +7253,15 @@
     <returnValue type="wxString"/>
     <warn severity="style">This function is deprecated, use 'wxPGProperty::GetValueAsString()' instead.</warn>
   </function>
+  <!-- virtual wxVariant wxPGProperty::DoGetValue(void) const -->
+  <!--         wxVariant wxPGProperty::GetValue(void) const   -->
+  <function name="wxPGProperty::GetValue,wxPGProperty::DoGetValue">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <const/>
+    <returnValue type="wxVariant"/>
+  </function>
   <!-- wxString wxPGPropertyFlags::wxPGProperty::GetValueAsStringWithCheck( wxPGPropValFormatFlags flags = wxPGPropValFormatFlags::Null ) const -->
   <!-- wxString wxPGProperty::GetValueAsString( wxPGPropValFormatFlags flags = wxPGPropValFormatFlags::Null ) const -->
   <function name="wxPGPropertyFlags::wxPGProperty::GetValueAsStringWithCheck,wxPGProperty::GetValueAsString">
@@ -10350,6 +10361,14 @@
     <const/>
     <use-retval/>
   </function>
+  <!-- wxULongLong_t wxULongLong::GetValue() const  -->
+  <function name="wxULongLong::GetValue">
+    <noreturn>false</noreturn>
+    <returnValue type="wxULongLong_t"/>
+    <leak-ignore/>
+    <const/>
+    <use-retval/>
+  </function>
   <!-- void * wxVariant::GetVoidPtr() const -->
   <function name="wxVariant::GetVoidPtr">
     <noreturn>false</noreturn>
@@ -11382,6 +11401,12 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- wxPropertyGrid* wxPropertyGridManager::GetGrid(void) -->
+  <function name="wxPropertyGridManager::GetGrid">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="wxPropertyGrid *"/>
+  </function>
   <!-- wxPGProperty * wxPropertyGridInterface::Append( wxPGProperty * property ) -->
   <!-- wxPGProperty * wxPropertyGridManager::Append( wxPGProperty * property ) -->
   <function name="wxPropertyGridInterface::Append,wxPropertyGridManager::Append">
@@ -11678,7 +11703,8 @@
   </function>
   <!-- bool wxBitmap::HasAlpha( void ) const -->
   <!-- bool wxBitmap::IsOk( void ) const -->
-  <function name="wxBitmap::HasAlpha,wxBitmap::IsOk">
+  <!-- bool wxTreeListItem::IsOk( void ) const -->
+  <function name="wxBitmap::HasAlpha,wxBitmap::IsOk,wxTreeListItem::IsOk">
       <noreturn>false</noreturn>
       <leak-ignore/>
       <returnValue type="bool"/>
@@ -12501,7 +12527,8 @@
     </arg>
   </function>
   <!-- virtual void wxWindow::Refresh(bool eraseBackground = true, const wxRect * rect = NULL) -->
-  <function name="wxWindow::Refresh">
+  <!-- virtual void wxPropertyGridManager::Refresh(bool eraseBackground = true, const wxRect * rect = NULL) -->
+  <function name="wxWindow::Refresh,wxPropertyGridManager::Refresh">
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="void"/>
@@ -15805,7 +15832,8 @@ wxItemKind kind = wxITEM_NORMAL) -->
   </function>
   <!-- bool wxColour::IsOk( void ) const -->
   <!-- bool wxFont::IsOk( void ) const -->
-  <function name="wxColour::IsOk,wxFont::IsOk">
+  <!-- bool wxIcon::IsOk( void ) const -->
+  <function name="wxColour::IsOk,wxFont::IsOk,wxIcon::IsOk">
       <noreturn>false</noreturn>
       <leak-ignore/>
       <returnValue type="bool"/>
@@ -16095,6 +16123,30 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <leak-ignore/>
     <const/>
   </function>
+  <!-- wxPoint wxWindow::GetScreenPosition() const -->
+  <!-- wxPoint wxGrid::GetScreenPosition() const -->
+  <function name="wxWindow::GetScreenPosition,wxGrid::GetScreenPosition">
+    <noreturn>false</noreturn>
+    <returnValue type="wxPoint"/>
+    <use-retval/>
+    <leak-ignore/>
+    <const/>
+  </function>
+  <!-- unsigned int wxDataViewListCtrl::GetItemCount( )const -->
+  <function name="wxDataViewListCtrl::GetItemCount">
+    <noreturn>false</noreturn>
+    <returnValue type="unsigned int"/>
+    <use-retval/>
+    <leak-ignore/>
+    <const/>
+  </function>
+  <!-- static wxStandardPaths& wxStandardPaths::Get() -->
+  <function name="wxStandardPaths::Get">
+    <noreturn>false</noreturn>
+    <returnValue type="wxStandardPaths &amp;"/>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
   <!-- wxFont wxGrid::GetLabelFont() const -->
   <function name="wxGrid::GetLabelFont">
     <noreturn>false</noreturn>
@@ -16113,7 +16165,9 @@ wxItemKind kind = wxITEM_NORMAL) -->
       <const/>
   </function>
   <!-- wxPoint wxGridEvent::GetPosition( void ) const -->
-  <function name="wxGridEvent::GetPosition">
+  <!-- wxPoint wxMouseEvent::GetPosition( void ) const -->
+  <!-- wxPoint wxMouseState::GetPosition( void ) const -->
+  <function name="wxGridEvent::GetPosition,wxMouseEvent::GetPosition,wxMouseState::GetPosition">
       <noreturn>false</noreturn>
       <leak-ignore/>
       <returnValue type="wxPoint"/>
@@ -17021,12 +17075,28 @@ wxItemKind kind = wxITEM_NORMAL) -->
       <const/>
   </function>
   <!-- bool wxFrame::Layout( void ) -->
+  <!-- bool wxWindow::Layout( void ) -->
   <!-- bool wxWindowBase::Layout( void ) -->
-  <function name="wxWindowBase::Layout,wxFrame::Layout">
+  <!-- bool wxGrid::Layout( void ) -->
+  <function name="wxWindow::Layout,wxWindowBase::Layout,wxFrame::Layout,wxGrid::Layout">
       <noreturn>false</noreturn>
       <leak-ignore/>
       <returnValue type="bool"/>
       <use-retval/>
+  </function>  
+  <!-- bool wxPanel::Layout( void ) -->
+  <function name="wxPanel::Layout">
+      <noreturn>false</noreturn>
+      <returnValue type="bool"/>
+  </function>
+  <!-- void wxSizer::Layout( void ) -->
+  <!-- void wxBoxSizer::Layout( void ) -->
+  <!-- void wxGridSizer::Layout( void ) -->
+  <!-- void wxStaticBoxSizer::Layout( void ) -->
+  <function name="wxSizer::Layout,wxBoxSizer::Layout,wxGridSizer::Layout,wxStaticBoxSizer::Layout">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="void"/>
   </function>
   <!-- void wxTextEntry::Clear( void ) -->
   <!-- void wxTextCtrl::Clear( void ) -->
diff --git a/clang-tidy.md b/clang-tidy.md
index 59d28dbaa3d..f00a39cde12 100644
--- a/clang-tidy.md
+++ b/clang-tidy.md
@@ -33,7 +33,6 @@ These are coding guidelines we do not follow. Some of the checks might be explic
 
 `readability-braces-around-statements`<br/>
 `readability-isolate-declaration`<br/>
-`modernize-use-trailing-return-type`<br/>
 `readability-uppercase-literal-suffix`<br/>
 `readability-identifier-length`<br/>
 
@@ -112,7 +111,11 @@ Also reports a false positive about templates which deduce the array length: htt
 
 `misc-include-cleaner`<br/>
 
-We run this separately via `clang-include-cleaner` in the `iwyu.yml` workflow as the findings of the include checkers still need to be reviewed manually before applying them. 
+We run this separately via `clang-include-cleaner` in the `iwyu.yml` workflow as the findings of the include checkers still need to be reviewed manually before applying them.
+
+`readability-use-concise-preprocessor-directives`<br/>
+
+Does not improve the readability.
 
 `bugprone-branch-clone`<br/>
 `modernize-return-braced-init-list`<br/>
@@ -126,6 +129,11 @@ We run this separately via `clang-include-cleaner` in the `iwyu.yml` workflow as
 `readability-avoid-nested-conditional-operator`<br/>
 `modernize-use-designated-initializers`<br/>
 `readability-enum-initial-value`<br/>
+`modernize-use-trailing-return-type`<br/>
+`misc-unconventional-assign-operator`<br/>
+`bugprone-throwing-static-initialization`<br/>
+`bugprone-command-processor`<br/>
+`misc-multiple-inheritance`<br/>
 
 To be evaluated (need to remove exclusion).
 
@@ -144,9 +152,30 @@ To be evaluated (need to enable explicitly).
 
 `modernize-type-traits`<br/>
 `modernize-use-nodiscard`<br/>
+`modernize-use-scoped-lock`<br/>
 
 These apply to codebases which use later standards then C++11 (C++17 is used when building with Qt6) so we cannot simply apply them.
 
+`portability-avoid-pragma-once`<br/>
+
+We are not interested in this.
+
+`readability-redundant-parentheses`<br/>
+
+Reports false positives - see https://github.com/llvm/llvm-project/issues/164125.
+
+`readability-inconsistent-ifelse-braces`<br/>
+
+The suggestions are too intrusive.
+
+`modernize-avoid-c-style-cast`<br/>
+
+Currently flags functional casts - see https://github.com/llvm/llvm-project/issues/186784.
+
+`misc-use-internal-linkage.AnalyzeTypes`<br/>
+
+Adding anonymous namespaces requires identation which is too instrusive right now. Would require changes to our fomatting configuration.
+
 ### Disabled for performance reasons
 
 `portability-std-allocator-const`<br/>
@@ -171,7 +200,7 @@ We are currently using our own `naming.json` to enforce naming schemes. Also dis
 
 `portability-simd-intrinsics`<br/>
 
-We are not using SIMD instructions and it suggests to use `std::experiemental::` features which might not be commonly available. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
+We are not using SIMD instructions and it suggests to use `std::experimental::` features which might not be commonly available. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
 
 `modernize-macro-to-enum`<br/>
 
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index dc13dba1403..52103bdb8ec 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -1,54 +1,28 @@
-if (BUILD_CLI)
-
-    file(GLOB hdrs "*.h")
-    file(GLOB srcs "*.cpp")
-    file(GLOB mainfile "main.cpp")
-    list(REMOVE_ITEM srcs ${mainfile})
+file(GLOB hdrs "*.h")
+file(GLOB srcs "*.cpp")
+file(GLOB mainfile "main.cpp")
+list(REMOVE_ITEM srcs ${mainfile})
 
-    add_library(cli_objs OBJECT ${hdrs} ${srcs})
-    target_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/lib/)
-    if(USE_BUNDLED_TINYXML2)
-        target_externals_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-    else()
-        target_include_directories(cli_objs SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-    endif()
-    target_externals_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
-    target_externals_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
-    if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
-        target_precompile_headers(cli_objs PRIVATE precompiled.h)
-    endif()
-    if (BUILD_CORE_DLL)
-        target_compile_definitions(cli_objs PRIVATE CPPCHECKLIB_IMPORT TINYXML2_IMPORT)
-    endif()
+add_library(cli ${hdrs} ${srcs})
+target_include_directories(cli PUBLIC .)
+target_link_libraries(cli PRIVATE cppcheck-core frontend tinyxml2 simplecpp picojson)
+if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
+    target_precompile_headers(cli PRIVATE precompiled.h)
+endif()
 
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13)
-        # false positive warning in Clang 13 - caused by FD_ZERO macro
-        set_source_files_properties(processexecutor.cpp PROPERTIES COMPILE_FLAGS -Wno-reserved-identifier)
-    endif()
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13)
+    # false positive warning in Clang 13 - caused by FD_ZERO macro
+    set_source_files_properties(processexecutor.cpp PROPERTIES COMPILE_FLAGS -Wno-reserved-identifier)
+endif()
 
-    list(APPEND cppcheck_SOURCES ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs>)
-    if (NOT BUILD_CORE_DLL)
-        list(APPEND cppcheck_SOURCES $<TARGET_OBJECTS:cppcheck-core>)
-        list(APPEND cppcheck_SOURCES $<TARGET_OBJECTS:simplecpp_objs>)
-        if(USE_BUNDLED_TINYXML2)
-            list(APPEND cppcheck_SOURCES $<TARGET_OBJECTS:tinyxml2_objs>)
-        endif()
-    endif()
+if (BUILD_CLI)
+    list(APPEND cppcheck_SOURCES ${hdrs} ${mainfile})
     if (WIN32)
         list(APPEND cppcheck_SOURCES version.rc)
     endif()
 
     add_executable(cppcheck ${cppcheck_SOURCES})
-    target_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/lib/)
-    if(USE_BUNDLED_TINYXML2)
-        target_externals_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-    else()
-        target_include_directories(cppcheck SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-    endif()
-    target_externals_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
-    if (HAVE_RULES)
-        target_link_libraries(cppcheck ${PCRE_LIBRARY})
-    endif()
+    target_link_libraries(cppcheck cppcheck-core cli tinyxml2 simplecpp)
     if (WIN32 AND NOT BORLAND)
         if(NOT MINGW)
             target_link_libraries(cppcheck Shlwapi.lib)
@@ -56,13 +30,7 @@ if (BUILD_CLI)
             target_link_libraries(cppcheck shlwapi)
         endif()
     endif()
-    if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(cppcheck ${tinyxml2_LIBRARIES})
-    endif()
     target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT})
-    if (BUILD_CORE_DLL)
-        target_link_libraries(cppcheck cppcheck-core)
-    endif()
 
     add_dependencies(cppcheck copy_cfg)
     add_dependencies(cppcheck copy_addons)
@@ -72,27 +40,32 @@ if (BUILD_CLI)
     endif()
 
     install(TARGETS cppcheck
-        RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT applications)
 
     install(PROGRAMS ${CMAKE_SOURCE_DIR}/htmlreport/cppcheck-htmlreport
-        DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT applications)
 
+    # TODO: leverage CMAKE_INSTALL_DATAROOTDIR (share)?
+
     install(FILES ${addons_py}
-       DESTINATION ${FILESDIR_DEF}/addons
+       DESTINATION ${FILESDIR_INSTALL}/addons
        COMPONENT headers)
 
     install(FILES ${addons_json}
-       DESTINATION ${FILESDIR_DEF}/addons
+       DESTINATION ${FILESDIR_INSTALL}/addons
        COMPONENT headers)
 
     install(FILES ${cfgs}
-       DESTINATION ${FILESDIR_DEF}/cfg
+       DESTINATION ${FILESDIR_INSTALL}/cfg
        COMPONENT headers)
 
     install(FILES ${platforms}
-       DESTINATION ${FILESDIR_DEF}/platforms
+       DESTINATION ${FILESDIR_INSTALL}/platforms
        COMPONENT headers)
 
+    # TODO: install manpage into CMAKE_INSTALL_MANDIR
+    # TODO: install documentation into CMAKE_INSTALL_DOCDIR?
+
 endif()
diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj
index 3178f4319d2..05d1cf2916d 100644
--- a/cli/cli.vcxproj
+++ b/cli/cli.vcxproj
@@ -85,11 +85,11 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib;..\frontend;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
@@ -114,11 +114,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib;..\frontend;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
@@ -143,10 +143,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib;..\frontend;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -181,10 +181,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib;..\frontend;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -231,6 +231,7 @@
     <ClInclude Include="singleexecutor.h" />
     <ClInclude Include="stacktrace.h" />
     <ClInclude Include="threadexecutor.h" />
+    <ClInclude Include="..\frontend\frontend.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\lib\cppcheck.vcxproj">
@@ -254,6 +255,7 @@
     <ClCompile Include="singleexecutor.cpp" />
     <ClCompile Include="stacktrace.cpp" />
     <ClCompile Include="threadexecutor.cpp" />
+    <ClCompile Include="..\frontend\frontend.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
diff --git a/cli/cli.vcxproj.filters b/cli/cli.vcxproj.filters
index 2320255e6b5..5d3bd1c86cc 100644
--- a/cli/cli.vcxproj.filters
+++ b/cli/cli.vcxproj.filters
@@ -23,9 +23,6 @@
     <ClInclude Include="cppcheckexecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cppcheckexecutorseh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="signalhandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -44,6 +41,12 @@
     <ClInclude Include="singleexecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="sehwrapper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\frontend\frontend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup Label="SourceFiles">
     <ClCompile Include="main.cpp">
@@ -55,9 +58,6 @@
     <ClCompile Include="cppcheckexecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cppcheckexecutorseh.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="signalhandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -79,6 +79,12 @@
     <ClCompile Include="singleexecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sehwrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\frontend\frontend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc">
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 1e43930ddb1..f2d2254f833 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,6 +20,7 @@
 
 #include "addoninfo.h"
 #include "check.h"
+#include "checks.h"
 #include "checkers.h"
 #include "color.h"
 #include "config.h"
@@ -36,12 +37,12 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "timer.h"
 #include "utils.h"
 
+#include "frontend.h"
+
 #include <algorithm>
 #include <cassert>
-#include <climits>
 #include <cstdio>
 #include <cstdlib> // EXIT_FAILURE
 #include <cstring>
@@ -55,8 +56,13 @@
 #include <utility>
 
 #ifdef HAVE_RULES
+#include "regex.h"
+#include "rule.h"
+
 // xml is used for rules
 #include "xml.h"
+
+#include <memory>
 #endif
 
 static bool addFilesToList(const std::string& fileList, std::vector<std::string>& pathNames)
@@ -72,9 +78,7 @@ static bool addFilesToList(const std::string& fileList, std::vector<std::string>
         files = &infile;
     }
     std::string fileName;
-    // cppcheck-suppress accessMoved - FP
     while (std::getline(*files, fileName)) { // next line
-        // cppcheck-suppress accessMoved - FP
         if (!fileName.empty()) {
             pathNames.emplace_back(std::move(fileName));
         }
@@ -88,7 +92,6 @@ static bool addIncludePathsToList(const std::string& fileList, std::list<std::st
     std::ifstream files(fileList);
     if (files) {
         std::string pathName;
-        // cppcheck-suppress accessMoved - FP
         while (std::getline(files, pathName)) { // next line
             if (!pathName.empty()) {
                 pathName = Path::removeQuotationMarks(std::move(pathName));
@@ -128,6 +131,12 @@ namespace {
             reportOut(msg.toXML());
         }
 
+        void reportMetric(const std::string &metric) override
+        {
+            /* Not used here */
+            (void) metric;
+        }
+
         void reportProgress(const std::string & /*filename*/, const char /*stage*/[], const std::size_t /*value*/) override
         {}
     };
@@ -180,7 +189,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
     }
 
     // Output a warning for the user if he tries to exclude headers
-    const std::vector<std::string>& ignored = getIgnoredPaths();
+    const std::vector<std::string>& ignored = mIgnoredPaths;
     const bool warn = std::any_of(ignored.cbegin(), ignored.cend(), [](const std::string& i) {
         return Path::isHeader(i);
     });
@@ -189,23 +198,23 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
         mLogger.printMessage("Please use --suppress for ignoring results from the header files.");
     }
 
-    const std::vector<std::string>& pathnamesRef = getPathNames();
-    const std::list<FileSettings>& fileSettingsRef = getFileSettings();
+    const std::vector<std::string>& pathnamesRef = mPathNames;
+    const std::list<FileSettings>& fileSettingsRef = mFileSettings;
 
     // the inputs can only be used exclusively - CmdLineParser should already handle this
     assert(!(!pathnamesRef.empty() && !fileSettingsRef.empty()));
 
     if (!fileSettingsRef.empty()) {
-        // TODO: de-duplicate
-
         std::list<FileSettings> fileSettings;
         if (!mSettings.fileFilters.empty()) {
             // filter only for the selected filenames from all project files
+            PathMatch filtermatcher(mSettings.fileFilters, Path::getCurrentPath());
             std::copy_if(fileSettingsRef.cbegin(), fileSettingsRef.cend(), std::back_inserter(fileSettings), [&](const FileSettings &fs) {
-                return matchglobs(mSettings.fileFilters, fs.filename());
+                return filtermatcher.match(fs.filename());
             });
             if (fileSettings.empty()) {
-                mLogger.printError("could not find any files matching the filter.");
+                for (const std::string& f: mSettings.fileFilters)
+                    mLogger.printError("could not find any files matching the filter:" + f);
                 return false;
             }
         }
@@ -213,42 +222,11 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             fileSettings = fileSettingsRef;
         }
 
-        mFileSettings.clear();
+        // TODO: de-duplicate
 
-        if (mSettings.enforcedLang != Standards::Language::None)
-        {
-            // apply enforced language
-            for (auto& fs : fileSettings)
-            {
-                if (mSettings.library.markupFile(fs.filename()))
-                    continue;
-                fs.file.setLang(mSettings.enforcedLang);
-            }
-        }
-        else
-        {
-            // identify files
-            for (auto& fs : fileSettings)
-            {
-                if (mSettings.library.markupFile(fs.filename()))
-                    continue;
-                assert(fs.file.lang() == Standards::Language::None);
-                bool header = false;
-                fs.file.setLang(Path::identify(fs.filename(), mSettings.cppHeaderProbe, &header));
-                // unknown extensions default to C++
-                if (!header && fs.file.lang() == Standards::Language::None)
-                    fs.file.setLang(Standards::Language::CPP);
-            }
-        }
+        mFileSettings.clear();
 
-        // enforce the language since markup files are special and do not adhere to the enforced language
-        for (auto& fs : fileSettings)
-        {
-            if (mSettings.library.markupFile(fs.filename())) {
-                assert(fs.file.lang() == Standards::Language::None);
-                fs.file.setLang(Standards::Language::C);
-            }
-        }
+        frontend::applyLang(fileSettings, mSettings, mEnforcedLang);
 
         // sort the markup last
         std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) {
@@ -267,16 +245,9 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
 
     if (!pathnamesRef.empty()) {
         std::list<FileWithDetails> filesResolved;
-        // TODO: this needs to be inlined into PathMatch as it depends on the underlying filesystem
-#if defined(_WIN32)
-        // For Windows we want case-insensitive path matching
-        const bool caseSensitive = false;
-#else
-        const bool caseSensitive = true;
-#endif
         // Execute recursiveAddFiles() to each given file parameter
         // TODO: verbose log which files were ignored?
-        const PathMatch matcher(ignored, caseSensitive);
+        const PathMatch matcher(ignored, Path::getCurrentPath());
         for (const std::string &pathname : pathnamesRef) {
             const std::string err = FileLister::recursiveAddFiles(filesResolved, Path::toNativeSeparators(pathname), mSettings.library.markupExtensions(), matcher, mSettings.debugignore);
             if (!err.empty()) {
@@ -293,24 +264,12 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             return false;
         }
 
-        // de-duplicate files
-        {
-            auto it = filesResolved.begin();
-            while (it != filesResolved.end()) {
-                const std::string& name = it->path();
-                // TODO: log if duplicated files were dropped
-                filesResolved.erase(std::remove_if(std::next(it), filesResolved.end(), [&](const FileWithDetails& entry) {
-                    return entry.path() == name;
-                }), filesResolved.end());
-                ++it;
-            }
-        }
-
         std::list<FileWithDetails> files;
         if (!mSettings.fileFilters.empty()) {
             files = filterFiles(mSettings.fileFilters, filesResolved);
             if (files.empty()) {
-                mLogger.printError("could not find any files matching the filter.");
+                for (const std::string& f: mSettings.fileFilters)
+                    mLogger.printError("could not find any files matching the filter:" + f);
                 return false;
             }
         }
@@ -318,40 +277,20 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             files = std::move(filesResolved);
         }
 
-        if (mSettings.enforcedLang != Standards::Language::None)
-        {
-            // apply enforced language
-            for (auto& f : files)
-            {
-                if (mSettings.library.markupFile(f.path()))
-                    continue;
-                f.setLang(mSettings.enforcedLang);
-            }
-        }
-        else
+        // de-duplicate files
         {
-            // identify remaining files
-            for (auto& f : files)
-            {
-                if (f.lang() != Standards::Language::None)
-                    continue;
-                if (mSettings.library.markupFile(f.path()))
-                    continue;
-                bool header = false;
-                f.setLang(Path::identify(f.path(), mSettings.cppHeaderProbe, &header));
-                // unknown extensions default to C++
-                if (!header && f.lang() == Standards::Language::None)
-                    f.setLang(Standards::Language::CPP);
+            auto it = files.begin();
+            while (it != files.end()) {
+                const std::string& absname = it->abspath();
+                // TODO: log if duplicated files were dropped
+                files.erase(std::remove_if(std::next(it), files.end(), [&](const FileWithDetails& entry) {
+                    return entry.abspath() == absname;
+                }), files.end());
+                ++it;
             }
         }
 
-        // enforce the language since markup files are special and do not adhere to the enforced language
-        for (auto& f : files)
-        {
-            if (mSettings.library.markupFile(f.path())) {
-                f.setLang(Standards::Language::C);
-            }
-        }
+        frontend::applyLang(files, mSettings, mEnforcedLang);
 
         // sort the markup last
         std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) {
@@ -377,9 +316,41 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 {
     mSettings.exename = Path::getCurrentExecutablePath(argv[0]);
 
+    bool xmlOptionProvided = false;
+    bool outputFormatOptionProvided = false;
+
     // default to --check-level=normal from CLI for now
     mSettings.setCheckLevel(Settings::CheckLevel::normal);
 
+    // read --debug-lookup early so the option is available for the cppcheck.cfg loading
+    for (int i = 1; i < argc; i++) {
+        // Show debug warnings for lookup for configuration files
+        if (std::strcmp(argv[i], "--debug-lookup") == 0)
+            mSettings.debuglookup = true;
+
+        else if (std::strncmp(argv[i], "--debug-lookup=", 15) == 0) {
+            const std::string lookup = argv[i] + 15;
+            if (lookup == "all")
+                mSettings.debuglookup = true;
+            else if (lookup == "addon")
+                mSettings.debuglookupAddon = true;
+            else if (lookup == "config")
+                mSettings.debuglookupConfig = true;
+            else if (lookup == "library")
+                mSettings.debuglookupLibrary = true;
+            else if (lookup == "platform")
+                mSettings.debuglookupPlatform = true;
+            else
+            {
+                mLogger.printError("unknown lookup '" + lookup + "'");
+                return Result::Fail;
+            }
+        }
+    }
+
+    if (!loadCppcheckCfg())
+        return Result::Fail;
+
     if (argc <= 1) {
         printHelp();
         return Result::Exit;
@@ -391,9 +362,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         if (std::strcmp(argv[i], "--doc") == 0) {
             std::ostringstream doc;
             // Get documentation..
-            for (const Check * it : Check::instances()) {
-                const std::string& name(it->name());
-                const std::string info(it->classInfo());
+            for (const Check * const c : CheckInstances::get()) {
+                const std::string& name(c->name());
+                const std::string info(c->classInfo());
                 if (!name.empty() && !info.empty())
                     doc << "## " << name << " ##\n"
                         << info << "\n";
@@ -405,8 +376,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
         // print all possible error messages..
         if (std::strcmp(argv[i], "--errorlist") == 0) {
-            if (!loadCppcheckCfg())
-                return Result::Fail;
             {
                 XMLErrorMessagesLogger xmlLogger;
                 std::cout << ErrorMessage::getXMLHeader(mSettings.cppcheckCfgProductName, 2);
@@ -430,21 +399,27 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
 
         if (std::strcmp(argv[i], "--version") == 0) {
-            if (!loadCppcheckCfg())
-                return Result::Fail;
             const std::string version = getVersion();
             mLogger.printRaw(version); // TODO: should not include newline
             return Result::Exit;
         }
     }
 
-    bool def = false;
-    bool maxconfigs = false;
+    bool debug = false;
+    bool inputAsFilter = false; // set by: --file-filter=+
 
     ImportProject::Type projectType = ImportProject::Type::NONE;
     ImportProject project;
     std::string vsConfig;
 
+    std::string platform;
+    char defaultSign = '\0';
+
+    std::vector<std::string> lookupPaths{
+        Path::getCurrentPath(), // TODO: do we want to look in CWD?
+        Path::getPathFromFilename(mSettings.exename),
+    };
+
     bool executorAuto = true;
 
     for (int i = 1; i < argc; i++) {
@@ -478,8 +453,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             if (!mSettings.userDefines.empty())
                 mSettings.userDefines += ";";
             mSettings.userDefines += define;
-
-            def = true;
         }
 
         // -E
@@ -544,8 +517,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         else if (std::strncmp(argv[i],"--addon-python=", 15) == 0)
             mSettings.addonPython.assign(argv[i]+15);
 
-        else if (std::strcmp(argv[i],"--analyze-all-vs-configs") == 0)
+        else if (std::strcmp(argv[i],"--analyze-all-vs-configs") == 0) {
             mSettings.analyzeAllVsConfigs = true;
+            mAnalyzeAllVsConfigsSetOnCmdLine = true;
+        }
 
         // Check configuration
         else if (std::strcmp(argv[i], "--check-config") == 0)
@@ -645,6 +620,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.cppHeaderProbe = true;
         }
 
+        else if (std::strcmp(argv[i], "--debug-analyzerinfo") == 0)
+            mSettings.debugainfo = true;
+
         else if (std::strcmp(argv[i], "--debug-ast") == 0)
             mSettings.debugast = true;
 
@@ -656,33 +634,19 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         else if (std::strcmp(argv[i], "--debug-ignore") == 0)
             mSettings.debugignore = true;
 
+        else if (std::strcmp(argv[i], "--debug-ipc") == 0)
+            mSettings.debugipc = true;
+
         // Show --debug output after the first simplifications
         else if (std::strcmp(argv[i], "--debug") == 0 ||
                  std::strcmp(argv[i], "--debug-normal") == 0)
-            mSettings.debugnormal = true;
+            debug = true;
 
-        // Show debug warnings for lookup for configuration files
         else if (std::strcmp(argv[i], "--debug-lookup") == 0)
-            mSettings.debuglookup = true;
+            continue; // already handled above
 
-        else if (std::strncmp(argv[i], "--debug-lookup=", 15) == 0) {
-            const std::string lookup = argv[i] + 15;
-            if (lookup == "all")
-                mSettings.debuglookup = true;
-            else if (lookup == "addon")
-                mSettings.debuglookupAddon = true;
-            else if (lookup == "config")
-                mSettings.debuglookupConfig = true;
-            else if (lookup == "library")
-                mSettings.debuglookupLibrary = true;
-            else if (lookup == "platform")
-                mSettings.debuglookupPlatform = true;
-            else
-            {
-                mLogger.printError("unknown lookup '" + lookup + "'");
-                return Result::Fail;
-            }
-        }
+        else if (std::strncmp(argv[i], "--debug-lookup=", 15) == 0)
+            continue; // already handled above
 
         // Flag used for various purposes during debugging
         else if (std::strcmp(argv[i], "--debug-simplified") == 0)
@@ -794,6 +758,15 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
         }
 
+        else if (std::strncmp(argv[i], "--exitcode-suppress=", 20) == 0) {
+            const std::string suppression = argv[i]+20;
+            const std::string errmsg(mSuppressions.nofail.addSuppressionLine(suppression));
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
+            }
+        }
+
         // Filter errors
         else if (std::strncmp(argv[i], "--exitcode-suppressions=", 24) == 0) {
             // exitcode-suppressions=filename.txt
@@ -819,6 +792,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     mLogger.printError("Failed: --file-filter=-");
                     return Result::Fail;
                 }
+            } else if (std::strcmp(filter, "+") == 0) {
+                inputAsFilter = true;
             } else {
                 mSettings.fileFilters.emplace_back(filter);
             }
@@ -835,14 +810,16 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
 
         // Force checking of files that have "too many" configurations
-        else if (std::strcmp(argv[i], "-f") == 0 || std::strcmp(argv[i], "--force") == 0)
+        else if (std::strcmp(argv[i], "-f") == 0 || std::strcmp(argv[i], "--force") == 0) {
             mSettings.force = true;
+            mSettings.maxConfigsOption = Settings::maxConfigsNotAssigned;
+        }
 
         else if (std::strcmp(argv[i], "--fsigned-char") == 0)
-            mSettings.platform.defaultSign = 's';
+            defaultSign = 's';
 
         else if (std::strcmp(argv[i], "--funsigned-char") == 0)
-            mSettings.platform.defaultSign = 'u';
+            defaultSign = 'u';
 
         // Ignored paths
         else if (std::strncmp(argv[i], "-i", 2) == 0) {
@@ -977,9 +954,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
 
             if (str == "c")
-                mSettings.enforcedLang = Standards::Language::C;
+                mEnforcedLang = Standards::Language::C;
             else if (str == "c++")
-                mSettings.enforcedLang = Standards::Language::CPP;
+                mEnforcedLang = Standards::Language::CPP;
             else {
                 mLogger.printError("unknown language '" + str + "' enforced.");
                 return Result::Fail;
@@ -1008,9 +985,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
             }
 
-            mSettings.maxConfigs = tmp;
+            mSettings.maxConfigsOption = tmp;
             mSettings.force = false;
-            maxconfigs = true;
         }
 
         // max ctu depth
@@ -1030,8 +1006,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
         }
 
-        else if (std::strcmp(argv[i],"--no-analyze-all-vs-configs") == 0)
+        else if (std::strcmp(argv[i],"--no-analyze-all-vs-configs") == 0) {
             mSettings.analyzeAllVsConfigs = false;
+            mAnalyzeAllVsConfigsSetOnCmdLine = true;
+        }
 
         else if (std::strcmp(argv[i], "--no-check-headers") == 0)
             mSettings.checkHeaders = false;
@@ -1048,11 +1026,18 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.cppHeaderProbe = false;
         }
 
+        else if (std::strcmp(argv[i], "--no-safety") == 0)
+            mSettings.safety = false;
+
         // Write results in file
         else if (std::strncmp(argv[i], "--output-file=", 14) == 0)
             mSettings.outputFile = Path::simplifyPath(argv[i] + 14);
 
         else if (std::strncmp(argv[i], "--output-format=", 16) == 0) {
+            if (xmlOptionProvided) {
+                outputFormatOptionMixingError();
+                return Result::Fail;
+            }
             const std::string format = argv[i] + 16;
             // plist can not be handled here because it requires additional data
             if (format == "text")
@@ -1061,11 +1046,18 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.outputFormat = Settings::OutputFormat::sarif;
             else if (format == "xml")
                 mSettings.outputFormat = Settings::OutputFormat::xml;
-            else {
-                mLogger.printError("argument to '--output-format=' must be 'text', 'sarif' or 'xml'.");
+            else if (format == "xmlv2") {
+                mSettings.outputFormat = Settings::OutputFormat::xml;
+                mSettings.xml_version = 2;
+            } else if (format == "xmlv3") {
+                mSettings.outputFormat = Settings::OutputFormat::xml;
+                mSettings.xml_version = 3;
+            } else {
+                mLogger.printError("argument to '--output-format=' must be 'text', 'sarif', 'xml' (deprecated), 'xmlv2' or 'xmlv3'.");
                 return Result::Fail;
             }
             mSettings.plistOutput = "";
+            outputFormatOptionProvided = true;
         }
 
 
@@ -1088,22 +1080,12 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
         // Specify platform
         else if (std::strncmp(argv[i], "--platform=", 11) == 0) {
-            const std::string platform(11+argv[i]);
-
-            std::string errstr;
-            const std::vector<std::string> paths = {argv[0]};
-            if (!mSettings.platform.set(platform, errstr, paths, mSettings.debuglookup || mSettings.debuglookupPlatform)) {
-                mLogger.printError(errstr);
+            std::string p = 11 + argv[i];
+            if (p.empty()) {
+                mLogger.printError("empty platform specified.");
                 return Result::Fail;
             }
-
-            // TODO: remove
-            // these are loaded via external files and thus have Settings::PlatformFile set instead.
-            // override the type so they behave like the regular platforms.
-            if (platform == "unix32-unsigned")
-                mSettings.platform.type = Platform::Type::Unix32;
-            else if (platform == "unix64-unsigned")
-                mSettings.platform.type = Platform::Type::Unix64;
+            platform = std::move(p);
         }
 
         // Write results in results.plist
@@ -1129,21 +1111,26 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
 
         // Special Cppcheck Premium options
-        else if ((std::strncmp(argv[i], "--premium=", 10) == 0 || std::strncmp(argv[i], "--premium-", 10) == 0) && isCppcheckPremium()) {
+        else if ((std::strncmp(argv[i], "--premium=", 10) == 0 || std::strncmp(argv[i], "--premium-", 10) == 0) && mSettings.premium) {
             // valid options --premium=..
             const std::set<std::string> valid{
                 "autosar",
                 "cert-c-2016",
                 "cert-c++-2016",
                 "cert-cpp-2016",
+                "cert-c",
+                "cert-c++",
+                "metrics",
                 "misra-c-2012",
                 "misra-c-2023",
+                "misra-c-2025",
                 "misra-c++-2008",
                 "misra-cpp-2008",
                 "misra-c++-2023",
                 "misra-cpp-2023",
                 "bughunting",
-                "safety",
+                "safety",  // TODO: deprecate in favor of the regular --safety/--no-safety
+                "safety-profiles",
                 "debug-progress"};
             // valid options --premium-..=
             const std::set<std::string> valid2{
@@ -1161,12 +1148,22 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.premiumArgs += " ";
             const std::string p(argv[i] + 10);
             const std::string p2(p.find('=') != std::string::npos ? p.substr(0, p.find('=')) : "");
-            if (!valid.count(p) && !valid2.count(p2)) {
+            const bool isCodingStandard = startsWith(p, "autosar") || startsWith(p,"cert-") || startsWith(p,"misra-") || p == "safety-profiles";
+            const std::string p3(endsWith(p,":all") && isCodingStandard ? p.substr(0,p.rfind(':')) : p);
+            if (!valid.count(p3) && !valid2.count(p2)) {
                 mLogger.printError("invalid --premium option '" + (p2.empty() ? p : p2) + "'.");
                 return Result::Fail;
             }
-            mSettings.premiumArgs += "--" + p;
-            if (startsWith(p, "autosar") || startsWith(p, "cert") || startsWith(p, "misra")) {
+            if (p2 == "cert-c-int-precision") {
+                int tmp;
+                if (!parseNumberArg(argv[i], 31, tmp, true))
+                    return Result::Fail;
+            }
+            if (p.find(' ') != std::string::npos)
+                mSettings.premiumArgs += "\"--" + p + "\"";
+            else
+                mSettings.premiumArgs += "--" + p;
+            if (isCodingStandard) {
                 // All checkers related to the coding standard should be enabled. The coding standards
                 // do not all undefined behavior or portability issues.
                 mSettings.addEnabled("warning");
@@ -1182,7 +1179,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
             }
 
-            mSettings.checkAllConfigurations = false;     // Can be overridden with --max-configs or --force
             std::string projectFile = argv[i]+10;
             projectType = project.import(projectFile, &mSettings, &mSuppressions);
             if (projectType == ImportProject::Type::CPPCHECK_GUI) {
@@ -1192,17 +1188,11 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 const auto& excludedPaths = project.guiProject.excludedPaths;
                 std::copy(excludedPaths.cbegin(), excludedPaths.cend(), std::back_inserter(mIgnoredPaths));
 
-                std::string platform(project.guiProject.platform);
+                if (!project.guiProject.platform.empty())
+                    platform = project.guiProject.platform;
 
-                // keep existing platform from command-line intact
-                if (!platform.empty()) {
-                    std::string errstr;
-                    const std::vector<std::string> paths = {projectFile, argv[0]};
-                    if (!mSettings.platform.set(platform, errstr, paths, mSettings.debuglookup || mSettings.debuglookupPlatform)) {
-                        mLogger.printError(errstr);
-                        return Result::Fail;
-                    }
-                }
+                // look for external files relative to project first
+                lookupPaths.insert(lookupPaths.cbegin(), Path::getPathFromFilename(projectFile));
 
                 const auto& projectFileGui = project.guiProject.projectFile;
                 if (!projectFileGui.empty()) {
@@ -1215,9 +1205,15 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     }
                 }
             }
-            if (projectType == ImportProject::Type::VS_SLN || projectType == ImportProject::Type::VS_VCXPROJ) {
+            if (projectType == ImportProject::Type::COMPILE_DB)
+                mSettings.maxConfigsProject = 1;
+            if (projectType == ImportProject::Type::VS_SLN ||
+                projectType == ImportProject::Type::VS_SLNX ||
+                projectType == ImportProject::Type::VS_VCXPROJ) {
                 mSettings.libraries.emplace_back("windows");
             }
+            for (const auto &error : project.errors)
+                mLogger.printError(error);
             if (projectType == ImportProject::Type::MISSING) {
                 mLogger.printError("failed to open project '" + projectFile + "'. The file does not exist.");
                 return Result::Fail;
@@ -1239,7 +1235,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mLogger.printError("--project-configuration parameter is empty.");
                 return Result::Fail;
             }
-            if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) {
+            if (projectType != ImportProject::Type::VS_SLN &&
+                projectType != ImportProject::Type::VS_SLNX &&
+                projectType != ImportProject::Type::VS_VCXPROJ) {
                 mLogger.printError("--project-configuration has no effect - no Visual Studio project provided.");
                 return Result::Fail;
             }
@@ -1291,8 +1289,12 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.reportType = ReportType::certC;
             } else if (typeStr == "cert-cpp-2016") {
                 mSettings.reportType = ReportType::certCpp;
-            } else if (typeStr == "misra-c-2012" || typeStr == "misra-c-2023") {
-                mSettings.reportType = ReportType::misraC;
+            } else if (typeStr == "misra-c-2012") {
+                mSettings.reportType = ReportType::misraC2012;
+            } else if (typeStr == "misra-c-2023") {
+                mSettings.reportType = ReportType::misraC2023;
+            } else if (typeStr == "misra-c-2025") {
+                mSettings.reportType = ReportType::misraC2025;
             } else if (typeStr == "misra-cpp-2008") {
                 mSettings.reportType = ReportType::misraCpp2008;
             } else if (typeStr == "misra-cpp-2023") {
@@ -1306,7 +1308,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         // Rule given at command line
         else if (std::strncmp(argv[i], "--rule=", 7) == 0) {
 #ifdef HAVE_RULES
-            Settings::Rule rule;
+            Rule rule;
             rule.pattern = 7 + argv[i];
 
             if (rule.pattern.empty()) {
@@ -1314,6 +1316,13 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 return Result::Fail;
             }
 
+            std::string regex_err;
+            auto regex = Regex::create(rule.pattern, Regex::Engine::Pcre, regex_err);
+            if (!regex) {
+                mLogger.printError("failed to compile rule pattern '" + rule.pattern + "' (" + regex_err + ").");
+                return Result::Fail;
+            }
+            rule.regex = std::move(regex);
             mSettings.rules.emplace_back(std::move(rule));
 #else
             mLogger.printError("Option --rule cannot be used as Cppcheck has not been built with rules support.");
@@ -1335,7 +1344,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 if (node && strcmp(node->Value(), "rules") == 0)
                     node = node->FirstChildElement("rule");
                 for (; node && strcmp(node->Value(), "rule") == 0; node = node->NextSiblingElement()) {
-                    Settings::Rule rule;
+                    Rule rule;
+                    Regex::Engine regexEngine = Regex::Engine::Pcre;
 
                     for (const tinyxml2::XMLElement *subnode = node->FirstChildElement(); subnode; subnode = subnode->NextSiblingElement()) {
                         const char * const subname = subnode->Name();
@@ -1365,6 +1375,16 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                                 }
                             }
                         }
+                        else if (std::strcmp(subname, "engine") == 0) {
+                            const char * const engine = empty_if_null(subtext);
+                            if (std::strcmp(engine, "pcre") == 0) {
+                                regexEngine = Regex::Engine::Pcre;
+                            }
+                            else {
+                                mLogger.printError(std::string("unknown regex engine '") + engine + "'.");
+                                return Result::Fail;
+                            }
+                        }
                         else {
                             mLogger.printError("unable to load rule-file '" + ruleFile + "' - unknown element '" + subname + "' encountered in 'rule'.");
                             return Result::Fail;
@@ -1391,6 +1411,14 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                         return Result::Fail;
                     }
 
+                    std::string regex_err;
+                    auto regex = Regex::create(rule.pattern, regexEngine, regex_err);
+                    if (!regex) {
+                        mLogger.printError("unable to load rule-file '" + ruleFile + "' - pattern '" + rule.pattern + "' failed to compile (" + regex_err + ").");
+                        return Result::Fail;
+                    }
+                    rule.regex = std::move(regex);
+
                     if (rule.severity == Severity::none) {
                         mLogger.printError("unable to load rule-file '" + ruleFile + "' - a rule has an invalid severity.");
                         return Result::Fail;
@@ -1416,27 +1444,23 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         else if (std::strncmp(argv[i], "--showtime=", 11) == 0) {
             const std::string showtimeMode = argv[i] + 11;
             if (showtimeMode == "file")
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE;
+                mSettings.showtime = Settings::ShowTime::FILE;
             else if (showtimeMode == "file-total")
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
+                mSettings.showtime = Settings::ShowTime::FILE_TOTAL;
             else if (showtimeMode == "summary")
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY;
-            else if (showtimeMode == "top5") {
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE;
-                mLogger.printMessage("--showtime=top5 is deprecated and will be removed in Cppcheck 2.14. Please use --showtime=top5_file or --showtime=top5_summary instead.");
-            }
+                mSettings.showtime = Settings::ShowTime::SUMMARY;
             else if (showtimeMode == "top5_file")
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE;
+                mSettings.showtime = Settings::ShowTime::TOP5_FILE;
             else if (showtimeMode == "top5_summary")
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY;
+                mSettings.showtime = Settings::ShowTime::TOP5_SUMMARY;
             else if (showtimeMode == "none")
-                mSettings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+                mSettings.showtime = Settings::ShowTime::NONE;
             else if (showtimeMode.empty()) {
                 mLogger.printError("no mode provided for --showtime");
                 return Result::Fail;
             }
             else {
-                mLogger.printError("unrecognized --showtime mode: '" + showtimeMode + "'. Supported modes: file, file-total, summary, top5, top5_file, top5_summary.");
+                mLogger.printError("unrecognized --showtime mode: '" + showtimeMode + "'. Supported modes: file, file-total, summary, top5_file, top5_summary.");
                 return Result::Fail;
             }
         }
@@ -1550,11 +1574,20 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
         // Write results in results.xml
         else if (std::strcmp(argv[i], "--xml") == 0) {
+            if (outputFormatOptionProvided) {
+                outputFormatOptionMixingError();
+                return Result::Fail;
+            }
             mSettings.outputFormat = Settings::OutputFormat::xml;
+            xmlOptionProvided = true;
         }
 
         // Define the XML file version (and enable XML output)
         else if (std::strncmp(argv[i], "--xml-version=", 14) == 0) {
+            if (outputFormatOptionProvided) {
+                outputFormatOptionMixingError();
+                return Result::Fail;
+            }
             int tmp;
             if (!parseNumberArg(argv[i], 14, tmp))
                 return Result::Fail;
@@ -1567,6 +1600,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.xml_version = tmp;
             // Enable also XML if version is set
             mSettings.outputFormat = Settings::OutputFormat::xml;
+            xmlOptionProvided = true;
         }
 
         else {
@@ -1578,9 +1612,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         }
     }
 
-    if (!loadCppcheckCfg())
-        return Result::Fail;
-
     // TODO: bail out?
     if (!executorAuto && mSettings.useSingleJob())
         mLogger.printMessage("'--executor' has no effect as only a single job will be used.");
@@ -1592,26 +1623,42 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             mSettings.templateLocation = "{bold}{file}:{line}:{column}: {dim}note:{reset} {info}\\n{code}";
     }
     // replace static parts of the templates
-    substituteTemplateFormatStatic(mSettings.templateFormat);
-    substituteTemplateLocationStatic(mSettings.templateLocation);
-
-    if (mSettings.force || maxconfigs)
-        mSettings.checkAllConfigurations = true;
-
-    if (mSettings.force)
-        mSettings.maxConfigs = INT_MAX;
+    substituteTemplateFormatStatic(mSettings.templateFormat, !mSettings.outputFile.empty());
+    substituteTemplateLocationStatic(mSettings.templateLocation, !mSettings.outputFile.empty());
 
-    else if ((def || mSettings.preprocessOnly) && !maxconfigs)
-        mSettings.maxConfigs = 1U;
+    if (debug) {
+        mSettings.debugnormal = true;
+        mSettings.debugvalueflow = true;
+        if (mSettings.verbose) {
+            mSettings.debugast = true;
+            mSettings.debugsymdb = true;
+        }
+    }
 
     if (mSettings.jobs > 1 && mSettings.buildDir.empty()) {
         // TODO: bail out instead?
         if (mSettings.checks.isEnabled(Checks::unusedFunction))
+        {
             mLogger.printMessage("unusedFunction check requires --cppcheck-build-dir to be active with -j.");
+            mSettings.checks.disable(Checks::unusedFunction);
+            // TODO: is there some later logic to remove?
+        }
         // TODO: enable
         //mLogger.printMessage("whole program analysis requires --cppcheck-build-dir to be active with -j.");
     }
 
+    if (!mSettings.checks.isEnabled(Checks::unusedFunction))
+        mSettings.unmatchedSuppressionFilters.emplace_back("unusedFunction");
+    if (!mSettings.addons.count("misra"))
+        mSettings.unmatchedSuppressionFilters.emplace_back("misra-*");
+    if (!mSettings.premium)
+        mSettings.unmatchedSuppressionFilters.emplace_back("premium-*");
+
+    if (inputAsFilter) {
+        mSettings.fileFilters.insert(mSettings.fileFilters.end(), mPathNames.cbegin(), mPathNames.cend());
+        mPathNames.clear();
+    }
+
     if (!mPathNames.empty() && projectType != ImportProject::Type::NONE) {
         mLogger.printError("--project cannot be used in conjunction with source files.");
         return Result::Fail;
@@ -1623,14 +1670,30 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         project.ignoreOtherConfigs(vsConfig);
     }
 
-    if (!mSettings.analyzeAllVsConfigs) {
-        if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) {
-            mLogger.printError("--no-analyze-all-vs-configs has no effect - no Visual Studio project provided.");
+    if (!platform.empty())
+    {
+        std::string errstr;
+        if (!mSettings.platform.set(platform, errstr, lookupPaths, mSettings.debuglookup || mSettings.debuglookupPlatform)) {
+            mLogger.printError(errstr);
             return Result::Fail;
         }
+    }
 
-        // TODO: bail out when this does nothing
-        project.selectOneVsConfig(mSettings.platform.type);
+    if (defaultSign != '\0')
+        mSettings.platform.defaultSign = defaultSign;
+
+    if (!mSettings.analyzeAllVsConfigs) {
+        if (projectType != ImportProject::Type::VS_SLN &&
+            projectType != ImportProject::Type::VS_SLNX &&
+            projectType != ImportProject::Type::VS_VCXPROJ) {
+            if (mAnalyzeAllVsConfigsSetOnCmdLine) {
+                mLogger.printError("--no-analyze-all-vs-configs has no effect - no Visual Studio project provided.");
+                return Result::Fail;
+            }
+        } else {
+            // TODO: bail out when this does nothing
+            project.selectOneVsConfig(mSettings.platform.type);
+        }
     }
 
     if (!mSettings.buildDir.empty() && !Path::isDirectory(mSettings.buildDir)) {
@@ -1648,19 +1711,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     for (auto& path : mIgnoredPaths)
     {
         path = Path::removeQuotationMarks(std::move(path));
-        path = Path::simplifyPath(std::move(path));
-
-        bool isdir = false;
-        if (!Path::exists(path, &isdir) && mSettings.debugignore) {
-            // FIXME: this is misleading because we match from the end of the path so it does not require to exist
-            //std::cout << "path to ignore does not exist: " << path << std::endl;
-        }
-        // TODO: this only works when it exists
-        if (isdir) {
-            // If directory name doesn't end with / or \, add it
-            if (!endsWith(path, '/'))
-                path += '/';
-        }
+        path = Path::fromNativeSeparators(std::move(path));
     }
 
     if (!project.guiProject.pathNames.empty())
@@ -1691,11 +1742,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
 void CmdLineParser::printHelp() const
 {
-    const std::string manualUrl(isCppcheckPremium() ?
-                                "https://cppcheck.sourceforge.io/manual.pdf" :
-                                "https://files.cppchecksolutions.com/manual.pdf");
-
     std::ostringstream oss;
+    // TODO: display product name
     oss << "Cppcheck - A tool for static C/C++ code analysis\n"
         "\n"
         "Syntax:\n"
@@ -1747,9 +1795,9 @@ void CmdLineParser::printHelp() const
         "                         be considered for evaluation.\n"
         "    --config-excludes-file=<file>\n"
         "                         A file that contains a list of config-excludes\n"
-        "    --disable=<id>       Disable individual checks.\n"
-        "                         Please refer to the documentation of --enable=<id>\n"
-        "                         for further details.\n"
+        "    --disable=<severity> Disable checks with the given severity.\n"
+        "                         Please refer to the documentation of --enable for\n"
+        "                         further details.\n"
         "    --dump               Dump xml data for each translation unit. The dump\n"
         "                         files have the extension .dump and contain ast,\n"
         "                         tokenlist, symboldatabase, valueflow.\n"
@@ -1759,44 +1807,42 @@ void CmdLineParser::printHelp() const
         "                         Example: '-DDEBUG=1 -D__cplusplus'.\n"
         "    -E                   Print preprocessor output on stdout and don't do any\n"
         "                         further processing.\n"
-        "    --enable=<id>        Enable additional checks. The available ids are:\n"
-        "                          * all\n"
-        "                                  Enable all checks. It is recommended to only\n"
-        "                                  use --enable=all when the whole program is\n"
-        "                                  scanned, because this enables unusedFunction.\n"
+        "    --enable=<severity>  Enable additional checks grouped by severity. The available\n"
+        "                         severities are:\n"
         "                          * warning\n"
-        "                                  Enable warning messages\n"
-        "                          * style\n"
-        "                                  Enable all coding style checks. All messages\n"
-        "                                  with the severities 'style', 'warning',\n"
-        "                                  'performance' and 'portability' are enabled.\n"
         "                          * performance\n"
-        "                                  Enable performance messages\n"
         "                          * portability\n"
-        "                                  Enable portability messages\n"
         "                          * information\n"
-        "                                  Enable information messages\n"
+        "                          * style\n"
+        "                                  Enable checks with severities 'style', 'warning',\n"
+        "                                  'performance' and 'portability'.\n"
         "                          * unusedFunction\n"
         "                                  Check for unused functions. It is recommended\n"
         "                                  to only enable this when the whole program is\n"
         "                                  scanned.\n"
         "                          * missingInclude\n"
-        "                                  Warn if there are missing includes.\n"
-        "                         Several ids can be given if you separate them with\n"
-        "                         commas. See also --std\n"
+        "                                  Check for missing include files.\n"
+        "                          * all\n"
+        "                                  Enable all checks.\n"
+        "                         Pass multiple severities as a comma-separated list.\n"
         "    --error-exitcode=<n> If errors are found, integer [n] is returned instead of\n"
         "                         the default '0'. '" << EXIT_FAILURE << "' is returned\n"
         "                         if arguments are not valid or if no input files are\n"
         "                         provided. Note that your operating system can modify\n"
         "                         this value, e.g. '256' can become '0'.\n"
         "    --errorlist          Print a list of all the error messages in XML format.\n"
+        "    --exitcode-suppress=<spec>\n"
+        "                         Used to specify an error ID which should not result in\n"
+        "                         a non-zero exitcode."
         "    --exitcode-suppressions=<file>\n"
         "                         Used when certain messages should be displayed but\n"
         "                         should not cause a non-zero exitcode.\n"
-        "    --file-filter=<str>  Analyze only those files matching the given filter str\n"
-        "                         Can be used multiple times\n"
+        "    --file-filter=<str>  Analyze only those files matching the given filter str.\n"
+        "                         Can be used multiple times. When str is '-', the file\n"
+        "                         filter will be read from standard input. When str is '+',\n"
+        "                         given files on CLI will be treated as file filters.\n"
         "                         Example: --file-filter=*bar.cpp analyzes only files\n"
-        "                                  that end with bar.cpp.\n"
+        "                         that end with bar.cpp.\n"
         "    --file-list=<file>   Specify the files to check in a text file. Add one\n"
         "                         filename per line. When file is '-,' the file list will\n"
         "                         be read from standard input.\n"
@@ -1818,10 +1864,13 @@ void CmdLineParser::printHelp() const
         "                         this is not needed.\n"
         "    --include=<file>\n"
         "                         Force inclusion of a file before the checked file.\n"
-        "    -i <dir or file>     Give a source file or source file directory to exclude\n"
-        "                         from the check. This applies only to source files so\n"
-        "                         header files included by source files are not matched.\n"
-        "                         Directory name is matched to all parts of the path.\n"
+        "    -i <str>             Ignore files that match <str>. <str> can be a filename\n"
+        "                         or directory and can contain *,**,?. A file that is\n"
+        "                         ignored will not be checked directly (the whole\n"
+        "                         translation unit is skipped completely). Header files\n"
+        "                         are checked indirectly when they are #include'd.\n"
+        "                         Note: If you want to prevent warnings in some headers,\n"
+        "                         use suppressions instead.\n"
         "    --inconclusive       Allow that Cppcheck reports even though the analysis is\n"
         "                         inconclusive.\n"
         "                         There are false positives with this option. Each result\n"
@@ -1857,7 +1906,9 @@ void CmdLineParser::printHelp() const
         "                        Specify the output format. The available formats are:\n"
         "                          * text\n"
         "                          * sarif\n"
-        "                          * xml\n"
+        "                          * xml (deprecated)\n"
+        "                          * xmlv2\n"
+        "                          * xmlv3\n"
         "    --platform=<type>, --platform=<file>\n"
         "                         Specifies platform specific types and sizes. The\n"
         "                         available builtin platforms are:\n"
@@ -1893,33 +1944,43 @@ void CmdLineParser::printHelp() const
         "    --plist-output=<path>\n"
         "                         Generate Clang-plist output files in folder.\n";
 
-    if (isCppcheckPremium()) {
+    if (mSettings.premium) {
         oss <<
             "    --premium=<option>\n"
             "                         Coding standards:\n"
             "                          * autosar           Autosar (partial)\n"
-            "                          * cert-c-2016       Cert C 2016 checking\n"
-            "                          * cert-c++-2016     Cert C++ 2016 checking\n"
+            "                          * cert-c            Cert C checking\n"
+            "                          * cert-c++          Cert C++ checking\n"
             "                          * misra-c-2012      Misra C 2012\n"
             "                          * misra-c-2023      Misra C 2023\n"
+            "                          * misra-c-2025      Misra C 2025\n"
             "                          * misra-c++-2008    Misra C++ 2008\n"
             "                          * misra-c++-2023    Misra C++ 2023\n"
+            "                         By default 'Misra/Cert C' only checks C files.\n"
+            "                         By default 'Autosar/Misra/Cert C++' only checks C++ files.\n"
+            "                         To check all files, append \":all\" i.e. --premium=misra-c++-2023:all.\n"
             "                         Other:\n"
             "                          * bughunting        Soundy analysis\n"
-            "                          * cert-c-int-precision=BITS  Integer precision to use in Cert C analysis.\n"
+            "                          * metrics           Calculate metrics. Metrics are only reported in xmlv3 output.\n"
             "                          * safety            Turn on safety certified behavior (ON by default)\n"
-            "                          * safety-off        Turn off safety certified behavior\n";
+            "                          * safety-off        Turn off safety certified behavior\n"
+            "    --premium-cert-c-int-precision=BITS\n"
+            "                         Integer precision to use in Cert C analysis. Only needed if precision of 'int' is\n"
+            "                         less than the size of 'int'. BITS shall be a positive value that is less than the\n"
+            "                         size of 'int'. This precision is used for INT35-C checking.\n"
+            "    --premium-license-file=<path>\n"
+            "                         Provide license file path with argument.\n";
     }
 
     oss <<
         "    --project=<file>     Run Cppcheck on project. The <file> can be a Visual\n"
-        "                         Studio Solution (*.sln), Visual Studio Project\n"
+        "                         Studio Solution (*.sln) or (*.slnx), Visual Studio Project\n"
         "                         (*.vcxproj), compile database (compile_commands.json),\n"
         "                         or Borland C++ Builder 6 (*.bpr). The files to analyse,\n"
         "                         include paths, defines, platform and undefines in\n"
         "                         the specified file will be used.\n"
         "    --project-configuration=<config>\n"
-        "                         If used together with a Visual Studio Solution (*.sln)\n"
+        "                         If used together with a Visual Studio Solution (*.sln) or (*.slnx)\n"
         "                         or Visual Studio Project (*.vcxproj) you can limit\n"
         "                         the configuration cppcheck should check.\n"
         "                         For example: '--project-configuration=Release|Win32'\n"
@@ -1942,6 +2003,7 @@ void CmdLineParser::printHelp() const
         "                          * cert-cpp-2016    Cert C++ 2016\n"
         "                          * misra-c-2012     Misra C 2012\n"
         "                          * misra-c-2023     Misra C 2023\n"
+        "                          * misra-c-2025     Misra C 2025\n"
         "                          * misra-cpp-2008   Misra C++ 2008\n"
         "                          * misra-cpp-2023   Misra C++ 2023\n"
         "    --rule=<rule>        Match regular expression.\n"
@@ -1964,8 +2026,6 @@ void CmdLineParser::printHelp() const
         "                                 Show the top 5 for each processed file\n"
         "                          * top5_summary\n"
         "                                 Show the top 5 summary at the end\n"
-        "                          * top5\n"
-        "                                 Alias for top5_file (deprecated)\n"
         "    --std=<id>           Set standard.\n"
         "                         The available options are:\n"
         "                          * c89\n"
@@ -2055,7 +2115,7 @@ void CmdLineParser::printHelp() const
         "  cppcheck -I inc1/ -I inc2/ f.cpp\n"
         "\n"
         "For more information:\n"
-        "    " << manualUrl << "\n"
+        "    " << mSettings.manualUrl << "\n"
         "\n"
         "Many thanks to the 3rd party libraries we use:\n"
         " * tinyxml2 -- loading project/library/ctu files.\n"
@@ -2067,6 +2127,7 @@ void CmdLineParser::printHelp() const
 }
 
 std::string CmdLineParser::getVersion() const {
+    // TODO: this should not contain the version - it should set the extraVersion
     if (!mSettings.cppcheckCfgProductName.empty())
         return mSettings.cppcheckCfgProductName;
     const char * const extraVersion = CppCheck::extraVersion();
@@ -2075,12 +2136,6 @@ std::string CmdLineParser::getVersion() const {
     return std::string("Cppcheck ") + CppCheck::version();
 }
 
-bool CmdLineParser::isCppcheckPremium() const {
-    if (mSettings.cppcheckCfgProductName.empty())
-        Settings::loadCppcheckCfg(mSettings, mSuppressions, mSettings.debuglookup || mSettings.debuglookupConfig);
-    return startsWith(mSettings.cppcheckCfgProductName, "Cppcheck Premium");
-}
-
 bool CmdLineParser::tryLoadLibrary(Library& destination, const std::string& basepath, const char* filename, bool debug)
 {
     const Library::Error err = destination.load(basepath.c_str(), filename, debug);
@@ -2173,26 +2228,33 @@ bool CmdLineParser::loadAddons(Settings& settings)
 
 bool CmdLineParser::loadCppcheckCfg()
 {
-    if (!mSettings.cppcheckCfgProductName.empty())
-        return true;
+    if (!mSettings.settingsFiles.empty())
+    {
+        // should never happen - programming error
+        mLogger.printError("cppcheck.cfg has already been loaded from " + mSettings.settingsFiles[0]);
+        return false;
+    }
     const std::string cfgErr = Settings::loadCppcheckCfg(mSettings, mSuppressions, mSettings.debuglookup || mSettings.debuglookupConfig);
     if (!cfgErr.empty()) {
+        // TODO: log full path
         mLogger.printError("could not load cppcheck.cfg - " + cfgErr);
         return false;
     }
+    mSettings.premium = startsWith(mSettings.cppcheckCfgProductName, "Cppcheck Premium");
     return true;
 }
 
 std::list<FileWithDetails> CmdLineParser::filterFiles(const std::vector<std::string>& fileFilters,
                                                       const std::list<FileWithDetails>& filesResolved) {
     std::list<FileWithDetails> files;
-#ifdef _WIN32
-    constexpr bool caseInsensitive = true;
-#else
-    constexpr bool caseInsensitive = false;
-#endif
+    PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
     std::copy_if(filesResolved.cbegin(), filesResolved.cend(), std::inserter(files, files.end()), [&](const FileWithDetails& entry) {
-        return matchglobs(fileFilters, entry.path(), caseInsensitive) || matchglobs(fileFilters, entry.spath(), caseInsensitive);
+        return filtermatcher.match(entry.path());
     });
     return files;
 }
+
+void CmdLineParser::outputFormatOptionMixingError() const
+{
+    mLogger.printError("'--output-format' and '--xml...' may not be used in conjunction.");
+}
diff --git a/cli/cmdlineparser.h b/cli/cmdlineparser.h
index 2e6032b4e1c..54e7ae4b0aa 100644
--- a/cli/cmdlineparser.h
+++ b/cli/cmdlineparser.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -27,6 +27,7 @@
 
 #include "cmdlinelogger.h"
 #include "filesettings.h"
+#include "standards.h"
 #include "utils.h"
 
 class Settings;
@@ -78,19 +79,6 @@ class CmdLineParser {
     static std::list<FileWithDetails> filterFiles(const std::vector<std::string>& fileFilters,
                                                   const std::list<FileWithDetails>& filesResolved);
 
-    /**
-     * Parse given command line.
-     * @return true if command line was ok, false if there was an error.
-     */
-    Result parseFromArgs(int argc, const char* const argv[]);
-
-    /**
-     * Return the path names user gave to command line.
-     */
-    const std::vector<std::string>& getPathNames() const {
-        return mPathNames;
-    }
-
     /**
      * Return the files user gave to command line.
      */
@@ -105,28 +93,24 @@ class CmdLineParser {
         return mFileSettings;
     }
 
+protected:
     /**
-     * Return a list of paths user wants to ignore.
+     * Parse given command line.
+     * @return true if command line was ok, false if there was an error.
      */
-    const std::vector<std::string>& getIgnoredPaths() const {
-        return mIgnoredPaths;
-    }
+    Result parseFromArgs(int argc, const char* const argv[]);
 
     /**
      * Get Cppcheck version
      */
     std::string getVersion() const;
 
-protected:
-
+private:
     /**
      * Print help text to the console.
      */
     void printHelp() const;
 
-private:
-    bool isCppcheckPremium() const;
-
     template<typename T>
     bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool mustBePositive = false)
     {
@@ -166,14 +150,21 @@ class CmdLineParser {
 
     bool loadCppcheckCfg();
 
+    void outputFormatOptionMixingError() const;
+
     CmdLineLogger &mLogger;
 
+    Settings &mSettings;
+    Suppressions &mSuppressions;
+
+protected:
     std::vector<std::string> mPathNames;
     std::list<FileWithDetails> mFiles;
     std::list<FileSettings> mFileSettings;
     std::vector<std::string> mIgnoredPaths;
-    Settings &mSettings;
-    Suppressions &mSuppressions;
+    bool mAnalyzeAllVsConfigsSetOnCmdLine = false;
+    /** @brief Name of the language that is enforced. Empty per default. */
+    Standards::Language mEnforcedLang{Standards::Language::None};
 };
 
 /// @}
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index 5ce01ef0eee..72a20315272 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -32,10 +32,12 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "filesettings.h"
-#include "json.h"
+#include "path.h"
+#include "sarifreport.h"
 #include "settings.h"
 #include "singleexecutor.h"
 #include "suppressions.h"
+#include "timer.h"
 #include "utils.h"
 
 #if defined(HAS_THREADING_MODEL_THREAD)
@@ -47,7 +49,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <cstdint>
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
 #include <ctime>
@@ -55,6 +56,7 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <sstream>
 #include <unordered_set>
@@ -73,157 +75,11 @@
 #include <windows.h>
 #endif
 
-#if !defined(WIN32) && !defined(__MINGW32__)
+#if !defined(_WIN32) && !defined(__MINGW32__)
 #include <sys/wait.h> // WIFEXITED and friends
 #endif
 
 namespace {
-    class SarifReport {
-    public:
-        void addFinding(ErrorMessage msg) {
-            mFindings.push_back(std::move(msg));
-        }
-
-        picojson::array serializeRules() const {
-            picojson::array ret;
-            std::set<std::string> ruleIds;
-            for (const auto& finding : mFindings) {
-                // github only supports findings with locations
-                if (finding.callStack.empty())
-                    continue;
-                if (ruleIds.insert(finding.id).second) {
-                    picojson::object rule;
-                    rule["id"] = picojson::value(finding.id);
-                    // rule.shortDescription.text
-                    picojson::object shortDescription;
-                    shortDescription["text"] = picojson::value(finding.shortMessage());
-                    rule["shortDescription"] = picojson::value(shortDescription);
-                    // rule.fullDescription.text
-                    picojson::object fullDescription;
-                    fullDescription["text"] = picojson::value(finding.verboseMessage());
-                    rule["fullDescription"] = picojson::value(fullDescription);
-                    // rule.help.text
-                    picojson::object help;
-                    help["text"] = picojson::value(finding.verboseMessage()); // FIXME provide proper help text
-                    rule["help"] = picojson::value(help);
-                    // rule.properties.precision, rule.properties.problem.severity
-                    picojson::object properties;
-                    properties["precision"] = picojson::value(sarifPrecision(finding));
-                    double securitySeverity = 0;
-                    if (finding.severity == Severity::error && !ErrorLogger::isCriticalErrorId(finding.id))
-                        securitySeverity = 9.9; // We see undefined behavior
-                    //else if (finding.severity == Severity::warning)
-                    //    securitySeverity = 5.1; // We see potential undefined behavior
-                    if (securitySeverity > 0.5) {
-                        properties["security-severity"] = picojson::value(securitySeverity);
-                        const picojson::array tags{picojson::value("security")};
-                        properties["tags"] = picojson::value(tags);
-                    }
-                    rule["properties"] = picojson::value(properties);
-
-                    ret.emplace_back(rule);
-                }
-            }
-            return ret;
-        }
-
-        static picojson::array serializeLocations(const ErrorMessage& finding) {
-            picojson::array ret;
-            for (const auto& location : finding.callStack) {
-                picojson::object physicalLocation;
-                picojson::object artifactLocation;
-                artifactLocation["uri"] = picojson::value(location.getfile(false));
-                physicalLocation["artifactLocation"] = picojson::value(artifactLocation);
-                picojson::object region;
-                region["startLine"] = picojson::value(static_cast<int64_t>(location.line));
-                region["startColumn"] = picojson::value(static_cast<int64_t>(location.column));
-                region["endLine"] = region["startLine"];
-                region["endColumn"] = region["startColumn"];
-                physicalLocation["region"] = picojson::value(region);
-                picojson::object loc;
-                loc["physicalLocation"] = picojson::value(physicalLocation);
-                ret.emplace_back(loc);
-            }
-            return ret;
-        }
-
-        picojson::array serializeResults() const {
-            picojson::array results;
-            for (const auto& finding : mFindings) {
-                // github only supports findings with locations
-                if (finding.callStack.empty())
-                    continue;
-                picojson::object res;
-                res["level"] = picojson::value(sarifSeverity(finding));
-                res["locations"] = picojson::value(serializeLocations(finding));
-                picojson::object message;
-                message["text"] = picojson::value(finding.shortMessage());
-                res["message"] = picojson::value(message);
-                res["ruleId"] = picojson::value(finding.id);
-                results.emplace_back(res);
-            }
-            return results;
-        }
-
-        picojson::value serializeRuns(const std::string& productName, const std::string& version) const {
-            picojson::object driver;
-            driver["name"] = picojson::value(productName);
-            driver["semanticVersion"] = picojson::value(version);
-            driver["informationUri"] = picojson::value("https://cppcheck.sourceforge.io");
-            driver["rules"] = picojson::value(serializeRules());
-            picojson::object tool;
-            tool["driver"] = picojson::value(driver);
-            picojson::object run;
-            run["tool"] = picojson::value(tool);
-            run["results"] = picojson::value(serializeResults());
-            picojson::array runs{picojson::value(run)};
-            return picojson::value(runs);
-        }
-
-        std::string serialize(std::string productName) const {
-            const auto nameAndVersion = Settings::getNameAndVersion(productName);
-            productName = nameAndVersion.first.empty() ? "Cppcheck" : nameAndVersion.first;
-            std::string version = nameAndVersion.first.empty() ? CppCheck::version() : nameAndVersion.second;
-            if (version.find(' ') != std::string::npos)
-                version.erase(version.find(' '), std::string::npos);
-
-            picojson::object doc;
-            doc["version"] = picojson::value("2.1.0");
-            doc["$schema"] = picojson::value("https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json");
-            doc["runs"] = serializeRuns(productName, version);
-
-            return picojson::value(doc).serialize(true);
-        }
-    private:
-
-        static std::string sarifSeverity(const ErrorMessage& errmsg) {
-            if (ErrorLogger::isCriticalErrorId(errmsg.id))
-                return "error";
-            switch (errmsg.severity) {
-            case Severity::error:
-            case Severity::warning:
-            case Severity::style:
-            case Severity::portability:
-            case Severity::performance:
-                return "warning";
-            case Severity::information:
-            case Severity::internal:
-            case Severity::debug:
-            case Severity::none:
-                return "note";
-            }
-            return "note";
-        }
-
-        static std::string sarifPrecision(const ErrorMessage& errmsg) {
-            if (errmsg.certainty == Certainty::inconclusive)
-                return "medium";
-            return "high";
-        }
-
-        std::vector<ErrorMessage> mFindings;
-    };
-
     class CmdLineLoggerStd : public CmdLineLogger
     {
     public:
@@ -255,6 +111,9 @@ namespace {
             if (!mSettings.outputFile.empty()) {
                 mErrorOutput = new std::ofstream(settings.outputFile);
             }
+            if (!mSettings.buildDir.empty()) {
+                mCheckersFile = Path::join(settings.buildDir, "checkers.txt");
+            }
         }
 
         ~StdLogger() override {
@@ -277,6 +136,23 @@ namespace {
          */
         void reportErr(const std::string &errmsg);
 
+        void reportMetric(const std::string &metric) override
+        {
+            mFileMetrics.push_back(metric);
+        }
+
+        void reportMetrics()
+        {
+            if (!mFileMetrics.empty()) {
+                auto &out = mErrorOutput ? *mErrorOutput : std::cerr;
+                out << "    <metrics>" << std::endl;
+                for (const auto &metric : mFileMetrics) {
+                    out << "        " << metric << std::endl;
+                }
+                out << "    </metrics>" << std::endl;
+            }
+        }
+
         /**
          * @brief Write the checkers report
          */
@@ -290,6 +166,23 @@ namespace {
             return mCtuInfo;
         }
 
+        void readActiveCheckers() {
+            if (mCheckersFile.empty())
+                return;
+
+            std::ifstream fin(mCheckersFile);
+            if (fin.is_open())
+            {
+                std::set<std::string> activeCheckers;
+                std::string line;
+                while (std::getline(fin, line))
+                {
+                    activeCheckers.emplace(std::move(line));
+                }
+                mActiveCheckers = std::move(activeCheckers);
+            }
+        }
+
     private:
         /**
          * Information about progress is directed here. This should be
@@ -349,6 +242,16 @@ namespace {
          * Coding standard guideline mapping
          */
         std::map<std::string, std::string> mGuidelineMapping;
+
+        /**
+         * File metrics
+         */
+        std::vector<std::string> mFileMetrics;
+
+        /**
+         * The file the cached active checkers are stored in
+         */
+        std::string mCheckersFile;
     };
 }
 
@@ -365,13 +268,15 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
         return EXIT_SUCCESS;
     }
 
+    std::unique_ptr<OneShotTimer> overallTimer;
+    if (settings.showtime == Settings::ShowTime::SUMMARY || settings.showtime == Settings::ShowTime::TOP5_SUMMARY)
+        overallTimer.reset(new OneShotTimer("Overall time"));
+
     settings.loadSummaries();
 
     mFiles = parser.getFiles();
     mFileSettings = parser.getFileSettings();
 
-    settings.setMisraRuleTexts(executeCommand);
-
     const int ret = check_wrapper(settings, supprs);
 
     return ret;
@@ -390,35 +295,123 @@ int CppCheckExecutor::check_wrapper(const Settings& settings, Suppressions& supp
     return check_internal(settings, supprs);
 }
 
-bool CppCheckExecutor::reportSuppressions(const Settings &settings, const SuppressionList& suppressions, bool unusedFunctionCheckEnabled, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger) {
-    const auto& suppr = suppressions.getSuppressions();
-    if (std::any_of(suppr.begin(), suppr.end(), [](const SuppressionList::Suppression& s) {
-        return s.errorId == "unmatchedSuppression" && s.fileName.empty() && s.lineNumber == SuppressionList::Suppression::NO_LINE;
+/**
+ * Get list of unmatchedSuppression errors
+ * @param unmatched list of unmatched suppressions
+ * @param filters a list of (globbed) IDs to filter out
+ * @return vector of unmatchedSuppression errors
+ */
+static std::vector<ErrorMessage> getUnmatchedSuppressions(const std::list<SuppressionList::Suppression> &unmatched, const std::vector<std::string>& filters)
+{
+    std::vector<ErrorMessage> errors;
+
+    // Report unmatched suppressions
+    for (const SuppressionList::Suppression &s : unmatched) {
+        // check if this unmatched suppression is suppressed
+        bool suppressed = false;
+        for (const SuppressionList::Suppression &s2 : unmatched) {
+            if (s2.errorId == "unmatchedSuppression") { // TODO: handle unmatchedPolyspaceSuppression?
+                if ((s2.fileName.empty() || s2.fileName == "*" || s2.fileName == s.fileName) &&
+                    (s2.lineNumber == SuppressionList::Suppression::NO_LINE || s2.lineNumber == s.lineNumber)) {
+                    suppressed = true;
+                    break;
+                }
+            }
+        }
+
+        if (suppressed)
+            continue;
+
+        const bool skip = std::any_of(filters.cbegin(), filters.cend(), [&s](const std::string& filter) {
+            return matchglob(filter, s.errorId);
+        });
+        if (skip)
+            continue;
+
+        std::list<ErrorMessage::FileLocation> callStack;
+        if (!s.fileName.empty()) {
+            callStack.emplace_back(s.fileName, s.lineNumber == -1 ? 0 : s.lineNumber, s.column); // TODO: get rid of s.lineNumber == -1 hack
+        }
+        const std::string unmatchedSuppressionId = s.isPolyspace ? "unmatchedPolyspaceSuppression" : "unmatchedSuppression";
+        errors.emplace_back(std::move(callStack), "", Severity::information, "Unmatched suppression: " + s.errorId, unmatchedSuppressionId, Certainty::normal);
+    }
+
+    return errors;
+}
+
+bool CppCheckExecutor::reportUnmatchedSuppressions(const Settings &settings, const SuppressionList& suppressions, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger) {
+    // the two inputs may only be used exclusively
+    assert(!(!files.empty() && !fileSettings.empty()));
+
+    // bail out if there is a suppression of unmatchedSuppression which matches any file
+    auto suppr = suppressions.getSuppressions();
+    if (std::any_of(suppr.cbegin(), suppr.cend(), [](const SuppressionList::Suppression& s) {
+        // TODO: handle unmatchedPolyspaceSuppression?
+        return s.errorId == "unmatchedSuppression" && (s.fileName.empty() || s.fileName == "*") && s.lineNumber == SuppressionList::Suppression::NO_LINE;
     }))
         return false;
 
-    bool err = false;
-    if (settings.useSingleJob()) {
-        // the two inputs may only be used exclusively
-        assert(!(!files.empty() && !fileSettings.empty()));
+    SuppressionList supprlist;
 
-        for (auto i = files.cbegin(); i != files.cend(); ++i) {
-            err |= SuppressionList::reportUnmatchedSuppressions(
-                suppressions.getUnmatchedLocalSuppressions(*i, unusedFunctionCheckEnabled), errorLogger);
-        }
+    const bool doUnusedFunctionOnly = Settings::unusedFunctionOnly();
+    // ignore all other suppressions if we use the unusedFunction hack
+    for (auto&& s : suppr)
+    {
+        // TODO: checkersReport should not be reported - see #13387
+        if (doUnusedFunctionOnly && s.errorId != "unusedFunction" && s.errorId != "checkersReport")
+            continue;
+        supprlist.addSuppression(std::move(s));
+    }
+
+    const auto reportErrorsFn = [&](const std::string& sourcefile, std::size_t fsFileId, const std::vector<ErrorMessage>& errors) -> bool {
+        if (errors.empty())
+            return false;
+
+        // TODO: what if sourcefile is empty?
 
-        for (auto i = fileSettings.cbegin(); i != fileSettings.cend(); ++i) {
-            err |= SuppressionList::reportUnmatchedSuppressions(
-                suppressions.getUnmatchedLocalSuppressions(i->file, unusedFunctionCheckEnabled), errorLogger);
+        AnalyzerInformation analyzerInfo;
+        // FIXME: this is a horrible hack
+        // we need to "re-open" the file so we can add the unmatchedSuppression findings.
+        // we cannot keep it open conditionally because the whole program analysis reads the XML.
+        // re-ordering the code is also not an option because the unmatched suppression reporting needs to be run after all other checks.
+        analyzerInfo.reopen(settings.buildDir, sourcefile, /*cfgname*/ "", fsFileId);
+
+        for (const auto& errmsg : errors) {
+            analyzerInfo.reportErr(errmsg);
+            errorLogger.reportErr(errmsg);
         }
+        return true;
+    };
+
+    bool err = false;
+
+    for (auto i = files.cbegin(); i != files.cend(); ++i) {
+        const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(*i), settings.unmatchedSuppressionFilters);
+        err |= reportErrorsFn(i->spath(), i->fsFileId(), errors);
+    }
+
+    for (auto i = fileSettings.cbegin(); i != fileSettings.cend(); ++i) {
+        const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(i->file), settings.unmatchedSuppressionFilters);
+        err |= reportErrorsFn(i->file.spath(), i->file.fsFileId(), errors);
     }
+
     if (settings.inlineSuppressions) {
-        // report unmatched unusedFunction suppressions
-        err |= SuppressionList::reportUnmatchedSuppressions(
-            suppressions.getUnmatchedInlineSuppressions(unusedFunctionCheckEnabled), errorLogger);
+        const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedInlineSuppressions(), settings.unmatchedSuppressionFilters);
+        for (const auto& errmsg : errors) {
+            std::string sourcefile;
+            if (!errmsg.callStack.empty())
+                sourcefile = errmsg.callStack.cbegin()->getfile(false); // TODO: simplify path?
+            err |= reportErrorsFn(sourcefile, 0, {errmsg});
+        }
     }
 
-    err |= SuppressionList::reportUnmatchedSuppressions(suppressions.getUnmatchedGlobalSuppressions(unusedFunctionCheckEnabled), errorLogger);
+    const std::vector<ErrorMessage> errors = getUnmatchedSuppressions(supprlist.getUnmatchedGlobalSuppressions(), settings.unmatchedSuppressionFilters);
+    for (const auto& errmsg : errors) {
+        std::string sourcefile;
+        if (!errmsg.callStack.empty())
+            sourcefile = errmsg.callStack.cbegin()->getfile(false); // TODO: simplify path?
+        err |= reportErrorsFn(sourcefile, 0, {errmsg});
+    }
     return err;
 }
 
@@ -428,6 +421,9 @@ bool CppCheckExecutor::reportSuppressions(const Settings &settings, const Suppre
 int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& supprs) const
 {
     StdLogger stdLogger(settings);
+    std::unique_ptr<TimerResults> timerResults;
+    if (settings.showtime != Settings::ShowTime::NONE)
+        timerResults.reset(new TimerResults);
 
     if (settings.reportProgress >= 0)
         stdLogger.resetLatestProgressOutputTime();
@@ -440,49 +436,58 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
         std::list<std::string> fileNames;
         for (auto i = mFiles.cbegin(); i != mFiles.cend(); ++i)
             fileNames.emplace_back(i->path());
-        AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, settings.userDefines, mFileSettings);
+        AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, mFileSettings);
+
+        stdLogger.readActiveCheckers();
     }
 
     if (!settings.checkersReportFilename.empty())
         std::remove(settings.checkersReportFilename.c_str());
 
-    CppCheck cppcheck(settings, supprs, stdLogger, true, executeCommand);
+    CppCheck cppcheck(settings, supprs, stdLogger, timerResults.get(), true, executeCommand);
 
     unsigned int returnValue = 0;
     if (settings.useSingleJob()) {
         // Single process
-        SingleExecutor executor(cppcheck, mFiles, mFileSettings, settings, supprs, stdLogger);
+        SingleExecutor executor(cppcheck, mFiles, mFileSettings, settings, supprs, stdLogger, timerResults.get());
         returnValue = executor.check();
     } else {
 #if defined(HAS_THREADING_MODEL_THREAD)
         if (settings.executor == Settings::ExecutorType::Thread) {
-            ThreadExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, CppCheckExecutor::executeCommand);
+            ThreadExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, timerResults.get(), CppCheckExecutor::executeCommand);
             returnValue = executor.check();
         }
 #endif
 #if defined(HAS_THREADING_MODEL_FORK)
         if (settings.executor == Settings::ExecutorType::Process) {
-            ProcessExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, CppCheckExecutor::executeCommand);
+            ProcessExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, timerResults.get(), CppCheckExecutor::executeCommand);
             returnValue = executor.check();
         }
 #endif
     }
 
+    // TODO: show time *after* the whole program analysis
+    if (timerResults) {
+        if (settings.showtime == Settings::ShowTime::SUMMARY)
+            timerResults->showResults();
+        else if (settings.showtime == Settings::ShowTime::TOP5_SUMMARY)
+            timerResults->showResults(5);
+    }
+
+    // TODO: is this run again instead of using previously cached results?
     returnValue |= cppcheck.analyseWholeProgram(settings.buildDir, mFiles, mFileSettings, stdLogger.getCtuInfo());
 
-    if (settings.severity.isEnabled(Severity::information) || settings.checkConfiguration) {
-        const bool err = reportSuppressions(settings, supprs.nomsg, settings.checks.isEnabled(Checks::unusedFunction), mFiles, mFileSettings, stdLogger);
+    if ((settings.severity.isEnabled(Severity::information) || settings.checkConfiguration) && !supprs.nomsg.getSuppressions().empty()) {
+        const bool err = reportUnmatchedSuppressions(settings, supprs.nomsg, mFiles, mFileSettings, stdLogger);
         if (err && returnValue == 0)
             returnValue = settings.exitCode;
     }
 
-    if (!settings.checkConfiguration) {
-        cppcheck.tooManyConfigsError("",0U);
-    }
-
     stdLogger.writeCheckersReport(supprs);
 
     if (settings.outputFormat == Settings::OutputFormat::xml) {
+        if (settings.xml_version == 3)
+            stdLogger.reportMetrics();
         stdLogger.reportErr(ErrorMessage::getXMLFooter(settings.xml_version));
     }
 
@@ -496,15 +501,24 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
 
 void StdLogger::writeCheckersReport(const Suppressions& supprs)
 {
-    const bool summary = mSettings.safety || mSettings.severity.isEnabled(Severity::information);
-    const bool xmlReport = mSettings.outputFormat == Settings::OutputFormat::xml && mSettings.xml_version == 3;
-    const bool textReport = !mSettings.checkersReportFilename.empty();
+    // TODO: only necessary when we actually issue a checkers report?
+    if (!mCheckersFile.empty())
+    {
+        std::ofstream fout(mCheckersFile);
+        for (const auto& c : mActiveCheckers)
+        {
+            fout << c << std::endl;
+        }
+    }
+
+    bool summary, xmlReport, textReport;
 
-    if (!summary && !xmlReport && !textReport)
+    if (!mSettings.collectLogCheckers(&summary, &xmlReport, &textReport))
         return;
 
     CheckersReport checkersReport(mSettings, mActiveCheckers);
 
+    // TODO: include in summary boolean
     const auto& suppressions = supprs.nomsg.getSuppressions();
     const bool summarySuppressed = std::any_of(suppressions.cbegin(), suppressions.cend(), [](const SuppressionList::Suppression& s) {
         return s.errorId == "checkersReport";
@@ -647,18 +661,20 @@ void StdLogger::reportErr(const ErrorMessage &msg)
     msgCopy.classification = getClassification(msgCopy.guideline, mSettings.reportType);
 
     // TODO: there should be no need for verbose and default messages here
-    const std::string msgStr = msgCopy.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
+    const std::string msgStr =
+        msgCopy.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
 
     // Alert only about unique errors
     if (!mSettings.emitDuplicates && !mShownErrors.insert(msgStr).second)
         return;
 
-    if (mSettings.outputFormat == Settings::OutputFormat::sarif)
+    if (mSettings.outputFormat == Settings::OutputFormat::sarif) {
         mSarifReport.addFinding(std::move(msgCopy));
-    else if (mSettings.outputFormat == Settings::OutputFormat::xml)
+    } else if (mSettings.outputFormat == Settings::OutputFormat::xml) {
         reportErr(msgCopy.toXML());
-    else
+    } else {
         reportErr(msgStr);
+    }
 }
 
 /**
@@ -686,9 +702,10 @@ int CppCheckExecutor::executeCommand(std::string exe, std::vector<std::string> a
             joinedArgs += arg;
     }
 
-    const std::string cmd = exe + " " + joinedArgs + " " + redirect;
+    std::string cmd = exe + " " + joinedArgs + " " + redirect;
 
 #ifdef _WIN32
+    cmd = "\"" + cmd + "\"";
     FILE* p = _popen(cmd.c_str(), "r");
 #else
     FILE *p = popen(cmd.c_str(), "r");
@@ -706,6 +723,9 @@ int CppCheckExecutor::executeCommand(std::string exe, std::vector<std::string> a
 
 #ifdef _WIN32
     const int res = _pclose(p);
+#elif defined(__APPLE__) && defined(__MACH__)
+    // the W* macros cast to int* on macOS
+    int res = pclose(p);
 #else
     const int res = pclose(p);
 #endif
@@ -715,7 +735,7 @@ int CppCheckExecutor::executeCommand(std::string exe, std::vector<std::string> a
         //std::cout << "pclose() errno " << std::to_string(err) << std::endl;
         return res;
     }
-#if !defined(WIN32) && !defined(__MINGW32__)
+#if !defined(_WIN32) && !defined(__MINGW32__)
     if (WIFEXITED(res)) {
         return WEXITSTATUS(res);
     }
diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
index 9c8b6707b64..a1b35280597 100644
--- a/cli/cppcheckexecutor.h
+++ b/cli/cppcheckexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,8 +39,6 @@ struct Suppressions;
  */
 class CppCheckExecutor {
 public:
-    friend class TestSuppressions;
-
     /**
      * Constructor
      */
@@ -61,17 +59,16 @@ class CppCheckExecutor {
      */
     int check(int argc, const char* const argv[]);
 
-private:
+protected:
 
     /**
      * Execute a shell command and read the output from it. Returns exitcode of the executed command,.
      */
     static int executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output_);
 
-protected:
-
-    static bool reportSuppressions(const Settings &settings, const SuppressionList& suppressions, bool unusedFunctionCheckEnabled, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger);
+    static bool reportUnmatchedSuppressions(const Settings &settings, const SuppressionList& suppressions, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger);
 
+private:
     /**
      * Wrapper around check_internal
      *   - installs optional platform dependent signal handling
diff --git a/cli/executor.cpp b/cli/executor.cpp
index 31578399e35..d0a05eda5f7 100644
--- a/cli/executor.cpp
+++ b/cli/executor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -30,8 +30,8 @@
 
 struct FileSettings;
 
-Executor::Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger)
-    : mFiles(files), mFileSettings(fileSettings), mSettings(settings), mSuppressions(suppressions), mErrorLogger(errorLogger)
+Executor::Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults)
+    : mFiles(files), mFileSettings(fileSettings), mSettings(settings), mSuppressions(suppressions), mErrorLogger(errorLogger), mTimerResults(timerResults)
 {
     // the two inputs may only be used exclusively
     assert(!(!files.empty() && !fileSettings.empty()));
@@ -65,7 +65,7 @@ void Executor::reportStatus(std::size_t fileindex, std::size_t filecount, std::s
 {
     if (filecount > 1) {
         std::ostringstream oss;
-        const unsigned long percentDone = (sizetotal > 0) ? (100 * sizedone) / sizetotal : 0;
+        const unsigned long percentDone = (sizetotal > 0) ? (100 * sizedone) / sizetotal : (100 * fileindex / filecount);
         oss << fileindex << '/' << filecount
             << " files checked " << percentDone
             << "% done";
diff --git a/cli/executor.h b/cli/executor.h
index 3f24b1c9b00..7e6fb83eeba 100644
--- a/cli/executor.h
+++ b/cli/executor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,6 +31,7 @@ class ErrorMessage;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -41,7 +42,7 @@ class FileWithDetails;
  */
 class Executor {
 public:
-    Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
+    Executor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults);
     virtual ~Executor() = default;
 
     Executor(const Executor &) = delete;
@@ -72,6 +73,7 @@ class Executor {
     const Settings &mSettings;
     Suppressions &mSuppressions;
     ErrorLogger &mErrorLogger;
+    TimerResults *mTimerResults;
 
 private:
     std::mutex mErrorListSync;
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index f2975d104ad..9b95689679c 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -129,9 +129,7 @@ static std::string addFiles2(std::list<FileWithDetails>&files, const std::string
             } else {
                 // Directory
                 if (recursive) {
-                    // append a slash if it is a directory since that is what we are doing for mIgnoredPaths directory entries.
-                    // otherwise we would ignore all its contents individually instead as a whole.
-                    if (!ignored.match(fname + '/')) {
+                    if (!ignored.match(fname, PathMatch::Filemode::directory)) {
                         std::list<FileWithDetails> filesSorted;
 
                         std::string err = addFiles2(filesSorted, fname, extra, recursive, ignored);
@@ -174,7 +172,7 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
 
     std::string err = addFiles2(filesSorted, path, extra, recursive, ignored, debug);
 
-    // files need to be sorted as the filesystems dosn't provide a stable order
+    // files need to be sorted as the filesystems doesn't provide a stable order
     filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
         return a.path() < b.path();
     });
@@ -193,6 +191,12 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
 #include <sys/stat.h>
 #include <cerrno>
 
+struct closedir_deleter {
+    void operator()(DIR* d) const {
+        closedir(d);
+    }
+};
+
 static std::string addFiles2(std::list<FileWithDetails> &files,
                              const std::string &path,
                              const std::set<std::string> &extra,
@@ -223,7 +227,7 @@ static std::string addFiles2(std::list<FileWithDetails> &files,
         const int err = errno;
         return "could not open directory '" + path + "' (errno: " + std::to_string(err) + ")";
     }
-    std::unique_ptr<DIR, decltype(&closedir)> dir_deleter(dir, closedir);
+    std::unique_ptr<DIR, closedir_deleter> dir_deleter(dir);
 
     std::string new_path = path;
     new_path += '/';
@@ -243,9 +247,7 @@ static std::string addFiles2(std::list<FileWithDetails> &files,
 #endif
         if (path_is_directory) {
             if (recursive) {
-                // append a slash if it is a directory since that is what we are doing for mIgnoredPaths directory entries.
-                // otherwise we would ignore all its contents individually instead as a whole.
-                if (!ignored.match(new_path + '/')) {
+                if (!ignored.match(new_path, PathMatch::Filemode::directory)) {
                     std::string err = addFiles2(files, new_path, extra, recursive, ignored, debug);
                     if (!err.empty()) {
                         return err;
@@ -291,7 +293,7 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
 
     std::string err = addFiles2(filesSorted, corrected_path, extra, recursive, ignored, debug);
 
-    // files need to be sorted as the filesystems dosn't provide a stable order
+    // files need to be sorted as the filesystems doesn't provide a stable order
     filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
         return a.path() < b.path();
     });
diff --git a/cli/main.cpp b/cli/main.cpp
index a829a4ef24c..d1a635e1f6f 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.17.99
+ * @version 2.21.99
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
@@ -56,17 +56,8 @@
  * When errors are found, they are reported back to the CppCheckExecutor through the ErrorLogger interface.
  */
 
-
 #include "cppcheckexecutor.h"
 
-#ifdef NDEBUG
-#include "errortypes.h"
-
-#include <cstdlib>
-#include <exception>
-#include <iostream>
-#endif
-
 /**
  * Main function of cppcheck
  *
@@ -76,27 +67,6 @@
  */
 int main(int argc, char* argv[])
 {
-    // MS Visual C++ memory leak debug tracing
-#if defined(_MSC_VER) && defined(_DEBUG)
-    _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
-#endif
-
     CppCheckExecutor exec;
-
-// *INDENT-OFF*
-#ifdef NDEBUG
-    try {
-#endif
-        return exec.check(argc, argv);
-#ifdef NDEBUG
-    } catch (const InternalError& e) {
-        std::cout << e.errorMessage << std::endl;
-    } catch (const std::exception& error) {
-        std::cout << error.what() << std::endl;
-    } catch (...) {
-        std::cout << "Unknown exception" << std::endl;
-    }
-    return EXIT_FAILURE;
-#endif
-// *INDENT-ON*
+    return exec.check(argc, argv);
 }
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index d7dbc8f5f79..959d16d37ec 100644
--- a/cli/processexecutor.cpp
+++ b/cli/processexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,7 +22,7 @@
 
 #include "processexecutor.h"
 
-#if !defined(WIN32) && !defined(__MINGW32__)
+#ifdef HAS_THREADING_MODEL_FORK
 
 #include "cppcheck.h"
 #include "errorlogger.h"
@@ -37,6 +37,7 @@
 #include <numeric>
 #include <cassert>
 #include <cerrno>
+#include <chrono>
 #include <csignal>
 #include <cstdint>
 #include <cstdlib>
@@ -44,9 +45,9 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <memory>
 #include <sstream>
 #include <sys/select.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -68,8 +69,8 @@ enum class Color : std::uint8_t;
 using std::memset;
 
 
-ProcessExecutor::ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand)
-    : Executor(files, fileSettings, settings, suppressions, errorLogger)
+ProcessExecutor::ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand)
+    : Executor(files, fileSettings, settings, suppressions, errorLogger, timerResults)
     , mExecuteCommand(std::move(executeCommand))
 {
     assert(mSettings.jobs > 1);
@@ -78,9 +79,9 @@ ProcessExecutor::ProcessExecutor(const std::list<FileWithDetails> &files, const
 namespace {
     class PipeWriter : public ErrorLogger {
     public:
-        enum PipeSignal : std::uint8_t {REPORT_OUT='1',REPORT_ERROR='2',REPORT_SUPPR_INLINE='3',REPORT_SUPPR='4',CHILD_END='5'};
+        enum PipeSignal : std::uint8_t {REPORT_OUT='1',REPORT_ERROR='2',REPORT_SUPPR_INLINE='3',REPORT_SUPPR='4',CHILD_END='5',REPORT_METRIC='6',REPORT_TIMER='7'};
 
-        explicit PipeWriter(int pipe) : mWpipe(pipe) {}
+        explicit PipeWriter(int pipe, bool debug) : mWpipe(pipe), mDebug(debug) {}
 
         void reportOut(const std::string &outmsg, Color c) override {
             writeToPipe(REPORT_OUT, static_cast<char>(c) + outmsg);
@@ -100,6 +101,22 @@ namespace {
             }
         }
 
+        void reportMetric(const std::string &metric) override {
+            writeToPipe(REPORT_METRIC, metric);
+        }
+
+        void writeTimer(const TimerResults* timerResults) const {
+            if (!timerResults)
+                return;
+
+            for (const auto& entry : timerResults->getResults())
+            {
+                for (const auto& d : entry.second) {
+                    writeToPipe(REPORT_TIMER, entry.first + ";" + std::to_string(d.count()));
+                }
+            }
+        }
+
         void writeEnd(const std::string& str) const {
             writeToPipe(CHILD_END, str);
         }
@@ -109,9 +126,13 @@ namespace {
         {
             std::string suppr_str = suppr.toString();
             suppr_str += ";";
+            suppr_str += std::to_string(suppr.column);
+            suppr_str += ";";
             suppr_str += suppr.checked ? "1" : "0";
             suppr_str += ";";
             suppr_str += suppr.matched ? "1" : "0";
+            suppr_str += ";";
+            suppr_str += suppr.extraComment;
             return suppr_str;
         }
 
@@ -121,18 +142,21 @@ namespace {
             const ssize_t bytes_written = write(mWpipe, data, to_write);
             if (bytes_written <= 0) {
                 const int err = errno;
-                std::cerr << "#### ThreadExecutor::writeToPipeInternal() error for type " << type << ": " << std::strerror(err) << std::endl;
+                std::cerr << "#### ThreadExecutor::writeToPipeInternal() error for type " << static_cast<unsigned char>(type) << ": " << std::strerror(err) << std::endl;
                 std::exit(EXIT_FAILURE);
             }
             // TODO: write until everything is written
             if (bytes_written != to_write) {
-                std::cerr << "#### ThreadExecutor::writeToPipeInternal() error for type " << type << ": insufficient data written (expected: " << to_write << " / got: " << bytes_written << ")" << std::endl;
+                std::cerr << "#### ThreadExecutor::writeToPipeInternal() error for type " << static_cast<unsigned char>(type) << ": insufficient data written (expected: " << to_write << " / got: " << bytes_written << ")" << std::endl;
                 std::exit(EXIT_FAILURE);
             }
         }
 
         void writeToPipe(PipeSignal type, const std::string &data) const
         {
+            if (mDebug)
+                std::cout << "writeToPipe - " << static_cast<char>(type) << " - " << data << std::endl;
+
             {
                 const auto t = static_cast<char>(type);
                 writeToPipeInternal(type, &t, 1);
@@ -149,6 +173,7 @@ namespace {
         }
 
         const int mWpipe;
+        const bool mDebug;
     };
 }
 
@@ -179,7 +204,9 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         type != PipeWriter::REPORT_ERROR &&
         type != PipeWriter::REPORT_SUPPR_INLINE &&
         type != PipeWriter::REPORT_SUPPR &&
-        type != PipeWriter::CHILD_END) {
+        type != PipeWriter::CHILD_END &&
+        type != PipeWriter::REPORT_METRIC &&
+        type != PipeWriter::REPORT_TIMER) {
         std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") invalid type " << int(type) << std::endl;
         std::exit(EXIT_FAILURE);
     }
@@ -213,6 +240,9 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         } while (bytes_to_read != 0);
     }
 
+    if (mSettings.debugipc)
+        std::cout << "handleRead - " << type << " - " << buf << std::endl;
+
     bool res = true;
     if (type == PipeWriter::REPORT_OUT) {
         // the first character is the color
@@ -234,7 +264,7 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         if (!buf.empty()) {
             // TODO: avoid string splitting
             auto parts = splitString(buf, ';');
-            if (parts.size() != 3)
+            if (parts.size() < 5)
             {
                 // TODO: make this non-fatal
                 std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - insufficient data" << std::endl;
@@ -242,8 +272,13 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
             }
             auto suppr = SuppressionList::parseLine(parts[0]);
             suppr.isInline = (type == PipeWriter::REPORT_SUPPR_INLINE);
-            suppr.checked = parts[1] == "1";
-            suppr.matched = parts[2] == "1";
+            suppr.column = strToInt<int>(parts[1]);
+            suppr.checked = parts[2] == "1";
+            suppr.matched = parts[3] == "1";
+            suppr.extraComment = parts[4];
+            for (std::size_t i = 5; i < parts.size(); i++) {
+                suppr.extraComment += ";" + parts[i];
+            }
             const std::string err = mSuppressions.nomsg.addSuppression(suppr);
             if (!err.empty()) {
                 // TODO: only update state if it doesn't exist - otherwise propagate error
@@ -256,6 +291,22 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
     } else if (type == PipeWriter::CHILD_END) {
         result += std::stoi(buf);
         res = false;
+    } else if (type == PipeWriter::REPORT_METRIC) {
+        mErrorLogger.reportMetric(buf);
+    } else if (type == PipeWriter::REPORT_TIMER) {
+        if (!mTimerResults) {
+            // TODO: make this non-fatal
+            std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") received timer results when no timer is enabled" << std::endl;
+            std::exit(EXIT_FAILURE);
+        }
+        const auto parts = splitString(buf, ';');
+        if (parts.size() < 2)
+        {
+            // TODO: make this non-fatal
+            std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of timer result failed - insufficient data" << std::endl;
+            std::exit(EXIT_FAILURE);
+        }
+        mTimerResults->addResults(parts[0], std::chrono::milliseconds{strToInt<long>(parts[1])});
     }
 
     return res;
@@ -263,7 +314,7 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
 
 bool ProcessExecutor::checkLoadAverage(size_t nchildren)
 {
-#if defined(__QNX__) || defined(__HAIKU__)  // getloadavg() is unsupported on Qnx, Haiku.
+#if defined(__QNX__) || defined(__HAIKU__) || defined(_AIX) // getloadavg() is unsupported on Qnx, Haiku, AIX.
     (void)nchildren;
     return true;
 #else
@@ -292,6 +343,12 @@ unsigned int ProcessExecutor::check()
         return v + p.size();
     });
 
+    // pass unmodified suppressions to forked process so we only transfer back the actual changes done by the fork
+    // and do not see the changes which have already been transferred back
+    Suppressions supprs;
+    supprs.nomsg.addSuppressions(mSuppressions.nomsg.getSuppressions());
+    supprs.nofail.addSuppressions(mSuppressions.nofail.getSuppressions());
+
     std::list<int> rpipes;
     std::map<pid_t, std::string> childFile;
     std::map<int, std::string> pipeFile;
@@ -330,8 +387,13 @@ unsigned int ProcessExecutor::check()
 #endif
                 close(pipes[0]);
 
-                PipeWriter pipewriter(pipes[1]);
-                CppCheck fileChecker(mSettings, mSuppressions, pipewriter, false, mExecuteCommand);
+                // create a separate result object so we do not get the results which have already been transferred back
+                std::unique_ptr<TimerResults> timerResults;
+                if (mTimerResults)
+                    timerResults.reset(new TimerResults);
+
+                PipeWriter pipewriter(pipes[1], mSettings.debugipc);
+                CppCheck fileChecker(mSettings, supprs, pipewriter, timerResults.get(), false, mExecuteCommand);
                 unsigned int resultOfCheck = 0;
 
                 if (iFileSettings != mFileSettings.end()) {
@@ -341,7 +403,9 @@ unsigned int ProcessExecutor::check()
                     resultOfCheck = fileChecker.check(*iFile);
                 }
 
-                pipewriter.writeSuppr(mSuppressions.nomsg);
+                pipewriter.writeSuppr(supprs.nomsg);
+
+                pipewriter.writeTimer(timerResults.get());
 
                 pipewriter.writeEnd(std::to_string(resultOfCheck));
                 std::exit(EXIT_SUCCESS);
@@ -436,9 +500,7 @@ unsigned int ProcessExecutor::check()
         }
     }
 
-    // TODO: wee need to get the timing information from the subprocess
-    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)
-        CppCheck::printTimerResults(mSettings.showtime);
+    // TODO: we need to get the timing information from the subprocess
 
     return result;
 }
@@ -454,8 +516,8 @@ void ProcessExecutor::reportInternalChildErr(const std::string &childname, const
                               "cppcheckError",
                               Certainty::normal);
 
-    if (!mSuppressions.nomsg.isSuppressed(errmsg, {}))
+    if (hasToLog(errmsg))
         mErrorLogger.reportErr(errmsg);
 }
 
-#endif // !WIN32
+#endif // HAS_THREADING_MODEL_FORK
diff --git a/cli/processexecutor.h b/cli/processexecutor.h
index c4d02b7b94d..6c590da4072 100644
--- a/cli/processexecutor.h
+++ b/cli/processexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,6 +19,10 @@
 #ifndef PROCESSEXECUTOR_H
 #define PROCESSEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_FORK
+
 #include "cppcheck.h"
 #include "executor.h"
 
@@ -31,6 +35,7 @@ class ErrorLogger;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -41,7 +46,7 @@ class FileWithDetails;
  */
 class ProcessExecutor : public Executor {
 public:
-    ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand);
+    ProcessExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand);
     ProcessExecutor(const ProcessExecutor &) = delete;
     ProcessExecutor& operator=(const ProcessExecutor &) = delete;
 
@@ -72,4 +77,6 @@ class ProcessExecutor : public Executor {
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_FORK
+
 #endif // PROCESSEXECUTOR_H
diff --git a/cli/signalhandler.cpp b/cli/signalhandler.cpp
index 1b6fb445b49..64e5038e82e 100644
--- a/cli/signalhandler.cpp
+++ b/cli/signalhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,8 +24,6 @@
 
 #if defined(USE_UNIX_SIGNAL_HANDLING)
 
-#include "utils.h"
-
 #ifdef USE_UNIX_BACKTRACE_SUPPORT
 #include "stacktrace.h"
 #endif
@@ -58,7 +56,7 @@
 #ifdef __USE_DYNAMIC_STACK_SIZE
 static constexpr size_t MYSTACKSIZE = (16*1024)+32768; // wild guess about a reasonable buffer
 #else
-static constexpr size_t MYSTACKSIZE = 16*1024+SIGSTKSZ; // wild guess about a reasonable buffer
+static constexpr size_t MYSTACKSIZE = (16*1024)+SIGSTKSZ; // wild guess about a reasonable buffer
 #endif
 static char mytstack[MYSTACKSIZE]= {0}; // alternative stack for signal handler
 static bool bStackBelowHeap=false; // lame attempt to locate heap vs. stack address space. See CppCheckExecutor::check_wrapper()
@@ -108,24 +106,24 @@ static const Signalmap_t listofsignals = {
  * but when ending up here something went terribly wrong anyway.
  * And all which is left is just printing some information and terminate.
  */
-// cppcheck-suppress constParameterCallback
-static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
+static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context) // cppcheck-suppress constParameterCallback - info can be const
 {
-    int type = -1;
+    const char* typeStr = "";
     pid_t killid;
     // TODO: separate these two defines
 #if defined(__linux__) && defined(REG_ERR)
     const auto* const uc = reinterpret_cast<const ucontext_t*>(context);
     killid = static_cast<pid_t>(syscall(SYS_gettid));
     if (uc) {
-        type = static_cast<int>(uc->uc_mcontext.gregs[REG_ERR]) & 2;
+        const int type = static_cast<int>(uc->uc_mcontext.gregs[REG_ERR]) & 2;
+        typeStr = (type == 0) ? "reading " : "writing ";
     }
 #else
     (void)context;
     killid = getpid();
 #endif
 
-    const auto it = utils::as_const(listofsignals).find(signo);
+    const auto it = listofsignals.find(signo);
     const char * const signame = (it==listofsignals.end()) ? "unknown" : it->second.c_str();
     bool unexpectedSignal=true; // unexpected indicates program failure
     bool terminate=true; // exit process/thread
@@ -239,7 +237,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
         }
         fprintf(output, " (at 0x%lx).%s\n",
                 reinterpret_cast<unsigned long>(info->si_addr),
-                (isAddressOnStack)?" Stackoverflow?":"");
+                isAddressOnStack ? " Stackoverflow?" : "");
         break;
     case SIGINT:
         unexpectedSignal=false;     // legal usage: interrupt application via CTRL-C
@@ -261,11 +259,9 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
             break;
         }
         fprintf(output, " (%sat 0x%lx).%s\n",
-                // cppcheck-suppress knownConditionTrueFalse ; FP
-                (type==-1)? "" :
-                (type==0) ? "reading " : "writing ",
+                typeStr,
                 reinterpret_cast<unsigned long>(info->si_addr),
-                (isAddressOnStack)?" Stackoverflow?":""
+                isAddressOnStack ? " Stackoverflow?" : ""
                 );
         break;
     case SIGUSR1:
diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
index 5d7e4a83f9d..e25fc804490 100644
--- a/cli/singleexecutor.cpp
+++ b/cli/singleexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,7 +21,6 @@
 #include "cppcheck.h"
 #include "filesettings.h"
 #include "settings.h"
-#include "timer.h"
 
 #include <cassert>
 #include <cstddef>
@@ -30,8 +29,8 @@
 
 class ErrorLogger;
 
-SingleExecutor::SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger)
-    : Executor(files, fileSettings, settings, suppressions, errorLogger)
+SingleExecutor::SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults)
+    : Executor(files, fileSettings, settings, suppressions, errorLogger, timerResults)
     , mCppcheck(cppcheck)
 {
     assert(mSettings.jobs == 1);
@@ -67,11 +66,10 @@ unsigned int SingleExecutor::check()
             reportStatus(c, mFileSettings.size(), c, mFileSettings.size());
     }
 
+    // TODO: show time after the whole program analysis
+    // TODO: CppCheckExecutor::check_internal() is also invoking the whole program analysis - is it run twice?
     if (mCppcheck.analyseWholeProgram())
         result++;
 
-    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)
-        CppCheck::printTimerResults(mSettings.showtime);
-
     return result;
 }
diff --git a/cli/singleexecutor.h b/cli/singleexecutor.h
index c2294a2e467..8b908bd6c4e 100644
--- a/cli/singleexecutor.h
+++ b/cli/singleexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -29,11 +29,12 @@ class CppCheck;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 class SingleExecutor : public Executor
 {
 public:
-    SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
+    SingleExecutor(CppCheck &cppcheck, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults);
     SingleExecutor(const SingleExecutor &) = delete;
     SingleExecutor& operator=(const SingleExecutor &) = delete;
 
diff --git a/cli/stacktrace.cpp b/cli/stacktrace.cpp
index 53c4fdba6df..dbcbed448bb 100644
--- a/cli/stacktrace.cpp
+++ b/cli/stacktrace.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -31,9 +31,17 @@
 void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth, bool omit_above_own)
 {
     // 32 vs. 64bit
-#define ADDRESSDISPLAYLENGTH ((sizeof(long)==8)?12:8)
+    static constexpr auto ADDRESSDISPLAYLENGTH = (sizeof(long) == 8) ? 12 : 8;
+
     void *callstackArray[32]= {nullptr}; // the less resources the better...
     const int currentdepth = backtrace(callstackArray, static_cast<int>(getArrayLength(callstackArray)));
+    if (currentdepth == 0) {
+        fputs("Callstack could not be obtained (backtrace)\n", output);
+        return;
+    }
+    if (currentdepth == getArrayLength(callstackArray)) {
+        fputs("Callstack might be truncated\n", output);
+    }
     // set offset to 1 to omit the printing function itself
     int offset=start_idx+1; // some entries on top are within our own exception handling code or libc
     if (maxdepth<0)
@@ -43,60 +51,92 @@ void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth
 
     char **symbolStringList = backtrace_symbols(callstackArray, currentdepth);
     if (!symbolStringList) {
-        fputs("Callstack could not be obtained\n", output);
+        fputs("Callstack could not be obtained (backtrace_symbols)\n", output);
         return;
     }
 
     fputs("Callstack:\n", output);
     bool own_code = false;
     char demangle_buffer[2048]= {0};
+    bool no_address = false;
     for (int i = offset; i < maxdepth; ++i) {
         const char * const symbolString = symbolStringList[i];
+        // TODO: implement parsing for __APPLE__
+        // 0   test-signalhandler                  0x0000000100dbf42c _Z16print_stacktraceP7__sFILEibib + 124
+
+        /*
+         * examples:
+         * ./test-signalhandler(_Z16print_stacktraceP8_IO_FILEibib+0xa1) [0x55cb65e41464]
+         * ./test-signalhandler(+0xf9d9) [0x55cb65e3c9d9]
+         */
+
         // skip all leading libc symbols so the first symbol is our code
         if (omit_above_own && !own_code) {
             if (strstr(symbolString, "/libc.so.6") != nullptr)
                 continue;
             own_code = true;
-            offset = i; // make sure the numbering is continous if we omit frames
+            offset = i; // make sure the numbering is continuous if we omit frames
         }
-        char * realnameString = nullptr;
-        const char * const firstBracketName     = strchr(symbolString, '(');
-        const char * const firstBracketAddress  = strchr(symbolString, '[');
-        const char * const secondBracketAddress = strchr(firstBracketAddress, ']');
-        const char * const beginAddress         = firstBracketAddress+3;
-        const int addressLen = int(secondBracketAddress-beginAddress);
-        const int padLen     = (ADDRESSDISPLAYLENGTH-addressLen);
-        if (demangling && firstBracketName) {
-            const char * const plus = strchr(firstBracketName, '+');
-            if (plus && (plus>(firstBracketName+1))) {
-                char input_buffer[1024]= {0};
-                strncpy(input_buffer, firstBracketName+1, plus-firstBracketName-1);
-                size_t length = getArrayLength(demangle_buffer);
-                int status=0;
-                // We're violating the specification - passing stack address instead of malloc'ed heap.
-                // Benefit is that no further heap is required, while there is sufficient stack...
-                realnameString = abi::__cxa_demangle(input_buffer, demangle_buffer, &length, &status); // non-NULL on success
+        const char * realnameString = nullptr;
+        if (demangling) {
+            const char * const firstBracketName = strchr(symbolString, '(');
+            if (firstBracketName) {
+                const char * const plus = strchr(firstBracketName, '+');
+                if (plus && (plus>(firstBracketName+1))) {
+                    char input_buffer[1024]= {0};
+                    strncpy(input_buffer, firstBracketName+1, plus-firstBracketName-1);
+                    size_t length = getArrayLength(demangle_buffer);
+                    int status=0;
+                    // We're violating the specification - passing stack address instead of malloc'ed heap.
+                    // Benefit is that no further heap is required, while there is sufficient stack...
+                    realnameString = abi::__cxa_demangle(input_buffer, demangle_buffer, &length, &status); // non-NULL on success
+                }
             }
         }
+
+        const char * const firstBracketAddress = strchr(symbolString, '[');
+        if (!firstBracketAddress) {
+            no_address = true;
+            break;
+        }
+        const char * const secondBracketAddress = strchr(firstBracketAddress, ']');
+        if (!secondBracketAddress) {
+            no_address = true;
+            break;
+        }
+
         const int ordinal=i-offset;
         fprintf(output, "#%-2d 0x",
                 ordinal);
+        const int padLen = [&]() {
+            const char * const beginAddress = firstBracketAddress+3;
+            const int addressLen = int(secondBracketAddress-beginAddress);
+            return (ADDRESSDISPLAYLENGTH-addressLen);
+        }();
         if (padLen>0)
             fprintf(output, "%0*d",
-                    padLen, 0);
+                    padLen,
+                    0);
         if (realnameString) {
             fprintf(output, "%.*s in %s\n",
-                    static_cast<int>(secondBracketAddress - firstBracketAddress - 3), firstBracketAddress+3,
+                    static_cast<int>(secondBracketAddress - firstBracketAddress - 3),
+                    firstBracketAddress+3,
                     realnameString);
         } else {
             fprintf(output, "%.*s in %.*s\n",
-                    static_cast<int>(secondBracketAddress - firstBracketAddress - 3), firstBracketAddress+3,
-                    static_cast<int>(firstBracketAddress - symbolString), symbolString);
+                    static_cast<int>(secondBracketAddress - firstBracketAddress - 3),
+                    firstBracketAddress+3,
+                    static_cast<int>(firstBracketAddress - symbolString),
+                    symbolString);
         }
     }
     // NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion) - code matches the documented usage
     free(symbolStringList);
-#undef ADDRESSDISPLAYLENGTH
+
+    if (no_address) {
+        fputs("Callstack could not be obtained (no address)\n", output);
+        return;
+    }
 }
 
 #endif // USE_UNIX_BACKTRACE_SUPPORT
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
index 921f09fdf0f..5d723366574 100644
--- a/cli/threadexecutor.cpp
+++ b/cli/threadexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,13 +18,14 @@
 
 #include "threadexecutor.h"
 
+#ifdef HAS_THREADING_MODEL_THREAD
+
 #include "config.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
 #include "filesettings.h"
 #include "settings.h"
 #include "suppressions.h"
-#include "timer.h"
 
 #include <cassert>
 #include <cstdlib>
@@ -38,8 +39,8 @@
 #include <utility>
 #include <vector>
 
-ThreadExecutor::ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand)
-    : Executor(files, fileSettings, settings, suppressions, errorLogger)
+ThreadExecutor::ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand)
+    : Executor(files, fileSettings, settings, suppressions, errorLogger, timerResults)
     , mExecuteCommand(std::move(executeCommand))
 {
     assert(mSettings.jobs > 1);
@@ -66,6 +67,11 @@ class SyncLogForwarder : public ErrorLogger
         mErrorLogger.reportErr(msg);
     }
 
+    void reportMetric(const std::string &metric) override {
+        std::lock_guard<std::mutex> lg(mReportSync);
+        mErrorLogger.reportMetric(metric);
+    }
+
     void reportStatus(std::size_t fileindex, std::size_t filecount, std::size_t sizedone, std::size_t sizetotal) {
         std::lock_guard<std::mutex> lg(mReportSync);
         mThreadExecutor.reportStatus(fileindex, filecount, sizedone, sizetotal);
@@ -80,8 +86,8 @@ class SyncLogForwarder : public ErrorLogger
 class ThreadData
 {
 public:
-    ThreadData(ThreadExecutor &threadExecutor, ErrorLogger &errorLogger, const Settings &settings, Suppressions& supprs, const std::list<FileWithDetails> &files, const std::list<FileSettings> &fileSettings, CppCheck::ExecuteCmdFn executeCommand)
-        : mFiles(files), mFileSettings(fileSettings), mSettings(settings), mSuppressions(supprs), mExecuteCommand(std::move(executeCommand)), logForwarder(threadExecutor, errorLogger)
+    ThreadData(ThreadExecutor &threadExecutor, ErrorLogger &errorLogger, TimerResults *timerResults, const Settings &settings, Suppressions& supprs, const std::list<FileWithDetails> &files, const std::list<FileSettings> &fileSettings, CppCheck::ExecuteCmdFn executeCommand)
+        : mFiles(files), mFileSettings(fileSettings), mTimerResults(timerResults), mSettings(settings), mSuppressions(supprs), mExecuteCommand(std::move(executeCommand)), mLogForwarder(threadExecutor, errorLogger)
     {
         mItNextFile = mFiles.begin();
         mItNextFileSettings = mFileSettings.begin();
@@ -112,8 +118,8 @@ class ThreadData
         return false;
     }
 
-    unsigned int check(ErrorLogger &errorLogger, const FileWithDetails *file, const FileSettings *fs) const {
-        CppCheck fileChecker(mSettings, mSuppressions, errorLogger, false, mExecuteCommand);
+    unsigned int check(const FileWithDetails *file, const FileSettings *fs) {
+        CppCheck fileChecker(mSettings, mSuppressions, mLogForwarder, mTimerResults, false, mExecuteCommand);
 
         unsigned int result;
         if (fs) {
@@ -148,7 +154,7 @@ class ThreadData
         mProcessedSize += fileSize;
         mProcessedFiles++;
         if (!mSettings.quiet)
-            logForwarder.reportStatus(mProcessedFiles, mTotalFiles, mProcessedSize, mTotalFileSize);
+            mLogForwarder.reportStatus(mProcessedFiles, mTotalFiles, mProcessedSize, mTotalFileSize);
     }
 
 private:
@@ -163,12 +169,12 @@ class ThreadData
     std::size_t mTotalFileSize{};
 
     std::mutex mFileSync;
+    TimerResults *mTimerResults;
     const Settings &mSettings;
     Suppressions &mSuppressions;
     CppCheck::ExecuteCmdFn mExecuteCommand;
 
-public:
-    SyncLogForwarder logForwarder;
+    SyncLogForwarder mLogForwarder;
 };
 
 static unsigned int STDCALL threadProc(ThreadData *data)
@@ -180,7 +186,7 @@ static unsigned int STDCALL threadProc(ThreadData *data)
     std::size_t fileSize;
 
     while (data->next(file, fs, fileSize)) {
-        result += data->check(data->logForwarder, file, fs);
+        result += data->check(file, fs);
 
         data->status(fileSize);
     }
@@ -193,7 +199,7 @@ unsigned int ThreadExecutor::check()
     std::vector<std::future<unsigned int>> threadFutures;
     threadFutures.reserve(mSettings.jobs);
 
-    ThreadData data(*this, mErrorLogger, mSettings, mSuppressions, mFiles, mFileSettings, mExecuteCommand);
+    ThreadData data(*this, mErrorLogger, mTimerResults, mSettings, mSuppressions, mFiles, mFileSettings, mExecuteCommand);
 
     for (unsigned int i = 0; i < mSettings.jobs; ++i) {
         try {
@@ -209,8 +215,7 @@ unsigned int ThreadExecutor::check()
         return v + f.get();
     });
 
-    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)
-        CppCheck::printTimerResults(mSettings.showtime);
-
     return result;
 }
+
+#endif // HAS_THREADING_MODEL_THREAD
diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h
index aa2efc5a38d..a0ab4933573 100644
--- a/cli/threadexecutor.h
+++ b/cli/threadexecutor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,6 +19,10 @@
 #ifndef THREADEXECUTOR_H
 #define THREADEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_THREAD
+
 #include "cppcheck.h"
 #include "executor.h"
 
@@ -29,6 +33,7 @@ class ErrorLogger;
 struct Suppressions;
 struct FileSettings;
 class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -41,7 +46,7 @@ class ThreadExecutor : public Executor {
     friend class SyncLogForwarder;
 
 public:
-    ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand);
+    ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, TimerResults* timerResults, CppCheck::ExecuteCmdFn executeCommand);
     ThreadExecutor(const ThreadExecutor &) = delete;
     ThreadExecutor& operator=(const ThreadExecutor &) = delete;
 
@@ -52,4 +57,6 @@ class ThreadExecutor : public Executor {
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_THREAD
+
 #endif // THREADEXECUTOR_H
diff --git a/cmake/clang_tidy.cmake b/cmake/clang_tidy.cmake
index bdbb5feca4c..f8324b98d21 100644
--- a/cmake/clang_tidy.cmake
+++ b/cmake/clang_tidy.cmake
@@ -11,7 +11,7 @@ if(NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
         message(STATUS "Cannot use non-Clang compiler with clang-tidy when precompiled headers are enabled - skipping 'run-clang-tidy'/'run-clang-tidy-csa' target generation")
     endif()
 else()
-    set(RUN_CLANG_TIDY_NAMES run-clang-tidy run-clang-tidy-20 run-clang-tidy-19 run-clang-tidy-18 run-clang-tidy-17 run-clang-tidy-16 run-clang-tidy-15 run-clang-tidy-14 run-clang-tidy-13 run-clang-tidy-12 run-clang-tidy-11 run-clang-tidy-10 run-clang-tidy-9 run-clang-tidy-8)
+    set(RUN_CLANG_TIDY_NAMES run-clang-tidy run-clang-tidy-22 run-clang-tidy-21 run-clang-tidy-20 run-clang-tidy-19 run-clang-tidy-18 run-clang-tidy-17 run-clang-tidy-16 run-clang-tidy-15 run-clang-tidy-14 run-clang-tidy-13 run-clang-tidy-12 run-clang-tidy-11 run-clang-tidy-10 run-clang-tidy-9 run-clang-tidy-8)
 endif()
 
 if(RUN_CLANG_TIDY_NAMES)
@@ -25,6 +25,12 @@ if(RUN_CLANG_TIDY_NAMES)
         endif()
         message(STATUS "NPROC=${NPROC}")
 
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 22)
+            set(CLANG_TIDY_CONFIG "-enable-check-profile")
+        else()
+            set(CLANG_TIDY_CONFIG "")
+        endif()
+
         # most of these are disabled because they are too noisy in our code
         # clang-analyzer-core.CallAndMessage
         # clang-analyzer-core.NonNullParamChecker
@@ -32,23 +38,23 @@ if(RUN_CLANG_TIDY_NAMES)
         # clang-analyzer-cplusplus.NewDelete
         # clang-analyzer-core.NullDereference
         # clang-analyzer-unix.Stream
-        # clang-analyzer-optin.cplusplus.UninitializedObject - false positives with unnamed fields - see https://github.com/llvm/llvm-project/issues/132001
         # clang-analyzer-alpha.clone.CloneChecker
         # clang-analyzer-alpha.webkit.* - we are not interested in these
-        set(CLANG_TIDY_CSA_CONFIG "-config={InheritParentConfig: true, Checks: '-*,clang-analyzer-*,-clang-analyzer-core.CallAndMessage,-clang-analyzer-core.NonNullParamChecker,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-cplusplus.NewDelete,-clang-analyzer-core.NullDereference,-clang-analyzer-unix.Stream,-clang-analyzer-optin.cplusplus.UninitializedObject,-clang-analyzer-alpha.clone.CloneChecker,-clang-analyzer-alpha.webkit.*'}")
+        set(CLANG_TIDY_CSA_CONFIG "-config={InheritParentConfig: true, Checks: '-*,clang-analyzer-*,-clang-analyzer-core.CallAndMessage,-clang-analyzer-core.NonNullParamChecker,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-cplusplus.NewDelete,-clang-analyzer-core.NullDereference,-clang-analyzer-unix.Stream,-clang-analyzer-alpha.clone.CloneChecker,-clang-analyzer-alpha.webkit.*'}")
         if (ENABLE_CSA_ALPHA)
             set(CLANG_TIDY_CSA_ALPHA_OPTS "-allow-enabling-alpha-checkers" "-extra-arg=-Xclang" "-extra-arg=-analyzer-config" "-extra-arg=-Xclang" "-extra-arg=aggressive-binary-operation-simplification=true")
+        else()
+            set(CLANG_TIDY_CSA_ALPHA_OPTS "")
         endif()
 
         # TODO: exclude moc_*.cpp
         # TODO: exclude mocs_compilation.cpp
-        # disable all compiler warnings since we are just interested in the tidy ones
         add_custom_target(run-clang-tidy
-                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet
+                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet ${CLANG_TIDY_CONFIG}
                 USES_TERMINAL
                 VERBATIM)
         add_custom_target(run-clang-tidy-csa
-                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet ${CLANG_TIDY_CSA_ALPHA_OPTS} ${CLANG_TIDY_CSA_CONFIG}
+                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet ${CLANG_TIDY_CONFIG} ${CLANG_TIDY_CSA_ALPHA_OPTS} ${CLANG_TIDY_CSA_CONFIG}
                 USES_TERMINAL
                 VERBATIM)
         if(BUILD_GUI)
diff --git a/cmake/compilerCheck.cmake b/cmake/compilerCheck.cmake
index 47c8fc1245e..c26bf9e336e 100644
--- a/cmake/compilerCheck.cmake
+++ b/cmake/compilerCheck.cmake
@@ -2,12 +2,18 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
         message(ERROR "GCC >= 5.1 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
     endif()
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
         message(ERROR "Clang >= 3.5 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
     endif()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+        message(ERROR "AppleClang >= 6.0 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
+    endif()
 elseif(MSVC)
     if(MSVC_VERSION VERSION_LESS 1900)
         message(ERROR "Visual Studio >= 2015 (19.0) required - detected ${MSVC_VERSION} not supported")
     endif()
+else()
+    message(WARNING "Unknown compiler ${CMAKE_CXX_COMPILER_ID}")
 endif()
diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake
index 6ad938fa009..3daf0e7ba87 100644
--- a/cmake/compilerDefinitions.cmake
+++ b/cmake/compilerDefinitions.cmake
@@ -4,32 +4,34 @@ if(MSVC)
     # Visual Studio only sets _DEBUG
     add_compile_definitions($<$<CONFIG:Debug>:DEBUG>)
 
-    add_definitions(-DWIN32)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
     add_definitions(-DWIN32_LEAN_MEAN)
-    add_definitions(-D_WIN64)
 endif()
 
-# TODO: this should probably apply to the compiler and not the platform - I think it is only "broken" with MinGW
-# TODO: AppleClang only has libc++
-# TODO: what about clang-cl and native Win32 clang?
-if(CPPCHK_GLIBCXX_DEBUG AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if(USE_LIBCXX)
-            if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
-                add_definitions(-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
-            else()
-                add_definitions(-D_LIBCPP_ENABLE_ASSERTIONS=1)
-            endif()
-            # TODO: also add _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS?
+# libstdc++-specific flags
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (NOT USE_LIBCXX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+    if(CPPCHK_GLIBCXX_DEBUG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+        add_definitions(-D_GLIBCXX_DEBUG)
+    endif()
+endif()
+
+# TODO: what about clang-cl?
+# libc++-specific flags - AppleClang only has libc++
+if ((USE_LIBCXX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    if(CPPCHK_GLIBCXX_DEBUG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+        # TODO: determine proper version for AppleClang - current value is based on the oldest version avaialble in CI
+        if((CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18) OR
+           (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17))
+            add_definitions(-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG)
+        else()
+            add_definitions(-D_LIBCPP_ENABLE_ASSERTIONS=1)
         endif()
+        # TODO: also add _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS?
     else()
         # TODO: check if this can be enabled again for Clang - also done in Makefile
         add_definitions(-D_GLIBCXX_DEBUG)
     endif()
-endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND USE_LIBCXX)
     add_definitions(-D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES)
 endif()
 
@@ -52,8 +54,8 @@ if(DISALLOW_THREAD_EXECUTOR)
     add_definitions(-DDISALLOW_THREAD_EXECUTOR)
 endif()
 
-if(MSVC AND DISABLE_CRTDBG_MAP_ALLOC)
-    add_definitions(-DDISABLE_CRTDBG_MAP_ALLOC)
+if(DISALLOW_PROCESS_EXECUTOR)
+    add_definitions(-DDISALLOW_PROCESS_EXECUTOR)
 endif()
 
 if(NO_UNIX_SIGNAL_HANDLING)
@@ -68,6 +70,10 @@ if(NO_WINDOWS_SEH)
     add_definitions(-DNO_WINDOWS_SEH)
 endif()
 
+if(NOT MSVC)
+    add_definitions(-DHAVE_EXECINFO_H=${HAVE_EXECINFO_H})
+endif()
+
 if(FILESDIR_DEF)
     file(TO_CMAKE_PATH "${FILESDIR_DEF}" _filesdir)
     add_definitions(-DFILESDIR="${_filesdir}")
diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
index ada39cea21f..6343a8a5102 100644
--- a/cmake/compileroptions.cmake
+++ b/cmake/compileroptions.cmake
@@ -24,6 +24,28 @@ function(target_externals_include_directories TARGET)
     endif()
 endfunction()
 
+function(target_dll_compile_definitions TARGET)
+    set(options)
+    set(oneValueArgs IMPORT EXPORT)
+    set(multiValueArgs)
+
+    cmake_parse_arguments(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    if(PARSE_UNPARSED_ARGUMENTS)
+        message(
+            FATAL_ERROR "Unknown keywords given to target_dll_compile_definitions(): \"${PARSE_UNPARSED_ARGUMENTS}\"")
+    endif()
+
+
+    if (BUILD_SHARED_LIBS AND MSVC)
+        if(PARSE_EXPORT)
+            target_compile_definitions(${TARGET} PRIVATE ${PARSE_EXPORT})
+        endif()
+        if(PARSE_IMPORT)
+            target_compile_definitions(${TARGET} INTERFACE ${PARSE_IMPORT})
+        endif()
+    endif()
+endfunction()
+
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-Weverything)
 endif()
@@ -100,18 +122,18 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         add_compile_options(-gdwarf-4)
     endif()
 
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+        add_compile_options(-Wno-poison-system-directories)
+    endif()
+
     if(USE_LIBCXX)
         add_compile_options(-stdlib=libc++)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++")
     endif()
 
     # TODO: fix and enable these warnings - or move to suppression list below
-    add_compile_options_safe(-Wno-documentation-unknown-command) # TODO: Clang currently does not support all commands
-    add_compile_options_safe(-Wno-unused-exception-parameter)
     add_compile_options_safe(-Wno-sign-conversion)
     add_compile_options_safe(-Wno-shadow-field-in-constructor)
-    add_compile_options_safe(-Wno-covered-switch-default)
-    add_compile_options_safe(-Wno-shorten-64-to-32)
     add_compile_options_safe(-Wno-implicit-int-conversion)
     add_compile_options_safe(-Wno-double-promotion)
     add_compile_options_safe(-Wno-shadow-field)
@@ -120,8 +142,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options_safe(-Wno-switch-enum)
     add_compile_options_safe(-Wno-date-time)
     add_compile_options(-Wno-disabled-macro-expansion)
-    add_compile_options_safe(-Wno-bitwise-instead-of-logical)
     add_compile_options(-Wno-sign-compare)
+    add_compile_options_safe(-Wno-ms-bitfield-padding) # TODO: fix this
 
     # these cannot be fixed properly without adopting later C++ standards
     add_compile_options_safe(-Wno-unsafe-buffer-usage)
@@ -130,6 +152,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
     # can only be partially addressed
     add_compile_options(-Wno-padded)
+    add_compile_options_safe(-Wno-nrvo)
 
     # no need for C++98 compatibility
     add_compile_options(-Wno-c++98-compat)
@@ -146,6 +169,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-Wno-weak-vtables)
     add_compile_options(-Wno-multichar)
 
+    # FIXME: only reported when running clang-tidy
+    # /home/runner/work/cppcheck/cppcheck/tools/triage/mainwindow.cpp:19:10: error: multiple candidates for header 'mainwindow.h' found; directory '/home/runner/work/cppcheck/cppcheck/tools/triage' chosen, ignoring others including '/home/runner/work/cppcheck/cppcheck/gui' [clang-diagnostic-shadow-header]
+    # 19 | #include "mainwindow.h"
+    # |          ^
+    add_compile_options_safe(-Wno-shadow-header)
+
     if(ENABLE_COVERAGE OR ENABLE_COVERAGE_XML)
       message(FATAL_ERROR "Do not use clang to generate code coverage. Use GCC instead.")
     endif()
diff --git a/cmake/cxx11.cmake b/cmake/cxx11.cmake
index 2deba34edaa..99e94ea4d23 100644
--- a/cmake/cxx11.cmake
+++ b/cmake/cxx11.cmake
@@ -1,6 +1,12 @@
 macro(use_cxx11)
+  if(CMAKE_CXX_STANDARD EQUAL 98)
+    message(FATAL_ERROR "C++ standard was set to ${CMAKE_CXX_STANDARD} but 11 is required as minimum")
+  endif()
   if(USE_BOOST AND USE_BOOST_INT128)
     # Boost.Math requires C++14
+    if(CMAKE_CXX_STANDARD LESS 14)
+      message(FATAL_ERROR "C++ standard was set to ${CMAKE_CXX_STANDARD} but 14 is required as minimum")
+    endif()
     set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to use")
   else()
     set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index 1cca94ff6c8..b1f6571504d 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -3,30 +3,15 @@ if(BUILD_GUI)
     if(WITH_QCHART)
         list(APPEND qt_components Charts)
     endif()
-    if(BUILD_TESTS)
+    if(BUILD_TESTING)
         list(APPEND qt_components Test)
     endif()
-    if(USE_QT6)
-        find_package(Qt6 COMPONENTS ${qt_components} REQUIRED)
-        set(QT_VERSION "${Qt6Core_VERSION}")
-        if(NOT QT_VERSION)
-            # TODO: remove fallback
-            message(WARNING "'Qt6Core_VERSION' is not set - using 6.0.0 as fallback")
-            set(QT_VERSION "6.0.0")
-        endif()
-        if(MSVC)
-            # disable Visual Studio C++ memory leak detection since it causes compiler errors with Qt 6
-            # D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): warning C4003: not enough arguments for function-like macro invocation 'free' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
-            # D:\a\cppcheck\Qt\6.2.4\msvc2019_64\include\QtCore/qhash.h(179,15): error C2059: syntax error: ',' [D:\a\cppcheck\cppcheck\build\gui\cppcheck-gui.vcxproj]
-            # this is supposed to be fixed according to the following tickets but it still happens
-            # https://bugreports.qt.io/browse/QTBUG-40575
-            # https://bugreports.qt.io/browse/QTBUG-86395
-            set(DISABLE_CRTDBG_MAP_ALLOC ON)
-        endif()
-    else()
-        message(WARNING "Building with Qt5 is deprecated (it went EOL in May 2023) and will be removed in Cppcheck 2.19 - please use Qt6 instead")
-        find_package(Qt5 COMPONENTS ${qt_components} REQUIRED)
-        set(QT_VERSION "${Qt5Core_VERSION_STRING}")
+    find_package(Qt6 COMPONENTS ${qt_components} REQUIRED)
+    set(QT_VERSION "${Qt6Core_VERSION}")
+    if(NOT QT_VERSION)
+        # TODO: remove fallback
+        message(WARNING "'Qt6Core_VERSION' is not set - using 6.0.0 as fallback")
+        set(QT_VERSION "6.0.0")
     endif()
 
     if(BUILD_ONLINE_HELP)
@@ -49,6 +34,8 @@ if(HAVE_RULES)
     if(NOT PCRE_LIBRARY OR NOT PCRE_INCLUDE)
         message(FATAL_ERROR "pcre dependency for RULES has not been found")
     endif()
+else()
+    set(PCRE_LIBRARY "")
 endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -62,15 +49,16 @@ if(NOT Python_Interpreter_FOUND)
     endif()
 else()
     if(${Python_VERSION} VERSION_LESS 3.7)
-        message(FATAL_ERROR "The minimum supported Python version is 3.7 - found ${Python_VERSION}")
+        message(WARNING "The minimum supported Python version is 3.7, found ${Python_VERSION} - disabling matchcompiler.")
+        set(USE_MATCHCOMPILER_OPT "Off")
     endif()
 endif()
 
 if(NOT USE_BUNDLED_TINYXML2)
+    add_library(tinyxml2 INTERFACE)
     find_package(tinyxml2 QUIET)
     if(TARGET tinyxml2::tinyxml2)
-        set(tinyxml2_LIBRARIES "tinyxml2::tinyxml2")
-        set(tinyxml2_INCLUDE_DIRS $<TARGET_PROPERTY:tinyxml2::tinyxml2,INTERFACE_INCLUDE_DIRECTORIES>)
+        target_link_libraries(tinyxml2 INTERFACE tinyxml2::tinyxml2)
     else()
         find_library(tinyxml2_LIBRARIES tinyxml2)
         find_path(tinyxml2_INCLUDE_DIRS tinyxml2.h)
@@ -79,21 +67,41 @@ if(NOT USE_BUNDLED_TINYXML2)
         else()
             set(tinyxml2_FOUND 1)
         endif()
+        target_link_libraries(tinyxml2 INTERFACE ${tinyxml2_LIBRARIES})
+        target_include_directories(tinyxml2 INTERFACE ${tinyxml2_INCLUDE_DIRS})
     endif()
 endif()
 
 find_package(Threads REQUIRED)
+if(NOT DEFINED CMAKE_THREAD_LIBS_INIT)
+    set(CMAKE_THREAD_LIBS_INIT "")
+endif()
 
 if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.30")
     # avoid legacy warning about Boost lookup in CMake
     cmake_policy(SET CMP0167 NEW)
 endif()
 
-# we are only using the header-only "container" component so we can unconditionally search for it
 if(USE_BOOST)
-    find_package(Boost REQUIRED)
-else()
-    find_package(Boost)
+    # with Visual Studio Boost is not detected by CMake unless you provide a full release even if only used header-only.
+    # to work around this we allow to externally set BOOST_INCLUDEDIR.
+    # see https://trac.cppcheck.net/ticket/13822 for more details.
+    if(BOOST_INCLUDEDIR)
+        if(NOT MSVC)
+            message(FATAL_ERROR "BOOST_INCLUDEDIR hack only allowed for Visual Studio")
+        endif()
+        message(STATUS "Using BOOST_INCLUDEDIR hack for Visual Studio")
+        if(NOT IS_READABLE "${BOOST_INCLUDEDIR}/boost/container/small_vector.hpp")
+            message(FATAL_ERROR "Provided BOOST_INCLUDEDIR does not appear to contain Boost includes")
+        endif()
+        set(Boost_FOUND ON)
+        set(Boost_INCLUDE_DIRS "${BOOST_INCLUDEDIR}")
+        set(Boost_VERSION_STRING "")  # TODO: set proper value
+    elseif(USE_BOOST STREQUAL "Auto")
+        find_package(Boost)
+    else()
+        find_package(Boost REQUIRED)
+    endif()
 endif()
 
 find_program(LIBXML2_XMLLINT_EXECUTABLE xmllint)
diff --git a/cmake/includechecks.cmake b/cmake/includechecks.cmake
new file mode 100644
index 00000000000..b9cbbd03183
--- /dev/null
+++ b/cmake/includechecks.cmake
@@ -0,0 +1,8 @@
+include(CheckIncludeFileCXX)
+
+if(NOT MSVC)
+    check_include_file_cxx(execinfo.h HAVE_EXECINFO_H)
+    if(NOT HAVE_EXECINFO_H)
+        set(HAVE_EXECINFO_H 0)
+    endif()
+endif()
\ No newline at end of file
diff --git a/cmake/options.cmake b/cmake/options.cmake
index f388c90e173..bda080fe77b 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -25,12 +25,13 @@ option(ANALYZE_TYPE         "Build with TypeSanitizer to detect aliasing issues"
 option(WARNINGS_ARE_ERRORS  "Treat warnings as errors"                                      OFF)
 if(WARNINGS_ARE_ERRORS)
     if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24")
-        message(WARNING "WARNINGS_ARE_ERRORS is deprecated - please use CMAKE_COMPILE_WARNING_AS_ERROR instead")
+        message(DEPRECATION "WARNINGS_ARE_ERRORS is deprecated - please use CMAKE_COMPILE_WARNING_AS_ERROR instead")
     endif()
     set(CMAKE_COMPILE_WARNING_AS_ERROR On)
 endif()
 option(EXTERNALS_AS_SYSTEM  "Treat externals as system includes"                            OFF)
 
+# we are only using the header-only "container" Boost component so we can unconditionally search for it by default
 set(USE_MATCHCOMPILER "Auto" CACHE STRING "Usage of match compiler")
 set_property(CACHE USE_MATCHCOMPILER PROPERTY STRINGS Auto Off On Verify)
 if(USE_MATCHCOMPILER)
@@ -55,17 +56,31 @@ option(BUILD_CORE_DLL       "Build lib as cppcheck-core.dll with Visual Studio"
 if(BUILD_CORE_DLL AND NOT MSVC)
     message(FATAL_ERROR "Building of lib as DLL is only supported with Visual Studio")
 endif()
+# need to check before the option() specifying it or it will be defined
+if(DEFINED BUILD_TESTS)
+    message(DEPRECATION "BUILD_TESTS has been deprecated and will be removed in Cppcheck 2.22 - please use BUILD_TESTING instead")
+    if(DEFINED BUILD_TESTING)
+        message(AUTHOR_WARNING "BUILD_TESTS and BUILD_TESTING have been defined at the same time - ignoring BUILD_TESTS")
+    else()
+        set(BUILD_TESTING "${BUILD_TESTS}")
+    endif()
+elseif(NOT DEFINED BUILD_TESTING)
+    # disable tests by default - TODO: remove this
+    set(BUILD_TESTING OFF)
+endif()
 option(BUILD_TESTS          "Build tests"                                                   OFF)
 option(REGISTER_TESTS       "Register tests in CTest"                                       ON)
 option(ENABLE_CHECK_INTERNAL "Enable internal checks"                                       OFF)
 option(DISABLE_DMAKE        "Disable run-dmake dependencies"                                OFF)
 option(BUILD_MANPAGE        "Enable man target to build manpage"                            OFF)
 
-option(BUILD_CLI            "Build the cli application"                                     ON)
+option(BUILD_CLI            "Build the CLI application"                                     ON)
+if(NOT BUILD_CLI AND BUILD_TESTING)
+    message(FATAL_ERROR "Building the tests requires the CLI to be build as well")
+endif()
 
 option(BUILD_GUI            "Build the qt application"                                      OFF)
 option(WITH_QCHART          "Enable QtCharts usage in the GUI"                              OFF)
-option(USE_QT6              "Prefer Qt6 when available"                                     OFF)
 option(REGISTER_GUI_TESTS   "Register GUI tests in CTest"                                   ON)
 option(BUILD_ONLINE_HELP    "Build online help"                                             OFF)
 option(BUILD_TRIAGE         "Build triage UI tool"                                          OFF)
@@ -89,14 +104,22 @@ option(DISALLOW_THREAD_EXECUTOR "Disallow usage of ThreadExecutor for -j"
 if(DISALLOW_THREAD_EXECUTOR AND WIN32)
     message(FATAL_ERROR "Cannot disable usage of ThreadExecutor on Windows as no other executor implementation is currently available")
 endif()
-option(USE_BOOST            "Force usage of Boost"                                          OFF)
+option(DISALLOW_PROCESS_EXECUTOR "Disallow usage of ProcessExecutor for -j"                   OFF)
+if(DISALLOW_THREAD_EXECUTOR AND DISALLOW_PROCESS_EXECUTOR)
+    message(FATAL_ERROR "Cannot disable both ThreadExecutor and ProcessExecutor")
+endif()
+set(USE_BOOST "Auto" CACHE STRING "Usage of Boost")
+set_property(CACHE USE_BOOST PROPERTY STRINGS Auto Off On)
 option(USE_BOOST_INT128     "Usage of Boost.Multiprecision 128-bit integer for Mathlib"     OFF)
 if (NOT USE_BOOST AND USE_BOOST_INT128)
     message(FATAL_ERROR "USE_BOOST_INT128 requires USE_BOOST to be enabled")
 endif()
 option(USE_LIBCXX           "Use libc++ instead of libstdc++"                               OFF)
 
-option(DISABLE_CRTDBG_MAP_ALLOC "Disable usage of Visual Studio C++ memory leak detection in Debug build" OFF)
+if(USE_LIBCXX AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message(FATAL_ERROR "libc++ can only be used with a Clang-based compiler")
+endif()
+
 option(NO_UNIX_SIGNAL_HANDLING "Disable usage of Unix Signal Handling"                      OFF)
 option(NO_UNIX_BACKTRACE_SUPPORT "Disable usage of Unix Backtrace support"                  OFF)
 option(NO_WINDOWS_SEH       "Disable usage of Windows SEH"                                  OFF)
@@ -106,27 +129,27 @@ option(ENABLE_CSA_ALPHA     "Enable Clang Static Analyzer alpha checkers for run
 # TODO: disable by default like make build?
 option(FILESDIR "Hard-coded directory for files to load from"                               OFF)
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
-    set(CMAKE_DISABLE_PRECOMPILE_HEADERS Off CACHE BOOL "Disable precompiled headers")
-    # need to disable the prologue or it will be treated like a system header and not emit any warnings
-    # see https://gitlab.kitware.com/cmake/cmake/-/issues/21219
-    set(CMAKE_PCH_PROLOGUE "")
-else()
-    set(CMAKE_DISABLE_PRECOMPILE_HEADERS On CACHE BOOL "Disable precompiled headers")
-endif()
+set(CMAKE_DISABLE_PRECOMPILE_HEADERS Off CACHE BOOL "Disable precompiled headers")
+# need to disable the prologue or it will be treated like a system header and not emit any warnings
+# see https://gitlab.kitware.com/cmake/cmake/-/issues/21219
+set(CMAKE_PCH_PROLOGUE "")
 
+# TODO: do we need to set these?
 set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE ${CMAKE_INSTALL_PREFIX}/include      CACHE PATH "Output directory for headers")
 set(CMAKE_LIB_DIRS_CONFIGCMAKE     ${CMAKE_INSTALL_PREFIX}/lib          CACHE PATH "Output directory for libraries")
 
+# TODO: do we need to set these?
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
 string(LENGTH "${FILESDIR}" _filesdir_len)
 # override FILESDIR if it is set or empty
+# needs to be an absolute path in Cppcheck but a relative one for CMake install
 if(FILESDIR OR ${_filesdir_len} EQUAL 0)
-# TODO: verify that it is an abolute path?
-    set(FILESDIR_DEF                   ${FILESDIR})
+    set(FILESDIR_INSTALL               "${FILESDIR}") # TODO: make relative - leverage CMAKE_INSTALL_DATAROOTDIR?
+    set(FILESDIR_DEF                   "${FILESDIR}")
 else()
-    set(FILESDIR_DEF                   ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} CACHE STRING "Cppcheck files directory")
+    set(FILESDIR_INSTALL               "share/${PROJECT_NAME}")
+    set(FILESDIR_DEF                   "${CMAKE_INSTALL_PREFIX}/${FILESDIR_INSTALL}")
 endif()
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
index a2667578e5f..7869169708d 100644
--- a/cmake/printInfo.cmake
+++ b/cmake/printInfo.cmake
@@ -8,6 +8,7 @@ message(STATUS "Compiler Version =      ${CMAKE_CXX_COMPILER_VERSION}")
 message(STATUS "Build type =            ${CMAKE_BUILD_TYPE}")
 message(STATUS "CMake C++ Standard =    ${CMAKE_CXX_STANDARD}")
 message(STATUS "CMAKE_INSTALL_PREFIX =  ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "CMAKE_INSTALL_BINDIR =  ${CMAKE_INSTALL_BINDIR}")
 message(STATUS "CMAKE_DISABLE_PRECOMPILE_HEADERS = ${CMAKE_DISABLE_PRECOMPILE_HEADERS}")
 message(STATUS "C++ flags (General) =   ${CMAKE_CXX_FLAGS}")
 message(STATUS "C++ flags (Release) =   ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -15,6 +16,9 @@ message(STATUS "C++ flags (RelWithDebInfo) = ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 message(STATUS "C++ flags (Debug) =     ${CMAKE_CXX_FLAGS_DEBUG}")
 message(STATUS "CMAKE_EXE_LINKER_FLAGS = ${CMAKE_EXE_LINKER_FLAGS}")
 message(STATUS "CPPCHK_GLIBCXX_DEBUG =  ${CPPCHK_GLIBCXX_DEBUG}")
+if(DEFINED HAVE_EXECINFO_H)
+    message(STATUS "HAVE_EXECINFO_H =       ${HAVE_EXECINFO_H}")
+endif()
 get_directory_property(DirCompileDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
 message(STATUS "COMPILE_DEFINITIONS (global) =  ${DirCompileDefs}")
 get_directory_property(DirCompileOptions DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_OPTIONS)
@@ -38,7 +42,6 @@ message(STATUS)
 message(STATUS "USE_MATCHCOMPILER =     ${USE_MATCHCOMPILER}")
 message(STATUS "USE_MATCHCOMPILER_OPT = ${USE_MATCHCOMPILER_OPT}")
 message(STATUS)
-message(STATUS "DISABLE_CRTDBG_MAP_ALLOC = ${DISABLE_CRTDBG_MAP_ALLOC}")
 message(STATUS "NO_UNIX_SIGNAL_HANDLING = ${NO_UNIX_SIGNAL_HANDLING}")
 message(STATUS "NO_UNIX_BACKTRACE_SUPPORT = ${NO_UNIX_BACKTRACE_SUPPORT}")
 message(STATUS "NO_WINDOWS_SEH =        ${NO_WINDOWS_SEH}")
@@ -53,7 +56,8 @@ endif()
 message(STATUS "LIBXML2_XMLLINT_EXECUTABLE = ${LIBXML2_XMLLINT_EXECUTABLE}")
 message(STATUS "BUILD_CORE_DLL =        ${BUILD_CORE_DLL}")
 message(STATUS "BUILD_TESTS =           ${BUILD_TESTS}")
-if(BUILD_TESTS)
+message(STATUS "BUILD_TESTING =         ${BUILD_TESTING}")
+if(BUILD_TESTING)
     message(STATUS "REGISTER_TESTS =        ${REGISTER_TESTS}")
 endif()
 message(STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}")
@@ -66,16 +70,12 @@ message(STATUS "BUILD_GUI =             ${BUILD_GUI}")
 if(BUILD_GUI)
     message(STATUS "REGISTER_GUI_TESTS =    ${REGISTER_GUI_TESTS}")
     message(STATUS "WITH_QCHART =           ${WITH_QCHART}")
-    message(STATUS "USE_QT6 =               ${USE_QT6}")
     message(STATUS "QT_VERSION =            ${QT_VERSION}")
-    if(USE_QT6)
-        message(STATUS "Qt6Core_LIBRARIES =     ${Qt6Core_LIBRARIES}")
-        message(STATUS "Qt6Core_INCLUDE_DIRS =  ${Qt6Core_INCLUDE_DIRS}")
-    else()
-        message(STATUS "Qt5Core_LIBRARIES =     ${Qt5Core_LIBRARIES}")
-        message(STATUS "Qt5Core_INCLUDE_DIRS =  ${Qt5Core_INCLUDE_DIRS}")
+    message(STATUS "Qt6Core_LIBRARIES =     ${Qt6Core_LIBRARIES}")
+    message(STATUS "Qt6Core_INCLUDE_DIRS =  ${Qt6Core_INCLUDE_DIRS}")
+    if(BUILD_ONLINE_HELP)
+        message(STATUS "QHELPGENERATOR =        ${QHELPGENERATOR}")
     endif()
-    message(STATUS "QHELPGENERATOR =        ${QHELPGENERATOR}")
 endif()
 message(STATUS)
 message(STATUS "HAVE_RULES =            ${HAVE_RULES}")
@@ -84,23 +84,33 @@ if(HAVE_RULES)
 endif()
 message(STATUS)
 message(STATUS "DISALLOW_THREAD_EXECUTOR = ${DISALLOW_THREAD_EXECUTOR}")
+message(STATUS "DISALLOW_PROCESS_EXECUTOR = ${DISALLOW_PROCESS_EXECUTOR}")
 message(STATUS "CMAKE_THREAD_LIBS_INIT = ${CMAKE_THREAD_LIBS_INIT}")
 message(STATUS)
 message(STATUS "USE_BUNDLED_TINYXML2 =  ${USE_BUNDLED_TINYXML2}")
 if(NOT USE_BUNDLED_TINYXML2)
-    message(STATUS "tinyxml2_LIBRARIES =    ${tinyxml2_LIBRARIES}")
-    message(STATUS "tinyxml2_INCLUDE_DIRS = ${tinyxml2_INCLUDE_DIRS}")
+    if(TARGET tinyxml2::tinyxml2)
+        # TODO: print libraries and include dirs
+    else()
+        message(STATUS "tinyxml2_LIBRARIES =    ${tinyxml2_LIBRARIES}")
+        message(STATUS "tinyxml2_INCLUDE_DIRS = ${tinyxml2_INCLUDE_DIRS}")
+    endif()
 endif()
 message(STATUS)
 message(STATUS "USE_BOOST =             ${USE_BOOST}")
-message(STATUS "Boost_FOUND =           ${Boost_FOUND}")
-message(STATUS "Boost_VERSION_STRING =  ${Boost_VERSION_STRING}")
-message(STATUS "Boost_INCLUDE_DIRS =    ${Boost_INCLUDE_DIRS}")
-message(STATUS "USE_BOOST_INT128 =      ${USE_BOOST_INT128}")
+if(USE_BOOST)
+    message(STATUS "Boost_FOUND =           ${Boost_FOUND}")
+    if(Boost_FOUND)
+        message(STATUS "Boost_VERSION_STRING =  ${Boost_VERSION_STRING}")
+        message(STATUS "Boost_INCLUDE_DIRS =    ${Boost_INCLUDE_DIRS}")
+        message(STATUS "USE_BOOST_INT128 =      ${USE_BOOST_INT128}")
+    endif()
+endif()
 message(STATUS)
 message(STATUS "USE_LIBCXX =            ${USE_LIBCXX}")
 message(STATUS)
 message(STATUS "FILESDIR =              ${FILESDIR}")
+message(STATUS "FILESDIR_INSTALL =      ${FILESDIR_INSTALL}")
 message(STATUS "FILESDIR_DEF =          ${FILESDIR_DEF}")
 message(STATUS)
 
diff --git a/cmake/qtCompat.cmake b/cmake/qtCompat.cmake
index 91995610a90..bc3e3851440 100644
--- a/cmake/qtCompat.cmake
+++ b/cmake/qtCompat.cmake
@@ -1,43 +1,10 @@
-if(QT_VERSION VERSION_LESS 5.15)
-    # "versionless" Qt is not supported until 5.15 so we need to use wrappers
-
-    function(qt_wrap_ui out)
-        qt5_wrap_ui(_uis_hdrs ${ARGN})
-        set("${out}" ${_uis_hdrs} PARENT_SCOPE)
-    endfunction()
-
-    function(qt_add_resources out)
-        qt5_add_resources(_resources ${ARGN})
-        set("${out}" ${_resources} PARENT_SCOPE)
-    endfunction()
-
-    function(qt_create_translation out)
-        qt5_create_translation(_qms ${ARGN})
-        set("${out}" ${_qms} PARENT_SCOPE)
-    endfunction()
-
-    function(qt_wrap_cpp out)
-        qt5_wrap_cpp(_sources ${ARGN})
-        set("${out}" ${_sources} PARENT_SCOPE)
-    endfunction()
-
-    set(QT_CORE_LIB Qt5::Core)
-    set(QT_TEST_LIB Qt5::Test)
-    set(QT_WIDGETS_LIB Qt5::Widgets)
-    set(QT_GUI_LIB Qt5::Gui)
-    set(QT_HELP_LIB Qt5::Help)
-    set(QT_PRINTSUPPORT_LIB Qt5::PrintSupport)
-    set(QT_CHARTS_LIB Qt5::Charts)
-    set(QT_NETWORK_LIB Qt5::Network)
-else()
-    # use "versionless" targets - no need for wrapper functions
-
-    set(QT_CORE_LIB Qt::Core)
-    set(QT_TEST_LIB Qt::Test)
-    set(QT_WIDGETS_LIB Qt::Widgets)
-    set(QT_GUI_LIB Qt::Gui)
-    set(QT_HELP_LIB Qt::Help)
-    set(QT_PRINTSUPPORT_LIB Qt::PrintSupport)
-    set(QT_CHARTS_LIB Qt::Charts)
-    set(QT_NETWORK_LIB Qt::Network)
-endif()
+# use "versionless" targets - no need for wrapper functions
+
+set(QT_CORE_LIB Qt::Core)
+set(QT_TEST_LIB Qt::Test)
+set(QT_WIDGETS_LIB Qt::Widgets)
+set(QT_GUI_LIB Qt::Gui)
+set(QT_HELP_LIB Qt::Help)
+set(QT_PRINTSUPPORT_LIB Qt::PrintSupport)
+set(QT_CHARTS_LIB Qt::Charts)
+set(QT_NETWORK_LIB Qt::Network)
diff --git a/cppcheckpremium-suppressions b/cppcheckpremium-suppressions
index 07fce749a80..1b26fa55cc1 100644
--- a/cppcheckpremium-suppressions
+++ b/cppcheckpremium-suppressions
@@ -25,9 +25,6 @@ premium-cert-str34-c
 # we intentionally pass structs
 premium-cert-dcl39-c-*
 
-# we need to declare reserved identifier _CRTDBG_MAP_ALLOC
-premium-cert-dcl51-cpp
-
 # we don't want to check the return values of fclose/sprintf/etc
 premium-cert-err33-c
 
@@ -115,6 +112,9 @@ premium-misra-cpp-2023-7.0.3
 # signed integer expression in bitwise rhs by intention
 premium-misra-cpp-2023-7.0.4
 
+# integer promotions
+premium-misra-cpp-2023-7.0.5
+
 # sign conversions in assignments by intention
 premium-misra-cpp-2023-7.0.6
 
@@ -196,7 +196,7 @@ premium-misra-cpp-2023-12.3.1
 # TODO ensure overrides match
 premium-misra-cpp-2023-13.3.2
 
-# TODO use the same parameter names in overriden methods.
+# TODO use the same parameter names in overridden methods.
 premium-misra-cpp-2023-13.3.3
 
 # we sometimes use both public/private data members by intention
diff --git a/createrelease b/createrelease
index 5b5d1fb7cc3..6a611a5a469 100755
--- a/createrelease
+++ b/createrelease
@@ -1,13 +1,29 @@
 #!/bin/bash
 #
-# A script for creating release packages. The release packages are create in the home directory.
+# A script for creating release packages. The release packages are created in the home directory.
 #
 # Create release candidate
 # ========================
 #
-# update cppcheck used in premium addon CI
+# Review trac roadmap, are tickets closed properly?
+# Only tickets that should be retargeted should be open.
 #
-# check every isPremiumEnabled call:
+# Versioning scheme
+# ========================
+# VERSION=2.22.0      # the new release tag created
+# PREV=2.21.0         # the previous release
+# BRANCH=2.22.x       # release branch
+#
+#   2.22.x          BRANCH  - release branch
+#   2.22.0          TAG     - the release
+#   2.22.1, ...     TAG     - patch releases
+#   2.22.0-rc1      TAG     - release candidate
+#
+# Update mappings:
+# cd ~/cppchecksolutions/addon/coverage
+# CPPCHECK_REPO=~/cppchecksolutions/cppcheck python3 coverage.py --code
+#
+# Check every isPremiumEnabled call: TODO write helper script
 # - every id should be in --errorlist
 #   git grep 'isPremiumEnabled[(]"' | sed 's/.*isPremiumEnabled[(]"//' | sed 's/".*//' | sort | uniq > ids1.txt
 #   ./cppcheck --errorlist | grep ' id="' | sed 's/.* id="//' | sed 's/".*//' | sort | uniq > ids2.txt
@@ -20,86 +36,97 @@
 # - ensure latest build was successful
 # - ensure cfg files etc are included (win_installer/cppcheck.wxs)
 #
-# self check, fix critical issues:
-# make clean && make CXXFLAGS=-O2 MATCHCOMPILER=yes -j4
+# Self check, fix critical issues:
+# make clean && make CXXOPTS=-O2 MATCHCOMPILER=yes -j4
 # ./cppcheck -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --std=c++11 --library=cppcheck-lib --library=qt --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h --suppress=functionConst --suppress=functionStatic --suppress=normalCheckLevelMaxBranches --xml cli gui/*.cpp lib 2> selfcheck.xml
 #
-# Generate lib/checkers.cpp (TODO the premium checkers should not be statically coded)
+# Generate lib/checkers.cpp: (TODO the premium checkers should not be statically coded)
 # cd ~/cppchecksolutions/cppcheck && python3 tools/get_checkers.py > lib/checkers.cpp
 #
-# Update copyright year
-# git diff 2.8 -- */*.cpp */*.h | grep '^diff --git a/' | sed 's|.* b/||' | xargs sed -i 's/Copyright (C) 2007-20[12]./Copyright (C) 2007-2022/'
+# Update copyright year: TODO release script
+# git diff $PREV -- */*.cpp */*.h | grep '^diff --git a/' | sed 's|.* b/||' | xargs sed -i "s/Copyright (C) 2007-20[12]./Copyright (C) 2007-$(date +%Y)/"
 # git diff | grep '^diff --git a/'
 #
 # Make sure "cppcheck --errorlist" works:
 # make clean && make -j4 && ./cppcheck --errorlist > errlist.xml && xmllint --noout errlist.xml
 #
 # Update AUTHORS using output from:
-# git log --format='%aN' 2.7..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
+# git log --format='%aN' $PREV..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
+# Include github usernames in PR title and commit message
 #
-# Create 2.8.x branch
-# git checkout -b 2.8.x ; git push -u origin 2.8.x
+# Update GUI translations:
+# cd ~/cppchecksolutions/cppcheck/gui && lupdate gui.pro
+#
+# Create new release branch:
+# git checkout -b $BRANCH && git push -u origin $BRANCH
+# in fork:
+#  * add upstream: git remote add upstream git@github.com:cppcheck-opensource/cppcheck.git
+#  * add branch:   git fetch upstream $BRANCH
 #
 # Release notes:
 # - ensure safety critical issues are listed properly
 # - empty the releasenotes.txt in main branch
 #
 # Update version numbers in:
-# sed -i -r "s/version 2[.][0-9]+([.]99)*/version 2.13.0/" cli/main.cpp
-# sed -i -r "s|VERSION 2[.][0-9]+[.]99|VERSION 2.13.0|" CMakeLists.txt # version must have 3 parts.
-# sed -i -r "s/CPPCHECK_MINOR_VERSION [0-9]+/CPPCHECK_MINOR_VERSION 13/" lib/version.h
-# sed -i -r "s/CPPCHECK_BUGFIX_VERSION 99/CPPCHECK_BUGFIX_VERSION 0/" lib/version.h
-# sed -i -r "s/2[.][0-9]+([.]99)*( dev)*/2.13.0/" win_installer/productInfo.wxi
-# sed -i -r "s/subtitle: Version 2\.[0-9]+.*/subtitle: Version 2.13/" man/*.md
-# Ensure that "-rc1" is added in productInfo.wxi and lib/version.h
+# python3 tools/release-set-version.py $VERSION
 # Verify:
 # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
 # egrep "2\.[0-9]+" */*.h */*.cpp man/*.md | grep -v "test/test" | less
-# git commit -a -m "2.8: Set versions"
+# git commit -a -m "$VERSION: Set versions"
 #
 # Build and test the windows installer
 #
 # Update the Makefile:
 # make dmake && ./dmake --release
-# git commit -a -m "2.8: Updated Makefile [ci skip]"
+# git commit -a -m "$VERSION: Updated Makefile"
+#
+# Push changes:
+# git push
 #
 # Ensure that CI is happy
 #
 # Tag:
-# git tag 2.8-rc1
+# git tag $VERSION-rc1
 # git push --tags
 #
 # Release
-# =======
+# ========================
 #
 # Remove "-rc1" from versions. Test: git grep "\-rc[0-9]"
 #
 # Create a release folder on sourceforge:
 # https://sourceforge.net/projects/cppcheck/files/cppcheck/
 #
-# git tag 2.8 ; git push --tags
-# ./createrelease 2.8
+# git tag $VERSION && git push --tags
+# ./createrelease $VERSION
 #
-# copy msi from release-windows, install and test cppcheck
-# copy manual from build-manual
+# Copy msi from release-windows, install and test cppcheck
+# Copy manual from build-manual
 #
 # Update download link on index.php main page
 #
 # Trac:
-# 1. Create ticket "2.12 safety cosmetic changes"
+# 1. Create ticket "$VERSION safety cosmetic changes"
+#    git log --format=oneline $PREV..HEAD | egrep -v "^[0-9a-f]*[ ][ ]*([Ff]ix|fixed|Fixup|Fixes|refs)?[ ]*#*[0-9]+"
 # 2. Check priorities for all tickets in milestone. Should be: safety-*
 # 3. Create new milestone
 # 4. Close old milestone
 #
-# write a news
+# Write a news
 #
-# save "cppcheck --doc" output on wiki
+# Save "cppcheck --doc" output on wiki
 #
-# compile new democlient:
+# Compile new democlient:
 # ssh -t danielmarjamaki,cppcheck@shell.sourceforge.net create
 # ./build-cppcheck.sh
 #
-# run daca with new release
+# Create a ticket with data from http://cppcheck1.osuosl.org:8000/time_gt.html for performance tracking
+# (example: https://trac.cppcheck.net/ticket/13715)
+# - type: defect
+# - component: Performance
+# - summary: [meta] performance regressions in $VERSION
+#
+# Run daca with new release:
 # 1. edit tools/donate-cpu-server.py. Update OLD_VERSION and SERVER_VERSION
 # 2. scp -i ~/.ssh/osuosl_id_rsa tools/donate-cpu-server.py danielmarjamaki@cppcheck1.osuosl.org:/var/daca@home/
 #
@@ -107,14 +134,14 @@
 # * trac: cd /var && nice tar -cJf ~/trac.tar.xz trac-cppcheck/db/trac.db
 # * daca: cd /var && nice tar -cJf ~/daca.tar.xz daca@home
 # * git: git checkout -f && git checkout main && git pull && tar -cJf git.tar.xz .git
-# * git log 2.16.0..2.17.0 > Changelog
-# * mkdir out && python3 ~/cppchecksolutions/release/getWorkflowAndIssueLogs.py -r danmar/cppcheck -t 2.15.0 -p out
+# * git log $PREV..$VERSION > Changelog
+# * mkdir out && python3 ~/cppchecksolutions/release/getWorkflowAndIssueLogs.py -r /cppcheck-opensource//cppcheck -t $VERSION -p out
 
-# Folder/tag to use
-folder=$1
-tag=$folder.0
+# Folder/tag to use:
+tag=$1
+folder=${tag%.*}
 
-# Name of release
+# Name of release:
 releasename=cppcheck-$tag
 
 set -e
@@ -124,38 +151,36 @@ cd ~/cppcheck
 git checkout $tag
 
 rm -rf upload
-mkdir -p upload
+mkdir -p upload/htdocs upload/frs
 
+# htdocs
 make clean
-
-# Create archives..
-git archive --format=tar --prefix=$releasename/ $tag | gzip > upload/$releasename.tar.gz
-git archive --format=tar --prefix=$releasename/ $tag | bzip2 > upload/$releasename.tar.bz2
-git archive --format=zip -9 --prefix=$releasename/ $tag > upload/$releasename.zip
-cd upload
-scp $releasename.* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
-rm $releasename.*
-cd ..
-
-# Generate version.txt
 make -j12
 rm -f cppcheck.cfg
-./cppcheck --version > upload/version.txt
+./cppcheck --version > upload/htdocs/version.txt
+# TODO manual, update version on webpage
 
-cd ~/cppcheck/upload
-scp version.txt danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
+# frs
+git archive --format=tar --prefix=$releasename/ $tag | gzip > upload/frs/$releasename.tar.gz
+git archive --format=tar --prefix=$releasename/ $tag | bzip2 > upload/frs/$releasename.tar.bz2
+git archive --format=zip -9 --prefix=$releasename/ $tag > upload/frs/$releasename.zip
+cp releasenotes.txt upload/frs/README.md
+# TODO msi
 
-cd ~/cppcheck
+cd upload
+scp frs/* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
+scp htdocs/* danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
+cd ..
 rm -rf upload
 
-# Local cppcheck binary
+# Local cppcheck binary:
 mkdir -p ~/.cppcheck/$tag
 cd ~/.cppcheck/$tag
 cp -R ~/cppcheck/cfg .
 cp -R ~/cppcheck/addons .
 cp -R ~/cppcheck/platforms .
 cd ~/cppcheck
-make clean ; make -j12 FILESDIR=~/.cppcheck/$tag MATCHCOMPILER=yes CXXFLAGS=-O2
+make clean ; make -j12 FILESDIR=~/.cppcheck/$tag MATCHCOMPILER=yes CXXOPTS=-O2
 mv cppcheck ~/.cppcheck/cppcheck-$tag
 
 git checkout main
diff --git a/democlient/democlient.cpp b/democlient/democlient.cpp
index 59746788163..8560596f4f3 100644
--- a/democlient/democlient.cpp
+++ b/democlient/democlient.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -63,11 +63,11 @@ class CppcheckExecutor : public ErrorLogger {
 public:
     CppcheckExecutor(const Settings& settings)
         : stoptime(std::time(nullptr)+2U)
-        , cppcheck(settings, supprs, *this, false, nullptr)
+        , cppcheck(settings, supprs, *this, nullptr, false, nullptr)
     {}
 
-    void run(const char code[]) {
-        cppcheck.check(FileWithDetails("test.cpp", Standards::Language::CPP, 0), code);
+    void run(const char* code) {
+        cppcheck.checkBuffer(FileWithDetails("test.cpp", Standards::Language::CPP, 0), code, strlen(code));
     }
 
     void reportOut(const std::string & /*outmsg*/, Color /*c*/) override {}
@@ -81,6 +81,7 @@ class CppcheckExecutor : public ErrorLogger {
         if (logfile != nullptr)
             std::fprintf(logfile, "%s\n", s.c_str());
     }
+    void reportMetric(const std::string & /*metric*/) override {}
 
     void reportProgress(const std::string& /*filename*/,
                         const char /*stage*/[],
diff --git a/externals/picojson/CMakeLists.txt b/externals/picojson/CMakeLists.txt
new file mode 100644
index 00000000000..937a89c12b3
--- /dev/null
+++ b/externals/picojson/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_library(picojson INTERFACE)
+target_externals_include_directories(picojson INTERFACE .)
+
diff --git a/externals/simplecpp/CMakeLists.txt b/externals/simplecpp/CMakeLists.txt
index 18430fea55e..50f139739a7 100644
--- a/externals/simplecpp/CMakeLists.txt
+++ b/externals/simplecpp/CMakeLists.txt
@@ -1,11 +1,11 @@
 file(GLOB hdrs "*.h")
 file(GLOB srcs "*.cpp")
 
-add_library(simplecpp_objs OBJECT ${srcs} ${hdrs})
-if (BUILD_CORE_DLL)
-    target_compile_definitions(simplecpp_objs PRIVATE SIMPLECPP_EXPORT)
-endif()
+add_library(simplecpp ${srcs} ${hdrs})
+target_dll_compile_definitions(simplecpp EXPORT SIMPLECPP_EXPORT IMPORT SIMPLECPP_IMPORT)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    target_compile_options_safe(simplecpp_objs -Wno-zero-as-null-pointer-constant)
+    target_compile_options_safe(simplecpp -Wno-zero-as-null-pointer-constant)
 endif()
+
+target_externals_include_directories(simplecpp PUBLIC .)
diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
old mode 100755
new mode 100644
index d1fa91bf532..8237ac75fab
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -3,23 +3,30 @@
  * Copyright (C) 2016-2023 simplecpp team
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#define SIMPLECPP_WINDOWS
-#define NOMINMAX
+// needs to be specified here otherwise _mingw.h will define it as 0x0601
+// causing FileIdInfo not to be available
+#if defined(_WIN32)
+#  ifndef _WIN32_WINNT
+#    define _WIN32_WINNT 0x0602
+#  endif
 #endif
 
 #include "simplecpp.h"
 
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#  define SIMPLECPP_WINDOWS
+#endif
+
 #include <algorithm>
 #include <cassert>
 #include <cctype>
 #include <climits>
 #include <cstddef> // IWYU pragma: keep
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-#include <exception>
 #include <fstream>
 #include <iostream>
 #include <istream>
@@ -31,36 +38,26 @@
 #include <stack>
 #include <stdexcept>
 #include <string>
-#if __cplusplus >= 201103L
 #ifdef SIMPLECPP_WINDOWS
-#include <mutex>
+#  include <mutex>
 #endif
 #include <unordered_map>
-#endif
 #include <utility>
 #include <vector>
 
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-#ifdef SIMPLECPP_WINDOWS
-#include <windows.h>
-#undef ERROR
-#endif
-
-#if __cplusplus >= 201103L
-#define OVERRIDE override
-#define EXPLICIT explicit
+#if defined(_WIN32)
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  undef ERROR
+#  include <direct.h>
 #else
-#define OVERRIDE
-#define EXPLICIT
-#endif
-
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#define nullptr NULL
+#  include <sys/stat.h>
+#  include <sys/types.h>
 #endif
 
 static bool isHex(const std::string &s)
@@ -73,14 +70,12 @@ static bool isOct(const std::string &s)
     return s.size()>1 && (s[0]=='0') && (s[1] >= '0') && (s[1] < '8');
 }
 
-// TODO: added an undercore since this conflicts with a function of the same name in utils.h from Cppcheck source when building Cppcheck with MSBuild
-static bool isStringLiteral_(const std::string &s)
+static bool isStringLiteral(const std::string &s)
 {
     return s.size() > 1 && (s[0]=='\"') && (*s.rbegin()=='\"');
 }
 
-// TODO: added an undercore since this conflicts with a function of the same name in utils.h from Cppcheck source when building Cppcheck with MSBuild
-static bool isCharLiteral_(const std::string &s)
+static bool isCharLiteral(const std::string &s)
 {
     // char literal patterns can include 'a', '\t', '\000', '\xff', 'abcd', and maybe ''
     // This only checks for the surrounding '' but doesn't parse the content.
@@ -101,6 +96,8 @@ static const simplecpp::TokenString IFNDEF("ifndef");
 static const simplecpp::TokenString DEFINED("defined");
 static const simplecpp::TokenString ELSE("else");
 static const simplecpp::TokenString ELIF("elif");
+static const simplecpp::TokenString ELIFDEF("elifdef");
+static const simplecpp::TokenString ELIFNDEF("elifndef");
 static const simplecpp::TokenString ENDIF("endif");
 
 static const simplecpp::TokenString PRAGMA("pragma");
@@ -153,12 +150,6 @@ static unsigned long long stringToULL(const std::string &s)
     return ret;
 }
 
-// TODO: added an undercore since this conflicts with a function of the same name in utils.h from Cppcheck source when building Cppcheck with MSBuild 
-static bool startsWith_(const std::string &s, const std::string &p)
-{
-    return (s.size() >= p.size()) && std::equal(p.begin(), p.end(), s.begin());
-}
-
 static bool endsWith(const std::string &s, const std::string &e)
 {
     return (s.size() >= e.size()) && std::equal(e.rbegin(), e.rend(), s.rbegin());
@@ -193,8 +184,6 @@ static std::string replaceAll(std::string s, const std::string& from, const std:
     return s;
 }
 
-const std::string simplecpp::Location::emptyFileName;
-
 void simplecpp::Location::adjust(const std::string &str)
 {
     if (strpbrk(str.c_str(), "\r\n") == nullptr) {
@@ -256,7 +245,7 @@ void simplecpp::Token::printOut() const
 // cppcheck-suppress noConstructor - we call init() in the inherited to initialize the private members
 class simplecpp::TokenList::Stream {
 public:
-    virtual ~Stream() {}
+    virtual ~Stream() = default;
 
     virtual int get() = 0;
     virtual int peek() = 0;
@@ -264,12 +253,12 @@ class simplecpp::TokenList::Stream {
     virtual bool good() = 0;
 
     unsigned char readChar() {
-        unsigned char ch = static_cast<unsigned char>(get());
+        auto ch = static_cast<unsigned char>(get());
 
         // For UTF-16 encoded files the BOM is 0xfeff/0xfffe. If the
         // character is non-ASCII character then replace it with 0xff
         if (isUtf16) {
-            const unsigned char ch2 = static_cast<unsigned char>(get());
+            const auto ch2 = static_cast<unsigned char>(get());
             const int ch16 = makeUtf16Char(ch, ch2);
             ch = static_cast<unsigned char>(((ch16 >= 0x80) ? 0xff : ch16));
         }
@@ -291,17 +280,19 @@ class simplecpp::TokenList::Stream {
         return ch;
     }
 
-    unsigned char peekChar() {
-        unsigned char ch = static_cast<unsigned char>(peek());
+    int peekChar() {
+        int ch = peek();
+        if (ch == EOF)
+            return ch;
 
         // For UTF-16 encoded files the BOM is 0xfeff/0xfffe. If the
         // character is non-ASCII character then replace it with 0xff
         if (isUtf16) {
             (void)get();
-            const unsigned char ch2 = static_cast<unsigned char>(peek());
+            const auto ch2 = static_cast<unsigned char>(peek());
             unget();
             const int ch16 = makeUtf16Char(ch, ch2);
-            ch = static_cast<unsigned char>(((ch16 >= 0x80) ? 0xff : ch16));
+            ch = (ch16 >= 0x80) ? 0xff : ch16;
         }
 
         // Handling of newlines..
@@ -365,152 +356,149 @@ class simplecpp::TokenList::Stream {
     bool isUtf16;
 };
 
-class StdIStream : public simplecpp::TokenList::Stream {
-public:
-    // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    EXPLICIT StdIStream(std::istream &istr)
-        : istr(istr) {
-        assert(istr.good());
-        init();
-    }
+namespace {
+    class StdIStream : public simplecpp::TokenList::Stream {
+    public:
+        // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
+        explicit StdIStream(std::istream &istr)
+            : istr(istr) {
+            assert(istr.good());
+            init();
+        }
 
-    virtual int get() OVERRIDE {
-        return istr.get();
-    }
-    virtual int peek() OVERRIDE {
-        return istr.peek();
-    }
-    virtual void unget() OVERRIDE {
-        istr.unget();
-    }
-    virtual bool good() OVERRIDE {
-        return istr.good();
-    }
+        int get() override {
+            return istr.get();
+        }
+        int peek() override {
+            return istr.peek();
+        }
+        void unget() override {
+            istr.unget();
+        }
+        bool good() override {
+            return istr.good();
+        }
 
-private:
-    std::istream &istr;
-};
+    private:
+        std::istream &istr;
+    };
 
-class StdCharBufStream : public simplecpp::TokenList::Stream {
-public:
-    // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    StdCharBufStream(const unsigned char* str, std::size_t size)
-        : str(str)
-        , size(size)
-        , pos(0)
-        , lastStatus(0) {
-        init();
-    }
+    class StdCharBufStream : public simplecpp::TokenList::Stream {
+    public:
+        // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
+        StdCharBufStream(const unsigned char* str, std::size_t size)
+            : str(str)
+            , size(size)
+        {
+            init();
+        }
 
-    virtual int get() OVERRIDE {
-        if (pos >= size)
-            return lastStatus = EOF;
-        return str[pos++];
-    }
-    virtual int peek() OVERRIDE {
-        if (pos >= size)
-            return lastStatus = EOF;
-        return str[pos];
-    }
-    virtual void unget() OVERRIDE {
-        --pos;
-    }
-    virtual bool good() OVERRIDE {
-        return lastStatus != EOF;
-    }
+        int get() override {
+            if (pos >= size)
+                return lastStatus = EOF;
+            return str[pos++];
+        }
+        int peek() override {
+            if (pos >= size)
+                return lastStatus = EOF;
+            return str[pos];
+        }
+        void unget() override {
+            --pos;
+        }
+        bool good() override {
+            return lastStatus != EOF;
+        }
 
-private:
-    const unsigned char *str;
-    const std::size_t size;
-    std::size_t pos;
-    int lastStatus;
-};
+    private:
+        const unsigned char *str;
+        const std::size_t size;
+        std::size_t pos{};
+        int lastStatus{};
+    };
 
-class FileStream : public simplecpp::TokenList::Stream {
-public:
-    // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-    EXPLICIT FileStream(const std::string &filename, std::vector<std::string> &files)
-        : file(fopen(filename.c_str(), "rb"))
-        , lastCh(0)
-        , lastStatus(0) {
-        if (!file) {
-            files.push_back(filename);
-            throw simplecpp::Output(files, simplecpp::Output::FILE_NOT_FOUND, "File is missing: " + filename);
+    class FileStream : public simplecpp::TokenList::Stream {
+    public:
+        /**
+         * @throws simplecpp::Output thrown if file is not found
+         */
+        // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
+        explicit FileStream(const std::string &filename, std::vector<std::string> &files)
+            : file(fopen(filename.c_str(), "rb"))
+        {
+            if (!file) {
+                files.emplace_back(filename);
+                throw simplecpp::Output(simplecpp::Output::FILE_NOT_FOUND, {}, "File is missing: " + filename);
+            }
+            init();
         }
-        init();
-    }
 
-    ~FileStream() OVERRIDE {
-        fclose(file);
-        file = nullptr;
-    }
+        FileStream(const FileStream&) = delete;
+        FileStream &operator=(const FileStream&) = delete;
 
-    virtual int get() OVERRIDE {
-        lastStatus = lastCh = fgetc(file);
-        return lastCh;
-    }
-    virtual int peek() OVERRIDE{
-        // keep lastCh intact
-        const int ch = fgetc(file);
-        unget_internal(ch);
-        return ch;
-    }
-    virtual void unget() OVERRIDE {
-        unget_internal(lastCh);
-    }
-    virtual bool good() OVERRIDE {
-        return lastStatus != EOF;
-    }
+        ~FileStream() override {
+            fclose(file);
+            file = nullptr;
+        }
 
-private:
-    void unget_internal(int ch) {
-        if (isUtf16) {
-            // TODO: use ungetc() as well
-            // UTF-16 has subsequent unget() calls
-            fseek(file, -1, SEEK_CUR);
-        } else
-            ungetc(ch, file);
-    }
+        int get() override {
+            lastStatus = lastCh = fgetc(file);
+            return lastCh;
+        }
+        int peek() override {
+            // keep lastCh intact
+            const int ch = fgetc(file);
+            unget_internal(ch);
+            return ch;
+        }
+        void unget() override {
+            unget_internal(lastCh);
+        }
+        bool good() override {
+            return lastStatus != EOF;
+        }
 
-    FileStream(const FileStream&);
-    FileStream &operator=(const FileStream&);
+    private:
+        void unget_internal(int ch) {
+            if (isUtf16) {
+                // TODO: use ungetc() as well
+                // UTF-16 has subsequent unget() calls
+                fseek(file, -1, SEEK_CUR);
+            } else {
+                ungetc(ch, file);
+            }
+        }
 
-    FILE *file;
-    int lastCh;
-    int lastStatus;
-};
+        FILE *file;
+        int lastCh{};
+        int lastStatus{};
+    };
+}
 
 simplecpp::TokenList::TokenList(std::vector<std::string> &filenames) : frontToken(nullptr), backToken(nullptr), files(filenames) {}
 
-simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
+simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename, const DUI &dui, OutputList *outputList)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
     StdIStream stream(istr);
-    readfile(stream,filename,outputList);
+    readfile(stream,filename,dui,outputList);
 }
 
-simplecpp::TokenList::TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
+simplecpp::TokenList::TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, const DUI &dui, OutputList *outputList, int /*unused*/)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
     StdCharBufStream stream(data, size);
-    readfile(stream,filename,outputList);
-}
-
-simplecpp::TokenList::TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
-    : frontToken(nullptr), backToken(nullptr), files(filenames)
-{
-    StdCharBufStream stream(reinterpret_cast<const unsigned char*>(data), size);
-    readfile(stream,filename,outputList);
+    readfile(stream,filename,dui,outputList);
 }
 
-simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList)
+simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
     try {
         FileStream stream(filename, filenames);
-        readfile(stream,filename,outputList);
-    } catch (const simplecpp::Output & e) { // TODO handle extra type of errors
-        outputList->push_back(e);
+        readfile(stream,filename,dui,outputList);
+    } catch (const simplecpp::Output & e) {
+        outputList->emplace_back(e);
     }
 }
 
@@ -519,12 +507,10 @@ simplecpp::TokenList::TokenList(const TokenList &other) : frontToken(nullptr), b
     *this = other;
 }
 
-#if __cplusplus >= 201103L
 simplecpp::TokenList::TokenList(TokenList &&other) : frontToken(nullptr), backToken(nullptr), files(other.files)
 {
     *this = std::move(other);
 }
-#endif
 
 simplecpp::TokenList::~TokenList()
 {
@@ -543,7 +529,6 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(const TokenList &other)
     return *this;
 }
 
-#if __cplusplus >= 201103L
 simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
 {
     if (this != &other) {
@@ -557,7 +542,6 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
     }
     return *this;
 }
-#endif
 
 void simplecpp::TokenList::clear()
 {
@@ -580,24 +564,34 @@ void simplecpp::TokenList::push_back(Token *tok)
     backToken = tok;
 }
 
-void simplecpp::TokenList::dump() const
+void simplecpp::TokenList::dump(bool linenrs) const
 {
-    std::cout << stringify() << std::endl;
+    std::cout << stringify(linenrs) << std::endl;
 }
 
-std::string simplecpp::TokenList::stringify() const
+std::string simplecpp::TokenList::stringify(bool linenrs) const
 {
     std::ostringstream ret;
-    Location loc(files);
+    Location loc;
+    loc.line = 1;
+    bool filechg = true;
     for (const Token *tok = cfront(); tok; tok = tok->next) {
         if (tok->location.line < loc.line || tok->location.fileIndex != loc.fileIndex) {
-            ret << "\n#line " << tok->location.line << " \"" << tok->location.file() << "\"\n";
+            ret << "\n#line " << tok->location.line << " \"" << file(tok->location) << "\"\n";
             loc = tok->location;
+            filechg = true;
+        }
+
+        if (linenrs && filechg) {
+            ret << loc.line << ": ";
+            filechg = false;
         }
 
         while (tok->location.line > loc.line) {
             ret << '\n';
             loc.line++;
+            if (linenrs)
+                ret << loc.line << ": ";
         }
 
         if (sameline(tok->previous, tok))
@@ -611,7 +605,7 @@ std::string simplecpp::TokenList::stringify() const
     return ret.str();
 }
 
-static bool isNameChar(unsigned char ch)
+static bool isNameChar(int ch)
 {
     return std::isalnum(ch) || ch == '_' || ch == '$';
 }
@@ -630,15 +624,16 @@ static std::string escapeString(const std::string &str)
     return ostr.str();
 }
 
-static void portabilityBackslash(simplecpp::OutputList *outputList, const std::vector<std::string> &files, const simplecpp::Location &location)
+static void portabilityBackslash(simplecpp::OutputList *outputList, const simplecpp::Location &location)
 {
     if (!outputList)
         return;
-    simplecpp::Output err(files);
-    err.type = simplecpp::Output::PORTABILITY_BACKSLASH;
-    err.location = location;
-    err.msg = "Combination 'backslash space newline' is not portable.";
-    outputList->push_back(err);
+    simplecpp::Output err{
+        simplecpp::Output::PORTABILITY_BACKSLASH,
+        location,
+        "Combination 'backslash space newline' is not portable."
+    };
+    outputList->emplace_back(std::move(err));
 }
 
 static bool isStringLiteralPrefix(const std::string &str)
@@ -647,16 +642,16 @@ static bool isStringLiteralPrefix(const std::string &str)
            str == "R" || str == "uR" || str == "UR" || str == "LR" || str == "u8R";
 }
 
-void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int line, Location *location)
+void simplecpp::TokenList::lineDirective(unsigned int fileIndex_, unsigned int line, Location &location)
 {
-    if (fileIndex != location->fileIndex || line >= location->line) {
-        location->fileIndex = fileIndex;
-        location->line = line;
+    if (fileIndex_ != location.fileIndex || line >= location.line) {
+        location.fileIndex = fileIndex_;
+        location.line = line;
         return;
     }
 
-    if (line + 2 >= location->line) {
-        location->line = line;
+    if (line + 2 >= location.line) {
+        location.line = line;
         while (cback()->op != '#')
             deleteToken(back());
         deleteToken(back());
@@ -666,32 +661,32 @@ void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int li
 
 static const std::string COMMENT_END("*/");
 
-void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename, OutputList *outputList)
+void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename, const DUI &dui, OutputList *outputList)
 {
-    std::stack<simplecpp::Location> loc;
-
     unsigned int multiline = 0U;
+    bool trailing_nl = true;
 
     const Token *oldLastToken = nullptr;
 
-    Location location(files);
-    location.fileIndex = fileIndex(filename);
-    location.line = 1U;
-    location.col  = 1U;
+    const cstd_t cstd = getCStd(dui.std);
+    const cppstd_t cppstd = getCppStd(dui.std);
+
+    Location location(fileIndex(filename), 1, 1);
     while (stream.good()) {
         unsigned char ch = stream.readChar();
         if (!stream.good())
             break;
 
+        trailing_nl = false;
+
         if (ch >= 0x80) {
             if (outputList) {
-                simplecpp::Output err(files);
-                err.type = simplecpp::Output::UNHANDLED_CHAR_ERROR;
-                err.location = location;
-                std::ostringstream s;
-                s << static_cast<int>(ch);
-                err.msg = "The code contains unhandled character(s) (character code=" + s.str() + "). Neither unicode nor extended ascii is supported.";
-                outputList->push_back(err);
+                simplecpp::Output err{
+                    simplecpp::Output::UNHANDLED_CHAR_ERROR,
+                    location,
+                    "The code contains unhandled character(s) (character code=" + std::to_string(static_cast<int>(ch)) + "). Neither unicode nor extended ascii is supported."
+                };
+                outputList->emplace_back(std::move(err));
             }
             clear();
             return;
@@ -700,48 +695,111 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
         if (ch == '\n') {
             if (cback() && cback()->op == '\\') {
                 if (location.col > cback()->location.col + 1U)
-                    portabilityBackslash(outputList, files, cback()->location);
+                    portabilityBackslash(outputList, cback()->location);
                 ++multiline;
                 deleteToken(back());
             } else {
                 location.line += multiline + 1;
                 multiline = 0U;
+                trailing_nl = true;
             }
             if (!multiline)
                 location.col = 1;
 
             if (oldLastToken != cback()) {
                 oldLastToken = cback();
-                if (!isLastLinePreprocessor())
+
+                // #line 3
+                // #line 3 "file.c"
+                // #3
+                // #3 "file.c"
+                const Token * ppTok = isLastLinePreprocessor();
+                if (!ppTok)
                     continue;
-                const std::string lastline(lastLine());
-                if (lastline == "# file %str%") {
-                    const Token *strtok = cback();
-                    while (strtok->comment)
-                        strtok = strtok->previous;
-                    loc.push(location);
-                    location.fileIndex = fileIndex(strtok->str().substr(1U, strtok->str().size() - 2U));
-                    location.line = 1U;
-                } else if (lastline == "# line %num%") {
-                    const Token *numtok = cback();
-                    while (numtok->comment)
-                        numtok = numtok->previous;
-                    lineDirective(location.fileIndex, std::atol(numtok->str().c_str()), &location);
-                } else if (lastline == "# %num% %str%" || lastline == "# line %num% %str%") {
-                    const Token *strtok = cback();
-                    while (strtok->comment)
-                        strtok = strtok->previous;
-                    const Token *numtok = strtok->previous;
-                    while (numtok->comment)
-                        numtok = numtok->previous;
-                    lineDirective(fileIndex(replaceAll(strtok->str().substr(1U, strtok->str().size() - 2U),"\\\\","\\")),
-                                  std::atol(numtok->str().c_str()), &location);
-                }
-                // #endfile
-                else if (lastline == "# endfile" && !loc.empty()) {
-                    location = loc.top();
-                    loc.pop();
+
+                const auto advanceAndSkipComments = [](const Token* tok) {
+                    do {
+                        tok = tok->next;
+                    } while (tok && tok->comment);
+                    return tok;
+                };
+
+                // skip #
+                ppTok = advanceAndSkipComments(ppTok);
+                if (!ppTok)
+                    continue;
+
+                if (ppTok->str() == "line")
+                    ppTok = advanceAndSkipComments(ppTok);
+
+                if (ppTok && (ppTok->str()[0] == '-' || ppTok->str()[0] == '+')) {
+                    if (outputList) {
+                        simplecpp::Output err{
+                            simplecpp::Output::SYNTAX_ERROR,
+                            location,
+                            "Invalid character in line directive: '" + ppTok->str() + "'."
+                        };
+                        outputList->emplace_back(std::move(err));
+                    }
+                    clear();
+                    return;
+                }
+
+                if (!ppTok || !ppTok->number)
+                    continue;
+
+                constexpr unsigned long line_limit = std::numeric_limits<decltype(Location::line)>::max();
+                unsigned long line;
+                try {
+                    line = std::min(line_limit, std::stoul(ppTok->str()));
+                } catch (...) {
+                    line = line_limit;
                 }
+
+                unsigned long maxline;
+                if ((cstd != CUnknown && cstd < C99) || (cppstd != CPPUnknown && cppstd < CPP11))
+                    maxline = 32767;
+                else
+                    maxline = 2147483647;
+
+                if (line == 0 || line > maxline) {
+                    if (outputList) {
+                        const bool unknown_std = cstd == CUnknown && cppstd == CPPUnknown;
+                        std::string msg = "Line number out of range: " + ppTok->str() + ". ";
+                        if (line == 0) {
+                            msg += "Line number zero is undefined behavior.";
+                        } else {
+                            msg += "Line numbers above " + std::to_string(maxline) + " are ";
+                            if (unknown_std)
+                                msg += "undefined behavior or conditionally supported";
+                            else if (cppstd >= CPP26)
+                                msg += "conditionally supported";
+                            else
+                                msg += "undefined behavior";
+                            if (cstd != CUnknown)
+                                msg += std::string(" in ") + getCStdName(cstd);
+                            else if (cppstd != CPPUnknown)
+                                msg += std::string(" in ") + getCppStdName(cppstd);
+                            msg += ".";
+                        }
+                        simplecpp::Output err{
+                            simplecpp::Output::PORTABILITY_LINE_DIRECTIVE,
+                            location, msg
+                        };
+                        outputList->emplace_back(std::move(err));
+                    }
+                }
+
+                ppTok = advanceAndSkipComments(ppTok);
+
+                unsigned int fileindex;
+
+                if (ppTok && ppTok->str()[0] == '\"')
+                    fileindex = fileIndex(replaceAll(ppTok->str().substr(1U, ppTok->str().size() - 2U),"\\\\","\\"));
+                else
+                    fileindex = location.fileIndex;
+
+                lineDirective(fileindex, line, location);
             }
 
             continue;
@@ -755,8 +813,8 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
         TokenString currentToken;
 
         if (cback() && cback()->location.line == location.line && cback()->previous && cback()->previous->op == '#') {
-            const Token* const llTok = lastLineTok();
-            if (llTok && llTok->op == '#' && llTok->next && (llTok->next->str() == "error" || llTok->next->str() == "warning")) {
+            const Token* const ppTok = cback()->previous;
+            if (ppTok->next && (ppTok->next->str() == "error" || ppTok->next->str() == "warning")) {
                 char prev = ' ';
                 while (stream.good() && (prev == '\\' || (ch != '\r' && ch != '\n'))) {
                     currentToken += ch;
@@ -764,15 +822,28 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                     ch = stream.readChar();
                 }
                 stream.ungetChar();
-                push_back(new Token(currentToken, location));
-                location.adjust(currentToken);
+                std::string::size_type pos = 0;
+                unsigned int spliced = 0;
+                while ((pos = currentToken.find('\\', pos)) != std::string::npos) {
+                    if (pos + 1 < currentToken.size() && currentToken[pos + 1] == '\n') {
+                        currentToken.erase(pos, 2);
+                        ++spliced;
+                    } else {
+                        ++pos;
+                    }
+                }
+                if (!currentToken.empty()) {
+                    push_back(new Token(currentToken, location));
+                    location.adjust(currentToken);
+                }
+                location.line += spliced;
                 continue;
             }
         }
 
         // number or name
         if (isNameChar(ch)) {
-            const bool num = std::isdigit(ch);
+            const bool num = !!std::isdigit(ch);
             while (stream.good() && isNameChar(ch)) {
                 currentToken += ch;
                 ch = stream.readChar();
@@ -785,17 +856,35 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
 
         // comment
         else if (ch == '/' && stream.peekChar() == '/') {
-            while (stream.good() && ch != '\r' && ch != '\n') {
+            while (stream.good() && ch != '\n') {
                 currentToken += ch;
                 ch = stream.readChar();
+                if (ch == '\\') {
+                    TokenString tmp;
+                    char tmp_ch = ch;
+                    while ((stream.good()) && (tmp_ch == '\\' || tmp_ch == ' ' || tmp_ch == '\t')) {
+                        tmp += tmp_ch;
+                        tmp_ch = stream.readChar();
+                    }
+                    if (!stream.good()) {
+                        break;
+                    }
+
+                    if (tmp_ch != '\n') {
+                        currentToken += tmp;
+                    } else {
+                        const TokenString check_portability = currentToken + tmp;
+                        const std::string::size_type pos = check_portability.find_last_not_of(" \t");
+                        if (pos < check_portability.size() - 1U && check_portability[pos] == '\\')
+                            portabilityBackslash(outputList, location);
+                        ++multiline;
+                        tmp_ch = stream.readChar();
+                        currentToken += '\n';
+                    }
+                    ch = tmp_ch;
+                }
             }
-            const std::string::size_type pos = currentToken.find_last_not_of(" \t");
-            if (pos < currentToken.size() - 1U && currentToken[pos] == '\\')
-                portabilityBackslash(outputList, files, location);
-            if (currentToken[currentToken.size() - 1U] == '\\') {
-                ++multiline;
-                currentToken.erase(currentToken.size() - 1U);
-            } else {
+            if (ch == '\n') {
                 stream.ungetChar();
             }
         }
@@ -847,24 +936,26 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                 }
                 if (!stream.good() || ch == '\n') {
                     if (outputList) {
-                        Output err(files);
-                        err.type = Output::SYNTAX_ERROR;
-                        err.location = location;
-                        err.msg = "Invalid newline in raw string delimiter.";
-                        outputList->push_back(err);
+                        Output err{
+                            Output::SYNTAX_ERROR,
+                            location,
+                            "Invalid newline in raw string delimiter."
+                        };
+                        outputList->emplace_back(std::move(err));
                     }
                     return;
                 }
                 const std::string endOfRawString(')' + delim + currentToken);
-                while (stream.good() && !(endsWith(currentToken, endOfRawString) && currentToken.size() > 1))
+                while (stream.good() && (!endsWith(currentToken, endOfRawString) || currentToken.size() <= 1))
                     currentToken += stream.readChar();
                 if (!endsWith(currentToken, endOfRawString)) {
                     if (outputList) {
-                        Output err(files);
-                        err.type = Output::SYNTAX_ERROR;
-                        err.location = location;
-                        err.msg = "Raw string missing terminating delimiter.";
-                        outputList->push_back(err);
+                        Output err{
+                            Output::SYNTAX_ERROR,
+                            location,
+                            "Raw string missing terminating delimiter."
+                        };
+                        outputList->emplace_back(std::move(err));
                     }
                     return;
                 }
@@ -874,7 +965,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                 back()->setstr(currentToken);
                 location.adjust(currentToken);
                 if (currentToken.find_first_of("\r\n") == std::string::npos)
-                    location.col += 2 + 2 * delim.size();
+                    location.col += 2 + (2 * delim.size());
                 else
                     location.col += 1 + delim.size();
 
@@ -895,7 +986,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             }
 
             if (prefix.empty())
-                push_back(new Token(s, location, std::isspace(stream.peekChar()))); // push string without newlines
+                push_back(new Token(s, location, !!std::isspace(stream.peekChar()))); // push string without newlines
             else
                 back()->setstr(prefix + s);
 
@@ -925,7 +1016,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             }
         }
 
-        push_back(new Token(currentToken, location, std::isspace(stream.peekChar())));
+        push_back(new Token(currentToken, location, !!std::isspace(stream.peekChar())));
 
         if (multiline)
             location.col += currentToken.size();
@@ -933,6 +1024,15 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             location.adjust(currentToken);
     }
 
+    if ((cstd != CUnknown || cppstd == CPPUnknown) && !trailing_nl && outputList) {
+        Output err{
+            Output::PORTABILITY_NO_EOF_NEWLINE,
+            location,
+            "No newline at end of file is undefined behavior in C."
+        };
+        outputList->emplace_back(std::move(err));
+    }
+
     combineOperators();
 }
 
@@ -956,7 +1056,7 @@ void simplecpp::TokenList::constFold()
         constFoldComparison(tok);
         constFoldBitwise(tok);
         constFoldLogicalOp(tok);
-        constFoldQuestionOp(&tok);
+        constFoldQuestionOp(tok);
 
         // If there is no '(' we are done with the constant folding
         if (tok->op != '(')
@@ -979,10 +1079,17 @@ static bool isFloatSuffix(const simplecpp::Token *tok)
     return c == 'f' || c == 'l';
 }
 
+static const std::string AND("and");
+static const std::string BITAND("bitand");
+static const std::string BITOR("bitor");
+static bool isAlternativeAndBitandBitor(const simplecpp::Token* tok)
+{
+    return isAlternativeBinaryOp(tok, AND) || isAlternativeBinaryOp(tok, BITAND) || isAlternativeBinaryOp(tok, BITOR);
+}
+
 void simplecpp::TokenList::combineOperators()
 {
-    std::stack<bool> executableScope;
-    executableScope.push(false);
+    std::stack<bool, std::vector<bool>> executableScope{{false}};
     for (Token *tok = front(); tok; tok = tok->next) {
         if (tok->op == '{') {
             if (executableScope.top()) {
@@ -990,7 +1097,7 @@ void simplecpp::TokenList::combineOperators()
                 continue;
             }
             const Token *prev = tok->previous;
-            while (prev && prev->isOneOf(";{}()"))
+            while (prev && prev->isOneOf(";{}("))
                 prev = prev->previous;
             executableScope.push(prev && prev->op == ')');
             continue;
@@ -1014,7 +1121,7 @@ void simplecpp::TokenList::combineOperators()
             if (tok->previous && tok->previous->number && sameline(tok->previous, tok) && tok->previous->str().find_first_of("._") == std::string::npos) {
                 tok->setstr(tok->previous->str() + '.');
                 deleteToken(tok->previous);
-                if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp")))) {
+                if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp") && !isAlternativeAndBitandBitor(tok->next)))) {
                     tok->setstr(tok->str() + tok->next->str());
                     deleteToken(tok->next);
                 }
@@ -1153,8 +1260,9 @@ void simplecpp::TokenList::constFoldMulDivRem(Token *tok)
             continue;
 
         long long result;
-        if (tok->op == '*')
+        if (tok->op == '*') {
             result = (stringToLL(tok->previous->str()) * stringToLL(tok->next->str()));
+        }
         else if (tok->op == '/' || tok->op == '%') {
             const long long rhs = stringToLL(tok->next->str());
             if (rhs == 0)
@@ -1166,8 +1274,9 @@ void simplecpp::TokenList::constFoldMulDivRem(Token *tok)
                 result = (lhs / rhs);
             else
                 result = (lhs % rhs);
-        } else
+        } else {
             continue;
+        }
 
         tok = tok->previous;
         tok->setstr(toString(result));
@@ -1259,8 +1368,6 @@ void simplecpp::TokenList::constFoldComparison(Token *tok)
     }
 }
 
-static const std::string BITAND("bitand");
-static const std::string BITOR("bitor");
 static const std::string XOR("xor");
 void simplecpp::TokenList::constFoldBitwise(Token *tok)
 {
@@ -1295,7 +1402,6 @@ void simplecpp::TokenList::constFoldBitwise(Token *tok)
     }
 }
 
-static const std::string AND("and");
 static const std::string OR("or");
 void simplecpp::TokenList::constFoldLogicalOp(Token *tok)
 {
@@ -1326,10 +1432,11 @@ void simplecpp::TokenList::constFoldLogicalOp(Token *tok)
     }
 }
 
-void simplecpp::TokenList::constFoldQuestionOp(Token **tok1)
+void simplecpp::TokenList::constFoldQuestionOp(Token *&tok1)
 {
     bool gotoTok1 = false;
-    for (Token *tok = *tok1; tok && tok->op != ')'; tok =  gotoTok1 ? *tok1 : tok->next) {
+    // NOLINTNEXTLINE(misc-const-correctness) - technically correct but used to access non-const data
+    for (Token *tok = tok1; tok && tok->op != ')'; tok =  gotoTok1 ? tok1 : tok->next) {
         gotoTok1 = false;
         if (tok->str() != "?")
             continue;
@@ -1344,8 +1451,8 @@ void simplecpp::TokenList::constFoldQuestionOp(Token **tok1)
         Token * const falseTok = trueTok->next->next;
         if (!falseTok)
             throw std::runtime_error("invalid expression");
-        if (condTok == *tok1)
-            *tok1 = (condTok->str() != "0" ? trueTok : falseTok);
+        if (condTok == tok1)
+            tok1 = (condTok->str() != "0" ? trueTok : falseTok);
         deleteToken(condTok->next); // ?
         deleteToken(trueTok->next); // :
         deleteToken(condTok->str() == "0" ? trueTok : falseTok);
@@ -1390,8 +1497,9 @@ std::string simplecpp::TokenList::readUntil(Stream &stream, const Location &loca
                     ret.erase(ret.size()-1U);
                     backslash = (next == '\r');
                     update_ch = false;
-                } else if (next == '\\')
+                } else if (next == '\\') {
                     update_ch = !update_ch;
+                }
                 ret += next;
             } while (next == '\\');
             if (update_ch)
@@ -1402,11 +1510,12 @@ std::string simplecpp::TokenList::readUntil(Stream &stream, const Location &loca
     if (!stream.good() || ch != end) {
         clear();
         if (outputList) {
-            Output err(files);
-            err.type = Output::SYNTAX_ERROR;
-            err.location = location;
-            err.msg = std::string("No pair for character (") + start + "). Can't process file. File is either invalid or unicode, which is currently not supported.";
-            outputList->push_back(err);
+            Output err{
+                Output::SYNTAX_ERROR,
+                location,
+                std::string("No pair for character (") + start + "). Can't process file. File is either invalid or unicode, which is currently not supported."
+            };
+            outputList->emplace_back(std::move(err));
         }
         return "";
     }
@@ -1414,34 +1523,6 @@ std::string simplecpp::TokenList::readUntil(Stream &stream, const Location &loca
     return ret;
 }
 
-std::string simplecpp::TokenList::lastLine(int maxsize) const
-{
-    std::string ret;
-    int count = 0;
-    for (const Token *tok = cback(); ; tok = tok->previous) {
-        if (!sameline(tok, cback())) {
-            break;
-        }
-        if (tok->comment)
-            continue;
-        if (++count > maxsize)
-            return "";
-        if (!ret.empty())
-            ret += ' ';
-        // add tokens in reverse for performance reasons
-        if (tok->str()[0] == '\"')
-            ret += "%rts%"; // %str%
-        else if (tok->number)
-            ret += "%mun%"; // %num%
-        else {
-            ret += tok->str();
-            std::reverse(ret.end() - tok->str().length(), ret.end());
-        }
-    }
-    std::reverse(ret.begin(), ret.end());
-    return ret;
-}
-
 const simplecpp::Token* simplecpp::TokenList::lastLineTok(int maxsize) const
 {
     const Token* prevTok = nullptr;
@@ -1458,10 +1539,12 @@ const simplecpp::Token* simplecpp::TokenList::lastLineTok(int maxsize) const
     return prevTok;
 }
 
-bool simplecpp::TokenList::isLastLinePreprocessor(int maxsize) const
+const simplecpp::Token* simplecpp::TokenList::isLastLinePreprocessor(int maxsize) const
 {
     const Token * const prevTok = lastLineTok(maxsize);
-    return prevTok && prevTok->op == '#';
+    if (prevTok && prevTok->op == '#')
+        return prevTok;
+    return nullptr;
 }
 
 unsigned int simplecpp::TokenList::fileIndex(const std::string &filename)
@@ -1470,23 +1553,28 @@ unsigned int simplecpp::TokenList::fileIndex(const std::string &filename)
         if (files[i] == filename)
             return i;
     }
-    files.push_back(filename);
+    files.emplace_back(filename);
     return files.size() - 1U;
 }
 
+const std::string& simplecpp::TokenList::file(const Location& loc) const
+{
+    static const std::string s_emptyFileName;
+    return loc.fileIndex < files.size() ? files[loc.fileIndex] : s_emptyFileName;
+}
+
 
 namespace simplecpp {
     class Macro;
-#if __cplusplus >= 201103L
     using MacroMap = std::unordered_map<TokenString,Macro>;
-#else
-    typedef std::map<TokenString,Macro> MacroMap;
-#endif
 
     class Macro {
     public:
-        explicit Macro(std::vector<std::string> &f) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), valueDefinedInCode_(false) {}
+        explicit Macro(std::vector<std::string> &f) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), variadicOpt(false), valueDefinedInCode_(false) {}
 
+        /**
+         * @throws std::runtime_error thrown on bad macro syntax
+         */
         Macro(const Token *tok, std::vector<std::string> &f) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(true) {
             if (sameline(tok->previousSkipComments(), tok))
                 throw std::runtime_error("bad macro syntax");
@@ -1503,8 +1591,11 @@ namespace simplecpp {
                 throw std::runtime_error("bad macro syntax");
         }
 
+        /**
+         * @throws std::runtime_error thrown on bad macro syntax
+         */
         Macro(const std::string &name, const std::string &value, std::vector<std::string> &f) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(false) {
-            const std::string def(name + ' ' + value);
+            const std::string def(name + ' ' + value + '\n');
             StdCharBufStream stream(reinterpret_cast<const unsigned char*>(def.data()), def.size());
             tokenListDefine.readfile(stream);
             if (!parseDefine(tokenListDefine.cfront()))
@@ -1512,15 +1603,26 @@ namespace simplecpp {
         }
 
         Macro(const Macro &other) : nameTokDef(nullptr), files(other.files), tokenListDefine(other.files), valueDefinedInCode_(other.valueDefinedInCode_) {
-            *this = other;
+            // TODO: remove the try-catch - see #537
+            // avoid bugprone-exception-escape clang-tidy warning
+            try {
+                *this = other;
+            }
+            catch (const Error&) {} // NOLINT(bugprone-empty-catch)
+        }
+
+        ~Macro() {
+            delete optExpandValue;
+            delete optNoExpandValue;
         }
 
         Macro &operator=(const Macro &other) {
             if (this != &other) {
                 files = other.files;
                 valueDefinedInCode_ = other.valueDefinedInCode_;
-                if (other.tokenListDefine.empty())
+                if (other.tokenListDefine.empty()) {
                     parseDefine(other.nameTokDef);
+                }
                 else {
                     tokenListDefine = other.tokenListDefine;
                     parseDefine(tokenListDefine.cfront());
@@ -1541,9 +1643,11 @@ namespace simplecpp {
          * @param macros     list of macros
          * @param inputFiles the input files
          * @return token after macro
-         * @throw Can throw wrongNumberOfParameters or invalidHashHash
+         * @throws Error thrown on missing or invalid preprocessor directives
+         * @throws wrongNumberOfParameters thrown on invalid number of parameters
+         * @throws invalidHashHash thrown on invalid ## usage
          */
-        const Token * expand(TokenList * const output,
+        const Token * expand(TokenList & output,
                              const Token * rawtok,
                              const MacroMap &macros,
                              std::vector<std::string> &inputFiles) const {
@@ -1570,14 +1674,14 @@ namespace simplecpp {
                     else if (rawtok->op == ')')
                         --par;
                     else if (rawtok->op == '#' && !sameline(rawtok->previous, rawtok))
-                        throw Error(rawtok->location, "it is invalid to use a preprocessor directive as macro parameter");
+                        throw invalidDirectiveAsMacroParameter(rawtok->location);
                     rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
                     rawtok = rawtok->next;
                 }
-                if (expand(&output2, rawtok1->location, rawtokens2.cfront(), macros, expandedmacros))
+                if (expand(output2, rawtok1->location, rawtokens2.cfront(), macros, expandedmacros))
                     rawtok = rawtok1->next;
             } else {
-                rawtok = expand(&output2, rawtok->location, rawtok, macros, expandedmacros);
+                rawtok = expand(output2, rawtok->location, rawtok, macros, expandedmacros);
             }
             while (output2.cback() && rawtok) {
                 unsigned int par = 0;
@@ -1587,21 +1691,23 @@ namespace simplecpp {
                         if (par==0)
                             break;
                         --par;
-                    } else if (macro2tok->op == ')')
+                    } else if (macro2tok->op == ')') {
                         ++par;
+                    }
                     macro2tok = macro2tok->previous;
                 }
                 if (macro2tok) { // macro2tok->op == '('
                     macro2tok = macro2tok->previous;
                     expandedmacros.insert(name());
-                } else if (rawtok->op == '(')
+                } else if (rawtok->op == '(') {
                     macro2tok = output2.back();
+                }
                 if (!macro2tok || !macro2tok->name)
                     break;
                 if (output2.cfront() != output2.cback() && macro2tok->str() == this->name())
                     break;
                 const MacroMap::const_iterator macro = macros.find(macro2tok->str());
-                if (macro == macros.end() || !macro->second.functionLike())
+                if (macro == macros.end() || !macro->second.functionLike() || macro2tok->isExpandedFrom(&macro->second))
                     break;
                 TokenList rawtokens2(inputFiles);
                 const Location loc(macro2tok->location);
@@ -1615,8 +1721,9 @@ namespace simplecpp {
                 const Token *rawtok2 = rawtok;
                 for (; rawtok2; rawtok2 = rawtok2->next) {
                     rawtokens2.push_back(new Token(rawtok2->str(), loc));
-                    if (rawtok2->op == '(')
+                    if (rawtok2->op == '(') {
                         ++par;
+                    }
                     else if (rawtok2->op == ')') {
                         if (par <= 1U)
                             break;
@@ -1625,11 +1732,11 @@ namespace simplecpp {
                 }
                 if (!rawtok2 || par != 1U)
                     break;
-                if (macro->second.expand(&output2, rawtok->location, rawtokens2.cfront(), macros, expandedmacros) != nullptr)
+                if (macro->second.expand(output2, rawtok->location, rawtokens2.cfront(), macros, expandedmacros) != nullptr)
                     break;
                 rawtok = rawtok2->next;
             }
-            output->takeTokens(output2);
+            output.takeTokens(output2);
             return rawtok;
         }
 
@@ -1663,6 +1770,11 @@ namespace simplecpp {
             const std::string what;
         };
 
+        struct invalidDirectiveAsMacroParameter : public Error {
+            explicit invalidDirectiveAsMacroParameter(const Location &loc)
+                : Error(loc, "it is invalid to use a preprocessor directive as macro parameter") {}
+        };
+
         /** Struct that is thrown when macro is expanded with wrong number of parameters */
         struct wrongNumberOfParameters : public Error {
             wrongNumberOfParameters(const Location &loc, const std::string &macroName) : Error(loc, "Wrong number of parameters for macro \'" + macroName + "\'.") {}
@@ -1675,28 +1787,28 @@ namespace simplecpp {
             }
 
             invalidHashHash(const Location &loc, const std::string &macroName, const std::string &message)
-                : Error(loc, format(macroName, message)) { }
+                : Error(loc, format(macroName, message)) {}
 
             static inline invalidHashHash unexpectedToken(const Location &loc, const std::string &macroName, const Token *tokenA) {
-                return invalidHashHash(loc, macroName, "Unexpected token '"+ tokenA->str()+"'");
+                return {loc, macroName, "Unexpected token '"+ tokenA->str()+"'"};
             }
 
             static inline invalidHashHash cannotCombine(const Location &loc, const std::string &macroName, const Token *tokenA, const Token *tokenB) {
-                return invalidHashHash(loc, macroName, "Combining '"+ tokenA->str()+ "' and '"+ tokenB->str() + "' yields an invalid token.");
+                return {loc, macroName, "Combining '"+ tokenA->str()+ "' and '"+ tokenB->str() + "' yields an invalid token."};
             }
 
             static inline invalidHashHash unexpectedNewline(const Location &loc, const std::string &macroName) {
-                return invalidHashHash(loc, macroName, "Unexpected newline");
+                return {loc, macroName, "Unexpected newline"};
             }
 
             static inline invalidHashHash universalCharacterUB(const Location &loc, const std::string &macroName, const Token* tokenA, const std::string& strAB) {
-                return invalidHashHash(loc, macroName, "Combining '\\"+ tokenA->str()+ "' and '"+ strAB.substr(tokenA->str().size()) + "' yields universal character '\\" + strAB + "'. This is undefined behavior according to C standard chapter 5.1.1.2, paragraph 4.");
+                return {loc, macroName, "Combining '\\"+ tokenA->str()+ "' and '"+ strAB.substr(tokenA->str().size()) + "' yields universal character '\\" + strAB + "'. This is undefined behavior according to C standard chapter 5.1.1.2, paragraph 4."};
             }
         };
     private:
         /** Create new token where Token::macro is set for replaced tokens */
         Token *newMacroToken(const TokenString &str, const Location &loc, bool replaced, const Token *expandedFromToken=nullptr) const {
-            Token *tok = new Token(str,loc);
+            auto *tok = new Token(str,loc);
             if (replaced)
                 tok->macro = nameTokDef->str();
             if (expandedFromToken)
@@ -1704,9 +1816,17 @@ namespace simplecpp {
             return tok;
         }
 
+        /**
+         * @throws Error thrown in case of __VA_OPT__ issues
+         */
         bool parseDefine(const Token *nametoken) {
             nameTokDef = nametoken;
             variadic = false;
+            variadicOpt = false;
+            delete optExpandValue;
+            optExpandValue = nullptr;
+            delete optNoExpandValue;
+            optNoExpandValue = nullptr;
             if (!nameTokDef) {
                 valueToken = endToken = nullptr;
                 args.clear();
@@ -1722,12 +1842,12 @@ namespace simplecpp {
                         argtok->next && argtok->next->op == ')') {
                         variadic = true;
                         if (!argtok->previous->name)
-                            args.push_back("__VA_ARGS__");
+                            args.emplace_back("__VA_ARGS__");
                         argtok = argtok->next; // goto ')'
                         break;
                     }
                     if (argtok->op != ',')
-                        args.push_back(argtok->str());
+                        args.emplace_back(argtok->str());
                     argtok = argtok->next;
                 }
                 if (!sameline(nametoken, argtok)) {
@@ -1744,8 +1864,49 @@ namespace simplecpp {
             if (!sameline(valueToken, nameTokDef))
                 valueToken = nullptr;
             endToken = valueToken;
-            while (sameline(endToken, nameTokDef))
+            while (sameline(endToken, nameTokDef)) {
+                if (variadic && endToken->str() == "__VA_OPT__")
+                    variadicOpt = true;
                 endToken = endToken->next;
+            }
+
+            if (variadicOpt) {
+                TokenList expandValue(files);
+                TokenList noExpandValue(files);
+                for (const Token *tok = valueToken; tok && tok != endToken;) {
+                    if (tok->str() == "__VA_OPT__") {
+                        if (!sameline(tok, tok->next) || tok->next->op != '(')
+                            throw Error(tok->location, "In definition of '" + nameTokDef->str() + "': Missing opening parenthesis for __VA_OPT__");
+                        tok = tok->next->next;
+                        int par = 1;
+                        while (tok && tok != endToken) {
+                            if (tok->op == '(')
+                                par++;
+                            else if (tok->op == ')')
+                                par--;
+                            else if (tok->str() == "__VA_OPT__")
+                                throw Error(tok->location, "In definition of '" + nameTokDef->str() + "': __VA_OPT__ cannot be nested");
+                            if (par == 0) {
+                                tok = tok->next;
+                                break;
+                            }
+                            expandValue.push_back(new Token(*tok));
+                            tok = tok->next;
+                        }
+                        if (par != 0) {
+                            const Token *const lastTok = expandValue.back() ? expandValue.back() : valueToken->next;
+                            throw Error(lastTok->location, "In definition of '" + nameTokDef->str() + "': Missing closing parenthesis for __VA_OPT__");
+                        }
+                    } else {
+                        expandValue.push_back(new Token(*tok));
+                        noExpandValue.push_back(new Token(*tok));
+                        tok = tok->next;
+                    }
+                }
+                optExpandValue = new TokenList(std::move(expandValue));
+                optNoExpandValue = new TokenList(std::move(noExpandValue));
+            }
+
             return true;
         }
 
@@ -1761,27 +1922,29 @@ namespace simplecpp {
 
         std::vector<const Token *> getMacroParameters(const Token *nameTokInst, bool calledInDefine) const {
             if (!nameTokInst->next || nameTokInst->next->op != '(' || !functionLike())
-                return std::vector<const Token *>();
+                return {};
 
             std::vector<const Token *> parametertokens;
-            parametertokens.push_back(nameTokInst->next);
+            parametertokens.emplace_back(nameTokInst->next);
             unsigned int par = 0U;
             for (const Token *tok = nameTokInst->next->next; calledInDefine ? sameline(tok, nameTokInst) : (tok != nullptr); tok = tok->next) {
-                if (tok->op == '(')
+                if (tok->op == '(') {
                     ++par;
+                }
                 else if (tok->op == ')') {
                     if (par == 0U) {
-                        parametertokens.push_back(tok);
+                        parametertokens.emplace_back(tok);
                         break;
                     }
                     --par;
-                } else if (par == 0U && tok->op == ',' && (!variadic || parametertokens.size() < args.size()))
-                    parametertokens.push_back(tok);
+                } else if (par == 0U && tok->op == ',' && (!variadic || parametertokens.size() < args.size())) {
+                    parametertokens.emplace_back(tok);
+                }
             }
             return parametertokens;
         }
 
-        const Token *appendTokens(TokenList *tokens,
+        const Token *appendTokens(TokenList &tokens,
                                   const Location &rawloc,
                                   const Token * const lpar,
                                   const MacroMap &macros,
@@ -1799,13 +1962,14 @@ namespace simplecpp {
                     tok = expandHash(tokens, rawloc, tok, expandedmacros, parametertokens);
                 } else {
                     if (!expandArg(tokens, tok, rawloc, macros, expandedmacros, parametertokens)) {
-                        tokens->push_back(new Token(*tok));
+                        tokens.push_back(new Token(*tok));
                         if (tok->macro.empty() && (par > 0 || tok->str() != "("))
-                            tokens->back()->macro = name();
+                            tokens.back()->macro = name();
                     }
 
-                    if (tok->op == '(')
+                    if (tok->op == '(') {
                         ++par;
+                    }
                     else if (tok->op == ')') {
                         --par;
                         if (par == 0U)
@@ -1814,30 +1978,33 @@ namespace simplecpp {
                     tok = tok->next;
                 }
             }
-            for (Token *tok2 = tokens->front(); tok2; tok2 = tok2->next)
+            for (Token *tok2 = tokens.front(); tok2; tok2 = tok2->next)
                 tok2->location = lpar->location;
             return sameline(lpar,tok) ? tok : nullptr;
         }
 
-        const Token * expand(TokenList * const output, const Location &loc, const Token * const nameTokInst, const MacroMap &macros, std::set<TokenString> expandedmacros) const {
+        const Token * expand(TokenList & output, const Location &loc, const Token * const nameTokInst, const MacroMap &macros, std::set<TokenString> expandedmacros) const {
             expandedmacros.insert(nameTokInst->str());
 
 #ifdef SIMPLECPP_DEBUG_MACRO_EXPANSION
             std::cout << "  expand " << name() << " " << locstring(defineLocation()) << std::endl;
 #endif
 
-            usageList.push_back(loc);
+            usageList.emplace_back(loc);
 
             if (nameTokInst->str() == "__FILE__") {
-                output->push_back(new Token('\"'+loc.file()+'\"', loc));
+                output.push_back(new Token('\"'+output.file(loc)+'\"', loc));
+                output.back()->macro = "__FILE__";
                 return nameTokInst->next;
             }
             if (nameTokInst->str() == "__LINE__") {
-                output->push_back(new Token(toString(loc.line), loc));
+                output.push_back(new Token(toString(loc.line), loc));
+                output.back()->macro = "__LINE__";
                 return nameTokInst->next;
             }
             if (nameTokInst->str() == "__COUNTER__") {
-                output->push_back(new Token(toString(usageList.size()-1U), loc));
+                output.push_back(new Token(toString(usageList.size()-1U), loc));
+                output.back()->macro = "__COUNTER__";
                 return nameTokInst->next;
             }
 
@@ -1849,7 +2016,7 @@ namespace simplecpp {
             if (functionLike()) {
                 // No arguments => not macro expansion
                 if (nameTokInst->next && nameTokInst->next->op != '(') {
-                    output->push_back(new Token(nameTokInst->str(), loc));
+                    output.push_back(new Token(nameTokInst->str(), loc));
                     return nameTokInst->next;
                 }
 
@@ -1878,19 +2045,20 @@ namespace simplecpp {
 
                 const MacroMap::const_iterator m = macros.find("__COUNTER__");
 
-                if (!counter || m == macros.end())
+                if (!counter || m == macros.end()) {
                     parametertokens2.swap(parametertokens1);
+                }
                 else {
                     const Macro &counterMacro = m->second;
                     unsigned int par = 0;
                     for (const Token *tok = parametertokens1[0]; tok && par < parametertokens1.size(); tok = tok->next) {
                         if (tok->str() == "__COUNTER__") {
                             tokensparams.push_back(new Token(toString(counterMacro.usageList.size()), tok->location));
-                            counterMacro.usageList.push_back(tok->location);
+                            counterMacro.usageList.emplace_back(tok->location);
                         } else {
                             tokensparams.push_back(new Token(*tok));
                             if (tok == parametertokens1[par]) {
-                                parametertokens2.push_back(tokensparams.cback());
+                                parametertokens2.emplace_back(tokensparams.cback());
                                 par++;
                             }
                         }
@@ -1898,10 +2066,25 @@ namespace simplecpp {
                 }
             }
 
-            Token * const output_end_1 = output->back();
+            // NOLINTNEXTLINE(misc-const-correctness) - technically correct but used to access non-const data
+            Token * const output_end_1 = output.back();
+
+            const Token *valueToken2;
+            const Token *endToken2;
+
+            if (variadicOpt) {
+                if (parametertokens2.size() > args.size() && parametertokens2[args.size() - 1]->next->op != ')')
+                    valueToken2 = optExpandValue->cfront();
+                else
+                    valueToken2 = optNoExpandValue->cfront();
+                endToken2 = nullptr;
+            } else {
+                valueToken2 = valueToken;
+                endToken2 = endToken;
+            }
 
             // expand
-            for (const Token *tok = valueToken; tok != endToken;) {
+            for (const Token *tok = valueToken2; tok != endToken2;) {
                 if (tok->op != '#') {
                     // A##B => AB
                     if (sameline(tok, tok->next) && tok->next && tok->next->op == '#' && tok->next->next && tok->next->next->op == '#') {
@@ -1909,20 +2092,20 @@ namespace simplecpp {
                             throw invalidHashHash::unexpectedNewline(tok->location, name());
                         if (variadic && tok->op == ',' && tok->next->next->next->str() == args.back()) {
                             Token *const comma = newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok);
-                            output->push_back(comma);
+                            output.push_back(comma);
                             tok = expandToken(output, loc, tok->next->next->next, macros, expandedmacros, parametertokens2);
-                            if (output->back() == comma)
-                                output->deleteToken(comma);
+                            if (output.back() == comma)
+                                output.deleteToken(comma);
                             continue;
                         }
                         TokenList new_output(files);
-                        if (!expandArg(&new_output, tok, parametertokens2))
-                            output->push_back(newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok));
+                        if (!expandArg(new_output, tok, parametertokens2))
+                            output.push_back(newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok));
                         else if (new_output.empty()) // placemarker token
-                            output->push_back(newMacroToken("", loc, isReplaced(expandedmacros)));
+                            output.push_back(newMacroToken("", loc, isReplaced(expandedmacros)));
                         else
                             for (const Token *tok2 = new_output.cfront(); tok2; tok2 = tok2->next)
-                                output->push_back(newMacroToken(tok2->str(), loc, isReplaced(expandedmacros), tok2));
+                                output.push_back(newMacroToken(tok2->str(), loc, isReplaced(expandedmacros), tok2));
                         tok = tok->next;
                     } else {
                         tok = expandToken(output, loc, tok, macros, expandedmacros, parametertokens2);
@@ -1938,20 +2121,26 @@ namespace simplecpp {
                 }
                 if (numberOfHash == 4 && tok->next->location.col + 1 == tok->next->next->location.col) {
                     // # ## #  => ##
-                    output->push_back(newMacroToken("##", loc, isReplaced(expandedmacros)));
+                    output.push_back(newMacroToken("##", loc, isReplaced(expandedmacros)));
                     tok = hashToken;
                     continue;
                 }
 
                 if (numberOfHash >= 2 && tok->location.col + 1 < tok->next->location.col) {
-                    output->push_back(new Token(*tok));
+                    output.push_back(new Token(*tok));
                     tok = tok->next;
                     continue;
                 }
 
                 tok = tok->next;
-                if (tok == endToken) {
-                    output->push_back(new Token(*tok->previous));
+                if (tok == endToken2) {
+                    if (tok) {
+                        output.push_back(new Token(*tok->previous));
+                    }
+                    else {
+                        output.push_back(new Token(*nameTokInst));
+                        output.back()->setstr("\"\"");
+                    }
                     break;
                 }
                 if (tok->op == '#') {
@@ -1964,7 +2153,7 @@ namespace simplecpp {
             }
 
             if (!functionLike()) {
-                for (Token *tok = output_end_1 ? output_end_1->next : output->front(); tok; tok = tok->next) {
+                for (Token *tok = output_end_1 ? output_end_1->next : output.front(); tok; tok = tok->next) {
                     tok->macro = nameTokInst->str();
                 }
             }
@@ -1975,73 +2164,53 @@ namespace simplecpp {
             return functionLike() ? parametertokens2.back()->next : nameTokInst->next;
         }
 
-        const Token *recursiveExpandToken(TokenList *output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
-            if (!(temp.cback() && temp.cback()->name && tok->next && tok->next->op == '(')) {
-                output->takeTokens(temp);
-                return tok->next;
-            }
-
-            if (!sameline(tok, tok->next)) {
-                output->takeTokens(temp);
-                return tok->next;
-            }
-
+        /** Returns the macro to expand when the last token of @p temp is the name of a
+         *  function-like macro and the tokens after @p tok supply its arguments; nullptr otherwise */
+        static const Macro *rescanMacro(const TokenList &temp, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros) {
+            if (!temp.cback() || !temp.cback()->name || !sameline(tok, tok->next) || tok->next->op != '(')
+                return nullptr;
             const MacroMap::const_iterator it = macros.find(temp.cback()->str());
-            if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end()) {
-                output->takeTokens(temp);
-                return tok->next;
-            }
-
-            const Macro &calledMacro = it->second;
-            if (!calledMacro.functionLike()) {
-                output->takeTokens(temp);
-                return tok->next;
-            }
+            if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end())
+                return nullptr;
+            if (!it->second.functionLike() || temp.cback()->isExpandedFrom(&it->second))
+                return nullptr;
+            return &it->second;
+        }
 
-            TokenList temp2(files);
-            temp2.push_back(new Token(temp.cback()->str(), tok->location));
+        const Token *recursiveExpandToken(TokenList &output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+            // Expand while the expansion result ends with the name of a function-like
+            // macro whose arguments are supplied by the tokens that follow it. Each round
+            // consumes that macro call from the token stream, so tok always advances.
+            while (const Macro * const calledMacro = rescanMacro(temp, tok, macros, expandedmacros)) {
+                TokenList temp2(files);
+                temp2.push_back(new Token(temp.cback()->str(), tok->location));
 
-            const Token * const tok2 = appendTokens(&temp2, loc, tok->next, macros, expandedmacros, parametertokens);
-            if (!tok2)
-                return tok->next;
-            output->takeTokens(temp);
-            output->deleteToken(output->back());
-            calledMacro.expand(output, loc, temp2.cfront(), macros, expandedmacros);
-            return tok2->next;
+                const Token * const tok2 = appendTokens(temp2, loc, tok->next, macros, expandedmacros, parametertokens);
+                if (!tok2)
+                    break;
+                output.takeTokens(temp);
+                output.deleteToken(output.back());
+                calledMacro->expand(temp, loc, temp2.cfront(), macros, expandedmacros);
+                tok = tok2;
+            }
+            output.takeTokens(temp);
+            return tok->next;
         }
 
-        const Token *expandToken(TokenList *output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+        const Token *expandToken(TokenList &output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
             // Not name..
             if (!tok->name) {
-                output->push_back(newMacroToken(tok->str(), loc, true, tok));
+                output.push_back(newMacroToken(tok->str(), loc, true, tok));
                 return tok->next;
             }
 
             // Macro parameter..
             {
                 TokenList temp(files);
-                if (tok->str() == "__VA_OPT__") {
-                    if (sameline(tok, tok->next) && tok->next->str() == "(") {
-                        tok = tok->next;
-                        int paren = 1;
-                        while (sameline(tok, tok->next)) {
-                            if (tok->next->str() == "(")
-                                ++paren;
-                            else if (tok->next->str() == ")")
-                                --paren;
-                            if (paren == 0)
-                                return tok->next->next;
-                            tok = tok->next;
-                            if (parametertokens.size() > args.size() && parametertokens.front()->next->str() != ")")
-                                tok = expandToken(output, loc, tok, macros, expandedmacros, parametertokens)->previous;
-                        }
-                    }
-                    throw Error(tok->location, "Missing parenthesis for __VA_OPT__(content)");
-                }
-                if (expandArg(&temp, tok, loc, macros, expandedmacros, parametertokens)) {
-                    if (tok->str() == "__VA_ARGS__" && temp.empty() && output->cback() && output->cback()->str() == "," &&
+                if (expandArg(temp, tok, loc, macros, expandedmacros, parametertokens)) {
+                    if (tok->str() == "__VA_ARGS__" && temp.empty() && output.cback() && output.cback()->str() == "," &&
                         tok->nextSkipComments() && tok->nextSkipComments()->str() == ")")
-                        output->deleteToken(output->back());
+                        output.deleteToken(output.back());
                     return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros, parametertokens);
                 }
             }
@@ -2055,29 +2224,30 @@ namespace simplecpp {
                 const Macro &calledMacro = it->second;
                 if (!calledMacro.functionLike()) {
                     TokenList temp(files);
-                    calledMacro.expand(&temp, loc, tok, macros, expandedmacros);
+                    calledMacro.expand(temp, loc, tok, macros, expandedmacros);
                     return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros2, parametertokens);
                 }
                 if (!sameline(tok, tok->next)) {
-                    output->push_back(newMacroToken(tok->str(), loc, true, tok));
+                    output.push_back(newMacroToken(tok->str(), loc, true, tok));
                     return tok->next;
                 }
                 TokenList tokens(files);
                 tokens.push_back(new Token(*tok));
                 const Token * tok2 = nullptr;
-                if (tok->next->op == '(')
-                    tok2 = appendTokens(&tokens, loc, tok->next, macros, expandedmacros, parametertokens);
-                else if (expandArg(&tokens, tok->next, loc, macros, expandedmacros, parametertokens)) {
+                if (tok->next->op == '(') {
+                    tok2 = appendTokens(tokens, loc, tok->next, macros, expandedmacros, parametertokens);
+                }
+                else if (expandArg(tokens, tok->next, loc, macros, expandedmacros, parametertokens)) {
                     tokens.front()->location = loc;
                     if (tokens.cfront()->next && tokens.cfront()->next->op == '(')
                         tok2 = tok->next;
                 }
                 if (!tok2) {
-                    output->push_back(newMacroToken(tok->str(), loc, true, tok));
+                    output.push_back(newMacroToken(tok->str(), loc, true, tok));
                     return tok->next;
                 }
                 TokenList temp(files);
-                calledMacro.expand(&temp, loc, tokens.cfront(), macros, expandedmacros);
+                calledMacro.expand(temp, loc, tokens.cfront(), macros, expandedmacros);
                 return recursiveExpandToken(output, temp, loc, tok2, macros, expandedmacros, parametertokens);
             }
 
@@ -2097,25 +2267,27 @@ namespace simplecpp {
                     std::string macroName = defToken->str();
                     if (defToken->next && defToken->next->op == '#' && defToken->next->next && defToken->next->next->op == '#' && defToken->next->next->next && defToken->next->next->next->name && sameline(defToken,defToken->next->next->next)) {
                         TokenList temp(files);
-                        if (expandArg(&temp, defToken, parametertokens))
+                        if (expandArg(temp, defToken, parametertokens))
                             macroName = temp.cback()->str();
-                        if (expandArg(&temp, defToken->next->next->next, parametertokens))
+                        if (expandArg(temp, defToken->next->next->next, parametertokens))
                             macroName += temp.cback() ? temp.cback()->str() : "";
                         else
                             macroName += defToken->next->next->next->str();
                         lastToken = defToken->next->next->next;
                     }
                     const bool def = (macros.find(macroName) != macros.end());
-                    output->push_back(newMacroToken(def ? "1" : "0", loc, true));
+                    output.push_back(newMacroToken(def ? "1" : "0", loc, true));
                     return lastToken->next;
                 }
             }
 
-            output->push_back(newMacroToken(tok->str(), loc, true, tok));
+            output.push_back(newMacroToken(tok->str(), loc, true, tok));
+            if (it != macros.end())
+                output.back()->markExpandedFrom(&it->second);
             return tok->next;
         }
 
-        bool expandArg(TokenList *output, const Token *tok, const std::vector<const Token*> &parametertokens) const {
+        bool expandArg(TokenList &output, const Token *tok, const std::vector<const Token*> &parametertokens) const {
             if (!tok->name)
                 return false;
 
@@ -2128,12 +2300,12 @@ namespace simplecpp {
                 return true;
 
             for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U]; partok = partok->next)
-                output->push_back(new Token(*partok));
+                output.push_back(new Token(*partok));
 
             return true;
         }
 
-        bool expandArg(TokenList *output, const Token *tok, const Location &loc, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+        bool expandArg(TokenList &output, const Token *tok, const Location &loc, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
             if (!tok->name)
                 return false;
             const unsigned int argnr = getArgNum(tok->str());
@@ -2146,15 +2318,15 @@ namespace simplecpp {
                 if (it != macros.end() && !partok->isExpandedFrom(&it->second) && (partok->str() == name() || expandedmacros.find(partok->str()) == expandedmacros.end())) {
                     std::set<TokenString> expandedmacros2(expandedmacros); // temporary amnesia to allow reexpansion of currently expanding macros during argument evaluation
                     expandedmacros2.erase(name());
-                    partok = it->second.expand(output, loc, partok, macros, expandedmacros2);
+                    partok = it->second.expand(output, loc, partok, macros, std::move(expandedmacros2));
                 } else {
-                    output->push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros), partok));
-                    output->back()->macro = partok->macro;
+                    output.push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros), partok));
+                    output.back()->macro = partok->macro;
                     partok = partok->next;
                 }
             }
-            if (tok->whitespaceahead && output->back())
-                output->back()->whitespaceahead = true;
+            if (tok->whitespaceahead && output.back())
+                output.back()->whitespaceahead = true;
             return true;
         }
 
@@ -2167,10 +2339,10 @@ namespace simplecpp {
          * @param parametertokens  parameters given when expanding this macro
          * @return token after the X
          */
-        const Token *expandHash(TokenList *output, const Location &loc, const Token *tok, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+        const Token *expandHash(TokenList &output, const Location &loc, const Token *tok, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
             TokenList tokenListHash(files);
             const MacroMap macros2; // temporarily bypass macro expansion
-            tok = expandToken(&tokenListHash, loc, tok->next, macros2, expandedmacros, parametertokens);
+            tok = expandToken(tokenListHash, loc, tok->next, macros2, expandedmacros, parametertokens);
             std::ostringstream ostr;
             ostr << '\"';
             for (const Token *hashtok = tokenListHash.cfront(), *next; hashtok; hashtok = next) {
@@ -2180,7 +2352,7 @@ namespace simplecpp {
                     ostr << ' ';
             }
             ostr << '\"';
-            output->push_back(newMacroToken(escapeString(ostr.str()), loc, isReplaced(expandedmacros)));
+            output.push_back(newMacroToken(escapeString(ostr.str()), loc, isReplaced(expandedmacros)));
             return tok;
         }
 
@@ -2196,18 +2368,18 @@ namespace simplecpp {
          * @param expandResult     expand ## result i.e. "AB"?
          * @return token after B
          */
-        const Token *expandHashHash(TokenList *output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens, bool expandResult=true) const {
-            Token *A = output->back();
+        const Token *expandHashHash(TokenList &output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens, bool expandResult=true) const {
+            Token *A = output.back();
             if (!A)
                 throw invalidHashHash(tok->location, name(), "Missing first argument");
             if (!sameline(tok, tok->next) || !sameline(tok, tok->next->next))
                 throw invalidHashHash::unexpectedNewline(tok->location, name());
 
             const bool canBeConcatenatedWithEqual = A->isOneOf("+-*/%&|^") || A->str() == "<<" || A->str() == ">>";
-            const bool canBeConcatenatedStringOrChar = isStringLiteral_(A->str()) || isCharLiteral_(A->str());
+            const bool canBeConcatenatedStringOrChar = isStringLiteral(A->str()) || isCharLiteral(A->str());
             const bool unexpectedA = (!A->name && !A->number && !A->str().empty() && !canBeConcatenatedWithEqual && !canBeConcatenatedStringOrChar);
 
-            Token * const B = tok->next->next;
+            const Token * const B = tok->next->next;
             if (!B->name && !B->number && B->op && !B->isOneOf("#="))
                 throw invalidHashHash::unexpectedToken(tok->location, name(), B);
 
@@ -2223,31 +2395,31 @@ namespace simplecpp {
             const Token *nextTok = B->next;
 
             if (canBeConcatenatedStringOrChar) {
-                if (unexpectedA)
-                    throw invalidHashHash::unexpectedToken(tok->location, name(), A);
-
                 // It seems clearer to handle this case separately even though the code is similar-ish, but we don't want to merge here.
                 // TODO The question is whether the ## or varargs may still apply, and how to provoke?
-                if (expandArg(&tokensB, B, parametertokens)) {
+                if (expandArg(tokensB, B, parametertokens)) {
                     for (Token *b = tokensB.front(); b; b = b->next)
                         b->location = loc;
                 } else {
                     tokensB.push_back(new Token(*B));
                     tokensB.back()->location = loc;
                 }
-                output->takeTokens(tokensB);
+                output.takeTokens(tokensB);
             } else {
                 std::string strAB;
 
                 const bool varargs = variadic && !args.empty() && B->str() == args[args.size()-1U];
 
-                if (expandArg(&tokensB, B, parametertokens)) {
-                    if (tokensB.empty())
+                if (expandArg(tokensB, B, parametertokens)) {
+                    if (tokensB.empty()) {
                         strAB = A->str();
-                    else if (varargs && A->op == ',')
+                    }
+                    else if (varargs && A->op == ',') {
                         strAB = ",";
-                    else if (varargs && unexpectedA)
+                    }
+                    else if (varargs && unexpectedA) {
                         throw invalidHashHash::unexpectedToken(tok->location, name(), A);
+                    }
                     else {
                         strAB = A->str() + tokensB.cfront()->str();
                         tokensB.deleteToken(tokensB.front());
@@ -2266,28 +2438,29 @@ namespace simplecpp {
                         throw invalidHashHash::universalCharacterUB(tok->location, name(), A, strAB);
                 }
 
-                if (varargs && tokensB.empty() && tok->previous->str() == ",")
-                    output->deleteToken(A);
+                if (varargs && tokensB.empty() && tok->previous->str() == ",") {
+                    output.deleteToken(A);
+                }
                 else if (strAB != "," && macros.find(strAB) == macros.end()) {
                     A->setstr(strAB);
                     for (Token *b = tokensB.front(); b; b = b->next)
                         b->location = loc;
-                    output->takeTokens(tokensB);
+                    output.takeTokens(tokensB);
                 } else if (sameline(B, nextTok) && sameline(B, nextTok->next) && nextTok->op == '#' && nextTok->next->op == '#') {
                     TokenList output2(files);
                     output2.push_back(new Token(strAB, tok->location));
-                    nextTok = expandHashHash(&output2, loc, nextTok, macros, expandedmacros, parametertokens);
-                    output->deleteToken(A);
-                    output->takeTokens(output2);
+                    nextTok = expandHashHash(output2, loc, nextTok, macros, expandedmacros, parametertokens);
+                    output.deleteToken(A);
+                    output.takeTokens(output2);
                 } else {
-                    output->deleteToken(A);
+                    output.deleteToken(A);
                     TokenList tokens(files);
                     tokens.push_back(new Token(strAB, tok->location));
                     // for function like macros, push the (...)
                     if (tokensB.empty() && sameline(B,B->next) && B->next->op=='(') {
                         const MacroMap::const_iterator it = macros.find(strAB);
                         if (it != macros.end() && expandedmacros.find(strAB) == expandedmacros.end() && it->second.functionLike()) {
-                            const Token * const tok2 = appendTokens(&tokens, loc, B->next, macros, expandedmacros, parametertokens);
+                            const Token * const tok2 = appendTokens(tokens, loc, B->next, macros, expandedmacros, parametertokens);
                             if (tok2)
                                 nextTok = tok2->next;
                         }
@@ -2295,10 +2468,10 @@ namespace simplecpp {
                     if (expandResult)
                         expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens);
                     else
-                        output->takeTokens(tokens);
+                        output.takeTokens(tokens);
                     for (Token *b = tokensB.front(); b; b = b->next)
                         b->location = loc;
-                    output->takeTokens(tokensB);
+                    output.takeTokens(tokensB);
                 }
             }
 
@@ -2307,11 +2480,11 @@ namespace simplecpp {
 
         static bool isReplaced(const std::set<std::string> &expandedmacros) {
             // return true if size > 1
-            std::set<std::string>::const_iterator it = expandedmacros.begin();
-            if (it == expandedmacros.end())
+            auto it = expandedmacros.cbegin();
+            if (it == expandedmacros.cend())
                 return false;
             ++it;
-            return (it != expandedmacros.end());
+            return (it != expandedmacros.cend());
         }
 
         /** name token in definition */
@@ -2338,6 +2511,13 @@ namespace simplecpp {
         /** is macro variadic? */
         bool variadic;
 
+        /** does the macro expansion have __VA_OPT__? */
+        bool variadicOpt;
+
+        /** Expansion value for varadic macros with __VA_OPT__ expanded and discarded respectively */
+        const TokenList *optExpandValue{};
+        const TokenList *optNoExpandValue{};
+
         /** was the value of this macro actually defined in the code? */
         bool valueDefinedInCode_;
     };
@@ -2346,12 +2526,17 @@ namespace simplecpp {
 namespace simplecpp {
 
 #ifdef __CYGWIN__
+    static bool startsWith(const std::string &s, const std::string &p)
+    {
+        return (s.size() >= p.size()) && std::equal(p.begin(), p.end(), s.begin());
+    }
+
     std::string convertCygwinToWindowsPath(const std::string &cygwinPath)
     {
         std::string windowsPath;
 
         std::string::size_type pos = 0;
-        if (cygwinPath.size() >= 11 && startsWith_(cygwinPath, "/cygdrive/")) {
+        if (cygwinPath.size() >= 11 && startsWith(cygwinPath, "/cygdrive/")) {
             const unsigned char driveLetter = cygwinPath[10];
             if (std::isalpha(driveLetter)) {
                 if (cygwinPath.size() == 11) {
@@ -2376,187 +2561,26 @@ namespace simplecpp {
         return windowsPath;
     }
 #endif
-}
 
+    bool isAbsolutePath(const std::string &path)
+    {
 #ifdef SIMPLECPP_WINDOWS
-
-#if __cplusplus >= 201103L
-using MyMutex = std::mutex;
-template<class T>
-using MyLock = std::lock_guard<T>;
-#else
-class MyMutex {
-public:
-    MyMutex() {
-        InitializeCriticalSection(&m_criticalSection);
-    }
-
-    ~MyMutex() {
-        DeleteCriticalSection(&m_criticalSection);
-    }
-
-    CRITICAL_SECTION* lock() {
-        return &m_criticalSection;
-    }
-private:
-    CRITICAL_SECTION m_criticalSection;
-};
-
-template<typename T>
-class MyLock {
-public:
-    explicit MyLock(T& m)
-        : m_mutex(m) {
-        EnterCriticalSection(m_mutex.lock());
-    }
-
-    ~MyLock() {
-        LeaveCriticalSection(m_mutex.lock());
-    }
-
-private:
-    MyLock& operator=(const MyLock&);
-    MyLock(const MyLock&);
-
-    T& m_mutex;
-};
-#endif
-
-class RealFileNameMap {
-public:
-    RealFileNameMap() {}
-
-    bool getCacheEntry(const std::string& path, std::string& returnPath) {
-        MyLock<MyMutex> lock(m_mutex);
-
-        const std::map<std::string, std::string>::iterator it = m_fileMap.find(path);
-        if (it != m_fileMap.end()) {
-            returnPath = it->second;
+        // C:\\path\\file
+        // C:/path/file
+        if (path.length() >= 3 && std::isalpha(path[0]) && path[1] == ':' && (path[2] == '\\' || path[2] == '/'))
             return true;
-        }
-        return false;
-    }
 
-    void addToCache(const std::string& path, const std::string& actualPath) {
-        MyLock<MyMutex> lock(m_mutex);
-        m_fileMap[path] = actualPath;
-    }
-
-private:
-    std::map<std::string, std::string> m_fileMap;
-    MyMutex m_mutex;
-};
-
-static RealFileNameMap realFileNameMap;
-
-static bool realFileName(const std::string &f, std::string &result)
-{
-    // are there alpha characters in last subpath?
-    bool alpha = false;
-    for (std::string::size_type pos = 1; pos <= f.size(); ++pos) {
-        const unsigned char c = f[f.size() - pos];
-        if (c == '/' || c == '\\')
-            break;
-        if (std::isalpha(c)) {
-            alpha = true;
-            break;
-        }
-    }
+        // \\host\path\file
+        // //host/path/file
+        if (path.length() >= 2 && (path[0] == '\\' || path[0] == '/') && (path[1] == '\\' || path[1] == '/'))
+            return true;
 
-    // do not convert this path if there are no alpha characters (either pointless or cause wrong results for . and ..)
-    if (!alpha)
         return false;
-
-    // Lookup filename or foldername on file system
-    if (!realFileNameMap.getCacheEntry(f, result)) {
-
-        WIN32_FIND_DATAA FindFileData;
-
-#ifdef __CYGWIN__
-        const std::string fConverted = simplecpp::convertCygwinToWindowsPath(f);
-        const HANDLE hFind = FindFirstFileExA(fConverted.c_str(), FindExInfoBasic, &FindFileData, FindExSearchNameMatch, NULL, 0);
 #else
-        HANDLE hFind = FindFirstFileExA(f.c_str(), FindExInfoBasic, &FindFileData, FindExSearchNameMatch, NULL, 0);
+        return !path.empty() && path[0] == '/';
 #endif
-
-        if (INVALID_HANDLE_VALUE == hFind)
-            return false;
-        result = FindFileData.cFileName;
-        realFileNameMap.addToCache(f, result);
-        FindClose(hFind);
-    }
-    return true;
-}
-
-static RealFileNameMap realFilePathMap;
-
-/** Change case in given path to match filesystem */
-static std::string realFilename(const std::string &f)
-{
-    std::string ret;
-    ret.reserve(f.size()); // this will be the final size
-    if (realFilePathMap.getCacheEntry(f, ret))
-        return ret;
-
-    // Current subpath
-    std::string subpath;
-
-    for (std::string::size_type pos = 0; pos < f.size(); ++pos) {
-        const unsigned char c = f[pos];
-
-        // Separator.. add subpath and separator
-        if (c == '/' || c == '\\') {
-            // if subpath is empty just add separator
-            if (subpath.empty()) {
-                ret += c;
-                continue;
-            }
-
-            const bool isDriveSpecification =
-                (pos == 2 && subpath.size() == 2 && std::isalpha(subpath[0]) && subpath[1] == ':');
-
-            // Append real filename (proper case)
-            std::string f2;
-            if (!isDriveSpecification && realFileName(f.substr(0, pos), f2))
-                ret += f2;
-            else
-                ret += subpath;
-
-            subpath.clear();
-
-            // Append separator
-            ret += c;
-        } else {
-            subpath += c;
-        }
-    }
-
-    if (!subpath.empty()) {
-        std::string f2;
-        if (realFileName(f,f2))
-            ret += f2;
-        else
-            ret += subpath;
     }
-
-    realFilePathMap.addToCache(f, ret);
-    return ret;
-}
-
-static bool isAbsolutePath(const std::string &path)
-{
-    if (path.length() >= 3 && path[0] > 0 && std::isalpha(path[0]) && path[1] == ':' && (path[2] == '\\' || path[2] == '/'))
-        return true;
-    return path.length() > 1U && (path[0] == '/' || path[0] == '\\');
-}
-#else
-#define realFilename(f)  f
-
-static bool isAbsolutePath(const std::string &path)
-{
-    return path.length() > 1U && path[0] == '/';
 }
-#endif
 
 namespace simplecpp {
     /**
@@ -2629,22 +2653,23 @@ namespace simplecpp {
         if (unc)
             path = '/' + path;
 
-        // cppcheck-suppress duplicateExpressionTernary - platform-dependent implementation
-        return strpbrk(path.c_str(), "*?") == nullptr ? realFilename(path) : path;
+        return path;
     }
 }
 
-/** Evaluate sizeof(type) */
+/** Evaluate sizeof(type)
+ * @throws std::runtime_error thrown on missing arguments or invalid expression
+ */
 static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::string, std::size_t> &sizeOfType)
 {
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->str() != "sizeof")
             continue;
-        simplecpp::Token *tok1 = tok->next;
+        const simplecpp::Token *tok1 = tok->next;
         if (!tok1) {
             throw std::runtime_error("missing sizeof argument");
         }
-        simplecpp::Token *tok2 = tok1->next;
+        const simplecpp::Token *tok2 = tok1->next;
         if (!tok2) {
             throw std::runtime_error("missing sizeof argument");
         }
@@ -2659,7 +2684,7 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
         }
 
         std::string type;
-        for (simplecpp::Token *typeToken = tok1; typeToken != tok2; typeToken = typeToken->next) {
+        for (const simplecpp::Token *typeToken = tok1; typeToken != tok2; typeToken = typeToken->next) {
             if ((typeToken->str() == "unsigned" || typeToken->str() == "signed") && typeToken->next->name)
                 continue;
             if (typeToken->str() == "*" && type.find('*') != std::string::npos)
@@ -2681,68 +2706,44 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
     }
 }
 
-/** Evaluate __has_include(file) */
 static bool isCpp17OrLater(const simplecpp::DUI &dui)
 {
     const std::string std_ver = simplecpp::getCppStdString(dui.std);
-    return !std_ver.empty() && (std_ver >= "201703L");
-}
-
-
-static std::string currentDirectoryOSCalc() {
-    const std::size_t size = 4096;
-    char currentPath[size];
-
-#ifndef _WIN32
-    if (getcwd(currentPath, size) != nullptr)
-#else
-    if (_getcwd(currentPath, size) != nullptr)
-#endif
-        return std::string(currentPath);
-
-    return "";
-}
-
-static const std::string& currentDirectory() {
-    static const std::string curdir = simplecpp::simplifyPath(currentDirectoryOSCalc());
-    return curdir;
+    return std_ver.empty() || (std_ver >= "201703L");
 }
 
-static std::string toAbsolutePath(const std::string& path) {
-    if (path.empty()) {
-        return path;// preserve error file path that is indicated by an empty string
-    }
-    if (!isAbsolutePath(path)) {
-        return simplecpp::simplifyPath(currentDirectory() + "/" + path);
-    }
-    // otherwise
-    return simplecpp::simplifyPath(path);
+static bool isGnu(const simplecpp::DUI &dui)
+{
+    return dui.std.rfind("gnu", 0) != std::string::npos;
 }
 
-static std::pair<std::string, bool> extractRelativePathFromAbsolute(const std::string& absolutepath) {
-    static const std::string prefix = currentDirectory() + "/";
-    if (startsWith_(absolutepath, prefix)) {
-        const std::size_t size = prefix.size();
-        return std::make_pair(absolutepath.substr(size, absolutepath.size() - size), true);
+static std::string dirPath(const std::string& path, bool withTrailingSlash=true)
+{
+    const std::size_t lastSlash = path.find_last_of("\\/");
+    if (lastSlash == std::string::npos) {
+        return "";
     }
-    // otherwise
-    return std::make_pair("", false);
+    return path.substr(0, lastSlash + (withTrailingSlash ? 1U : 0U));
 }
 
 static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header, bool systemheader);
+
+/** Evaluate __has_include(include)
+ * @throws std::runtime_error thrown on missing arguments or invalid expression
+ */
 static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI &dui)
 {
-    if (!isCpp17OrLater(dui))
+    if (!isCpp17OrLater(dui) && !isGnu(dui))
         return;
 
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->str() != HAS_INCLUDE)
             continue;
-        simplecpp::Token *tok1 = tok->next;
+        const simplecpp::Token *tok1 = tok->next;
         if (!tok1) {
             throw std::runtime_error("missing __has_include argument");
         }
-        simplecpp::Token *tok2 = tok1->next;
+        const simplecpp::Token *tok2 = tok1->next;
         if (!tok2) {
             throw std::runtime_error("missing __has_include argument");
         }
@@ -2756,11 +2757,11 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
             }
         }
 
-        const std::string &sourcefile = tok->location.file();
+        const std::string &sourcefile = expr.file(tok->location);
         const bool systemheader = (tok1 && tok1->op == '<');
         std::string header;
         if (systemheader) {
-            simplecpp::Token *tok3 = tok1->next;
+            const simplecpp::Token *tok3 = tok1->next;
             if (!tok3) {
                 throw std::runtime_error("missing __has_include closing angular bracket");
             }
@@ -2771,12 +2772,10 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
                 }
             }
 
-            for (simplecpp::Token *headerToken = tok1->next; headerToken != tok3; headerToken = headerToken->next)
+            for (const simplecpp::Token *headerToken = tok1->next; headerToken != tok3; headerToken = headerToken->next)
                 header += headerToken->str();
-            // cppcheck-suppress selfAssignment - platform-dependent implementation
-            header = realFilename(header);
         } else {
-            header = realFilename(tok1->str().substr(1U, tok1->str().size() - 2U));
+            header = tok1->str().substr(1U, tok1->str().size() - 2U);
         }
         std::ifstream f;
         const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader);
@@ -2788,12 +2787,14 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
     }
 }
 
-static const char * const altopData[] = {"and","or","bitand","bitor","compl","not","not_eq","xor"};
-static const std::set<std::string> altop(&altopData[0], &altopData[8]);
+/** Evaluate name
+ * @throws std::runtime_error thrown on undefined function-like macro
+ */
 static void simplifyName(simplecpp::TokenList &expr)
 {
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->name) {
+            static const std::set<std::string> altop{"and","or","bitand","bitor","compl","not","not_eq","xor"};
             if (altop.find(tok->str()) != altop.end()) {
                 bool alt;
                 if (tok->str() == "not" || tok->str() == "compl") {
@@ -2804,6 +2805,8 @@ static void simplifyName(simplecpp::TokenList &expr)
                 if (alt)
                     continue;
             }
+            if (tok->next && tok->next->str() == "(")
+                throw std::runtime_error("undefined function-like macro invocation: " + tok->str() + "( ... )");
             tok->setstr("0");
         }
     }
@@ -2815,7 +2818,7 @@ static void simplifyName(simplecpp::TokenList &expr)
  * unsigned long long value, updating pos to point to the first
  * unused element of s.
  * Returns ULLONG_MAX if the result is not representable and
- * throws if the above requirements were not possible to satisfy.
+ * @throws std::runtime_error thrown if the above requirements were not possible to satisfy.
  */
 static unsigned long long stringToULLbounded(
     const std::string& s,
@@ -2823,7 +2826,7 @@ static unsigned long long stringToULLbounded(
     int base = 0,
     std::ptrdiff_t minlen = 1,
     std::size_t maxlen = std::string::npos
-)
+    )
 {
     const std::string sub = s.substr(pos, maxlen);
     const char * const start = sub.c_str();
@@ -2835,34 +2838,6 @@ static unsigned long long stringToULLbounded(
     return value;
 }
 
-/* Converts character literal (including prefix, but not ud-suffix)
- * to long long value.
- *
- * Assumes ASCII-compatible single-byte encoded str for narrow literals
- * and UTF-8 otherwise.
- *
- * For target assumes
- * - execution character set encoding matching str
- * - UTF-32 execution wide-character set encoding
- * - requirements for __STDC_UTF_16__, __STDC_UTF_32__ and __STDC_ISO_10646__ satisfied
- * - char16_t is 16bit wide
- * - char32_t is 32bit wide
- * - wchar_t is 32bit wide and unsigned
- * - matching char signedness to host
- * - matching sizeof(int) to host
- *
- * For host assumes
- * - ASCII-compatible execution character set
- *
- * For host and target assumes
- * - CHAR_BIT == 8
- * - two's complement
- *
- * Implements multi-character narrow literals according to GCC's behavior,
- * except multi code unit universal character names are not supported.
- * Multi-character wide literals are not supported.
- * Limited support of universal character names for non-UTF-8 execution character set encodings.
- */
 long long simplecpp::characterLiteralToLL(const std::string& str)
 {
     // default is wide/utf32
@@ -2883,8 +2858,9 @@ long long simplecpp::characterLiteralToLL(const std::string& str)
         pos = 3;
     } else if (str.size() >= 2 && (str[0] == 'L' || str[0] == 'U') && str[1] == '\'') {
         pos = 2;
-    } else
+    } else {
         throw std::runtime_error("expected a character literal");
+    }
 
     unsigned long long multivalue = 0;
 
@@ -3056,6 +3032,9 @@ long long simplecpp::characterLiteralToLL(const std::string& str)
     return multivalue;
 }
 
+/**
+ * @throws std::runtime_error thrown on invalid literal
+ */
 static void simplifyNumbers(simplecpp::TokenList &expr)
 {
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
@@ -3078,6 +3057,11 @@ static void simplifyComments(simplecpp::TokenList &expr)
     }
 }
 
+/**
+ * @throws std::runtime_error thrown on invalid literals, missing sizeof arguments or invalid expressions,
+ * missing __has_include() arguments or expressions, undefined function-like macros, invalid number literals
+ * @throws std::overflow_error thrown on overflow or division by zero
+ */
 static long long evaluate(simplecpp::TokenList &expr, const simplecpp::DUI &dui, const std::map<std::string, std::size_t> &sizeOfType)
 {
     simplifyComments(expr);
@@ -3106,208 +3090,293 @@ class NonExistingFilesCache {
     NonExistingFilesCache() {}
 
     bool contains(const std::string& path) {
-        MyLock<MyMutex> lock(m_mutex);
+        std::lock_guard<std::mutex> lock(m_mutex);
         return (m_pathSet.find(path) != m_pathSet.end());
     }
 
     void add(const std::string& path) {
-        MyLock<MyMutex> lock(m_mutex);
+        std::lock_guard<std::mutex> lock(m_mutex);
         m_pathSet.insert(path);
     }
 
     void clear() {
-        MyLock<MyMutex> lock(m_mutex);
+        std::lock_guard<std::mutex> lock(m_mutex);
         m_pathSet.clear();
     }
 
 private:
     std::set<std::string> m_pathSet;
-    MyMutex m_mutex;
+    std::mutex m_mutex;
 };
 
 static NonExistingFilesCache nonExistingFilesCache;
 
 #endif
 
-static std::string openHeader(std::ifstream &f, const std::string &path)
+static std::string openHeaderDirect(std::ifstream &f, const std::string &path)
 {
-    std::string simplePath = simplecpp::simplifyPath(path);
 #ifdef SIMPLECPP_WINDOWS
-    if (nonExistingFilesCache.contains(simplePath))
+    if (nonExistingFilesCache.contains(path))
         return "";  // file is known not to exist, skip expensive file open call
 #endif
-    f.open(simplePath.c_str());
+    f.open(path.c_str());
     if (f.is_open())
-        return simplePath;
+        return path;
 #ifdef SIMPLECPP_WINDOWS
-    nonExistingFilesCache.add(simplePath);
+    nonExistingFilesCache.add(path);
 #endif
     return "";
 }
 
-static std::string getRelativeFileName(const std::string &baseFile, const std::string &header)
-{
-    std::string path;
-    if (baseFile.find_first_of("\\/") != std::string::npos)
-        path = baseFile.substr(0, baseFile.find_last_of("\\/") + 1U) + header;
-    else
-        path = header;
-    return simplecpp::simplifyPath(path);
-}
-
-static std::string openHeaderRelative(std::ifstream &f, const std::string &sourcefile, const std::string &header)
-{
-    return openHeader(f, getRelativeFileName(sourcefile, header));
-}
-
-// returns the simplified header path:
-// * If the header path is absolute, returns it in absolute path
-// * Otherwise, returns it in relative path with respect to the current directory
-static std::string getIncludePathFileName(const std::string &includePath, const std::string &header)
+static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header, bool systemheader)
 {
-    std::string simplifiedHeader = simplecpp::simplifyPath(header);
+    if (simplecpp::isAbsolutePath(header))
+        return openHeaderDirect(f, simplecpp::simplifyPath(header));
 
-    if (isAbsolutePath(simplifiedHeader)) {
-        return simplifiedHeader;
+    // prefer first to search the header relatively to source file if found, when not a system header
+    if (!systemheader) {
+        std::string path = openHeaderDirect(f, simplecpp::simplifyPath(dirPath(sourcefile) + header));
+        if (!path.empty()) {
+            return path;
+        }
     }
 
-    std::string basePath = toAbsolutePath(includePath);
-    if (!basePath.empty() && basePath[basePath.size()-1U]!='/' && basePath[basePath.size()-1U]!='\\')
-        basePath += '/';
-    const std::string absolutesimplifiedHeaderPath = basePath + simplifiedHeader;
-    return extractRelativePathFromAbsolute(absolutesimplifiedHeaderPath).first;
-}
-
-static std::string openHeaderIncludePath(std::ifstream &f, const simplecpp::DUI &dui, const std::string &header)
-{
-    for (std::list<std::string>::const_iterator it = dui.includePaths.begin(); it != dui.includePaths.end(); ++it) {
-        std::string path = openHeader(f, getIncludePathFileName(*it, header));
+    // search the header on the include paths (provided by the flags "-I...")
+    for (const auto &includePath : dui.includePaths) {
+        std::string path = openHeaderDirect(f, simplecpp::simplifyPath(includePath + "/" + header));
         if (!path.empty())
             return path;
     }
     return "";
 }
 
-static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header, bool systemheader)
-{
-    if (isAbsolutePath(header))
-        return openHeader(f, header);
-
-    // prefer first to search the header relatively to source file if found, when not a system header
-    if (!systemheader) {
-        std::string relativeHeader = openHeaderRelative(f, sourcefile, header);
-        if (!relativeHeader.empty()) {
-            return relativeHeader;
+namespace {
+    struct FileID {
+#ifdef _WIN32
+        struct {
+            std::uint64_t VolumeSerialNumber;
+            struct {
+                std::uint64_t IdentifierHi;
+                std::uint64_t IdentifierLo;
+            } FileId;
+        } fileIdInfo;
+
+        bool operator==(const FileID &that) const noexcept {
+            return fileIdInfo.VolumeSerialNumber == that.fileIdInfo.VolumeSerialNumber &&
+                   fileIdInfo.FileId.IdentifierHi == that.fileIdInfo.FileId.IdentifierHi &&
+                   fileIdInfo.FileId.IdentifierLo == that.fileIdInfo.FileId.IdentifierLo;
         }
-    }
+#else
+        dev_t dev;
+        ino_t ino;
 
-    // search the header on the include paths (provided by the flags "-I...")
-    return openHeaderIncludePath(f, dui, header);
+        bool operator==(const FileID& that) const noexcept {
+            return dev == that.dev && ino == that.ino;
+        }
+#endif
+        struct Hasher {
+            std::size_t operator()(const FileID &id) const {
+#ifdef _WIN32
+                return static_cast<std::size_t>(id.fileIdInfo.FileId.IdentifierHi ^ id.fileIdInfo.FileId.IdentifierLo ^
+                                                id.fileIdInfo.VolumeSerialNumber);
+#else
+                return static_cast<std::size_t>(id.dev) ^ static_cast<std::size_t>(id.ino);
+#endif
+            }
+        };
+    };
 }
 
-static std::string findPathInMapBothRelativeAndAbsolute(const std::map<std::string, simplecpp::TokenList *> &filedata, const std::string& path) {
-    // here there are two possibilities - either we match this from absolute path or from a relative one
-    if (filedata.find(path) != filedata.end()) {// try first to respect the exact match
-        return path;
+struct simplecpp::FileDataCache::Impl
+{
+    void clear()
+    {
+        mIdMap.clear();
     }
-    // otherwise - try to use the normalize to the correct representation
-    if (isAbsolutePath(path)) {
-        const std::pair<std::string, bool> relativeExtractedResult = extractRelativePathFromAbsolute(path);
-        if (relativeExtractedResult.second) {
-            const std::string relativePath = relativeExtractedResult.first;
-            if (filedata.find(relativePath) != filedata.end()) {
-                return relativePath;
-            }
-        }
-    } else {
-        const std::string absolutePath = toAbsolutePath(path);
-        if (filedata.find(absolutePath) != filedata.end()) {
-            return absolutePath;
-        }
+
+    using id_map_type = std::unordered_map<FileID, FileData *, FileID::Hasher>;
+
+    id_map_type mIdMap;
+};
+
+simplecpp::FileDataCache::FileDataCache()
+    : mImpl(new Impl)
+{}
+
+simplecpp::FileDataCache::~FileDataCache() = default;
+simplecpp::FileDataCache::FileDataCache(FileDataCache &&) SIMPLECPP_NOEXCEPT = default;
+simplecpp::FileDataCache &simplecpp::FileDataCache::operator=(simplecpp::FileDataCache &&) SIMPLECPP_NOEXCEPT = default;
+
+static bool getFileId(const std::string &path, FileID &id);
+
+std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(FileDataCache::name_map_type::iterator &name_it, const simplecpp::DUI &dui, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
+{
+    const std::string &path = name_it->first;
+    FileID fileId;
+
+    if (!getFileId(path, fileId))
+        return {nullptr, false};
+
+    const auto id_it = mImpl->mIdMap.find(fileId);
+    if (id_it != mImpl->mIdMap.end()) {
+        name_it->second = id_it->second;
+        return {id_it->second, false};
     }
-    // otherwise
-    return "";
+
+    auto *const data = new FileData {path, TokenList(path, filenames, {}, outputList)};
+
+    if (dui.removeComments)
+        data->tokens.removeComments();
+
+    name_it->second = data;
+    mImpl->mIdMap.emplace(fileId, data);
+    mData.emplace_back(data);
+
+    return {data, true};
 }
 
-static std::string getFileIdPath(const std::map<std::string, simplecpp::TokenList *> &filedata, const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader)
+std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get_private(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
 {
-    if (filedata.empty()) {
-        return "";
-    }
     if (isAbsolutePath(header)) {
-        const std::string simplifiedHeaderPath = simplecpp::simplifyPath(header);
-        const std::string match = findPathInMapBothRelativeAndAbsolute(filedata, simplifiedHeaderPath);
-        if (!match.empty()) {
-            return match;
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(header), nullptr);
+
+        if (ins.second) {
+            const auto ret = tryload(ins.first, dui, filenames, outputList);
+            if (ret.first != nullptr) {
+                return ret;
+            }
+        } else {
+            return {ins.first->second, false};
         }
+
+        return {nullptr, false};
     }
 
     if (!systemheader) {
-        const std::string relativeOrAbsoluteFilename = getRelativeFileName(sourcefile, header);// unknown if absolute or relative, but always simplified
-        const std::string match = findPathInMapBothRelativeAndAbsolute(filedata, relativeOrAbsoluteFilename);
-        if (!match.empty()) {
-            return match;
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(dirPath(sourcefile) + header), nullptr);
+
+        if (ins.second) {
+            const auto ret = tryload(ins.first, dui, filenames, outputList);
+            if (ret.first != nullptr) {
+                return ret;
+            }
+        } else if (ins.first->second != nullptr) {
+            return {ins.first->second, false};
         }
-    } else if (filedata.find(header) != filedata.end()) {
-        return header;// system header that its file is already in the filedata - return that as is
     }
 
-    for (std::list<std::string>::const_iterator it = dui.includePaths.begin(); it != dui.includePaths.end(); ++it) {
-        const std::string match = findPathInMapBothRelativeAndAbsolute(filedata, getIncludePathFileName(*it, header));
-        if (!match.empty()) {
-            return match;
+    for (const auto &includePath : dui.includePaths) {
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(includePath + "/" + header), nullptr);
+
+        if (ins.second) {
+            const auto ret = tryload(ins.first, dui, filenames, outputList);
+            if (ret.first != nullptr) {
+                return ret;
+            }
+        } else if (ins.first->second != nullptr) {
+            return {ins.first->second, false};
         }
     }
 
-    return "";
+    return {nullptr, false};
+}
+
+std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
+{
+    auto ret = get_private(sourcefile, header, dui, systemheader, filenames, outputList);
+
+    if (mLoadCallback && ret.first)
+        mLoadCallback(*ret.first, ret.second);
+
+    return ret;
 }
 
-static bool hasFile(const std::map<std::string, simplecpp::TokenList *> &filedata, const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader)
+void simplecpp::FileDataCache::clear()
 {
-    return !getFileIdPath(filedata, sourcefile, header, dui, systemheader).empty();
+    mImpl->clear();
+    mNameMap.clear();
+    mData.clear();
 }
 
-std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList)
+static bool getFileId(const std::string &path, FileID &id)
+{
+#ifdef _WIN32
+    HANDLE hFile = CreateFileA(path.c_str(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
+
+    if (hFile == INVALID_HANDLE_VALUE)
+        return false;
+
+    BOOL ret = GetFileInformationByHandleEx(hFile, FileIdInfo, &id.fileIdInfo, sizeof(id.fileIdInfo));
+    if (!ret) {
+        const DWORD err = GetLastError();
+        if (err == ERROR_INVALID_PARAMETER || // encountered when using a non-NTFS filesystem e.g. exFAT
+            err == ERROR_NOT_SUPPORTED) // encountered on Windows Server Core (used as a Docker container)
+        {
+            BY_HANDLE_FILE_INFORMATION fileInfo;
+            ret = GetFileInformationByHandle(hFile, &fileInfo);
+            if (ret) {
+                id.fileIdInfo.VolumeSerialNumber = static_cast<std::uint64_t>(fileInfo.dwVolumeSerialNumber);
+                id.fileIdInfo.FileId.IdentifierHi = static_cast<std::uint64_t>(fileInfo.nFileIndexHigh);
+                id.fileIdInfo.FileId.IdentifierLo = static_cast<std::uint64_t>(fileInfo.nFileIndexLow);
+            }
+        }
+    }
+
+    CloseHandle(hFile);
+
+    return ret == TRUE;
+#else
+    struct stat statbuf;
+
+    if (stat(path.c_str(), &statbuf) != 0)
+        return false;
+
+    id.dev = statbuf.st_dev;
+    id.ino = statbuf.st_ino;
+
+    return true;
+#endif
+}
+
+simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, FileDataCache cache)
 {
 #ifdef SIMPLECPP_WINDOWS
     if (dui.clearIncludeCache)
         nonExistingFilesCache.clear();
 #endif
 
-    std::map<std::string, simplecpp::TokenList*> ret;
-
     std::list<const Token *> filelist;
 
     // -include files
-    for (std::list<std::string>::const_iterator it = dui.includes.begin(); it != dui.includes.end(); ++it) {
-        const std::string &filename = realFilename(*it);
+    for (auto it = dui.includes.cbegin(); it != dui.includes.cend(); ++it) {
+        const std::string &filename = *it;
 
-        if (ret.find(filename) != ret.end())
-            continue;
+        const auto loadResult = cache.get("", filename, dui, false, filenames, outputList);
+        const bool loaded = loadResult.second;
+        FileData *const filedata = loadResult.first;
 
-        std::ifstream fin(filename.c_str());
-        if (!fin.is_open()) {
+        if (filedata == nullptr) {
             if (outputList) {
-                simplecpp::Output err(filenames);
-                err.type = simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND;
-                err.location = Location(filenames);
-                err.msg = "Can not open include file '" + filename + "' that is explicitly included.";
-                outputList->push_back(err);
+                simplecpp::Output err{
+                    simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND,
+                    {},
+                    "Can not open include file '" + filename + "' that is explicitly included."
+                };
+                outputList->emplace_back(std::move(err));
             }
             continue;
         }
-        fin.close();
 
-        TokenList *tokenlist = new TokenList(filename, filenames, outputList);
-        if (!tokenlist->front()) {
-            delete tokenlist;
+        if (!loaded)
+            continue;
+
+        if (!filedata->tokens.front())
             continue;
-        }
 
         if (dui.removeComments)
-            tokenlist->removeComments();
-        ret[filename] = tokenlist;
-        filelist.push_back(tokenlist->front());
+            filedata->tokens.removeComments();
+
+        filelist.emplace_back(filedata->tokens.front());
     }
 
     for (const Token *rawtok = rawtokens.cfront(); rawtok || !filelist.empty(); rawtok = rawtok ? rawtok->next : nullptr) {
@@ -3323,57 +3392,69 @@ std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::To
         if (!rawtok || rawtok->str() != INCLUDE)
             continue;
 
-        const std::string &sourcefile = rawtok->location.file();
+        const std::string &sourcefile = rawtokens.file(rawtok->location);
 
         const Token * const htok = rawtok->nextSkipComments();
         if (!sameline(rawtok, htok))
             continue;
 
         const bool systemheader = (htok->str()[0] == '<');
-        const std::string header(realFilename(htok->str().substr(1U, htok->str().size() - 2U)));
-        if (hasFile(ret, sourcefile, header, dui, systemheader))
+        const std::string header(htok->str().substr(1U, htok->str().size() - 2U));
+
+        const auto loadResult = cache.get(sourcefile, header, dui, systemheader, filenames, outputList);
+        const bool loaded = loadResult.second;
+
+        if (!loaded)
             continue;
 
-        std::ifstream f;
-        const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader);
-        if (!f.is_open())
+        FileData *const filedata = loadResult.first;
+
+        if (!filedata->tokens.front())
             continue;
-        f.close();
 
-        TokenList *tokens = new TokenList(header2, filenames, outputList);
         if (dui.removeComments)
-            tokens->removeComments();
-        ret[header2] = tokens;
-        if (tokens->front())
-            filelist.push_back(tokens->front());
+            filedata->tokens.removeComments();
+
+        filelist.emplace_back(filedata->tokens.front());
     }
 
-    return ret;
+    return cache;
 }
 
-static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token **tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList)
+static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token *&tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList, const simplecpp::DUI &dui)
 {
-    const simplecpp::Token * const tok = *tok1;
-    const simplecpp::MacroMap::const_iterator it = macros.find(tok->str());
+    const simplecpp::Token * const tok = tok1;
+    const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find(tok->str()) : macros.end();
     if (it != macros.end()) {
         simplecpp::TokenList value(files);
         try {
-            *tok1 = it->second.expand(&value, tok, macros, files);
-        } catch (simplecpp::Macro::Error &err) {
+            tok1 = it->second.expand(value, tok, macros, files);
+        } catch (const simplecpp::Macro::invalidDirectiveAsMacroParameter &err) {
             if (outputList) {
-                simplecpp::Output out(files);
-                out.type = simplecpp::Output::SYNTAX_ERROR;
-                out.location = err.location;
-                out.msg = "failed to expand \'" + tok->str() + "\', " + err.what;
-                outputList->push_back(out);
+                simplecpp::Output out{
+                    simplecpp::Output::DIRECTIVE_AS_MACRO_PARAMETER,
+                    err.location,
+                    "failed to expand \'" + tok->str() + "\', " + err.what
+                };
+                outputList->emplace_back(std::move(out));
+            }
+            return false;
+        } catch (const simplecpp::Macro::Error &err) {
+            if (outputList) {
+                simplecpp::Output out{
+                    simplecpp::Output::SYNTAX_ERROR,
+                    err.location,
+                    "failed to expand \'" + tok->str() + "\', " + err.what
+                };
+                outputList->emplace_back(std::move(out));
             }
             return false;
         }
         output.takeTokens(value);
     } else {
-        if (!tok->comment)
+        if (!tok->comment || !dui.removeComments)
             output.push_back(new simplecpp::Token(*tok));
-        *tok1 = tok->next;
+        tok1 = tok->next;
     }
     return true;
 }
@@ -3400,11 +3481,11 @@ static std::string getDateDefine(const struct tm *timep)
 static std::string getTimeDefine(const struct tm *timep)
 {
     char buf[] = "??:??:??";
-    strftime(buf, sizeof(buf), "%T", timep);
+    strftime(buf, sizeof(buf), "%H:%M:%S", timep);
     return std::string("\"").append(buf).append("\"");
 }
 
-void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, simplecpp::TokenList *> &filedata, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
+void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, simplecpp::FileDataCache &cache, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
 {
 #ifdef SIMPLECPP_WINDOWS
     if (dui.clearIncludeCache)
@@ -3414,20 +3495,20 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     std::map<std::string, std::size_t> sizeOfType(rawtokens.sizeOfType);
     sizeOfType.insert(std::make_pair("char", sizeof(char)));
     sizeOfType.insert(std::make_pair("short", sizeof(short)));
-    sizeOfType.insert(std::make_pair("short int", sizeOfType["short"]));
+    sizeOfType.insert(std::make_pair("short int", sizeof(short)));
     sizeOfType.insert(std::make_pair("int", sizeof(int)));
     sizeOfType.insert(std::make_pair("long", sizeof(long)));
-    sizeOfType.insert(std::make_pair("long int", sizeOfType["long"]));
+    sizeOfType.insert(std::make_pair("long int", sizeof(long)));
     sizeOfType.insert(std::make_pair("long long", sizeof(long long)));
     sizeOfType.insert(std::make_pair("float", sizeof(float)));
     sizeOfType.insert(std::make_pair("double", sizeof(double)));
     sizeOfType.insert(std::make_pair("long double", sizeof(long double)));
     sizeOfType.insert(std::make_pair("char *", sizeof(char *)));
     sizeOfType.insert(std::make_pair("short *", sizeof(short *)));
-    sizeOfType.insert(std::make_pair("short int *", sizeOfType["short *"]));
+    sizeOfType.insert(std::make_pair("short int *", sizeof(short *)));
     sizeOfType.insert(std::make_pair("int *", sizeof(int *)));
     sizeOfType.insert(std::make_pair("long *", sizeof(long *)));
-    sizeOfType.insert(std::make_pair("long int *", sizeOfType["long *"]));
+    sizeOfType.insert(std::make_pair("long int *", sizeof(long *)));
     sizeOfType.insert(std::make_pair("long long *", sizeof(long long *)));
     sizeOfType.insert(std::make_pair("float *", sizeof(float *)));
     sizeOfType.insert(std::make_pair("double *", sizeof(double *)));
@@ -3436,25 +3517,56 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     // use a dummy vector for the macros because as this is not part of the file and would add an empty entry - e.g. /usr/include/poll.h
     std::vector<std::string> dummy;
 
-    const bool hasInclude = isCpp17OrLater(dui);
+    const bool hasInclude = isCpp17OrLater(dui) || isGnu(dui);
     MacroMap macros;
-    for (std::list<std::string>::const_iterator it = dui.defines.begin(); it != dui.defines.end(); ++it) {
+    bool strictAnsiDefined = false;
+    for (auto it = dui.defines.cbegin(); it != dui.defines.cend(); ++it) {
         const std::string &macrostr = *it;
         const std::string::size_type eq = macrostr.find('=');
         const std::string::size_type par = macrostr.find('(');
         const std::string macroname = macrostr.substr(0, std::min(eq,par));
+        if (macroname == "__STRICT_ANSI__")
+            strictAnsiDefined = true;
         if (dui.undefined.find(macroname) != dui.undefined.end())
             continue;
         const std::string lhs(macrostr.substr(0,eq));
         const std::string rhs(eq==std::string::npos ? std::string("1") : macrostr.substr(eq+1));
-        const Macro macro(lhs, rhs, dummy);
-        macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
+        try {
+            const Macro macro(lhs, rhs, dummy);
+            macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
+        } catch (const std::runtime_error& e) {
+            if (outputList) {
+                simplecpp::Output err{
+                    Output::DUI_ERROR,
+                    {},
+                    e.what()
+                };
+                outputList->emplace_back(std::move(err));
+            }
+            output.clear();
+            return;
+        } catch (const simplecpp::Macro::Error& e) {
+            if (outputList) {
+                simplecpp::Output err{
+                    Output::DUI_ERROR,
+                    {},
+                    e.what
+                };
+                outputList->emplace_back(std::move(err));
+            }
+            output.clear();
+            return;
+        }
     }
 
+    const bool strictAnsiUndefined = dui.undefined.find("__STRICT_ANSI__") != dui.undefined.cend();
+    if (!isGnu(dui) && !strictAnsiDefined && !strictAnsiUndefined)
+        macros.insert(std::pair<TokenString, Macro>("__STRICT_ANSI__", Macro("__STRICT_ANSI__", "1", dummy)));
+
     macros.insert(std::make_pair("__FILE__", Macro("__FILE__", "__FILE__", dummy)));
     macros.insert(std::make_pair("__LINE__", Macro("__LINE__", "__LINE__", dummy)));
     macros.insert(std::make_pair("__COUNTER__", Macro("__COUNTER__", "__COUNTER__", dummy)));
-    struct tm ltime = {};
+    struct tm ltime {};
     getLocaltime(ltime);
     macros.insert(std::make_pair("__DATE__", Macro("__DATE__", getDateDefine(&ltime), dummy)));
     macros.insert(std::make_pair("__TIME__", Macro("__TIME__", getTimeDefine(&ltime), dummy)));
@@ -3469,10 +3581,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             const cppstd_t cpp_std = simplecpp::getCppStd(dui.std);
             if (cpp_std == CPPUnknown) {
                 if (outputList) {
-                    simplecpp::Output err(files);
-                    err.type = Output::DUI_ERROR;
-                    err.msg = "unknown standard specified: '" + dui.std + "'";
-                    outputList->push_back(err);
+                    simplecpp::Output err{
+                        Output::DUI_ERROR,
+                        {},
+                        "unknown standard specified: '" + dui.std + "'"
+                    };
+                    outputList->emplace_back(std::move(err));
                 }
                 output.clear();
                 return;
@@ -3486,8 +3600,9 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     // True => code in current #if block should be kept
     // ElseIsTrue => code in current #if block should be dropped. the code in the #else should be kept.
     // AlwaysFalse => drop all code in #if and #else
-    enum IfState { True, ElseIsTrue, AlwaysFalse };
+    enum IfState : std::uint8_t { True, ElseIsTrue, AlwaysFalse };
     std::stack<int> ifstates;
+    std::stack<const Token *> iftokens;
     ifstates.push(True);
 
     std::stack<const Token *> includetokenstack;
@@ -3495,13 +3610,24 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     std::set<std::string> pragmaOnce;
 
     includetokenstack.push(rawtokens.cfront());
-    for (std::list<std::string>::const_iterator it = dui.includes.begin(); it != dui.includes.end(); ++it) {
-        const std::map<std::string, TokenList*>::const_iterator f = filedata.find(*it);
-        if (f != filedata.end())
-            includetokenstack.push(f->second->cfront());
+    for (auto it = dui.includes.cbegin(); it != dui.includes.cend(); ++it) {
+        const FileData *const filedata = cache.get("", *it, dui, false, files, outputList).first;
+        if (filedata == nullptr) {
+            if (outputList) {
+                simplecpp::Output err{
+                    simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND,
+                    {},
+                    "Can not open include file '" + *it + "' that is explicitly included."
+                };
+                outputList->emplace_back(std::move(err));
+            }
+        }
+        else if (filedata->tokens.cfront() != nullptr) {
+            includetokenstack.push(filedata->tokens.cfront());
+        }
     }
 
-    std::map<std::string, std::list<Location> > maybeUsedMacros;
+    std::map<std::string, std::list<Location>> maybeUsedMacros;
 
     for (const Token *rawtok = nullptr; rawtok || !includetokenstack.empty();) {
         if (rawtok == nullptr) {
@@ -3521,13 +3647,16 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 continue;
             }
 
-            if (ifstates.size() <= 1U && (rawtok->str() == ELIF || rawtok->str() == ELSE || rawtok->str() == ENDIF)) {
+            if (ifstates.size() <= 1U && (rawtok->str() == ELIF || rawtok->str() == ELIFDEF ||
+                                          rawtok->str() == ELIFNDEF || rawtok->str() == ELSE ||
+                                          rawtok->str() == ENDIF)) {
                 if (outputList) {
-                    simplecpp::Output err(files);
-                    err.type = Output::SYNTAX_ERROR;
-                    err.location = rawtok->location;
-                    err.msg = "#" + rawtok->str() + " without #if";
-                    outputList->push_back(err);
+                    simplecpp::Output err{
+                        Output::SYNTAX_ERROR,
+                        rawtok->location,
+                        "#" + rawtok->str() + " without #if"
+                    };
+                    outputList->emplace_back(std::move(err));
                 }
                 output.clear();
                 return;
@@ -3535,16 +3664,20 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
 
             if (ifstates.top() == True && (rawtok->str() == ERROR || rawtok->str() == WARNING)) {
                 if (outputList) {
-                    simplecpp::Output err(rawtok->location.files);
-                    err.type = rawtok->str() == ERROR ? Output::ERROR : Output::WARNING;
-                    err.location = rawtok->location;
+                    std::string msg;
                     for (const Token *tok = rawtok->next; tok && sameline(rawtok,tok); tok = tok->next) {
-                        if (!err.msg.empty() && isNameChar(tok->str()[0]))
-                            err.msg += ' ';
-                        err.msg += tok->str();
+                        if (!msg.empty() && isNameChar(tok->str()[0]))
+                            msg += ' ';
+                        msg += tok->str();
                     }
-                    err.msg = '#' + rawtok->str() + ' ' + err.msg;
-                    outputList->push_back(err);
+                    msg = '#' + rawtok->str() + ' ' + msg;
+                    simplecpp::Output err{
+                        rawtok->str() == ERROR ? Output::ERROR : Output::WARNING,
+                        rawtok->location,
+                        std::move(msg)
+                    };
+
+                    outputList->emplace_back(std::move(err));
                 }
                 if (rawtok->str() == ERROR) {
                     output.clear();
@@ -3564,13 +3697,25 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         else
                             it->second = macro;
                     }
-                } catch (const std::runtime_error &) {
+                } catch (const std::runtime_error &err) {
+                    if (outputList) {
+                        simplecpp::Output out{
+                            Output::SYNTAX_ERROR,
+                            rawtok->location,
+                            std::string("Failed to parse #define, ") + err.what()
+                        };
+                        outputList->emplace_back(std::move(out));
+                    }
+                    output.clear();
+                    return;
+                } catch (const simplecpp::Macro::Error &err) {
                     if (outputList) {
-                        simplecpp::Output err(files);
-                        err.type = Output::SYNTAX_ERROR;
-                        err.location = rawtok->location;
-                        err.msg = "Failed to parse #define";
-                        outputList->push_back(err);
+                        simplecpp::Output out{
+                            simplecpp::Output::SYNTAX_ERROR,
+                            err.location,
+                            "Failed to parse #define, " + err.what
+                        };
+                        outputList->emplace_back(std::move(out));
                     }
                     output.clear();
                     return;
@@ -3584,7 +3729,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 TokenList inc2(files);
                 if (!inc1.empty() && inc1.cfront()->name) {
                     const Token *inctok = inc1.cfront();
-                    if (!preprocessToken(inc2, &inctok, macros, files, outputList)) {
+                    if (!preprocessToken(inc2, inctok, macros, files, outputList, dui)) {
                         output.clear();
                         return;
                     }
@@ -3606,11 +3751,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
 
                 if (inc2.empty() || inc2.cfront()->str().size() <= 2U) {
                     if (outputList) {
-                        simplecpp::Output err(files);
-                        err.type = Output::SYNTAX_ERROR;
-                        err.location = rawtok->location;
-                        err.msg = "No header in #include";
-                        outputList->push_back(err);
+                        simplecpp::Output err{
+                            Output::SYNTAX_ERROR,
+                            rawtok->location,
+                            "No header in #include"
+                        };
+                        outputList->emplace_back(std::move(err));
                     }
                     output.clear();
                     return;
@@ -3619,64 +3765,69 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 const Token * const inctok = inc2.cfront();
 
                 const bool systemheader = (inctok->str()[0] == '<');
-                const std::string header(realFilename(inctok->str().substr(1U, inctok->str().size() - 2U)));
-                std::string header2 = getFileIdPath(filedata, rawtok->location.file(), header, dui, systemheader);
-                if (header2.empty()) {
-                    // try to load file..
-                    std::ifstream f;
-                    header2 = openHeader(f, dui, rawtok->location.file(), header, systemheader);
-                    if (f.is_open()) {
-                        f.close();
-                        TokenList * const tokens = new TokenList(header2, files, outputList);
-                        if (dui.removeComments)
-                            tokens->removeComments();
-                        filedata[header2] = tokens;
-                    }
-                }
-                if (header2.empty()) {
+                const std::string header(inctok->str().substr(1U, inctok->str().size() - 2U));
+                const FileData *const filedata = cache.get(rawtokens.file(rawtok->location), header, dui, systemheader, files, outputList).first;
+                if (filedata == nullptr) {
                     if (outputList) {
-                        simplecpp::Output out(files);
-                        out.type = Output::MISSING_HEADER;
-                        out.location = rawtok->location;
-                        out.msg = "Header not found: " + inctok->str();
-                        outputList->push_back(out);
+                        simplecpp::Output out{
+                            simplecpp::Output::MISSING_HEADER,
+                            rawtok->location,
+                            "Header not found: " + inctok->str()
+                        };
+                        outputList->emplace_back(std::move(out));
                     }
                 } else if (includetokenstack.size() >= 400) {
                     if (outputList) {
-                        simplecpp::Output out(files);
-                        out.type = Output::INCLUDE_NESTED_TOO_DEEPLY;
-                        out.location = rawtok->location;
-                        out.msg = "#include nested too deeply";
-                        outputList->push_back(out);
+                        simplecpp::Output out{
+                            simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY,
+                            rawtok->location,
+                            "#include nested too deeply"
+                        };
+                        outputList->emplace_back(std::move(out));
                     }
-                } else if (pragmaOnce.find(header2) == pragmaOnce.end()) {
+                } else if (pragmaOnce.find(filedata->filename) == pragmaOnce.end()) {
                     includetokenstack.push(gotoNextLine(rawtok));
-                    const TokenList * const includetokens = filedata.find(header2)->second;
-                    rawtok = includetokens ? includetokens->cfront() : nullptr;
+                    rawtok = filedata->tokens.cfront();
                     continue;
                 }
-            } else if (rawtok->str() == IF || rawtok->str() == IFDEF || rawtok->str() == IFNDEF || rawtok->str() == ELIF) {
+            } else if (rawtok->str() == IF || rawtok->str() == IFDEF || rawtok->str() == IFNDEF || rawtok->str() == ELIF ||
+                       rawtok->str() == ELIFDEF || rawtok->str() == ELIFNDEF) {
                 if (!sameline(rawtok,rawtok->next)) {
                     if (outputList) {
-                        simplecpp::Output out(files);
-                        out.type = Output::SYNTAX_ERROR;
-                        out.location = rawtok->location;
-                        out.msg = "Syntax error in #" + rawtok->str();
-                        outputList->push_back(out);
+                        simplecpp::Output out{
+                            simplecpp::Output::SYNTAX_ERROR,
+                            rawtok->location,
+                            "Syntax error in #" + rawtok->str()
+                        };
+                        outputList->emplace_back(std::move(out));
                     }
                     output.clear();
                     return;
                 }
 
                 bool conditionIsTrue;
-                if (ifstates.top() == AlwaysFalse || (ifstates.top() == ElseIsTrue && rawtok->str() != ELIF))
+                if (ifstates.top() == AlwaysFalse || (ifstates.top() == ElseIsTrue && rawtok->str() != ELIF &&
+                                                      rawtok->str() != ELIFDEF && rawtok->str() != ELIFNDEF)) {
                     conditionIsTrue = false;
-                else if (rawtok->str() == IFDEF) {
-                    conditionIsTrue = (macros.find(rawtok->next->str()) != macros.end() || (hasInclude && rawtok->next->str() == HAS_INCLUDE));
-                    maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
-                } else if (rawtok->str() == IFNDEF) {
-                    conditionIsTrue = (macros.find(rawtok->next->str()) == macros.end() && !(hasInclude && rawtok->next->str() == HAS_INCLUDE));
-                    maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
+                }
+                else if (rawtok->str() == IFDEF || rawtok->str() == ELIFDEF) {
+                    const std::string &name = rawtok->next->str();
+                    conditionIsTrue = (macros.find(name) != macros.end() || (hasInclude && name == HAS_INCLUDE));
+                    maybeUsedMacros[name].emplace_back(rawtok->next->location);
+                    if (ifCond) {
+                        const std::string E = conditionIsTrue ? "1" : "0";
+                        const long long result = conditionIsTrue ? 1 : 0;
+                        ifCond->emplace_back(rawtok->location, E, result);
+                    }
+                } else if (rawtok->str() == IFNDEF || rawtok->str() == ELIFNDEF) {
+                    const std::string &name = rawtok->next->str();
+                    conditionIsTrue = (macros.find(name) == macros.end() && !(hasInclude && name == HAS_INCLUDE));
+                    maybeUsedMacros[name].emplace_back(rawtok->next->location);
+                    if (ifCond) {
+                        const std::string E = conditionIsTrue ? "1" : "0";
+                        const long long result = conditionIsTrue ? 1 : 0;
+                        ifCond->emplace_back(rawtok->location, E, result);
+                    }
                 } else { /*if (rawtok->str() == IF || rawtok->str() == ELIF)*/
                     TokenList expr(files);
                     for (const Token *tok = rawtok->next; tok && tok->location.sameline(rawtok->location); tok = tok->next) {
@@ -3690,7 +3841,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                             const bool par = (tok && tok->op == '(');
                             if (par)
                                 tok = tok->next;
-                            maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
+                            maybeUsedMacros[rawtok->next->str()].emplace_back(rawtok->next->location);
                             if (tok) {
                                 if (macros.find(tok->str()) != macros.end())
                                     expr.push_back(new Token("1", tok->location));
@@ -3703,11 +3854,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                 tok = tok ? tok->next : nullptr;
                             if (!tok || !sameline(rawtok,tok) || (par && tok->op != ')')) {
                                 if (outputList) {
-                                    Output out(rawtok->location.files);
-                                    out.type = Output::SYNTAX_ERROR;
-                                    out.location = rawtok->location;
-                                    out.msg = "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition";
-                                    outputList->push_back(out);
+                                    Output out{
+                                        Output::SYNTAX_ERROR,
+                                        rawtok->location,
+                                        "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition"
+                                    };
+                                    outputList->emplace_back(std::move(out));
                                 }
                                 output.clear();
                                 return;
@@ -3722,34 +3874,35 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                 tok = tok->next;
                             bool closingAngularBracket = false;
                             if (tok) {
-                                const std::string &sourcefile = rawtok->location.file();
-                                const bool systemheader = (tok && tok->op == '<');
+                                const std::string &sourcefile = rawtokens.file(rawtok->location);
+                                const bool systemheader = tok->op == '<';
                                 std::string header;
 
                                 if (systemheader) {
                                     while ((tok = tok->next) && tok->op != '>')
                                         header += tok->str();
-                                    // cppcheck-suppress selfAssignment - platform-dependent implementation
-                                    header = realFilename(header);
                                     if (tok && tok->op == '>')
                                         closingAngularBracket = true;
                                 } else {
-                                    header = realFilename(tok->str().substr(1U, tok->str().size() - 2U));
+                                    header = tok->str().substr(1U, tok->str().size() - 2U);
                                     closingAngularBracket = true;
                                 }
-                                std::ifstream f;
-                                const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader);
-                                expr.push_back(new Token(header2.empty() ? "0" : "1", tok->location));
+                                if (tok) {
+                                    std::ifstream f;
+                                    const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader);
+                                    expr.push_back(new Token(header2.empty() ? "0" : "1", tok->location));
+                                }
                             }
                             if (par)
                                 tok = tok ? tok->next : nullptr;
                             if (!tok || !sameline(rawtok,tok) || (par && tok->op != ')') || (!closingAngularBracket)) {
                                 if (outputList) {
-                                    Output out(rawtok->location.files);
-                                    out.type = Output::SYNTAX_ERROR;
-                                    out.location = rawtok->location;
-                                    out.msg = "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition";
-                                    outputList->push_back(out);
+                                    Output out{
+                                        Output::SYNTAX_ERROR,
+                                        rawtok->location,
+                                        "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition"
+                                    };
+                                    outputList->emplace_back(std::move(out));
                                 }
                                 output.clear();
                                 return;
@@ -3757,10 +3910,10 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                             continue;
                         }
 
-                        maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
+                        maybeUsedMacros[rawtok->next->str()].emplace_back(rawtok->next->location);
 
                         const Token *tmp = tok;
-                        if (!preprocessToken(expr, &tmp, macros, files, outputList)) {
+                        if (!preprocessToken(expr, tmp, macros, files, outputList, dui)) {
                             output.clear();
                             return;
                         }
@@ -3775,41 +3928,51 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                 E += (E.empty() ? "" : " ") + tok->str();
                             const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
-                            ifCond->push_back(IfCond(rawtok->location, E, result));
+                            ifCond->emplace_back(rawtok->location, E, result);
                         } else {
                             const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
                         }
-                    } catch (const std::exception &e) {
+                    } catch (const std::runtime_error &e) {
                         if (outputList) {
-                            Output out(rawtok->location.files);
-                            out.type = Output::SYNTAX_ERROR;
-                            out.location = rawtok->location;
-                            out.msg = "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition";
+                            std::string msg = "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition";
                             if (e.what() && *e.what())
-                                out.msg += std::string(", ") + e.what();
-                            outputList->push_back(out);
+                                msg += std::string(", ") + e.what();
+                            Output out{
+                                Output::SYNTAX_ERROR,
+                                rawtok->location,
+                                std::move(msg)
+                            };
+                            outputList->emplace_back(std::move(out));
                         }
                         output.clear();
                         return;
                     }
                 }
 
-                if (rawtok->str() != ELIF) {
+                if (rawtok->str() != ELIF && rawtok->str() != ELIFDEF && rawtok->str() != ELIFNDEF) {
                     // push a new ifstate..
                     if (ifstates.top() != True)
                         ifstates.push(AlwaysFalse);
                     else
                         ifstates.push(conditionIsTrue ? True : ElseIsTrue);
-                } else if (ifstates.top() == True) {
-                    ifstates.top() = AlwaysFalse;
-                } else if (ifstates.top() == ElseIsTrue && conditionIsTrue) {
-                    ifstates.top() = True;
+                    iftokens.push(rawtok);
+                } else {
+                    if (ifstates.top() == True)
+                        ifstates.top() = AlwaysFalse;
+                    else if (ifstates.top() == ElseIsTrue && conditionIsTrue)
+                        ifstates.top() = True;
+                    iftokens.top()->nextcond = rawtok;
+                    iftokens.top() = rawtok;
                 }
             } else if (rawtok->str() == ELSE) {
                 ifstates.top() = (ifstates.top() == ElseIsTrue) ? True : AlwaysFalse;
+                iftokens.top()->nextcond = rawtok;
+                iftokens.top() = rawtok;
             } else if (rawtok->str() == ENDIF) {
                 ifstates.pop();
+                iftokens.top()->nextcond = rawtok;
+                iftokens.pop();
             } else if (rawtok->str() == UNDEF) {
                 if (ifstates.top() == True) {
                     const Token *tok = rawtok->next;
@@ -3819,9 +3982,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         macros.erase(tok->str());
                 }
             } else if (ifstates.top() == True && rawtok->str() == PRAGMA && rawtok->next && rawtok->next->str() == ONCE && sameline(rawtok,rawtok->next)) {
-                pragmaOnce.insert(rawtok->location.file());
+                pragmaOnce.insert(rawtokens.file(rawtok->location));
             }
-            rawtok = gotoNextLine(rawtok);
+            if (ifstates.top() != True && rawtok->nextcond)
+                rawtok = rawtok->nextcond->previous;
+            else
+                rawtok = gotoNextLine(rawtok);
             continue;
         }
 
@@ -3845,7 +4011,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
         const Location loc(rawtok->location);
         TokenList tokens(files);
 
-        if (!preprocessToken(tokens, &rawtok, macros, files, outputList)) {
+        if (!preprocessToken(tokens, rawtok, macros, files, outputList, dui)) {
             output.clear();
             return;
         }
@@ -3872,38 +4038,52 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             const std::list<Location>& temp = maybeUsedMacros[macro.name()];
             usage.insert(usage.end(), temp.begin(), temp.end());
             for (std::list<Location>::const_iterator usageIt = usage.begin(); usageIt != usage.end(); ++usageIt) {
-                MacroUsage mu(usageIt->files, macro.valueDefinedInCode());
+                MacroUsage mu(macro.valueDefinedInCode());
                 mu.macroName = macro.name();
                 mu.macroLocation = macro.defineLocation();
                 mu.useLocation = *usageIt;
-                macroUsage->push_back(mu);
+                macroUsage->emplace_back(std::move(mu));
             }
         }
     }
 }
 
-void simplecpp::cleanup(std::map<std::string, TokenList*> &filedata)
+void simplecpp::cleanup(FileDataCache &cache)
 {
-    for (std::map<std::string, TokenList*>::iterator it = filedata.begin(); it != filedata.end(); ++it)
-        delete it->second;
-    filedata.clear();
+    cache.clear();
 }
 
 simplecpp::cstd_t simplecpp::getCStd(const std::string &std)
 {
     if (std == "c90" || std == "c89" || std == "iso9899:1990" || std == "iso9899:199409" || std == "gnu90" || std == "gnu89")
         return C89;
-    if (std == "c99" || std == "c9x" || std == "iso9899:1999" || std == "iso9899:199x" || std == "gnu99"|| std == "gnu9x")
+    if (std == "c99" || std == "c9x" || std == "iso9899:1999" || std == "iso9899:199x" || std == "gnu99" || std == "gnu9x")
         return C99;
     if (std == "c11" || std == "c1x" || std == "iso9899:2011" || std == "gnu11" || std == "gnu1x")
         return C11;
-    if (std == "c17" || std == "c18" || std == "iso9899:2017" || std == "iso9899:2018" || std == "gnu17"|| std == "gnu18")
+    if (std == "c17" || std == "c18" || std == "iso9899:2017" || std == "iso9899:2018" || std == "gnu17" || std == "gnu18")
         return C17;
     if (std == "c23" || std == "gnu23" || std == "c2x" || std == "gnu2x")
         return C23;
+    if (std == "c2y" || std == "gnu2y")
+        return C2Y;
     return CUnknown;
 }
 
+const char *simplecpp::getCStdName(cstd_t std)
+{
+    switch (std) {
+    case CUnknown: return "C";
+    case C89: return "C89";
+    case C99: return "C99";
+    case C11: return "C11";
+    case C17: return "C17";
+    case C23: return "C23";
+    case C2Y: return "C2Y";
+    }
+    return "";
+}
+
 std::string simplecpp::getCStdString(cstd_t std)
 {
     switch (std) {
@@ -3922,6 +4102,10 @@ std::string simplecpp::getCStdString(cstd_t std)
         // Clang 14, 15, 16, 17 return "202000L"
         // Clang 9, 10, 11, 12, 13, 14, 15, 16, 17 do not support "c23" and "gnu23"
         return "202311L";
+    case C2Y:
+        // supported by GCC 15+ and Clang 19+
+        // Clang 19, 20, 21, 22 return "202400L"
+        return "202500L";
     case CUnknown:
         return "";
     }
@@ -3952,6 +4136,21 @@ simplecpp::cppstd_t simplecpp::getCppStd(const std::string &std)
     return CPPUnknown;
 }
 
+const char *simplecpp::getCppStdName(cppstd_t std)
+{
+    switch (std) {
+    case CPPUnknown: return "C++";
+    case CPP03: return "C++03";
+    case CPP11: return "C++11";
+    case CPP14: return "C++14";
+    case CPP17: return "C++17";
+    case CPP20: return "C++20";
+    case CPP23: return "C++23";
+    case CPP26: return "C++26";
+    }
+    return "";
+}
+
 std::string simplecpp::getCppStdString(cppstd_t std)
 {
     switch (std) {
@@ -3973,7 +4172,7 @@ std::string simplecpp::getCppStdString(cppstd_t std)
         // Clang 17, 18 return "202302L"
         return "202302L";
     case CPP26:
-        // supported by Clang 17+
+        // supported by GCC 14+ and Clang 17+
         return "202400L";
     case CPPUnknown:
         return "";
@@ -3985,7 +4184,3 @@ std::string simplecpp::getCppStdString(const std::string &std)
 {
     return getCppStdString(getCppStd(std));
 }
-
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#undef nullptr
-#endif
diff --git a/externals/simplecpp/simplecpp.h b/externals/simplecpp/simplecpp.h
old mode 100755
new mode 100644
index f5c69593cb1..f4dca18374a
--- a/externals/simplecpp/simplecpp.h
+++ b/externals/simplecpp/simplecpp.h
@@ -7,13 +7,28 @@
 #define simplecppH
 
 #include <cctype>
+#include <cstdint>
 #include <cstring>
+#include <functional>
 #include <iosfwd>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
+#include <unordered_map>
+#include <utility>
 #include <vector>
+#if __cplusplus >= 202002L
+#  include <version>
+#endif
+
+#if defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
+#include <string_view>
+#endif
+#ifdef __cpp_lib_span
+#include <span>
+#endif
 
 #ifdef _WIN32
 #  ifdef SIMPLECPP_EXPORT
@@ -27,10 +42,6 @@
 #  define SIMPLECPP_LIB
 #endif
 
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#define nullptr NULL
-#endif
-
 #if defined(_MSC_VER)
 #  pragma warning(push)
 // suppress warnings about "conversion from 'type1' to 'type2', possible loss of data"
@@ -38,33 +49,89 @@
 #  pragma warning(disable : 4244)
 #endif
 
+// provide legacy (i.e. raw pointer) API for TokenList
+// note: std::istream has an overhead compared to raw pointers
+#ifndef SIMPLECPP_TOKENLIST_ALLOW_PTR
+// still provide the legacy API in case we lack the performant wrappers
+#  if !defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
+#    define SIMPLECPP_TOKENLIST_ALLOW_PTR 1
+#  else
+#    define SIMPLECPP_TOKENLIST_ALLOW_PTR 0
+#  endif
+#endif
+
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 9
+// Hack to workaround GCC bug.
+// Details: https://trac.cppcheck.net/ticket/14850
+// seen on g++ before 10.x
+#define  SIMPLECPP_NOEXCEPT
+#else
+#define  SIMPLECPP_NOEXCEPT  noexcept
+#endif
+
 namespace simplecpp {
     /** C code standard */
-    enum cstd_t { CUnknown=-1, C89, C99, C11, C17, C23 };
+    enum cstd_t : std::int8_t { CUnknown=-1, C89, C99, C11, C17, C23, C2Y };
 
     /** C++ code standard */
-    enum cppstd_t { CPPUnknown=-1, CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26 };
+    enum cppstd_t : std::int8_t { CPPUnknown=-1, CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26 };
+
+    using TokenString = std::string;
+
+#if defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
+    using View = std::string_view;
+#else
+    struct View
+    {
+        // cppcheck-suppress noExplicitConstructor
+        View(const char* data)
+            : mData(data)
+            , mSize(strlen(data))
+        {}
+
+        // only provide when std::span is not available so using untyped initialization won't use View
+#if !defined(__cpp_lib_span)
+        View(const char* data, std::size_t size)
+            : mData(data)
+            , mSize(size)
+        {}
+
+        // cppcheck-suppress noExplicitConstructor
+        View(const std::string& str)
+            : mData(str.data())
+            , mSize(str.size())
+        {}
+#endif // !defined(__cpp_lib_span)
+
+        const char* data() const {
+            return mData;
+        }
+
+        std::size_t size() const {
+            return mSize;
+        }
+
+    private:
+        const char* mData;
+        std::size_t mSize;
+    };
+#endif // defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
 
-    typedef std::string TokenString;
     class Macro;
 
     /**
      * Location in source code
      */
-    class SIMPLECPP_LIB Location {
-    public:
-        explicit Location(const std::vector<std::string> &f) : files(f), fileIndex(0), line(1U), col(0U) {}
-
-        Location(const Location &loc) : files(loc.files), fileIndex(loc.fileIndex), line(loc.line), col(loc.col) {}
+    struct SIMPLECPP_LIB Location {
+        Location() = default;
+        Location(unsigned int fileIndex, unsigned int line, unsigned int col)
+            : fileIndex(fileIndex)
+            , line(line)
+            , col(col)
+        {}
 
-        Location &operator=(const Location &other) {
-            if (this != &other) {
-                fileIndex = other.fileIndex;
-                line = other.line;
-                col  = other.col;
-            }
-            return *this;
-        }
+        Location(const Location &loc) = default;
+        Location &operator=(const Location &other) = default;
 
         /** increment this location by string */
         void adjust(const std::string &str);
@@ -81,16 +148,9 @@ namespace simplecpp {
             return fileIndex == other.fileIndex && line == other.line;
         }
 
-        const std::string& file() const {
-            return fileIndex < files.size() ? files[fileIndex] : emptyFileName;
-        }
-
-        const std::vector<std::string> &files;
-        unsigned int fileIndex;
-        unsigned int line;
-        unsigned int col;
-    private:
-        static const std::string emptyFileName;
+        unsigned int fileIndex{};
+        unsigned int line{};
+        unsigned int col{};
     };
 
     /**
@@ -100,21 +160,14 @@ namespace simplecpp {
     class SIMPLECPP_LIB Token {
     public:
         Token(const TokenString &s, const Location &loc, bool wsahead = false) :
-            whitespaceahead(wsahead), location(loc), previous(nullptr), next(nullptr), string(s) {
+            whitespaceahead(wsahead), location(loc), string(s) {
             flags();
         }
 
         Token(const Token &tok) :
-            macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), whitespaceahead(tok.whitespaceahead), location(tok.location), previous(nullptr), next(nullptr), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {
-        }
+            macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), whitespaceahead(tok.whitespaceahead), location(tok.location), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {}
 
-        void flags() {
-            name = (std::isalpha(static_cast<unsigned char>(string[0])) || string[0] == '_' || string[0] == '$')
-                   && (std::memchr(string.c_str(), '\'', string.size()) == nullptr);
-            comment = string.size() > 1U && string[0] == '/' && (string[1] == '/' || string[1] == '*');
-            number = isNumberLike(string);
-            op = (string.size() == 1U && !name && !comment && !number) ? string[0] : '\0';
-        }
+        Token &operator=(const Token &tok) = delete;
 
         const TokenString& str() const {
             return string;
@@ -127,9 +180,9 @@ namespace simplecpp {
         bool isOneOf(const char ops[]) const;
         bool startsWithOneOf(const char c[]) const;
         bool endsWithOneOf(const char c[]) const;
-        static bool isNumberLike(const std::string& str) {
-            return std::isdigit(static_cast<unsigned char>(str[0])) ||
-                   (str.size() > 1U && (str[0] == '-' || str[0] == '+') && std::isdigit(static_cast<unsigned char>(str[1])));
+        static bool isNumberLike(const std::string& s) {
+            return std::isdigit(static_cast<unsigned char>(s[0])) ||
+                   (s.size() > 1U && (s[0] == '-' || s[0] == '+') && std::isdigit(static_cast<unsigned char>(s[1])));
         }
 
         TokenString macro;
@@ -139,8 +192,9 @@ namespace simplecpp {
         bool number;
         bool whitespaceahead;
         Location location;
-        Token *previous;
-        Token *next;
+        Token *previous{};
+        Token *next{};
+        mutable const Token *nextcond{};
 
         const Token *previousSkipComments() const {
             const Token *tok = this->previous;
@@ -165,39 +219,64 @@ namespace simplecpp {
         bool isExpandedFrom(const Macro* m) const {
             return mExpandedFrom.find(m) != mExpandedFrom.end();
         }
+        void markExpandedFrom(const Macro* m) {
+            mExpandedFrom.insert(m);
+        }
 
         void printAll() const;
         void printOut() const;
     private:
+        void flags() {
+            name = (std::isalpha(static_cast<unsigned char>(string[0])) || string[0] == '_' || string[0] == '$')
+                   && (std::memchr(string.c_str(), '\'', string.size()) == nullptr);
+            comment = string.size() > 1U && string[0] == '/' && (string[1] == '/' || string[1] == '*');
+            number = isNumberLike(string);
+            op = (string.size() == 1U && !name && !comment && !number) ? string[0] : '\0';
+        }
+
         TokenString string;
 
         std::set<const Macro*> mExpandedFrom;
-
-        // Not implemented - prevent assignment
-        Token &operator=(const Token &tok);
     };
 
     /** Output from preprocessor */
     struct SIMPLECPP_LIB Output {
-        explicit Output(const std::vector<std::string> &files) : type(ERROR), location(files) {}
-        enum Type {
+        enum Type : std::uint8_t {
             ERROR, /* #error */
             WARNING, /* #warning */
             MISSING_HEADER,
             INCLUDE_NESTED_TOO_DEEPLY,
             SYNTAX_ERROR,
+            DIRECTIVE_AS_MACRO_PARAMETER,
             PORTABILITY_BACKSLASH,
+            PORTABILITY_LINE_DIRECTIVE,
+            PORTABILITY_NO_EOF_NEWLINE,
             UNHANDLED_CHAR_ERROR,
             EXPLICIT_INCLUDE_NOT_FOUND,
             FILE_NOT_FOUND,
             DUI_ERROR
         } type;
-        explicit Output(const std::vector<std::string>& files, Type type, const std::string& msg) : type(type), location(files), msg(msg) {}
+        Output(Type type, const Location& loc, std::string msg) : type(type), location(loc), msg(std::move(msg)) {}
         Location location;
         std::string msg;
     };
 
-    typedef std::list<Output> OutputList;
+    using OutputList = std::list<Output>;
+
+    /**
+     * Command line preprocessor settings.
+     * On the command line these are configured by -D, -U, -I, --include, -std
+     */
+    struct SIMPLECPP_LIB DUI {
+        DUI() = default;
+        std::list<std::string> defines;
+        std::set<std::string> undefined;
+        std::list<std::string> includePaths;
+        std::list<std::string> includes;
+        std::string std;
+        bool clearIncludeCache{};
+        bool removeComments{}; /** remove comment tokens from included files */
+    };
 
     /** List of tokens. */
     class SIMPLECPP_LIB TokenList {
@@ -206,22 +285,50 @@ namespace simplecpp {
 
         explicit TokenList(std::vector<std::string> &filenames);
         /** generates a token list from the given std::istream parameter */
-        TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr);
+        /** generates a token list from the given buffer */
+        template<size_t size>
+        TokenList(const char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data), size-1, filenames, filename, dui, outputList, 0)
+        {}
+        /** generates a token list from the given buffer */
+        template<size_t size>
+        TokenList(const unsigned char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(data, size-1, filenames, filename, dui, outputList, 0)
+        {}
+#if SIMPLECPP_TOKENLIST_ALLOW_PTR
         /** generates a token list from the given buffer */
-        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(data, size, filenames, filename, dui, outputList, 0)
+        {}
+        /** generates a token list from the given buffer */
+        TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data), size, filenames, filename, dui, outputList, 0)
+        {}
+#endif // SIMPLECPP_TOKENLIST_ALLOW_PTR
+        /** generates a token list from the given buffer */
+        TokenList(View data, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, dui, outputList, 0)
+        {}
+#ifdef __cpp_lib_span
+        /** generates a token list from the given buffer */
+        TokenList(std::span<const char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, dui, outputList, 0)
+        {}
+
         /** generates a token list from the given buffer */
-        TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        TokenList(std::span<const unsigned char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr)
+            : TokenList(data.data(), data.size(), filenames, filename, dui, outputList, 0)
+        {}
+#endif // __cpp_lib_span
+
         /** generates a token list from the given filename parameter */
-        TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList = nullptr);
+        TokenList(const std::string &filename, std::vector<std::string> &filenames, const DUI &dui = {}, OutputList *outputList = nullptr);
         TokenList(const TokenList &other);
-#if __cplusplus >= 201103L
         TokenList(TokenList &&other);
-#endif
         ~TokenList();
         TokenList &operator=(const TokenList &other);
-#if __cplusplus >= 201103L
         TokenList &operator=(TokenList &&other);
-#endif
 
         void clear();
         bool empty() const {
@@ -229,10 +336,14 @@ namespace simplecpp {
         }
         void push_back(Token *tok);
 
-        void dump() const;
-        std::string stringify() const;
+        void dump(bool linenrs = false) const;
+        std::string stringify(bool linenrs = false) const;
 
-        void readfile(Stream &stream, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        void readfile(Stream &stream, const std::string &filename=std::string(), const DUI &dui = {}, OutputList *outputList = nullptr);
+        /**
+         * @throws std::overflow_error thrown on overflow or division by zero
+         * @throws std::runtime_error thrown on invalid expressions
+         */
         void constFold();
 
         void removeComments();
@@ -289,24 +400,33 @@ namespace simplecpp {
             return files;
         }
 
+        const std::string& file(const Location& loc) const;
+
     private:
+        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, const DUI &dui, OutputList *outputList, int /*unused*/);
+
         void combineOperators();
 
         void constFoldUnaryNotPosNeg(Token *tok);
+        /**
+         * @throws std::overflow_error thrown on overflow or division by zero
+         */
         void constFoldMulDivRem(Token *tok);
         void constFoldAddSub(Token *tok);
         void constFoldShift(Token *tok);
         void constFoldComparison(Token *tok);
         void constFoldBitwise(Token *tok);
         void constFoldLogicalOp(Token *tok);
-        void constFoldQuestionOp(Token **tok1);
+        /**
+         * @throws std::runtime_error thrown on invalid expressions
+         */
+        void constFoldQuestionOp(Token *&tok1);
 
         std::string readUntil(Stream &stream, const Location &location, char start, char end, OutputList *outputList);
-        void lineDirective(unsigned int fileIndex, unsigned int line, Location *location);
+        void lineDirective(unsigned int fileIndex_, unsigned int line, Location &location);
 
-        std::string lastLine(int maxsize=1000) const;
         const Token* lastLineTok(int maxsize=1000) const;
-        bool isLastLinePreprocessor(int maxsize=1000) const;
+        const Token* isLastLinePreprocessor(int maxsize=1000) const;
 
         unsigned int fileIndex(const std::string &filename);
 
@@ -317,11 +437,11 @@ namespace simplecpp {
 
     /** Tracking how macros are used */
     struct SIMPLECPP_LIB MacroUsage {
-        explicit MacroUsage(const std::vector<std::string> &f, bool macroValueKnown_) : macroLocation(f), useLocation(f), macroValueKnown(macroValueKnown_) {}
+        explicit MacroUsage(bool macroValueKnown_) : macroValueKnown(macroValueKnown_) {}
         std::string macroName;
-        Location    macroLocation;
-        Location    useLocation;
-        bool        macroValueKnown;
+        Location macroLocation;
+        Location useLocation;
+        bool macroValueKnown;
     };
 
     /** Tracking #if/#elif expressions */
@@ -332,24 +452,116 @@ namespace simplecpp {
         long long result; // condition result
     };
 
-    /**
-     * Command line preprocessor settings.
-     * On the command line these are configured by -D, -U, -I, --include, -std
-     */
-    struct SIMPLECPP_LIB DUI {
-        DUI() : clearIncludeCache(false), removeComments(false) {}
-        std::list<std::string> defines;
-        std::set<std::string> undefined;
-        std::list<std::string> includePaths;
-        std::list<std::string> includes;
-        std::string std;
-        bool clearIncludeCache;
-        bool removeComments; /** remove comment tokens from included files */
+    struct SIMPLECPP_LIB FileData {
+        /** The canonical filename associated with this data */
+        std::string filename;
+        /** The tokens associated with this file */
+        TokenList tokens;
     };
 
+    class SIMPLECPP_LIB FileDataCache {
+    public:
+        FileDataCache();
+        ~FileDataCache();
+
+        FileDataCache(const FileDataCache &) = delete;
+        FileDataCache(FileDataCache &&) SIMPLECPP_NOEXCEPT;
+
+        FileDataCache &operator=(const FileDataCache &) = delete;
+        FileDataCache &operator=(FileDataCache &&) SIMPLECPP_NOEXCEPT;
+
+        /** Get the cached data for a file, or load and then return it if it isn't cached.
+         *  returns the file data and true if the file was loaded, false if it was cached. */
+        std::pair<FileData *, bool> get(const std::string &sourcefile, const std::string &header, const DUI &dui, bool systemheader, std::vector<std::string> &filenames, OutputList *outputList);
+
+        void insert(FileData data) {
+            // NOLINTNEXTLINE(misc-const-correctness) - FP
+            auto *const newdata = new FileData(std::move(data));
+
+            mData.emplace_back(newdata);
+            mNameMap.emplace(newdata->filename, newdata);
+        }
+
+        void clear();
+
+        using container_type = std::vector<std::unique_ptr<FileData>>;
+        using iterator = container_type::iterator;
+        using const_iterator = container_type::const_iterator;
+        using size_type = container_type::size_type;
+
+        size_type size() const {
+            return mData.size();
+        }
+        iterator begin() {
+            return mData.begin();
+        }
+        iterator end() {
+            return mData.end();
+        }
+        const_iterator begin() const {
+            return mData.begin();
+        }
+        const_iterator end() const {
+            return mData.end();
+        }
+        const_iterator cbegin() const {
+            return mData.cbegin();
+        }
+        const_iterator cend() const {
+            return mData.cend();
+        }
+
+        using load_callback_type = std::function<void (FileData &, bool)>;
+
+        void set_load_callback(load_callback_type cb) {
+            mLoadCallback = std::move(cb);
+        }
+
+    private:
+        struct Impl;
+        std::unique_ptr<Impl> mImpl;
+
+        using name_map_type = std::unordered_map<std::string, FileData *>;
+
+        std::pair<FileData *, bool> tryload(name_map_type::iterator &name_it, const DUI &dui, std::vector<std::string> &filenames, OutputList *outputList);
+        std::pair<FileData *, bool> get_private(const std::string &sourcefile, const std::string &header, const DUI &dui, bool systemheader, std::vector<std::string> &filenames, OutputList *outputList);
+
+        container_type mData;
+        name_map_type mNameMap;
+        load_callback_type mLoadCallback;
+    };
+
+    /** Converts character literal (including prefix, but not ud-suffix) to long long value.
+     *
+     * Assumes ASCII-compatible single-byte encoded str for narrow literals
+     * and UTF-8 otherwise.
+     *
+     * For target assumes
+     * - execution character set encoding matching str
+     * - UTF-32 execution wide-character set encoding
+     * - requirements for __STDC_UTF_16__, __STDC_UTF_32__ and __STDC_ISO_10646__ satisfied
+     * - char16_t is 16bit wide
+     * - char32_t is 32bit wide
+     * - wchar_t is 32bit wide and unsigned
+     * - matching char signedness to host
+     * - matching sizeof(int) to host
+     *
+     * For host assumes
+     * - ASCII-compatible execution character set
+     *
+     * For host and target assumes
+     * - CHAR_BIT == 8
+     * - two's complement
+     *
+     * Implements multi-character narrow literals according to GCC's behavior,
+     * except multi code unit universal character names are not supported.
+     * Multi-character wide literals are not supported.
+     * Limited support of universal character names for non-UTF-8 execution character set encodings.
+     * @throws std::runtime_error thrown on invalid literal
+     */
     SIMPLECPP_LIB long long characterLiteralToLL(const std::string& str);
 
-    SIMPLECPP_LIB std::map<std::string, TokenList*> load(const TokenList &rawtokens, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList = nullptr);
+    SIMPLECPP_LIB FileDataCache load(const TokenList &rawtokens, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList = nullptr, FileDataCache cache = {});
 
     /**
      * Preprocess
@@ -357,18 +569,18 @@ namespace simplecpp {
      * @param output TokenList that receives the preprocessing output
      * @param rawtokens Raw tokenlist for top sourcefile
      * @param files internal data of simplecpp
-     * @param filedata output from simplecpp::load()
+     * @param cache output from simplecpp::load()
      * @param dui defines, undefs, and include paths
      * @param outputList output: list that will receive output messages
      * @param macroUsage output: macro usage
      * @param ifCond output: #if/#elif expressions
      */
-    SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, TokenList*> &filedata, const DUI &dui, OutputList *outputList = nullptr, std::list<MacroUsage> *macroUsage = nullptr, std::list<IfCond> *ifCond = nullptr);
+    SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector<std::string> &files, FileDataCache &cache, const DUI &dui, OutputList *outputList = nullptr, std::list<MacroUsage> *macroUsage = nullptr, std::list<IfCond> *ifCond = nullptr);
 
     /**
      * Deallocate data
      */
-    SIMPLECPP_LIB void cleanup(std::map<std::string, TokenList*> &filedata);
+    SIMPLECPP_LIB void cleanup(FileDataCache &cache);
 
     /** Simplify path */
     SIMPLECPP_LIB std::string simplifyPath(std::string path);
@@ -379,9 +591,15 @@ namespace simplecpp {
     /** Returns the C version a given standard */
     SIMPLECPP_LIB cstd_t getCStd(const std::string &std);
 
+    /** Returns the name of a C standard */
+    SIMPLECPP_LIB const char *getCStdName(cstd_t std);
+
     /** Returns the C++ version a given standard */
     SIMPLECPP_LIB cppstd_t getCppStd(const std::string &std);
 
+    /** Returns the name of a C++ standard */
+    SIMPLECPP_LIB const char *getCppStdName(cppstd_t std);
+
     /** Returns the __STDC_VERSION__ value for a given standard */
     SIMPLECPP_LIB std::string getCStdString(const std::string &std);
     SIMPLECPP_LIB std::string getCStdString(cstd_t std);
@@ -389,14 +607,17 @@ namespace simplecpp {
     /** Returns the __cplusplus value for a given standard */
     SIMPLECPP_LIB std::string getCppStdString(const std::string &std);
     SIMPLECPP_LIB std::string getCppStdString(cppstd_t std);
+
+    /** Checks if given path is absolute */
+    SIMPLECPP_LIB bool isAbsolutePath(const std::string &path);
 }
 
+#undef SIMPLECPP_TOKENLIST_ALLOW_PTR
+
 #if defined(_MSC_VER)
 #  pragma warning(pop)
 #endif
 
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#undef nullptr
-#endif
+#undef SIMPLECPP_LIB
 
 #endif
diff --git a/externals/tinyxml2/CMakeLists.txt b/externals/tinyxml2/CMakeLists.txt
index f1e7adaa01a..2e1aa036b81 100644
--- a/externals/tinyxml2/CMakeLists.txt
+++ b/externals/tinyxml2/CMakeLists.txt
@@ -1,24 +1,26 @@
 file(GLOB hdrs "*.h")
 file(GLOB srcs "*.cpp")
 
-add_library(tinyxml2_objs OBJECT ${srcs} ${hdrs})
-if (BUILD_CORE_DLL)
-    target_compile_definitions(tinyxml2_objs PRIVATE TINYXML2_EXPORT)
-endif()
+add_library(tinyxml2 ${srcs} ${hdrs})
+target_dll_compile_definitions(tinyxml2 EXPORT TINYXML2_EXPORT IMPORT TINYXML2_IMPORT)
 
 # TODO: needs to be fixed upstream
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    target_compile_options(tinyxml2_objs PRIVATE -Wno-suggest-attribute=format)
-    target_compile_options(tinyxml2_objs PRIVATE -Wno-useless-cast)
+    target_compile_options(tinyxml2 PRIVATE -Wno-suggest-attribute=format)
+    target_compile_options(tinyxml2 PRIVATE -Wno-useless-cast)
 endif()
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    target_compile_options_safe(tinyxml2_objs -Wno-implicit-fallthrough)
-    target_compile_options_safe(tinyxml2_objs -Wno-suggest-destructor-override)
-    target_compile_options_safe(tinyxml2_objs -Wno-zero-as-null-pointer-constant)
-    target_compile_options_safe(tinyxml2_objs -Wno-format-nonliteral)
-    target_compile_options_safe(tinyxml2_objs -Wno-inconsistent-missing-destructor-override)
+    target_compile_options_safe(tinyxml2 -Wno-implicit-fallthrough)
+    target_compile_options_safe(tinyxml2 -Wno-suggest-destructor-override)
+    target_compile_options_safe(tinyxml2 -Wno-zero-as-null-pointer-constant)
+    target_compile_options_safe(tinyxml2 -Wno-format-nonliteral)
+    target_compile_options_safe(tinyxml2 -Wno-inconsistent-missing-destructor-override)
+    target_compile_options_safe(tinyxml2 -Wno-sign-conversion)
+    target_compile_options_safe(tinyxml2 -Wno-double-promotion)
 endif()
 if(CYGWIN)
     target_compile_definitions(-D_LARGEFILE_SOURCE)  # required for fseeko() and ftello()
 endif()
 
+target_externals_include_directories(tinyxml2 PUBLIC .)
+
diff --git a/frontend/CMakeLists.txt b/frontend/CMakeLists.txt
new file mode 100644
index 00000000000..17d10bb4f00
--- /dev/null
+++ b/frontend/CMakeLists.txt
@@ -0,0 +1,6 @@
+file(GLOB hdrs "*.h")
+file(GLOB srcs "*.cpp")
+
+add_library(frontend ${hdrs} ${srcs})
+target_include_directories(frontend PUBLIC .)
+target_link_libraries(frontend PRIVATE cppcheck-core)
diff --git a/frontend/frontend.cpp b/frontend/frontend.cpp
new file mode 100644
index 00000000000..bd95488a9a5
--- /dev/null
+++ b/frontend/frontend.cpp
@@ -0,0 +1,104 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2025 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/>.
+ */
+
+#include "frontend.h"
+
+#include "filesettings.h"
+#include "library.h"
+#include "path.h"
+#include "settings.h"
+
+#include <cassert>
+
+namespace frontend {
+    void applyLang(std::list<FileSettings>& fileSettings, const Settings& settings, Standards::Language enforcedLang)
+    {
+        if (enforcedLang != Standards::Language::None)
+        {
+            // apply enforced language
+            for (auto& fs : fileSettings)
+            {
+                if (settings.library.markupFile(fs.filename()))
+                    continue;
+                fs.file.setLang(enforcedLang);
+            }
+        }
+        else
+        {
+            // identify files
+            for (auto& fs : fileSettings)
+            {
+                if (settings.library.markupFile(fs.filename()))
+                    continue;
+                assert(fs.file.lang() == Standards::Language::None);
+                bool header = false;
+                fs.file.setLang(Path::identify(fs.filename(), settings.cppHeaderProbe, &header));
+                // unknown extensions default to C++
+                if (!header && fs.file.lang() == Standards::Language::None)
+                    fs.file.setLang(Standards::Language::CPP);
+            }
+        }
+
+        // enforce the language since markup files are special and do not adhere to the enforced language
+        for (auto& fs : fileSettings)
+        {
+            if (settings.library.markupFile(fs.filename())) {
+                assert(fs.file.lang() == Standards::Language::None);
+                fs.file.setLang(Standards::Language::C);
+            }
+        }
+    }
+
+    void applyLang(std::list<FileWithDetails>& files, const Settings& settings, Standards::Language enforcedLang)
+    {
+        if (enforcedLang != Standards::Language::None)
+        {
+            // apply enforced language
+            for (auto& f : files)
+            {
+                if (settings.library.markupFile(f.path()))
+                    continue;
+                f.setLang(enforcedLang);
+            }
+        }
+        else
+        {
+            // identify remaining files
+            for (auto& f : files)
+            {
+                if (f.lang() != Standards::Language::None)
+                    continue;
+                if (settings.library.markupFile(f.path()))
+                    continue;
+                bool header = false;
+                f.setLang(Path::identify(f.path(), settings.cppHeaderProbe, &header));
+                // unknown extensions default to C++
+                if (!header && f.lang() == Standards::Language::None)
+                    f.setLang(Standards::Language::CPP);
+            }
+        }
+
+        // enforce the language since markup files are special and do not adhere to the enforced language
+        for (auto& f : files)
+        {
+            if (settings.library.markupFile(f.path())) {
+                f.setLang(Standards::Language::C);
+            }
+        }
+    }
+}
diff --git a/frontend/frontend.h b/frontend/frontend.h
new file mode 100644
index 00000000000..71af18b3b3f
--- /dev/null
+++ b/frontend/frontend.h
@@ -0,0 +1,39 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2025 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 FRONTEND_H
+#define FRONTEND_H
+
+#include "standards.h"
+
+#include <list>
+
+struct FileSettings;
+class Settings;
+class FileWithDetails;
+
+namespace frontend
+{
+    /**
+        Applies the enforced language as all as identifying remaining files - also taking markup files into consideration.
+     */
+    void applyLang(std::list<FileSettings> &fileSettings, const Settings &settings, Standards::Language enforcedLang);
+    void applyLang(std::list<FileWithDetails> &files, const Settings &settings, Standards::Language enforcedLang);
+}
+
+#endif // FRONTEND_H
diff --git a/generate_coverage_report b/generate_coverage_report
deleted file mode 100755
index df29b8ff5c6..00000000000
--- a/generate_coverage_report
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-make clean
-rm -rf coverage_report
-make test CXXFLAGS="-g -fprofile-arcs -ftest-coverage"
-test/cfg/runtests.sh
-gcov lib/*.cpp -o lib/
-lcov --directory ./ --capture --output-file lcov_tmp.info -b ./
-lcov --extract lcov_tmp.info "$(pwd)/*" --output-file lcov.info
-genhtml lcov.info -o coverage_report --frame --legend --demangle-cpp
-rm cli/*.gcda
-rm cli/*.gcno
-rm lib/*.gcda
-rm lib/*.gcno
-rm test/*.gcda
-rm test/*.gcno
-rm externals/tinyxml2/*.gcda
-rm externals/tinyxml2/*.gcno
-rm lcov.info lcov_tmp.info
-make clean
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 21375fbd784..50980bfb262 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -21,69 +21,42 @@ CheckOptions:
     add_custom_target(gui-build-deps SOURCES ${cppcheck-gui-deps})
 
     list(APPEND cppcheck-gui_SOURCES ${srcs})
-    if (NOT BUILD_CORE_DLL)
-        list(APPEND cppcheck-gui_SOURCES $<TARGET_OBJECTS:cppcheck-core> $<TARGET_OBJECTS:simplecpp_objs>)
-        if(USE_BUNDLED_TINYXML2)
-            list(APPEND cppcheck-gui_SOURCES $<TARGET_OBJECTS:tinyxml2_objs>)
-        endif()
-    endif()
     if (WIN32)
         list(APPEND cppcheck-gui_SOURCES cppcheck-gui.rc)
     endif()
 
     add_executable(cppcheck-gui ${cppcheck-gui-deps} ${cppcheck-gui_SOURCES})
+    target_link_libraries(cppcheck-gui cppcheck-core simplecpp tinyxml2 picojson frontend)
+
     set_target_properties(cppcheck-gui PROPERTIES AUTOMOC ON)
     set_target_properties(cppcheck-gui PROPERTIES WIN32_EXECUTABLE ON)
-    target_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/lib/)
-    if(USE_BUNDLED_TINYXML2)
-        target_externals_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-    else()
-        target_include_directories(cppcheck-gui SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-    endif()
-    target_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
     if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
         target_precompile_headers(cppcheck-gui PRIVATE precompiled.h)
     endif()
     if (HAVE_RULES)
         target_link_libraries(cppcheck-gui ${PCRE_LIBRARY})
     endif()
-    if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES})
-    endif()
     target_link_libraries(cppcheck-gui ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB} ${QT_NETWORK_LIB})
     if(WITH_QCHART)
         target_link_libraries(cppcheck-gui ${QT_CHARTS_LIB})
     endif()
-    if (BUILD_CORE_DLL)
-        target_compile_definitions(cppcheck-gui PRIVATE CPPCHECKLIB_IMPORT TINYXML2_IMPORT)
-        target_link_libraries(cppcheck-gui cppcheck-core)
-    endif()
-    if(MSVC)
-        # compilation will fail as e.g. QList::realloc would be replaced by MSVC's macro definition
-        target_compile_definitions(cppcheck-gui PRIVATE $<$<CONFIG:Debug>:DISABLE_CRTDBG_MAP_ALLOC>)
-        if(NOT USE_QT6)
-            target_compile_options(cppcheck-gui PRIVATE /wd4996) # warning C4996: 'QProcess::startDetached': Use QProcess::startDetached(const QString &program, const QStringList &arguments) instead
-            target_compile_options(cppcheck-gui PRIVATE /wd4505) # warning C4505: 'x': unreferenced function with internal linkage has been removed
-        endif()
-    endif()
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if(QT_VERSION VERSION_LESS "6.0.0")
-            # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-            target_compile_options_safe(cppcheck-gui -Wno-extra-semi-stmt)
-        endif()
         if(QT_VERSION VERSION_LESS "6.4.0")
             # caused by Qt generated moc code - see https://bugreports.qt.io/browse/QTBUG-100915
             target_compile_options_safe(cppcheck-gui -Wno-redundant-parens)
         endif()
-        if(QT_VERSION VERSION_EQUAL "6.9.0")
-            # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+        if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+            # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
             target_compile_options_safe(cppcheck-gui -Wno-ctad-maybe-unsupported)
         endif()
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        # caused by mocs
+        target_compile_options_safe(cppcheck-gui -Wno-useless-cast)
     endif()
-    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.1")
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.2")
         # QBrush fails to compile before 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-134038
-        # QtCharts/qxyseries.h fails to compile in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135637
-        target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR)
+        # QtCharts/qxyseries.h fails to compile in 6.9.0 and 6.9.1 - see https://bugreports.qt.io/browse/QTBUG-135637
+        #target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR)
     endif()
     target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_FOREACH)
 
@@ -98,8 +71,8 @@ CheckOptions:
         add_dependencies(cppcheck-gui online-help.qhc)
     endif()
 
-    install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
-    install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
+    install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+    install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
 
     install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
 
@@ -114,7 +87,7 @@ CheckOptions:
         add_dependencies(cppcheck-gui run-dmake)
     endif()
 
-    if (BUILD_TESTS)
+    if (BUILD_TESTING)
         add_subdirectory(test)
     endif()
 endif()
diff --git a/gui/applicationdialog.cpp b/gui/applicationdialog.cpp
index bc8804d6f97..bdf9a4f827e 100644
--- a/gui/applicationdialog.cpp
+++ b/gui/applicationdialog.cpp
@@ -80,7 +80,7 @@ void ApplicationDialog::ok()
 {
     if (mUI->mName->text().isEmpty() || mUI->mPath->text().isEmpty()) {
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("You must specify a name, a path and optionally parameters for the application!"),
                         QMessageBox::Ok,
                         this);
diff --git a/gui/checkstatistics.cpp b/gui/checkstatistics.cpp
index 93ceb362f99..830f5eb6b4e 100644
--- a/gui/checkstatistics.cpp
+++ b/gui/checkstatistics.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,9 +18,14 @@
 
 #include "checkstatistics.h"
 
+#include "utils.h"
+
 #include <QDebug>
 #include <QList>
 #include <QSet>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtLogging>
+#endif
 
 CheckStatistics::CheckStatistics(QObject *parent)
     : QObject(parent)
@@ -30,10 +35,7 @@ CheckStatistics::CheckStatistics(QObject *parent)
 
 static void addItem(QMap<QString,unsigned> &m, const QString &key)
 {
-    if (m.contains(key))
-        m[key]++;
-    else
-        m[key] = 0;
+    m[key]++;
 }
 
 void CheckStatistics::addItem(const QString &tool, ShowTypes::ShowType type)
@@ -59,7 +61,6 @@ void CheckStatistics::addItem(const QString &tool, ShowTypes::ShowType type)
         ::addItem(mInformation, lower);
         break;
     case ShowTypes::ShowNone:
-    default:
         qDebug() << "Unknown error type - not added to statistics.";
         break;
     }
@@ -99,19 +100,19 @@ unsigned CheckStatistics::getCount(const QString &tool, ShowTypes::ShowType type
     case ShowTypes::ShowInformation:
         return mInformation.value(lower,0);
     case ShowTypes::ShowNone:
-    default:
         qDebug() << "Unknown error type - returning zero statistics.";
         return 0;
     }
+    cppcheck::unreachable();
 }
 
 QStringList CheckStatistics::getTools() const
 {
     QSet<QString> ret;
-    for (const QString& tool: mStyle.keys()) ret.insert(tool);
-    for (const QString& tool: mWarning.keys()) ret.insert(tool);
-    for (const QString& tool: mPerformance.keys()) ret.insert(tool);
-    for (const QString& tool: mPortability.keys()) ret.insert(tool);
-    for (const QString& tool: mError.keys()) ret.insert(tool);
+    std::copy(mStyle.keyBegin(), mStyle.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mWarning.keyBegin(), mWarning.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mPerformance.keyBegin(), mPerformance.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mPortability.keyBegin(), mPortability.keyEnd(), std::inserter(ret, ret.end()));
+    std::copy(mError.keyBegin(), mError.keyEnd(), std::inserter(ret, ret.end()));
     return ret.values();
 }
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index e6fc23a0fd8..07ca4e77ed2 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,7 +25,6 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "filesettings.h"
-#include "path.h"
 #include "settings.h"
 #include "standards.h"
 #include "threadresult.h"
@@ -52,10 +51,6 @@
 #include <QTextStream>
 #include <QVariant>
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-#include <QCharRef>
-#endif
-
 static QString unquote(QString s) {
     if (s.startsWith("\""))
         s = s.mid(1, s.size() - 2);
@@ -63,7 +58,7 @@ static QString unquote(QString s) {
 }
 
 // NOLINTNEXTLINE(performance-unnecessary-value-param) - used as callback so we need to preserve the signature
-int CheckThread::executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output) // cppcheck-suppress [passedByValue,passedByValueCallback]
+int CheckThread::executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output) // cppcheck-suppress passedByValueCallback
 {
     output.clear();
 
@@ -110,8 +105,9 @@ int CheckThread::executeCommand(std::string exe, std::vector<std::string> args,
 }
 
 
-CheckThread::CheckThread(ThreadResult &result) :
-    mResult(result)
+CheckThread::CheckThread(ThreadResult &result, int threadIndex)
+    : mResult(result)
+    , mThreadIndex(threadIndex)
 {}
 
 void CheckThread::setSettings(const Settings &settings, std::shared_ptr<Suppressions> supprs)
@@ -121,7 +117,7 @@ void CheckThread::setSettings(const Settings &settings, std::shared_ptr<Suppress
     mSuppressions = std::move(supprs);
 }
 
-void CheckThread::analyseWholeProgram(const QStringList &files, const std::string& ctuInfo)
+void CheckThread::analyseWholeProgram(const std::list<FileWithDetails> &files, const std::string& ctuInfo)
 {
     mFiles = files;
     mAnalyseWholeProgram = true;
@@ -129,47 +125,56 @@ void CheckThread::analyseWholeProgram(const QStringList &files, const std::strin
     start();
 }
 
-// cppcheck-suppress unusedFunction - TODO: false positive
 void CheckThread::run()
 {
     mState = Running;
 
-    CppCheck cppcheck(mSettings, *mSuppressions, mResult, true, executeCommand);
+    CppCheck cppcheck(mSettings, *mSuppressions, mResult, nullptr, true, executeCommand);
 
-    if (!mFiles.isEmpty() || mAnalyseWholeProgram) {
+    if (!mFiles.empty() || mAnalyseWholeProgram) {
         mAnalyseWholeProgram = false;
         std::string ctuInfo;
         ctuInfo.swap(mCtuInfo);
         qDebug() << "Whole program analysis";
-        std::list<FileWithDetails> files2;
-        std::transform(mFiles.cbegin(), mFiles.cend(), std::back_inserter(files2), [&](const QString& file) {
-            return FileWithDetails{file.toStdString(), Path::identify(file.toStdString(), mSettings.cppHeaderProbe), 0};
-        });
-        cppcheck.analyseWholeProgram(mSettings.buildDir, files2, {}, ctuInfo);
+        cppcheck.analyseWholeProgram(mSettings.buildDir, mFiles, {}, ctuInfo);
         mFiles.clear();
         emit done();
         return;
     }
 
-    QString file = mResult.getNextFile();
-    while (!file.isEmpty() && mState == Running) {
-        qDebug() << "Checking file" << file;
-        cppcheck.check(FileWithDetails(file.toStdString(), Path::identify(file.toStdString(), mSettings.cppHeaderProbe), 0));
-        runAddonsAndTools(mSettings, nullptr, file);
-        emit fileChecked(file);
+    // TODO: apply enforcedLanguage
+    const FileWithDetails* file = nullptr;
+    mResult.getNextFile(file);
+    while (file && mState == Running) {
+        const std::string& fname = file->spath();
+        qDebug() << "Checking file" << QString::fromStdString(fname);
+
+        const Details details{ mThreadIndex, QString::fromStdString(fname), QTime::currentTime(), };
+        emit startCheck(details);
+
+        cppcheck.check(*file);
+        runAddonsAndTools(mSettings, nullptr, QString::fromStdString(fname));
+
+        emit finishCheck(details);
 
         if (mState == Running)
-            file = mResult.getNextFile();
+            mResult.getNextFile(file);
     }
 
     const FileSettings* fileSettings = nullptr;
     mResult.getNextFileSettings(fileSettings);
     while (fileSettings && mState == Running) {
-        file = QString::fromStdString(fileSettings->filename());
-        qDebug() << "Checking file" << file;
+        const std::string& fname = fileSettings->filename();
+        qDebug() << "Checking file" << QString::fromStdString(fname);
+
+        const Details details{ mThreadIndex, QString::fromStdString(fname), QTime::currentTime(), };
+        emit startCheck(details);
+
         cppcheck.check(*fileSettings);
-        runAddonsAndTools(mSettings, fileSettings, QString::fromStdString(fileSettings->filename()));
-        emit fileChecked(file);
+        runAddonsAndTools(mSettings, fileSettings, QString::fromStdString(fname));
+
+        emit finishCheck(details);
+
 
         if (mState == Running)
             mResult.getNextFileSettings(fileSettings);
@@ -185,7 +190,7 @@ void CheckThread::run()
 
 void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings *fileSettings, const QString &fileName)
 {
-    for (const QString& addon : mAddonsAndTools) {
+    for (const QString& addon : utils::as_const(mAddonsAndTools)) {
         if (addon == CLANG_ANALYZER || addon == CLANG_TIDY) {
             if (!fileSettings)
                 continue;
@@ -245,7 +250,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
 
             const std::string &buildDir = settings.buildDir;
             if (!buildDir.empty()) {
-                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->filename(), fileSettings->cfg, fileSettings->fileIndex));
+                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->sfilename(), fileSettings->cfg, fileSettings->file.fsFileId()));
 
                 QStringList args2(args);
                 args2.insert(0,"-E");
@@ -254,11 +259,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
                 process.start(clangCmd(),args2);
                 process.waitForFinished();
                 const QByteArray &ba = process.readAllStandardOutput();
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
                 const quint16 chksum = qChecksum(QByteArrayView(ba));
-#else
-                const quint16 chksum = qChecksum(ba.data(), ba.length());
-#endif
 
                 QFile f1(analyzerInfoFile + '.' + addon + "-E");
                 if (f1.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -274,7 +275,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
                     }
                     f1.close();
                 }
-                f1.open(QIODevice::WriteOnly | QIODevice::Text);
+                (void)f1.open(QIODevice::WriteOnly | QIODevice::Text); // TODO: check result
                 QTextStream out1(&f1);
                 out1 << chksum;
 
@@ -302,7 +303,7 @@ void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings
             {
                 const QString cmd(clangTidyCmd());
                 QString debug(cmd.contains(" ") ? ('\"' + cmd + '\"') : cmd);
-                for (const QString& arg : args) {
+                for (const QString& arg : utils::as_const(args)) {
                     if (arg.contains(" "))
                         debug += " \"" + arg + '\"';
                     else
@@ -436,7 +437,7 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
         const std::string f0 = file0.toStdString();
         const std::string msg = e.message.toStdString();
         const std::string id = e.errorId.toStdString();
-        ErrorMessage errmsg(callstack, f0, e.severity, msg, id, Certainty::normal);
+        ErrorMessage errmsg(std::move(callstack), f0, e.severity, msg, id, Certainty::normal);
         mResult.reportErr(errmsg);
     }
 }
@@ -497,3 +498,4 @@ QString CheckThread::clangTidyCmd()
 
     return QString();
 }
+
diff --git a/gui/checkthread.h b/gui/checkthread.h
index 827e75f1247..a630ef7fc13 100644
--- a/gui/checkthread.h
+++ b/gui/checkthread.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,11 +20,13 @@
 #ifndef CHECKTHREAD_H
 #define CHECKTHREAD_H
 
+#include "filesettings.h"
 #include "settings.h"
 #include "suppressions.h"
 
 #include <atomic>
 #include <cstdint>
+#include <list>
 #include <memory>
 #include <string>
 #include <vector>
@@ -34,9 +36,9 @@
 #include <QString>
 #include <QStringList>
 #include <QThread>
+#include <QTime>
 
 class ThreadResult;
-struct FileSettings;
 
 /// @addtogroup GUI
 /// @{
@@ -48,7 +50,14 @@ struct FileSettings;
 class CheckThread : public QThread {
     Q_OBJECT
 public:
-    explicit CheckThread(ThreadResult &result);
+    struct Details {
+        int threadIndex;
+        QString file;
+        QTime startTime;
+    };
+
+public:
+    CheckThread(ThreadResult &result, int threadIndex);
 
     /**
      * @brief Set settings for cppcheck
@@ -63,7 +72,7 @@ class CheckThread : public QThread {
      * @param files    All files
      * @param ctuInfo  Ctu info for addons
      */
-    void analyseWholeProgram(const QStringList &files, const std::string& ctuInfo);
+    void analyseWholeProgram(const std::list<FileWithDetails> &files, const std::string& ctuInfo);
 
     void setAddonsAndTools(const QStringList &addonsAndTools) {
         mAddonsAndTools = addonsAndTools;
@@ -77,12 +86,6 @@ class CheckThread : public QThread {
         mSuppressionsUi = s;
     }
 
-    /**
-     * @brief method that is run in a thread
-     *
-     */
-    void run() override;
-
     void stop();
 
     /**
@@ -107,8 +110,8 @@ class CheckThread : public QThread {
      */
     void done();
 
-    // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
-    void fileChecked(const QString &file);
+    void startCheck(CheckThread::Details details);
+    void finishCheck(CheckThread::Details details);
 protected:
 
     /**
@@ -131,23 +134,31 @@ class CheckThread : public QThread {
     std::atomic<State> mState{Ready};
 
     ThreadResult &mResult;
+    int mThreadIndex{};
 
     Settings mSettings;
     std::shared_ptr<Suppressions> mSuppressions;
 
 private:
+    /**
+     * @brief method that is run in a thread
+     *
+     */
+    void run() override;
+
     void runAddonsAndTools(const Settings& settings, const FileSettings *fileSettings, const QString &fileName);
 
     void parseClangErrors(const QString &tool, const QString &file0, QString err);
 
     bool isSuppressed(const SuppressionList::ErrorMessage &errorMessage) const;
 
-    QStringList mFiles;
+    std::list<FileWithDetails> mFiles;
     bool mAnalyseWholeProgram{};
     std::string mCtuInfo;
     QStringList mAddonsAndTools;
     QStringList mClangIncludePaths;
     QList<SuppressionList::Suppression> mSuppressionsUi;
 };
+Q_DECLARE_METATYPE(CheckThread::Details);
 /// @}
 #endif // CHECKTHREAD_H
diff --git a/gui/codeeditor.cpp b/gui/codeeditor.cpp
index 8b2634873a4..d6c8c1c4071 100644
--- a/gui/codeeditor.cpp
+++ b/gui/codeeditor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,6 +19,7 @@
 #include "codeeditor.h"
 
 #include "codeeditorstyle.h"
+#include "utils.h"
 
 #include <QChar>
 #include <QColor>
@@ -133,7 +134,7 @@ Highlighter::Highlighter(QTextDocument *parent,
                     << "volatile"
                     << "wchar_t"
                     << "while";
-    for (const QString &pattern : keywordPatterns) {
+    for (const QString &pattern : utils::as_const(keywordPatterns)) {
         rule.pattern = QRegularExpression("\\b" + pattern + "\\b");
         rule.format = mKeywordFormat;
         rule.ruleRole = RuleRole::Keyword;
@@ -216,7 +217,7 @@ void Highlighter::setStyle(const CodeEditorStyle &newStyle)
 
 void Highlighter::highlightBlock(const QString &text)
 {
-    for (const HighlightingRule &rule : mHighlightingRulesWithSymbols) {
+    for (const HighlightingRule &rule : utils::as_const(mHighlightingRulesWithSymbols)) {
         QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text);
         while (matchIterator.hasNext()) {
             QRegularExpressionMatch match = matchIterator.next();
@@ -246,7 +247,7 @@ void Highlighter::highlightBlock(const QString &text)
     }
 }
 
-void Highlighter::applyFormat(HighlightingRule &rule)
+void Highlighter::applyFormat(HighlightingRule &rule) const
 {
     switch (rule.ruleRole) {
     case RuleRole::Keyword:
@@ -284,13 +285,8 @@ CodeEditor::CodeEditor(QWidget *parent) :
     setObjectName("CodeEditor");
     setStyleSheet(generateStyleString());
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     auto *copyText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_C),this);
     auto *allText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_A),this);
-#else
-    const auto *copyText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_C),this);
-    const auto *allText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_A),this);
-#endif
 
     connect(this, SIGNAL(blockCountChanged(int)), this, SLOT(updateLineNumberAreaWidth(int)));
     connect(this, SIGNAL(updateRequest(QRect,int)), this, SLOT(updateLineNumberArea(QRect,int)));
@@ -367,11 +363,7 @@ int CodeEditor::lineNumberAreaWidth()
         ++digits;
     }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
     const int space = 3 + (fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits);
-#else
-    const int space = 3 + (fontMetrics().width(QLatin1Char('9')) * digits);
-#endif
     return space;
 }
 
diff --git a/gui/codeeditor.h b/gui/codeeditor.h
index ba079753ff4..00205d1c4e1 100644
--- a/gui/codeeditor.h
+++ b/gui/codeeditor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,6 +21,7 @@
 
 #include <cstdint>
 
+#include <QList>
 #include <QObject>
 #include <QPlainTextEdit>
 #include <QRegularExpression>
@@ -29,7 +30,6 @@
 #include <QStringList>
 #include <QSyntaxHighlighter>
 #include <QTextCharFormat>
-#include <QVector>
 #include <QWidget>
 
 class CodeEditorStyle;
@@ -65,10 +65,10 @@ class Highlighter : public QSyntaxHighlighter {
         RuleRole ruleRole;
     };
 
-    void applyFormat(HighlightingRule &rule);
+    void applyFormat(HighlightingRule &rule) const;
 
-    QVector<HighlightingRule> mHighlightingRules;
-    QVector<HighlightingRule> mHighlightingRulesWithSymbols;
+    QList<HighlightingRule> mHighlightingRules;
+    QList<HighlightingRule> mHighlightingRulesWithSymbols;
 
     QRegularExpression mCommentStartExpression;
     QRegularExpression mCommentEndExpression;
@@ -119,6 +119,7 @@ class CodeEditor : public QPlainTextEdit {
         return mFileName;
     }
 
+    // NOLINTNEXTLINE(bugprone-derived-method-shadowing-base-method) - TODO: fix this
     void clear() {
         mFileName.clear();
         setPlainText(QString());
@@ -128,9 +129,9 @@ class CodeEditor : public QPlainTextEdit {
     void resizeEvent(QResizeEvent *event) override;
 
 private slots:
-    void updateLineNumberAreaWidth(int newBlockCount);
+    void updateLineNumberAreaWidth(int /*newBlockCount*/);
     void highlightErrorLine();
-    void updateLineNumberArea(const QRect & /*rect*/, int /*dy*/);
+    void updateLineNumberArea(const QRect& rect, int dy);
 
 private:
     QString generateStyleString();
diff --git a/gui/codeeditorstyle.cpp b/gui/codeeditorstyle.cpp
index e8e6be31f6e..6d7a15fb2f8 100644
--- a/gui/codeeditorstyle.cpp
+++ b/gui/codeeditorstyle.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,44 +18,36 @@
 
 #include "codeeditorstyle.h"
 
+#include <QList>
 #include <QSettings>
 #include <QVariant>
 
 CodeEditorStyle::CodeEditorStyle(
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor CtrlFGColor, QColor CtrlBGColor,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor HiLiBGColor,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor LnNumFGColor, QColor LnNumBGColor,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor KeyWdFGColor, QFont::Weight KeyWdWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor ClsFGColor, QFont::Weight ClsWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor QteFGColor, QFont::Weight QteWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor CmtFGColor, QFont::Weight CmtWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor SymbFGColor, QColor SymbBGColor,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QFont::Weight SymbWeight) :
-    widgetFGColor(CtrlFGColor),
-    widgetBGColor(CtrlBGColor),
-    highlightBGColor(HiLiBGColor),
-    lineNumFGColor(LnNumFGColor),
-    lineNumBGColor(LnNumBGColor),
-    keywordColor(KeyWdFGColor),
-    keywordWeight(KeyWdWeight),
-    classColor(ClsFGColor),
-    classWeight(ClsWeight),
-    quoteColor(QteFGColor),
-    quoteWeight(QteWeight),
-    commentColor(CmtFGColor),
-    commentWeight(CmtWeight),
-    symbolFGColor(SymbFGColor),
-    symbolBGColor(SymbBGColor),
-    symbolWeight(SymbWeight)
+    QColor ctrlFGColor, QColor ctrlBGColor,
+    QColor hiLiBGColor,
+    QColor lnNumFGColor, QColor lnNumBGColor,
+    QColor keyWdFGColor, QFont::Weight keyWdWeight,
+    QColor clsFGColor, QFont::Weight clsWeight,
+    QColor qteFGColor, QFont::Weight qteWeight,
+    QColor cmtFGColor, QFont::Weight cmtWeight,
+    QColor symbFGColor, QColor symbBGColor,
+    QFont::Weight symbWeight) :
+    widgetFGColor(ctrlFGColor),
+    widgetBGColor(ctrlBGColor),
+    highlightBGColor(hiLiBGColor),
+    lineNumFGColor(lnNumFGColor),
+    lineNumBGColor(lnNumBGColor),
+    keywordColor(keyWdFGColor),
+    keywordWeight(keyWdWeight),
+    classColor(clsFGColor),
+    classWeight(clsWeight),
+    quoteColor(qteFGColor),
+    quoteWeight(qteWeight),
+    commentColor(cmtFGColor),
+    commentWeight(cmtWeight),
+    symbolFGColor(symbFGColor),
+    symbolBGColor(symbBGColor),
+    symbolWeight(symbWeight)
 {}
 
 bool CodeEditorStyle::operator==(const CodeEditorStyle& rhs) const
diff --git a/gui/codeeditorstyle.h b/gui/codeeditorstyle.h
index b6f481bec8c..8ce43bccd35 100644
--- a/gui/codeeditorstyle.h
+++ b/gui/codeeditorstyle.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -51,24 +51,15 @@ class QSettings;
 class CodeEditorStyle {
 public:
     explicit CodeEditorStyle(
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor CtrlFGColor, QColor CtrlBGColor,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor HiLiBGColor,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor LnNumFGColor, QColor LnNumBGColor,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor KeyWdFGColor, QFont::Weight KeyWdWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor ClsFGColor, QFont::Weight ClsWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor QteFGColor, QFont::Weight QteWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor CmtFGColor, QFont::Weight CmtWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor SymbFGColor, QColor SymbBGColor,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QFont::Weight SymbWeight);
+        QColor ctrlFGColor, QColor ctrlBGColor,
+        QColor hiLiBGColor,
+        QColor lnNumFGColor, QColor lnNumBGColor,
+        QColor keyWdFGColor, QFont::Weight keyWdWeight,
+        QColor clsFGColor, QFont::Weight clsWeight,
+        QColor qteFGColor, QFont::Weight qteWeight,
+        QColor cmtFGColor, QFont::Weight cmtWeight,
+        QColor symbFGColor, QColor symbBGColor,
+        QFont::Weight symbWeight);
 
     bool operator==(const CodeEditorStyle& rhs) const;
     bool operator!=(const CodeEditorStyle& rhs) const;
diff --git a/gui/codeeditstyledialog.cpp b/gui/codeeditstyledialog.cpp
index 33bd9ff7e1a..44304ddddc1 100644
--- a/gui/codeeditstyledialog.cpp
+++ b/gui/codeeditstyledialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -28,7 +28,6 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QString>
-#include <QStringList>
 #include <QVBoxLayout>
 #include <QtGlobal>
 
@@ -130,11 +129,7 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
     mSampleEditor = new CodeEditor(this);
     QFont sampleFont("Monospace");
     QFontMetrics fm(sampleFont);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
     mSampleEditor->setMinimumWidth(fm.horizontalAdvance(QString(40, 'W')));
-#else
-    mSampleEditor->setMinimumWidth(fm.width(QString(40, 'W')));
-#endif
     // designate highlight, errors, and symbols
     mSampleEditor->setError(mSampleDocument, mErrLineNum, mErrSymbolsList);
     // End Controls
diff --git a/gui/codeeditstyledialog.h b/gui/codeeditstyledialog.h
index 92b31efd46a..763372cbef6 100644
--- a/gui/codeeditstyledialog.h
+++ b/gui/codeeditstyledialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,6 +25,7 @@
 #include <QDialog>
 #include <QFont>
 #include <QObject>
+#include <QStringList>
 
 class CodeEditor;
 class SelectColorButton;
@@ -33,10 +34,6 @@ class QPushButton;
 class QWidget;
 class QString;
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-class QStringList;
-#endif
-
 class StyleEditDialog : public QDialog {
     Q_OBJECT
 public:
diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
deleted file mode 100644
index 8e8d523a05a..00000000000
--- a/gui/compliancereportdialog.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 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/>.
- */
-
-#include "compliancereportdialog.h"
-
-#include "ui_compliancereportdialog.h"
-
-#include "errortypes.h"
-#include "filelist.h"
-#include "filesettings.h"
-#include "importproject.h"
-#include "projectfile.h"
-
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <QByteArray>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCoreApplication>
-#include <QCryptographicHash>
-#include <QDialogButtonBox>
-#include <QDir>
-#include <QFile>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QIODevice>
-#include <QLineEdit>
-#include <QList>
-#include <QMessageBox>
-#include <QProcess>
-#include <QRegularExpression>
-#include <QSet>
-#include <QStringList>
-#include <QTemporaryFile>
-#include <QTextStream>
-
-static void addHeaders(const QString& file1, QSet<QString> &allFiles) {
-    if (allFiles.contains(file1))
-        return;
-    QFile file(file1);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
-        return;
-    allFiles << file1;
-    const QRegularExpression re("^#include[ ]*\"([^\">]+)\".*");
-    QTextStream in(&file);
-    QString line = in.readLine();
-    while (!in.atEnd()) {
-        if (line.startsWith("#include")) {
-            const QRegularExpressionMatch match = re.match(line);
-            if (match.hasMatch()) {
-                QString hfile = match.captured(1);
-                if (file1.contains("/"))
-                    hfile = file1.mid(0,file1.lastIndexOf("/") + 1) + hfile;
-                addHeaders(hfile, allFiles);
-            }
-        }
-        line = in.readLine();
-    }
-}
-
-static std::vector<std::string> toStdStringList(const QStringList& from) {
-    std::vector<std::string> ret;
-    std::transform(from.cbegin(), from.cend(), std::back_inserter(ret), [](const QString& e) {
-        return e.toStdString();
-    });
-    return ret;
-}
-
-ComplianceReportDialog::ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport)
-    : QDialog(nullptr),
-    mUI(new Ui::ComplianceReportDialog),
-    mProjectFile(projectFile),
-    mResultsFile(std::move(resultsFile)),
-    mCheckersReport(std::move(checkersReport))
-{
-    mUI->setupUi(this);
-    mUI->mEditProjectName->setText(projectFile->getProjectName());
-    connect(mUI->buttonBox, &QDialogButtonBox::clicked, this, &ComplianceReportDialog::buttonClicked);
-    mUI->mCodingStandard->clear();
-    if (!projectFile->getCodingStandards().contains("misra-c-2023") && projectFile->getAddons().contains("misra"))
-        mUI->mCodingStandard->addItem("Misra C 2012");
-    for (QString std: projectFile->getCodingStandards()) {
-        std[0] = std[0].toUpper();
-        std = std.replace("-", " ").replace(" c ", " C ").replace(" cpp ", " C++ ").replace(" c++ ", " C++ ");
-        mUI->mCodingStandard->addItem(std);
-    }
-}
-
-ComplianceReportDialog::~ComplianceReportDialog()
-{
-    delete mUI;
-}
-
-void ComplianceReportDialog::buttonClicked(QAbstractButton* button)
-{
-    switch (mUI->buttonBox->standardButton(button)) {
-    case QDialogButtonBox::StandardButton::Save:
-        save();
-        break;
-    case QDialogButtonBox::StandardButton::Close:
-        close();
-        break;
-    default:
-        break;
-    }
-}
-
-void ComplianceReportDialog::save()
-{
-    const QString std(mUI->mCodingStandard->currentText().toLower().replace(" ", "-"));
-
-    const QString outFile = QFileDialog::getSaveFileName(this,
-                                                         tr("Compliance report"),
-                                                         QDir::homePath() + "/" + std + "-compliance-report.html",
-                                                         tr("HTML files (*.html)"));
-    if (outFile.isEmpty())
-        return;
-
-    close();
-
-    const QString& projectName = mUI->mEditProjectName->text();
-    const QString& projectVersion = mUI->mEditProjectVersion->text();
-    const bool files = mUI->mCheckFiles->isChecked();
-
-    if (projectName != mProjectFile->getProjectName()) {
-        mProjectFile->setProjectName(projectName);
-        mProjectFile->write();
-    }
-
-    QTemporaryFile tempCheckersReport;
-    if (tempCheckersReport.open()) {
-        QTextStream out(&tempCheckersReport);
-        out << mCheckersReport << "\n";
-        tempCheckersReport.close();
-    }
-
-    QTemporaryFile tempFiles;
-    if (files && tempFiles.open()) {
-        QTextStream out(&tempFiles);
-        FileList fileList;
-        fileList.addPathList(mProjectFile->getCheckPaths());
-        if (!mProjectFile->getImportProject().isEmpty()) {
-            QFileInfo inf(mProjectFile->getFilename());
-
-            QString prjfile;
-            if (QFileInfo(mProjectFile->getImportProject()).isAbsolute())
-                prjfile = mProjectFile->getImportProject();
-            else
-                prjfile = inf.canonicalPath() + '/' + mProjectFile->getImportProject();
-
-            ImportProject p;
-            try {
-                p.import(prjfile.toStdString());
-            } catch (InternalError &e) {
-                QMessageBox msg(QMessageBox::Critical,
-                                tr("Save compliance report"),
-                                tr("Failed to import '%1' (%2), can not show files in compliance report").arg(prjfile).arg(QString::fromStdString(e.errorMessage)),
-                                QMessageBox::Ok,
-                                this);
-                msg.exec();
-                return;
-            }
-
-            p.ignorePaths(toStdStringList(mProjectFile->getExcludedPaths()));
-
-            QDir dir(inf.absoluteDir());
-            for (const FileSettings& fs: p.fileSettings)
-                fileList.addFile(dir.relativeFilePath(QString::fromStdString(fs.filename())));
-        }
-
-        QSet<QString> allFiles;
-        for (const QString &sourcefile: fileList.getFileList())
-            addHeaders(sourcefile, allFiles);
-        for (const QString& fileName: allFiles) {
-            QFile f(fileName);
-            if (f.open(QFile::ReadOnly)) {
-                QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
-                if (hash.addData(&f)) {
-                    for (auto b: hash.result())
-                        out << QString::number(static_cast<unsigned char>(b),16);
-                    out << " " << fileName << "\n";
-                }
-            }
-        }
-        tempFiles.close();
-    }
-
-    QStringList suppressions;
-    for (const auto& suppression: mProjectFile->getSuppressions()) {
-        if (!suppression.errorId.empty())
-            suppressions.append(QString::fromStdString(suppression.errorId));
-    }
-
-    QStringList args{"--project-name=" + projectName,
-                     "--project-version=" + projectVersion,
-                     "--output-file=" + outFile,
-                     "--checkers-report=" + tempCheckersReport.fileName()};
-    if (!suppressions.isEmpty())
-        args << "--suppressions=" + suppressions.join(",");
-
-    args << ("--" + std);
-
-    if (files)
-        args << "--files=" + tempFiles.fileName();
-    args << mResultsFile;
-
-    const QString appPath = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath();
-
-    QProcess process;
-#ifdef Q_OS_WIN
-    process.start(appPath + "/compliance-report.exe", args);
-#else
-    process.start(appPath + "/compliance-report", args);
-#endif
-    process.waitForFinished();
-    const QString output = process.readAll();
-    if (!output.isEmpty()) {
-        QMessageBox msg(QMessageBox::Critical,
-                        tr("Save compliance report"),
-                        output,
-                        QMessageBox::Ok,
-                        this);
-        msg.exec();
-    }
-}
diff --git a/gui/compliancereportdialog.h b/gui/compliancereportdialog.h
deleted file mode 100644
index c7ef27f1cc5..00000000000
--- a/gui/compliancereportdialog.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- C++ -*-
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 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 COMPLIANCEREPORTDIALOG_H
-#define COMPLIANCEREPORTDIALOG_H
-
-#include <QDialog>
-#include <QObject>
-#include <QString>
-
-namespace Ui {
-    class ComplianceReportDialog;
-}
-
-class ProjectFile;
-class QAbstractButton;
-
-class ComplianceReportDialog final : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport);
-    ~ComplianceReportDialog() final;
-
-private slots:
-    void buttonClicked(QAbstractButton* button);
-
-private:
-    void save();
-
-    Ui::ComplianceReportDialog *mUI;
-    ProjectFile* mProjectFile;
-    const QString mResultsFile;
-    const QString mCheckersReport;
-};
-
-#endif // COMPLIANCEREPORTDIALOG_H
diff --git a/gui/compliancereportdialog.ui b/gui/compliancereportdialog.ui
deleted file mode 100644
index b756ec7eab5..00000000000
--- a/gui/compliancereportdialog.ui
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ComplianceReportDialog</class>
- <widget class="QDialog" name="ComplianceReportDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>403</width>
-    <height>199</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Compliance Report</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Project version</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Project name</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="mEditProjectName"/>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="mEditProjectVersion"/>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Coding Standard</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="mCodingStandard">
-       <item>
-        <property name="text">
-         <string>Misra C</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Cert C</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Cert C++</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="mCheckFiles">
-     <property name="text">
-      <string>List of files with md5 checksums</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts
index cd29220f65c..a9429aa1c94 100644
--- a/gui/cppcheck_de.ts
+++ b/gui/cppcheck_de.ts
@@ -40,7 +40,7 @@ der GNU General Public License Version 3 lizenziert</translation>
         <location filename="about.ui" line="115"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <oldsource>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Many thanks to these libraries that we use:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;pcre&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;picojson&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tinyxml2&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vielen Dank den Bibliotheken die wir nutzen:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PCRE&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PicoJSON&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qt&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;TinyXML2&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Boost&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
@@ -63,7 +63,7 @@ The following texts in parameters are replaced with appropriate values when appl
 Example opening a file with Kate and make Kate scroll to the correct line:
 Executable: kate
 Parameters: -l(line) (file)</source>
-        <translation>Hier können Sie Anwendungen hinzufügen, die Codedateien öffnen können. Geben Sie den Namen der Anwendung, deren ausführbare Datei und Kommandozeilenparameter für die Ausführung an.
+        <translation>Hier können Sie Anwendungen hinzufügen, die Codedateien öffnen können. Geben Sie den Namen der Anwendung, deren ausführbare Datei und Kommandozeilenparameter für die Ausführung, an.
 
 Die folgenden Texte in Parametern werden durch die passenden Werte ersetzt, wenn die Anwendung ausgeführt wird:
 (file) - Name der Datei, die den Fehler enthält
@@ -107,9 +107,8 @@ Parameter: -l(line) (file)
         <translation>Anzeigeanwendung auswählen</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -120,65 +119,52 @@ Parameter: -l(line) (file)
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Compliance-Report</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Projektname</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Projekt-Version</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
         <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Programmierstandards</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
         <source>Misra C</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Misra C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
         <source>Cert C</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Cert C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
         <source>Cert C++</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Datei-Listen mit MD5-Prüfsummen</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Compliance-Report</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">HTML-Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Compliance-Report speichern</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
         <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Import von &apos;%1&apos; (%2) fehlgeschlagen, Compliance-Report kann nicht angezeigt werden</translation>
     </message>
 </context>
 <context>
@@ -189,10 +175,8 @@ Parameter: -l(line) (file)
         <translation>Konnte die Datei nicht finden: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -205,27 +189,26 @@ Parameter: -l(line) (file)
     <message>
         <location filename="helpdialog.ui" line="14"/>
         <source>Cppcheck GUI help</source>
-        <translation type="unfinished"></translation>
+        <translation>Cppcheck GUI Hilfe</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="34"/>
         <source>Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Inhalt</translation>
     </message>
     <message>
         <location filename="helpdialog.ui" line="44"/>
         <source>Index</source>
-        <translation type="unfinished"></translation>
+        <translation>Index</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Hilfedatei &apos;%1&apos; nicht gefunden</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -334,40 +317,37 @@ Parameter: -l(line) (file)
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Bibliotheksdateien (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Bibliothek öffnen</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation>Datei %1 kann nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>%1 kann nicht geladen werden. %2.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation>Datei %1 kann nicht gespeichert werden.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>Speichere Bibliothek unter</translation>
     </message>
@@ -495,26 +475,11 @@ Parameter: -l(line) (file)
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
@@ -524,246 +489,246 @@ Parameter: -l(line) (file)
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Symbolleisten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>A&amp;nalysieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++-Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation>&amp;C-Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Lizenz...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Autoren...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>Ü&amp;ber...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Dateien...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <translation>Analysiere Dateien</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Strg+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Verzeichnis...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <translation>Analysiere Verzeichnis</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Strg+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Strg+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stoppen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <translation>Analyse abbrechen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Ergebnisse in Datei speichern...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>Ergebnisse &amp;löschen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>Zeige Fehler</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>Zeige Warnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>Zeige Performance-Warnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Zeige &amp;versteckte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Zeige Informationsmeldungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Zeige Portabilitätswarnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Zeige Cppcheck-Ergebnisse</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Zeige Clang-Ergebnisse</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Gefilterte Ergebnisse</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit, ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit, Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Drucken...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Aktuellen Bericht ausdrucken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Druckvorschau</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Druckvorschaudialog für aktuelle Ergebnisse öffnen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>Bibliothekseditor öffnen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>Alle &amp;auswählen</translation>
     </message>
@@ -778,299 +743,301 @@ Parameter: -l(line) (file)
         <translation type="unfinished">Verstecken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <translation>Veränderte Dateien neu analysieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>Alle Dateien erneut anal&amp;ysieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>Stilwar&amp;nungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>F&amp;ehler</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>Alle a&amp;bwählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Alle &amp;reduzieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>Alle &amp;erweitern</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Standardeinträge</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Symbolleiste</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorien</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Fehler-Kategorien</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>Öffne &amp;XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Pr&amp;ojektdatei öffnen...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>&amp;Zeige Schmierzettel...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Neue Projektdatei...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Loganzeige</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Loganzeige</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>Projektdatei &amp;schließen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>Projektdatei &amp;bearbeiten...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistik</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>&amp;Warnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>Per&amp;formance-Warnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>&amp;Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>&amp;Portabilität</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>P&amp;lattformen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>Posix</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>&amp;Bibliothekseditor</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>Sprache &amp;automatisch erkennen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>C++ &amp;erzwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>C e&amp;rzwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>Neu analysieren und Bibliothek prüfen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>Prüfe Konfiguration (Definitionen, Includes)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
         <source>Misra C</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Misra C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
+        <source>Cert C</source>
+        <translation type="vanished">Cert C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <source>Cert C++</source>
+        <translation type="vanished">Cert C++</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Inhalte</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>Zeige Stilwarnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Öffnet die Hilfe-Inhalte</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
@@ -1080,18 +1047,18 @@ Parameter: -l(line) (file)
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>Schnellfilter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation>Konfiguration wählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1100,102 +1067,102 @@ Do you want to load this project file instead?</source>
 Möchten Sie stattdessen diese öffnen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>Datei nicht gefunden</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation>Fehlerhaftes XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation>Fehlendes Attribut</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation>Falscher Attributwert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation>Plattformtyp doppelt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation>Plattformtyp neu definiert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>Laden der ausgewählten Bibliothek &apos;%1&apos; schlug fehl.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Lizenz</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Autoren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Speichert die Berichtdatei</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML-Dateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1204,37 +1171,32 @@ This is probably because the settings were changed between the Cppcheck versions
 Dies wurde vermutlich durch einen Wechsel der Cppcheck-Version hervorgerufen. Bitte prüfen (und korrigieren) Sie die Einstellungen, andernfalls könnte die Editor-Anwendung nicht korrekt starten.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Sie müssen die Projektdatei schließen, bevor Sie neue Dateien oder Verzeichnisse auswählen!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>Die Bibliothek &apos;%1&apos; enthält unbekannte Elemente:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>Nicht unterstütztes Format</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation>Unbekanntes Element</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation>Unbekannter Fehler</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -1243,80 +1205,78 @@ Dies wurde vermutlich durch einen Wechsel der Cppcheck-Version hervorgerufen. Bi
         <translation type="vanished">Laden von %1 fehlgeschlagen. Ihre Cppcheck-Installation ist defekt. Sie können --data-dir=&lt;Verzeichnis&gt; als Kommandozeilenparameter verwenden, um anzugeben, wo die Datei sich befindet. Bitte beachten Sie, dass --data-dir in Installationsroutinen genutzt werden soll, und die GUI bei dessen Nutzung nicht startet, sondern die Einstellungen konfiguriert.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>Berichtdatei öffnen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>Textdateien (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV-Dateien (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Projektdateien (*.cppcheck);;Alle Dateien(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>Projektdatei auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation>Keine passenden Dateien für Analyse gefunden!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation>C/C++-Quellcode</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation>Compilerdatenbank</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++-Builder 6</translation>
+        <translation type="vanished">Borland C++-Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation>Dateien für Analyse auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation>Verzeichnis für Analyse auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Zu analysierende Konfiguration auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1325,7 +1285,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 Wollen sie fortfahren, ohne diese Projektdateien zu nutzen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1336,7 +1296,7 @@ Eine neue XML-Datei zu öffnen wird die aktuellen Ergebnisse löschen
 Möchten sie fortfahren?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1345,27 +1305,22 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 Wollen sie die Analyse abbrechen und Cppcheck beenden?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML-Dateien (*.xml);;Textdateien (*.txt);;CSV-Dateien (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>Erstellungsverzeichnis &apos;%1&apos; existiert nicht. Erstellen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1385,69 +1340,69 @@ Wollen sie die Analyse abbrechen und Cppcheck beenden?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1456,22 +1411,22 @@ Analysis is stopped.</source>
         <translation type="vanished">Import von &apos;%1&apos; fehlgeschlagen; Analyse wurde abgebrochen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Projektdateien (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>Projektnamen auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>Keine Projektdatei geladen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1488,17 +1443,17 @@ Do you want to remove the file from the recently used projects -list?</source>
 Möchten Sie die Datei von der Liste der zuletzt benutzten Projekte entfernen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1529,7 +1484,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - Kommandozeilenparameter</translation>
     </message>
@@ -1562,7 +1517,7 @@ Options:
         <translation>Symbolname</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>Fehlerunterdrückung bearbeiten</translation>
     </message>
@@ -1575,29 +1530,24 @@ Options:
         <translation>Nativ</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit, ANSI</translation>
+        <translation type="vanished">Windows 32-bit, ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit, Unicode</translation>
+        <translation type="vanished">Windows 32-bit, Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1623,7 +1573,7 @@ Options:
         <translation>Definitionen müssen mit einem Semikolon getrennt werden. Beispiel: DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Hinweis: Legen Sie eigene .cfg-Dateien in den Ordner der Projektdatei. Dann sollten sie oben sichtbar werden.</translation>
     </message>
@@ -1632,17 +1582,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation>MISRA-Regeltexte</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Text aus Anhang A &amp;quot;Summary of guidelines&amp;quot; aus der MISRA-C-2012-PDF in eine Textdatei einfügen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1653,8 +1603,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation>Durchsuchen...</translation>
     </message>
@@ -1666,7 +1615,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="113"/>
         <source>Selected VS Configurations</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte VS-Konfiguration</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="147"/>
@@ -1682,15 +1631,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
@@ -1720,263 +1669,281 @@ Options:
         <translation>Ab</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation>Plattform</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation>Analyse</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
-        <translation type="unfinished">Prüfe Code in ungenutzten Templates (langsamere und weniger genaue Analyse)</translation>
+        <translation>Prüfe Code in ungenutzten Templates (normalerweise AN, theoretisch können Warnungen in ungenutzten Templates gefahrlos ignoriert werden)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation>Maximale CTU-Tiefe</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation>Warnoptionen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation>Wurzelverzeichnis:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Warnungs-Tags (Semikolon-getrennt)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
-        <translation type="unfinished">Inline-Fehlerunterdrückung aktivieren</translation>
+        <translation>Inline-Fehlerunterdrückung aktivieren</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
-        <translation type="unfinished"></translation>
+        <translation>Cert C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation>Externe Werkzeuge</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck-Arbeitsverzeichnis (Vollständige Programmanalyse, inkrementelle Analyse, Statistiken, etc.)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation>Bibliotheken</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>Fehlerunterdrückungen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation>Add-Ons</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation>Threadsicherheit</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation>Programmierstandards</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
-        <translation type="unfinished"></translation>
+        <translation>Misra C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
-        <translation type="unfinished"></translation>
+        <translation>Cert C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="999"/>
         <source>Clang analyzer</source>
-        <translation>Clang-Analyzer</translation>
+        <translation type="vanished">Clang-Analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="992"/>
         <source>Clang-tidy</source>
-        <translation>Clang-Tidy</translation>
+        <translation type="vanished">Clang-Tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
@@ -1987,115 +1954,124 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>Projektdatei: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation>Wähle Cppcheck-Erstellungsverzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Wähle Include-Verzeichnisse</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>Wähle zu prüfendes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinweis: Open-Source Cppcheck implementiert Misra C 2012 nicht vollständig</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (nicht gefunden)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
+        <location filename="projectfiledialog.cpp" line="628"/>
         <source>Compile database</source>
         <translation>Compilerdatenbank</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++-Builder 6</translation>
+        <translation type="vanished">Borland C++-Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation>Projekt importieren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>Wähle zu ignorierendes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelltext-Dateien</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei ausschließen</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation>Wähle MISRA-Regeltext-Datei</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
-        <translation>MISRA-Regeltext-Datei</translation>
+        <translation>MISRA-Regeltext-Datei (%1)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Unbekannte Sprache angegeben!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>Sprachdatei %1 nicht gefunden!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation>Die Übersetzungen der Sprache %1 konnten nicht aus der Datei %2 geladen werden</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation>Zeile %1: Nicht behandeltes Element %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (nicht gefunden)</translation>
     </message>
@@ -2145,180 +2121,175 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation>Klassen-Vordergrundfarbe</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Datei</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Zeile</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Schweregrad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">Unklar</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">Seit Datum</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
@@ -2342,93 +2313,90 @@ Options:
         <translation type="vanished">Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>Undefinierte Datei</translation>
+        <translation type="vanished">Undefinierte Datei</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>Kann Datei nicht finden:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>Bitte wählen Sie den Ordner &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>Wähle Verzeichnis &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
-        <translation>Bitte wählen Sie das Verzeichnis, wo sich die Datei befindet</translation>
+        <translation>Bitte wählen Sie das Verzeichnis, in dem sich die Datei befindet.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>Debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>Anmerkung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
-        <translation>Erneut prüfen</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="752"/>
-        <source>Hide</source>
-        <translation>Verstecken</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Verstecke alle mit gleicher ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>Ausgewählte ID(s) unterdrücken</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Übergeordneten Ordner öffnen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
-        <translation type="unfinished"></translation>
+        <translation>Intern</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation>Erneut %1 Datei(en) prüfen</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation>Verstecke %1 Ergebnis(se)</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>Kein Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2437,7 +2405,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Konfigurieren Sie diese unter Einstellungen/Anwendungen.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2446,12 +2414,12 @@ Please select the default editor application in preferences/Applications.</sourc
  Bitte wählen Sie eine Standardanwendung unter Einstellungen/Anwendungen.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Datei konnte nicht gefunden werden!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2460,49 +2428,37 @@ Please check the application path and parameters are correct.</source>
 Bitte überprüfen Sie ob der Pfad und die Parameter der Anwendung richtig eingestellt sind.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Wähle Verzeichnis</translation>
     </message>
     <message>
-        <source>Id</source>
-        <translation type="vanished">Id</translation>
-    </message>
-    <message>
-        <source>Inconclusive</source>
-        <translation type="vanished">Unklar</translation>
-    </message>
-    <message>
-        <source>Since date</source>
-        <translation type="vanished">Seit Datum</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>Performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>Portabilität</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>Information</translation>
     </message>
@@ -2510,107 +2466,100 @@ Bitte überprüfen Sie ob der Pfad und die Parameter der Anwendung richtig einge
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Bericht drucken</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Keine Funde, nichts zu drucken.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 von %2 Dateien geprüft)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Keine Fehler gefunden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Es wurden Fehler gefunden, aber sie sind so konfiguriert, ausgeblendet zu werden.
 Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werden sollen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Lesen des Berichts fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML-Format-Version 1 wird nicht länger unterstützt.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>Zuerst inkludiert von</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation>Protokoll leeren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation>Diesen Protokolleintrag kopieren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation>Gesamtes Protokoll kopieren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Analyse wurde gestoppt</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Kritischer Fehler mit ID &apos;%1&apos; aufgetreten</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
-        <translation type="unfinished"></translation>
+        <translation>beim Prüfen von %1</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
-        <translation type="unfinished"></translation>
+        <translation>beim Prüfen einer Datei</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Analyse abgebrochen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Der Bericht konnte nicht speichern werden.</translation>
     </message>
@@ -2622,7 +2571,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     <message>
         <location filename="resultsview.ui" line="60"/>
         <source>Critical errors</source>
-        <translation type="unfinished"></translation>
+        <translation>Kritische Fehler</translation>
     </message>
     <message>
         <location filename="resultsview.ui" line="92"/>
@@ -2676,7 +2625,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>Hinzufügen...</translation>
     </message>
@@ -2686,175 +2635,179 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
         <translation>Anzahl der Threads: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>Ideale Anzahl:</translation>
+        <translation type="vanished">Ideale Anzahl:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>Erzwinge Prüfung aller #ifdef-Konfigurationen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Vollständigen Dateipfad anzeigen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>&quot;Keine Fehler gefunden&quot;-Meldung anzeigen, wenn keine Fehler gefunden werden</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Zeige Meldungs-Id in Spalte &quot;Id&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>Inline-Fehlerunterdrückung aktivieren</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation>Auch nach unklaren Fehlern suchen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation>Zeige Statistiken nach Prüfungsabschluss</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Updates prüfen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>Interne Warnungen im Log anzeigen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation>Add-Ons</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python-Binärdatei (Python aus PATH wird genutzt, wenn leer)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation>MISRA-Addon</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA-Regeltext-Datei</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Text aus Anhang A &amp;quot;Summary of guidelines&amp;quot; aus der MISRA-C-2012-PDF in eine Textdatei einfügen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang-Verzeichnis (PATH wird genutzt, wenn leer)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation>Visual-Studio-Header</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pfade zu Visual-Studio-Headern, Semikolon-getrennt.&lt;/p&gt;&lt;p&gt;Sie können eine Visual-Studio-Kommandozeile öffnen, &amp;quot;SET INCLUDE&amp;quot; eingeben und dann die Pfade hier reinkopieren.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation>Code-Editor</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation>Code-Editor-Stil</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation>Systemstil</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation>Heller Standardstil</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation>Dunkler Standardstil</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation>Maximalzahl:</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>Bearbeiten...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>Als Standard festlegen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Berichte</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Alle Fehler beim Erstellen von Berichten speichern</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Vollständigen Dateipfad in Berichten speichern</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
@@ -2862,47 +2815,46 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>kA</translation>
+        <translation type="vanished">kA</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
-        <translation type="unfinished"></translation>
+        <translation>Die ausführbare Datei &quot;%1&quot; ist nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Neue Anwendung hinzufügen</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Anwendung ändern</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation> [Standard]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[Standard]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation>Python-Binärdatei auswählen</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation>Wähle MISRA-Datei</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation>Clang-Verzeichnis auswählen</translation>
     </message>
@@ -2912,14 +2864,14 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
@@ -2950,7 +2902,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Vorherige Prüfung</translation>
     </message>
@@ -3002,12 +2954,12 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
     <message>
         <location filename="statsdialog.ui" line="356"/>
         <source>Active checkers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktive Checker:</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="374"/>
         <source>Checkers</source>
-        <translation type="unfinished"></translation>
+        <translation>Checker</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="399"/>
@@ -3030,151 +2982,159 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
         <translation>PDF-Export</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 Tag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 Tage</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 Stunde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 Stunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 Minute</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 Minuten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 Sekunde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 Sekunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0,%1 Sekunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> und </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>Exportiere PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Projekteinstellungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Include-Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Definitionen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>Un-Definitionen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Gewählte Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Anzahl geprüfter Dateien</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Prüfungsdauer</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>Datei: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>Kein Cppcheck-Analyseverzeichnis</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Warnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stilwarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Portabilitätswarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Performance-Warnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Informationsmeldungen</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 von %2 Dateien geprüft</translation>
     </message>
@@ -3182,7 +3142,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3195,9 +3155,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 Die Sprache wurde auf Englisch zurückgesetzt. Öffnen Sie den Einstellungen-Dialog um eine verfügbare Sprache auszuwählen.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts
index 2f134db6b60..fa03b4457cc 100644
--- a/gui/cppcheck_es.ts
+++ b/gui/cppcheck_es.ts
@@ -95,9 +95,8 @@ Parameters: -l(line) (file)</source>
         <translation>Selecciona la aplicación para visualizar</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -105,70 +104,6 @@ Parameters: -l(line) (file)</source>
         <translation>¡Debes especificar el nombre, la ruta y opcionalmente los parámetros para la aplicación!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -177,10 +112,8 @@ Parameters: -l(line) (file)</source>
         <translation>No se ha encontrado el fichero: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -206,14 +139,13 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -322,42 +254,39 @@ Parameters: -l(line) (file)</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Archivos de biblioteca (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Abrir archivo de biblioteca</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -475,23 +404,8 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
@@ -499,12 +413,12 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Herramientas</translation>
     </message>
@@ -514,233 +428,233 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished">C estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licencia...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;utores...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Acerca de...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Ficheros...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished">Comprobar archivos</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Carpeta...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished">Comprobar carpeta</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Detener</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished">Detener comprobación</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Guardar los resultados en el fichero...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Limpiar resultados</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Preferencias</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>Mostrar advertencias de estilo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>Mostrar errores</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Mostrar mensajes de información</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Mostrar advertencias de portabilidad</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Resultados del filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Im&amp;primir...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Imprimir el informe actual</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Pre&amp;visualización de impresión...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Abre el diálogo de previsualización de impresión para el informe actual</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>Abrir el editor de bibliotecas</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Seleccionar todo</translation>
     </message>
@@ -755,434 +669,424 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Ocultar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Deseleccionar todo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Contraer &amp;todo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Expandir todo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Elementos estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenidos</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Abrir la ayuda de contenidos</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Barra de herramientas</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorías</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Categorías de error</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Abrir XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Abrir P&amp;royecto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nuevo Proyecto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Visor del log</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Visor del log</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>C&amp;errar Proyecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Editar Proyecto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Estadísticas</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>Mostrar advertencias</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>Mostrar advertencias de rendimiento</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Mostrar &amp;ocultos</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>¡Tienes que cerrar el proyecto antes de seleccionar nuevos ficheros o carpetas!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>Archivo no encontrado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation type="unfinished">XML malformado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation type="unfinished">Falta el atributo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>Formato no soportado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>Archivos XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>Abrir informe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Licencia</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Autores</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Guardar informe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>Filtro rápido:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1191,117 +1095,102 @@ Do you want to load this project file instead?</source>
 ¿Quiere cargar este fichero de proyecto en su lugar?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>La biblioteca &apos;%1&apos; contiene elementos deconocidos:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>Ficheros de texto (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>Ficheros CVS (*.cvs)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Ficheros de proyecto (*.cppcheck;;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>Selecciona el archivo de proyecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>Proyecto:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1309,34 +1198,29 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1356,34 +1240,34 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>Selecciona el nombre del proyecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>No hay ningún proyecto cargado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1400,72 +1284,72 @@ Do you want to remove the file from the recently used projects -list?</source>
 ¿Quiere eliminar el fichero de la lista de proyectos recientes?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1495,7 +1379,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1528,7 +1412,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1541,29 +1425,24 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1591,58 +1470,58 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Nota: Ponga sus propios archivos .cfg en la misma carpeta que el proyecto. Debería verlos arriba.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1653,8 +1532,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1682,15 +1560,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
@@ -1710,114 +1588,134 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Habilitar supresiones inline</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1832,116 +1730,106 @@ Options:
         <translation>Bajar</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation type="unfinished">Supresiones</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
         <source>Defines:</source>
@@ -1951,82 +1839,83 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>Archivo de proyecto: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Selecciona una carpeta para incluir</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>Selecciona la carpeta a comprobar</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="628"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="630"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>Selecciona la carpeta a ignorar</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2034,32 +1923,32 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>¡Idioma especificado desconocido!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>¡Fichero de idioma %1 no encontrado!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation>Fallo al cargar la traducción para el idioma %1 desde el fichero %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2109,181 +1998,176 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Archivo</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Línea</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Severidad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Resumen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
@@ -2307,103 +2191,104 @@ Options:
         <translation type="vanished">Resumen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>Fichero no definido</translation>
+        <translation type="vanished">Fichero no definido</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilidad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>información</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>depuración</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>Ocultar</translation>
+        <translation type="vanished">Ocultar</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Ocultar todos con el mismo id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Abrir carpeta contenedora</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2413,7 +2298,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Configura el programa para editar en Preferencias/Aplicaciones.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2422,12 +2307,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Configura el programa para editar por defecto en Preferencias/Aplicaciones.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>¡No se ha encontrado el fichero!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2436,7 +2321,7 @@ Please check the application path and parameters are correct.</source>
 Por favor comprueba que la ruta a la aplicación y los parámetros son correctos.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Selecciona carpeta</translation>
     </message>
@@ -2445,22 +2330,22 @@ Por favor comprueba que la ruta a la aplicación y los parámetros son correctos
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>estilo</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>error</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>advertencia</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>ajuste</translation>
     </message>
@@ -2488,107 +2373,100 @@ Por favor comprueba que la ruta a la aplicación y los parámetros son correctos
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Error al guardar el informe.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Imprimir informe</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>No se encontraron errores, nada que imprimir.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 of %2 archivos comprobados)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>No se han encontrado errores.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Se han encontrado errores, pero están configurados para que no se muestren.
 Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Error al leer el informe.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2634,145 +2512,149 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>Cantidad ideal:</translation>
+        <translation type="vanished">Cantidad ideal:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>Forzar comprobación de todas las configuraciones #ifdef</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Mostrar el Id del error en la columna &quot;Id&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>Habilitar supresiones inline</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>Añadir...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>Definir por defecto</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
@@ -2782,37 +2664,37 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
         <translation>Número de hilos:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Mostrar la ruta completa de los ficheros</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Mostrar el mensaje &quot;No se han encontrado errores&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Informes</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Guardar todos los errores cuando se cree el informe</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Guardar la ruta completa en los ficheros de informes</translation>
     </message>
@@ -2820,47 +2702,46 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation type="vanished">N/A</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Añadir una nueva aplicación</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Modificar  una aplicación</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[Predeterminada]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2870,14 +2751,14 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
@@ -2908,7 +2789,7 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation type="unfinished">Análisis anterior</translation>
     </message>
@@ -2988,151 +2869,159 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 día</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 días</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 hora</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 horas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minuto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minutos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 segundo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 segundos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 segundos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Preferencias del proyecto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished">Incluye las rutas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished">Definiciones</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Ruta seleccionada</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished">Número de archivos analizados</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished">Duración del análisis</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Errores</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Advertencias</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Advertencias de estilo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Advertencias de portabilidad</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Advertencias de rendimiento</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Mensajes de información</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 de %2 archivos comprobados</translation>
     </message>
@@ -3140,7 +3029,7 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3153,9 +3042,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 El idioma de la interfaz gráfica ha sido cambiado a Inglés. Abra la ventana de Preferencias para seleccionar alguno de los idiomas disponibles.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts
index dbf1bbcd4c5..bf379534998 100644
--- a/gui/cppcheck_fi.ts
+++ b/gui/cppcheck_fi.ts
@@ -96,9 +96,8 @@ Parameters: -l(line) (file)</source>
         <translation>Valitse ohjelma jolla avata virhetiedosto</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -106,70 +105,6 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -180,10 +115,8 @@ Parameters: -l(line) (file)</source>
         <translation>Tiedostoa %1 ei löytynyt</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -209,14 +142,13 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -325,42 +257,39 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -478,31 +407,16 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Vakio</translation>
     </message>
@@ -512,245 +426,245 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;Tiedosto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Näytä</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Muokkaa</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Lisenssi...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Tekijät...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Tietoa ohjelmasta Cppcheck...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Tiedostot...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Hakemisto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Pysäytä</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Tallenna tulokset tiedostoon...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Lopeta</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Tyhjennä tulokset</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Asetukset</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Valitse kaikki</translation>
     </message>
@@ -765,300 +679,290 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Poista kaikista valinta</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>&amp;Pienennä kaikki</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Laajenna kaikki</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1068,240 +972,225 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;Ohje</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Lisenssi</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Tekijät</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Tallenna raportti</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML-tiedostot (*xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>Tekstitiedostot (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1309,34 +1198,29 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1356,34 +1240,34 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1394,72 +1278,72 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1489,7 +1373,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1522,7 +1406,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1534,31 +1418,6 @@ Options:
         <source>Native</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ProjectFile</name>
@@ -1585,22 +1444,22 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1611,8 +1470,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1640,15 +1498,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1678,264 +1536,274 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
         <source>Defines:</source>
@@ -1945,82 +1813,83 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="628"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="630"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2028,34 +1897,34 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <oldsource>Language file %1.qm not found!</oldsource>
         <translation>Käännöstiedostoa %1 ei löytynyt!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <oldsource>Failed to load translation for language %1 from file %2.qm</oldsource>
         <translation>Käänöksen lataaminen kielelle %1 tiedostosta %2 epäonnistui</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2105,181 +1974,176 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Tiedosto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Rivi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Tyyppi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2299,93 +2163,90 @@ Options:
         <translation type="vanished">Rivi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>Määrittelemätön tiedosto</translation>
+        <translation type="vanished">Määrittelemätön tiedosto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
+        <location filename="resultstree.cpp" line="670"/>
+        <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
-        <source>Hide</source>
+        <location filename="resultstree.cpp" line="692"/>
+        <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
-        <source>Hide all with id</source>
+        <location filename="resultstree.cpp" line="671"/>
+        <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
-        <source>Suppress selected id(s)</source>
+        <location filename="resultstree.cpp" line="376"/>
+        <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
-        <source>Open containing folder</source>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
-        <source>internal</source>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2393,19 +2254,19 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
         <translation type="unfinished">Voit asetuksista määritellä muita ohjelmia joilla avata tämän virheen sisältävän tiedoston.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2414,37 +2275,37 @@ Please check the application path and parameters are correct.</source>
 Tarkista että ohjelman polku ja parametrit ovat oikeat.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>Tyyli</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,107 +2313,100 @@ Tarkista että ohjelman polku ja parametrit ovat oikeat.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Virheitä ei löytynyt.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Virheitä löytyi, mutta asetuksissa kyseiset virheet on määritelty piilotettavaksi.
 Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valikko.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Raportin tallentaminen epäonnistui.</translation>
     </message>
@@ -2618,7 +2472,7 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
         <translation>Yleiset</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2628,176 +2482,176 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
         <translation>Säikeiden lukumäärä: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
-        <source>Ideal count:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation type="unfinished">Tarkista kaikki #ifdef kombinaatiot</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Näytä tiedostojen täysi polku</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Näytä &quot;virheitä ei löytynyt&quot;-viesti jos virheitä ei löydy</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Ohjelmat</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Raportit</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Tallenna kaikki virheet raporttia luodessa</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Tallenna tiedostojen koko polku raportteihin</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2805,47 +2659,42 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Lisää uusi ohjelma</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Muokkaa ohjelmaa</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2855,14 +2704,14 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2893,7 +2742,7 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2973,151 +2822,159 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3125,7 +2982,7 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3134,9 +2991,8 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts
index 9bc54bf276c..6d464bc46af 100644
--- a/gui/cppcheck_fr.ts
+++ b/gui/cppcheck_fr.ts
@@ -65,11 +65,6 @@ General Public License version 3</translation>
         <source>Select viewer application</source>
         <translation>Sélection de l&apos;application</translation>
     </message>
-    <message>
-        <location filename="applicationdialog.cpp" line="83"/>
-        <source>Cppcheck</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="applicationdialog.ui" line="86"/>
         <source>&amp;Executable:</source>
@@ -116,70 +111,6 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation>Vous devez spécifier un nom, un chemin, et eventuellement des paramètres en option à l&apos;application !</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -187,12 +118,6 @@ Paramètres : -l(ligne) (fichier)</translation>
         <source>Could not find the file: %1</source>
         <translation>Ne trouve pas le fichier : %1</translation>
     </message>
-    <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
         <source>Could not read the file: %1</source>
@@ -217,15 +142,10 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="helpdialog.cpp" line="86"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LibraryAddFunctionDialog</name>
@@ -313,13 +233,13 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation type="unfinished">Editer</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -344,29 +264,22 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -483,25 +396,6 @@ Paramètres : -l(ligne) (fichier)</translation>
 </context>
 <context>
     <name>MainWindow</name>
-    <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
         <source>Checking for updates</source>
@@ -518,13 +412,13 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -534,350 +428,335 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Édition</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licence...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;uteurs...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>À &amp;Propos...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Fichiers...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Répertoires...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Arrêter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Sauvegarder les résultats dans un fichier...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Effacer les résultats</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Préférences</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Tout cocher</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Tout décocher</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>&amp;Tout réduire</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Tout dérouler</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenus</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Ouvir l&apos;aide</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Licence</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Sauvegarder le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>Fichiers XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>Fichiers Texte (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>Fichiers CSV (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Boite à outils</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>Afficher les avertissements de style</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>Afficher les erreurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Ouvrir un fichier XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Ouvrir un P&amp;rojet...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nouveau Projet...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Journal</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Journal</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>F&amp;ermer le projet</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Editer le projet</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>Afficher les avertissements</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>Afficher les avertissements de performance</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Afficher les messages d&apos;information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Afficher les problèmes de portabilité</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Vous devez d&apos;abord fermer le projet avant de choisir des fichiers/répertoires</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>Ouvrir le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -897,132 +776,132 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtre</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>Filtre rapide : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>Projet : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1033,144 +912,139 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>Fichier introuvable</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation>Mauvais fichier XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation>Attribut manquant</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation>Mauvaise valeur d&apos;attribut</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>Echec lors du chargement de la bibliothèque &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>Format non supporté</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>La bibliothèque &apos;%1&apos; contient des éléments inconnus:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation> &amp;Imprimer...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Imprimer le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Apercu d&apos;impression...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1188,296 +1062,286 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1513,38 +1377,13 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Platforms</name>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="platforms.cpp" line="38"/>
         <source>Native</source>
@@ -1577,15 +1416,15 @@ Do you want to proceed?</source>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
@@ -1600,22 +1439,22 @@ Do you want to proceed?</source>
         <translation>Descendre</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>Suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1640,17 +1479,17 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1660,95 +1499,99 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1758,143 +1601,148 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1914,19 +1762,19 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1934,115 +1782,116 @@ Do you want to proceed?</source>
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>Fichier projet : %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Selectionner un répertoire à inclure</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>Selectionner un répertoire à ignorer</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>Selectionner un répertoire à vérifier</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
-        <source>Exclude file</source>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
-        <source>Select MISRA rule texts file</source>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
-        <source>MISRA rule texts file (%1)</source>
+        <location filename="projectfiledialog.cpp" line="894"/>
+        <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="977"/>
+        <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="979"/>
+        <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="628"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>Fichier de langue %1 non trouvé !</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation>Erreur lors du chargement de la langue %1 depuis le fichier %2</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2092,180 +1941,175 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Ligne</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Sévérité</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Résumé</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation type="unfinished">Fermer</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation type="unfinished">Sauvegarder</translation>
     </message>
@@ -2285,18 +2129,11 @@ Do you want to proceed?</source>
         <translation type="obsolete">Ligne</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>Fichier indéterminé</translation>
+        <translation type="vanished">Fichier indéterminé</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2305,12 +2142,12 @@ Please check the application path and parameters are correct.</source>
 Merci de vérifier que le chemin de l&apos;application et que les paramètres sont corrects.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>erreur de style</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>erreur</translation>
     </message>
@@ -2319,59 +2156,68 @@ Merci de vérifier que le chemin de l&apos;application et que les paramètres so
         <translation type="vanished">Résumé</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>Cacher</translation>
+        <translation type="vanished">Cacher</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Fichier introuvable !</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Selectionner dossier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>avertissement</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilité</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>information</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>débogage</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2382,62 +2228,61 @@ Please select the default editor application in preferences/Applications.</sourc
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Ouvrir l&apos;emplacement du fichier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
         <source>Recheck</source>
-        <translation>Revérifier</translation>
+        <translation type="vanished">Revérifier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2450,92 +2295,81 @@ Please select the default editor application in preferences/Applications.</sourc
         <translation>Résultats</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Pas d&apos;erreurs trouvées.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Des erreurs ont été trouvées mais sont configurées pour rester cachées.
 Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Erreur lors de la sauvegarde du rapport.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Erreur lors de la lecture du rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 fichiers sur %2 vérifiés)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Imprimer le rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Aucune erreur trouvée. Il n&apos;y a rien à imprimer</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2555,17 +2389,17 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2616,180 +2450,180 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <translation>Nombre de fils : </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Montrer le chemin complet des fichiers</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Afficher un message &quot;Pas d&apos;erreur trouvée&quot; lorsque aucune erreur est trouvée</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Rapports</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Sauvegarder toutes les erreurs lorsqu&apos;un rapport est créé</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Sauvegarder le chemin complet des fichiers dans les rapports</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>Ajouter...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
-        <source>Ideal count:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>Editer...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Afficher l&apos;identifiant d&apos;erreur Id dans la colonne &quot;Id&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>Montrer les avertissements internes dans le journal</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2797,47 +2631,42 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Ajouter une nouvelle application</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Modifier une application</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2847,14 +2676,14 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Projet</translation>
     </message>
@@ -2880,7 +2709,7 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Analyse précédente</translation>
     </message>
@@ -2945,123 +2774,123 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <translation>Copier vers le presse-papier</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation type="unfinished">Chemins</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation type="unfinished">Erreurs</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation type="unfinished">Avertissements</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation type="unfinished">Avertissement de style</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation type="unfinished">Avertissements de performance</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3071,7 +2900,7 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3086,12 +2915,12 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3101,15 +2930,23 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3117,7 +2954,7 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3125,11 +2962,6 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
 The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="translationhandler.cpp" line="132"/>
-        <source>Cppcheck</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TxtReport</name>
diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts
index ab6b869beb6..65b31b59b1e 100644
--- a/gui/cppcheck_it.ts
+++ b/gui/cppcheck_it.ts
@@ -107,9 +107,8 @@ Parametri: -l(line) (file)
         <translation>Seleziona l&apos;applicazione di lettura</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -117,70 +116,6 @@ Parametri: -l(line) (file)
         <translation>Devi specificare un nome, un percorso ed, opzionalmente, i parametri per l&apos;applicazione!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -189,10 +124,8 @@ Parametri: -l(line) (file)
         <translation>File non trovato: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -218,14 +151,13 @@ Parametri: -l(line) (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -334,42 +266,39 @@ Parametri: -l(line) (file)
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,31 +416,16 @@ Parametri: -l(line) (file)
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
@@ -521,245 +435,245 @@ Parametri: -l(line) (file)
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Barre degli strumenti</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Modifica</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licenza...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;utori...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>I&amp;nformazioni su...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;File...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished">Scansiona i file</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Cartella...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished">Scansiona la cartella</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Ferma</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished">Ferma la scansione</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Salva i risultati nel file...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Cancella i risultati</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Preferenze</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>Mostra gli errori</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>Mostra gli avvisi</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>Mostra gli avvisi sulle prestazioni</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Mostra &amp;i nascosti</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Mostra messaggi di informazione</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Mostra gli avvisi sulla portabilità</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Filtra i risultati</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit, ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit, Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Seleziona tutto</translation>
     </message>
@@ -774,300 +688,290 @@ Parametri: -l(line) (file)
         <translation type="unfinished">Nascondi</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Deseleziona tutto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Riduci &amp;tutto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Espandi tutto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Oggetti standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorie</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Categorie di errore</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Apri XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Apri file di p&amp;rogetto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nuovo file di progetto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Visualizza il rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Visualizza il rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>C&amp;hiudi il file di progetto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Modifica il file di progetto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistiche</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenuti</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Categorie</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>Mostra gli avvisi sullo stile</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Apri i contenuti di aiuto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
@@ -1077,18 +981,18 @@ Parametri: -l(line) (file)
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>Rapido filtro:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1097,96 +1001,96 @@ Do you want to load this project file instead?</source>
 Vuoi piuttosto caricare questo file di progetto?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Licenza</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Autori</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Salva il file di rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>File XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1195,126 +1099,111 @@ This is probably because the settings were changed between the Cppcheck versions
 Probabilmente ciò è avvenuto perché le impostazioni sono state modificate tra le versioni di Cppcheck. Per favore controlla (e sistema) le impostazioni delle applicazioni editor, altrimenti il programma editor può non partire correttamente.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Devi chiudere il file di progetto prima di selezionare nuovi file o cartelle!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>Apri il file di rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>File di testo (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>Files CSV (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Files di progetto (*.cppcheck);;Tutti i files(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>Seleziona il file di progetto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>Progetto:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1322,34 +1211,29 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1369,34 +1253,34 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>Seleziona il nome del file di progetto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>Nessun file di progetto caricato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1413,72 +1297,72 @@ Do you want to remove the file from the recently used projects -list?</source>
 Vuoi rimuovere il file dalla lista dei progetti recentemente usati?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1508,7 +1392,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1541,7 +1425,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1554,29 +1438,24 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit, ANSI</translation>
+        <translation type="vanished">Windows 32-bit, ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit, Unicode</translation>
+        <translation type="vanished">Windows 32-bit, Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1604,58 +1483,58 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1666,8 +1545,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1695,15 +1573,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
@@ -1723,114 +1601,134 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Abilita le soppressioni</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1845,116 +1743,106 @@ Options:
         <translation>Giù</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
         <source>Defines:</source>
@@ -1964,82 +1852,83 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>File di progetto: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Seleziona la cartella da includere</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>Seleziona una cartella da scansionare</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="628"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="630"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>Seleziona la cartella da ignorare</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2047,32 +1936,32 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Lingua specificata sconosciuta!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>Il file di lingua %1 non trovato!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation>Fallito il tentativo di aprire la traduzione per la lingua %1 dal file %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2122,181 +2011,176 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">File</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Linea</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Severità</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Riassunto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2320,93 +2204,94 @@ Options:
         <translation type="vanished">Riassunto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>File indefinito</translation>
+        <translation type="vanished">File indefinito</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>Nascondi</translation>
+        <translation type="vanished">Nascondi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2415,7 +2300,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Configura l&apos;applicazione di scrittura per Cppcheck in Preferenze/Applicazioni.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2424,12 +2309,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Per favore seleziona l&apos;applicazione di scrittura predefinito in Preferenze/Applicazioni.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Non è stato possibile trovare il file!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2438,7 +2323,7 @@ Please check the application path and parameters are correct.</source>
 Per favore verifica che il percorso dell&apos;applicazione e i parametri siano corretti.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Seleziona Cartella</translation>
     </message>
@@ -2447,32 +2332,32 @@ Per favore verifica che il percorso dell&apos;applicazione e i parametri siano c
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>stile</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>errore</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>avviso</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilità</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>Informazione</translation>
     </message>
@@ -2480,107 +2365,100 @@ Per favore verifica che il percorso dell&apos;applicazione e i parametri siano c
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 su %2 file scansionati)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Nessun errore trovato.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Sono stati trovati errori, ma sono stati configurati per essere nascosti.
 Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Apertura del report fallito.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Salvataggio del report fallito.</translation>
     </message>
@@ -2646,7 +2524,7 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>Aggiungi...</translation>
     </message>
@@ -2656,175 +2534,179 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
         <translation>Numero di threads: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>Numero ideale:</translation>
+        <translation type="vanished">Numero ideale:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>Forza la scansione di tutte le configurazioni #ifdef</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Mostra tutto il percorso dei files</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Mostra il messaggio &quot;Nessun errore trovato&quot; quando nessun errore è stato trovato</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Mostra l&apos;id dell&apos;errore nella colonna &quot;Id&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>Abilita le soppressioni</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>Modifica...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>Imposta come predefinito</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Rapporti</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Salva tutti gli errori quando viene creato il rapporto</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Salva tutto il percorso ai files nei rapporti</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>Lingua</translation>
     </message>
@@ -2832,47 +2714,46 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation type="vanished">N/A</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Aggiungi una nuova applicazione</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Modifica un&apos;applicazione</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[Predefinito]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2882,14 +2763,14 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistiche</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Progetto</translation>
     </message>
@@ -2920,7 +2801,7 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Precedente Scansione</translation>
     </message>
@@ -3000,151 +2881,159 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 giorno</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 giorni</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 ora</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 ore</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minuto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minuti</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 secondo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 secondi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0,%1 secondi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Impostazioni progetto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Percorsi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Percorsi di inclusione</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Definizioni</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Selezionato percorso</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Numero di file scansionati</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Durata della scansione</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Errori</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Avvisi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stilwarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Avvisi sulla portabilità</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Avvisi sulle performance</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Messaggi di informazione</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 su %2 file scansionati</translation>
     </message>
@@ -3152,7 +3041,7 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3165,9 +3054,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 L&apos;interfaccia utente è stata risettata in Inglese. Apri la finestra di dialogo Preferenze per selezionare una qualunque lingua a disposizione.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts
index 0631e9a4cfd..eedad8e9515 100644
--- a/gui/cppcheck_ja.ts
+++ b/gui/cppcheck_ja.ts
@@ -106,9 +106,8 @@ Parameters: -l(line) (file)</translation>
         <translation>表示アプリケーションの選択</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -119,65 +118,52 @@ Parameters: -l(line) (file)</translation>
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation>コンプライアンスレポート</translation>
+        <translation type="vanished">コンプライアンスレポート</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation>プロジェクト名</translation>
+        <translation type="vanished">プロジェクト名</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation>プロジェクトバージョン</translation>
+        <translation type="vanished">プロジェクトバージョン</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
         <source>Coding Standard</source>
-        <translation>コーディング標準</translation>
+        <translation type="vanished">コーディング標準</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
         <source>Misra C</source>
-        <translation>MISRA C</translation>
+        <translation type="vanished">MISRA C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
         <source>Cert C</source>
-        <translation>CERT C</translation>
+        <translation type="vanished">CERT C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation>md5チェックサムつきファイルリスト</translation>
+        <translation type="vanished">md5チェックサムつきファイルリスト</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation>コンプライアンスレポート</translation>
+        <translation type="vanished">コンプライアンスレポート</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation>HTMLファイル(*.html)</translation>
+        <translation type="vanished">HTMLファイル(*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation>コンプライアンスレポートの保存</translation>
+        <translation type="vanished">コンプライアンスレポートの保存</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
         <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation>&apos;%1&apos; (%2)のインポートに失敗しました。コンプライアンスレポートに表示できません</translation>
+        <translation type="vanished">&apos;%1&apos; (%2)のインポートに失敗しました。コンプライアンスレポートに表示できません</translation>
     </message>
     <message>
         <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
@@ -192,10 +178,8 @@ Parameters: -l(line) (file)</translation>
         <translation>ファイル：%1 が見つかりません</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -221,14 +205,13 @@ Parameters: -l(line) (file)</translation>
         <translation>インデックス</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>ヘルプファイル &apos;%1&apos; が見つかりません</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -337,42 +320,39 @@ Parameters: -l(line) (file)</translation>
         <translation>編集</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>ライブラリファイル(*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>ライブラリファイルを開く</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>ファイルが見つかりません %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>読み込みに失敗しました(%1.%2)。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation>ファイルが保存できません %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>このライブラリに名前をつけて保存する</translation>
     </message>
@@ -501,23 +481,8 @@ Parameters: -l(line) (file)</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
@@ -525,12 +490,12 @@ Parameters: -l(line) (file)</translation>
         <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>表示(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>ツールバー(&amp;T)</translation>
     </message>
@@ -540,266 +505,266 @@ Parameters: -l(line) (file)</translation>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++標準</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;C標準</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>編集(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>言語規格</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>カテゴリ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>ライセンス(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;u)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>Cppcheckについて(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>ファイル選択(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>ファイルをチェックする</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>ディレクトリ選択(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>ディレクトリをチェックする</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>停止(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>チェックを停止する</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>結果をファイルに保存(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>終了(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>結果をクリア(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>設定(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>スタイル警告を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>エラーを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>情報メッセージを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>移植可能性の問題を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Cppcheck結果を表示する</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Clangの結果を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>フィルター(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>フィルタ結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSIエンコード</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>印刷(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>現在のレポートを印刷</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>印刷プレビュー(&amp;v)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>現在のレポートをプレビュー表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>ライブラリエディタを開く</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>プロジェクトを閉じる(&amp;l)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>プロジェクトの編集(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>統計情報(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>警告を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>パフォーマンス警告を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>非表示を表示(&amp;h)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>すべてのエラーを表示(&amp;C)</translation>
     </message>
@@ -814,284 +779,294 @@ Parameters: -l(line) (file)</translation>
         <translation>非表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation>レポート</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>チェック(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>フィルター</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>変更ありファイルを再解析(&amp;R)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>全ファイル再解析(&amp;y)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>スタイル警告(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>エラー(&amp;r)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>すべてのエラーを非表示(&amp;U)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>ツリーを折り畳む(&amp;a)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>ツリーを展開(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>言語規格(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>標準項目</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>コンテンツ(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>ヘルプファイルを開く</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>ツールバー</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>カテゴリ(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>エラーカテゴリ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>XMLを開く(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>プロジェクトを開く(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>スクラッチパッドを表示(&amp;o)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>新規プロジェクト(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>ログを表示(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>ログ表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>パフォーマンス警告(&amp;f)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>情報(&amp;I)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>移植可能性(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>プラットフォーム(&amp;l)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++11(&amp;1)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C99(&amp;9)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>Posix(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C11(&amp;1)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>C89(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>C++03(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>ライブラリエディタ(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>自動言語検出(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>C++ 強制(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>C 強制(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>ライブラリを再チェックする</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>チェックの設定(define、インクルード)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation>コンプライアンスレポート...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation>ノーマル</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
         <source>Misra C</source>
-        <translation>MISRA C</translation>
+        <translation type="vanished">MISRA C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="993"/>
         <source>Misra C++ 2008</source>
-        <translation>MISRA C++ 2008</translation>
+        <translation type="vanished">MISRA C++ 2008</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1001"/>
         <source>Cert C</source>
-        <translation>CERT C</translation>
+        <translation type="vanished">CERT C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
         <source>Misra C++ 2023</source>
-        <translation>MISRA C++ 2023</translation>
+        <translation type="vanished">MISRA C++ 2023</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
+        <location filename="mainwindow.ui" line="1035"/>
         <source>Autosar</source>
         <translation>AUTOSAR</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation>EULA...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
+        <translation>スレッド詳細</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
+        <translation>スレッド詳細を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1100,23 +1075,23 @@ This is probably because the settings were changed between the Cppcheck versions
 Cppcheckの古いバージョンの設定には互換性がありません。エディタアプリケーションの設定を確認して修正してください、そうしないと正しく起動できないかもしれません。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>新しいファイル／ディレクトリをチェックするには現在のプロジェクトを閉じてください!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>クイックフィルタ：</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation>コンフィグレーションの選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1125,69 +1100,64 @@ Do you want to load this project file instead?</source>
 現在のプロジェクトの代わりにこのプロジェクトファイルを読み込んでもかまいませんか？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>このライブラリ &apos;%1&apos; には次の不明な要素が含まれています。
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>ファイルがありません</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation>不正なXML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation>属性がありません</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation>不正な属性があります</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>サポートされていないフォーマット</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation>プラットフォームの種類が重複しています</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation>プラットフォームの種類が再定義されました</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation>不明な要素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation>不明な課題</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>選択したライブラリの読み込みに失敗しました &apos;%1&apos;
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
@@ -1200,53 +1170,52 @@ Do you want to load this project file instead?</source>
         <translation type="vanished">%1 - %2 の読み込みに失敗</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML ファイル (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>レポートを開く</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>ライセンス</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>レポートを保存</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>テキストファイル (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV形式ファイル (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
         <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation>コンプライアンスレポートをすぐに生成できません。解析が完了し成功していなければなりません。コードを再解析して、致命的なエラーがないことを確認してください。</translation>
+        <translation type="vanished">コンプライアンスレポートをすぐに生成できません。解析が完了し成功していなければなりません。コードを再解析して、致命的なエラーがないことを確認してください。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>プロジェクトファイル (*.cppcheck);;すべてのファイル(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>プロジェクトファイルを選択</translation>
     </message>
@@ -1266,7 +1235,7 @@ Do you want to load this project file instead?</source>
         <translation>プロジェクトファイルのインポートに失敗しました</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
@@ -1275,70 +1244,68 @@ Analysis is stopped.</source>
 解析を停止しました。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation>&apos;%1&apos; (%2) のインポートに失敗しました。解析は停止</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation>インストール</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation>新しいバージョンが利用可能です。: %1. %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>プロジェクト:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation>チェック対象のファイルがみつかりません!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation>C/C++のソースコード</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation>コンパイルデータベース</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation>チェック対象のファイルを選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation>チェックするディレクトリを選択してください</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>チェックの設定を選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1347,37 +1314,37 @@ Do you want to proceed analysis without using any of these project files?</sourc
 みつかったプロジェクトファイルを使用せずにチェックしますか?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation>重複した定義</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation>ファイルがありません: &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation>アドオンの読み込みまたは設定に失敗 %1 - %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation>%1のロードに失敗しました。あなたの Cppcheck は正しくインストールされていません。あなたは --data-dir=&lt;directory&gt; コマンドラインオプションを使ってこのファイルの場所を指定できます。ただし、この --data-dir はインストールスクリプトによって使用されていなければなりません。またGUI版はこれを使用しません。さらに、全ての設定は調整済みでなければなりません。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation>読み込みに失敗 %1 - %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
@@ -1386,7 +1353,7 @@ Analysis is aborted.</source>
 解析は中止した。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1396,7 +1363,7 @@ Do you want to proceed?</source>
 新しくXMLファイルを開くと現在の結果が削除されます。実行しますか？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1405,77 +1372,77 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 チェックを中断して、Cppcheckを終了しますか?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation>CppCheckについて</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML ファイル (*.xml);;テキストファイル (*.txt);;CSVファイル (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>ビルドディレクトリ&apos;%1&apos;がありません。作成しますか?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>アドオンを使用してプロジェクトをチェックするためには、ビルドディレクトリが必要です。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation>必須を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation>要求を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation>推奨を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation>ドキュメントを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation>L1を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation>L2を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation>L3を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation>スタイルを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation>移植可能性を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation>パフォーマンスを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation>情報を表示</translation>
     </message>
@@ -1484,22 +1451,22 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="vanished">&apos;%1&apos;のインポートに失敗しました。(チェック中断)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation>プロジェクトファイル (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>プロジェクトファイル名を選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>プロジェクトファイルが読み込まれていません</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1511,7 +1478,7 @@ Do you want to remove the file from the recently used projects -list?</source>
 最近使用したプロジェクトのリストからこのファイルを取り除きますか？</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1552,7 +1519,7 @@ Options:
     --data-dir=&lt;directory&gt;  GUI のデータファイル(翻訳やcfg)のあるディレクトリを指定する。このオプションを指定した場合、GUIで起動しません。</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - コマンドラインパラメータ</translation>
     </message>
@@ -1585,7 +1552,7 @@ Options:
         <translation>シンボル名</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>抑制の編集</translation>
     </message>
@@ -1598,29 +1565,24 @@ Options:
         <translation>ネイティブ</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSIエンコード</translation>
+        <translation type="vanished">Windows 32-bit ANSIエンコード</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1648,7 +1610,7 @@ Options:
         <translation>定義(Define)はセミコロン&apos;;&apos;で区切る必要があります。 例: DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>カスタマイズした cfgファイルを同じフォルダにプロジェクトファイルとして保存してください。ここに表示できるようになります。</translation>
     </message>
@@ -1657,17 +1619,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation>MISRA ルールテキスト</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;MISRA C 2012 pdfのAppendix A &amp;quot;Summary of guidelines&amp;quot; からテキストをコピーペーストしてください。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1678,8 +1640,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation>参照...</translation>
     </message>
@@ -1707,15 +1668,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>取り除く</translation>
     </message>
@@ -1735,145 +1696,169 @@ Options:
         <translation>インクルードパス:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation>インクルードファイル</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;ヘッダファイルを強制的にインクルードします&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation>ブラウズ..</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation>型と関数</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation>チェック</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation>Cppcheckがさまざまな目的で使用するワークディレクトリ。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation>パーサー</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheckビルトイン</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation>チェックレベル</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
-        <translation type="unfinished"></translation>
+        <translation>#R 限定的 -- 開発者が直接的に結果を得るための解析を意味します。解析は限定的で高速ですがより少ない結果になります。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation>#N 通常 -- CIでの通常の解析を意味します。解析が合理的な時間内に完了すべきです。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation>#E 徹底的 -- ナイトリービルド等を意味します。解析時間はより長くなることがあります (コンパイルの10倍以上時間がかかってもよい)。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation>ヘッダファイルのコードもチェック  (通常はONにしてください、制限するときのみOFF)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
         <source>Premium License</source>
-        <translation>プレミアムライセンス</translation>
+        <translation type="vanished">プレミアムライセンス</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation>タグが追加された場合、警告上で右クリックしてそれらのタグの中の一つを設定できます。警告を分類できます。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation>除外するソースファイル</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation>フォルダで除外...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation>ファイルで除外...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation>クラスが安全で公開されたインターフェースをもっているか確認</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation>解析の制限</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation>未使用テンプレートのコードもチェック (解析に時間がかかり、また正確性は低い)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation>CTUの最大深さ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation>inline抑制を有効にする</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation>MISRA C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation>2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation>2023</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation>2025</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation>MISRA C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation>2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation>Cert C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation>安全性プロファイル(C++コアガイドラインで定義)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation>バグハンティング(プレミアム)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation>外部ツール</translation>
     </message>
@@ -1888,88 +1873,88 @@ Options:
         <translation>下</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation>プラットフォーム</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation>Clang (実験的)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation>可能な限りクラスが柔軟であり堅牢であることを望む場合、公開されたインターフェースが非常に堅牢です。Cppcheckは引数があらゆる値をとりうると仮定します。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation>テンプレートインスタンス化の最大再帰回数</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation>警告オプション</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation>ルートパス:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>警告中のファイルパスはこのパスからの相対パスになります</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告タグ(セミコロン区切り)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck ビルドディレクトリ (全プログラムチェック, 差分チェック, 統計等)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation>ライブラリ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>指摘の抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation>アドオン</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation>注意: アドオンには&lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt;が必要です。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation>スレッドセーフ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation>コーディング標準</translation>
     </message>
@@ -1978,12 +1963,12 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation>CERT C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation>CERT-INT35-C:  int型の精度 (もしサイズが精度と一致する場合空のままにしてください)</translation>
     </message>
@@ -1992,24 +1977,22 @@ Options:
         <translation type="vanished">MISRA C++ 2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation>AUTOSAR</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation>バグハント</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="999"/>
         <source>Clang analyzer</source>
-        <translation>Clang Analyzer</translation>
+        <translation type="vanished">Clang Analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="992"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
@@ -2020,82 +2003,91 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>プロジェクトファイル:%1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation>Cppcheckビルドディレクトリ</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>includeディレクトリを選択</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>チェックするディレクトリを選択してください</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
-        <translation type="unfinished"></translation>
+        <translation>注意: オープンソースのCppcheckはMisra C 2012を完全にサポートしていません。</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (みつかりません)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
+        <location filename="projectfiledialog.cpp" line="628"/>
         <source>Compile database</source>
         <translation>コンパイルデータベース</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation>プロジェクトのインポート</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
+        <translation>C/C++のヘッダー</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
+        <translation>ファイルのインクルード</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>除外するディレクトリを選択してください</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation>ソースファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation>全ファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation>除外ファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation>MISRAルールテキストファイルを選択</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRAルールテキストファイル (%1)</translation>
     </message>
@@ -2111,32 +2103,32 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>未知の言語が指定されました!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>言語ファイル %1 が見つかりません!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation>言語 %2 から %1 への翻訳ファイルの読み込みに失敗</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation>行 %1: 扱われていない要素(Unhandled element) %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation>行 %1: 必須の属性 &apos;%2&apos; が &apos;%3&apos;にない</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (見つかりません)</translation>
     </message>
@@ -2186,181 +2178,180 @@ Options:
         <translation>黒</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>エディタの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>エディタの背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>ハイライトの背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>行番号の前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>行番号の背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>キーワードの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation>キーワードのフォントのウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>クラスの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation>クラスフォントのウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation>クォートの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation>クォートのフォントウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation>コメントの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation>コメントフォントのウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>シンボルの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>シンボルの背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>シンボルのフォントウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation>デフォルトをライトに設定</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation>デフォルトをダークに設定</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation>行</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation>警告の種別</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation>分類</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation>レベル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation>結論のでない</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation>要約</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation>ガイドライン</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation>ルール</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation>日付</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation>タグ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="144"/>
         <source>CWE</source>
-        <translation>CWE</translation>
+        <translation type="vanished">CWE</translation>
     </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>保存する</translation>
     </message>
@@ -2384,93 +2375,98 @@ Options:
         <translation type="vanished">要約</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>未定義ファイル</translation>
+        <translation type="vanished">未定義ファイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>ファイルが見つかりません:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>フォルダ &apos;%1&apos; を選択してください</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>ディレクトリ &apos;%1&apos; 選択</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>ファイルのあるディレクトリを選択してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>デバッグ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
         <source>Recheck</source>
-        <translation>再チェック</translation>
+        <translation type="vanished">再チェック</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>非表示</translation>
+        <translation type="vanished">非表示</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>IDで非表示を指定</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>選択したidを抑制</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>含まれるフォルダを開く</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation>内部</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation>再チェック %1 件のファイル</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation>非表示 %1 件の結果</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>タグ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>タグなし</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2480,7 +2476,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Cppcheckの「設定」からテキストファイルを編集するアプリケーションを設定してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2489,12 +2485,12 @@ Please select the default editor application in preferences/Applications.</sourc
 設定からデフォルトのエディタアプリケーションを設定してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>ファイルが見つかりません!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2503,7 +2499,7 @@ Please check the application path and parameters are correct.</source>
 実行ファイルパスや引数の設定を確認してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>ディレクトリを選択</translation>
     </message>
@@ -2520,32 +2516,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">日付</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>スタイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>パフォーマンス</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>移植可能性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>情報</translation>
     </message>
@@ -2573,106 +2569,103 @@ Please check the application path and parameters are correct.</source>
         <translation>警告の詳細</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>レポートの保存に失敗しました。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>レポートの印刷</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>指摘がないため、印刷するものがありません。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 / %2 :ファイル数)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>警告/エラーは見つかりませんでした。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>警告/エラーが見つかりましたが、非表示設定になっています。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>レポートの読み込みに失敗.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML フォーマットバージョン 1 はもうサポートされていません。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>は次のものが最初にインクルードしました</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
         <source>Bug hunting analysis is incomplete</source>
-        <translation>バグハントの解析は不完全です</translation>
+        <translation type="vanished">バグハントの解析は不完全です</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation>ログの消去</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation>このログ項目をコピー</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation>ログ全体をコピー</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation>解析は停止しした</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation>id &apos;%1&apos;の致命的なエラーがあります</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation>%1 をチェックするとき</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation>ファイルをチェックするとき</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation>解析は中止した。</translation>
     </message>
@@ -2718,7 +2711,7 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>追加...</translation>
     </message>
@@ -2728,176 +2721,180 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>解析用のスレッド数: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>理想的な数：</translation>
+        <translation type="vanished">理想的な数：</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>すべての #ifdef をチェックする</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>ファイルのフルパスを表示</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>エラーが無いときは&quot;エラーなし&quot;を表示</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>エラーIDを &quot;Id&quot; に表示する</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>inline抑制を有効にする</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation>結論のでない指摘もチェックする</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation>チェック完了時に統計情報を表示する</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation>更新の確認</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>ログの内部警告も表示する</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation>アドオン</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Pythonインタプリタの場所(空白の場合システムのPATHから検索)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation>MISRAアドオン</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA ルールテキストファイル</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdfのテキストをテキストファイルにコピー&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clangの場所(空白の場合システムのPATHから検索)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studioのヘッダ</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Visual Studioのヘッダーファイル(セミコロン区切り&apos;;&apos;)。&lt;/p&gt;&lt;p&gt;Visual Studio コマンドプロンプトを開き、 &amp;quot;SET INCLUDE&amp;quot;. と入力後、そのパスをコピーペーストしてください。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation>コードエディタ</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation>コードエディタスタイル</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation>システムのデフォルトのスタイル</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation>ライトスタイルをデフォルトに</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation>ダークスタイルをデフォルトに</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation>カスタム</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation>#M 最大数:</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>アプリケーション</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>編集...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>デフォルトとして設定</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>レポート</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>レポート作成時にすべての警告/エラーを保存</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>レポートにファイルのフルパスを保存</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>言語</translation>
     </message>
@@ -2905,47 +2902,46 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation type="vanished">N/A</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation>実行ファイル &quot;%1&quot; が利用できません</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>新しいアプリケーションの追加</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>アプリケーションの変更</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation> [デフォルト]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[デフォルト]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation>pythonの場所の選択</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation>MISRAファイルの選択</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation>clangのパスの選択</translation>
     </message>
@@ -2955,14 +2951,14 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>統計情報</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>プロジェクト</translation>
     </message>
@@ -2993,7 +2989,7 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>前回の解析</translation>
     </message>
@@ -3073,151 +3069,159 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>PDF エクスポート</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>一日</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1日</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>一時間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1時間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>一分</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1分</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>一秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> と </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>PDF エクスポート</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>プロジェクトの設定</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>インクルードパス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>定義(define)</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>定義取り消し(Undef)</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>選択されたパス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>スキャンしたファイルの数</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>スキャン期間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>ファイル: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>cppcheckビルドディレクトリがありません</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>スタイル警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>移植可能性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>パフォーマンス警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>情報メッセージ</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation>スレッド詳細</translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>チェック: %1 / %2 (ファイル数)</translation>
     </message>
@@ -3225,7 +3229,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3236,9 +3240,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 そのため言語を 英語にリセットします。設定ダイアログから利用可能な言語を選択してください。</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ka.ts b/gui/cppcheck_ka.ts
index 7e1c3a14426..00239743df0 100644
--- a/gui/cppcheck_ka.ts
+++ b/gui/cppcheck_ka.ts
@@ -96,9 +96,8 @@ Parameters: -l(line) (file)</source>
         <translation>აირჩიეთ აპლიკაცია</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -109,65 +108,52 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation>შესაბამისობის ანგარიში</translation>
+        <translation type="vanished">შესაბამისობის ანგარიში</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation>პროექტის სახელი</translation>
+        <translation type="vanished">პროექტის სახელი</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation>პროექტის ვერსია</translation>
+        <translation type="vanished">პროექტის ვერსია</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
         <source>Coding Standard</source>
-        <translation>კოდირების სტანდარტი</translation>
+        <translation type="vanished">კოდირების სტანდარტი</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
         <source>Misra C</source>
-        <translation>Misra C</translation>
+        <translation type="vanished">Misra C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
         <source>Cert C</source>
-        <translation>Cert C</translation>
+        <translation type="vanished">Cert C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
         <source>Cert C++</source>
-        <translation>Cert C++</translation>
+        <translation type="vanished">Cert C++</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation>MD5 საკონტროლო ჯამების მქონე ფაილების სია</translation>
+        <translation type="vanished">MD5 საკონტროლო ჯამების მქონე ფაილების სია</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation>შესაბამისობის ანგარიში</translation>
+        <translation type="vanished">შესაბამისობის ანგარიში</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation>HTML ფაილები (*.html)</translation>
+        <translation type="vanished">HTML ფაილები (*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation>შესაბამისობის ანგარიშის შენახვა</translation>
+        <translation type="vanished">შესაბამისობის ანგარიშის შენახვა</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
         <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation>&apos;%1&apos;-ის (%2) შემოტანა ჩავარდა. შესაბამისობის ანგარიშში ფაილებს ვერ ვაჩვენებ</translation>
+        <translation type="vanished">&apos;%1&apos;-ის (%2) შემოტანა ჩავარდა. შესაბამისობის ანგარიშში ფაილებს ვერ ვაჩვენებ</translation>
     </message>
 </context>
 <context>
@@ -180,10 +166,8 @@ Parameters: -l(line) (file)</source>
         <translation>ვერ ვიპოვე ფაილი: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -209,14 +193,13 @@ Parameters: -l(line) (file)</source>
         <translation>ინდექსი</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>დახმარების ფაილი &apos;%1&apos; ვერ ვიპოვე</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -325,41 +308,38 @@ Parameters: -l(line) (file)</source>
         <translation>ჩასწორება</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>ბიბლიოთეკის ფაილები (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>ბიბლიოთეკის ფაილის გახსნა</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>ფაილის &apos;%1&apos; გახსნის შეცდომა.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>%1-ის ჩატვირთვის შეცდომა. %2.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation>ფაილის შენახვის შეცდომა: %1 .</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>ბიბლიოთეკის შენახვა, როგორც</translation>
     </message>
@@ -477,31 +457,16 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>ა&amp;ნალიზი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>სტანდარტული</translation>
     </message>
@@ -511,245 +476,245 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;ფაილი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;ხედი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;ხელსაწყოთა ზოლები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++-ის სტანდარტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;C-ის სტანდარტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;ჩასწორება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;ლიცენზია...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;ავტორები...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;შესახებ...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>ფაილ&amp;ები...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>ფაილების ანალიზი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;საქაღალდე....</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>საქაღალდის ანალიზი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;გაჩერება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>ანალიზის გაჩერება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>შედეგები&amp;ს შენახვა ფაილში....</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>გამოსვლა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>შედეგების &amp;გასუფთავება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;გამართვა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>შეცდომების ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>გაფრთხილების ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>წარმადობის გაფრთხილებების ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>დამალულის &amp;ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>ინფორმაცია</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>ინფორმაციის შეტყობინებების ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>გადატანადობის გაფრთხილებების ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Cppcheck-ის შედეგები ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Clang-ის შედეგები ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;ფილტრი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>შედეგების გაფილტვრა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>&amp;ბეჭდვა…</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>მიმდინარე ანგარიშის დაბეჭდვა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>საბეჭდის &amp;გადახედვა...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>მიმდინარე შედეგების დაბეჭდვის მინიატურის დიალოგის ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>ბიბლიოთეკის რედაქტორის გახსნა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;ყველას ჩართვა</translation>
     </message>
@@ -764,300 +729,302 @@ Parameters: -l(line) (file)</source>
         <translation>დამალვა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>ფილტრი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>ყველა შეცვლილი ფაილის თავიდან ანალი&amp;ზი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>&amp;ყველა ფაილის თავიდან ანალიზი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>ს&amp;ტილის გაფრთხილებები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>&amp;შეცდომები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>ყველას ჩამოყ&amp;რა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>ყველას ჩაკეცვ&amp;ა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;ყველას ამოკეცვა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;სტანდარტული</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>სტანდარტული ელემენტები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>ხელსაწყოთა ზოლი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;კატეგორიები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>შეცდომის კატეგორიები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;XML-ის გახსნა...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>პ&amp;პროექტის ფაილის გახსნა...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>ბლ&amp;ოკნოტის ჩვენება...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;ახალი პროექტის ფაილი...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>ჟურნა&amp;ლის ხედი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>ჟურნალის ხედი</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>პროექტის ფაი&amp;ლის დახურვა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>პროექტის ფაილის ჩასწორ&amp;ება...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;სტატისტიკა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>&amp;გაფრთხილებები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>წარმატების გა&amp;ფრთხილებები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>&amp;ინფორმაცია</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>&amp;გადატანადობა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>პ&amp;ლატფორმები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>&amp;Posix</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>ბიბ&amp;ლიოთეკის რედაქტორი...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>ენის &amp;ავტოდადგენა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>ძ&amp;ალით C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>ძა&amp;ლით C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>ბიბლიოთეკის თავიდან ანალიზი და შემოწმება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>კონფიგურაციის შემოწმება (defines, includes)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation>შესაბამისობის ანგარიში...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished">ნორმალური</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
         <source>Misra C</source>
-        <translation type="unfinished">Misra C</translation>
+        <translation type="obsolete">Misra C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
         <source>Cert C</source>
-        <translation type="unfinished">Cert C</translation>
+        <translation type="obsolete">Cert C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
         <source>Cert C++</source>
-        <translation type="unfinished">Cert C++</translation>
+        <translation type="obsolete">Cert C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;შემცველობა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>კატეგორიები</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>სტილის გაფრთხილების ჩვენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>დახმარების შემცველობის გახსნა</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
@@ -1067,18 +1034,18 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;დახმარება</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>სწრაფი ფილტრი:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation>აირჩიეთ კონფიგურაცია</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1087,61 +1054,61 @@ Do you want to load this project file instead?</source>
 გნებავთ, სამაგიეროდ, ეს პროექტის ფაილი ჩატვირთოთ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>ფაილი ნაპოვნი არაა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation>არასწორი XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation>აკლია ატრიბუტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation>არასწორი ატრიბუტის მნიშვნელობა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>მხარდაუჭერელი ფორმატი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation>გამეორებული აღწერა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>ჩავარდა ჩატვირთვა მონიშნული ბიბლიოთეკისთვის &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation>ფაილი ვერ ვიპოვე: &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation>დამატების (%1) ჩატვირთვა/მორგება ჩავარდა: %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
@@ -1150,8 +1117,8 @@ Analysis is aborted.</source>
 ანალიზი შეწყდა.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
@@ -1160,148 +1127,141 @@ Analysis is aborted.</source>
 ანალიზი შეწყვეტილია.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>ლიცენზია</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>ავტორები</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>ანგარიშის ფაილში ჩაწერა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML ფაილები (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>ახალი ფაილების ან საქაღალდეების არჩევამდე პრორექტის ფაილი უნდა დახუროთ!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>ბიბლიოთეკა &apos;%1&apos; უცნობ ელემენტებს შეიცავს:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation>გამეორებული პლატფორმის ტიპი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation>პლატფორმის ტიპი თავდან აღიწერა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation>უცნობი ელემენტი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation>უცნობი პრობლემა</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>შეცდომა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>ანგარიშის ფაილის გახსნა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>ტექსტური ფაილები (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV ფაილები (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>პროექტის ფაილები (*.cppcheck);;ყველა ფაილი(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>აირჩიეთ პროექტის ფაილი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>პროექტი:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation>ანალიზისათვის შესაფერისი ფაილები აღმოჩენილი არაა!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation>C/C++ საწყისი კოდი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation>მონაცემთა ბაზის კომპილაცია</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation>აირჩეთ ფაილები ანალიზისთვის</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation>აირჩიეთ საქაღალდე ანალიზისთვის</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>აირჩიეთ კონფიგურაცია ანალიზისთვის</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1310,7 +1270,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 გნებავთ, გააგრძელოთ ანალიზი ამ პროექტის ფაილების გამოყენების გარეშე?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1321,7 +1281,7 @@ Do you want to proceed?</source>
 გნებავთ, გააგრძელოთ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1330,27 +1290,26 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 გნებავთ, გააჩეროთ ანალიზი და გახვიდეთ Cppcheck-დან?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation>შესახებ</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML ფაილები (*.xml);;ტექსტური ფაილები (*.txt);;CSV ფაილები (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
         <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation>შესაბამისობის ანგარიშის გენერაცია ახლა შეუძლებელია, რადგან ჯერ ანალიზი წარმატებით უნდა დასრულდეს. სცადეთ, კოდის ანალიზი თავიდან გაუშვათ და დარწმუნდეთ, რომ კრიტიკული შეცდომები არ არსებობს.</translation>
+        <translation type="vanished">შესაბამისობის ანგარიშის გენერაცია ახლა შეუძლებელია, რადგან ჯერ ანალიზი წარმატებით უნდა დასრულდეს. სცადეთ, კოდის ანალიზი თავიდან გაუშვათ და დარწმუნდეთ, რომ კრიტიკული შეცდომები არ არსებობს.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>აგების საქაღალდე (%1) არ არსებობს. შევქმნა?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>პროექტის დამატებებით შესამოწმებლად აგების საქაღალდე გჭირდებათ.</translation>
     </message>
@@ -1370,7 +1329,7 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation>პროექტის ფაილის შემოტანა ჩავარდა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
@@ -1379,27 +1338,27 @@ Analysis is stopped.</source>
 ანალიზი შეწყდა.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation>&apos;%1&apos;-ის (%2) შემოტანა ჩავარდა. ანალიზი შეწყდა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation>პროექტის ფაილები (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>აირჩიეთ პროექტის ფაილის სახელი</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>პროექტის ფაილი ჩატვირთული არაა</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1416,72 +1375,72 @@ Do you want to remove the file from the recently used projects -list?</source>
 გნებავთ წაშალოთ ეს ფაილი ახლახან გამოყენებული პროექტების სიიდან?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation>დაყენება</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation>ხელმისაწვდომია ახალი ვერსია: %1. %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1524,7 +1483,7 @@ Options:
                             არ გამოიყენება.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - ბრძანების სტრიქონის პარამეტრები</translation>
     </message>
@@ -1557,7 +1516,7 @@ Options:
         <translation>სიმბოლოს სახელი</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>ჩახშობის ჩასწორება</translation>
     </message>
@@ -1570,29 +1529,24 @@ Options:
         <translation>საკუთარი</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1620,67 +1574,67 @@ Options:
         <translation>აღწერები წერტილმძიმით უნდა იყოს გამოყოფილი. მაგ: DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>შენიშვნა: ჩადეთ თქვენი .cfg ფაილები იგივე საქაღალდეში, სადაც პროექტის ფაილია. მათ ზემოთ დაინახავთ.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation>Clang (ექსპერიმენტული)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation>თავსართის ფაილებში არსებული კოდის შეწმება  (ნაგულისხმევად, ეს ჩართულია. თუ გნებავთ შეზღუდული სწრაფი ანალიზი, მაშინ გამორთეთ ეს)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>ფაილის ბილიკები ამ ბილიკის ფარდობითი იქნება</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation>თუ ჭდეები დამატებულია, შეგიძლიათ, გაფრთხილებებზე მარჯვენა ღილაკით დააწკაპუნოთ და დააყენოთ ერთ-ერთი ჭდე. გაფრთხილებების კატეგორიებად დალაგება ხელით შეგიძლიათ.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation>კოდის ფაილების ამოღება</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation>საქაღალდის ამოღება...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation>ფაილის ამოღება...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation>MISRA-ის წესის ტექსტები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1691,8 +1645,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation>ნუსხა...</translation>
     </message>
@@ -1720,15 +1673,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>ჩასწორება</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>წაშლა</translation>
     </message>
@@ -1748,114 +1701,134 @@ Options:
         <translation>ჩასმის ბილიკები:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation>ტიპები და ფუნქციები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation>ანალიზი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation>ეს სამუშაო საქაღალდეა, რომელსაც Cppcheck სხვადასხვა მიზნებისთვის გამოიყენებს.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation>ანალიზატორი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheck (ჩაშენებული)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation>შემოწმების დონე</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation>ნორმალური -- ნიშნავს ნორმალურ ანალიზს CI-ში. ანალიზი მისაღებ დროში დასრულდება.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation>ამომწურავი -- განკუთვნილია ღამის აგებებისთვის და ა.შ. ანალიზის დრო, შეიძლება, უფრო მეტიც იყოს (კომპილაციაზე 10x მეტი დრო ჩვეულებრივი ამბავია).</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation>შემოწმება, აქვს თუ არა ყველა კლასს უსაფრთხო საჯარო ინტერფეისი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation>ანალიზის შეზღუდვა</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation>CTU-ის მაქსიმალური სიღრმე</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation>შეცდომების ხაზშივე ჩახშობის ჩართვა</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished">2025</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation>Misra C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation>2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation>Cert C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation>CERT-INT35-C:  მთელი რიცხვის სიზუსტე (თუ ზომა სიზუსტეს ემთხვევა, შეგიძლიათ, ცარიელი დატოვოთ)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation>შეცდომებზე ნადირობა</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation>გარე ხელსაწყოები</translation>
     </message>
@@ -1870,106 +1843,104 @@ Options:
         <translation>ქვემოთ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation>პლატფორმა</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation>გაფრთხილების მორგება</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation>Root ბილიკი:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>გაფრთხილების ჭდეები (წერტილმძიმით გამოყოფილი)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck-ის აგების საქაღალდე (მთელი პროგრამის ანალიზი, ინკრემენტული ანალიზი, სტატისტიკა და ა.შ.)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation>ბიბლიოთეკები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>ჩახშობები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>დამატება</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation>დამატებები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation>შენიშვნა: დამატებას დაყენებული &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; სჭირდება.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation>ნაკადების უსაფრთხოება</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation>კოდირების სტანდარტები</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation>Misra C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation>2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation>2023</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation>Cert C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation>შეცდომებზე ნადირობა (ფასიანი)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="999"/>
         <source>Clang analyzer</source>
-        <translation>Clang-ის ანალიზატორი</translation>
+        <translation type="vanished">Clang-ის ანალიზატორი</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="992"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
@@ -1980,82 +1951,91 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>პროექტის ფაილი: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation>აირჩიეთ Cppcheck-ის აგების საქაღალდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>აირჩიეთ ჩასასმელი საქაღალდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>აირჩიეთ შესამოწმებელი საქაღალდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (ვერ ვიპოვე)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
+        <location filename="projectfiledialog.cpp" line="628"/>
         <source>Compile database</source>
         <translation>მონაცემთა ბაზის კომპილაცია</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation>პროექტის შემოტანა</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>აირჩიეთ გამოსატოვებელი საქაღალდე</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation>კოდის ფაილები</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation>ყველა ფაილი</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation>ფაილის ამოღება</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation>აირჩიეთ MISRA-ის წესების ტექსტის ფაილი</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA-ის წესის ტექსტების ფაილი (%1)</translation>
     </message>
@@ -2063,34 +2043,34 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>მითითებული ენა უცნობია!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <oldsource>Language file %1.qm not found!</oldsource>
         <translation>ენის ფაილი %1 ვერ ვიპოვე!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <oldsource>Failed to load translation for language %1 from file %2.qm</oldsource>
         <translation>ჩავარდა თარგმანის ჩატვირთვა ენისთვის %1 ფაილიდან %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation>ხაზი %1: აუცილებელი ატრიბუტი &apos;%2&apos; &apos;%3&apos;-ში აღმოჩენილი არაა</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (ვერ ვიპოვე)</translation>
     </message>
@@ -2140,181 +2120,176 @@ Options:
         <translation>შავი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>რედაქტორის წინა პლანის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>რედაქტორის ფონის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>ფონის ფერის გაოკვეთა</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>ხაზის ნომრის წინა პლანის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>ხაზის ნომრის ფონის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>საკვანძო სიტყვის წინა პლანის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation>საკვანძო სიტყვის ფონტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>კლასის წინა პლანის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation>კლასის ფონტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation>ციტატის წინა პლანის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation>ციტატის ფონტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation>კომენტარის წინა პლანს ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation>კომენტარის ფონტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>სიმბოლოს წინა პლანის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>სიმბოლოს ფონის ფერი</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>სიმბოლოს ფონტის სიმძიმე</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation>ნაგულისხმევად ღიას დაყენება</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation>ნაგულისხმევად მუქის დაყენება</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">ფაილი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">ხაზი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">სიმძიმე</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">არადამაჯერებელი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">შეჯამება</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">თარიღიდან</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>დიახ</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>შეწყვეტა</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>დახურვა</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>შენახვა</translation>
     </message>
@@ -2338,93 +2313,98 @@ Options:
         <translation type="vanished">შეჯამება</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>გაურკვეველი ფაილი</translation>
+        <translation type="vanished">გაურკვეველი ფაილი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>კოპირება</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>ვერ ვიპოვე ფაილი:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>აირჩიეთ საქაღალდე &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>აირჩიეთ საქაღალდე &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>აირჩიეთ საქაღალდე, სადაც ფაილია მოთავსებული.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>შეცდომების მოძებნა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>ნოტა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
         <source>Recheck</source>
-        <translation>თავიდან შემოწმება</translation>
+        <translation type="vanished">თავიდან შემოწმება</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>დამალვა</translation>
+        <translation type="vanished">დამალვა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>დამალვა ყველასი id-ით</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>მონიშნული id(ებ)-ის ჩახშობა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>შემცველი საქაღალდის გახსნა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation>შიდა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>იარლიყი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>ჭდის გარეშე</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2434,7 +2414,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 მიუთითეთ რედაქტორის აპლიკაცია Cppcheck-სთვის მენიუში მორგება/აპლიკაციები.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2443,12 +2423,12 @@ Please select the default editor application in preferences/Applications.</sourc
 აირჩიეთ ნაგულისხმევი რედაქტორის აპლიკაცია მენიუში მორგება/აპლიკაციები.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>ფაილი ვერ ვიპოვე!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2457,7 +2437,7 @@ Please check the application path and parameters are correct.</source>
 შეამოწმეთ, სწორია, თუ არა აპლიკაციის ბილიკი და მისი პარამეტრები.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>აირჩიეთ საქაღალდე</translation>
     </message>
@@ -2474,32 +2454,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">თარიღიდან</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>სტილი</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>შეცდომა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>გაფრთხილება</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>წარმადობა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>გადატანადობა</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>ინფორმაცია</translation>
     </message>
@@ -2507,107 +2487,104 @@ Please check the application path and parameters are correct.</source>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>ანგარიშის დაბეჭდვა</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>შეცდომები ვერ ვიპოვე. დასაბეჭდი არაფერია.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (შემოწმებულია %1 ფაილი %2-დან)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>შეცდომების გარეშე.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>აღმოჩენილია შეცდომები, მაგრამ მითითებულია, რომ ისინი დაიმალოს.
 იმისათვის, რომ გადართოთ, რა სახის შეცდომებია ნაჩვენები, გახსენით მენიუ &apos;ხედი&apos;.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>ანგარიშის წაკითხვა ჩავარდა.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML-ის ფორმატის პირველი ვერსია მხარდაჭერილი აღარაა.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>პირველად ჩასმულია ფაილში</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
         <source>Bug hunting analysis is incomplete</source>
-        <translation>შეცდომებზე ნადირობის ანალიზი დაუსრულებელია</translation>
+        <translation type="vanished">შეცდომებზე ნადირობის ანალიზი დაუსრულებელია</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation>ჟურნალის გასუფთავება</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation>ამ ჟურნალის ჩანაწერის კოპირება</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation>სრული ჟურნალის კოპირება</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation>ანალიზი გაუქმებულია</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation>აღმოჩენილია კრიტიკული შეცდომა id-ით &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation>%1-ის შემოწმებისას</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation>ფაილის შემოწმებისას</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation>ანალიზი შეწყვეტილია.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>ანგარიშის შენახვა ჩავარდა.</translation>
     </message>
@@ -2673,7 +2650,7 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>ზოგადი</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>დამატება...</translation>
     </message>
@@ -2683,176 +2660,180 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>ნაკადების რაოდენობა: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>რეკომენდებული მნიშვნელობა:</translation>
+        <translation type="vanished">რეკომენდებული მნიშვნელობა:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>ყველა #ifdef კონფიგურაციის ნაძალადევი შემოწმება</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>ფაილების სრული ბილიკის ჩვენება</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>&quot;შეცდომები ნაპოვნი არაა&quot; შეტყობინების ჩვენება, როცა შეცდომები აღმოჩენილი არა</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>სვეტში &quot;Id&quot; შეცდომის Id-ის ჩვენება</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>შეცდომების ხაზშივე ჩახშობის ჩართვა</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation>ასევე, ნაჩვენები იქნება საკამათო შეცდომებიც</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation>სტატისტიკის ჩვენება შემოწმების დასრულებისას</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation>განახლებების შემოწმება</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>ჟურნალში შიდა გაფრთხილებების ჩვენება</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation>დამატებები</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>ბილიკი python-ის ინტერპრეტატორამდე. (PATH-ში არსებული python-ის გამოსაყენებლად ცარიელი დატოვეთ)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation>MISRA-ის დამატება</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA-ის წესის ტექსტების ფაილი</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>ბილიკი Clang-ის ინტერპრეტატორამდე. (PATH-ში არსებულის გამოსაყენებლად ცარიელი დატოვეთ)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio-ის თავსართები</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation>კოდის რედაქტორი</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation>კოდის რედაქტორის სტილი</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation>სისტემის მიყოლა</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation>ნაგულისხმევი ღია სტილი</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation>ნაგულისხმევი მუქი სტილი</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation>მომხმარებლის</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>წაშლა</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>აპლიკაციები</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>რედაქტირება...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>ნაგულისხმებად დაყენება</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>ანგარიში</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>ყველა შეცდომის შენახვა ანგარიშის შექმნისას</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>ფაილების სრული ბილიკის ჩვენება ანგარიშებში</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>ენა</translation>
     </message>
@@ -2860,47 +2841,46 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation type="vanished">N/A</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation>გამშვები ფაილი &quot;%1&quot; ხელმისაწვდომი არაა</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>ახალი აპლიკაციის დამატება</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>აპლიკაციის შეცვლა</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation> [ნაგულისხმევი]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[ნაგულისხმევი]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation>აირჩიეთ python-ის გამშვები ფაილი</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation>აირჩიეთ MISA ფაილი</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation>აირჩიეთ clang-ის ბილიკი</translation>
     </message>
@@ -2910,14 +2890,14 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>სტატისტიკა</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>პროექტი</translation>
     </message>
@@ -2948,7 +2928,7 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>წინა სკანირება</translation>
     </message>
@@ -3028,151 +3008,159 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>PDF-ად გატანა</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 დღე</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 დღე</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>%1 საათი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 საათი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>%1 წუთი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 წთ</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 წამი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 წამი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 წამი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> და </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>PDF-ში გატანა</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>პროექტის პარამეტრები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>ბილიკები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>ჩასმის ბილიკები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>აღწერები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>წაშლილი მაკროაღწერები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>არჩეული ბილიკი</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>დასკანერებულია ფაილების რაოდენობა</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>სკანირების ხანგრძლივობა</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>შედომები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>ფაილი: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>Cppcheck-ის აგების საქაღალდის გარეშე</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>გაფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>სტილის გაფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>გადატანადობის გაფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>წარმადობის გაფრთხილებები</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>საინფორმაციო შეტყობინებები</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>შემოწმებულია %1 ფაილი %2-დან</translation>
     </message>
@@ -3180,7 +3168,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3193,9 +3181,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 მომხმარებლის ინტერფეისი ინგლისურზე გადაირთო. გახსენით მორგების დიალოგი, რომ ხელმისაწვდომი ენებიდან სასურველი აირჩიოთ.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts
index b9e4c1d44b3..eef9ffac818 100644
--- a/gui/cppcheck_ko.ts
+++ b/gui/cppcheck_ko.ts
@@ -106,9 +106,8 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation>뷰어 프로그램 선택</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +115,6 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -188,10 +123,8 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation>파일 찾기 실패: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -217,14 +150,13 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -313,13 +245,13 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation type="unfinished">편집</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -344,29 +276,26 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -484,23 +413,8 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
@@ -518,18 +432,18 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation>파일(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>보기(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>도구바(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -539,330 +453,320 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation>도움말(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>편집(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>표준 도구</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>분류 도구</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>필터 도구</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>저작권(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>제작자(&amp;u)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>정보(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>파일(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>디렉토리(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>중지(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>결과를 파일에 저장(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>종료(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>결과 지우기(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>설정(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>스타일 경고 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>애러 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>전체 선택(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>전체 해제(&amp;U)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>전체 접기(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>전체 펼치기(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>표준 도구(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>표준 아이템</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>내용(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>도움말을 엽니다</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>도구바</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>분류 도구(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>에러 종류</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>XML 열기(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>프로젝트 파일 열기(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>새 프로젝트 파일(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>로그 보기(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>로그 보기</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>프로젝트 파일 닫기(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>프로젝트 파일 편집(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>통계 보기(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>경고 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>성능 경고 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>숨기기 보기(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>정보</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>정보 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>이식성 경고 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>필터 도구(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>필터링 결과</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>빠른 필터:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -871,12 +775,12 @@ This is probably because the settings were changed between the Cppcheck versions
 Cppcheck 버전간 설정 방법 차이때문인 것으로 보입니다. 편집기 설정을 검사(및 수정)해주세요, 그렇지 않으면 편집기가 제대로 시작하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>새로운 파일이나 디렉토리를 선택하기 전에 프로젝트 파일을 닫으세요!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -885,53 +789,48 @@ Do you want to load this project file instead?</source>
 이 프로젝트 파일을 불러오겠습니까?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML 파일 (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>보고서 파일 열기</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>저작권</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>제작자</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>보고서 파일 저장</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>텍스트 파일 (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 파일 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>프로젝트 파일 (*.cppcheck);;모든 파일(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>프로젝트 파일 선택</translation>
     </message>
@@ -951,149 +850,149 @@ Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>프로젝트:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>프로젝트 파일이름 선택</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>프로젝트 파일 불러오기 실패</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1110,112 +1009,107 @@ Do you want to remove the file from the recently used projects -list?</source>
 최근 프로젝트 목록에서 파일을 제거하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1233,259 +1127,249 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1521,7 +1405,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1529,29 +1413,24 @@ Do you want to proceed?</source>
 <context>
     <name>Platforms</name>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
     <message>
         <location filename="platforms.cpp" line="38"/>
@@ -1585,15 +1464,15 @@ Do you want to proceed?</source>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
@@ -1608,22 +1487,22 @@ Do you want to proceed?</source>
         <translation>아래로</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1648,17 +1527,17 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1668,95 +1547,99 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1766,143 +1649,148 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Inline suppression 사용</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1922,19 +1810,19 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1942,115 +1830,116 @@ Do you want to proceed?</source>
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>프로젝트 파일: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Include 디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>검사할 디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>무시할 디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
-        <source>Exclude file</source>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
-        <source>Select MISRA rule texts file</source>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
-        <source>MISRA rule texts file (%1)</source>
+        <location filename="projectfiledialog.cpp" line="894"/>
+        <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="977"/>
+        <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="979"/>
+        <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="628"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>알 수 없는 언어입니다!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>언어 파일(%1)이 없습니다!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation>파일(%2)로부터 언어(%1) 불러오기 실패</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2100,180 +1989,175 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">파일</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">행</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">분류</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">요약</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation type="unfinished">닫기</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2297,63 +2181,59 @@ Do you want to proceed?</source>
         <translation type="vanished">요약</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>미정의된 파일</translation>
+        <translation type="vanished">미정의된 파일</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>스타일</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>에러</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>성능</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>이식성</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>정보</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>디버그</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>숨기기</translation>
+        <translation type="vanished">숨기기</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2362,7 +2242,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 [설정 - 응용 프로그램]에서 편집기를 설정하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2371,12 +2251,12 @@ Please select the default editor application in preferences/Applications.</sourc
 [설정 - 응용 프로그램]에서 기본 편집기를 선택하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>파일을 찾을 수 없습니다!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2385,67 +2265,72 @@ Please check the application path and parameters are correct.</source>
 경로와 인자가 정확한지 확인하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
+        <location filename="resultstree.cpp" line="307"/>
+        <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
-        <source>note</source>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2458,92 +2343,85 @@ Please check the application path and parameters are correct.</source>
         <translation>결과</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>결과 저장 실패.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%2 중 %1 파일 검사됨)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>에러가 발견되지 않았습니다.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>에러가 발견되었지만, 감추도록 설정되어 있습니다.
 에러 종류를 표시하도록 설정하려면, 보기 메뉴를 선택하세요.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>결과 불러오기 실패.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2563,17 +2441,17 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2624,180 +2502,184 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>쓰레드 수: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>최적 값:</translation>
+        <translation type="vanished">최적 값:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <translation>모든 #ifdef 설정을 강제로 검사</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>파일의 전체 경로 표시</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>에러가 발견되지 않는 경우 &quot;에러가 없습니다.&quot; 메시지 표시</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>Inline suppression 사용</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>추가...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>응용 프로그램</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>편집...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>기본으로 지정</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>보고서</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>보고서 생성 시 모든 에러 저장</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>보고서에 파일의 전체 경로 저장</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>언어</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2805,47 +2687,46 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation type="vanished">N/A</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>새 응용 프로그램 추가</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>응용 프로그램 편집</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[기본]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2855,14 +2736,14 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>통계</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>프로젝트</translation>
     </message>
@@ -2888,7 +2769,7 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>직전 검사</translation>
     </message>
@@ -2953,123 +2834,123 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>클립보드에 복사</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1일</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1일</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1분</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1분</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1초</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1초</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1초</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> 및 </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>프로젝트 설정</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Include 경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Defines</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>선택된 경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>검사된 파일 수</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>검사 시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>에러</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>스타일 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>이식성 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>성능 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>정보 메시지</translation>
     </message>
@@ -3079,7 +2960,7 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3094,12 +2975,12 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3109,15 +2990,23 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%2 중 %1 파일 검사됨</translation>
     </message>
@@ -3125,7 +3014,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3138,9 +3027,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 언어가 영어로 초기화 됐습니다. 설정창을 열어서 설정 가능한 언어를 선택하세요.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts
index a7f27f1294c..6a877a34909 100644
--- a/gui/cppcheck_nl.ts
+++ b/gui/cppcheck_nl.ts
@@ -106,9 +106,8 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>Selecteer applicatie</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +115,6 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>Geef een naam op, een pad en eventueel parameters voor de toepassing!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -190,10 +125,8 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>Kon het bestand niet vinden: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -219,14 +152,13 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -335,42 +267,39 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation type="unfinished">Bewerk</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -488,31 +417,16 @@ Parameters: -l(lijn) (bestand)</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
@@ -522,245 +436,245 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>&amp;Bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Weergave</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Werkbalken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++standaard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished">C standaard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>Be&amp;werken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licentie...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;uteurs...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Over...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Bestanden...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished">Controleer bestanden</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Mappen...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished">Controleer Map</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished">Stop controle</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Resultaten opslaan...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Resultaten wissen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Voorkeuren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>Toon fouten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>Toon waarschuwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>Toon presentatie waarschuwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Toon &amp;verborgen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Toon informatie bericht</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Toon portabiliteit waarschuwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Filter resultaten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Controleer alles</translation>
     </message>
@@ -775,300 +689,290 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation type="unfinished">Verberg</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>Selecteer &amp;niets</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Alles Inkl&amp;appen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>Alles &amp;Uitklappen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standaard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Standaard items</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Werkbalk</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorieën</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Foute Categorieën</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Open P&amp;oject bestand...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nieuw Project Bestand...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Log weergave</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Log weergave</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>&amp;Sluit Project Bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Bewerk Project Bestand...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistieken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Inhoud</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Categorieën</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>Toon stijl waarschuwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Open de help inhoud</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation></translation>
     </message>
@@ -1078,18 +982,18 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>Snel Filter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1097,91 +1001,91 @@ Do you want to load this project file instead?</source>
 Wilt u dit project laden in plaats van?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Licentie</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Rapport opslaan </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML bestanden (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1190,131 +1094,116 @@ This is probably because the settings were changed between the Cppcheck versions
 Dit is waarschijnlijk omdat de instellingen zijn gewijzigd tussen de versies van cppcheck. Controleer (en maak) de bewerker instellingen, anders zal de bewerker niet correct starten.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Je moet project bestanden sluiten voordat je nieuwe bestanden of mappen selekteerd!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>Open het rapport bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>Tekst bestanden (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV bestanden (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Project bestanden (*.cppcheck);;Alle bestanden(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>Selecteer project bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>Project:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1322,34 +1211,29 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1369,34 +1253,34 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>Selecteer project bestandsnaam</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>Geen project bestand geladen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1412,72 +1296,72 @@ Kan niet worden gevonden!
 Wilt u het bestand van de onlangs gebruikte project verwijderen -lijst?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1507,7 +1391,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - Command lijn parameters</translation>
     </message>
@@ -1540,7 +1424,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1552,31 +1436,6 @@ Options:
         <source>Native</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>ProjectFile</name>
@@ -1603,58 +1462,58 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1665,8 +1524,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1694,15 +1552,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>Bewerk</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
@@ -1722,114 +1580,134 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Schakel inline suppressies in</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1844,116 +1722,106 @@ Options:
         <translation>Omlaag</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
         <source>Defines:</source>
@@ -1963,82 +1831,83 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>Project Bestand %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Selecteer include map</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>Selecteer een map om te controleren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="628"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="630"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>Selecteer een map om te negeren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2046,34 +1915,34 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Onbekende taal gekozen!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <oldsource>Language file %1.qm not found!</oldsource>
         <translation>Kon het taalbestand niet vinden: %1!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <oldsource>Failed to load translation for language %1 from file %2.qm</oldsource>
         <translation>Kon de vertaling voor taal %1 in bestand %2 niet laden</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2123,181 +1992,176 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Bestand</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Regel</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Ernst</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Overzicht</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>Annuleer</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
@@ -2321,93 +2185,94 @@ Options:
         <translation type="vanished">Overzicht</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>Niet gedefinieerd bestand</translation>
+        <translation type="vanished">Niet gedefinieerd bestand</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>Verberg</translation>
+        <translation type="vanished">Verberg</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Verberg alles met id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2417,7 +2282,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Configureer de bewerker toepassing voor cppcheck in voorkeuren/Applicaties.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2425,12 +2290,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Selecteer de standaard bewerker in voorkeuren/Applicaties.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Kon het bestand niet vinden!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2439,7 +2304,7 @@ Please check the application path and parameters are correct.</source>
 Gelieve te controleren of de het pad en de parameters correct zijn.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Selecteer map</translation>
     </message>
@@ -2448,32 +2313,32 @@ Gelieve te controleren of de het pad en de parameters correct zijn.</translation
         <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>Stijlfouten</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>Fouten</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>Presentatie</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>Portabiliteit</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>Informatie</translation>
     </message>
@@ -2481,107 +2346,100 @@ Gelieve te controleren of de het pad en de parameters correct zijn.</translation
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 van %2 bestanden gecontroleerd)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Geen fouten gevonden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Fouten werden gevonden, maar volgens de configuratie zijn deze verborgen.
 Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Kon rapport niet lezen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Kon het rapport niet opslaan.</translation>
     </message>
@@ -2647,7 +2505,7 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>Toevoegen...</translation>
     </message>
@@ -2657,176 +2515,180 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
         <translation>Aantal threads: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>Ideale telling:</translation>
+        <translation type="vanished">Ideale telling:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>Controleer alle #ifdef combinaties</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Toon het volledige pad van bestanden</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Toon &quot;Geen fouten gevonden&quot; indien geen fouten gevonden werden</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Toon fout ld in kolom &quot;Id&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>Schakel inline suppressies in</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Applicaties</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>Bewerk...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>Instellen als standaard</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Rapporten</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Alle fouten opslaan</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Volledig pad opslaan</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>Taal</translation>
     </message>
@@ -2834,47 +2696,42 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
-        <source>N/A</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Nieuwe applicatie toevoegen</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Applicatie wijzigen</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[Standaard]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2884,14 +2741,14 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Project</translation>
     </message>
@@ -2922,7 +2779,7 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Vorige scan</translation>
     </message>
@@ -3002,151 +2859,159 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 dag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 dagen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 uur</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 uren</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minuut</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minuten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 seconde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 secondes</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 secondes</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> en </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Project instellingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Paden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Bevat paden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Omschrijft</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Pad Geselekteerd</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Aantal bestanden gescanned</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Scan tijd</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Fouten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stijl waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Portabiliteit waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Presentatie waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Informatie bericht</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 van %2 bestanden gecontroleerd</translation>
     </message>
@@ -3154,7 +3019,7 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3167,9 +3032,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 De gebruikerstaal is gereset naar Engels. Open het dialoogvenster om een van de beschikbare talen te selecteren.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts
index 75b726f2836..cd1a4c4d0ce 100644
--- a/gui/cppcheck_ru.ts
+++ b/gui/cppcheck_ru.ts
@@ -106,9 +106,8 @@ Parameters: -l(line) (file)</source>
         <translation>Выберите приложение</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +115,6 @@ Parameters: -l(line) (file)</source>
         <translation>Вы должны задать название и путь к приложению!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -190,10 +125,8 @@ Parameters: -l(line) (file)</source>
         <translation>Невозможно найти файл: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -219,14 +152,13 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -335,42 +267,39 @@ Parameters: -l(line) (file)</source>
         <translation>Изменить</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Файлы библиотек (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Открыть файл библиотеки</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>Невозможно открыть файл %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>Ошибка загрузки %1. %2.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation>Невозможно сохранить файл %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>Сохранить библиотеку как</translation>
     </message>
@@ -488,31 +417,16 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>Анализ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Стандартные</translation>
     </message>
@@ -522,245 +436,245 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Панель инструментов</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>Стандарт C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;Стандарт C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Лицензия...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Авторы...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;О программе...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Файлы...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>Проверить файлы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Каталог...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>Проверка каталога</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>Остановить</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>Остановить проверку</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>Сохранить отчёт в файл...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>Очистить отчёт</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>Показать ошибки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>Показать предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>Показать предупреждения производительности</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Показать скрытые</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Информационные сообщения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Показать информационные сообщения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Показать предупреждения переносимости</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Просмотр результатов Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Просмотр результатов Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Результаты фильтрации</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Печать...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Напечатать текущий отчет</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Предварительный просмотр...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Открыть диалог печати для текущих результатов</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>Открыть редактор библиотек</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>Отметить все</translation>
     </message>
@@ -775,300 +689,290 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Скрыть</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>Заново проверить измененные файлы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>Заново проверить все файлы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>Стилистические предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>Ошибки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>Сбросить все</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Свернуть все</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>Развернуть все</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>Стандартные</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Стандартные элементы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Категории ошибок</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Открыть XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Открыть файл &amp;проекта...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>Показать Блокнот</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Новый файл проекта...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>Посмотреть &amp;лог</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Посмотреть лог</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>&amp;Закрыть файл проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Изменить файл проекта...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Статистика</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>Предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>Предупреждения производительности</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>Информационные предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>Предупреждения переносимости</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>Платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>Редактор библиотеки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>Автоматическое определение языка</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>Принудительно C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>Принудительно C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>Повторный анализ библиотеки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>Проверить конфигурацию (defines, includes)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>Показать стилистические предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Открыть помощь</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
@@ -1078,18 +982,18 @@ Parameters: -l(line) (file)</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>Быстрый фильтр:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation>Выбор конфигурации</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1098,97 +1002,97 @@ Do you want to load this project file instead?</source>
 Вы хотите загрузить этот проект?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>Файл не найден</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation>Некорректный XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation>Пропущен атрибут</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation>Некорректное значение атрибута</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>Неподдерживаемый формат</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>Не удалось загрузить выбранную библиотеку &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Лицензия</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Авторы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Сохранить файл с отчетом</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML-файлы (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1197,42 +1101,37 @@ This is probably because the settings were changed between the Cppcheck versions
 Возможно, это связано с изменениями в версии программы. Пожалуйста, проверьте (и исправьте) настройки приложения.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Вы должны закрыть проект перед выбором новых файлов или каталогов!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>Библиотека &apos;%1&apos; содержит неизвестные элементы:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation>Дубликат типа платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation>Переобъявление типа платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation>Неизвестный элемент</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation>Неизвестная проблема</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -1241,80 +1140,78 @@ This is probably because the settings were changed between the Cppcheck versions
         <translation type="vanished">Невозможно загрузить %1. Cppcheck установлен некорректно. Вы можете использовать --data-dir=&lt;directory&gt; в командной строке для указания расположения файлов конфигурации. Обратите внимание, что --data-dir предназначен для использования сценариями установки. При включении данной опции, графический интерфейс пользователя не запускается.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>Открыть файл с отчетом</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>Текстовые файлы (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV файлы(*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Файлы проекта (*.cppcheck);;Все файлы(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>Выберите файл проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>Проект:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation>Не найдено подходящих файлов для анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation>Исходный код C/C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
         <source>Visual Studio</source>
-        <translation type="unfinished">Visual Studio</translation>
+        <translation type="obsolete">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
         <source>Borland C++ Builder 6</source>
-        <translation type="unfinished">Borland C++ Builder 6</translation>
+        <translation type="obsolete">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation>Выбор файлов для анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation>Выбор каталога для анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Выбор используемой конфигурации</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1323,7 +1220,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 Вы хотите продолжить анализ без использования этих файлов проекта?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1334,7 +1231,7 @@ Do you want to proceed?</source>
 Вы хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1343,27 +1240,22 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 Вы хотите остановить анализ и выйти из Cppcheck?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML файлы (*.xml);;Текстовые файлы (*.txt);;CSV файлы (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>Директория для сборки &apos;%1&apos; не существует, создать?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1383,69 +1275,69 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1454,22 +1346,22 @@ Analysis is stopped.</source>
         <translation type="vanished">Невозможно импортировать &apos;%1&apos;, анализ остановлен</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Файлы проекта (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>Выберите имя файла для проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>Файл с проектом не загружен</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1485,17 +1377,17 @@ Do you want to remove the file from the recently used projects -list?</source>
 Хотите удалить его из списка проектов?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1538,7 +1430,7 @@ Options:
                             Графический интерфейс пользователя не будет запущен, если указана эта опция.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - параметры Командной строки</translation>
     </message>
@@ -1571,7 +1463,7 @@ Options:
         <translation>Имя символа</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>Редактировать подавление</translation>
     </message>
@@ -1584,29 +1476,24 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1634,52 +1521,52 @@ Options:
         <translation>Defines должны быть разделены точкой с запятой &apos;;&apos;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Положите свои .cfg-файлы в один каталог с файлом проекта. Вы увидите их сверху.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1688,17 +1575,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation>Файл с текстами правил MISRA</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Скопируйте текст из Appendix A &amp;quot;Summary of guidelines&amp;quot; из фала правил MISRA C 2012 pdf в текстовый файл.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1709,8 +1596,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
@@ -1738,15 +1624,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
@@ -1766,114 +1652,134 @@ Options:
         <translation>Пути заголовочных файлов:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation>Анализ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished">Проверить код в неиспользуемых шаблонах</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation>Максимальная глубина CTU</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Включить inline-подавление ошибок</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation>Внешние инструменты</translation>
     </message>
@@ -1888,107 +1794,97 @@ Options:
         <translation>Вниз</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation>Платформа</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation>Опции предупреждений</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation>Корневой каталог:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Теги предупреждений (через &apos;;&apos;)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Каталог сборки Cppcheck</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation>Библиотеки</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>Подавления</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation>Дополнения</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation>Стандарты кодирования</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
         <source>Defines:</source>
@@ -1998,82 +1894,91 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>Файл проекта: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation>Выбрать директорию сборки Cppcheck</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Выберите директорию для поиска заголовочных файлов</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>Выберите директорию для проверки</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (не найден)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
+        <location filename="projectfiledialog.cpp" line="628"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation>Импорт проекта</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>Выберите директорию, которую надо проигнорировать</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation>Выбрать файл текстов правил MISRA</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>Файл текстов правил MISRA (%1)</translation>
     </message>
@@ -2081,34 +1986,34 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Неизвестный язык!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <oldsource>Language file %1.qm not found!</oldsource>
         <translation>Языковой файл %1 не найден!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <oldsource>Failed to load translation for language %1 from file %2.qm</oldsource>
         <translation>Ошибка загрузки переводов для языка %1 из файла %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (Недоступно)</translation>
     </message>
@@ -2158,181 +2063,176 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Файл</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Строка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Важность</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">Спорное</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Кратко</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">Начиная с даты</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
@@ -2356,93 +2256,98 @@ Options:
         <translation type="vanished">Кратко</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>Неопределенный файл</translation>
+        <translation type="vanished">Неопределенный файл</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>Невозможно найти файл:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>Выберите каталог &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>Выбрать каталог &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>Укажите каталог с расположением файла.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>отлаживать</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>заметка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
         <source>Recheck</source>
-        <translation>Проверить заново</translation>
+        <translation type="vanished">Проверить заново</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>Скрыть</translation>
+        <translation type="vanished">Скрыть</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Скрыть все с id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>Подавить выбранные id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Открыть содержащую папку</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>Тег</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>Тег отсутствует</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2451,7 +2356,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Сконфигурируйте приложение редактора для Cppcheck в предпочтениях/Приложениях.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2459,12 +2364,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Выберите приложение редактора по умолчанию в предпочтениях/Приложениях.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Не удается найти файл!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2472,7 +2377,7 @@ Please check the application path and parameters are correct.</source>
 Пожалуйста, проверьте путь приложения, и верны ли параметры.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Выберите директорию</translation>
     </message>
@@ -2489,32 +2394,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">Начиная с даты</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>стиль</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>ошибка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>предупреждение</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>производительность</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>переносимость</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>информация</translation>
     </message>
@@ -2522,107 +2427,100 @@ Please check the application path and parameters are correct.</source>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Распечатать отчет</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Ошибок не найдено, нечего распечатывать.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 из %2 файлов проверено)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Ошибок не найдено.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Были обнаружены ошибки, но они настроены быть скрыты.
 Для переключения какие ошибки отображаются, откройте меню представления.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Не удалось прочитать отчет.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML формат версии 1 больше не поддерживается.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>Только первый включенный</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation>Очистить лог</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation>Скопировать данную запись</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation>Скопировать полный лог</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Не удалось сохранить отчет.</translation>
     </message>
@@ -2688,7 +2586,7 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
@@ -2698,176 +2596,180 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>Количество потоков исполнения:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>Рекомендуемое значение:</translation>
+        <translation type="vanished">Рекомендуемое значение:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>Проверять все варианты #ifdef конфигураций</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Показывать полные пути к файлам</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Показывать сообщение, если ошибок не найдено</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Отображать номер ошибки в колонке &quot;id&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>Включить inline-подавление ошибок</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation>Показывать также спорные ошибки</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation>Показывать статистику после завершения проверки</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>Показывать внутренние предупреждения в логе</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation>Дополнения</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python (оставьте пустым для использования python из PATH)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation>Дополнение MISRA</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation>Файл с текстами правил MISRA: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Скопируйте текст из Appendix A &amp;quot;Summary of guidelines&amp;quot; из фала правил MISRA C 2012 pdf в текстовый файл.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang (оставьте пустым для использования clang из PATH)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation>Заголовочные файлы Visual Studio</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Путь до заголовочных файлов Visual Studio headers, разделенных символом &apos;;&apos;.&lt;/p&gt;&lt;p&gt;Вы можете открыть командную строку Visual Studio, ввести &amp;quot;SET INCLUDE&amp;quot; и скопировать пути.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation>Редактор</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation>Оформление</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Приложения</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>Изменить...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>Установить по умолчанию</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Отчёты</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Сохранять все ошибки при создании отчёта</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Сохранять полные пути к файлам в отчётах</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
@@ -2875,47 +2777,46 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>Нет данных</translation>
+        <translation type="vanished">Нет данных</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Добавить новое приложение</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Изменить приложение</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation> [По умолчанию]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[По умолчанию]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation>Выберите исполняемый файл python</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation>Выберите файл текстов правил MISRA</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation>Выберите исполняемый файл clang</translation>
     </message>
@@ -2925,14 +2826,14 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
@@ -2963,7 +2864,7 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Последнее сканирование</translation>
     </message>
@@ -3043,151 +2944,159 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>Экспорт PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 день</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 дней</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 час</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 часов</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 минута</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 минут</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 секунда</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 секунд</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.1%1 секунд</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>Экспорт PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Настройки проекта</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Включенные пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Объявленные макроопределения:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>Удаленные макроопределения:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Выбранные пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Количество просканированных файлов</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Продолжительность сканирования</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Ошибки</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>Файл: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>Не задана директория сборки</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Предупреждения</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Стилистические предупреждения</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Предупреждения переносимости</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Предупреждения производительности</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Информационные сообщения</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 из %2 файлов проверены</translation>
     </message>
@@ -3195,7 +3104,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3208,9 +3117,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 Язык пользовательского интерфейса был сброшен на английский. Откройте Настройки-диалог для выбора любого из доступных языков.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts
index 8af00a117cf..ebfe46f5ced 100644
--- a/gui/cppcheck_sr.ts
+++ b/gui/cppcheck_sr.ts
@@ -96,9 +96,8 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Select viewer application</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -106,70 +105,6 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -178,10 +113,8 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Could not find the file: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -207,14 +140,13 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -323,42 +255,39 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -476,31 +405,16 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation type="unfinished">Standard</translation>
     </message>
@@ -510,245 +424,245 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">&amp;File</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation type="unfinished">&amp;View</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation type="unfinished">&amp;License...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation type="unfinished">A&amp;uthors...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation type="unfinished">&amp;About...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation type="unfinished">&amp;Files...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation type="unfinished">&amp;Directory...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation type="unfinished">Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation type="unfinished">Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation type="unfinished">&amp;Stop</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation type="unfinished">Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation type="unfinished">&amp;Save results to file...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation type="unfinished">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Quit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation type="unfinished">&amp;Clear results</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation type="unfinished">&amp;Preferences</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation type="unfinished">&amp;Check all</translation>
     </message>
@@ -763,300 +677,290 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation type="unfinished">&amp;Uncheck all</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation type="unfinished">Collapse &amp;all</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation type="unfinished">&amp;Expand all</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
@@ -1066,240 +970,225 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">&amp;Help</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation type="unfinished">License</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation type="unfinished">Authors</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation type="unfinished">Save the report file</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished">XML files (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation type="unfinished">Text files (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
-        <source>Visual Studio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1307,34 +1196,29 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1354,34 +1238,34 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1392,72 +1276,72 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1487,7 +1371,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1520,7 +1404,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1533,29 +1417,24 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1583,22 +1462,22 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1609,8 +1488,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1638,15 +1516,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1676,264 +1554,274 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="projectfile.ui" line="999"/>
-        <source>Clang analyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="992"/>
-        <source>Clang-tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
         <source>Defines:</source>
@@ -1943,82 +1831,83 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
-        <source>Visual Studio</source>
+        <location filename="projectfiledialog.cpp" line="628"/>
+        <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
-        <source>Compile database</source>
+        <location filename="projectfiledialog.cpp" line="630"/>
+        <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
-        <source>Import Project</source>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2026,32 +1915,32 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation type="unfinished">Could not find the file: %1!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation type="unfinished">Failed to load translation for language %1 from file %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2101,181 +1990,176 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">File</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Line</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Severity</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2295,112 +2179,109 @@ Options:
         <translation type="obsolete">Line</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation type="unfinished">Undefined file</translation>
+        <translation type="obsolete">Undefined file</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
+        <location filename="resultstree.cpp" line="670"/>
+        <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
-        <source>Hide</source>
+        <location filename="resultstree.cpp" line="692"/>
+        <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
-        <source>Hide all with id</source>
+        <location filename="resultstree.cpp" line="671"/>
+        <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
-        <source>Suppress selected id(s)</source>
+        <location filename="resultstree.cpp" line="376"/>
+        <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
-        <source>Open containing folder</source>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
-        <source>internal</source>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
         <translation type="unfinished">You can open this error by specifying applications in program&apos;s settings.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2409,37 +2290,37 @@ Please check the application path and parameters are correct.</source>
 Please check the application path and parameters are correct.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation type="unfinished">Style</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation type="unfinished">Error</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2447,107 +2328,100 @@ Please check the application path and parameters are correct.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation type="unfinished">No errors found.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished">Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation type="unfinished">Failed to save the report.</translation>
     </message>
@@ -2613,7 +2487,7 @@ To toggle what kind of errors are shown, open view menu.</translation>
         <translation type="unfinished">General</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2623,175 +2497,175 @@ To toggle what kind of errors are shown, open view menu.</translation>
         <translation type="unfinished">Number of threads: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
-        <source>Ideal count:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <translation type="unfinished">Check all #ifdef configurations</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation type="unfinished">Show full path of files</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation type="unfinished">Show &quot;No errors found&quot; message when no errors found</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation type="unfinished">Applications</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation type="unfinished">Reports</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation type="unfinished">Save all errors when creating report</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation type="unfinished">Save full path to files in reports</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2799,47 +2673,42 @@ To toggle what kind of errors are shown, open view menu.</translation>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation type="unfinished">Add a new application</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation type="unfinished">Modify an application</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2849,14 +2718,14 @@ To toggle what kind of errors are shown, open view menu.</translation>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2887,7 +2756,7 @@ To toggle what kind of errors are shown, open view menu.</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2967,151 +2836,159 @@ To toggle what kind of errors are shown, open view menu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,7 +2996,7 @@ To toggle what kind of errors are shown, open view menu.</translation>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3128,9 +3005,8 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts
index c1393152c0b..43d6886afc0 100644
--- a/gui/cppcheck_sv.ts
+++ b/gui/cppcheck_sv.ts
@@ -106,9 +106,8 @@ Parametrar: -l(line) (file)</translation>
         <translation>Välj program</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -116,70 +115,6 @@ Parametrar: -l(line) (file)</translation>
         <translation>Du måste ange namn, sökväg samt eventuellt parametrar för applikationen!</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -190,10 +125,8 @@ Parametrar: -l(line) (file)</translation>
         <translation>Kunde inte hitta filen: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -219,14 +152,13 @@ Parametrar: -l(line) (file)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation type="obsolete">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -335,42 +267,39 @@ Parametrar: -l(line) (file)</translation>
         <translation>Redigera</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>Library fil (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>Öppna Library fil</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation type="unfinished">Kunde ej öppna filen %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation type="unfinished">Kunde ej spara filen %1.</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>Spara library som</translation>
     </message>
@@ -494,31 +423,16 @@ Exempel:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>Analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
@@ -528,245 +442,245 @@ Exempel:
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>Verktygsfält</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>C standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licens...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Utvecklat av...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Om...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Filer...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>Analysera filer</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Katalog...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>Analysera mapp</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stoppa</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>Stoppa analys</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>&amp;Spara resultat till fil...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Töm resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Inställningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>Visa fel</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>Visa varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>Visa prestanda varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Visa dolda</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Visa informations meddelanden</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Visa portabilitets varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Visa Cppcheck resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Visa Clang resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Filtrera resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Skriv ut...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Skriv ut aktuell rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Förhandsgranska utskrift...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>Öppnar förhandsgranskning för nuvarande resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>Öppna library editor</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Kryssa alla</translation>
     </message>
@@ -781,301 +695,291 @@ Exempel:
         <translation type="unfinished">Dölj</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>Analysera om ändrade filer</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>Analysera om alla filer</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>Style varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>Kryssa &amp;ur alla</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translatorcomment>Ingen bra översättning!</translatorcomment>
         <translation>&amp;Fäll ihop alla</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Expandera alla</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Standard poster</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Verktygsfält</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Fel kategorier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Öppna XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Öppna Projektfil...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>Visa Scratchpad...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>Ny projektfil...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Logg vy</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>Stäng projektfil</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>Redigera projektfil...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>Varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>Optimerings varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>Portabilitet</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>Plattformar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>Posix</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>Library Editor...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>Detektera språk automatiskt</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>Tvinga C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>Tvinga C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Innehåll</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Kategorier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>Visa stil varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Öppna hjälp</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
@@ -1085,18 +989,18 @@ Exempel:
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>Snabbfilter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation>Välj konfiguration</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1105,97 +1009,97 @@ Do you want to load this project file instead?</source>
 Vill du ladda denna projektfil istället?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>Filen hittades ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation>Ogiltig XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation>Attribut finns ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation>Ogiltigt attribut värde</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>Format stöds ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>Misslyckades att ladda valda library &apos;%1&apos;.
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>Licens</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>Utvecklare</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>Spara rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML filer (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1204,42 +1108,37 @@ This is probably because the settings were changed between the Cppcheck versions
 En trolig orsak är att inställningarna ändrats för olika Cppcheck versioner. Kontrollera programinställningarna.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Du måste stänga projektfilen innan nya filer eller sökvägar kan väljas!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>Library filen &apos;%1&apos; har element som ej hanteras:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation>Dubbel plattformstyp</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation>Plattformstyp definieras igen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation>Element hanteras ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation>Något problem</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
@@ -1248,80 +1147,74 @@ En trolig orsak är att inställningarna ändrats för olika Cppcheck versioner.
         <translation type="vanished">Misslyckades att ladda %1. Din Cppcheck installation är ej komplett. Du kan använda --data-dir&lt;directory&gt; på kommandoraden för att specificera var denna fil finns. Det är meningen att --data-dir kommandot skall köras under installationen,så GUIt kommer ej visas när --data-dir används allt som händer är att en inställning görs.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>Öppna rapportfilen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>Text filer (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Projektfiler (*.cppcheck);;Alla filer(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>Välj projektfil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation>Inga filer hittades att analysera!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
         <source>Visual Studio</source>
-        <translation type="unfinished">Visual Studio</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="733"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation>Välj filer att analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation>Välj mapp att analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Välj konfiguration som kommer analyseras</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1330,7 +1223,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 Vill du fortsätta analysen utan att använda någon av dessa projekt filer?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1338,7 +1231,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1347,27 +1240,22 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 Vill du stoppa analysen och avsluta Cppcheck?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML filer (*.xml);;Text filer (*.txt);;CSV filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>Build dir &apos;%1&apos; existerar ej, skapa den?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1387,69 +1275,69 @@ Vill du stoppa analysen och avsluta Cppcheck?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1458,22 +1346,22 @@ Analysis is stopped.</source>
         <translation type="vanished">Misslyckades att importera &apos;%1&apos;, analysen stoppas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Projekt filer (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>Välj Projektfil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>Inget projekt laddat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1490,17 +1378,17 @@ Do you want to remove the file from the recently used projects -list?</source>
 Vill du ta bort filen från &apos;senast använda projekt&apos;-listan?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1543,7 +1431,7 @@ Options:
                             is used.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - Command line parameters</translation>
     </message>
@@ -1576,7 +1464,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1589,29 +1477,24 @@ Options:
         <translation>Native</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32-bit</translation>
+        <translation type="vanished">Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64-bit</translation>
+        <translation type="vanished">Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32-bit ANSI</translation>
+        <translation type="vanished">Windows 32-bit ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32-bit Unicode</translation>
+        <translation type="vanished">Windows 32-bit Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64-bit</translation>
+        <translation type="vanished">Windows 64-bit</translation>
     </message>
 </context>
 <context>
@@ -1639,12 +1522,12 @@ Options:
         <translation type="unfinished">Defines separeras med semicolon &apos;;&apos;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>Obs: Lägg dina egna .cfg filer i samma folder som projekt filen. De skall isåfall visas ovan.</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1655,8 +1538,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1684,15 +1566,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>Redigera</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
@@ -1712,133 +1594,153 @@ Options:
         <translation>Include sökvägar:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">Använd inline suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1853,142 +1755,140 @@ Options:
         <translation>Ned</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation>Bas sökväg:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Varnings taggar (separerade med semikolon)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck build dir (whole program analys, incremental analys, statistik, etc)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation>Libraries</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>Suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>Lägg till</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation>Addons</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation>Tråd säkerhet</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation>Kodstandarder</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="999"/>
         <source>Clang analyzer</source>
-        <translation>Clang analyzer</translation>
+        <translation type="vanished">Clang analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="992"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
@@ -1999,82 +1899,87 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>Projektfil: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation>Välj Cppcheck build dir</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>Välj include sökväg</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>Välj mapp att analysera</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
         <source>Visual Studio</source>
-        <translation type="unfinished">Visual Studio</translation>
+        <translation type="obsolete">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
+        <location filename="projectfiledialog.cpp" line="628"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
-        <source>Borland C++ Builder 6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation>Importera Projekt</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>Välj sökväg att ignorera</translation>
     </message>
@@ -2082,34 +1987,34 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Okänt språk valt!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <oldsource>Language file %1.qm not found!</oldsource>
         <translation>Språk filen %1 hittades ej!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <oldsource>Failed to load translation for language %1 from file %2.qm</oldsource>
         <translation>Misslyckades med att ladda översättningen för %1 från filen %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2159,181 +2064,176 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">Fil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">Rad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">Typ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">Inconclusive</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">Sammanfattning</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">Sedan datum</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
@@ -2357,93 +2257,98 @@ Options:
         <translation type="vanished">Sammanfattning</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>Odefinierad fil</translation>
+        <translation type="vanished">Odefinierad fil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>note</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
         <source>Recheck</source>
-        <translation>Analysera om</translation>
+        <translation type="vanished">Analysera om</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>Dölj</translation>
+        <translation type="vanished">Dölj</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>Dölj alla med id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>Stäng av valda id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>Ingen tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2453,7 +2358,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Konfigurera program i inställningar/program.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2462,12 +2367,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Vänligen välj standard editor i inställningar/Program.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>Kunde inte hitta filen!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2476,7 +2381,7 @@ Please check the application path and parameters are correct.</source>
 Kontrollera att sökvägen och parametrarna är korrekta.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>Välj mapp</translation>
     </message>
@@ -2493,32 +2398,32 @@ Kontrollera att sökvägen och parametrarna är korrekta.</translation>
         <translation type="vanished">Sedan datum</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>stil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>fel</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>varning</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>prestanda</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>portabilitet</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>information</translation>
     </message>
@@ -2526,107 +2431,100 @@ Kontrollera att sökvägen och parametrarna är korrekta.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>Skriv ut rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>Inga fel hittades, inget att skriva ut.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 av %2 filer analyserade)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>Inga fel hittades.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Fel hittades, men de visas ej.
 För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>Misslyckades att läsa rapporten.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML format version 1 stöds ej längre.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>Först inkluderad av</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>Misslyckades med att spara rapporten.</translation>
     </message>
@@ -2692,7 +2590,7 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>Lägg till...</translation>
     </message>
@@ -2702,176 +2600,180 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
         <translation>Antal trådar:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>Optimalt värde:</translation>
+        <translation type="vanished">Optimalt värde:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>Kontrollera alla #ifdef konfigurationer</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>Visa den fulla sökvägen för filer</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>Visa &quot;Inga fel hittades&quot; meddelande när inga fel hittas</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>Visa meddelande id i kolumn &quot;Id&quot;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>Använd inline suppressions</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation>Kör inconclusive analys</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation>Visa statistik när analys är klar</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>Visa interna fel i loggen</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation>Addons</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python binär fil (lämna tom för att använda python i PATH)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang sökväg (lämna tom för att använda PATH)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio headers</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sökvägar till Visual Studio headers, separerade med semikolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;Du kan öppna en Visual Studio command prompt, och skriva &amp;quot;SET INCLUDE&amp;quot;. Sedan kopiera och klistra in sökvägarna.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>Program</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>Redigera...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>Sätt förvald</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>Rapporter</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>Spara alla fel</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>Spara fulla sökvägar</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
@@ -2879,47 +2781,46 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>Ej tillgängligt</translation>
+        <translation type="vanished">Ej tillgängligt</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>Lägg till program</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>Ändra program</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation> [Vald]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[Förvald]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation>Välj python binär</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation>Välj Clang sökväg</translation>
     </message>
@@ -2929,14 +2830,14 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
@@ -2967,7 +2868,7 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>Föregående analys</translation>
     </message>
@@ -3047,151 +2948,159 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
         <translation>Pdf Export</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 dag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 dagar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 timme</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 timmar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 minut</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 minuter</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 sekund</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 sekunder</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 sekunder</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> och </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>Exportera PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>Projekt inställningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>Sökvägar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>Include sökvägar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>Definitioner</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>Vald sökväg</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>Antal analyserade filer</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>Fil:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>Ingen Cppcheck build dir</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>Varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>Stil varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>Portabilitetsvarningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>Prestanda varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>Informationsmeddelanden</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 av %2 filer analyserade</translation>
     </message>
@@ -3199,7 +3108,7 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3212,9 +3121,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 Språket har nollställts till Engelska. Öppna Preferences och välj något av de tillgängliga språken.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts
index dceb558aa9a..5ecaa17a91b 100644
--- a/gui/cppcheck_zh_CN.ts
+++ b/gui/cppcheck_zh_CN.ts
@@ -105,9 +105,8 @@ Parameters: -l(line) (file)</source>
         <translation>选择查看应用程序</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -115,70 +114,6 @@ Parameters: -l(line) (file)</source>
         <translation>你必须为应用程序指定名称、路径以及可选参数！</translation>
     </message>
 </context>
-<context>
-    <name>ComplianceReportDialog</name>
-    <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
-        <source>Project name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
-        <source>Project version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
-        <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FileViewDialog</name>
     <message>
@@ -187,10 +122,8 @@ Parameters: -l(line) (file)</source>
         <translation>无法找到文件: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -216,14 +149,13 @@ Parameters: -l(line) (file)</source>
         <translation>索引</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>帮助文件 &apos;%1&apos; 未找到</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -332,42 +264,39 @@ Parameters: -l(line) (file)</source>
         <translation>编辑</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>库文件 (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>打开库文件</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <oldsource>Can not open file %1.</oldsource>
         <translation>无法打开文件 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>加载文件 %1 失败。%2。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <oldsource>Can not save file %1.</oldsource>
         <translation>无法保存文件 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation>库另存为</translation>
     </message>
@@ -495,23 +424,8 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="132"/>
@@ -519,12 +433,12 @@ Parameters: -l(line) (file)</source>
         <translation>文件(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>查看(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>工具栏(&amp;T)</translation>
     </message>
@@ -534,266 +448,266 @@ Parameters: -l(line) (file)</source>
         <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ 标准</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <oldsource>C standard</oldsource>
         <translation>&amp;C 标准</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>编辑(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>标准</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>分类</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>许可证(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;U)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>关于(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>文件(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <oldsource>Check files</oldsource>
         <translation>分析文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>目录(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <oldsource>Check directory</oldsource>
         <translation>分析目录</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>停止(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <oldsource>Stop checking</oldsource>
         <translation>停止分析</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>保存结果到文件(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>清空结果(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>首选项(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>显示风格警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>显示错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>显示信息消息</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>显示可移植性警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>显示 Cppcheck 结果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>显示 Clang 结果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>滤器(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>过滤结果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>打印(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>打印当前报告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>打印预览(&amp;v)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>打开当前结果的打印预览窗口</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>打开库编辑器</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>关闭项目文件(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>编辑项目文件(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>统计(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>显示警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>显示性能警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>显示隐藏项(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>全部选中(&amp;C)</translation>
     </message>
@@ -808,284 +722,274 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">隐藏</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>分析(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>滤器</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <oldsource>&amp;Recheck modified files</oldsource>
         <translation>重新分析已修改的文件(&amp;R)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>重新分析全部文件(&amp;y)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>风格警告(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>编辑(&amp;r)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>全部取消选中(&amp;U)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>全部折叠(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>全部展开(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>标准(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>标准项</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>内容(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>打开帮助内容</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>工具栏</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>分类(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>错误分类</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>打开 XML (&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>打开项目文件(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>显示便条(&amp;o)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>新建项目文件(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>日志视图(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>日志视图</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>性能警告(&amp;f)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>信息(&amp;I)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>可移植性(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>平台(&amp;l)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>&amp;Posix</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>库编辑器(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>自动检测语言(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>&amp;Enforce C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>E&amp;nforce C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>重新分析并检查库</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>检查配置(defines, includes)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished">常规</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
@@ -1094,23 +998,23 @@ This is probably because the settings were changed between the Cppcheck versions
 这可能是因为 Cppcheck 不同版本间的设置有所不同。请检查(并修复)编辑器应用程序设置，否则编辑器程序可能不会正确启动。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>在选择新的文件或目录之前，你必须先关闭此项目文件！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>快速滤器:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation>选择配置</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1119,69 +1023,64 @@ Do you want to load this project file instead?</source>
 你是否想加载该项目文件？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>库 &apos;%1&apos; 包含未知元素：
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>文件未找到</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation>无效的 XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation>缺失属性</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation>无效的属性值</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>不支持的格式</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation>重复的平台类型</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation>平台类型重定义</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation>位置元素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation>未知问题</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>选择的库 &apos;%1&apos; 加载失败。
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -1190,53 +1089,48 @@ Do you want to load this project file instead?</source>
         <translation type="vanished">加载 %1 失败。您的 Cppcheck 安装已损坏。您可以在命令行添加 --data-dir=&lt;目录&gt; 参数来指定文件位置。请注意，&apos;--data-dir&apos; 参数应当由安装脚本使用，因此，当使用此参数时，GUI不会启动，所发生的一切只是配置了设置。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML 文件(*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>打开报告文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>许可证</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>保存报告文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>文本文件(*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 文件(*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>项目文件(*.cppcheck);;所有文件(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>选择项目文件</translation>
     </message>
@@ -1256,77 +1150,75 @@ Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>项目:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation>没有找到合适的文件来分析!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation>C/C++ 源码</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation>Compile database</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation>选择要分析的文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation>选择要分析的目录</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>选择要分析的配置</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1335,44 +1227,44 @@ Do you want to proceed analysis without using any of these project files?</sourc
 您想在不使用这些项目文件的情况下进行分析吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1383,7 +1275,7 @@ Do you want to proceed?</source>
 你想继续吗?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1392,77 +1284,77 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 您想停止分析并退出 Cppcheck 吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML 文件 (*.xml);;文本文件 (*.txt);;CSV 文件 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>构建文件夹 &apos;%1&apos; 不能存在，创建它吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>要使用插件检查项目，您需要一个构建目录。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1471,22 +1363,22 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation type="vanished">导入 &apos;%1&apos; 失败，分析已停止</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation>项目文件 (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>选择项目文件名</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation>项目文件未加载</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1503,7 +1395,7 @@ Do you want to remove the file from the recently used projects -list?</source>
 你要从最近使用的项目列表中删除此文件吗？</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1545,7 +1437,7 @@ Options:
                             当使用这个选项时，GUI不会启动。</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - 命令行参数</translation>
     </message>
@@ -1578,7 +1470,7 @@ Options:
         <translation>符号名</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>编辑抑制</translation>
     </message>
@@ -1590,31 +1482,6 @@ Options:
         <source>Native</source>
         <translation>本地</translation>
     </message>
-    <message>
-        <location filename="platforms.cpp" line="39"/>
-        <source>Unix 32-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="40"/>
-        <source>Unix 64-bit</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="41"/>
-        <source>Windows 32-bit ANSI</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="42"/>
-        <source>Windows 32-bit Unicode</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="platforms.cpp" line="43"/>
-        <source>Windows 64-bit</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>ProjectFile</name>
@@ -1641,27 +1508,27 @@ Options:
         <translation>定义必须用分号分隔。例如：DEF1;DEF2=5;DEF3=int</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation>注意：把你自己的 .cfg 文件放在和项目文件相同的文件夹中。你应该在上面看到它们。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation>如果添加了标记，您将能够右键单击警告并设置其中一个标记。您可以手动对警告进行分类。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation>排除源文件</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation>排除文件夹...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation>排除文件...</translation>
     </message>
@@ -1670,17 +1537,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation>MISRA 规则文本</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;从 MISRA C 2012 PDF 的附录 A &amp;quot;指南摘要&amp;quot; 复制/粘贴文本到一个文本文件。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1691,8 +1558,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation>浏览...</translation>
     </message>
@@ -1720,15 +1586,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
@@ -1748,114 +1614,134 @@ Options:
         <translation>包含目录：</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation>类型和函数</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation>分析</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation>这是一个 Cppcheck 将用于各种目的的工作文件夹。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation>解析器</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheck (内建)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation>检查每个类是否有一个安全的公共接口</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation>极限分析</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <oldsource>Check code in unused templates  (slower and less accurate analysis)</oldsource>
         <translation>检查未使用模板中的代码（正常情况下应该是打开，但理论上可以忽略未使用模板中的警告）</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation>最大 CTU 深度</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished">启用内联方案</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation>外部工具</translation>
     </message>
@@ -1870,131 +1756,129 @@ Options:
         <translation>向下</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation>平台</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation>Clang (实验性的)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation>如果你想要设计你的类尽可能的灵活和健壮，那么公共接口必须非常健壮。Cppcheck 将假设参数可以取 *任何* 值。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation>检查头文件中的代码（通常应该是打开的。如果您想要一个有限的快速分析，那么关掉它)）</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation>模板实例化中的最大递归</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation>警告选项</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation>根路径：</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>警告中的文件路径将相对于此路径</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告标志（用分号隔开）</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation>Cppcheck 构建目录 (整个程序分析、增量分析、统计数据等)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation>库</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation>插件</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation>注意：插件需要安装  &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt;。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation>线程安全</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation>编码标准</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="999"/>
         <source>Clang analyzer</source>
-        <translation>Clang analyzer</translation>
+        <translation type="vanished">Clang analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="992"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="221"/>
@@ -2005,82 +1889,91 @@ Options:
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>项目文件: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation>选择 Cppcheck 构建目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>选择 Include 目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>选择一个检查目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (未找到)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
+        <location filename="projectfiledialog.cpp" line="628"/>
         <source>Compile database</source>
         <translation>Compile database</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation>导入项目</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>选择忽略的目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation>源文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation>全部文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation>排除文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation>选择 MISRA 规则文本文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA 规则文本文件 (%1)</translation>
     </message>
@@ -2088,32 +1981,32 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>指定了未知语言！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>语言文件 %1 不存在！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation>无法从文件 %2 中为语言 %1 加载翻译文件</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation>第%1行：未处理元素 %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation>第%1行：在 &quot;%3&quot; 中缺失的必选属性 &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (未找到)</translation>
     </message>
@@ -2163,181 +2056,176 @@ Options:
         <translation>极粗</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>编辑器前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>编辑器背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>高亮背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>行号前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>行号背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>关键字前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation>关键字字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>类前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation>类字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation>引用前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation>引用字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation>注释前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation>注释字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>符号前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>符号背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>符号字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation>设置为默认亮色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation>设置为默认暗色</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">行</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">严重性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished">不确定的</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished">概要</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished">日期</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
@@ -2361,93 +2249,98 @@ Options:
         <translation type="vanished">概要</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>未定义文件</translation>
+        <translation type="vanished">未定义文件</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation>找不到文件：</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>请选择文件夹 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>选择目录 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>请选择文件所在的目录。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation>调试</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
         <source>Recheck</source>
-        <translation>重新检查</translation>
+        <translation type="vanished">重新检查</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>隐藏</translation>
+        <translation type="vanished">隐藏</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation>隐藏全部 ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation>抑制选择的 ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation>打开包含的文件夹</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>标记</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>取消标记</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2457,7 +2350,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 在“首先项 / 应用程序”中为 Cppcheck 配置编辑应用程序。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2466,12 +2359,12 @@ Please select the default editor application in preferences/Applications.</sourc
 请在“首先项 / 应用程序”中选择默认应用程序。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>找不到文件！</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2480,7 +2373,7 @@ Please check the application path and parameters are correct.</source>
 请检查此应用程序的路径与参数是否正确。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>选择目录</translation>
     </message>
@@ -2497,32 +2390,32 @@ Please check the application path and parameters are correct.</source>
         <translation type="vanished">日期</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>风格</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>性能</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation>移植可能性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>信息</translation>
     </message>
@@ -2550,107 +2443,104 @@ Please check the application path and parameters are correct.</source>
         <translation>警告详情</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>保存报告失败。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>打印报告</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation>没有错误发现，没有可打印内容。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%2 个文件已检查 %1 个)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>未发现错误。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>发现错误，但它们被设为隐藏。
 打开“查看”菜单，切换需要显示的错误。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>读取报告失败。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>不再支持 XML 格式版本 1。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation>首次包含于</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
         <source>Bug hunting analysis is incomplete</source>
-        <translation>错误搜寻分析未完成</translation>
+        <translation type="vanished">错误搜寻分析未完成</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation>清空日志</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation>复制此日志条目</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation>复制完整日志</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2696,7 +2586,7 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>常规</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>添加...</translation>
     </message>
@@ -2706,176 +2596,180 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>线程个数: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
         <source>Ideal count:</source>
-        <translation>理想个数:</translation>
+        <translation type="vanished">理想个数:</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <oldsource>Check all #ifdef configurations</oldsource>
         <translation>强制检查所有 #ifdef 配置</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>显示文件的完整路径</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation>当未找到错误，显示“未发现错误”消息</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation>在列“Id”中显示错误 Id</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation>启用内联方案</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation>检查不确定的错误</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation>检查完成后显示统计数据</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>在日志中显示内建警告</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation>插件</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation>Python 二进制 (留空将使用 PATH 路径中的 python)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation>MISRA 插件</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA 规则文本文件</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;从 MISRA C 2012 PDF 的附录 A &amp;quot;指南摘要&amp;quot; 复制/粘贴文本到一个文本文件。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation>Clang 路径 (留空将使用系统 PATH 路径)</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio 头文件</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Visual Studio 头文件路径，用分号 &apos;;&apos; 分割。&lt;/p&gt;&lt;p&gt;你可以打开一个 Visual Studio 命令提示符，输入 &amp;quot;SET INCLUDE&amp;quot;。然后复制/粘贴路径。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation>代码编辑器</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation>代码编辑器风格</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation>系统风格</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation>默认浅色风格</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation>默认深色风格</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>应用程序</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>编辑...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>设为默认</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>报告</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation>创建报告时，保存所有错误</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>在报告中保存文件的完整路径</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>语言</translation>
     </message>
@@ -2883,47 +2777,46 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
         <source>N/A</source>
-        <translation>N/A</translation>
+        <translation type="vanished">N/A</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation>可执行文件 &quot;%1&quot; 不可用</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>添加一个新的应用程序</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>修改一个应用程序</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation> [默认]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation>[默认]</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation>选择 python 二进制</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation>选择 MISRA 文件</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation>选择 clang 路径</translation>
     </message>
@@ -2933,14 +2826,14 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>统计</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>项目</translation>
     </message>
@@ -2971,7 +2864,7 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>上一次扫描</translation>
     </message>
@@ -3051,151 +2944,159 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 小时</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 小时</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 分钟</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 分钟</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation> 与 </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>项目设置</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>包含路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>定义</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>未定义</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>选中的路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>扫描的文件数</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>扫描时间</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>文件: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>没有 cppcheck 构建目录</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>风格警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>移植可能性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>性能警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>信息</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation>%2 个文件已检查 %1 个</translation>
     </message>
@@ -3203,7 +3104,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3216,9 +3117,8 @@ The user interface language has been reset to English. Open the Preferences-dial
 用户界面语言已被重置为英语。打开“首选项”对话框，选择任何可用的语言。</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="132"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
diff --git a/gui/cppcheck_zh_TW.ts b/gui/cppcheck_zh_TW.ts
index cc332c7e455..3c25925c207 100644
--- a/gui/cppcheck_zh_TW.ts
+++ b/gui/cppcheck_zh_TW.ts
@@ -95,9 +95,8 @@ Parameters: -l(line) (file)</source>
         <translation>選取檢視器應用程式</translation>
     </message>
     <message>
-        <location filename="applicationdialog.cpp" line="83"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="applicationdialog.cpp" line="84"/>
@@ -108,65 +107,16 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>ComplianceReportDialog</name>
     <message>
-        <location filename="compliancereportdialog.ui" line="14"/>
-        <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation>專案名稱</translation>
+        <translation type="vanished">專案名稱</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation>專案版本</translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="42"/>
-        <source>Coding Standard</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">專案版本</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="50"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="55"/>
-        <source>Cert C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="60"/>
-        <source>Cert C++</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.ui" line="70"/>
-        <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="133"/>
-        <source>Compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation>HTML 檔案 (*.html)</translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="176"/>
-        <location filename="compliancereportdialog.cpp" line="239"/>
-        <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="compliancereportdialog.cpp" line="177"/>
-        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">HTML 檔案 (*.html)</translation>
     </message>
 </context>
 <context>
@@ -177,10 +127,8 @@ Parameters: -l(line) (file)</source>
         <translation>無法找到檔案: %1</translation>
     </message>
     <message>
-        <location filename="fileviewdialog.cpp" line="57"/>
-        <location filename="fileviewdialog.cpp" line="71"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="fileviewdialog.cpp" line="67"/>
@@ -206,14 +154,13 @@ Parameters: -l(line) (file)</source>
         <translation>索引</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="84"/>
+        <location filename="helpdialog.cpp" line="85"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>找不到幫助檔 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -322,40 +269,37 @@ Parameters: -l(line) (file)</source>
         <translation>編輯</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="98"/>
-        <location filename="librarydialog.cpp" line="170"/>
+        <location filename="librarydialog.cpp" line="97"/>
+        <location filename="librarydialog.cpp" line="169"/>
         <source>Library files (*.cfg)</source>
         <translation>程式庫檔案 (*.cfg)</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="100"/>
+        <location filename="librarydialog.cpp" line="99"/>
         <source>Open library file</source>
         <translation>開啟程式庫檔案</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="111"/>
-        <location filename="librarydialog.cpp" line="123"/>
-        <location filename="librarydialog.cpp" line="160"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="112"/>
+        <location filename="librarydialog.cpp" line="111"/>
         <source>Cannot open file %1.</source>
         <translation>無法開啟檔案 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="124"/>
+        <location filename="librarydialog.cpp" line="123"/>
         <source>Failed to load %1. %2.</source>
         <translation>無法載入 %1. %2。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="161"/>
+        <location filename="librarydialog.cpp" line="160"/>
         <source>Cannot save file %1.</source>
         <translation>無法儲存檔案 %1。</translation>
     </message>
     <message>
-        <location filename="librarydialog.cpp" line="173"/>
+        <location filename="librarydialog.cpp" line="172"/>
         <source>Save the library as</source>
         <translation type="unfinished">另存程式庫為</translation>
     </message>
@@ -473,23 +417,8 @@ Parameters: -l(line) (file)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="685"/>
-        <location filename="mainwindow.cpp" line="448"/>
-        <location filename="mainwindow.cpp" line="635"/>
-        <location filename="mainwindow.cpp" line="715"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="842"/>
-        <location filename="mainwindow.cpp" line="1429"/>
-        <location filename="mainwindow.cpp" line="1558"/>
-        <location filename="mainwindow.cpp" line="1890"/>
-        <location filename="mainwindow.cpp" line="1898"/>
-        <location filename="mainwindow.cpp" line="1946"/>
-        <location filename="mainwindow.cpp" line="1955"/>
-        <location filename="mainwindow.cpp" line="2027"/>
-        <location filename="mainwindow.cpp" line="2101"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
@@ -507,18 +436,18 @@ Parameters: -l(line) (file)</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="151"/>
         <source>&amp;View</source>
         <translation>檢視(&amp;V)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="156"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Toolbars</source>
         <translation>工具條(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="164"/>
-        <location filename="mainwindow.ui" line="969"/>
+        <location filename="mainwindow.ui" line="163"/>
+        <location filename="mainwindow.ui" line="979"/>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -528,532 +457,530 @@ Parameters: -l(line) (file)</source>
         <translation>幫助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="208"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>分析(&amp;N)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="212"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ 標準</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation>C 標準(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="251"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>編輯(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="264"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="282"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>分類</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="301"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>篩選</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="312"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>授權(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;U)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="326"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>關於(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="331"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>檔案(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="334"/>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="336"/>
+        <location filename="mainwindow.ui" line="339"/>
         <source>Analyze files</source>
         <translation>分析檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="340"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="349"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>目錄(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="352"/>
-        <location filename="mainwindow.ui" line="355"/>
+        <location filename="mainwindow.ui" line="354"/>
+        <location filename="mainwindow.ui" line="357"/>
         <source>Analyze directory</source>
         <translation>分析目錄</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="358"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="367"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <translation>重新分析已修改的檔案(&amp;R)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="370"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="379"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>重新分析所有檔案(&amp;Y)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="388"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>停止(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="391"/>
-        <location filename="mainwindow.ui" line="394"/>
+        <location filename="mainwindow.ui" line="393"/>
+        <location filename="mainwindow.ui" line="396"/>
         <source>Stop analysis</source>
         <translation>停止分析</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="406"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>儲存結果為檔案(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>清除結果(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>偏好設定(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>樣式警告(&amp;N)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="450"/>
-        <location filename="mainwindow.ui" line="453"/>
+        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Show style warnings</source>
         <translation>顯示樣式警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="465"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>錯誤(&amp;R)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="468"/>
-        <location filename="mainwindow.ui" line="471"/>
-        <location filename="mainwindow.cpp" line="2325"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2347"/>
         <source>Show errors</source>
         <translation>顯示錯誤</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="476"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>全部檢查(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="481"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="486"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>全部摺疊(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="491"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>全部展開(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="499"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>標準(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="502"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translatorcomment>標準項目</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="507"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>內容(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>開啟幫助內容</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="513"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="518"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>工具條</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>分類(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>錯誤分類</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="534"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>開啟 XML(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>開啟專案檔(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="555"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="560"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>新增專案檔(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="563"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="568"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>日誌檢視(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="571"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>日誌檢視</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="579"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>關閉專案檔(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="587"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>編輯專案檔(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="599"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>統計資料(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="611"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="614"/>
-        <location filename="mainwindow.ui" line="617"/>
-        <location filename="mainwindow.cpp" line="2326"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2348"/>
         <source>Show warnings</source>
         <translation>顯示警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="629"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>效能警告(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="632"/>
-        <location filename="mainwindow.ui" line="635"/>
+        <location filename="mainwindow.ui" line="634"/>
+        <location filename="mainwindow.ui" line="637"/>
         <source>Show performance warnings</source>
         <translation>顯示下效能警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="643"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>顯示隱藏項目(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="655"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>資訊(&amp;I)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="658"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>顯示資訊訊息</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="670"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>可移植性(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="673"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>顯示可移植性警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="688"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>顯示 Cppcheck 結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="700"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="703"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>顯示 Clang 結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="711"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>篩選(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="714"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>篩選結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="730"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32 位元 ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="738"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32 位元 Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="746"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32 位元</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="754"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64 位元</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="762"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64 位元</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="770"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>平臺(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="784"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="795"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="803"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="811"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="835"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="843"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="848"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>列印(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="851"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>列印當前報告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="856"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>列印預覽(&amp;V)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="859"/>
+        <location filename="mainwindow.ui" line="869"/>
         <source>Open a Print Preview Dialog for the Current Results</source>
         <translation>開啟當前結果的列印預覽視窗</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="864"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>程式庫編輯器(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="867"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>開啟程式庫編輯器</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="875"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>自動偵測語言(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="883"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="891"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="902"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="910"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>重新分析並檢查程式庫</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="918"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>檢查組態 (定義、包含)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="926"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="937"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="964"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="977"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="985"/>
-        <source>Misra C</source>
-        <translation type="unfinished"></translation>
+        <source>Misra C++ 2008</source>
+        <translation type="obsolete">Misra C++ 2008</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="993"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished">Misra C++ 2008</translation>
+        <source>Misra C++ 2023</source>
+        <translation type="obsolete">Misra C++ 2023</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1001"/>
-        <source>Cert C</source>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1009"/>
-        <source>Cert C++</source>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
-        <source>Misra C++ 2023</source>
-        <translation type="unfinished">Misra C++ 2023</translation>
+        <location filename="mainwindow.ui" line="1045"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
-        <source>Autosar</source>
+        <location filename="mainwindow.ui" line="1048"/>
+        <source>Show thread details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="106"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1071,206 +998,199 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="121"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - 命令行參數</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="145"/>
-        <location filename="mainwindow.cpp" line="1736"/>
+        <location filename="mainwindow.cpp" line="153"/>
+        <location filename="mainwindow.cpp" line="1758"/>
         <source>Quick Filter:</source>
         <translation>快速篩選:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="226"/>
-        <location filename="mainwindow.cpp" line="1738"/>
-        <location filename="mainwindow.cpp" line="1805"/>
-        <location filename="mainwindow.cpp" line="1995"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="1760"/>
+        <location filename="mainwindow.cpp" line="1826"/>
+        <location filename="mainwindow.cpp" line="2001"/>
         <source>Project:</source>
         <translation>專案:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="443"/>
+        <location filename="mainwindow.cpp" line="454"/>
         <source>There was a problem with loading the editor application settings.
 
 This is probably because the settings were changed between the Cppcheck versions. Please check (and fix) the editor application settings, otherwise the editor program might not start correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="670"/>
         <source>No suitable files found to analyze!</source>
         <translation>找不到適合的檔案來分析！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="755"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>您必須在選取新檔案或目錄之前關閉該專案檔！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="730"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>C/C++ Source</source>
         <translation>C/C++ 來源檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="731"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Compile database</source>
         <translation>編譯資料庫</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="732"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="733"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="736"/>
+        <location filename="mainwindow.cpp" line="775"/>
         <source>Select files to analyze</source>
         <translation>選取要分析的檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="751"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>Select directory to analyze</source>
         <translation>選取要分析的目錄</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select configuration</source>
         <translation>選取組態</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="791"/>
+        <location filename="mainwindow.cpp" line="831"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>選取要分析的組態</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="821"/>
+        <location filename="mainwindow.cpp" line="861"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="843"/>
+        <location filename="mainwindow.cpp" line="883"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="986"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="946"/>
+        <location filename="mainwindow.cpp" line="986"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="955"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>File not found</source>
         <translation>找不到檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="958"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="961"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="964"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Unsupported format</source>
         <translation>未支援的格式</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="970"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Duplicate platform type</source>
         <translation>重複的平臺型別</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="973"/>
+        <location filename="mainwindow.cpp" line="1013"/>
         <source>Platform type redefined</source>
         <translation>平臺型別重定義</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="976"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Duplicate define</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="979"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown element</source>
         <translation>未知的元素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="982"/>
-        <source>Unknown issue</source>
-        <translation>未知的議題</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="987"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Failed to load the selected library &apos;%1&apos;.
 %2</source>
         <translation>無法載入選取的程式庫 &apos;%1&apos;。
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="998"/>
+        <location filename="mainwindow.cpp" line="1035"/>
         <source>File not found: &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1024"/>
+        <location filename="mainwindow.cpp" line="1058"/>
         <source>Failed to load/setup addon %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
-        <location filename="mainwindow.cpp" line="1056"/>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1081"/>
+        <location filename="mainwindow.cpp" line="1091"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1046"/>
+        <location filename="mainwindow.cpp" line="1081"/>
         <source>Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=&lt;directory&gt; at the command line to specify where this file is located. Please note that --data-dir is supposed to be used by installation scripts and therefore the GUI does not start when it is used, all that happens is that the setting is configured.
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1091"/>
         <source>Failed to load %1 - %2
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1066"/>
-        <location filename="mainwindow.cpp" line="1160"/>
+        <location filename="mainwindow.cpp" line="1103"/>
+        <location filename="mainwindow.cpp" line="1200"/>
         <source>%1
 
 Analysis is aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1430"/>
+        <location filename="mainwindow.cpp" line="1470"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1278,18 +1198,18 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1445"/>
-        <location filename="mainwindow.cpp" line="1639"/>
+        <location filename="mainwindow.cpp" line="1485"/>
+        <location filename="mainwindow.cpp" line="1680"/>
         <source>XML files (*.xml)</source>
         <translation>XML 檔案 (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1487"/>
         <source>Open the report file</source>
         <translation>開啟報告檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1554"/>
+        <location filename="mainwindow.cpp" line="1590"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1298,62 +1218,57 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 您想停止分析並離開 Cppcheck 嗎？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1596"/>
+        <location filename="mainwindow.cpp" line="1632"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1610"/>
+        <location filename="mainwindow.cpp" line="1646"/>
         <source>License</source>
         <translation>授權</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1617"/>
+        <location filename="mainwindow.cpp" line="1653"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1630"/>
+        <location filename="mainwindow.cpp" line="1671"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML 檔案 (*.xml);;文字檔 (*.txt);;CSV 檔案 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1632"/>
+        <location filename="mainwindow.cpp" line="1673"/>
         <source>Save the report file</source>
         <translation>儲存報告檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1643"/>
+        <location filename="mainwindow.cpp" line="1684"/>
         <source>Text files (*.txt)</source>
         <translation>文字檔 (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1647"/>
+        <location filename="mainwindow.cpp" line="1688"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 檔案 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1670"/>
-        <source>Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1775"/>
+        <location filename="mainwindow.cpp" line="1796"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>專案檔 (*.cppcheck);;所有檔案 (*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1777"/>
+        <location filename="mainwindow.cpp" line="1798"/>
         <source>Select Project File</source>
         <translation>選取專案檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1891"/>
+        <location filename="mainwindow.cpp" line="1890"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>建置目錄 &apos;%1&apos; 不存在，是否建立它？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1899"/>
+        <location filename="mainwindow.cpp" line="1898"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1373,7 +1288,7 @@ Do you want to stop the analysis and exit Cppcheck?</source>
         <translation>無法匯入專案檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1947"/>
+        <location filename="mainwindow.cpp" line="1953"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
@@ -1382,62 +1297,62 @@ Analysis is stopped.</source>
 停止分析。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1962"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2298"/>
+        <location filename="mainwindow.cpp" line="2320"/>
         <source>Show Mandatory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2299"/>
+        <location filename="mainwindow.cpp" line="2321"/>
         <source>Show Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2300"/>
+        <location filename="mainwindow.cpp" line="2322"/>
         <source>Show Advisory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2323"/>
         <source>Show Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2318"/>
+        <location filename="mainwindow.cpp" line="2340"/>
         <source>Show L1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="2341"/>
         <source>Show L2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Show L3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2327"/>
+        <location filename="mainwindow.cpp" line="2349"/>
         <source>Show style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2328"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Show portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2329"/>
+        <location filename="mainwindow.cpp" line="2351"/>
         <source>Show performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2330"/>
+        <location filename="mainwindow.cpp" line="2352"/>
         <source>Show information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1446,22 +1361,22 @@ Analysis is stopped.</source>
         <translation type="vanished">無法匯入 &apos;%1&apos;，停止分析</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1980"/>
+        <location filename="mainwindow.cpp" line="1986"/>
         <source>Project files (*.cppcheck)</source>
         <translation>專案檔 (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1982"/>
+        <location filename="mainwindow.cpp" line="1988"/>
         <source>Select Project Filename</source>
         <translation>選取專案檔案名稱</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2096"/>
+        <location filename="mainwindow.cpp" line="2116"/>
         <source>The project file
 
 %1
@@ -1478,12 +1393,12 @@ Do you want to remove the file from the recently used projects -list?</source>
 您要從最近使用的專案列表中移除該檔案嗎？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2256"/>
+        <location filename="mainwindow.cpp" line="2278"/>
         <source>Install</source>
         <translation>安章</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2260"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>New version available: %1. %2</source>
         <translation>可用的新版本: %1. %2</translation>
     </message>
@@ -1516,7 +1431,7 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation>符號名稱</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="81"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>編輯抑制</translation>
     </message>
@@ -1529,29 +1444,24 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation>原生</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="39"/>
         <source>Unix 32-bit</source>
-        <translation>Unix 32 位元</translation>
+        <translation type="vanished">Unix 32 位元</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="40"/>
         <source>Unix 64-bit</source>
-        <translation>Unix 64 位元</translation>
+        <translation type="vanished">Unix 64 位元</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="41"/>
         <source>Windows 32-bit ANSI</source>
-        <translation>Windows 32 位元 ANSI</translation>
+        <translation type="vanished">Windows 32 位元 ANSI</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="42"/>
         <source>Windows 32-bit Unicode</source>
-        <translation>Windows 32 位元 Unicode</translation>
+        <translation type="vanished">Windows 32 位元 Unicode</translation>
     </message>
     <message>
-        <location filename="platforms.cpp" line="43"/>
         <source>Windows 64-bit</source>
-        <translation>Windows 64 位元</translation>
+        <translation type="vanished">Windows 64 位元</translation>
     </message>
 </context>
 <context>
@@ -1573,8 +1483,7 @@ Do you want to remove the file from the recently used projects -list?</source>
     </message>
     <message>
         <location filename="projectfile.ui" line="60"/>
-        <location filename="projectfile.ui" line="422"/>
-        <location filename="projectfile.ui" line="616"/>
+        <location filename="projectfile.ui" line="450"/>
         <source>Browse...</source>
         <translation>瀏覽...</translation>
     </message>
@@ -1607,15 +1516,15 @@ Do you want to remove the file from the recently used projects -list?</source>
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="690"/>
+        <location filename="projectfile.ui" line="699"/>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="697"/>
-        <location filename="projectfile.ui" line="740"/>
+        <location filename="projectfile.ui" line="706"/>
+        <location filename="projectfile.ui" line="749"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
@@ -1655,220 +1564,235 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="362"/>
+        <location filename="projectfile.ui" line="350"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="360"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="367"/>
+        <source>Browse..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="390"/>
         <source>Types and Functions</source>
         <translation>型別與函式</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="368"/>
+        <location filename="projectfile.ui" line="396"/>
         <source>Platform</source>
         <translation>平臺</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="380"/>
+        <location filename="projectfile.ui" line="408"/>
         <source>Libraries</source>
         <translation>程式庫</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="389"/>
+        <location filename="projectfile.ui" line="417"/>
         <source>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="488"/>
+        <location filename="projectfile.ui" line="431"/>
+        <location filename="projectfile.ui" line="516"/>
         <source>Analysis</source>
         <translation>分析</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="409"/>
+        <location filename="projectfile.ui" line="437"/>
         <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="415"/>
+        <location filename="projectfile.ui" line="443"/>
         <source>This is a workfolder that Cppcheck will use for various purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="432"/>
+        <location filename="projectfile.ui" line="460"/>
         <source>Parser</source>
         <translation>剖析器</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="438"/>
+        <location filename="projectfile.ui" line="466"/>
         <source>Cppcheck (built in)</source>
         <translation>Cppcheck (內建)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="448"/>
+        <location filename="projectfile.ui" line="476"/>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="486"/>
         <source>Check level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="492"/>
         <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="471"/>
+        <location filename="projectfile.ui" line="499"/>
         <source>Normal -- meant for normal analysis in CI. Analysis should finish in reasonable time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="478"/>
+        <location filename="projectfile.ui" line="506"/>
         <source>Exhaustive -- meant for nightly builds etc. Analysis time can be longer (10x slower than compilation is OK).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="494"/>
+        <location filename="projectfile.ui" line="522"/>
         <source>If you want to design your classes to be as flexible and robust as possible then the public interface must be very robust. Cppcheck will asumme that arguments can take *any* value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="497"/>
+        <location filename="projectfile.ui" line="525"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="513"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="519"/>
+        <location filename="projectfile.ui" line="547"/>
         <source>Check code in headers  (should be ON normally. if you want a limited quick analysis then turn this OFF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="529"/>
+        <location filename="projectfile.ui" line="557"/>
         <source>Check code in unused templates (should be ON normally, however in theory you can safely ignore warnings in unused templates)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="541"/>
+        <location filename="projectfile.ui" line="569"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="572"/>
+        <location filename="projectfile.ui" line="600"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="607"/>
-        <source>Premium License</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="627"/>
+        <location filename="projectfile.ui" line="636"/>
         <source>Warning options</source>
         <translation>警告選項</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="633"/>
+        <location filename="projectfile.ui" line="642"/>
         <source>Root path:</source>
         <translation>根路徑:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="639"/>
+        <location filename="projectfile.ui" line="648"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="649"/>
+        <location filename="projectfile.ui" line="658"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告標記 (由分號分隔)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="655"/>
+        <location filename="projectfile.ui" line="664"/>
         <source>If tags are added, you will be able to right click on warnings and set one of these tags. You can manually categorize warnings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="665"/>
+        <location filename="projectfile.ui" line="674"/>
         <source>Exclude source files</source>
         <translation>排除來源檔</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="676"/>
+        <location filename="projectfile.ui" line="685"/>
         <source>Exclude folder...</source>
         <translation>排除資料夾...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="683"/>
+        <location filename="projectfile.ui" line="692"/>
         <source>Exclude file...</source>
         <translation>排除檔案...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="722"/>
+        <location filename="projectfile.ui" line="731"/>
         <source>Suppressions</source>
         <translation>抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="733"/>
+        <location filename="projectfile.ui" line="742"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="765"/>
+        <location filename="projectfile.ui" line="774"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="786"/>
-        <location filename="projectfile.ui" line="792"/>
+        <location filename="projectfile.ui" line="795"/>
+        <location filename="projectfile.ui" line="801"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="798"/>
+        <location filename="projectfile.ui" line="807"/>
         <source>Note: Addons require &lt;a href=&quot;https://www.python.org/&quot;&gt;Python&lt;/a&gt; being installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="808"/>
+        <location filename="projectfile.ui" line="817"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="815"/>
+        <location filename="projectfile.ui" line="824"/>
         <source>Thread safety</source>
         <translation>執行緒安全</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="825"/>
+        <location filename="projectfile.ui" line="834"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="833"/>
+        <location filename="projectfile.ui" line="842"/>
         <source>Misra C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="841"/>
+        <location filename="projectfile.ui" line="850"/>
         <source>2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="846"/>
-        <location filename="projectfile.ui" line="909"/>
+        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="923"/>
         <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="896"/>
+        <location filename="projectfile.ui" line="860"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="910"/>
         <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="904"/>
+        <location filename="projectfile.ui" line="918"/>
         <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1877,17 +1801,17 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="vanished">Misra C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="885"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="878"/>
+        <location filename="projectfile.ui" line="892"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="885"/>
+        <location filename="projectfile.ui" line="899"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1896,130 +1820,142 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="vanished">Misra C++ 2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="932"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="941"/>
+        <location filename="projectfile.ui" line="955"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="953"/>
+        <location filename="projectfile.ui" line="967"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="960"/>
+        <location filename="projectfile.ui" line="974"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="970"/>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Safety profiles (defined in C++ core guidelines)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="976"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="986"/>
+        <location filename="projectfile.ui" line="1007"/>
         <source>External tools</source>
         <translation>外部工具</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="992"/>
         <source>Clang-tidy</source>
-        <translation>Clang-tidy</translation>
+        <translation type="vanished">Clang-tidy</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="999"/>
         <source>Clang analyzer</source>
-        <translation>Clang 分析器</translation>
+        <translation type="vanished">Clang 分析器</translation>
     </message>
 </context>
 <context>
     <name>ProjectFileDialog</name>
     <message>
-        <location filename="projectfiledialog.cpp" line="118"/>
+        <location filename="projectfiledialog.cpp" line="137"/>
         <source>Project file: %1</source>
         <translation>專案檔: %1</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="391"/>
+        <location filename="projectfiledialog.cpp" line="395"/>
         <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="446"/>
+        <location filename="projectfiledialog.cpp" line="460"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (找不到)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="575"/>
+        <location filename="projectfiledialog.cpp" line="588"/>
         <source>Select Cppcheck build dir</source>
         <translation>選取 Cppcheck 建置目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="614"/>
         <source>Visual Studio</source>
-        <translation>Visual Studio</translation>
+        <translation type="vanished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="615"/>
+        <location filename="projectfiledialog.cpp" line="628"/>
         <source>Compile database</source>
         <translation>編譯資料庫</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="616"/>
         <source>Borland C++ Builder 6</source>
-        <translation>Borland C++ Builder 6</translation>
+        <translation type="vanished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="617"/>
+        <location filename="projectfiledialog.cpp" line="630"/>
         <source>Import Project</source>
         <translation>匯入專案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="824"/>
+        <location filename="projectfiledialog.cpp" line="649"/>
+        <source>C/C++ header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="651"/>
+        <source>Include file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="844"/>
         <source>Select a directory to check</source>
         <translation>選取要檢查的目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="844"/>
+        <location filename="projectfiledialog.cpp" line="864"/>
         <source>Select include directory</source>
         <translation>選取包含目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="864"/>
+        <location filename="projectfiledialog.cpp" line="884"/>
         <source>Select directory to ignore</source>
         <translation>選取要忽略的目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="872"/>
+        <location filename="projectfiledialog.cpp" line="892"/>
         <source>Source files</source>
         <translation>來源檔</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="873"/>
+        <location filename="projectfiledialog.cpp" line="650"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="874"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>Exclude file</source>
         <translation>排除檔案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="958"/>
+        <location filename="projectfiledialog.cpp" line="977"/>
         <source>Select MISRA rule texts file</source>
         <translation>選取 MISRA 規則文字檔</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="960"/>
+        <location filename="projectfiledialog.cpp" line="979"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA 規則文字檔 (%1)</translation>
     </message>
@@ -2072,210 +2008,205 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <location filename="codeeditstyledialog.cpp" line="80"/>
         <source>Editor Foreground Color</source>
         <translation>編輯器前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <location filename="codeeditstyledialog.cpp" line="83"/>
         <source>Editor Background Color</source>
         <translation>編輯器背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <location filename="codeeditstyledialog.cpp" line="86"/>
         <source>Highlight Background Color</source>
         <translation>標明背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <location filename="codeeditstyledialog.cpp" line="89"/>
         <source>Line Number Foreground Color</source>
         <translation>行號前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <location filename="codeeditstyledialog.cpp" line="92"/>
         <source>Line Number Background Color</source>
         <translation>行號背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <location filename="codeeditstyledialog.cpp" line="95"/>
         <source>Keyword Foreground Color</source>
         <translation>關鍵字前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <location filename="codeeditstyledialog.cpp" line="98"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <location filename="codeeditstyledialog.cpp" line="101"/>
         <source>Class Foreground Color</source>
         <translation>類別前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <location filename="codeeditstyledialog.cpp" line="104"/>
         <source>Class Font Weight</source>
         <translation type="unfinished">類別字型粗細</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <location filename="codeeditstyledialog.cpp" line="107"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <location filename="codeeditstyledialog.cpp" line="110"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <location filename="codeeditstyledialog.cpp" line="113"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <location filename="codeeditstyledialog.cpp" line="116"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <location filename="codeeditstyledialog.cpp" line="119"/>
         <source>Symbol Foreground Color</source>
         <translation>符號前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <location filename="codeeditstyledialog.cpp" line="122"/>
         <source>Symbol Background Color</source>
         <translation>符號被景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <location filename="codeeditstyledialog.cpp" line="125"/>
         <source>Symbol Font Weight</source>
         <translation>符號字型粗細</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="146"/>
+        <location filename="codeeditstyledialog.cpp" line="141"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="148"/>
+        <location filename="codeeditstyledialog.cpp" line="143"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="42"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="47"/>
+        <location filename="cppchecklibrarydata.cpp" line="43"/>
         <source>line %1: Mandatory attribute &apos;%2&apos; missing in &apos;%3&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="279"/>
+        <location filename="projectfiledialog.cpp" line="282"/>
         <source> (Not found)</source>
         <translation> (找不到)</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="87"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>指定了未知語言！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="113"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>找不到語言檔 %1！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="118"/>
+        <location filename="translationhandler.cpp" line="122"/>
         <source>Failed to load translation for language %1 from file %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="132"/>
+        <location filename="resultstree.cpp" line="113"/>
         <source>File</source>
         <translation type="unfinished">檔案</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="133"/>
+        <location filename="resultstree.cpp" line="114"/>
         <source>Line</source>
         <translation type="unfinished">行號</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="134"/>
+        <location filename="resultstree.cpp" line="115"/>
         <source>Severity</source>
         <translation type="unfinished">安全性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="135"/>
+        <location filename="resultstree.cpp" line="116"/>
         <source>Classification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="136"/>
+        <location filename="resultstree.cpp" line="117"/>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="137"/>
+        <location filename="resultstree.cpp" line="118"/>
         <source>Inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="138"/>
+        <location filename="resultstree.cpp" line="119"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="139"/>
+        <location filename="resultstree.cpp" line="120"/>
         <source>Id</source>
         <translation type="unfinished">識別號</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="140"/>
+        <location filename="resultstree.cpp" line="121"/>
         <source>Guideline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="141"/>
+        <location filename="resultstree.cpp" line="122"/>
         <source>Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="142"/>
+        <location filename="resultstree.cpp" line="123"/>
         <source>Since date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="143"/>
+        <location filename="resultstree.cpp" line="124"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="resultstree.cpp" line="144"/>
-        <source>CWE</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="translationhandler.cpp" line="37"/>
+        <location filename="translationhandler.cpp" line="41"/>
         <source>OK</source>
         <translation>確認</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="38"/>
+        <location filename="translationhandler.cpp" line="42"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="39"/>
+        <location filename="translationhandler.cpp" line="43"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="40"/>
+        <location filename="translationhandler.cpp" line="44"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
@@ -2283,149 +2214,150 @@ Do you want to remove the file from the recently used projects -list?</source>
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="260"/>
         <source>Undefined file</source>
-        <translation>未定義的檔案</translation>
+        <translation type="vanished">未定義的檔案</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="386"/>
+        <location filename="resultstree.cpp" line="307"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="442"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>style</source>
         <translation>樣式</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="445"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="448"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="451"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>performance</source>
         <translation>效能</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="454"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="457"/>
+        <location filename="resultstree.cpp" line="370"/>
         <source>information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="460"/>
+        <location filename="resultstree.cpp" line="373"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="463"/>
+        <location filename="resultstree.cpp" line="376"/>
         <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="750"/>
-        <source>Recheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="751"/>
+        <location filename="resultstree.cpp" line="668"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="752"/>
         <source>Hide</source>
-        <translation>隱藏</translation>
+        <translation type="vanished">隱藏</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="753"/>
+        <location filename="resultstree.cpp" line="667"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="669"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="670"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="754"/>
+        <location filename="resultstree.cpp" line="671"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="772"/>
+        <location filename="resultstree.cpp" line="692"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="793"/>
+        <location filename="resultstree.cpp" line="712"/>
         <source>Tag</source>
         <translation>標記</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="795"/>
+        <location filename="resultstree.cpp" line="714"/>
         <source>No tag</source>
         <translation>取消標記</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="826"/>
-        <location filename="resultstree.cpp" line="840"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="827"/>
+        <location filename="resultstree.cpp" line="745"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="841"/>
+        <location filename="resultstree.cpp" line="759"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="867"/>
+        <location filename="resultstree.cpp" line="779"/>
         <source>Could not find the file!</source>
         <translation>找不到該檔案！</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="930"/>
+        <location filename="resultstree.cpp" line="822"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="944"/>
+        <location filename="resultstree.cpp" line="836"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="948"/>
+        <location filename="resultstree.cpp" line="840"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>請選取資料夾 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="949"/>
+        <location filename="resultstree.cpp" line="841"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>選取目錄 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="951"/>
+        <location filename="resultstree.cpp" line="843"/>
         <source>Please select the directory where file is located.</source>
         <translation>請選取資料夾所在的目錄。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="952"/>
+        <location filename="resultstree.cpp" line="844"/>
         <source>Select Directory</source>
         <translation>選取目錄</translation>
     </message>
@@ -2469,106 +2401,99 @@ Please check the application path and parameters are correct.</source>
         <translation>警告詳細資訊</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="232"/>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="236"/>
+        <location filename="resultsview.cpp" line="244"/>
         <source>Failed to save the report.</source>
         <translation>無法載入報告。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="254"/>
         <source>Print Report</source>
         <translation>列印報告</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="269"/>
+        <location filename="resultsview.cpp" line="273"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="321"/>
+        <location filename="resultsview.cpp" line="324"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="345"/>
-        <location filename="resultsview.cpp" line="356"/>
         <source>Cppcheck</source>
-        <translation>Cppcheck</translation>
+        <translation type="vanished">Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="346"/>
+        <location filename="resultsview.cpp" line="349"/>
         <source>No errors found.</source>
         <translation>找不到錯誤。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="353"/>
+        <location filename="resultsview.cpp" line="356"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="402"/>
-        <location filename="resultsview.cpp" line="421"/>
+        <location filename="resultsview.cpp" line="398"/>
+        <location filename="resultsview.cpp" line="417"/>
         <source>Failed to read the report.</source>
         <translation>無法讀取報告。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="409"/>
+        <location filename="resultsview.cpp" line="405"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>不再支援 XML 格式版本 1。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="470"/>
+        <location filename="resultsview.cpp" line="456"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="475"/>
+        <location filename="resultsview.cpp" line="461"/>
         <source>Id</source>
         <translation>識別號</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="477"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="551"/>
+        <location filename="resultsview.cpp" line="535"/>
         <source>Clear Log</source>
         <translation>清除日誌</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="552"/>
+        <location filename="resultsview.cpp" line="536"/>
         <source>Copy this Log entry</source>
         <translation>複製該日誌條目</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="553"/>
+        <location filename="resultsview.cpp" line="537"/>
         <source>Copy complete Log</source>
         <translation>複製完整的日誌</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="561"/>
+        <location filename="resultsview.cpp" line="544"/>
         <source>Analysis was stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="575"/>
+        <location filename="resultsview.cpp" line="558"/>
         <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="577"/>
+        <location filename="resultsview.cpp" line="560"/>
         <source>when checking %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="579"/>
+        <location filename="resultsview.cpp" line="562"/>
         <source>when checking a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="580"/>
+        <location filename="resultsview.cpp" line="563"/>
         <source>Analysis was aborted.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,180 +2544,180 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>執行緒數量: </translation>
     </message>
     <message>
-        <location filename="settings.ui" line="85"/>
-        <source>Ideal count:</source>
+        <location filename="settings.ui" line="79"/>
+        <source>Max count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="114"/>
+        <location filename="settings.ui" line="108"/>
         <source>Force checking all #ifdef configurations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="121"/>
+        <location filename="settings.ui" line="115"/>
         <source>Show full path of files</source>
         <translation>顯示檔案的完整路徑</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="128"/>
+        <location filename="settings.ui" line="122"/>
         <source>Show &quot;No errors found&quot; message when no errors found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="135"/>
+        <location filename="settings.ui" line="129"/>
         <source>Display error Id in column &quot;Id&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="142"/>
+        <location filename="settings.ui" line="136"/>
         <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="149"/>
+        <location filename="settings.ui" line="143"/>
         <source>Check for inconclusive errors also</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="156"/>
+        <location filename="settings.ui" line="150"/>
         <source>Show statistics on check completion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="163"/>
+        <location filename="settings.ui" line="157"/>
         <source>Check for updates</source>
         <translation>檢查更新</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="183"/>
+        <location filename="settings.ui" line="177"/>
         <source>Show internal warnings in log</source>
         <translation>顯示日誌中的內部警告</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="191"/>
+        <location filename="settings.ui" line="185"/>
         <source>Applications</source>
         <translation>應用程式</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="202"/>
+        <location filename="settings.ui" line="196"/>
         <source>Add...</source>
         <translation>新增...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="209"/>
-        <location filename="settings.ui" line="485"/>
+        <location filename="settings.ui" line="203"/>
+        <location filename="settings.ui" line="479"/>
         <source>Edit...</source>
         <translation>編輯...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="216"/>
+        <location filename="settings.ui" line="210"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="223"/>
+        <location filename="settings.ui" line="217"/>
         <source>Set as default</source>
         <translation>設定為預設值</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="246"/>
+        <location filename="settings.ui" line="240"/>
         <source>Reports</source>
         <translation>報告</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="252"/>
+        <location filename="settings.ui" line="246"/>
         <source>Save all errors when creating report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="259"/>
+        <location filename="settings.ui" line="253"/>
         <source>Save full path to files in reports</source>
         <translation>在報告中儲存檔案的完整路徑</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="280"/>
+        <location filename="settings.ui" line="274"/>
         <source>Language</source>
         <translation>語言</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="294"/>
+        <location filename="settings.ui" line="288"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="300"/>
+        <location filename="settings.ui" line="294"/>
         <source>Python binary (leave this empty to use python in the PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="311"/>
-        <location filename="settings.ui" line="352"/>
-        <location filename="settings.ui" line="397"/>
+        <location filename="settings.ui" line="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="330"/>
+        <location filename="settings.ui" line="324"/>
         <source>MISRA addon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="338"/>
+        <location filename="settings.ui" line="332"/>
         <source>MISRA rule texts file</source>
         <translation>MISRA 規則文字檔</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="345"/>
+        <location filename="settings.ui" line="339"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy/paste the text from Appendix A &amp;quot;Summary of guidelines&amp;quot; from the MISRA C 2012 pdf to a text file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="378"/>
+        <location filename="settings.ui" line="372"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="384"/>
+        <location filename="settings.ui" line="378"/>
         <source>Clang path (leave empty to use system PATH)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="407"/>
+        <location filename="settings.ui" line="401"/>
         <source>Visual Studio headers</source>
         <translation>Visual Studio 標頭檔</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="413"/>
+        <location filename="settings.ui" line="407"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paths to Visual Studio headers, separated by semicolon &apos;;&apos;.&lt;/p&gt;&lt;p&gt;You can open a Visual Studio command prompt, write &amp;quot;SET INCLUDE&amp;quot;. Then copy/paste the paths.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="443"/>
+        <location filename="settings.ui" line="437"/>
         <source>Code Editor</source>
         <translation>程式碼編輯器</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="449"/>
+        <location filename="settings.ui" line="443"/>
         <source>Code Editor Style</source>
         <translation>程式碼編輯器樣式</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="455"/>
+        <location filename="settings.ui" line="449"/>
         <source>System Style</source>
         <translation>系統樣式</translation>
     </message>
     <message>
-        <location filename="settings.ui" line="462"/>
+        <location filename="settings.ui" line="456"/>
         <source>Default Light Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="469"/>
+        <location filename="settings.ui" line="463"/>
         <source>Default Dark Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="478"/>
+        <location filename="settings.ui" line="472"/>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
@@ -2800,47 +2725,42 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settingsdialog.cpp" line="126"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.cpp" line="237"/>
+        <location filename="settingsdialog.cpp" line="232"/>
         <source>The executable file &quot;%1&quot; is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="248"/>
+        <location filename="settingsdialog.cpp" line="243"/>
         <source>Add a new application</source>
         <translation>新增一個新應用程式</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="278"/>
+        <location filename="settingsdialog.cpp" line="273"/>
         <source>Modify an application</source>
         <translation>修改一個應用程式</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="283"/>
+        <location filename="settingsdialog.cpp" line="278"/>
         <source> [Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="308"/>
+        <location filename="settingsdialog.cpp" line="303"/>
         <source>[Default]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="363"/>
+        <location filename="settingsdialog.cpp" line="358"/>
         <source>Select python binary</source>
         <translation>選取 python 二進位檔</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="370"/>
+        <location filename="settingsdialog.cpp" line="365"/>
         <source>Select MISRA File</source>
         <translation>選取 MISRA 檔案</translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="401"/>
+        <location filename="settingsdialog.cpp" line="396"/>
         <source>Select clang path</source>
         <translation>選取 clang 路徑</translation>
     </message>
@@ -2850,14 +2770,14 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="statsdialog.ui" line="14"/>
         <location filename="statsdialog.ui" line="248"/>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="184"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Statistics</source>
         <translation>統計資料</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Project</source>
         <translation>專案</translation>
     </message>
@@ -2888,7 +2808,7 @@ To toggle what kind of errors are shown, open view menu.</source>
     </message>
     <message>
         <location filename="statsdialog.ui" line="165"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Previous Scan</source>
         <translation>上一次掃描</translation>
     </message>
@@ -2968,151 +2888,159 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>Pdf 匯出</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>檔案: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="116"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>沒有 cppcheck 建置目錄</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>1 day</source>
         <translation>1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="160"/>
         <source>%1 days</source>
         <translation>%1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>1 hour</source>
         <translation>1 小時</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="165"/>
+        <location filename="statsdialog.cpp" line="162"/>
         <source>%1 hours</source>
         <translation>%1 小時</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>1 minute</source>
         <translation>1 分鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="164"/>
         <source>%1 minutes</source>
         <translation>%1 分鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>1 second</source>
         <translation>1 秒鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="166"/>
         <source>%1 seconds</source>
         <translation>%1 秒鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="173"/>
+        <location filename="statsdialog.cpp" line="170"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 秒鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="175"/>
+        <location filename="statsdialog.cpp" line="172"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="235"/>
+        <location filename="statsdialog.cpp" line="186"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Errors</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="236"/>
+        <location filename="statsdialog.cpp" line="188"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="237"/>
+        <location filename="statsdialog.cpp" line="190"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Style warnings</source>
         <translation>樣式警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="195"/>
-        <location filename="statsdialog.cpp" line="238"/>
+        <location filename="statsdialog.cpp" line="192"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Portability warnings</source>
         <translation>可移植性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="197"/>
-        <location filename="statsdialog.cpp" line="239"/>
+        <location filename="statsdialog.cpp" line="194"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Performance warnings</source>
         <translation>效能警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="199"/>
-        <location filename="statsdialog.cpp" line="240"/>
+        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="237"/>
         <source>Information messages</source>
         <translation>資訊訊息</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="202"/>
+        <location filename="statsdialog.cpp" line="199"/>
         <source>Export PDF</source>
         <translation>匯出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="224"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project Settings</source>
         <translation>專案設定</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Paths</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Include paths</source>
         <translation>包含路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Defines</source>
         <translation>定義</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Undefines</source>
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Path selected</source>
         <translation>選取的路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Number of files scanned</source>
         <translation>已掃描的檔案數量</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Scan duration</source>
         <translation>掃描時間</translation>
     </message>
 </context>
+<context>
+    <name>ThreadDetails</name>
+    <message>
+        <location filename="threaddetails.ui" line="14"/>
+        <source>Thread Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="45"/>
+        <location filename="threadresult.cpp" line="47"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3120,7 +3048,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="126"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -3128,11 +3056,6 @@ To toggle what kind of errors are shown, open view menu.</source>
 The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="translationhandler.cpp" line="132"/>
-        <source>Cppcheck</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>TxtReport</name>
diff --git a/gui/cppchecklibrarydata.cpp b/gui/cppchecklibrarydata.cpp
index 09c4ef7b689..637ad841580 100644
--- a/gui/cppchecklibrarydata.cpp
+++ b/gui/cppchecklibrarydata.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -29,21 +29,16 @@
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
-
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-#include <QStringRef>
-#endif
 
 const unsigned int CppcheckLibraryData::Function::Arg::ANY = ~0U;
 const unsigned int CppcheckLibraryData::Function::Arg::VARIADIC = ~1U;
 
-static std::string unhandledElement(const QXmlStreamReader &xmlReader)
+NORETURN static void unhandledElement(const QXmlStreamReader &xmlReader)
 {
     throw std::runtime_error(QObject::tr("line %1: Unhandled element %2").arg(xmlReader.lineNumber()).arg(xmlReader.name().toString()).toStdString());
 }
 
-static std::string mandatoryAttibuteMissing(const QXmlStreamReader &xmlReader, const QString& attributeName)
+NORETURN static void mandatoryAttibuteMissing(const QXmlStreamReader &xmlReader, const QString& attributeName)
 {
     throw std::runtime_error(QObject::tr("line %1: Mandatory attribute '%2' missing in '%3'")
                              .arg(xmlReader.lineNumber())
diff --git a/gui/cppchecklibrarydata.h b/gui/cppchecklibrarydata.h
index 1ec993314a2..71d8382ef34 100644
--- a/gui/cppchecklibrarydata.h
+++ b/gui/cppchecklibrarydata.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,8 +19,6 @@
 #ifndef CPPCHECKLIBRARYDATA_H
 #define CPPCHECKLIBRARYDATA_H
 
-#include "config.h"
-
 #include <cstdint>
 #include <utility>
 
@@ -230,7 +228,7 @@ class CppcheckLibraryData {
         entrypoints.clear();
     }
 
-    void swap(CppcheckLibraryData &other) NOEXCEPT {
+    void swap(CppcheckLibraryData &other) noexcept {
         containers.swap(other.containers);
         defines.swap(other.defines);
         undefines.swap(other.undefines);
diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp
index 26e983009dd..df9e4d48c47 100644
--- a/gui/csvreport.cpp
+++ b/gui/csvreport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -24,7 +24,6 @@
 #include <QDir>
 #include <QFile>
 #include <QList>
-#include <QtGlobal>
 
 CsvReport::CsvReport(const QString &filename) :
     Report(filename)
@@ -42,11 +41,7 @@ bool CsvReport::create()
 void CsvReport::writeHeader()
 {
     // Added 5 columns to the header.
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     mTxtWriter << "File, Line, Severity, Id, Summary" << Qt::endl;
-#else
-    mTxtWriter << "File, Line, Severity, Id, Summary" << endl;
-#endif
 }
 
 void CsvReport::writeFooter()
@@ -64,9 +59,5 @@ void CsvReport::writeError(const ErrorItem &error)
     const QString file = QDir::toNativeSeparators(error.errorPath.back().file);
     QString line = QString("%1,%2,").arg(file).arg(error.errorPath.back().line);
     line += QString("%1,%2,%3").arg(GuiSeverity::toString(error.severity)).arg(error.errorId).arg(error.summary);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     mTxtWriter << line << Qt::endl;
-#else
-    mTxtWriter << line << endl;
-#endif
 }
diff --git a/gui/erroritem.cpp b/gui/erroritem.cpp
index 4d24b434d4d..77693f26a81 100644
--- a/gui/erroritem.cpp
+++ b/gui/erroritem.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -37,7 +37,7 @@ bool operator==(const QErrorPathItem &i1, const QErrorPathItem &i2)
 ErrorItem::ErrorItem()
     : severity(Severity::none)
     , inconclusive(false)
-    , cwe(-1)
+    , cwe(0)
     , hash(0)
 {}
 
@@ -70,21 +70,22 @@ QString ErrorItem::tool() const
 
 QString ErrorItem::toString() const
 {
-    QString str = errorPath.back().file + " - " + errorId + " - ";
+    const int i = getMainLocIndex();
+    QString ret = errorPath[i].file + ":" + QString::number(errorPath[i].line) + ":" + QString::number(errorPath[i].column) + ":";
+    ret += GuiSeverity::toString(severity);
     if (inconclusive)
-        str += "inconclusive ";
-    str += GuiSeverity::toString(severity) +"\n";
-    str += summary + "\n";
-    str += message + "\n";
-    for (const QErrorPathItem& i : errorPath) {
-        str += "  " + i.file + ": " + QString::number(i.line) + "\n";
+        ret += ",inconclusive";
+    ret += ": " + summary + " [" + errorId + "]";
+    if (errorPath.size() >= 2) {
+        for (const auto& e: errorPath)
+            ret += "\n" + e.file + ":" + QString::number(e.line) + ":" + QString::number(e.column) + ":note: " + e.info;
     }
-    return str;
+    return ret;
 }
 
-bool ErrorItem::sameCID(const ErrorItem &errorItem1, const ErrorItem &errorItem2)
+bool ErrorItem::same(const ErrorItem &errorItem1, const ErrorItem &errorItem2)
 {
-    if (errorItem1.hash || errorItem2.hash)
+    if (errorItem1.hash && errorItem2.hash)
         return errorItem1.hash == errorItem2.hash;
 
     // fallback
@@ -95,3 +96,19 @@ bool ErrorItem::sameCID(const ErrorItem &errorItem1, const ErrorItem &errorItem2
            errorItem1.inconclusive == errorItem2.inconclusive &&
            errorItem1.severity == errorItem2.severity;
 }
+
+bool ErrorItem::filterMatch(const QString& filter) const
+{
+    if (filter.isEmpty())
+        return true;
+    if (summary.contains(filter, Qt::CaseInsensitive) ||
+        message.contains(filter, Qt::CaseInsensitive) ||
+        errorId.contains(filter, Qt::CaseInsensitive) ||
+        classification.contains(filter, Qt::CaseInsensitive))
+        return true;
+    return std::any_of(errorPath.cbegin(), errorPath.cend(),
+                       [filter](const auto& e) {
+        return e.file.contains(filter, Qt::CaseInsensitive) ||
+               e.info.contains(filter, Qt::CaseInsensitive);
+    });
+}
diff --git a/gui/erroritem.h b/gui/erroritem.h
index dfd48fbadfd..54c5a32a7f3 100644
--- a/gui/erroritem.h
+++ b/gui/erroritem.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,7 +23,6 @@
 #include "errortypes.h"
 
 #include <QList>
-#include <QMetaType>
 #include <QString>
 
 /// @addtogroup GUI
@@ -81,6 +80,20 @@ class ErrorItem {
     QString toString() const;
     QString tool() const;
 
+    int getMainLocIndex() const {
+        return isClangResult() ? 0 : errorPath.size() - 1;
+    }
+
+    QString getFile() const {
+        return errorPath.isEmpty() ? QString() : errorPath[getMainLocIndex()].file;
+    }
+
+    bool isClangResult() const {
+        return errorId.startsWith("clang");
+    }
+
+    bool filterMatch(const QString& filter) const;
+
     QString file0;
     QString errorId;
     Severity severity;
@@ -100,33 +113,9 @@ class ErrorItem {
     QString tags;
 
     /**
-     * Compare "CID"
+     * Compare Hash and fields
      */
-    static bool sameCID(const ErrorItem &errorItem1, const ErrorItem &errorItem2);
+    static bool same(const ErrorItem &errorItem1, const ErrorItem &errorItem2);
 };
-
-// NOLINTNEXTLINE(performance-no-int-to-ptr)
-Q_DECLARE_METATYPE(ErrorItem)
-
-/**
- * @brief A class containing error data for one shown error line.
- */
-class ErrorLine {
-public:
-    QString file;
-    int line;
-    QString file0;
-    QString errorId;
-    int cwe;
-    unsigned long long hash;
-    bool inconclusive;
-    Severity severity;
-    QString summary;
-    QString message;
-    QString sinceDate;
-    QString tags;
-    QString remark;
-};
-
 /// @}
 #endif // ERRORITEM_H
diff --git a/gui/filelist.cpp b/gui/filelist.cpp
index 3115967c451..cdfa6676a4e 100644
--- a/gui/filelist.cpp
+++ b/gui/filelist.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -119,11 +119,7 @@ static std::vector<std::string> toStdStringList(const QStringList &stringList)
 
 QStringList FileList::applyExcludeList() const
 {
-#ifdef _WIN32
-    const PathMatch pathMatch(toStdStringList(mExcludedPaths), true);
-#else
-    const PathMatch pathMatch(toStdStringList(mExcludedPaths), false);
-#endif
+    const PathMatch pathMatch(toStdStringList(mExcludedPaths), QDir::currentPath().toStdString());
 
     QStringList paths;
     for (const QFileInfo& item : mFileList) {
diff --git a/gui/fileviewdialog.cpp b/gui/fileviewdialog.cpp
index bebb1f656cb..9d453519450 100644
--- a/gui/fileviewdialog.cpp
+++ b/gui/fileviewdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -54,7 +54,7 @@ void FileViewDialog::loadTextFile(const QString &filename, QTextEdit *edit)
         msg = msg.arg(filename);
 
         QMessageBox msgbox(QMessageBox::Critical,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
@@ -62,13 +62,13 @@ void FileViewDialog::loadTextFile(const QString &filename, QTextEdit *edit)
         return;
     }
 
-    file.open(QIODevice::ReadOnly | QIODevice::Text);
+    (void)file.open(QIODevice::ReadOnly | QIODevice::Text); // TODO: check result
     if (!file.isReadable()) {
         QString msg(tr("Could not read the file: %1"));
         msg = msg.arg(filename);
 
         QMessageBox msgbox(QMessageBox::Critical,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
diff --git a/gui/gui.pro b/gui/gui.pro
new file mode 100644
index 00000000000..37c70471b9a
--- /dev/null
+++ b/gui/gui.pro
@@ -0,0 +1,236 @@
+lessThan(QT_MAJOR_VERSION, 6): error(requires >= Qt 6 (You used: $$QT_VERSION))
+
+TEMPLATE = app
+TARGET = cppcheck-gui
+CONFIG += warn_on debug
+DEPENDPATH += . \
+    ../lib
+INCLUDEPATH += . \
+    ../lib
+QT += widgets
+QT += printsupport
+QT += help
+QT += network
+
+# Build online help
+#onlinehelp.target = online-help.qhc
+#onlinehelp.commands = qhelpgenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc
+#QMAKE_EXTRA_TARGETS += onlinehelp
+#PRE_TARGETDEPS += online-help.qhc
+
+contains(LINKCORE, [yY][eE][sS]) {
+    LIBS += -l../bin/cppcheck-core
+    DEFINES += CPPCHECKLIB_IMPORT
+}
+LIBS += -L$$PWD/../externals
+
+DESTDIR = .
+RCC_DIR = temp
+MOC_DIR = temp
+OBJECTS_DIR = temp
+UI_DIR = temp
+
+isEmpty(QMAKE_CXX) {
+    isEmpty(CXX)) {
+        QMAKE_CXX = gcc
+    } else {
+        QMAKE_CXX = $$(CXX)
+    }
+}
+
+win32 {
+   CONFIG += windows
+   contains(LINKCORE, [yY][eE][sS]) {
+      DESTDIR = ../bin
+      RCC_DIR = temp/generated
+      MOC_DIR = temp/generated
+      OBJECTS_DIR = temp/generated
+      UI_DIR = temp/generated
+   } else {
+      DESTDIR = ../Build/gui
+      RCC_DIR = ../BuildTmp/gui
+      MOC_DIR = ../BuildTmp/gui
+      OBJECTS_DIR = ../BuildTmp/gui
+      UI_DIR = ../BuildTmp/gui
+   }
+}
+
+RESOURCES = gui.qrc
+FORMS = about.ui \
+        applicationdialog.ui \
+        fileview.ui \
+        helpdialog.ui \
+        mainwindow.ui \
+        projectfile.ui \
+        resultsview.ui \
+        scratchpad.ui \
+        settings.ui \
+        statsdialog.ui \
+        librarydialog.ui \
+        libraryaddfunctiondialog.ui \
+        libraryeditargdialog.ui \
+        newsuppressiondialog.ui \
+        threaddetails.ui
+
+TRANSLATIONS =  cppcheck_de.ts \
+                cppcheck_es.ts \
+                cppcheck_fi.ts \
+                cppcheck_fr.ts \
+                cppcheck_it.ts \
+                cppcheck_ja.ts \
+                cppcheck_ka.ts \
+                cppcheck_ko.ts \
+                cppcheck_nl.ts \
+                cppcheck_ru.ts \
+                cppcheck_sr.ts \
+                cppcheck_sv.ts \
+                cppcheck_zh_CN.ts \
+                cppcheck_zh_TW.ts
+
+# Windows-specific options
+CONFIG += embed_manifest_exe
+
+contains(LINKCORE, [yY][eE][sS]) {
+} else {
+    INCLUDEPATH += $$PWD/../lib
+    HEADERS += $$PWD/../lib/*.h
+    SOURCES += $$PWD/../lib/*.cpp
+
+    INCLUDEPATH += $$PWD/../frontend
+    HEADERS += $$PWD/../frontend/*.h
+    SOURCES += $$PWD/../frontend/*.cpp
+
+    INCLUDEPATH += $$PWD/../externals/picojson
+    HEADERS += $$PWD/../externals/picojson/picojson.h
+
+    INCLUDEPATH += $$PWD/../externals/simplecpp
+    HEADERS += $$PWD/../externals/simplecpp/simplecpp.h
+    SOURCES += $$PWD/../externals/simplecpp/simplecpp.cpp
+    DEFINES += SIMPLECPP_TOKENLIST_ALLOW_PTR
+
+    INCLUDEPATH += $$PWD/../externals/tinyxml2
+    HEADERS += $$PWD/../externals/tinyxml2/tinyxml2.h
+    SOURCES += $$PWD/../externals/tinyxml2/tinyxml2.cpp
+}
+
+win32-msvc* {
+    MSVC_VER = $$(VisualStudioVersion)
+    message($$MSVC_VER)
+    MSVC_VER_SPLIT = $$split(MSVC_VER, .)
+    MSVC_VER_MAJOR = $$first(MSVC_VER_SPLIT)
+    # doesn't compile with older VS versions - assume VS2019 (16.x) is the first working for now
+    !lessThan(MSVC_VER_MAJOR, 16) {
+        message("using precompiled header")
+        CONFIG += precompile_header
+        PRECOMPILED_HEADER = precompiled_qmake.h
+    }
+}
+
+HEADERS += aboutdialog.h \
+           application.h \
+           applicationdialog.h \
+           applicationlist.h \
+           checkstatistics.h \
+           checkthread.h \
+           codeeditstylecontrols.h \
+           codeeditorstyle.h \
+           codeeditstyledialog.h \
+           codeeditor.h \
+           common.h \
+           csvreport.h \
+           erroritem.h \
+           filelist.h \
+           fileviewdialog.h \
+           helpdialog.h \
+           mainwindow.h \
+           platforms.h \
+           printablereport.h \
+           projectfile.h \
+           projectfiledialog.h \
+           report.h \
+           resultitem.h \
+           resultstree.h \
+           resultsview.h \
+           scratchpad.h \
+           settingsdialog.h \
+           showtypes.h \
+           statsdialog.h \
+           threaddetails.h \
+           threadhandler.h \
+           threadresult.h \
+           translationhandler.h \
+           txtreport.h \
+           xmlreport.h \
+           xmlreportv2.h \
+           librarydialog.h \
+           cppchecklibrarydata.h \
+           libraryaddfunctiondialog.h \
+           libraryeditargdialog.h \
+           newsuppressiondialog.h
+
+SOURCES += aboutdialog.cpp \
+           application.cpp \
+           applicationdialog.cpp \
+           applicationlist.cpp \
+           checkstatistics.cpp \
+           checkthread.cpp \
+           codeeditorstyle.cpp \
+           codeeditstylecontrols.cpp \
+           codeeditstyledialog.cpp \
+           codeeditor.cpp \
+           common.cpp \
+           csvreport.cpp \
+           erroritem.cpp \
+           filelist.cpp \
+           fileviewdialog.cpp \
+           helpdialog.cpp \
+           main.cpp \
+           mainwindow.cpp\
+           platforms.cpp \
+           printablereport.cpp \
+           projectfile.cpp \
+           projectfiledialog.cpp \
+           report.cpp \
+           resultitem.cpp \
+           resultstree.cpp \
+           resultsview.cpp \
+           scratchpad.cpp \
+           settingsdialog.cpp \
+           showtypes.cpp \
+           statsdialog.cpp \
+           threaddetails.cpp \
+           threadhandler.cpp \
+           threadresult.cpp \
+           translationhandler.cpp \
+           txtreport.cpp \
+           xmlreport.cpp \
+           xmlreportv2.cpp \
+           librarydialog.cpp \
+           cppchecklibrarydata.cpp \
+           libraryaddfunctiondialog.cpp \
+           libraryeditargdialog.cpp \
+           newsuppressiondialog.cpp
+
+win32 {
+    RC_FILE = cppcheck-gui.rc
+    HEADERS += ../lib/version.h
+    contains(LINKCORE, [yY][eE][sS]) {
+    } else {
+        LIBS += -lshlwapi
+    }
+}
+
+contains(QMAKE_CC, gcc) {
+    QMAKE_CXXFLAGS += -std=c++17 -pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar
+}
+
+contains(QMAKE_CXX, clang++) {
+    QMAKE_CXXFLAGS += -std=c++17 -pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar
+}
+
+contains(HAVE_QCHART, [yY][eE][sS]) {
+    QT += charts
+} else {
+    message("Charts disabled - to enable it pass HAVE_QCHART=yes to qmake.")
+}
+
diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp
index db1125339b9..bef304c5471 100644
--- a/gui/helpdialog.cpp
+++ b/gui/helpdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,6 +19,7 @@
 #include "helpdialog.h"
 
 #include "common.h"
+#include "utils.h"
 
 #include "ui_helpdialog.h"
 
@@ -65,7 +66,7 @@ static QString getHelpFile()
     paths << (filesdir + "/help")
           << filesdir;
 #endif
-    for (const QString &p: paths) {
+    for (const QString &p: utils::as_const(paths)) {
         QString filename = p + "/online-help.qhc";
         if (QFileInfo::exists(filename))
             return filename;
@@ -83,7 +84,7 @@ HelpDialog::HelpDialog(QWidget *parent) :
     if (helpFile.isEmpty()) {
         const QString msg = tr("Helpfile '%1' was not found").arg("online-help.qhc");
         QMessageBox msgBox(QMessageBox::Warning,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
diff --git a/gui/helpdialog.h b/gui/helpdialog.h
index da80f61ca02..4f592f5c7f6 100644
--- a/gui/helpdialog.h
+++ b/gui/helpdialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,7 +22,6 @@
 #include <QDialog>
 #include <QObject>
 #include <QTextBrowser>
-#include <QVariant>
 
 class QHelpEngine;
 class QWidget;
diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp
index 0cdfb5cf84a..147363a3a25 100644
--- a/gui/librarydialog.cpp
+++ b/gui/librarydialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -30,7 +30,6 @@
 #include <QComboBox>
 #include <QFile>
 #include <QFileDialog>
-#include <QFlags>
 #include <QIODevice>
 #include <QLineEdit>
 #include <QList>
@@ -108,7 +107,7 @@ void LibraryDialog::openCfg()
     QFile file(selectedFile);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("Cannot open file %1.").arg(selectedFile),
                         QMessageBox::Ok,
                         this);
@@ -120,7 +119,7 @@ void LibraryDialog::openCfg()
     const QString errmsg = tempdata.open(file);
     if (!errmsg.isNull()) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("Failed to load %1. %2.").arg(selectedFile).arg(errmsg),
                         QMessageBox::Ok,
                         this);
@@ -157,7 +156,7 @@ void LibraryDialog::saveCfg()
         mUi->buttonSave->setEnabled(false);
     } else {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("Cannot save file %1.").arg(mFileName),
                         QMessageBox::Ok,
                         this);
@@ -168,7 +167,7 @@ void LibraryDialog::saveCfg()
 void LibraryDialog::saveCfgAs()
 {
     const QString filter(tr("Library files (*.cfg)"));
-    const QString path = Path::getPathFromFilename(mFileName.toStdString()).c_str();
+    const QString path = QString::fromStdString(Path::getPathFromFilename(mFileName.toStdString()));
     QString selectedFile = QFileDialog::getSaveFileName(this,
                                                         tr("Save the library as"),
                                                         path,
@@ -293,11 +292,11 @@ void LibraryDialog::filterFunctions(const QString& filter)
     QList<QListWidgetItem *> allItems = mUi->functions->findItems(QString(), Qt::MatchContains);
 
     if (filter.isEmpty()) {
-        for (QListWidgetItem *item : allItems) {
+        for (QListWidgetItem *item : utils::as_const(allItems)) {
             item->setHidden(false);
         }
     } else {
-        for (QListWidgetItem *item : allItems) {
+        for (QListWidgetItem *item : utils::as_const(allItems)) {
             item->setHidden(!item->text().startsWith(filter));
         }
     }
diff --git a/gui/librarydialog.h b/gui/librarydialog.h
index 285d36a820a..c8e522b10d4 100644
--- a/gui/librarydialog.h
+++ b/gui/librarydialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -47,10 +47,10 @@ private slots:
     void addFunction();
     void changeFunction();
     void editArg();
-    void editFunctionName(QListWidgetItem* /*item*/);
-    void filterFunctions(const QString& /*filter*/);
+    void editFunctionName(QListWidgetItem* item);
+    void filterFunctions(const QString& filter);
     void selectFunction();
-    void sortFunctions(bool /*sort*/);
+    void sortFunctions(bool sort);
 
 private:
     Ui::LibraryDialog *mUi;
diff --git a/gui/main.cpp b/gui/main.cpp
index 91bc9e7a084..c855b2529f6 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -47,12 +47,6 @@ static bool CheckArgs(const QStringList &args);
 
 int main(int argc, char *argv[])
 {
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
-
     QApplication app(argc, argv);
 
     QCoreApplication::setOrganizationName("Cppcheck");
@@ -130,6 +124,7 @@ static void ShowUsage()
 
 static void ShowVersion()
 {
+// TODO: should only *not* show a dialog when we are on a command-line
 #if defined(_WIN32)
     AboutDialog *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), 0);
     dlg->exec();
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 8522f3efcb5..31f124bc5b0 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,14 +23,12 @@
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
 #include "checkers.h"
-#include "checkstatistics.h"
 #include "checkthread.h"
 #include "common.h"
 #include "cppcheck.h"
 #include "errortypes.h"
 #include "filelist.h"
 #include "filesettings.h"
-#include "compliancereportdialog.h"
 #include "fileviewdialog.h"
 #include "helpdialog.h"
 #include "importproject.h"
@@ -40,6 +38,7 @@
 #include "projectfile.h"
 #include "projectfiledialog.h"
 #include "report.h"
+#include "resultstree.h"
 #include "resultsview.h"
 #include "scratchpad.h"
 #include "settings.h"
@@ -51,10 +50,15 @@
 #include "threadhandler.h"
 #include "threadresult.h"
 #include "translationhandler.h"
+#include "utils.h"
+#include "threaddetails.h"
 
 #include "ui_mainwindow.h"
 
+#include "frontend.h"
+
 #include <algorithm>
+#include <cstddef>
 #include <iterator>
 #include <list>
 #include <memory>
@@ -72,6 +76,7 @@
 #include <QCloseEvent>
 #include <QCoreApplication>
 #include <QDateTime>
+#include <QDesktopServices>
 #include <QDebug>
 #include <QDialog>
 #include <QDir>
@@ -94,7 +99,6 @@
 #include <QSettings>
 #include <QSize>
 #include <QTimer>
-#include <QTemporaryFile>
 #include <QToolBar>
 #include <QUrl>
 #include <QVariant>
@@ -176,6 +180,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     connect(mUI->mActionShowHidden, &QAction::triggered, mUI->mResults, &ResultsView::showHiddenResults);
     connect(mUI->mActionViewStats, &QAction::triggered, this, &MainWindow::showStatistics);
     connect(mUI->mActionLibraryEditor, &QAction::triggered, this, &MainWindow::showLibraryEditor);
+    connect(mUI->mActionShowThreadDetails, &QAction::triggered, this, &MainWindow::showThreadDetails);
 
     connect(mUI->mActionReanalyzeModified, &QAction::triggered, this, &MainWindow::reAnalyzeModified);
     connect(mUI->mActionReanalyzeAll, &QAction::triggered, this, &MainWindow::reAnalyzeAll);
@@ -184,11 +189,12 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
 
     connect(mUI->mActionStop, &QAction::triggered, this, &MainWindow::stopAnalysis);
     connect(mUI->mActionSave, &QAction::triggered, this, &MainWindow::save);
-    connect(mUI->mActionComplianceReport, &QAction::triggered, this, &MainWindow::complianceReport);
 
     // About menu
     connect(mUI->mActionAbout, &QAction::triggered, this, &MainWindow::about);
     connect(mUI->mActionLicense, &QAction::triggered, this, &MainWindow::showLicense);
+    mUI->mActionEULA->setVisible(isCppcheckPremium());
+    connect(mUI->mActionEULA, &QAction::triggered, this, &MainWindow::showEULA);
 
     // View > Toolbar menu
     connect(mUI->mActionToolBarMain, SIGNAL(toggled(bool)), this, SLOT(toggleMainToolBar()));
@@ -226,19 +232,19 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     loadSettings();
 
     mThread->initialize(mUI->mResults);
-    if (mProjectFile)
+    if (mProjectFile) {
+        enableProjectActions(true);
         formatAndSetTitle(tr("Project:") + ' ' + mProjectFile->getFilename());
-    else
+    } else {
+        enableProjectActions(false);
         formatAndSetTitle();
-
-    mUI->mActionComplianceReport->setVisible(isCppcheckPremium());
+    }
 
     enableCheckButtons(true);
 
     mUI->mActionPrint->setShortcut(QKeySequence::Print);
     enableResultsButtons();
     enableProjectOpenActions(true);
-    enableProjectActions(false);
 
     // Must setup MRU menu before CLI param handling as it can load a
     // project file and update MRU menu.
@@ -259,9 +265,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
         handleCLIParams(args);
     }
 
-    mUI->mActionCloseProjectFile->setEnabled(mProjectFile != nullptr);
-    mUI->mActionEditProjectFile->setEnabled(mProjectFile != nullptr);
-
     for (int i = 0; i < mPlatforms.getCount(); i++) {
         PlatformData platform = mPlatforms.mPlatforms[i];
         auto *action = new QAction(this);
@@ -288,6 +291,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mUI->mActionC11->setActionGroup(mCStandardActions);
     //mUI->mActionC17->setActionGroup(mCStandardActions);
     //mUI->mActionC23->setActionGroup(mCStandardActions);
+    //mUI->mActionC2Y->setActionGroup(mCStandardActions);
 
     mUI->mActionCpp03->setActionGroup(mCppStandardActions);
     mUI->mActionCpp11->setActionGroup(mCppStandardActions);
@@ -391,7 +395,9 @@ void MainWindow::loadSettings()
     mUI->mActionReportAutosar->setChecked(reportType == ReportType::autosar);
     mUI->mActionReportCertC->setChecked(reportType == ReportType::certC);
     mUI->mActionReportCertCpp->setChecked(reportType == ReportType::certCpp);
-    mUI->mActionReportMisraC->setChecked(reportType == ReportType::misraC);
+    mUI->mActionReportMisraC->setChecked(reportType == ReportType::misraC2012 ||
+                                         reportType == ReportType::misraC2023 ||
+                                         reportType == ReportType::misraC2025);
     mUI->mActionReportMisraCpp2008->setChecked(reportType == ReportType::misraCpp2008);
     mUI->mActionReportMisraCpp2023->setChecked(reportType == ReportType::misraCpp2023);
 
@@ -412,6 +418,7 @@ void MainWindow::loadSettings()
     mUI->mActionC11->setChecked(standards.c == Standards::C11);
     //mUI->mActionC17->setChecked(standards.c == Standards::C17);
     //mUI->mActionC23->setChecked(standards.c == Standards::C23);
+    //mUI->mActionC2Y->setChecked(standards.c == Standards::C2Y);
     standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
     mUI->mActionCpp03->setChecked(standards.cpp == Standards::CPP03);
     mUI->mActionCpp11->setChecked(standards.cpp == Standards::CPP11);
@@ -449,7 +456,7 @@ void MainWindow::loadSettings()
                                "Please check (and fix) the editor application settings, otherwise the editor "
                                "program might not start correctly.");
         QMessageBox msgBox(QMessageBox::Warning,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok,
                            this);
@@ -470,6 +477,15 @@ void MainWindow::loadSettings()
     }
 }
 
+static ReportType getMisraCReportType(const QStringList &standards)
+{
+    if (standards.contains(CODING_STANDARD_MISRA_C_2023))
+        return ReportType::misraC2023;
+    if (standards.contains(CODING_STANDARD_MISRA_C_2025))
+        return ReportType::misraC2025;
+    return ReportType::misraC2012;
+}
+
 void MainWindow::saveSettings() const
 {
     // Window/dialog sizes
@@ -480,7 +496,7 @@ void MainWindow::saveSettings() const
     const ReportType reportType = mUI->mActionReportAutosar->isChecked() ? ReportType::autosar :
                                   mUI->mActionReportCertC->isChecked() ? ReportType::certC :
                                   mUI->mActionReportCertCpp->isChecked() ? ReportType::certCpp :
-                                  mUI->mActionReportMisraC->isChecked() ? ReportType::misraC :
+                                  mUI->mActionReportMisraC->isChecked() ? (mProjectFile ? getMisraCReportType(mProjectFile->getCodingStandards()) : ReportType::misraC2012) :
                                   mUI->mActionReportMisraCpp2008->isChecked() ? ReportType::misraCpp2008 :
                                   mUI->mActionReportMisraCpp2023->isChecked() ? ReportType::misraCpp2023 :
                                   ReportType::normal;
@@ -504,6 +520,8 @@ void MainWindow::saveSettings() const
     //    mSettings->setValue(SETTINGS_STD_C, "C17");
     //if (mUI->mActionC23->isChecked())
     //    mSettings->setValue(SETTINGS_STD_C, "C23");
+    //if (mUI->mActionC2Y->isChecked())
+    //    mSettings->setValue(SETTINGS_STD_C, "C2Y");
 
     if (mUI->mActionCpp03->isChecked())
         mSettings->setValue(SETTINGS_STD_CPP, "C++03");
@@ -541,13 +559,20 @@ void MainWindow::saveSettings() const
     mUI->mResults->saveSettings(mSettings);
 }
 
-void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLib, const bool checkConfig, const QStringList& recheckFiles)
 {
     Settings checkSettings;
     auto supprs = std::make_shared<Suppressions>();
     if (!getCppcheckSettings(checkSettings, *supprs))
         return;
 
+    // filter requested files
+    if (!recheckFiles.isEmpty()) {
+        p.fileSettings.remove_if([&](const FileSettings& fs) {
+            return !recheckFiles.contains(QString::fromStdString(fs.filename()));
+        });
+    }
+
     clearResults();
 
     mIsLogfileLoaded = false;
@@ -572,7 +597,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
         enableProjectActions(false);
     }
 
-    mUI->mResults->clear(true);
+    mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Analysis);
     mThread->clearFiles();
 
     mUI->mResults->checkingStarted(p.fileSettings.size());
@@ -585,8 +610,8 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
 
     mUI->mResults->setCheckDirectory(checkPath);
     checkSettings.force = false;
-    checkSettings.checkLibrary = checkLibrary;
-    checkSettings.checkConfiguration = checkConfiguration;
+    checkSettings.checkLibrary = checkLib;
+    checkSettings.checkConfiguration = checkConfig;
 
     if (mProjectFile)
         qDebug() << "Checking project file" << mProjectFile->getFilename();
@@ -594,7 +619,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
     if (!checkSettings.buildDir.empty()) {
         checkSettings.loadSummaries();
         std::list<std::string> sourcefiles;
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, checkSettings.userDefines, p.fileSettings);
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, p.fileSettings);
     }
 
     //mThread->SetanalyzeProject(true);
@@ -604,12 +629,16 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
         mThread->setClangIncludePaths(clangHeaders.split(";"));
         mThread->setSuppressions(mProjectFile->getSuppressions());
     }
+
+    const Standards::Language enforcedLang = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
+    frontend::applyLang(p.fileSettings, checkSettings, enforcedLang);
+
     mThread->setProject(p);
     mThread->check(checkSettings, supprs);
     mUI->mResults->setCheckSettings(checkSettings);
 }
 
-void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLib, const bool checkConfig)
 {
     if (files.isEmpty())
         return;
@@ -632,11 +661,12 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     QStringList fileNames = pathList.getFileList();
 
     mUI->mResults->clear(true);
+    mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Analysis);
     mThread->clearFiles();
 
     if (fileNames.isEmpty()) {
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No suitable files found to analyze!"),
                         QMessageBox::Ok,
                         this);
@@ -644,10 +674,12 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
         return;
     }
 
-    mUI->mResults->checkingStarted(fileNames.count());
+    std::list<FileWithDetails> fdetails = enrichFilesForAnalysis(fileNames, checkSettings);
 
-    mThread->setFiles(fileNames);
-    if (mProjectFile && !checkConfiguration)
+    // TODO: lock UI here?
+    mUI->mResults->checkingStarted(fdetails.size());
+    mThread->setFiles(std::move(fdetails));
+    if (mProjectFile && !checkConfig)
         mThread->setAddonsAndTools(mProjectFile->getAddonsAndTools());
     mThread->setSuppressions(mProjectFile ? mProjectFile->getCheckingSuppressions() : QList<SuppressionList::Suppression>());
     QDir inf(mCurrentDirectory);
@@ -657,8 +689,8 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     checkLockDownUI(); // lock UI while checking
 
     mUI->mResults->setCheckDirectory(checkPath);
-    checkSettings.checkLibrary = checkLibrary;
-    checkSettings.checkConfiguration = checkConfiguration;
+    checkSettings.checkLibrary = checkLib;
+    checkSettings.checkConfiguration = checkConfig;
 
     if (mProjectFile)
         qDebug() << "Checking project file" << mProjectFile->getFilename();
@@ -669,7 +701,7 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
         std::transform(fileNames.cbegin(), fileNames.cend(), std::back_inserter(sourcefiles), [](const QString& s) {
             return s.toStdString();
         });
-        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, checkSettings.userDefines, {});
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, {});
     }
 
     mThread->setCheckFiles(true);
@@ -684,9 +716,9 @@ void MainWindow::analyzeCode(const QString& code, const QString& filename)
     if (!getCppcheckSettings(checkSettings, supprs))
         return;
 
+    // TODO: split ErrorLogger from ThreadResult
     // Initialize dummy ThreadResult as ErrorLogger
     ThreadResult result;
-    result.setFiles(QStringList(filename));
     connect(&result, SIGNAL(progress(int,QString)),
             mUI->mResults, SLOT(progress(int,QString)));
     connect(&result, SIGNAL(error(ErrorItem)),
@@ -697,13 +729,17 @@ void MainWindow::analyzeCode(const QString& code, const QString& filename)
             mUI->mResults, SLOT(debugError(ErrorItem)));
 
     // Create CppCheck instance
-    CppCheck cppcheck(checkSettings, supprs, result, true, nullptr);
+    CppCheck cppcheck(checkSettings, supprs, result, nullptr, true, nullptr);
 
     // Check
     checkLockDownUI();
     clearResults();
     mUI->mResults->checkingStarted(1);
-    cppcheck.check(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), code.toStdString());
+    {
+        const std::string code_s = code.toStdString();
+        // TODO: apply enforcedLanguage?
+        cppcheck.checkBuffer(FileWithDetails(filename.toStdString(), Path::identify(filename.toStdString(), false), 0), code_s.data(), code_s.size());
+    }
     analysisDone();
 
     // Expand results
@@ -715,7 +751,7 @@ QStringList MainWindow::selectFilesToAnalyze(QFileDialog::FileMode mode)
 {
     if (mProjectFile) {
         QMessageBox msgBox(this);
-        msgBox.setWindowTitle(tr("Cppcheck"));
+        msgBox.setWindowTitle("Cppcheck");
         const QString msg(tr("You must close the project file before selecting new files or directories!"));
         msgBox.setText(msg);
         msgBox.setIcon(QMessageBox::Critical);
@@ -732,8 +768,8 @@ QStringList MainWindow::selectFilesToAnalyze(QFileDialog::FileMode mode)
         QMap<QString,QString> filters;
         filters[tr("C/C++ Source")] = FileList::getDefaultFilters().join(" ");
         filters[tr("Compile database")] = compile_commands_json;
-        filters[tr("Visual Studio")] = "*.sln *.vcxproj";
-        filters[tr("Borland C++ Builder 6")] = "*.bpr";
+        filters["Visual Studio"] = "*.sln *.slnx *.vcxproj";
+        filters["Borland C++ Builder 6"] = "*.bpr";
         QString lastFilter = mSettings->value(SETTINGS_LAST_ANALYZE_FILES_FILTER).toString();
         selected = QFileDialog::getOpenFileNames(this,
                                                  tr("Select files to analyze"),
@@ -775,13 +811,14 @@ void MainWindow::analyzeFiles()
 
     const QString file0 = (!selected.empty() ? selected[0].toLower() : QString());
     if (file0.endsWith(".sln")
+        || file0.endsWith(".slnx")
         || file0.endsWith(".vcxproj")
         || file0.endsWith(compile_commands_json)
         || file0.endsWith(".bpr")) {
         ImportProject p;
         p.import(selected[0].toStdString());
 
-        if (file0.endsWith(".sln")) {
+        if (file0.endsWith(".sln") || file0.endsWith(".slnx")) {
             QStringList configs;
             for (auto it = p.fileSettings.cbegin(); it != p.fileSettings.cend(); ++it) {
                 const QString cfg(QString::fromStdString(it->cfg));
@@ -797,7 +834,7 @@ void MainWindow::analyzeFiles()
             p.ignoreOtherConfigs(cfg.toStdString());
         }
 
-        doAnalyzeProject(p);
+        doAnalyzeProject(p); // TODO: avoid copy
         return;
     }
 
@@ -820,7 +857,7 @@ void MainWindow::analyzeDirectory()
         if (projFiles.size() == 1) {
             // If one project file found, suggest loading it
             QMessageBox msgBox(this);
-            msgBox.setWindowTitle(tr("Cppcheck"));
+            msgBox.setWindowTitle("Cppcheck");
             const QString msg(tr("Found project file: %1\n\nDo you want to "
                                  "load this project file instead?").arg(projFiles[0]));
             msgBox.setText(msg);
@@ -842,7 +879,7 @@ void MainWindow::analyzeDirectory()
             // If multiple project files found inform that there are project
             // files also available.
             QMessageBox msgBox(this);
-            msgBox.setWindowTitle(tr("Cppcheck"));
+            msgBox.setWindowTitle("Cppcheck");
             const QString msg(tr("Found project files from the directory.\n\n"
                                  "Do you want to proceed analysis without "
                                  "using any of these project files?"));
@@ -981,9 +1018,6 @@ bool MainWindow::tryLoadLibrary(Library &library, const QString& filename)
         case Library::ErrorCode::UNKNOWN_ELEMENT:
             errmsg = tr("Unknown element");
             break;
-        default:
-            errmsg = tr("Unknown issue");
-            break;
         }
         if (!error.reason.empty())
             errmsg += " '" + QString::fromStdString(error.reason) + "'";
@@ -1037,6 +1071,7 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
 
     settings.exename = QCoreApplication::applicationFilePath().toStdString();
     settings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
+    settings.reportProgress = 10;
 
     // default to --check-level=normal for GUI for now
     settings.setCheckLevel(Settings::CheckLevel::normal);
@@ -1057,6 +1092,8 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
             return false;
         }
 
+        settings.premium = startsWith(settings.cppcheckCfgProductName, "Cppcheck Premium");
+
         const auto cfgAddons = settings.addons;
         settings.addons.clear();
         for (const std::string& addon : cfgAddons) {
@@ -1089,6 +1126,8 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
         for (const QString& undefine : undefines)
             settings.userUndefs.insert(undefine.toStdString());
 
+        mProjectFile->setSettingsUserIncludes(settings);
+
         const QStringList libraries = mProjectFile->getLibraries();
         for (const QString& library : libraries) {
             settings.libraries.emplace_back(library.toStdString());
@@ -1100,13 +1139,9 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
             supprs.nomsg.addSuppression(suppression); // TODO: check result
         }
 
-        // Only check the given -D configuration
-        if (!defines.isEmpty())
-            settings.maxConfigs = 1;
-
         // If importing a project, only check the given configuration
-        if (!mProjectFile->getImportProject().isEmpty())
-            settings.checkAllConfigurations = false;
+        if (mProjectFile->getImportProject().endsWith("json", Qt::CaseInsensitive))
+            settings.maxConfigsProject = 1;
 
         const QString &buildDir = fromNativePath(mProjectFile->getBuildDir());
         if (!buildDir.isEmpty()) {
@@ -1120,8 +1155,11 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
 
         const QString platform = mProjectFile->getPlatform();
         if (platform.endsWith(".xml")) {
-            const QString applicationFilePath = QCoreApplication::applicationFilePath();
-            settings.platform.loadFromFile(applicationFilePath.toStdString().c_str(), platform.toStdString());
+            const std::vector<std::string> paths = {
+                Path::getCurrentPath(), // TODO: do we want to look in CWD?
+                QCoreApplication::applicationFilePath().toStdString(),
+            };
+            settings.platform.loadFromFile(paths, platform.toStdString());
         } else {
             for (int i = Platform::Type::Native; i <= Platform::Type::Unix64; i++) {
                 const auto p = static_cast<Platform::Type>(i);
@@ -1175,7 +1213,6 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
             if (!premiumArgs.contains("--misra-c-") && mProjectFile->getAddons().contains("misra"))
                 premiumArgs += " --misra-c-2012";
             settings.premiumArgs = premiumArgs.mid(1).toStdString();
-            settings.setMisraRuleTexts(CheckThread::executeCommand);
         }
     }
     else
@@ -1201,7 +1238,7 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
     settings.debugwarnings = mSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, false).toBool();
     settings.quiet = false;
     settings.verbose = true;
-    settings.force = mSettings->value(SETTINGS_CHECK_FORCE, 1).toBool();
+    settings.force = mSettings->value(SETTINGS_CHECK_FORCE, 0).toBool();
     settings.outputFormat = Settings::OutputFormat::text;
     settings.jobs = mSettings->value(SETTINGS_CHECK_THREADS, 1).toInt();
     settings.certainty.setEnabled(Certainty::inconclusive, mSettings->value(SETTINGS_INCONCLUSIVE_ERRORS, false).toBool());
@@ -1209,7 +1246,6 @@ bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
         settings.platform.set(static_cast<Platform::Type>(mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt()));
     settings.standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
     settings.standards.setC(mSettings->value(SETTINGS_STD_C, QString()).toString().toStdString());
-    settings.enforcedLang = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
 
     settings.jobs = std::max(settings.jobs, 1u);
 
@@ -1364,10 +1400,12 @@ void MainWindow::reAnalyzeSelected(const QStringList& files)
     pathList.addPathList(files);
     if (mProjectFile)
         pathList.addExcludeList(mProjectFile->getExcludedPaths());
-    QStringList fileNames = pathList.getFileList();
+
+    std::list<FileWithDetails> fdetails = enrichFilesForAnalysis(pathList.getFileList(), checkSettings);
+
     checkLockDownUI(); // lock UI while checking
-    mUI->mResults->checkingStarted(fileNames.size());
-    mThread->setCheckFiles(fileNames);
+    mUI->mResults->checkingStarted(fdetails.size());
+    mThread->setCheckFiles(std::move(fdetails));
 
     // Saving last check start time, otherwise unchecked modified files will not be
     // considered in "Modified Files Check"  performed after "Selected Files Check"
@@ -1380,7 +1418,7 @@ void MainWindow::reAnalyzeSelected(const QStringList& files)
 
 void MainWindow::reAnalyze(bool all)
 {
-    const QStringList files = mThread->getReCheckFiles(all);
+    const std::list<FileWithDetails> files = mThread->getReCheckFiles(all);
     if (files.empty())
         return;
 
@@ -1393,8 +1431,8 @@ void MainWindow::reAnalyze(bool all)
     mUI->mResults->clear(all);
 
     // Clear results for changed files
-    for (int i = 0; i < files.size(); ++i)
-        mUI->mResults->clear(files[i]);
+    for (const auto& f : files)
+        mUI->mResults->clear(QString::fromStdString(f.path()));
 
     checkLockDownUI(); // lock UI while checking
     mUI->mResults->checkingStarted(files.size());
@@ -1428,7 +1466,7 @@ void MainWindow::openResults()
 {
     if (mUI->mResults->hasResults()) {
         QMessageBox msgBox(this);
-        msgBox.setWindowTitle(tr("Cppcheck"));
+        msgBox.setWindowTitle("Cppcheck");
         const QString msg(tr("Current results will be cleared.\n\n"
                              "Opening a new XML file will clear current results.\n"
                              "Do you want to proceed?"));
@@ -1464,6 +1502,7 @@ void MainWindow::loadResults(const QString &selectedFile)
         closeProjectFile();
     mIsLogfileLoaded = true;
     mUI->mResults->clear(true);
+    mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Log);
     mUI->mActionReanalyzeModified->setEnabled(false);
     mUI->mActionReanalyzeAll->setEnabled(false);
     mUI->mResults->readErrorsXml(selectedFile);
@@ -1491,19 +1530,14 @@ void MainWindow::enableCheckButtons(bool enable)
     }
 
     mUI->mActionAnalyzeDirectory->setEnabled(enable);
-
-    if (isCppcheckPremium()) {
-        mUI->mActionComplianceReport->setEnabled(enable && mProjectFile && (mProjectFile->getAddons().contains("misra") || !mProjectFile->getCodingStandards().empty()));
-    }
 }
 
 void MainWindow::enableResultsButtons()
 {
-    const bool enabled = mUI->mResults->hasResults();
-    mUI->mActionClearResults->setEnabled(enabled);
-    mUI->mActionSave->setEnabled(enabled);
-    mUI->mActionPrint->setEnabled(enabled);
-    mUI->mActionPrintPreview->setEnabled(enabled);
+    mUI->mActionClearResults->setEnabled(mUI->mResults->hasResults());
+    mUI->mActionSave->setEnabled(true);
+    mUI->mActionPrint->setEnabled(true);
+    mUI->mActionPrintPreview->setEnabled(true);
 }
 
 void MainWindow::showStyle(bool checked)
@@ -1557,7 +1591,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
                               "Do you want to stop the analysis and exit Cppcheck?"));
 
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         text,
                         QMessageBox::Yes | QMessageBox::No,
                         this);
@@ -1621,6 +1655,11 @@ void MainWindow::showAuthors()
     dlg->exec();
 }
 
+void MainWindow::showEULA()
+{
+    QDesktopServices::openUrl(QUrl("https://www.cppcheck.com/EULA"));
+}
+
 void MainWindow::performSelectedFilesCheck(const QStringList &selectedFilesList)
 {
     reAnalyzeSelected(selectedFilesList);
@@ -1664,31 +1703,11 @@ void MainWindow::save()
     }
 }
 
-void MainWindow::complianceReport()
+void MainWindow::resultsAdded()
 {
-    if (!mUI->mResults->isSuccess()) {
-        QMessageBox m(QMessageBox::Critical,
-                      "Cppcheck",
-                      tr("Cannot generate a compliance report right now, an analysis must finish successfully. Try to reanalyze the code and ensure there are no critical errors."),
-                      QMessageBox::Ok,
-                      this);
-        m.exec();
-        return;
-    }
-
-    QTemporaryFile tempResults;
-    tempResults.open();
-    tempResults.close();
-
-    mUI->mResults->save(tempResults.fileName(), Report::XMLV2, mCppcheckCfgProductName);
-
-    ComplianceReportDialog dlg(mProjectFile, tempResults.fileName(), mUI->mResults->getStatistics()->getCheckersReport());
-    dlg.exec();
+    enableResultsButtons();
 }
 
-void MainWindow::resultsAdded()
-{}
-
 void MainWindow::toggleMainToolBar()
 {
     mUI->mToolBarMain->setVisible(mUI->mActionToolBarMain->isChecked());
@@ -1714,6 +1733,7 @@ void MainWindow::formatAndSetTitle(const QString &text)
         nameWithVersion += " (" + extraVersion + ")";
     }
 
+    // TODO: should not contain the version
     if (!mCppcheckCfgProductName.isEmpty())
         nameWithVersion = mCppcheckCfgProductName;
 
@@ -1754,7 +1774,6 @@ void MainWindow::stopAnalysis()
 {
     mThread->stop();
     mUI->mResults->stopAnalysis();
-    mUI->mResults->disableProgressbar();
     const QString &lastResults = getLastResults();
     if (!lastResults.isEmpty()) {
         mUI->mResults->updateFromOldReport(lastResults);
@@ -1808,8 +1827,10 @@ void MainWindow::loadProjectFile(const QString &filePath)
     addProjectMRU(filePath);
 
     mIsLogfileLoaded = false;
-    mUI->mActionCloseProjectFile->setEnabled(true);
-    mUI->mActionEditProjectFile->setEnabled(true);
+    mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Analysis);
+    mUI->mActionReanalyzeModified->setEnabled(true);
+    mUI->mActionReanalyzeAll->setEnabled(true);
+    enableProjectActions(true);
     delete mProjectFile;
     mProjectFile = new ProjectFile(filePath, this);
     mProjectFile->setActiveProject();
@@ -1839,37 +1860,13 @@ bool MainWindow::loadLastResults()
     return true;
 }
 
-void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool checkLib, const bool checkConfig)
 {
     Settings::terminate(false);
 
     QFileInfo inf(projectFile->getFilename());
     const QString& rootpath = projectFile->getRootPath();
 
-    if (isCppcheckPremium() && !projectFile->getLicenseFile().isEmpty()) {
-        if (rootpath.isEmpty() || rootpath == ".")
-            QDir::setCurrent(inf.absolutePath());
-        else if (QDir(rootpath).isAbsolute())
-            QDir::setCurrent(rootpath);
-        else
-            QDir::setCurrent(inf.absolutePath() + "/" + rootpath);
-
-        QString licenseFile = projectFile->getLicenseFile();
-        if (!QFileInfo(licenseFile).isAbsolute() && !rootpath.isEmpty())
-            licenseFile = inf.absolutePath() + "/" + licenseFile;
-
-#ifdef Q_OS_WIN
-        const QString premiumaddon = QCoreApplication::applicationDirPath() + "/premiumaddon.exe";
-#else
-        const QString premiumaddon = QCoreApplication::applicationDirPath() + "/premiumaddon";
-#endif
-        const std::vector<std::string> args{"--check-loc-license", licenseFile.toStdString()};
-        std::string output;
-        CheckThread::executeCommand(premiumaddon.toStdString(), args, "", output);
-        std::ofstream fout(inf.absolutePath().toStdString() + "/cppcheck-premium-loc");
-        fout << output;
-    }
-
     QDir::setCurrent(inf.absolutePath());
 
     mThread->setAddonsAndTools(projectFile->getAddonsAndTools());
@@ -1889,7 +1886,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
             buildDir = inf.canonicalPath() + '/' + buildDir;
         if (!QDir(buildDir).exists()) {
             QMessageBox msg(QMessageBox::Question,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             tr("Build dir '%1' does not exist, create it?").arg(buildDir),
                             QMessageBox::Yes | QMessageBox::No,
                             this);
@@ -1897,7 +1894,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
                 QDir().mkpath(buildDir);
             } else if (!projectFile->getAddons().isEmpty()) {
                 QMessageBox m(QMessageBox::Critical,
-                              tr("Cppcheck"),
+                              "Cppcheck",
                               tr("To check the project using addons, you need a build directory."),
                               QMessageBox::Ok,
                               this);
@@ -1924,6 +1921,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
             switch (result) {
             case ImportProject::Type::COMPILE_DB:
             case ImportProject::Type::VS_SLN:
+            case ImportProject::Type::VS_SLNX:
             case ImportProject::Type::VS_VCXPROJ:
             case ImportProject::Type::BORLAND:
             case ImportProject::Type::CPPCHECK_GUI:
@@ -1943,9 +1941,15 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
                 break;
             }
 
+            if (!p.errors.empty())
+                errorMessage += ": \n";
+
+            for (const auto &error : p.errors)
+                errorMessage += "\n - " + QString::fromStdString(error);
+
             if (!errorMessage.isEmpty()) {
                 QMessageBox msg(QMessageBox::Critical,
-                                tr("Cppcheck"),
+                                "Cppcheck",
                                 tr("Failed to import '%1': %2\n\nAnalysis is stopped.").arg(prjfile).arg(errorMessage),
                                 QMessageBox::Ok,
                                 this);
@@ -1954,14 +1958,14 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
             }
         } catch (InternalError &e) {
             QMessageBox msg(QMessageBox::Critical,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             tr("Failed to import '%1' (%2), analysis is stopped").arg(prjfile).arg(QString::fromStdString(e.errorMessage)),
                             QMessageBox::Ok,
                             this);
             msg.exec();
             return;
         }
-        doAnalyzeProject(p, checkLibrary, checkConfiguration);
+        doAnalyzeProject(p, checkLib, checkConfig, recheckFiles);  // TODO: avoid copy
         return;
     }
 
@@ -1974,7 +1978,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis
     if (paths.isEmpty()) {
         paths << mCurrentDirectory;
     }
-    doAnalyzeFiles(paths, checkLibrary, checkConfiguration);
+    doAnalyzeFiles(paths, checkLib, checkConfig);
 }
 
 void MainWindow::newProjectFile()
@@ -2026,7 +2030,7 @@ void MainWindow::editProjectFile()
 {
     if (!mProjectFile) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No project file loaded"),
                         QMessageBox::Ok,
                         this);
@@ -2061,6 +2065,20 @@ void MainWindow::showLibraryEditor()
     libraryDialog.exec();
 }
 
+void MainWindow::showThreadDetails()
+{
+    if (ThreadDetails::instance())
+        return;
+    auto* threadDetails = new ThreadDetails(this);
+    connect(mThread, &ThreadHandler::threadDetailsUpdated,
+            threadDetails, &ThreadDetails::threadDetailsUpdated, Qt::QueuedConnection);
+    connect(mThread, &ThreadHandler::progress,
+            threadDetails, &ThreadDetails::progress, Qt::QueuedConnection);
+    threadDetails->setAttribute(Qt::WA_DeleteOnClose);
+    threadDetails->show();
+    mThread->emitThreadDetailsUpdated();
+}
+
 void MainWindow::filterResults()
 {
     mUI->mResults->filterResults(mLineEditFilter->text());
@@ -2100,7 +2118,7 @@ void MainWindow::openRecentProject()
                               "used projects -list?").arg(project));
 
         QMessageBox msg(QMessageBox::Warning,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         text,
                         QMessageBox::Yes | QMessageBox::No,
                         this);
@@ -2218,12 +2236,12 @@ static int getVersion(const QString& nameWithVersion) {
         }
         else if (c == '.') {
             ++dot;
-            ret = ret * 1000 + v;
+            ret = (ret * 1000) + v;
             v = 0;
         } else if (c >= '0' && c <= '9')
-            v = v * 10 + (c.toLatin1() - '0');
+            v = (v * 10) + (c.toLatin1() - '0');
     }
-    ret = ret * 1000 + v;
+    ret = (ret * 1000) + v;
     while (dot < 2) {
         ++dot;
         ret *= 1000;
@@ -2241,7 +2259,9 @@ void MainWindow::replyFinished(QNetworkReply *reply) {
     const QString str = reply->readAll();
     qDebug() << "Response: " << str;
     if (reply->url().fileName() == "version.txt") {
+        // TODO: lacks extra version
         QString nameWithVersion = QString("Cppcheck %1").arg(CppCheck::version());
+        // TODO: this should not contain the version
         if (!mCppcheckCfgProductName.isEmpty())
             nameWithVersion = mCppcheckCfgProductName;
         const int appVersion = getVersion(nameWithVersion);
@@ -2284,7 +2304,7 @@ void MainWindow::changeReportType() {
     const ReportType reportType = mUI->mActionReportAutosar->isChecked() ? ReportType::autosar :
                                   mUI->mActionReportCertC->isChecked() ? ReportType::certC :
                                   mUI->mActionReportCertCpp->isChecked() ? ReportType::certCpp :
-                                  mUI->mActionReportMisraC->isChecked() ? ReportType::misraC :
+                                  mUI->mActionReportMisraC->isChecked() ? (mProjectFile ? getMisraCReportType(mProjectFile->getCodingStandards()) : ReportType::misraC2012) :
                                   mUI->mActionReportMisraCpp2008->isChecked() ? ReportType::misraCpp2008 :
                                   mUI->mActionReportMisraCpp2023->isChecked() ? ReportType::misraCpp2023 :
                                   ReportType::normal;
@@ -2333,3 +2353,12 @@ void MainWindow::changeReportType() {
     }
 }
 
+std::list<FileWithDetails> MainWindow::enrichFilesForAnalysis(const QStringList& fileNames, const Settings& settings) const {
+    std::list<FileWithDetails> fdetails;
+    std::transform(fileNames.cbegin(), fileNames.cend(), std::back_inserter(fdetails), [](const QString& f) {
+        return FileWithDetails{f.toStdString(), Standards::Language::None, static_cast<std::size_t>(QFile(f).size())};
+    });
+    const Standards::Language enforcedLang = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
+    frontend::applyLang(fdetails, settings, enforcedLang);
+    return fdetails;
+}
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index ae58e5412ae..c654a2c94f0 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 #include "platforms.h"
 
 #include <cstdint>
+#include <list>
 
 #include <QFileDialog>
 #include <QMainWindow>
@@ -45,6 +46,7 @@ class QNetworkAccessManager;
 class QNetworkReply;
 class Settings;
 struct Suppressions;
+class FileWithDetails;
 namespace Ui {
     class MainWindow;
 }
@@ -168,12 +170,12 @@ public slots:
     /** @brief Slot to to show authors list */
     void showAuthors();
 
+    /** @brief Slot to to show EULA */
+    void showEULA();
+
     /** @brief Slot to save results */
     void save();
 
-    /** @brief Slot to generate compliance report */
-    void complianceReport();
-
     /** @brief Slot to create new project file */
     void newProjectFile();
 
@@ -195,6 +197,9 @@ public slots:
     /** @brief Slot for showing the library editor */
     void showLibraryEditor();
 
+    /** @brief Slot for showing the thread details window */
+    void showThreadDetails();
+
 private slots:
 
     /** @brief Slot for checkthread's done signal */
@@ -262,10 +267,10 @@ private slots:
      * @brief Analyze the project.
      * @param projectFile Pointer to the project to analyze.
      * @param recheckFiles files to recheck, empty => check all files
-     * @param checkLibrary Flag to indicate if the library should be checked.
-     * @param checkConfiguration Flag to indicate if the configuration should be checked.
+     * @param checkLib Flag to indicate if the library should be checked.
+     * @param checkConfig Flag to indicate if the configuration should be checked.
      */
-    void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool checkLibrary = false, bool checkConfiguration = false);
+    void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool checkLib = false, bool checkConfig = false);
 
     /**
      * @brief Set current language
@@ -301,19 +306,19 @@ private slots:
     /**
      * @brief Analyze project
      * @param p imported project
-     * @param checkLibrary Flag to indicate if library should be checked
-     * @param checkConfiguration Flag to indicate if the configuration should be checked.
+     * @param checkLib Flag to indicate if library should be checked
+     * @param checkConfig Flag to indicate if the configuration should be checked.
      */
-    void doAnalyzeProject(ImportProject p, bool checkLibrary = false, bool checkConfiguration = false);
+    void doAnalyzeProject(ImportProject p, bool checkLib = false, bool checkConfig = false, const QStringList& recheckFiles = QStringList());
 
     /**
      * @brief Analyze all files specified in parameter files
      *
      * @param files List of files and/or directories to analyze
-     * @param checkLibrary Flag to indicate if library should be checked
-     * @param checkConfiguration Flag to indicate if the configuration should be checked.
+     * @param checkLib Flag to indicate if library should be checked
+     * @param checkConfig Flag to indicate if the configuration should be checked.
      */
-    void doAnalyzeFiles(const QStringList &files, bool checkLibrary = false, bool checkConfiguration = false);
+    void doAnalyzeFiles(const QStringList &files, bool checkLib = false, bool checkConfig = false);
 
     /**
      * @brief Get our default cppcheck settings and read project file.
@@ -423,6 +428,9 @@ private slots:
      */
     void removeProjectMRU(const QString &project);
 
+    /** @brief Generate list of detailed files from list of filenames. */
+    std::list<FileWithDetails> enrichFilesForAnalysis(const QStringList& fileNames, const Settings& settings) const;
+
     /** @brief Program settings */
     QSettings *mSettings;
 
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index 6fb74bc0cb2..16577224874 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Cppcheck</string>
+   <string notr="true">Cppcheck</string>
   </property>
   <property name="iconSize">
    <size>
@@ -64,7 +64,7 @@
     <item>
      <layout class="QHBoxLayout" name="mLayoutInformation">
       <property name="sizeConstraint">
-       <enum>QLayout::SetDefaultConstraint</enum>
+       <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
       </property>
       <item>
        <widget class="QLabel" name="mLabelInformation">
@@ -84,13 +84,13 @@
          <string>Checking for updates</string>
         </property>
         <property name="textFormat">
-         <enum>Qt::RichText</enum>
+         <enum>Qt::TextFormat::RichText</enum>
         </property>
         <property name="openExternalLinks">
          <bool>true</bool>
         </property>
         <property name="textInteractionFlags">
-         <set>Qt::TextBrowserInteraction</set>
+         <set>Qt::TextInteractionFlag::TextBrowserInteraction</set>
         </property>
        </widget>
       </item>
@@ -104,7 +104,7 @@
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Orientation::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -124,7 +124,7 @@
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>30</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="mMenuFile">
@@ -140,7 +140,6 @@
     <addaction name="separator"/>
     <addaction name="mActionProjectMRU"/>
     <addaction name="mActionSave"/>
-    <addaction name="mActionComplianceReport"/>
     <addaction name="separator"/>
     <addaction name="mActionPrintPreview"/>
     <addaction name="mActionPrint"/>
@@ -192,6 +191,7 @@
     <addaction name="mActionShowScratchpad"/>
     <addaction name="mActionViewStats"/>
     <addaction name="mActionLibraryEditor"/>
+    <addaction name="mActionShowThreadDetails"/>
    </widget>
    <widget class="QMenu" name="mMenuHelp">
     <property name="title">
@@ -200,6 +200,7 @@
     <addaction name="mActionHelpContents"/>
     <addaction name="mActionLicense"/>
     <addaction name="mActionAuthors"/>
+    <addaction name="mActionEULA"/>
     <addaction name="separator"/>
     <addaction name="mActionAbout"/>
    </widget>
@@ -228,6 +229,7 @@
      <addaction name="mActionC11"/>
      <!--addaction name="mActionC17"/-->
      <!--addaction name="mActionC23"/-->
+     <!--addaction name="mActionC2Y"/-->
     </widget>
     <addaction name="mActionAnalyzeFiles"/>
     <addaction name="mActionAnalyzeDirectory"/>
@@ -682,7 +684,7 @@
      <normaloff>:/cppcheck-gui.png</normaloff>:/cppcheck-gui.png</iconset>
    </property>
    <property name="text">
-    <string>Cppcheck</string>
+    <string notr="true">Cppcheck</string>
    </property>
    <property name="toolTip">
     <string>Show Cppcheck results</string>
@@ -827,6 +829,14 @@
     <string>C&amp;23</string>
    </property>
   </action-->
+  <!--action name="mActionC2Y">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>C&amp;2y</string>
+   </property>
+  </action-->
   <action name="mActionC89">
    <property name="checkable">
     <bool>true</bool>
@@ -982,7 +992,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Misra C</string>
+    <string notr="true">Misra C</string>
    </property>
   </action>
   <action name="mActionReportMisraCpp2008">
@@ -990,7 +1000,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Misra C++ 2008</string>
+    <string notr="true">Misra C++ 2008</string>
    </property>
   </action>
   <action name="mActionReportCertC">
@@ -998,7 +1008,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Cert C</string>
+    <string notr="true">Cert C</string>
    </property>
   </action>
   <action name="mActionReportCertCpp">
@@ -1006,7 +1016,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Cert C++</string>
+    <string notr="true">Cert C++</string>
    </property>
   </action>
   <action name="mActionReportMisraCpp2023">
@@ -1014,7 +1024,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Misra C++ 2023</string>
+    <string notr="true">Misra C++ 2023</string>
    </property>
   </action>
   <action name="mActionReportAutosar">
@@ -1025,6 +1035,19 @@
     <string>Autosar</string>
    </property>
   </action>
+  <action name="mActionEULA">
+   <property name="text">
+    <string>EULA...</string>
+   </property>
+  </action>
+  <action name="mActionShowThreadDetails">
+   <property name="text">
+    <string>Thread Details</string>
+   </property>
+   <property name="toolTip">
+    <string>Show thread details</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/gui/manualtest/projectfiledialog.md b/gui/manualtest/projectfiledialog.md
new file mode 100644
index 00000000000..ce7d39b1df0
--- /dev/null
+++ b/gui/manualtest/projectfiledialog.md
@@ -0,0 +1,52 @@
+
+# Project file dialog
+
+Some manual testing in the project file dialog interface
+
+
+## Test: Relative paths
+
+Ticket: #14983
+
+1. Configure files/paths in project folder:
+ * import a projectfile
+ * add include paths in project folder
+ * exclude file/folder
+
+2. Save project
+
+EXPECTED: Relative paths should be used in the XML
+
+
+## Test: Platform file pic8.xml
+
+Ticket: #14489
+
+EXPECTED: In the project file dialog it should be possible to select xml files i.e. pic8.xml
+
+TODO: can this test be automated
+
+
+## Test: Custom cfg file
+
+Ticket: #14672
+
+1. Copy addons/avr.cfg to a file "aa.cfg" in same folder as a cppcheck GUI project file
+
+EXPECTED: It should not be possible to activate "aa.cfg" in the project file dialog, it should appear in alphabetical order.
+
+
+## Test: Misra C checkbox
+
+Ticket: #14488
+
+Matrix: Use both open source and premium
+
+1. Load project file in trac ticket 14488
+1. Goto "Edit project"
+1. Goto "Addons" tab
+
+EXPECTED: The misra c checkbox should be checked
+
+TODO: can this test be automated
+
diff --git a/gui/newsuppressiondialog.cpp b/gui/newsuppressiondialog.cpp
index a750e7c673b..e93312681b1 100644
--- a/gui/newsuppressiondialog.cpp
+++ b/gui/newsuppressiondialog.cpp
@@ -45,6 +45,9 @@ NewSuppressionDialog::NewSuppressionDialog(QWidget *parent) :
         void reportErr(const ErrorMessage &msg) override {
             errorIds << QString::fromStdString(msg.id);
         }
+        void reportMetric(const std::string &metric) override {
+            (void) metric;
+        }
         QStringList errorIds;
     };
 
diff --git a/gui/platforms.cpp b/gui/platforms.cpp
index 77683a6ea09..27504006477 100644
--- a/gui/platforms.cpp
+++ b/gui/platforms.cpp
@@ -36,11 +36,11 @@ void Platforms::add(const QString &title, Platform::Type platform)
 void Platforms::init()
 {
     add(tr("Native"), Platform::Type::Native);
-    add(tr("Unix 32-bit"), Platform::Type::Unix32);
-    add(tr("Unix 64-bit"), Platform::Type::Unix64);
-    add(tr("Windows 32-bit ANSI"), Platform::Type::Win32A);
-    add(tr("Windows 32-bit Unicode"), Platform::Type::Win32W);
-    add(tr("Windows 64-bit"), Platform::Type::Win64);
+    add("Unix 32-bit", Platform::Type::Unix32);
+    add("Unix 64-bit", Platform::Type::Unix64);
+    add("Windows 32-bit ANSI", Platform::Type::Win32A);
+    add("Windows 32-bit Unicode", Platform::Type::Win32W);
+    add("Windows 64-bit", Platform::Type::Win64);
 }
 
 int Platforms::getCount() const
diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
index 9b92f0d9184..716288d9695 100644
--- a/gui/projectfile.cpp
+++ b/gui/projectfile.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -26,6 +26,7 @@
 
 #include <utility>
 
+#include <QCoreApplication>
 #include <QFile>
 #include <QDir>
 #include <QIODevice>
@@ -35,10 +36,6 @@
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-#include <QStringRef>
-#endif
-
 ProjectFile *ProjectFile::mActiveProject;
 
 ProjectFile::ProjectFile(QObject *parent) :
@@ -66,6 +63,7 @@ void ProjectFile::clear()
     mIncludeDirs.clear();
     mDefines.clear();
     mUndefines.clear();
+    mUserInclude.clear();
     mPaths.clear();
     mExcludedPaths.clear();
     mLibraries.clear();
@@ -90,7 +88,6 @@ void ProjectFile::clear()
     mBughunting = false;
     mCertIntPrecision = 0;
     mCodingStandards.clear();
-    mPremiumLicenseFile.clear();
 }
 
 bool ProjectFile::read(const QString &filename)
@@ -169,6 +166,9 @@ bool ProjectFile::read(const QString &filename)
             if (xmlReader.name() == QString(CppcheckXml::UndefinesElementName))
                 readStringList(mUndefines, xmlReader, CppcheckXml::UndefineName);
 
+            if (xmlReader.name() == QString(CppcheckXml::UserIncludeElementName))
+                mUserInclude = readString(xmlReader);
+
             // Find exclude list from inside project element
             if (xmlReader.name() == QString(CppcheckXml::ExcludeElementName))
                 readExcludes(xmlReader);
@@ -232,8 +232,6 @@ bool ProjectFile::read(const QString &filename)
                 readStringList(mCodingStandards, xmlReader, CppcheckXml::CodingStandardElementName);
             if (xmlReader.name() == QString(CppcheckXml::CertIntPrecisionElementName))
                 mCertIntPrecision = readInt(xmlReader, 0);
-            if (xmlReader.name() == QString(CppcheckXml::LicenseFileElementName))
-                mPremiumLicenseFile = readString(xmlReader);
             if (xmlReader.name() == QString(CppcheckXml::ProjectNameElementName))
                 mProjectName = readString(xmlReader);
 
@@ -350,15 +348,13 @@ bool ProjectFile::readBool(QXmlStreamReader &reader)
 
 int ProjectFile::readInt(QXmlStreamReader &reader, int defaultValue)
 {
-    int ret = defaultValue;
     do {
         const QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::Characters:
-            ret = reader.text().toString().toInt();
-            FALLTHROUGH;
+            return reader.text().toString().toInt();
         case QXmlStreamReader::EndElement:
-            return ret;
+            return defaultValue;
         // Not handled
         case QXmlStreamReader::StartElement:
         case QXmlStreamReader::NoToken:
@@ -376,15 +372,13 @@ int ProjectFile::readInt(QXmlStreamReader &reader, int defaultValue)
 
 QString ProjectFile::readString(QXmlStreamReader &reader)
 {
-    QString ret;
     do {
         const QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::Characters:
-            ret = reader.text().toString();
-            FALLTHROUGH;
+            return reader.text().toString();
         case QXmlStreamReader::EndElement:
-            return ret;
+            return {};
         // Not handled
         case QXmlStreamReader::StartElement:
         case QXmlStreamReader::NoToken:
@@ -895,7 +889,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mIncludeDirs.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::IncludeDirElementName);
-        for (const QString& incdir : mIncludeDirs) {
+        for (const QString& incdir : utils::as_const(mIncludeDirs)) {
             xmlWriter.writeStartElement(CppcheckXml::DirElementName);
             xmlWriter.writeAttribute(CppcheckXml::DirNameAttrib, incdir);
             xmlWriter.writeEndElement();
@@ -905,7 +899,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mDefines.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::DefinesElementName);
-        for (const QString& define : mDefines) {
+        for (const QString& define : utils::as_const(mDefines)) {
             xmlWriter.writeStartElement(CppcheckXml::DefineName);
             xmlWriter.writeAttribute(CppcheckXml::DefineNameAttrib, define);
             xmlWriter.writeEndElement();
@@ -913,6 +907,12 @@ bool ProjectFile::write(const QString &filename)
         xmlWriter.writeEndElement();
     }
 
+    if (!mUserInclude.isEmpty()) {
+        xmlWriter.writeStartElement(CppcheckXml::UserIncludeElementName);
+        xmlWriter.writeCharacters(mUserInclude);
+        xmlWriter.writeEndElement();
+    }
+
     if (!mVsConfigurations.isEmpty()) {
         writeStringList(xmlWriter,
                         mVsConfigurations,
@@ -927,7 +927,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mPaths.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::PathsElementName);
-        for (const QString& path : mPaths) {
+        for (const QString& path : utils::as_const(mPaths)) {
             xmlWriter.writeStartElement(CppcheckXml::PathName);
             xmlWriter.writeAttribute(CppcheckXml::PathNameAttrib, path);
             xmlWriter.writeEndElement();
@@ -937,7 +937,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mExcludedPaths.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::ExcludeElementName);
-        for (const QString& path : mExcludedPaths) {
+        for (const QString& path : utils::as_const(mExcludedPaths)) {
             xmlWriter.writeStartElement(CppcheckXml::ExcludePathName);
             xmlWriter.writeAttribute(CppcheckXml::ExcludePathNameAttrib, path);
             xmlWriter.writeEndElement();
@@ -952,7 +952,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mSuppressions.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::SuppressionsElementName);
-        for (const SuppressionList::Suppression &suppression : mSuppressions) {
+        for (const SuppressionList::Suppression &suppression : utils::as_const(mSuppressions)) {
             xmlWriter.writeStartElement(CppcheckXml::SuppressionElementName);
             if (!suppression.fileName.empty())
                 xmlWriter.writeAttribute("fileName", QString::fromStdString(suppression.fileName));
@@ -1050,12 +1050,6 @@ bool ProjectFile::write(const QString &filename)
         xmlWriter.writeEndElement();
     }
 
-    if (!mPremiumLicenseFile.isEmpty()) {
-        xmlWriter.writeStartElement(CppcheckXml::LicenseFileElementName);
-        xmlWriter.writeCharacters(mPremiumLicenseFile);
-        xmlWriter.writeEndElement();
-    }
-
     xmlWriter.writeEndDocument();
     file.close();
     return true;
@@ -1075,6 +1069,12 @@ void ProjectFile::writeStringList(QXmlStreamWriter &xmlWriter, const QStringList
     xmlWriter.writeEndElement();
 }
 
+void ProjectFile::setSettingsUserIncludes(Settings &settings) const
+{
+    if (!mUserInclude.isEmpty())
+        settings.userIncludes.push_back(mUserInclude.toStdString());
+}
+
 QStringList ProjectFile::fromNativeSeparators(const QStringList &paths)
 {
     QStringList ret;
@@ -1172,7 +1172,7 @@ QString ProjectFile::getAddonFilePath(QString filesDir, const QString &addon)
 #endif
     ;
 
-    for (const QString& path : searchPaths) {
+    for (const QString& path : utils::as_const(searchPaths)) {
         QString f = path + addon + ".py";
         if (QFile(f).exists())
             return f;
@@ -1180,3 +1180,32 @@ QString ProjectFile::getAddonFilePath(QString filesDir, const QString &addon)
 
     return QString();
 }
+
+QStringList ProjectFile::getSearchPaths(const QString& projectPath, const QString& appPath, const QString& datadir, const QString& dir) {
+    QStringList ret;
+    ret << appPath << (appPath + "/" + dir) << projectPath;
+#ifdef FILESDIR
+    if (FILESDIR[0])
+        ret << FILESDIR << (FILESDIR "/" + dir);
+#endif
+    if (!datadir.isEmpty())
+        ret << datadir << (datadir + "/" + dir);
+    return ret;
+}
+
+QString ProjectFile::getRelativePath(const QString &absolutePath) const
+{
+    const QDir dir(QFileInfo(mFilename).absolutePath());
+    const QString relativePath(dir.relativeFilePath(absolutePath));
+    if (relativePath.startsWith("../../..") || absolutePath.length() < relativePath.length())
+        return absolutePath;
+    return relativePath;
+}
+
+QStringList ProjectFile::getSearchPaths(const QString& dir) const {
+    const QFileInfo inf(mFilename);
+    const QString applicationFilePath = QCoreApplication::applicationFilePath();
+    const QString appPath = QFileInfo(applicationFilePath).canonicalPath();
+    const QString datadir = getDataDir();
+    return getSearchPaths(inf.canonicalPath(), appPath, datadir, dir);
+}
diff --git a/gui/projectfile.h b/gui/projectfile.h
index 18503e8d6e1..e0b85582c99 100644
--- a/gui/projectfile.h
+++ b/gui/projectfile.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -141,6 +141,14 @@ class ProjectFile : public QObject {
         return mUndefines;
     }
 
+    const QString& getUserInclude() const {
+        return mUserInclude;
+    }
+
+    void setUserInclude(const QString& userInclude) {
+        mUserInclude = userInclude.trimmed();
+    }
+
     /**
      * @brief Get list of paths to check.
      * @return list of paths.
@@ -181,10 +189,6 @@ class ProjectFile : public QObject {
         return mPlatform;
     }
 
-    const QString& getProjectName() const {
-        return mProjectName;
-    }
-
     void setProjectName(QString projectName) {
         mProjectName = std::move(projectName);
     }
@@ -400,14 +404,6 @@ class ProjectFile : public QObject {
         return mCertIntPrecision;
     }
 
-    /** Cppcheck Premium: License file */
-    void setLicenseFile(const QString& licenseFile) {
-        mPremiumLicenseFile = licenseFile;
-    }
-    const QString& getLicenseFile() const {
-        return mPremiumLicenseFile;
-    }
-
     /**
      * @brief Write project file (to disk).
      * @param filename Filename to use.
@@ -446,6 +442,23 @@ class ProjectFile : public QObject {
     /** Use Clang parser */
     bool clangParser;
 
+    /** Get paths where we should glob for certain files (dir="cfg"/"platforms"/etc */
+    QStringList getSearchPaths(const QString& dir) const;
+
+    static QStringList getSearchPaths(const QString& projectPath, const QString& appPath, const QString& datadir, const QString& dir);
+
+    /**
+     * @brief Convert an absolute path to a path relative to this project's directory.
+     * If the relative path would need to walk up more than 2 parent folders
+     * (i.e. "../../...") the absolute path is returned unchanged instead.
+     * @param absolutePath Absolute path to convert.
+     */
+    QString getRelativePath(const QString &absolutePath) const;
+
+    /** Set user includes in settings if non-empty */
+    void setSettingsUserIncludes(Settings &settings) const;
+
+
 protected:
 
     /**
@@ -597,6 +610,9 @@ class ProjectFile : public QObject {
      */
     QStringList mUndefines;
 
+    /** @brief --include file */
+    QString mUserInclude;
+
     /**
      * @brief List of paths to check.
      */
@@ -637,9 +653,6 @@ class ProjectFile : public QObject {
      */
     QStringList mCodingStandards;
 
-    /** @brief Cppcheck Premium: license file */
-    QString mPremiumLicenseFile;
-
     /** @brief Project name, used when generating compliance report */
     QString mProjectName;
 
diff --git a/gui/projectfile.ui b/gui/projectfile.ui
index d2f781f27cf..9f7ad91fa8f 100644
--- a/gui/projectfile.ui
+++ b/gui/projectfile.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>940</width>
-    <height>701</height>
+    <height>741</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -80,7 +80,7 @@
               <item>
                <spacer name="verticalSpacer_11">
                 <property name="orientation">
-                 <enum>Qt::Vertical</enum>
+                 <enum>Qt::Orientation::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -95,7 +95,7 @@
             <item>
              <spacer name="horizontalSpacer_2">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -117,7 +117,7 @@
               <item>
                <spacer name="verticalSpacer_12">
                 <property name="orientation">
-                 <enum>Qt::Vertical</enum>
+                 <enum>Qt::Orientation::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -151,7 +151,7 @@
            <item>
             <spacer name="verticalSpacer_2">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -199,7 +199,7 @@
            <item>
             <spacer name="verticalSpacer_3">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -269,7 +269,7 @@
            <item>
             <spacer name="verticalSpacer_6">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -284,7 +284,7 @@
          <item>
           <widget class="QListWidget" name="mListIncludeDirs">
            <property name="selectionBehavior">
-            <enum>QAbstractItemView::SelectRows</enum>
+            <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
            </property>
           </widget>
          </item>
@@ -314,7 +314,7 @@
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Orientation::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -342,10 +342,38 @@
          </item>
         </layout>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="mLayoutDefines_2">
+         <item>
+          <widget class="QLabel" name="mLabelDefines_2">
+           <property name="text">
+            <string>Include file</string>
+           </property>
+           <property name="buddy">
+            <cstring>mEditUserInclude</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="mEditUserInclude">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'monospace'; color:#000000; background-color:#ffffff;&quot;&gt;Force inclusion of a header file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="mBtnBrowseUserInclude">
+           <property name="text">
+            <string>Browse..</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <spacer name="verticalSpacer_8">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -552,7 +580,7 @@
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -586,7 +614,7 @@
             <item>
              <spacer name="horizontalSpacer_3">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -601,25 +629,6 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="premiumLicense">
-         <property name="title">
-          <string>Premium License</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_12">
-          <item>
-           <widget class="QLineEdit" name="mEditLicenseFile"/>
-          </item>
-          <item>
-           <widget class="QPushButton" name="mBtnBrowseLicense">
-            <property name="text">
-             <string>Browse...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="mTabWarningOptions">
@@ -701,7 +710,7 @@
             <item>
              <spacer name="verticalSpacer_4">
               <property name="orientation">
-               <enum>Qt::Vertical</enum>
+               <enum>Qt::Orientation::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -744,7 +753,7 @@
             <item>
              <spacer name="verticalSpacer_10">
               <property name="orientation">
-               <enum>Qt::Vertical</enum>
+               <enum>Qt::Orientation::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -769,7 +778,7 @@
        <item>
         <spacer name="verticalSpacer_9">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -846,12 +855,17 @@
                 <string>2023</string>
                </property>
               </item>
+              <item>
+               <property name="text">
+                <string>2025</string>
+               </property>
+              </item>
              </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer_4">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -914,7 +928,7 @@
             <item>
              <spacer name="horizontalSpacer_5">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Orientation::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
@@ -961,6 +975,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="mSafetyProfiles">
+            <property name="text">
+             <string>Safety profiles (defined in C++ core guidelines)</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -989,14 +1010,14 @@
           <item>
            <widget class="QCheckBox" name="mToolClangTidy">
             <property name="text">
-             <string>Clang-tidy</string>
+             <string notr="true">Clang-Tidy</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="mToolClangAnalyzer">
             <property name="text">
-             <string>Clang analyzer</string>
+             <string notr="true">Clang Static Analyzer</string>
             </property>
            </widget>
           </item>
@@ -1006,7 +1027,7 @@
        <item>
         <spacer name="verticalSpacer_5">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1023,10 +1044,10 @@
    <item>
     <widget class="QDialogButtonBox" name="mButtons">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
      </property>
     </widget>
    </item>
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index efa63c90e83..abb7b343ec1 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -27,6 +27,7 @@
 #include "platforms.h"
 #include "projectfile.h"
 #include "settings.h"
+#include "utils.h"
 
 #include "ui_projectfile.h"
 
@@ -38,12 +39,10 @@
 #include <QByteArray>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QCoreApplication>
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QFlags>
 #include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
@@ -59,13 +58,15 @@
 #include <QSpinBox>
 #include <QVariant>
 
-static constexpr char ADDON_MISRA[]   = "misra";
-static constexpr char CODING_STANDARD_MISRA_C_2023[] = "misra-c-2023";
-static constexpr char CODING_STANDARD_MISRA_CPP_2008[] = "misra-cpp-2008";
-static constexpr char CODING_STANDARD_MISRA_CPP_2023[] = "misra-cpp-2023";
-static constexpr char CODING_STANDARD_CERT_C[] = "cert-c-2016";
-static constexpr char CODING_STANDARD_CERT_CPP[] = "cert-cpp-2016";
-static constexpr char CODING_STANDARD_AUTOSAR[] = "autosar";
+const char ADDON_MISRA[]   = "misra";
+const char CODING_STANDARD_MISRA_C_2023[] = "misra-c-2023";
+const char CODING_STANDARD_MISRA_C_2025[] = "misra-c-2025";
+const char CODING_STANDARD_MISRA_CPP_2008[] = "misra-cpp-2008";
+const char CODING_STANDARD_MISRA_CPP_2023[] = "misra-cpp-2023";
+const char CODING_STANDARD_CERT_C[] = "cert-c-2016";
+const char CODING_STANDARD_CERT_CPP[] = "cert-cpp-2016";
+const char CODING_STANDARD_AUTOSAR[] = "autosar";
+const char CODING_STANDARD_SAFETY_PROFILES[] = "safety-profiles";
 
 /** Return paths from QListWidget */
 static QStringList getPaths(const QListWidget *list)
@@ -89,9 +90,27 @@ static const std::array<Platform::Type, 6> builtinPlatforms = {
     Platform::Type::Unix64
 };
 
+static std::string suppressionAsText(const SuppressionList::Suppression& s)
+{
+    std::string ret;
+    if (!s.errorId.empty())
+        ret = s.errorId;
+    if (!s.fileName.empty())
+        ret += " fileName=" + s.fileName;
+    if (s.lineNumber != SuppressionList::Suppression::NO_LINE)
+        ret += " lineNumber=" + std::to_string(s.lineNumber);
+    if (!s.symbolName.empty())
+        ret += " symbolName=" + s.symbolName;
+    if (s.hash > 0)
+        ret += " hash=" + std::to_string(s.hash);
+    if (startsWith(ret," "))
+        return ret.substr(1);
+    return ret;
+}
+
 QStringList ProjectFileDialog::getProjectConfigs(const QString &fileName)
 {
-    if (!fileName.endsWith(".sln") && !fileName.endsWith(".vcxproj"))
+    if (!fileName.endsWith(".sln") && !fileName.endsWith(".slnx") && !fileName.endsWith(".vcxproj"))
         return QStringList();
     QStringList ret;
     ImportProject importer;
@@ -119,24 +138,10 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     setWindowTitle(title);
     loadSettings();
 
-    mUI->premiumLicense->setVisible(false);
-
-    // Checkboxes for the libraries..
-    const QString applicationFilePath = QCoreApplication::applicationFilePath();
-    const QString appPath = QFileInfo(applicationFilePath).canonicalPath();
-    const QString datadir = getDataDir();
-    QStringList searchPaths;
-    searchPaths << appPath << appPath + "/cfg" << inf.canonicalPath();
-#ifdef FILESDIR
-    if (FILESDIR[0])
-        searchPaths << FILESDIR << FILESDIR "/cfg";
-#endif
-    if (!datadir.isEmpty())
-        searchPaths << datadir << datadir + "/cfg";
     QStringList libs;
     // Search the std.cfg first since other libraries could depend on it
     QString stdLibraryFilename;
-    for (const QString &sp : searchPaths) {
+    for (const QString &sp : projectFile->getSearchPaths("cfg")) {
         QDir dir(sp);
         dir.setSorting(QDir::Name);
         dir.setNameFilters(QStringList("*.cfg"));
@@ -158,7 +163,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
             break;
     }
     // Search other libraries
-    for (const QString &sp : searchPaths) {
+    for (const QString &sp : projectFile->getSearchPaths("cfg")) {
         QDir dir(sp);
         dir.setSorting(QDir::Name);
         dir.setNameFilters(QStringList("*.cfg"));
@@ -186,7 +191,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     }
     libs.sort();
     mUI->mLibraries->clear();
-    for (const QString &lib : libs) {
+    for (const QString &lib : utils::as_const(libs)) {
         auto* item = new QListWidgetItem(lib, mUI->mLibraries);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
         item->setCheckState(Qt::Unchecked); // AND initialize check state
@@ -197,18 +202,15 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     for (const Platform::Type builtinPlatform : builtinPlatforms)
         mUI->mComboBoxPlatform->addItem(platforms.get(builtinPlatform).mTitle);
     QStringList platformFiles;
-    for (QString sp : searchPaths) {
-        if (sp.endsWith("/cfg"))
-            sp = sp.mid(0,sp.length()-3) + "platforms";
+    for (const QString& sp : projectFile->getSearchPaths("platforms")) {
         QDir dir(sp);
         dir.setSorting(QDir::Name);
         dir.setNameFilters(QStringList("*.xml"));
         dir.setFilter(QDir::Files | QDir::NoDotAndDotDot);
         for (const QFileInfo& item : dir.entryInfoList()) {
             const QString platformFile = item.fileName();
-
             Platform plat2;
-            if (!plat2.loadFromFile(applicationFilePath.toStdString().c_str(), platformFile.toStdString()))
+            if (!plat2.loadFromFile({sp.toStdString()}, platformFile.toStdString()))
                 continue;
 
             if (platformFiles.indexOf(platformFile) == -1)
@@ -230,6 +232,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     connect(mUI->mBtnBrowseBuildDir, &QPushButton::clicked, this, &ProjectFileDialog::browseBuildDir);
     connect(mUI->mBtnClearImportProject, &QPushButton::clicked, this, &ProjectFileDialog::clearImportProject);
     connect(mUI->mBtnBrowseImportProject, &QPushButton::clicked, this, &ProjectFileDialog::browseImportProject);
+    connect(mUI->mBtnBrowseUserInclude, &QPushButton::clicked, this, &ProjectFileDialog::browseUserInclude);
     connect(mUI->mBtnAddCheckPath, SIGNAL(clicked()), this, SLOT(addCheckPath()));
     connect(mUI->mBtnEditCheckPath, &QPushButton::clicked, this, &ProjectFileDialog::editCheckPath);
     connect(mUI->mBtnRemoveCheckPath, &QPushButton::clicked, this, &ProjectFileDialog::removeCheckPath);
@@ -298,6 +301,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     setIncludepaths(projectFile->getIncludeDirs());
     setDefines(projectFile->getDefines());
     setUndefines(projectFile->getUndefines());
+    mUI->mEditUserInclude->setText(projectFile->getUserInclude());
     setCheckPaths(projectFile->getCheckPaths());
     setImportProject(projectFile->getImportProject());
     mUI->mChkAllVsConfigs->setChecked(projectFile->getAnalyzeAllVsConfigs());
@@ -387,8 +391,9 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     // Misra checkbox..
     if (mPremium)
         mUI->mMisraC->setText("Misra C");
-    else
+    else {
         mUI->mMisraC->setText("Misra C 2012  " + tr("Note: Open source Cppcheck does not fully implement Misra C 2012"));
+    }
     updateAddonCheckBox(mUI->mMisraC, projectFile, dataDir, ADDON_MISRA);
     mUI->mMisraVersion->setEnabled(mUI->mMisraC->isChecked());
     connect(mUI->mMisraC, &QCheckBox::toggled, mUI->mMisraVersion, &QComboBox::setEnabled);
@@ -396,7 +401,14 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     const QString &misraFile = settings.value(SETTINGS_MISRA_FILE, QString()).toString();
     mUI->mEditMisraFile->setText(misraFile);
     mUI->mMisraVersion->setVisible(mPremium);
-    mUI->mMisraVersion->setCurrentIndex(projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_C_2023));
+    if (projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_C_2023))
+        mUI->mMisraVersion->setCurrentIndex(1);
+    else if (projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_C_2025))
+        mUI->mMisraVersion->setCurrentIndex(2);
+    else if (projectFile->getAddons().contains(ADDON_MISRA))
+        mUI->mMisraVersion->setCurrentIndex(0);
+    else
+        mUI->mMisraVersion->setCurrentIndex(-1);
     if (mPremium) {
         mUI->mLabelMisraFile->setVisible(false);
         mUI->mEditMisraFile->setVisible(false);
@@ -426,6 +438,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     mUI->mCertC2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_C));
     mUI->mCertCpp2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_CPP));
     mUI->mAutosar->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_AUTOSAR));
+    mUI->mSafetyProfiles->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_SAFETY_PROFILES));
 
     if (projectFile->getCertIntPrecision() <= 0)
         mUI->mEditCertIntPrecision->setText(QString());
@@ -435,6 +448,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     mUI->mCertC2016->setEnabled(mPremium);
     mUI->mCertCpp2016->setEnabled(mPremium);
     mUI->mAutosar->setEnabled(mPremium);
+    mUI->mSafetyProfiles->setEnabled(mPremium);
     mUI->mLabelCertIntPrecision->setVisible(mPremium);
     mUI->mEditCertIntPrecision->setVisible(mPremium);
     mUI->mBughunting->setChecked(mPremium && projectFile->getBughunting());
@@ -447,7 +461,6 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         mUI->mToolClangTidy->setEnabled(false);
     }
     mUI->mEditTags->setText(projectFile->getTags().join(';'));
-    mUI->mEditLicenseFile->setText(projectFile->getLicenseFile());
     updatePathsAndDefines();
 }
 
@@ -466,6 +479,7 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     projectFile->setIncludes(getIncludePaths());
     projectFile->setDefines(getDefines());
     projectFile->setUndefines(getUndefines());
+    projectFile->setUserInclude(mUI->mEditUserInclude->text());
     projectFile->setCheckPaths(getCheckPaths());
     projectFile->setExcludedPaths(getExcludedPaths());
     projectFile->setLibraries(getLibraries());
@@ -519,23 +533,22 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
         codingStandards << CODING_STANDARD_CERT_CPP;
     if (mPremium && mUI->mMisraVersion->currentIndex() == 1)
         codingStandards << CODING_STANDARD_MISRA_C_2023;
+    if (mPremium && mUI->mMisraVersion->currentIndex() == 2)
+        codingStandards << CODING_STANDARD_MISRA_C_2025;
     if (mUI->mMisraCpp->isChecked() && mUI->mMisraCppVersion->currentIndex() == 0)
         codingStandards << CODING_STANDARD_MISRA_CPP_2008;
     if (mUI->mMisraCpp->isChecked() && mUI->mMisraCppVersion->currentIndex() == 1)
         codingStandards << CODING_STANDARD_MISRA_CPP_2023;
     if (mUI->mAutosar->isChecked())
         codingStandards << CODING_STANDARD_AUTOSAR;
+    if (mUI->mSafetyProfiles->isChecked())
+        codingStandards << CODING_STANDARD_SAFETY_PROFILES;
     projectFile->setCodingStandards(std::move(codingStandards));
     projectFile->setCertIntPrecision(mUI->mEditCertIntPrecision->text().toInt());
     projectFile->setBughunting(mUI->mBughunting->isChecked());
     projectFile->setClangAnalyzer(mUI->mToolClangAnalyzer->isChecked());
     projectFile->setClangTidy(mUI->mToolClangTidy->isChecked());
-    projectFile->setLicenseFile(mUI->mEditLicenseFile->text());
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     projectFile->setTags(mUI->mEditTags->text().split(";", Qt::SkipEmptyParts));
-#else
-    projectFile->setTags(mUI->mEditTags->text().split(";", QString::SkipEmptyParts));
-#endif
 }
 
 void ProjectFileDialog::ok()
@@ -558,10 +571,7 @@ QString ProjectFileDialog::getExistingDirectory(const QString &caption, bool tra
 
     // Check if the path is relative to project file's path and if so
     // make it a relative path instead of absolute path.
-    const QDir dir(projectPath);
-    const QString relpath(dir.relativeFilePath(selectedDir));
-    if (!relpath.startsWith("../.."))
-        selectedDir = relpath;
+    selectedDir = mProjectFile->getRelativePath(selectedDir);
 
     // Trailing slash..
     if (trailingSlash && !selectedDir.endsWith('/'))
@@ -581,7 +591,7 @@ void ProjectFileDialog::updatePathsAndDefines()
 {
     const QString &fileName = mUI->mEditImportProject->text();
     const bool importProject = !fileName.isEmpty();
-    const bool hasConfigs = fileName.endsWith(".sln") || fileName.endsWith(".vcxproj");
+    const bool hasConfigs = fileName.endsWith(".sln") || fileName.endsWith(".slnx") || fileName.endsWith(".vcxproj");
     mUI->mBtnClearImportProject->setEnabled(importProject);
     mUI->mListCheckPaths->setEnabled(!importProject);
     mUI->mListIncludeDirs->setEnabled(!importProject);
@@ -611,14 +621,14 @@ void ProjectFileDialog::browseImportProject()
     const QFileInfo inf(mProjectFile->getFilename());
     const QDir &dir = inf.absoluteDir();
     QMap<QString,QString> filters;
-    filters[tr("Visual Studio")] = "*.sln *.vcxproj";
+    filters["Visual Studio"] = "*.sln *.slnx *.vcxproj";
     filters[tr("Compile database")] = "compile_commands.json";
-    filters[tr("Borland C++ Builder 6")] = "*.bpr";
+    filters["Borland C++ Builder 6"] = "*.bpr";
     QString fileName = QFileDialog::getOpenFileName(this, tr("Import Project"),
                                                     dir.canonicalPath(),
                                                     toFilterString(filters));
     if (!fileName.isEmpty()) {
-        mUI->mEditImportProject->setText(dir.relativeFilePath(fileName));
+        mUI->mEditImportProject->setText(mProjectFile->getRelativePath(fileName));
         updatePathsAndDefines();
         setProjectConfigurations(getProjectConfigs(fileName));
         for (int row = 0; row < mUI->mListVsConfigs->count(); ++row) {
@@ -628,6 +638,21 @@ void ProjectFileDialog::browseImportProject()
     }
 }
 
+void ProjectFileDialog::browseUserInclude()
+{
+    const QFileInfo inf(mProjectFile->getFilename());
+    const QDir &dir = inf.absoluteDir();
+    QMap<QString,QString> filters;
+    filters[tr("C/C++ header")] = "*.h";
+    filters[tr("All files")] = "*.*";
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Include file"),
+                                                    dir.canonicalPath(),
+                                                    toFilterString(filters));
+    if (!fileName.isEmpty()) {
+        mUI->mEditUserInclude->setText(mProjectFile->getRelativePath(fileName));
+    }
+}
+
 QStringList ProjectFileDialog::getProjectConfigurations() const
 {
     QStringList configs;
@@ -708,21 +733,13 @@ QStringList ProjectFileDialog::getIncludePaths() const
 
 QStringList ProjectFileDialog::getDefines() const
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     return mUI->mEditDefines->text().trimmed().split(QRegularExpression("\\s*;\\s*"), Qt::SkipEmptyParts);
-#else
-    return mUI->mEditDefines->text().trimmed().split(QRegularExpression("\\s*;\\s*"), QString::SkipEmptyParts);
-#endif
 }
 
 QStringList ProjectFileDialog::getUndefines() const
 {
     const QString undefine = mUI->mEditUndefines->text().trimmed();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList undefines = undefine.split(QRegularExpression("\\s*;\\s*"), Qt::SkipEmptyParts);
-#else
-    QStringList undefines = undefine.split(QRegularExpression("\\s*;\\s*"), QString::SkipEmptyParts);
-#endif
     undefines.removeDuplicates();
     return undefines;
 }
@@ -805,7 +822,7 @@ void ProjectFileDialog::setLibraries(const QStringList &libraries)
 void ProjectFileDialog::addSingleSuppression(const SuppressionList::Suppression &suppression)
 {
     mSuppressions += suppression;
-    mUI->mListSuppressions->addItem(QString::fromStdString(suppression.getText()));
+    mUI->mListSuppressions->addItem(QString::fromStdString(suppressionAsText(suppression)));
 }
 
 void ProjectFileDialog::setSuppressions(const QList<SuppressionList::Suppression> &suppressions)
@@ -871,7 +888,9 @@ void ProjectFileDialog::addExcludeFile()
     QMap<QString,QString> filters;
     filters[tr("Source files")] = "*.c *.cpp";
     filters[tr("All files")] = "*.*";
-    addExcludePath(QFileDialog::getOpenFileName(this, tr("Exclude file"), dir.canonicalPath(), toFilterString(filters)));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Exclude file"), dir.canonicalPath(), toFilterString(filters));
+    if (!fileName.isEmpty())
+        addExcludePath(mProjectFile->getRelativePath(fileName));
 }
 
 void ProjectFileDialog::editExcludePath()
@@ -946,7 +965,7 @@ int ProjectFileDialog::getSuppressionIndex(const QString &shortText) const
 {
     const std::string s = shortText.toStdString();
     auto it = std::find_if(mSuppressions.cbegin(), mSuppressions.cend(), [&](const SuppressionList::Suppression& sup) {
-        return sup.getText() == s;
+        return suppressionAsText(sup) == s;
     });
     return it == mSuppressions.cend() ? -1 : static_cast<int>(std::distance(mSuppressions.cbegin(), it));
 }
diff --git a/gui/projectfiledialog.h b/gui/projectfiledialog.h
index 3dfb6b89f93..a93d12dc2e2 100644
--- a/gui/projectfiledialog.h
+++ b/gui/projectfiledialog.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -33,6 +33,15 @@ namespace Ui {
     class ProjectFile;
 }
 
+extern const char ADDON_MISRA[];
+extern const char CODING_STANDARD_MISRA_C_2023[];
+extern const char CODING_STANDARD_MISRA_C_2025[];
+extern const char CODING_STANDARD_MISRA_CPP_2008[];
+extern const char CODING_STANDARD_MISRA_CPP_2023[];
+extern const char CODING_STANDARD_CERT_C[];
+extern const char CODING_STANDARD_CERT_CPP[];
+extern const char CODING_STANDARD_AUTOSAR[];
+
 /// @addtogroup GUI
 /// @{
 
@@ -192,6 +201,11 @@ private slots:
      */
     void browseImportProject();
 
+    /**
+     * @brief Browse for include file
+     */
+    void browseUserInclude();
+
     /**
      * @brief Add new path to check.
      */
@@ -266,7 +280,7 @@ private slots:
     /**
      * @brief Edit suppression (double clicking on suppression)
      */
-    void editSuppression(const QModelIndex &index);
+    void editSuppression(const QModelIndex& /*index*/);
 
     /**
      * @brief Browse for misra file
diff --git a/gui/resultitem.cpp b/gui/resultitem.cpp
new file mode 100644
index 00000000000..4f8c14fa056
--- /dev/null
+++ b/gui/resultitem.cpp
@@ -0,0 +1,25 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+#include "resultitem.h"
+
+#include <utility>
+
+ResultItem::ResultItem(QSharedPointer<ErrorItem> errorItem, Type type, int errorPathIndex)
+    : errorItem(std::move(errorItem)), mType(type), mErrorPathIndex(errorPathIndex)
+{}
diff --git a/gui/resultitem.h b/gui/resultitem.h
new file mode 100644
index 00000000000..e0c212b2138
--- /dev/null
+++ b/gui/resultitem.h
@@ -0,0 +1,61 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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 RESULTITEM_H
+#define RESULTITEM_H
+
+#include "erroritem.h"
+#include <QStandardItem>
+#include <QSharedPointer>
+
+class ResultItem : public QStandardItem
+{
+public:
+    enum class Type: std::uint8_t {file, message, note};
+
+    ResultItem(QSharedPointer<ErrorItem> errorItem, Type type, int errorPathIndex);
+    QSharedPointer<ErrorItem> errorItem;
+    bool hidden{};
+
+    QErrorPathItem getErrorPathItem() const {
+        if (!errorItem || mErrorPathIndex < 0 || mErrorPathIndex >= errorItem->errorPath.size())
+            return {};
+        return errorItem->errorPath[mErrorPathIndex];
+    }
+
+    Type getType() const {
+        return mType;
+    }
+
+    void setIconFileName(const QString& iconFileName) {
+        mIconFileName = iconFileName;
+        if (!mIconFileName.isEmpty())
+            setIcon(QIcon(iconFileName));
+    }
+
+    // cppcheck-suppress unusedFunction; used in test-resultstree
+    const QString& getIconFileName() const {
+        return mIconFileName;
+    }
+private:
+    const Type mType;
+    const int mErrorPathIndex;
+    QString mIconFileName;
+};
+
+#endif // RESULTITEM_H
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 3ab9e2602ff..ed8b3c7412e 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -28,9 +28,11 @@
 #include "path.h"
 #include "projectfile.h"
 #include "report.h"
+#include "resultitem.h"
 #include "showtypes.h"
 #include "suppressions.h"
 #include "threadhandler.h"
+#include "utils.h"
 #include "xmlreportv2.h"
 
 #include <algorithm>
@@ -48,9 +50,7 @@
 #include <QIcon>
 #include <QItemSelectionModel>
 #include <QKeyEvent>
-#include <QList>
 #include <QLocale>
-#include <QMap>
 #include <QMenu>
 #include <QMessageBox>
 #include <QModelIndex>
@@ -59,28 +59,10 @@
 #include <QSet>
 #include <QSettings>
 #include <QSignalMapper>
-#include <QStandardItem>
+#include <QStandardItemModel>
 #include <QUrl>
-#include <QVariant>
-#include <QVariantMap>
 #include <Qt>
-
-static constexpr char COLUMN[] = "column";
-static constexpr char CWE[] = "cwe";
-static constexpr char ERRORID[] = "id";
-static constexpr char FILENAME[] = "file";
-static constexpr char FILE0[] = "file0";
-static constexpr char HASH[] = "hash";
-static constexpr char HIDE[] = "hide";
-static constexpr char INCONCLUSIVE[] = "inconclusive";
-static constexpr char LINE[] = "line";
-static constexpr char MESSAGE[] = "message";
-static constexpr char REMARK[] = "remark";
-static constexpr char SEVERITY[] = "severity";
-static constexpr char SINCEDATE[] = "sinceDate";
-static constexpr char SYMBOLNAMES[] = "symbolNames";
-static constexpr char SUMMARY[] = "summary";
-static constexpr char TAGS[] = "tags";
+#include <QHeaderView>
 
 // These must match column headers given in ResultsTree::translate()
 static constexpr int COLUMN_FILE                  = 0;
@@ -140,13 +122,18 @@ static QStringList getLabels() {
         QObject::tr("Rule"),
         QObject::tr("Since date"),
         QObject::tr("Tags"),
-        QObject::tr("CWE")};
+        "CWE"};
+}
+
+static Severity getSeverity(ReportType reportType, const ErrorItem& errorItem) {
+    return reportType == ReportType::normal ? errorItem.severity : getSeverityFromClassification(errorItem.classification);
 }
 
 ResultsTree::ResultsTree(QWidget * parent) :
-    QTreeView(parent)
+    QTreeView(parent),
+    mModel(new QStandardItemModel)
 {
-    setModel(&mModel);
+    setModel(mModel);
     translate(); // Adds columns to grid
     clear();
     setExpandsOnDoubleClick(false);
@@ -168,20 +155,19 @@ void ResultsTree::setReportType(ReportType reportType) {
 
     mGuideline = createGuidelineMapping(reportType);
 
-    for (int i = 0; i < mModel.rowCount(); ++i) {
-        const QStandardItem *fileItem = mModel.item(i, COLUMN_FILE);
+    for (int i = 0; i < mModel->rowCount(); ++i) {
+        auto *fileItem = dynamic_cast<ResultItem*>(mModel->item(i, COLUMN_FILE));
         if (!fileItem)
             continue;
         for (int j = 0; j < fileItem->rowCount(); ++j) {
-            const auto& childdata = fileItem->child(j,0)->data().toMap();
-            const QString& errorId = childdata[ERRORID].toString();
-            Severity severity = ShowTypes::ShowTypeToSeverity(ShowTypes::VariantToShowType(childdata[SEVERITY]));
-            const QString& guideline = getGuideline(mReportType, mGuideline, errorId, severity);
-            const QString& classification = getClassification(mReportType, guideline);
-            fileItem->child(j, COLUMN_CERT_LEVEL)->setText(classification);
-            fileItem->child(j, COLUMN_CERT_RULE)->setText(guideline);
-            fileItem->child(j, COLUMN_MISRA_CLASSIFICATION)->setText(classification);
-            fileItem->child(j, COLUMN_MISRA_GUIDELINE)->setText(guideline);
+            QSharedPointer<ErrorItem>& errorItem = dynamic_cast<ResultItem*>(fileItem->child(j,0))->errorItem;
+            errorItem->guideline = getGuideline(mReportType, mGuideline, errorItem->errorId, errorItem->severity);
+            errorItem->classification = getClassification(mReportType, errorItem->guideline);
+            dynamic_cast<ResultItem*>(fileItem->child(j, COLUMN_FILE))->setIconFileName(severityToIcon(getSeverity(reportType, *errorItem)));
+            fileItem->child(j, COLUMN_CERT_LEVEL)->setText(errorItem->classification);
+            fileItem->child(j, COLUMN_CERT_RULE)->setText(errorItem->guideline);
+            fileItem->child(j, COLUMN_MISRA_CLASSIFICATION)->setText(errorItem->classification);
+            fileItem->child(j, COLUMN_MISRA_GUIDELINE)->setText(errorItem->guideline);
         }
     }
 
@@ -218,163 +204,98 @@ void ResultsTree::initialize(QSettings *settings, ApplicationList *list, ThreadH
     loadSettings();
 }
 
+ResultItem *ResultsTree::createNormalItem(const QString &text, QSharedPointer<ErrorItem> errorItem, ResultItem::Type type, int errorPathIndex)
+{
+    auto *item = new ResultItem(std::move(errorItem), type, errorPathIndex);
+    item->setText(text);
+    item->setEditable(false);
+    return item;
+}
 
-QStandardItem *ResultsTree::createNormalItem(const QString &name)
+ResultItem *ResultsTree::createFilenameItem(const QSharedPointer<ErrorItem>& errorItem, ResultItem::Type type, int errorPathIndex)
 {
-    auto *item = new QStandardItem(name);
-    item->setData(name, Qt::ToolTipRole);
+    auto *item = new ResultItem(errorItem, type, errorPathIndex);
+    item->setText(QDir::toNativeSeparators(stripPath(errorItem->errorPath[errorPathIndex].file, false)));
     item->setEditable(false);
     return item;
 }
 
-QStandardItem *ResultsTree::createCheckboxItem(bool checked)
+ResultItem *ResultsTree::createCheckboxItem(bool checked, QSharedPointer<ErrorItem> errorItem, ResultItem::Type type, int errorPathIndex)
 {
-    auto *item = new QStandardItem;
+    auto *item = new ResultItem(std::move(errorItem), type, errorPathIndex);
     item->setCheckable(true);
     item->setCheckState(checked ? Qt::Checked : Qt::Unchecked);
     item->setEnabled(false);
     return item;
 }
 
-QStandardItem *ResultsTree::createLineNumberItem(const QString &linenumber)
+ResultItem *ResultsTree::createLineNumberItem(int linenumber, QSharedPointer<ErrorItem> errorItem, ResultItem::Type type, int errorPathIndex)
 {
-    auto *item = new QStandardItem();
-    item->setData(QVariant(linenumber.toInt()), Qt::DisplayRole);
-    item->setToolTip(linenumber);
+    auto *item = new ResultItem(std::move(errorItem), type, errorPathIndex);
+    item->setText(QString::number(linenumber));
     item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
     item->setEditable(false);
     return item;
 }
 
-bool ResultsTree::addErrorItem(const ErrorItem &item)
+bool ResultsTree::addErrorItem(const ErrorItem& errorItem)
 {
-    if (item.errorPath.isEmpty()) {
+    if (errorItem.errorPath.isEmpty())
         return false;
-    }
-
-    const QErrorPathItem &loc = item.errorId.startsWith("clang") ? item.errorPath.front() : item.errorPath.back();
-    QString realfile = stripPath(loc.file, false);
 
-    if (realfile.isEmpty()) {
-        realfile = tr("Undefined file");
-    }
-
-    bool showItem = true;
+    const QString s = errorItem.toString();
+    if (mErrorList.contains(s))
+        return false;
+    mErrorList.append(s);
 
-    // Ids that are temporarily hidden..
-    if (mHiddenMessageId.contains(item.errorId))
-        showItem = false;
+    QSharedPointer<ErrorItem> errorItemPtr{new ErrorItem(errorItem)};
 
-    //If specified, filter on summary, message, filename, and id
-    if (showItem && !mFilter.isEmpty()) {
-        if (!item.summary.contains(mFilter, Qt::CaseInsensitive) &&
-            !item.message.contains(mFilter, Qt::CaseInsensitive) &&
-            !item.errorPath.back().file.contains(mFilter, Qt::CaseInsensitive) &&
-            !item.errorId.contains(mFilter, Qt::CaseInsensitive)) {
-            showItem = false;
-        }
+    if (mReportType != ReportType::normal) {
+        errorItemPtr->guideline = getGuideline(mReportType, mGuideline, errorItemPtr->errorId, errorItemPtr->severity);
+        errorItemPtr->classification = getClassification(mReportType, errorItemPtr->guideline);
     }
 
-    if (showItem) {
-        if (mReportType == ReportType::normal)
-            showItem = mShowSeverities.isShown(item.severity);
-        else {
-            const QString& guideline = getGuideline(mReportType, mGuideline, item.errorId, item.severity);
-            const QString& classification = getClassification(mReportType, guideline);
-            showItem = !classification.isEmpty() && mShowSeverities.isShown(getSeverityFromClassification(classification));
-        }
-    }
+    const bool showItem = !isErrorItemHidden(errorItemPtr);
 
     // if there is at least one error that is not hidden, we have a visible error
     mVisibleErrors |= showItem;
 
-    ErrorLine line;
-    line.file = realfile;
-    line.line = loc.line;
-    line.errorId = item.errorId;
-    line.cwe = item.cwe;
-    line.hash = item.hash;
-    line.inconclusive = item.inconclusive;
-    line.summary = item.summary;
-    line.message = item.message;
-    line.severity = item.severity;
-    line.sinceDate = item.sinceDate;
-    if (const ProjectFile *activeProject = ProjectFile::getActiveProject()) {
-        line.tags = activeProject->getWarningTags(item.hash);
-    }
-    line.remark = item.remark;
+    if (const ProjectFile *activeProject = ProjectFile::getActiveProject())
+        errorItemPtr->tags = activeProject->getWarningTags(errorItemPtr->hash);
     //Create the base item for the error and ensure it has a proper
     //file item as a parent
-    QStandardItem* fileItem = ensureFileItem(loc.file, item.file0, !showItem);
-    QStandardItem* stditem = addBacktraceFiles(fileItem,
-                                               line,
-                                               !showItem,
-                                               severityToIcon(line.severity),
-                                               false);
+    ResultItem* fileItem = ensureFileItem(errorItemPtr, !showItem);
+    ResultItem* stditem = addBacktraceFiles(fileItem,
+                                            errorItemPtr,
+                                            !showItem,
+                                            severityToIcon(getSeverity(mReportType, *errorItemPtr)),
+                                            ResultItem::Type::message,
+                                            errorItemPtr->getMainLocIndex());
 
     if (!stditem)
         return false;
 
-    //Add user data to that item
-    QMap<QString, QVariant> itemdata;
-    itemdata[SEVERITY]  = ShowTypes::SeverityToShowType(item.severity);
-    itemdata[SUMMARY] = item.summary;
-    itemdata[MESSAGE]  = item.message;
-    itemdata[FILENAME]  = loc.file;
-    itemdata[LINE]  = loc.line;
-    itemdata[COLUMN] = loc.column;
-    itemdata[ERRORID]  = item.errorId;
-    itemdata[CWE] = item.cwe;
-    itemdata[HASH] = item.hash;
-    itemdata[INCONCLUSIVE] = item.inconclusive;
-    itemdata[FILE0] = stripPath(item.file0, true);
-    itemdata[SINCEDATE] = item.sinceDate;
-    itemdata[SYMBOLNAMES] = item.symbolNames;
-    itemdata[TAGS] = line.tags;
-    itemdata[REMARK] = line.remark;
-    itemdata[HIDE] = false;
-    stditem->setData(QVariant(itemdata));
-
     //Add backtrace files as children
-    if (item.errorPath.size() > 1) {
-        for (int i = 0; i < item.errorPath.size(); i++) {
-            const QErrorPathItem &e = item.errorPath[i];
-            line.file = e.file;
-            line.line = e.line;
-            line.message = line.summary = e.info;
-            QStandardItem *child_item = addBacktraceFiles(stditem,
-                                                          line,
-                                                          false,
-                                                          ":images/go-down.png",
-                                                          true);
-            if (!child_item)
-                continue;
-
-            // Add user data to that item
-            QMap<QString, QVariant> child_data;
-            child_data[SEVERITY]  = ShowTypes::SeverityToShowType(line.severity);
-            child_data[SUMMARY] = line.summary;
-            child_data[MESSAGE]  = line.message;
-            child_data[FILENAME]  = e.file;
-            child_data[LINE]  = e.line;
-            child_data[COLUMN] = e.column;
-            child_data[ERRORID]  = line.errorId;
-            child_data[CWE] = line.cwe;
-            child_data[HASH] = line.hash;
-            child_data[INCONCLUSIVE] = line.inconclusive;
-            child_data[SYMBOLNAMES] = item.symbolNames;
-            child_item->setData(QVariant(child_data));
+    if (errorItemPtr->errorPath.size() > 1) {
+        for (int i = 0; i < errorItemPtr->errorPath.size(); i++) {
+            addBacktraceFiles(stditem,
+                              errorItemPtr,
+                              false,
+                              ":images/go-down.png",
+                              ResultItem::Type::note,
+                              i);
         }
     }
 
     return true;
 }
 
-QStandardItem *ResultsTree::addBacktraceFiles(QStandardItem *parent,
-                                              const ErrorLine &item,
-                                              const bool hide,
-                                              const QString &icon,
-                                              bool childOfMessage)
+ResultItem *ResultsTree::addBacktraceFiles(ResultItem *parent,
+                                           const QSharedPointer<ErrorItem>& errorItem,
+                                           const bool hide,
+                                           const QString &icon,
+                                           ResultItem::Type type,
+                                           int errorPathIndex)
 {
     if (!parent)
         return nullptr;
@@ -382,56 +303,49 @@ QStandardItem *ResultsTree::addBacktraceFiles(QStandardItem *parent,
     //TODO message has parameter names so we'll need changes to the core
     //cppcheck so we can get proper translations
 
-    const QString itemSeverity = childOfMessage ? tr("note") : severityToTranslatedString(item.severity);
+    const bool childOfMessage = (type == ResultItem::Type::note);
+    const QString itemSeverity = childOfMessage ? tr("note") : severityToTranslatedString(errorItem->severity);
+
+    const auto& loc = errorItem->errorPath[errorPathIndex];
 
     // Check for duplicate rows and don't add them if found
-    for (int i = 0; i < parent->rowCount(); i++) {
+    for (int i = 0; i < errorPathIndex; i++) {
         // The first column is the file name and is always the same
-
-        // the third column is the line number so check it first
-        if (parent->child(i, COLUMN_LINE)->text() == QString::number(item.line)) {
-            // the second column is the severity so check it next
-            if (parent->child(i, COLUMN_SEVERITY)->text() == itemSeverity) {
-                // the sixth column is the summary so check it last
-                if (parent->child(i, COLUMN_SUMMARY)->text() == item.summary) {
-                    // this row matches so don't add it
-                    return nullptr;
-                }
-            }
-        }
+        const auto& e = errorItem->errorPath[i];
+        if (loc.line == e.line && loc.info == e.info)
+            return nullptr;
     }
 
-    QMap<int, QStandardItem*> columns;
-    const QString guideline = getGuideline(mReportType, mGuideline, item.errorId, item.severity);
-    const QString classification = getClassification(mReportType, guideline);
-    columns[COLUMN_CERT_LEVEL] = createNormalItem(classification);
-    columns[COLUMN_CERT_RULE] = createNormalItem(guideline);
-    columns[COLUMN_CWE] = createNormalItem(QString::number(item.cwe));
-    columns[COLUMN_FILE] = createNormalItem(QDir::toNativeSeparators(item.file));
-    columns[COLUMN_ID] = createNormalItem(childOfMessage ? QString() : item.errorId);
-    columns[COLUMN_INCONCLUSIVE] = childOfMessage ? createNormalItem(QString()) : createCheckboxItem(item.inconclusive);
-    columns[COLUMN_LINE] = createLineNumberItem(QString::number(item.line));
-    columns[COLUMN_MISRA_CLASSIFICATION] = createNormalItem(classification);
-    columns[COLUMN_MISRA_GUIDELINE] = createNormalItem(guideline);
-    columns[COLUMN_SEVERITY] = createNormalItem(itemSeverity);
-    columns[COLUMN_SINCE_DATE] = createNormalItem(item.sinceDate);
-    columns[COLUMN_SUMMARY] = createNormalItem(item.summary);
-    columns[COLUMN_TAGS] = createNormalItem(item.tags);
+    const QString text = childOfMessage ? loc.info : errorItem->summary;
 
     const int numberOfColumns = getLabels().size();
+    QList<ResultItem*> columns(numberOfColumns);
+    columns[COLUMN_FILE] = createFilenameItem(errorItem, type, errorPathIndex);
+    columns[COLUMN_FILE]->setIconFileName(icon);
+    columns[COLUMN_LINE] = createLineNumberItem(loc.line, errorItem, type, errorPathIndex);
+    columns[COLUMN_SEVERITY] = createNormalItem(itemSeverity, errorItem, type, errorPathIndex);
+    columns[COLUMN_SUMMARY] = createNormalItem(text, errorItem, type, errorPathIndex);
+    if (type == ResultItem::Type::message) {
+        columns[COLUMN_CERT_LEVEL] = createNormalItem(errorItem->classification, errorItem, type, errorPathIndex);
+        columns[COLUMN_CERT_RULE] = createNormalItem(errorItem->guideline, errorItem, type, errorPathIndex);
+        columns[COLUMN_CWE] = createNormalItem(errorItem->cwe > 0 ? QString::number(errorItem->cwe) : QString(), errorItem, type, errorPathIndex);
+        columns[COLUMN_ID] = createNormalItem(errorItem->errorId, errorItem, type, errorPathIndex);
+        columns[COLUMN_INCONCLUSIVE] = createCheckboxItem(errorItem->inconclusive, errorItem, type, errorPathIndex);
+        columns[COLUMN_MISRA_CLASSIFICATION] = createNormalItem(errorItem->classification, errorItem, type, errorPathIndex);
+        columns[COLUMN_MISRA_GUIDELINE] = createNormalItem(errorItem->guideline, errorItem, type, errorPathIndex);
+        columns[COLUMN_SINCE_DATE] = createNormalItem(errorItem->sinceDate, errorItem, type, errorPathIndex);
+        columns[COLUMN_TAGS] = createNormalItem(errorItem->tags, errorItem, type, errorPathIndex);
+    }
+
     QList<QStandardItem*> list;
     for (int i = 0; i < numberOfColumns; ++i)
-        list << columns[i];
+        list << (columns[i] ? columns[i] : createNormalItem(QString(), errorItem, type, errorPathIndex));
 
     parent->appendRow(list);
 
     setRowHidden(parent->rowCount() - 1, parent->index(), hide);
 
-    if (!icon.isEmpty()) {
-        list[0]->setIcon(QIcon(icon));
-    }
-
-    return list[0];
+    return columns[COLUMN_FILE];
 }
 
 QString ResultsTree::severityToTranslatedString(Severity severity)
@@ -462,30 +376,33 @@ QString ResultsTree::severityToTranslatedString(Severity severity)
         return tr("internal");
 
     case Severity::none:
-    default:
         return QString();
     }
+
+    cppcheck::unreachable();
 }
 
-QStandardItem *ResultsTree::findFileItem(const QString &name) const
+ResultItem *ResultsTree::findFileItem(const QString &name) const
 {
     // The first column contains the file name. In Windows we can get filenames
     // "header.h" and "Header.h" and must compare them as identical.
 
-    for (int i = 0; i < mModel.rowCount(); i++) {
+    for (int i = 0; i < mModel->rowCount(); i++) {
 #ifdef _WIN32
-        if (QString::compare(mModel.item(i, COLUMN_FILE)->text(), name, Qt::CaseInsensitive) == 0)
+        if (QString::compare(mModel->item(i, COLUMN_FILE)->text(), name, Qt::CaseInsensitive) == 0)
 #else
-        if (mModel.item(i, COLUMN_FILE)->text() == name)
+        if (mModel->item(i, COLUMN_FILE)->text() == name)
 #endif
-            return mModel.item(i, COLUMN_FILE);
+            return dynamic_cast<ResultItem*>(mModel->item(i, COLUMN_FILE));
     }
     return nullptr;
 }
 
 void ResultsTree::clear()
 {
-    mModel.removeRows(0, mModel.rowCount());
+    mErrorList.clear();
+
+    mModel->removeRows(0, mModel->rowCount());
 
     if (const ProjectFile *activeProject = ProjectFile::getActiveProject()) {
         hideColumn(COLUMN_SINCE_DATE);
@@ -501,17 +418,17 @@ void ResultsTree::clear()
 
 void ResultsTree::clear(const QString &filename)
 {
-    const QString stripped = stripPath(filename, false);
+    const QString stripped = QDir::toNativeSeparators(stripPath(filename, false));
 
-    for (int i = 0; i < mModel.rowCount(); ++i) {
-        const QStandardItem *fileItem = mModel.item(i, COLUMN_FILE);
+    for (int i = 0; i < mModel->rowCount(); ++i) {
+        const auto *fileItem = dynamic_cast<ResultItem*>(mModel->item(i, COLUMN_FILE));
         if (!fileItem)
             continue;
 
-        QVariantMap fitemdata = fileItem->data().toMap();
-        if (stripped == fitemdata[FILENAME].toString() ||
-            filename == fitemdata[FILE0].toString()) {
-            mModel.removeRow(i);
+        if (stripped == fileItem->text() ||
+            filename == fileItem->errorItem->file0) {
+            mErrorList.removeAll(fileItem->errorItem->toString());
+            mModel->removeRow(i);
             break;
         }
     }
@@ -519,17 +436,17 @@ void ResultsTree::clear(const QString &filename)
 
 void ResultsTree::clearRecheckFile(const QString &filename)
 {
-    for (int i = 0; i < mModel.rowCount(); ++i) {
-        const QStandardItem *fileItem = mModel.item(i, COLUMN_FILE);
+    for (int i = 0; i < mModel->rowCount(); ++i) {
+        const auto *fileItem = dynamic_cast<ResultItem*>(mModel->item(i, COLUMN_FILE));
         if (!fileItem)
             continue;
 
         QString actualfile((!mCheckPath.isEmpty() && filename.startsWith(mCheckPath)) ? filename.mid(mCheckPath.length() + 1) : filename);
-        QVariantMap fitemdata = fileItem->data().toMap();
-        QString storedfile = fitemdata[FILENAME].toString();
+        QString storedfile = fileItem->getErrorPathItem().file;
         storedfile = ((!mCheckPath.isEmpty() && storedfile.startsWith(mCheckPath)) ? storedfile.mid(mCheckPath.length() + 1) : storedfile);
         if (actualfile == storedfile) {
-            mModel.removeRow(i);
+            mErrorList.removeAll(fileItem->errorItem->toString());
+            mModel->removeRow(i);
             break;
         }
     }
@@ -538,9 +455,9 @@ void ResultsTree::clearRecheckFile(const QString &filename)
 
 void ResultsTree::loadSettings()
 {
-    for (int i = 0; i < mModel.columnCount(); i++) {
+    for (int i = 0; i < mModel->columnCount(); i++) {
         QString temp = QString(SETTINGS_RESULT_COLUMN_WIDTH).arg(i);
-        setColumnWidth(i, qMax(20, mSettings->value(temp, 800 / mModel.columnCount()).toInt()));
+        setColumnWidth(i, qMax(20, mSettings->value(temp, 800 / mModel->columnCount()).toInt()));
     }
 
     mSaveFullPath = mSettings->value(SETTINGS_SAVE_FULL_PATH, false).toBool();
@@ -553,7 +470,7 @@ void ResultsTree::loadSettings()
 
 void ResultsTree::saveSettings() const
 {
-    for (int i = 0; i < mModel.columnCount(); i++) {
+    for (int i = 0; i < mModel->columnCount(); i++) {
         QString temp = QString(SETTINGS_RESULT_COLUMN_WIDTH).arg(i);
         mSettings->setValue(temp, columnWidth(i));
     }
@@ -598,11 +515,11 @@ void ResultsTree::refreshTree()
 {
     mVisibleErrors = false;
     //Get the amount of files in the tree
-    const int filecount = mModel.rowCount();
+    const int filecount = mModel->rowCount();
 
     for (int i = 0; i < filecount; i++) {
         //Get file i
-        QStandardItem *fileItem = mModel.item(i, 0);
+        auto *fileItem = dynamic_cast<ResultItem*>(mModel->item(i, 0));
         if (!fileItem) {
             continue;
         }
@@ -615,44 +532,13 @@ void ResultsTree::refreshTree()
 
         for (int j = 0; j < errorcount; j++) {
             //Get the error itself
-            QStandardItem *child = fileItem->child(j, 0);
+            const auto *child = dynamic_cast<ResultItem*>(fileItem->child(j, 0));
             if (!child) {
                 continue;
             }
 
-            //Get error's user data and convert it to QVariantMap
-            QVariantMap userdata = child->data().toMap();
-
             //Check if this error should be hidden
-            bool hide = userdata[HIDE].toBool() || mHiddenMessageId.contains(userdata[ERRORID].toString());
-
-            if (!hide) {
-                if (mReportType == ReportType::normal)
-                    hide = !mShowSeverities.isShown(ShowTypes::VariantToShowType(userdata[SEVERITY]));
-                else {
-                    const QString& classification = fileItem->child(j, COLUMN_MISRA_CLASSIFICATION)->text();
-                    hide = classification.isEmpty() || !mShowSeverities.isShown(getSeverityFromClassification(classification));
-                }
-            }
-
-            // If specified, filter on summary, message, filename, and id
-            if (!hide && !mFilter.isEmpty()) {
-                if (!userdata[SUMMARY].toString().contains(mFilter, Qt::CaseInsensitive) &&
-                    !userdata[MESSAGE].toString().contains(mFilter, Qt::CaseInsensitive) &&
-                    !userdata[FILENAME].toString().contains(mFilter, Qt::CaseInsensitive) &&
-                    !userdata[ERRORID].toString().contains(mFilter, Qt::CaseInsensitive) &&
-                    !fileItem->child(j, COLUMN_MISRA_CLASSIFICATION)->text().contains(mFilter, Qt::CaseInsensitive)) {
-                    hide = true;
-                }
-            }
-
-            // Tool filter
-            if (!hide) {
-                if (userdata[ERRORID].toString().startsWith("clang"))
-                    hide = !mShowClang;
-                else
-                    hide = !mShowCppcheck;
-            }
+            const bool hide = child->hidden || isErrorItemHidden(child->errorItem);
 
             if (!hide) {
                 showFile = true;
@@ -666,36 +552,57 @@ void ResultsTree::refreshTree()
         // Show the file if any of it's errors are visible
         setRowHidden(i, QModelIndex(), !showFile);
     }
+    sortByColumn(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
+}
+
+bool ResultsTree::isErrorItemHidden(const QSharedPointer<ErrorItem>& errorItem) const {
+    //Check if this error should be hidden
+    if (mHiddenMessageId.contains(errorItem->errorId))
+        return true;
+
+    bool hide;
+    if (mReportType == ReportType::normal)
+        hide = !mShowSeverities.isShown(errorItem->severity);
+    else
+        hide = errorItem->classification.isEmpty() || !mShowSeverities.isShown(getSeverityFromClassification(errorItem->classification));
+
+    // If specified, filter on summary, message, filename, and id
+    if (!hide && !mFilter.isEmpty())
+        hide = !errorItem->filterMatch(mFilter);
+
+    // Tool filter
+    if (!hide) {
+        if (errorItem->isClangResult())
+            hide = !mShowClang;
+        else
+            hide = !mShowCppcheck;
+    }
+
+    return hide;
 }
 
-QStandardItem *ResultsTree::ensureFileItem(const QString &fullpath, const QString &file0, bool hide)
+ResultItem *ResultsTree::ensureFileItem(const QSharedPointer<ErrorItem>& errorItem, bool hide)
 {
-    QString name = stripPath(fullpath, false);
+    QString name = QDir::toNativeSeparators(stripPath(errorItem->getFile(), false));
     // Since item has path with native separators we must use path with
     // native separators to find it.
-    QStandardItem *item = findFileItem(QDir::toNativeSeparators(name));
+    ResultItem *fileItem = findFileItem(name);
 
-    if (item) {
+    if (fileItem) {
         if (!hide)
-            setRowHidden(item->row(), QModelIndex(), hide);
-        return item;
+            setRowHidden(fileItem->row(), QModelIndex(), hide);
+        return fileItem;
     }
 
     // Ensure shown path is with native separators
-    name = QDir::toNativeSeparators(name);
-    item = createNormalItem(name);
-    item->setIcon(QIcon(":images/text-x-generic.png"));
+    fileItem = createFilenameItem(errorItem, ResultItem::Type::file, errorItem->getMainLocIndex());
+    fileItem->setIcon(QIcon(":images/text-x-generic.png"));
 
-    //Add user data to that item
-    QMap<QString, QVariant> itemdata;
-    itemdata[FILENAME] = fullpath;
-    itemdata[FILE0] = file0;
-    item->setData(QVariant(itemdata));
-    mModel.appendRow(item);
+    mModel->appendRow(fileItem);
 
-    setRowHidden(item->row(), QModelIndex(), hide);
+    setRowHidden(fileItem->row(), QModelIndex(), hide);
 
-    return item;
+    return fileItem;
 }
 
 void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
@@ -708,7 +615,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
         if (mSelectionModel->selectedRows().count() > 1)
             multipleSelection = true;
 
-        mContextItem = mModel.itemFromIndex(index);
+        mContextItem = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
 
         //Create a new context menu
         QMenu menu(this);
@@ -735,7 +642,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
             //Add a new mapping
             signalMapper.setMapping(start, defaultApplicationIndex);
 
-            connect(&signalMapper, SIGNAL(mapped(int)),
+            connect(&signalMapper, SIGNAL(mappedInt(int)),
                     this, SLOT(context(int)));
         }
 
@@ -745,21 +652,35 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 menu.addSeparator();
             }
 
+            int selectedFiles = 0;
+            int selectedResults = 0;
+
+            for (auto row : mSelectionModel->selectedRows()) {
+                auto *item = mModel->itemFromIndex(row);
+                if (!item->parent())
+                    selectedFiles++;
+                else if (!item->parent()->parent())
+                    selectedResults++;
+            }
+
             //Create an action for the application
-            auto *recheckAction          = new QAction(tr("Recheck"), &menu);
+            auto *recheckAction          = new QAction(tr("Recheck %1 file(s)").arg(selectedFiles), &menu);
             auto *copyAction             = new QAction(tr("Copy"), &menu);
-            auto *hide                   = new QAction(tr("Hide"), &menu);
+            auto *hide                   = new QAction(tr("Hide %1 result(s)").arg(selectedResults), &menu);
             auto *hideallid              = new QAction(tr("Hide all with id"), &menu);
             auto *opencontainingfolder   = new QAction(tr("Open containing folder"), &menu);
 
-            if (multipleSelection) {
+            if (selectedFiles == 0 || mThread->isChecking() || mResultsSource == ResultsSource::Log)
+                recheckAction->setDisabled(true);
+
+            if (selectedResults == 0)
+                hide->setDisabled(true);
+
+            if (selectedResults == 0 || multipleSelection)
                 hideallid->setDisabled(true);
+
+            if (multipleSelection || mResultsSource == ResultsSource::Log)
                 opencontainingfolder->setDisabled(true);
-            }
-            if (mThread->isChecking())
-                recheckAction->setDisabled(true);
-            else
-                recheckAction->setDisabled(false);
 
             menu.addAction(recheckAction);
             menu.addSeparator();
@@ -770,9 +691,8 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
 
             auto *suppress = new QAction(tr("Suppress selected id(s)"), &menu);
             {
-                QVariantMap itemdata = mContextItem->data().toMap();
-                const QString messageId = itemdata[ERRORID].toString();
-                suppress->setEnabled(!ErrorLogger::isCriticalErrorId(messageId.toStdString()));
+                if (selectedResults == 0 || ErrorLogger::isCriticalErrorId(mContextItem->errorItem->errorId.toStdString()))
+                    suppress->setDisabled(true);
             }
             menu.addAction(suppress);
             connect(suppress, &QAction::triggered, this, &ResultsTree::suppressSelectedIds);
@@ -793,7 +713,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 {
                     auto *action = new QAction(tr("No tag"), tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [this]() {
                         tagSelectedItems(QString());
                     });
                 }
@@ -801,7 +721,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 for (const QString& tagstr : currentProject->getTags()) {
                     auto *action = new QAction(tagstr, tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [tagstr, this]() {
                         tagSelectedItems(tagstr);
                     });
                 }
@@ -811,18 +731,17 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
         //Start the menu
         menu.exec(e->globalPos());
         index = indexAt(e->pos());
-        if (index.isValid()) {
-            mContextItem = mModel.itemFromIndex(index);
-        }
+        if (index.isValid())
+            mContextItem = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
     }
 }
 
-void ResultsTree::startApplication(const QStandardItem *target, int application)
+void ResultsTree::startApplication(const ResultItem *target, int application)
 {
     //If there are no applications specified, tell the user about it
     if (mApplications->getApplicationCount() == 0) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No editor application configured.\n\n"
                            "Configure the editor application for Cppcheck in preferences/Applications."),
                         QMessageBox::Ok,
@@ -836,29 +755,23 @@ void ResultsTree::startApplication(const QStandardItem *target, int application)
 
     if (application == -1) {
         QMessageBox msg(QMessageBox::Critical,
-                        tr("Cppcheck"),
+                        "Cppcheck",
                         tr("No default editor application selected.\n\n"
                            "Please select the default editor application in preferences/Applications."),
                         QMessageBox::Ok,
                         this);
         msg.exec();
         return;
-
     }
 
     if (target && application >= 0 && application < mApplications->getApplicationCount() && target->parent()) {
-        // Make sure we are working with the first column
-        if (target->column() != 0)
-            target = target->parent()->child(target->row(), 0);
-
-        QVariantMap targetdata = target->data().toMap();
+        const auto& errorPathItem = target->getErrorPathItem();
 
         //Replace (file) with filename
-        QString file = targetdata[FILENAME].toString();
-        file = QDir::toNativeSeparators(file);
+        QString file = QDir::toNativeSeparators(errorPathItem.file);
         qDebug() << "Opening file: " << file;
 
-        QFileInfo info(file);
+        const QFileInfo info(file);
         if (!info.exists()) {
             if (info.isAbsolute()) {
                 QMessageBox msgbox(this);
@@ -887,11 +800,10 @@ void ResultsTree::startApplication(const QStandardItem *target, int application)
         QString params = app.getParameters();
         params.replace("(file)", file, Qt::CaseInsensitive);
 
-        QVariant line = targetdata[LINE];
-        params.replace("(line)", QString("%1").arg(line.toInt()), Qt::CaseInsensitive);
+        params.replace("(line)", QString::number(errorPathItem.line), Qt::CaseInsensitive);
 
-        params.replace("(message)", targetdata[MESSAGE].toString(), Qt::CaseInsensitive);
-        params.replace("(severity)", targetdata[SEVERITY].toString(), Qt::CaseInsensitive);
+        params.replace("(message)", target->errorItem->message, Qt::CaseInsensitive);
+        params.replace("(severity)", severityToTranslatedString(target->errorItem->severity), Qt::CaseInsensitive);
 
         QString program = app.getPath();
 
@@ -905,26 +817,7 @@ void ResultsTree::startApplication(const QStandardItem *target, int application)
         }
 #endif // Q_OS_WIN
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-        const QString cmdLine = QString("%1 %2").arg(program).arg(params);
-#endif
-
-        // this is reported as deprecated in Qt 5.15.2 but no longer in Qt 6
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-        SUPPRESS_WARNING_CLANG_PUSH("-Wdeprecated")
-        SUPPRESS_WARNING_GCC_PUSH("-Wdeprecated-declarations")
-#endif
-
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-        const bool success = QProcess::startDetached(cmdLine);
-#else
         const bool success = QProcess::startDetached(program, QProcess::splitCommand(params));
-#endif
-
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-        SUPPRESS_WARNING_GCC_POP
-            SUPPRESS_WARNING_CLANG_POP
-#endif
         if (!success) {
             QString text = tr("Could not start %1\n\nPlease check the application path and parameters are correct.").arg(program);
 
@@ -993,25 +886,17 @@ void ResultsTree::copy()
 
     QString text;
     for (const QModelIndex& index : mSelectionModel->selectedRows()) {
-        const QStandardItem *item = mModel.itemFromIndex(index);
-        if (!item->parent()) {
-            text += item->text() + '\n';
+        const auto *item = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
+        if (!item)
             continue;
+        if (item->getType() == ResultItem::Type::file)
+            text += item->text() + '\n';
+        else if (item->getType() == ResultItem::Type::message)
+            text += item->errorItem->toString() + '\n';
+        else if (item->getType() == ResultItem::Type::note) {
+            const auto e = item->getErrorPathItem();
+            text += e.file + ":" + QString::number(e.line) + ":" + QString::number(e.column) + ":note: " + e.info + '\n';
         }
-        if (item->parent()->parent())
-            item = item->parent();
-        QVariantMap itemdata = item->data().toMap();
-        if (!itemdata.contains("id"))
-            continue;
-        QString inconclusive = itemdata[INCONCLUSIVE].toBool() ? ",inconclusive" : "";
-        text += itemdata[FILENAME].toString() + ':' + QString::number(itemdata[LINE].toInt()) + ':' + QString::number(itemdata[COLUMN].toInt())
-                + ": "
-                + QString::fromStdString(severityToString(ShowTypes::ShowTypeToSeverity(static_cast<ShowTypes::ShowType>(itemdata[SEVERITY].toInt())))) + inconclusive
-                + ": "
-                + itemdata[MESSAGE].toString()
-                + " ["
-                + itemdata[ERRORID].toString()
-                + "]\n";
     }
 
     QClipboard *clipboard = QApplication::clipboard();
@@ -1022,14 +907,13 @@ void ResultsTree::hideResult()
 {
     if (!mSelectionModel)
         return;
-
-    for (QModelIndex index : mSelectionModel->selectedRows()) {
-        QStandardItem *item = mModel.itemFromIndex(index);
-        //Set the "hide" flag for this item
-        QVariantMap itemdata = item->data().toMap();
-        itemdata[HIDE] = true;
-        item->setData(QVariant(itemdata));
-
+    bool hide = false;
+    for (const QModelIndex& index : mSelectionModel->selectedRows()) {
+        auto *item = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
+        if (item && item->getType() == ResultItem::Type::message)
+            hide = item->hidden = true;
+    }
+    if (hide) {
         refreshTree();
         emit resultsHidden(true);
     }
@@ -1041,15 +925,15 @@ void ResultsTree::recheckSelectedFiles()
         return;
 
     QStringList selectedItems;
-    for (QModelIndex index : mSelectionModel->selectedRows()) {
-        QStandardItem *item = mModel.itemFromIndex(index);
+    for (const QModelIndex& index : mSelectionModel->selectedRows()) {
+        const auto *item = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
         while (item->parent())
-            item = item->parent();
-        QVariantMap itemdata = item->data().toMap();
-        QString currentFile = itemdata[FILENAME].toString();
+            item = dynamic_cast<const ResultItem*>(item->parent());
+        const auto e = item->getErrorPathItem();
+        const QString currentFile = e.file;
         if (!currentFile.isEmpty()) {
             QString fileNameWithCheckPath;
-            QFileInfo curfileInfo(currentFile);
+            const QFileInfo curfileInfo(currentFile);
             if (!curfileInfo.exists() && !mCheckPath.isEmpty() && currentFile.indexOf(mCheckPath) != 0)
                 fileNameWithCheckPath = mCheckPath + "/" + currentFile;
             else
@@ -1060,13 +944,13 @@ void ResultsTree::recheckSelectedFiles()
                 return;
             }
             if (Path::isHeader(currentFile.toStdString())) {
-                if (!itemdata[FILE0].toString().isEmpty() && !selectedItems.contains(itemdata[FILE0].toString())) {
-                    selectedItems<<((!mCheckPath.isEmpty() && (itemdata[FILE0].toString().indexOf(mCheckPath) != 0)) ? (mCheckPath + "/" + itemdata[FILE0].toString()) : itemdata[FILE0].toString());
+                if (!item->errorItem->file0.isEmpty() && !selectedItems.contains(item->errorItem->file0)) {
+                    selectedItems << ((!mCheckPath.isEmpty() && (item->errorItem->file0.indexOf(mCheckPath) != 0)) ? (mCheckPath + "/" + item->errorItem->file0) : item->errorItem->file0);
                     if (!selectedItems.contains(fileNameWithCheckPath))
-                        selectedItems<<fileNameWithCheckPath;
+                        selectedItems << fileNameWithCheckPath;
                 }
             } else if (!selectedItems.contains(fileNameWithCheckPath))
-                selectedItems<<fileNameWithCheckPath;
+                selectedItems << fileNameWithCheckPath;
         }
     }
     emit checkSelected(std::move(selectedItems));
@@ -1074,17 +958,10 @@ void ResultsTree::recheckSelectedFiles()
 
 void ResultsTree::hideAllIdResult()
 {
-    if (!mContextItem || !mContextItem->parent())
+    if (!mContextItem || mContextItem->getType() == ResultItem::Type::file)
         return;
 
-    // Make sure we are working with the first column
-    if (mContextItem->column() != 0)
-        mContextItem = mContextItem->parent()->child(mContextItem->row(), 0);
-    QVariantMap itemdata = mContextItem->data().toMap();
-
-    QString messageId = itemdata[ERRORID].toString();
-
-    mHiddenMessageId.append(messageId);
+    mHiddenMessageId.append(mContextItem->errorItem->errorId);
 
     refreshTree();
     emit resultsHidden(true);
@@ -1096,36 +973,32 @@ void ResultsTree::suppressSelectedIds()
         return;
 
     QSet<QString> selectedIds;
-    for (QModelIndex index : mSelectionModel->selectedRows()) {
-        QStandardItem *item = mModel.itemFromIndex(index);
-        if (!item->parent())
-            continue;
-        if (item->parent()->parent())
-            item = item->parent();
-        QVariantMap itemdata = item->data().toMap();
-        if (!itemdata.contains("id"))
+    for (const QModelIndex& index : mSelectionModel->selectedRows()) {
+        const auto *item = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
+        if (!item || item->getType() == ResultItem::Type::file || !item->errorItem)
             continue;
-        selectedIds << itemdata[ERRORID].toString();
+        selectedIds << item->errorItem->errorId;
     }
 
     // delete all errors with selected message Ids
-    for (int i = 0; i < mModel.rowCount(); i++) {
-        QStandardItem * const file = mModel.item(i, 0);
+    for (int i = 0; i < mModel->rowCount(); i++) {
+        QStandardItem * const file = mModel->item(i, 0);
         for (int j = 0; j < file->rowCount();) {
-            QStandardItem *errorItem = file->child(j, 0);
-            QVariantMap userdata = errorItem->data().toMap();
-            if (selectedIds.contains(userdata[ERRORID].toString())) {
+            const auto *errorItem = dynamic_cast<ResultItem*>(file->child(j, 0));
+            if (errorItem && errorItem->errorItem && selectedIds.contains(errorItem->errorItem->errorId)) {
                 file->removeRow(j);
             } else {
                 j++;
             }
         }
         if (file->rowCount() == 0)
-            mModel.removeRow(file->row());
+            mModel->removeRow(file->row());
     }
 
-
-    emit suppressIds(selectedIds.values());
+    if (!selectedIds.isEmpty()) {
+        refreshTree(); // If all visible warnings was suppressed then the file item should be hidden
+        emit suppressIds(selectedIds.values());
+    }
 }
 
 void ResultsTree::suppressHash()
@@ -1133,34 +1006,29 @@ void ResultsTree::suppressHash()
     if (!mSelectionModel)
         return;
 
-    // Extract selected warnings
-    QSet<QStandardItem *> selectedWarnings;
+    bool changed = false;
+    ProjectFile *projectFile = ProjectFile::getActiveProject();
+
     for (QModelIndex index : mSelectionModel->selectedRows()) {
-        QStandardItem *item = mModel.itemFromIndex(index);
-        if (!item->parent())
+        auto *item = dynamic_cast<ResultItem *>(mModel->itemFromIndex(index));
+        if (!item || item->getType() == ResultItem::Type::file)
             continue;
-        while (item->parent()->parent())
-            item = item->parent();
-        selectedWarnings.insert(item);
-    }
+        if (item->getType() == ResultItem::Type::note)
+            item = dynamic_cast<ResultItem *>(item->parent());
 
-    bool changed = false;
-    ProjectFile *projectFile = ProjectFile::getActiveProject();
-    for (QStandardItem *item: selectedWarnings) {
-        QStandardItem *fileItem = item->parent();
-        const QVariantMap itemdata = item->data().toMap();
-        if (projectFile && itemdata.contains(HASH)) {
+        // Suppress
+        if (projectFile && item->errorItem->hash > 0) {
             SuppressionList::Suppression suppression;
-            suppression.hash = itemdata[HASH].toULongLong();
-            suppression.errorId = itemdata[ERRORID].toString().toStdString();
-            suppression.fileName = itemdata[FILENAME].toString().toStdString();
-            suppression.lineNumber = itemdata[LINE].toInt();
+            suppression.hash = item->errorItem->hash;
             projectFile->addSuppression(suppression);
             changed = true;
         }
+
+        // Remove item
+        QStandardItem *fileItem = item->parent();
         fileItem->removeRow(item->row());
         if (fileItem->rowCount() == 0)
-            mModel.removeRow(fileItem->row());
+            mModel->removeRow(fileItem->row());
     }
 
     if (changed)
@@ -1169,7 +1037,9 @@ void ResultsTree::suppressHash()
 
 void ResultsTree::openContainingFolder()
 {
-    QString filePath = getFilePath(mContextItem, true);
+    if (!mContextItem)
+        return;
+    QString filePath = mContextItem->getErrorPathItem().file;
     if (!filePath.isEmpty()) {
         filePath = QFileInfo(filePath).absolutePath();
         QDesktopServices::openUrl(QUrl::fromLocalFile(filePath));
@@ -1183,15 +1053,15 @@ void ResultsTree::tagSelectedItems(const QString &tag)
     bool isTagged = false;
     ProjectFile *currentProject = ProjectFile::getActiveProject();
     for (QModelIndex index : mSelectionModel->selectedRows()) {
-        QStandardItem *item = mModel.itemFromIndex(index);
-        QVariantMap itemdata = item->data().toMap();
-        if (itemdata.contains("tags")) {
-            itemdata[TAGS] = tag;
-            item->setData(QVariant(itemdata));
+        auto *item = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
+        if (item && item->getType() != ResultItem::Type::file) {
+            if (item->getType() == ResultItem::Type::note)
+                item = dynamic_cast<ResultItem*>(item->parent());
+            item->errorItem->tags = tag;
             item->parent()->child(index.row(), COLUMN_TAGS)->setText(tag);
-            if (currentProject && itemdata.contains(HASH)) {
+            if (currentProject && item->errorItem->hash > 0) {
                 isTagged = true;
-                currentProject->setWarningTags(itemdata[HASH].toULongLong(), tag);
+                currentProject->setWarningTags(item->errorItem->hash, tag);
             }
         }
     }
@@ -1206,30 +1076,7 @@ void ResultsTree::context(int application)
 
 void ResultsTree::quickStartApplication(const QModelIndex &index)
 {
-    startApplication(mModel.itemFromIndex(index));
-}
-
-QString ResultsTree::getFilePath(const QStandardItem *target, bool fullPath)
-{
-    if (target) {
-        // Make sure we are working with the first column
-        if (target->column() != 0)
-            target = target->parent()->child(target->row(), 0);
-
-        QVariantMap targetdata = target->data().toMap();
-
-        //Replace (file) with filename
-        QString file = targetdata[FILENAME].toString();
-        QString pathStr = QDir::toNativeSeparators(file);
-        if (!fullPath) {
-            QFileInfo fi(pathStr);
-            pathStr = fi.fileName();
-        }
-
-        return pathStr;
-    }
-
-    return QString();
+    startApplication(dynamic_cast<ResultItem*>(mModel->itemFromIndex(index)));
 }
 
 QString ResultsTree::severityToIcon(Severity severity)
@@ -1256,22 +1103,22 @@ void ResultsTree::saveResults(Report *report) const
 {
     report->writeHeader();
 
-    for (int i = 0; i < mModel.rowCount(); i++) {
+    for (int i = 0; i < mModel->rowCount(); i++) {
         if (mSaveAllErrors || !isRowHidden(i, QModelIndex()))
-            saveErrors(report, mModel.item(i, 0));
+            saveErrors(report, dynamic_cast<ResultItem*>(mModel->item(i, 0)));
     }
 
     report->writeFooter();
 }
 
-void ResultsTree::saveErrors(Report *report, const QStandardItem *fileItem) const
+void ResultsTree::saveErrors(Report *report, const ResultItem *fileItem) const
 {
     if (!fileItem) {
         return;
     }
 
     for (int i = 0; i < fileItem->rowCount(); i++) {
-        const QStandardItem *error = fileItem->child(i, 0);
+        const auto *error = dynamic_cast<ResultItem*>(fileItem->child(i, 0));
 
         if (!error) {
             continue;
@@ -1281,21 +1128,10 @@ void ResultsTree::saveErrors(Report *report, const QStandardItem *fileItem) cons
             continue;
         }
 
-        ErrorItem item;
-        readErrorItem(error, &item);
-
-        report->writeError(item);
+        report->writeError(*error->errorItem);
     }
 }
 
-static int indexOf(const QList<ErrorItem> &list, const ErrorItem &item)
-{
-    auto it = std::find_if(list.cbegin(), list.cend(), [&](const ErrorItem& e) {
-        return ErrorItem::sameCID(item, e);
-    });
-    return it == list.cend() ? -1 : static_cast<int>(std::distance(list.cbegin(), it));
-}
-
 void ResultsTree::updateFromOldReport(const QString &filename)
 {
     showColumn(COLUMN_SINCE_DATE);
@@ -1308,81 +1144,36 @@ void ResultsTree::updateFromOldReport(const QString &filename)
     }
 
     // Read current results..
-    for (int i = 0; i < mModel.rowCount(); i++) {
-        QStandardItem *fileItem = mModel.item(i,0);
+    for (int i = 0; i < mModel->rowCount(); i++) {
+        auto *fileItem = dynamic_cast<ResultItem*>(mModel->item(i,COLUMN_FILE));
         for (int j = 0; j < fileItem->rowCount(); j++) {
-            QStandardItem *error = fileItem->child(j,0);
-            ErrorItem errorItem;
-            readErrorItem(error, &errorItem);
-            const int oldErrorIndex = indexOf(oldErrors, errorItem);
-            QVariantMap errordata = error->data().toMap();
+            auto *error = dynamic_cast<ResultItem*>(fileItem->child(j,COLUMN_FILE));
+            if (!error)
+                // FIXME..
+                continue;
+            const auto it = std::find_if(oldErrors.cbegin(),
+                                         oldErrors.cend(),
+                                         [error](const ErrorItem& err) {
+                return ErrorItem::same(err, *error->errorItem);
+            });
+            const ErrorItem* oldError = (it == oldErrors.cend()) ? nullptr : &*it;
 
             // New error .. set the "sinceDate" property
-            if (oldErrorIndex >= 0 && !oldErrors[oldErrorIndex].sinceDate.isEmpty()) {
-                errordata[SINCEDATE] = oldErrors[oldErrorIndex].sinceDate;
-                error->setData(errordata);
-                fileItem->child(j, COLUMN_SINCE_DATE)->setText(oldErrors[oldErrorIndex].sinceDate);
-            } else if (oldErrorIndex < 0 || errordata[SINCEDATE].toString().isEmpty()) {
+            if (oldError && !oldError->sinceDate.isEmpty()) {
+                error->errorItem->sinceDate = oldError->sinceDate;
+                fileItem->child(j, COLUMN_SINCE_DATE)->setText(error->errorItem->sinceDate);
+            } else if (oldError == nullptr || error->errorItem->sinceDate.isEmpty()) {
                 const QString sinceDate = QLocale::system().toString(QDate::currentDate(), QLocale::ShortFormat);
-                errordata[SINCEDATE] = sinceDate;
-                error->setData(errordata);
+                error->errorItem->sinceDate = sinceDate;
                 fileItem->child(j, COLUMN_SINCE_DATE)->setText(sinceDate);
-                if (oldErrorIndex < 0)
-                    continue;
             }
 
-            if (!errorItem.tags.isEmpty())
-                continue;
-
-            const ErrorItem &oldErrorItem = oldErrors[oldErrorIndex];
-            errordata[TAGS] = oldErrorItem.tags;
-            error->setData(errordata);
+            if (oldError && error->errorItem->tags.isEmpty())
+                error->errorItem->tags = oldError->tags;
         }
     }
 }
 
-void ResultsTree::readErrorItem(const QStandardItem *error, ErrorItem *item) const
-{
-    // Get error's user data
-    QVariantMap errordata = error->data().toMap();
-
-    item->severity = ShowTypes::ShowTypeToSeverity(ShowTypes::VariantToShowType(errordata[SEVERITY]));
-    item->summary = errordata[SUMMARY].toString();
-    item->message = errordata[MESSAGE].toString();
-    item->errorId = errordata[ERRORID].toString();
-    item->cwe = errordata[CWE].toInt();
-    item->hash = errordata[HASH].toULongLong();
-    item->inconclusive = errordata[INCONCLUSIVE].toBool();
-    item->file0 = errordata[FILE0].toString();
-    item->sinceDate = errordata[SINCEDATE].toString();
-    item->tags = errordata[TAGS].toString();
-    item->remark = errordata[REMARK].toString();
-    item->classification = error->parent()->child(error->row(), COLUMN_MISRA_CLASSIFICATION)->text();
-    item->guideline = error->parent()->child(error->row(), COLUMN_MISRA_GUIDELINE)->text();
-
-    if (error->rowCount() == 0) {
-        QErrorPathItem e;
-        e.file = stripPath(errordata[FILENAME].toString(), true);
-        e.line = errordata[LINE].toInt();
-        e.info = errordata[MESSAGE].toString();
-        item->errorPath << e;
-    }
-
-    for (int j = 0; j < error->rowCount(); j++) {
-        const QStandardItem *child_error = error->child(j, 0);
-        //Get error's user data
-        QVariant child_userdata = child_error->data();
-        //Convert it to QVariantMap
-        QVariantMap child_data = child_userdata.toMap();
-
-        QErrorPathItem e;
-        e.file = stripPath(child_data[FILENAME].toString(), true);
-        e.line = child_data[LINE].toInt();
-        e.info = child_data[MESSAGE].toString();
-        item->errorPath << e;
-    }
-}
-
 void ResultsTree::updateSettings(bool showFullPath,
                                  bool saveFullPath,
                                  bool saveAllErrors,
@@ -1406,12 +1197,16 @@ void ResultsTree::setCheckDirectory(const QString &dir)
     mCheckPath = dir;
 }
 
-
 const QString& ResultsTree::getCheckDirectory() const
 {
     return mCheckPath;
 }
 
+void ResultsTree::setResultsSource(ResultsSource source)
+{
+    mResultsSource = source;
+}
+
 QString ResultsTree::stripPath(const QString &path, bool saving) const
 {
     if ((!saving && mShowFullPath) || (saving && mSaveFullPath)) {
@@ -1422,60 +1217,38 @@ QString ResultsTree::stripPath(const QString &path, bool saving) const
     return dir.relativeFilePath(path);
 }
 
-void ResultsTree::refreshFilePaths(QStandardItem *item)
+void ResultsTree::refreshFilePaths(ResultItem *fileItem)
 {
-    if (!item) {
+    if (!fileItem)
         return;
-    }
 
-    //Mark that this file's path hasn't been updated yet
-    bool updated = false;
+    auto refreshItem = [this](ResultItem* item) {
+        item->setText(QDir::toNativeSeparators(stripPath(item->getErrorPathItem().file, false)));
+    };
+
+    refreshItem(fileItem);
 
     //Loop through all errors within this file
-    for (int i = 0; i < item->rowCount(); i++) {
+    for (int i = 0; i < fileItem->rowCount(); i++) {
         //Get error i
-        QStandardItem *error = item->child(i, 0);
+        auto *error = dynamic_cast<ResultItem*>(fileItem->child(i, COLUMN_FILE));
 
         if (!error) {
             continue;
         }
 
-        //Get error's user data and convert it to QVariantMap
-        QVariantMap userdata = error->data().toMap();
-
-        //Get list of files
-        QString file = userdata[FILENAME].toString();
-
         //Update this error's text
-        error->setText(stripPath(file, false));
-
-        //If this error has backtraces make sure the files list has enough filenames
-        if (error->hasChildren()) {
-            //Loop through all files within the error
-            for (int j = 0; j < error->rowCount(); j++) {
-                //Get file
-                QStandardItem *child = error->child(j, 0);
-                if (!child) {
-                    continue;
-                }
-                //Get child's user data
-                QVariant child_userdata = child->data();
-                //Convert it to QVariantMap
-                QVariantMap child_data = child_userdata.toMap();
+        refreshItem(error);
 
-                //Get list of files
-                QString child_files = child_data[FILENAME].toString();
+        //Loop through all files within the error
+        for (int j = 0; j < error->rowCount(); j++) {
+            //Get file
+            auto *child = dynamic_cast<ResultItem*>(error->child(j, COLUMN_FILE));
+            if (child) {
                 //Update file's path
-                child->setText(stripPath(child_files, false));
+                refreshItem(child);
             }
         }
-
-        //if the main file hasn't been updated yet, update it now
-        if (!updated) {
-            updated = true;
-            item->setText(error->text());
-        }
-
     }
 }
 
@@ -1484,8 +1257,8 @@ void ResultsTree::refreshFilePaths()
     qDebug("Refreshing file paths");
 
     //Go through all file items (these are parent items that contain the errors)
-    for (int i = 0; i < mModel.rowCount(); i++) {
-        refreshFilePaths(mModel.item(i, 0));
+    for (int row = 0; row < mModel->rowCount(); row++) {
+        refreshFilePaths(dynamic_cast<ResultItem*>(mModel->item(row, COLUMN_FILE)));
     }
 }
 
@@ -1496,12 +1269,12 @@ bool ResultsTree::hasVisibleResults() const
 
 bool ResultsTree::hasResults() const
 {
-    return mModel.rowCount() > 0;
+    return mModel->rowCount() > 0;
 }
 
 void ResultsTree::translate()
 {
-    mModel.setHorizontalHeaderLabels(getLabels());
+    mModel->setHorizontalHeaderLabels(getLabels());
     //TODO go through all the errors in the tree and translate severity and message
 }
 
@@ -1525,7 +1298,8 @@ void ResultsTree::showInconclusiveColumn(bool show)
 void ResultsTree::currentChanged(const QModelIndex &current, const QModelIndex &previous)
 {
     QTreeView::currentChanged(current, previous);
-    emit treeSelectionChanged(current);
+    const auto *item = dynamic_cast<ResultItem*>(mModel->itemFromIndex(current));
+    emit treeSelectionChanged(item);
 }
 
 bool ResultsTree::isCertReport() const {
@@ -1534,7 +1308,9 @@ bool ResultsTree::isCertReport() const {
 
 bool ResultsTree::isAutosarMisraReport() const {
     return mReportType == ReportType::autosar ||
-           mReportType == ReportType::misraC ||
+           mReportType == ReportType::misraC2012 ||
+           mReportType == ReportType::misraC2023 ||
+           mReportType == ReportType::misraC2025 ||
            mReportType == ReportType::misraCpp2008 ||
            mReportType == ReportType::misraCpp2023;
 }
diff --git a/gui/resultstree.h b/gui/resultstree.h
index 840d56f5abc..23fe5567ed9 100644
--- a/gui/resultstree.h
+++ b/gui/resultstree.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,13 +22,13 @@
 
 #include "showtypes.h"
 #include "checkers.h"
+#include "resultitem.h"
 
 #include <cstdint>
 #include <map>
 #include <string>
 
 #include <QObject>
-#include <QStandardItemModel>
 #include <QString>
 #include <QStringList>
 #include <QTreeView>
@@ -36,18 +36,17 @@
 class ApplicationList;
 class Report;
 class ErrorItem;
-class ErrorLine;
 class QModelIndex;
 class QWidget;
 class QItemSelectionModel;
 class ThreadHandler;
 class QSettings;
+class QStandardItemModel;
 enum class Severity : std::uint8_t;
 
 /// @addtogroup GUI
 /// @{
 
-
 /**
  * @brief Cppcheck's results are shown in this tree
  *
@@ -62,9 +61,9 @@ class ResultsTree : public QTreeView {
     /**
      * @brief Add a new item to the tree
      *
-     * @param item Error item data
+     * @param errorItem Error item data
      */
-    bool addErrorItem(const ErrorItem &item);
+    bool addErrorItem(const ErrorItem& errorItem);
 
     /**
      * @brief Clear all errors from the tree
@@ -139,6 +138,24 @@ class ResultsTree : public QTreeView {
 
     const QString& getCheckDirectory() const;
 
+    /**
+     * @brief Results source for analysis results in the results tree.
+     */
+    enum class ResultsSource : std::uint8_t {
+        /** Results from a project, files, or directory check */
+        Analysis,
+        /** Saved results from a log file */
+        Log,
+    };
+
+    /**
+     * @brief Set the source type of the current results. This
+     * affects the actions that are allowed on them.
+     *
+     * @param source The results source type.
+     */
+    void setResultsSource(ResultsSource source);
+
     /**
      * @brief Check if there are any visible results in view.
      * @return true if there is at least one visible warning/error.
@@ -185,10 +202,15 @@ class ResultsTree : public QTreeView {
      */
     ShowTypes mShowSeverities;
 
-    void keyPressEvent(QKeyEvent *event) override;
-
     void setReportType(ReportType reportType);
 
+    /**
+     * @brief should errorItem be hidden by filter/severity/etc?
+     * @param errorItem error item
+     * @return true if error item should be hidden
+     */
+    bool isErrorItemHidden(const QSharedPointer<ErrorItem>& errorItem) const;
+
 signals:
     /**
      * @brief Signal that results have been hidden or shown
@@ -208,11 +230,10 @@ class ResultsTree : public QTreeView {
 
     /**
      * @brief Signal for selection change in result tree.
-     *
-     * @param current Model index to specify new selected item.
+     * @param selectedItem item that was selected
      */
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
-    void treeSelectionChanged(const QModelIndex &current);
+    void treeSelectionChanged(const ResultItem *selectedItem);
 
     /** Suppress Ids */
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
@@ -313,9 +334,9 @@ protected slots:
 
     /**
      * @brief Hides/shows full file path on all error file items according to mShowFullPath
-     * @param item Parent item whose children's paths to change
+     * @param fileItem Parent item whose children's paths to change
      */
-    void refreshFilePaths(QStandardItem *item);
+    void refreshFilePaths(ResultItem *fileItem);
 
 
     /**
@@ -333,7 +354,7 @@ protected slots:
      * @param report Report that errors are saved to
      * @param fileItem Item whose errors to save
      */
-    void saveErrors(Report *report, const QStandardItem *fileItem) const;
+    void saveErrors(Report *report, const ResultItem *fileItem) const;
 
     /**
      * @brief Convert a severity string to a icon filename
@@ -349,15 +370,7 @@ protected slots:
      * @param application Index of the application to open with. Giving -1
      *  (default value) will open the default application.
      */
-    void startApplication(const QStandardItem *target, int application = -1);
-
-    /**
-     * @brief Helper function returning the filename/full path of the error tree item \a target.
-     *
-     * @param target The error tree item containing the filename/full path
-     * @param fullPath Whether or not to retrieve the full path or only the filename.
-     */
-    static QString getFilePath(const QStandardItem *target, bool fullPath);
+    void startApplication(const ResultItem *target, int application = -1);
 
     /**
      * @brief Context menu event (user right clicked on the tree)
@@ -370,17 +383,19 @@ protected slots:
      * @brief Add a new error item beneath a file or a backtrace item beneath an error
      *
      * @param parent Parent for the item. Either a file item or an error item
-     * @param item Error line data
+     * @param errorItem Error item
      * @param hide Should this be hidden (true) or shown (false)
      * @param icon Should a default backtrace item icon be added
-     * @param childOfMessage Is this a child element of a message?
-     * @return newly created QStandardItem *
+     * @param type type of items to create file/message/note
+     * @param errorPathIndex errorPathIndex
+     * @return newly created ResultItem *
      */
-    QStandardItem *addBacktraceFiles(QStandardItem *parent,
-                                     const ErrorLine &item,
-                                     bool hide,
-                                     const QString &icon,
-                                     bool childOfMessage);
+    ResultItem *addBacktraceFiles(ResultItem *parent,
+                                  const QSharedPointer<ErrorItem>& errorItem,
+                                  bool hide,
+                                  const QString &icon,
+                                  ResultItem::Type type,
+                                  int errorPathIndex);
 
     /**
      * @brief Convert Severity to translated string for GUI.
@@ -405,29 +420,50 @@ protected slots:
     /**
      * @brief Create new normal item.
      *
-     * Normal item has left alignment and text set also as tooltip.
-     * @param name name for the item
-     * @return new QStandardItem
+     * Normal item has left alignment.
+     * @param text text for the item
+     * @param errorItem errorItem pointer
+     * @param type (file/message)
+     * @param errorPathIndex error path index
+     * @return new ResultItem
      */
-    static QStandardItem *createNormalItem(const QString &name);
+    static ResultItem *createNormalItem(const QString &text, QSharedPointer<ErrorItem> errorItem, ResultItem::Type type, int errorPathIndex);
 
     /**
-     * @brief Create new normal item.
+     * @brief Create filename item.
      *
-     * Normal item has left alignment and text set also as tooltip.
+     * filename item has left alignment. Path is stripped and converted to native path separators.
+     * @param errorItem errorItem pointer
+     * @param type (file/message)
+     * @param errorPathIndex error path index
+     *
+     * @return new ResultItem
+     */
+    ResultItem *createFilenameItem(const QSharedPointer<ErrorItem>& errorItem, ResultItem::Type type, int errorPathIndex);
+
+    /**
+     * @brief Create new checkbox item.
+     *
+     * Checkbox item can be checked or unchecked.
      * @param checked checked
-     * @return new QStandardItem
+     * @param errorItem errorItem pointer
+     * @param type (file/message)
+     * @param errorPathIndex error path index
+     * @return new ResultItem
      */
-    static QStandardItem *createCheckboxItem(bool checked);
+    static ResultItem *createCheckboxItem(bool checked, QSharedPointer<ErrorItem> errorItem, ResultItem::Type type, int errorPathIndex);
 
     /**
      * @brief Create new line number item.
      *
-     * Line number item has right align and text set as tooltip.
-     * @param linenumber name for the item
-     * @return new QStandardItem
+     * Line number item has right align.
+     * @param linenumber line number
+     * @param errorItem errorItem pointer
+     * @param type (file/message)
+     * @param errorPathIndex error path index
+     * @return new ResultItem
      */
-    static QStandardItem *createLineNumberItem(const QString &linenumber);
+    static ResultItem *createLineNumberItem(int linenumber, QSharedPointer<ErrorItem> errorItem, ResultItem::Type type, int errorPathIndex);
 
     /**
      * @brief Finds a file item
@@ -435,24 +471,22 @@ protected slots:
      * @param name name of the file item to find
      * @return pointer to file item or null if none found
      */
-    QStandardItem *findFileItem(const QString &name) const;
-
+    ResultItem *findFileItem(const QString &name) const;
 
     /**
      * @brief Ensures there's a item in the model for the specified file
      *
-     * @param fullpath Full path to the file item.
-     * @param file0 Source file
+     * @param errorItem Error item
      * @param hide is the error (we want this file item for) hidden?
-     * @return QStandardItem to be used as a parent for all errors for specified file
+     * @return ResultItem to be used as a parent for all errors for specified file
      */
-    QStandardItem *ensureFileItem(const QString &fullpath, const QString &file0, bool hide);
+    ResultItem *ensureFileItem(const QSharedPointer<ErrorItem>& errorItem, bool hide);
 
     /**
      * @brief Item model for tree
      *
      */
-    QStandardItemModel mModel;
+    QStandardItemModel* mModel;
 
     /**
      * @brief Program settings
@@ -476,7 +510,7 @@ protected slots:
      * @brief Right clicked item (used by context menu slots)
      *
      */
-    QStandardItem* mContextItem{};
+    ResultItem* mContextItem{};
 
     /**
      * @brief Should full path of files be shown (true) or relative (false)
@@ -508,6 +542,12 @@ protected slots:
      */
     QString mCheckPath;
 
+    /**
+     * @brief The type of source of the current results
+     *
+     */
+    ResultsSource mResultsSource{ResultsSource::Analysis};
+
     /**
      * @brief Are there any visible errors
      *
@@ -515,18 +555,20 @@ protected slots:
     bool mVisibleErrors{};
 
 private:
+    void keyPressEvent(QKeyEvent *event) override;
+
     /** tag selected items */
     void tagSelectedItems(const QString &tag);
 
-    /** @brief Convert GUI error item into data error item */
-    void readErrorItem(const QStandardItem *error, ErrorItem *item) const;
-
     bool isCertReport() const;
 
     bool isAutosarMisraReport() const;
 
     QStringList mHiddenMessageId;
 
+    // List of existing errors so we can avoid duplicates
+    QStringList mErrorList;
+
     QItemSelectionModel* mSelectionModel{};
     ThreadHandler *mThread{};
 
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
index 6b3b497489d..d11cae35bc6 100644
--- a/gui/resultsview.cpp
+++ b/gui/resultsview.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -69,8 +69,6 @@
 #include <QTextDocument>
 #include <QTextEdit>
 #include <QTextStream>
-#include <QVariant>
-#include <QVariantMap>
 #include <Qt>
 
 enum class ReportType : std::uint8_t;
@@ -125,6 +123,7 @@ void ResultsView::clear(bool results)
     }
 
     mUI->mDetails->setText(QString());
+    mUI->mCode->clear();
 
     mStatistics->clear();
     delete mCheckSettings;
@@ -136,8 +135,6 @@ void ResultsView::clear(bool results)
     mUI->mProgress->setFormat("%p%");
 
     mUI->mLabelCriticalErrors->setVisible(false);
-
-    mSuccess = false;
 }
 
 void ResultsView::clear(const QString &filename)
@@ -159,7 +156,12 @@ void ResultsView::setReportType(ReportType reportType) {
     mUI->mTree->setReportType(reportType);
 }
 
-void ResultsView::progress(int value, const QString& description)
+void ResultsView::setResultsSource(ResultsTree::ResultsSource source)
+{
+    mUI->mTree->setResultsSource(source);
+}
+
+void ResultsView::filesCheckedProgress(int value, const QString& description)
 {
     mUI->mProgress->setValue(value);
     mUI->mProgress->setFormat(QString("%p% (%1)").arg(description));
@@ -316,7 +318,6 @@ void ResultsView::setCheckSettings(const Settings &settings)
 
 void ResultsView::checkingStarted(int count)
 {
-    mSuccess = true;
     mUI->mProgress->setVisible(true);
     mUI->mProgress->setMaximum(PROGRESS_MAX);
     mUI->mProgress->setValue(0);
@@ -344,7 +345,7 @@ void ResultsView::checkingFinished()
         //Tell user that we found no errors
         if (!hasResults()) {
             QMessageBox msg(QMessageBox::Information,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             tr("No errors found."),
                             QMessageBox::Ok,
                             this);
@@ -355,7 +356,7 @@ void ResultsView::checkingFinished()
             QString text = tr("Errors were found, but they are configured to be hidden.\n" \
                               "To toggle what kind of errors are shown, open view menu.");
             QMessageBox msg(QMessageBox::Information,
-                            tr("Cppcheck"),
+                            "Cppcheck",
                             text,
                             QMessageBox::Ok,
                             this);
@@ -389,15 +390,8 @@ void ResultsView::translate()
     mUI->mTree->translate();
 }
 
-void ResultsView::disableProgressbar()
-{
-    mUI->mProgress->setEnabled(false);
-}
-
 void ResultsView::readErrorsXml(const QString &filename)
 {
-    mSuccess = false; // Don't know if results come from an aborted analysis
-
     const int version = XmlReport::determineVersion(filename);
     if (version == 0) {
         QMessageBox msgBox;
@@ -425,7 +419,7 @@ void ResultsView::readErrorsXml(const QString &filename)
         msgBox.exec();
     }
 
-    for (const ErrorItem& item : errors) {
+    for (const ErrorItem& item : utils::as_const(errors)) {
         handleCriticalError(item);
         mUI->mTree->addErrorItem(item);
     }
@@ -440,54 +434,42 @@ void ResultsView::readErrorsXml(const QString &filename)
     mUI->mTree->setCheckDirectory(dir);
 }
 
-void ResultsView::updateDetails(const QModelIndex &index)
+void ResultsView::updateDetails(const ResultItem* item)
 {
-    const auto *model = qobject_cast<const QStandardItemModel*>(mUI->mTree->model());
-    QStandardItem *item = model->itemFromIndex(index);
-
-    if (!item) {
+    if (!item || !item->errorItem) {
         mUI->mCode->clear();
         mUI->mDetails->setText(QString());
         return;
     }
 
-    // Make sure we are working with the first column
-    if (item->parent() && item->column() != 0)
-        item = item->parent()->child(item->row(), 0);
-
-    QVariantMap itemdata = item->data().toMap();
-
-    // If there is no severity data then it is a parent item without summary and message
-    if (!itemdata.contains("severity")) {
+    // File item => No details can be shown
+    if (item->getType() == ResultItem::Type::file) {
         mUI->mCode->clear();
         mUI->mDetails->setText(QString());
         return;
     }
 
-    const QString message = itemdata["message"].toString();
-    QString formattedMsg = message;
+    QString formattedMsg = item->errorItem->message;
 
-    const QString file0 = itemdata["file0"].toString();
-    if (!file0.isEmpty() && Path::isHeader(itemdata["file"].toString().toStdString()))
+    const QString file0 = item->errorItem->file0;
+    if (!file0.isEmpty() && Path::isHeader(item->getErrorPathItem().file.toStdString()))
         formattedMsg += QString("\n\n%1: %2").arg(tr("First included by")).arg(QDir::toNativeSeparators(file0));
 
-    if (itemdata["cwe"].toInt() > 0)
-        formattedMsg.prepend("CWE: " + QString::number(itemdata["cwe"].toInt()) + "\n");
+    if (item->errorItem->cwe > 0)
+        formattedMsg.prepend("CWE: " + QString::number(item->errorItem->cwe) + "\n");
     if (mUI->mTree->showIdColumn())
-        formattedMsg.prepend(tr("Id") + ": " + itemdata["id"].toString() + "\n");
-    if (itemdata["incomplete"].toBool())
-        formattedMsg += "\n" + tr("Bug hunting analysis is incomplete");
+        formattedMsg.prepend(tr("Id") + ": " + item->errorItem->errorId + "\n");
     mUI->mDetails->setText(formattedMsg);
 
-    const int lineNumber = itemdata["line"].toInt();
+    const int lineNumber = item->getErrorPathItem().line;
 
-    QString filepath = itemdata["file"].toString();
+    QString filepath = item->getErrorPathItem().file;
     if (!QFileInfo::exists(filepath) && QFileInfo::exists(mUI->mTree->getCheckDirectory() + '/' + filepath))
         filepath = mUI->mTree->getCheckDirectory() + '/' + filepath;
 
     QStringList symbols;
-    if (itemdata.contains("symbolNames"))
-        symbols = itemdata["symbolNames"].toString().split("\n");
+    if (!item->errorItem->symbolNames.isEmpty())
+        symbols = item->errorItem->symbolNames.split("\n");
 
     if (filepath == mUI->mCode->getFileName()) {
         mUI->mCode->setError(lineNumber, symbols);
@@ -536,6 +518,7 @@ void ResultsView::logCopyComplete()
         const QListWidgetItem * item = mUI->mListLog->item(i);
         if (nullptr != item) {
             logText += item->text();
+            logText += "\n";
         }
     }
     QClipboard *clipboard = QApplication::clipboard();
@@ -559,7 +542,6 @@ void ResultsView::on_mListLog_customContextMenuRequested(const QPoint &pos)
 
 void ResultsView::stopAnalysis()
 {
-    mSuccess = false;
     mUI->mLabelCriticalErrors->setText(tr("Analysis was stopped"));
     mUI->mLabelCriticalErrors->setVisible(true);
 }
@@ -582,10 +564,5 @@ void ResultsView::handleCriticalError(const ErrorItem &item)
         msg += ". " + tr("Analysis was aborted.");
         mUI->mLabelCriticalErrors->setText(msg);
         mUI->mLabelCriticalErrors->setVisible(true);
-        mSuccess = false;
     }
 }
-
-bool ResultsView::isSuccess() const {
-    return mSuccess;
-}
diff --git a/gui/resultsview.h b/gui/resultsview.h
index 18168b8a5ce..9ef74666395 100644
--- a/gui/resultsview.h
+++ b/gui/resultsview.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,8 +21,11 @@
 #define RESULTSVIEW_H
 
 #include "report.h"
+#include "resultstree.h"
 #include "showtypes.h"
 
+#include <cstdint>
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
@@ -32,11 +35,11 @@ class ErrorItem;
 class Settings;
 class ApplicationList;
 class ThreadHandler;
-class QModelIndex;
 class QPrinter;
 class QSettings;
 class CheckStatistics;
 class QPoint;
+class ResultItem;
 enum class ReportType : std::uint8_t;
 namespace Ui {
     class ResultsView;
@@ -195,8 +198,6 @@ class ResultsView : public QWidget {
      */
     bool isSuccess() const;
 
-    void disableProgressbar();
-
     /**
      * @brief Read errors from report XML file.
      * @param filename Report file to read.
@@ -220,6 +221,13 @@ class ResultsView : public QWidget {
 
     void setReportType(ReportType reportType);
 
+    /**
+     * @brief Set the results source type for the results tree.
+     *
+     * @param source The results source type.
+     */
+    void setResultsSource(ResultsTree::ResultsSource source);
+
 signals:
 
     /**
@@ -299,7 +307,7 @@ public slots:
      * @param value Current progress value
      * @param description Description to accompany the progress
      */
-    void progress(int value, const QString& description);
+    void filesCheckedProgress(int value, const QString& description);
 
     /**
      * @brief Slot for new error to be displayed
@@ -316,9 +324,9 @@ public slots:
     /**
      * @brief Update detailed message when selected item is changed.
      *
-     * @param index Position of new selected item.
+     * @param item selected item
      */
-    void updateDetails(const QModelIndex &index);
+    void updateDetails(const ResultItem* item);
 
     /**
      * @brief Slot opening a print dialog to print the current report
@@ -380,11 +388,6 @@ public slots:
 
     Settings* mCheckSettings = nullptr;
 
-    /**
-     * Set to true when checking finish successfully. Set to false whenever analysis starts.
-     */
-    bool mSuccess = false;
-
     /** Critical error ids */
     QString mCriticalErrors;
 
diff --git a/gui/settings.ui b/gui/settings.ui
index 3ead9bad07d..6db6ec70809 100644
--- a/gui/settings.ui
+++ b/gui/settings.ui
@@ -65,15 +65,9 @@
              <height>20</height>
             </size>
            </property>
-           <property name="inputMask">
-            <string notr="true">009</string>
-           </property>
            <property name="text">
             <string notr="true"/>
            </property>
-           <property name="maxLength">
-            <number>3</number>
-           </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
@@ -82,12 +76,12 @@
          <item>
           <widget class="QLabel" name="label_3">
            <property name="text">
-            <string>Ideal count:</string>
+            <string>Max count:</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="mLblIdealThreads">
+          <widget class="QLabel" name="mLblMaxThreads">
            <property name="text">
             <string notr="true">TextLabel</string>
            </property>
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index e377c1e5cf2..f53069a00ec 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -63,7 +63,10 @@ SettingsDialog::SettingsDialog(ApplicationList *list,
     QSettings settings;
     mTempApplications->copy(list);
 
+    int maxjobs = QThread::idealThreadCount();
+
     mUI->mJobs->setText(settings.value(SETTINGS_CHECK_THREADS, 1).toString());
+    mUI->mJobs->setValidator(new QIntValidator(1, maxjobs, this));
     mUI->mForce->setCheckState(boolToCheckState(settings.value(SETTINGS_CHECK_FORCE, false).toBool()));
     mUI->mShowFullPath->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_FULL_PATH, false).toBool()));
     mUI->mShowNoErrorsMessage->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_NO_ERRORS, false).toBool()));
@@ -119,11 +122,7 @@ SettingsDialog::SettingsDialog(ApplicationList *list,
     mUI->mListWidget->setSortingEnabled(false);
     populateApplicationList();
 
-    const int count = QThread::idealThreadCount();
-    if (count != -1)
-        mUI->mLblIdealThreads->setText(QString::number(count));
-    else
-        mUI->mLblIdealThreads->setText(tr("N/A"));
+    mUI->mLblMaxThreads->setText(QString::number(maxjobs));
 
     loadSettings();
     initTranslationsList();
@@ -179,13 +178,9 @@ void SettingsDialog::saveSettings() const
 
 void SettingsDialog::saveSettingValues() const
 {
-    int jobs = mUI->mJobs->text().toInt();
-    if (jobs <= 0) {
-        jobs = 1;
-    }
-
     QSettings settings;
-    settings.setValue(SETTINGS_CHECK_THREADS, jobs);
+    if (mUI->mJobs->hasAcceptableInput())
+        settings.setValue(SETTINGS_CHECK_THREADS, mUI->mJobs->text().toInt());
     saveCheckboxValue(&settings, mUI->mForce, SETTINGS_CHECK_FORCE);
     saveCheckboxValue(&settings, mUI->mSaveAllErrors, SETTINGS_SAVE_ALL_ERRORS);
     saveCheckboxValue(&settings, mUI->mSaveFullPath, SETTINGS_SAVE_FULL_PATH);
diff --git a/gui/showtypes.cpp b/gui/showtypes.cpp
index fc8afc5050a..f1c0d325257 100644
--- a/gui/showtypes.cpp
+++ b/gui/showtypes.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -56,42 +56,6 @@ ShowTypes::ShowType ShowTypes::SeverityToShowType(Severity severity)
     }
 }
 
-Severity ShowTypes::ShowTypeToSeverity(ShowTypes::ShowType type)
-{
-    switch (type) {
-    case ShowTypes::ShowStyle:
-        return Severity::style;
-
-    case ShowTypes::ShowErrors:
-        return Severity::error;
-
-    case ShowTypes::ShowWarnings:
-        return Severity::warning;
-
-    case ShowTypes::ShowPerformance:
-        return Severity::performance;
-
-    case ShowTypes::ShowPortability:
-        return Severity::portability;
-
-    case ShowTypes::ShowInformation:
-        return Severity::information;
-
-    case ShowTypes::ShowNone:
-    default:
-        return Severity::none;
-    }
-}
-
-ShowTypes::ShowType ShowTypes::VariantToShowType(const QVariant &data)
-{
-    const int value = data.toInt();
-    if (value < ShowTypes::ShowStyle || value > ShowTypes::ShowErrors) {
-        return ShowTypes::ShowNone;
-    }
-    return static_cast<ShowTypes::ShowType>(value);
-}
-
 void ShowTypes::load()
 {
     QSettings settings;
diff --git a/gui/showtypes.h b/gui/showtypes.h
index 0627436075b..5bb43203dd7 100644
--- a/gui/showtypes.h
+++ b/gui/showtypes.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -21,8 +21,6 @@
 
 #include <cstdint>
 
-#include <QVariant>
-
 enum class Severity : std::uint8_t;
 
 /// @addtogroup GUI
@@ -103,21 +101,6 @@ class ShowTypes {
      */
     static ShowTypes::ShowType SeverityToShowType(Severity severity);
 
-    /**
-     * @brief Convert ShowType to severity string
-     * @param type ShowType to convert
-     * @return ShowType converted to severity
-     */
-    static Severity ShowTypeToSeverity(ShowTypes::ShowType type);
-
-    /**
-     * @brief Convert QVariant (that contains an int) to Showtypes value
-     *
-     * @param data QVariant (that contains an int) to be converted
-     * @return data converted to ShowTypes
-     */
-    static ShowTypes::ShowType VariantToShowType(const QVariant &data);
-
     bool mVisible[ShowNone];
 };
 
diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
index e9580f9ffea..bf46abcb2d4 100644
--- a/gui/statsdialog.cpp
+++ b/gui/statsdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -63,10 +63,6 @@
 #include <QTextStream>
 #include <QValueAxis>
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-QT_CHARTS_USE_NAMESPACE
-#endif
-
 static QLineSeries *numberOfReports(const QString &fileName, const QString &severity);
 static QChartView *createChart(const QString &statsFile, const QString &tool);
 #endif
@@ -117,6 +113,7 @@ void StatsDialog::setProject(const ProjectFile* projectFile)
         if (!statsFile.isEmpty()) {
             QChartView *chartView = createChart(statsFile, "cppcheck");
             mUI->mTabHistory->layout()->addWidget(chartView);
+            // cppcheck-suppress knownConditionTrueFalse - TODO in getClangAnalyzer()
             if (projectFile->getClangAnalyzer()) {
                 chartView = createChart(statsFile, CLANG_ANALYZER);
                 mUI->mTabHistory->layout()->addWidget(chartView);
diff --git a/gui/test/cppchecklibrarydata/CMakeLists.txt b/gui/test/cppchecklibrarydata/CMakeLists.txt
index 8a508c45ba0..ea8f2b95097 100644
--- a/gui/test/cppchecklibrarydata/CMakeLists.txt
+++ b/gui/test/cppchecklibrarydata/CMakeLists.txt
@@ -13,12 +13,8 @@ target_compile_definitions(test-cppchecklibrarydata PRIVATE SRCDIR="${CMAKE_CURR
 target_link_libraries(test-cppchecklibrarydata ${QT_CORE_LIB} ${QT_TEST_LIB})
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(QT_VERSION VERSION_LESS "6.0.0")
-        # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-        target_compile_options_safe(test-cppchecklibrarydata -Wno-extra-semi-stmt)
-    endif()
-    if(QT_VERSION VERSION_EQUAL "6.9.0")
-        # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
         target_compile_options_safe(test-cppchecklibrarydata -Wno-ctad-maybe-unsupported)
     endif()
 endif()
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
index 203bd044882..c747f1b5093 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
@@ -26,6 +26,9 @@
 #include <QStringList>
 #include <QTextStream>
 #include <QtTest>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtLogging>
+#endif
 
 const QString TestCppcheckLibraryData::TempCfgFile = "./tmp.cfg";
 
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
index 15f79b67c7e..625ad4046a9 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
@@ -48,9 +48,13 @@ private slots:
     static void loadCfgFile(const QString &filename, CppcheckLibraryData &data, QString &res, bool removeFile = false);
     static void saveCfgFile(const QString &filename, CppcheckLibraryData &data);
 
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     CppcheckLibraryData libraryData;
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     CppcheckLibraryData fileLibraryData;
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     QString result;
 
+    // cppcheck-suppress naming-privateMemberVariable - TODO: fix this
     static const QString TempCfgFile;
 };
diff --git a/gui/test/filelist/CMakeLists.txt b/gui/test/filelist/CMakeLists.txt
index 8710fd949bb..4af40a1c876 100644
--- a/gui/test/filelist/CMakeLists.txt
+++ b/gui/test/filelist/CMakeLists.txt
@@ -5,23 +5,14 @@ add_executable(test-filelist
         ${test-filelist_SRC}
         testfilelist.cpp
         ${CMAKE_SOURCE_DIR}/gui/filelist.cpp
-        ${CMAKE_SOURCE_DIR}/lib/pathmatch.cpp
-        ${CMAKE_SOURCE_DIR}/lib/path.cpp
-        ${CMAKE_SOURCE_DIR}/lib/utils.cpp
-        $<TARGET_OBJECTS:simplecpp_objs>
         )
-target_include_directories(test-filelist PRIVATE ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/lib)
-target_externals_include_directories(test-filelist PRIVATE ${CMAKE_SOURCE_DIR}/externals/simplecpp)
+target_include_directories(test-filelist PRIVATE ${CMAKE_SOURCE_DIR}/gui)
 target_compile_definitions(test-filelist PRIVATE SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
-target_link_libraries(test-filelist ${QT_CORE_LIB} ${QT_TEST_LIB})
+target_link_libraries(test-filelist ${QT_CORE_LIB} ${QT_TEST_LIB} cppcheck-core simplecpp)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(QT_VERSION VERSION_LESS "6.0.0")
-        # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-        target_compile_options_safe(test-filelist -Wno-extra-semi-stmt)
-    endif()
-    if(QT_VERSION VERSION_EQUAL "6.9.0")
-        # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
         target_compile_options_safe(test-filelist -Wno-ctad-maybe-unsupported)
     endif()
 endif()
@@ -30,4 +21,4 @@ if (REGISTER_GUI_TESTS)
     add_test(NAME test-filelist COMMAND $<TARGET_FILE:test-filelist>)
 endif()
 
-add_dependencies(gui-tests test-filelist)
\ No newline at end of file
+add_dependencies(gui-tests test-filelist)
diff --git a/gui/test/projectfile/CMakeLists.txt b/gui/test/projectfile/CMakeLists.txt
index 95609df4483..f9bab8ba0c7 100644
--- a/gui/test/projectfile/CMakeLists.txt
+++ b/gui/test/projectfile/CMakeLists.txt
@@ -4,6 +4,7 @@ add_dependencies(gui-build-deps build-projectfile-deps)
 add_executable(test-projectfile
         ${test-projectfile_SRC}
         testprojectfile.cpp
+        ${CMAKE_SOURCE_DIR}/gui/common.cpp
         ${CMAKE_SOURCE_DIR}/gui/projectfile.cpp
         )
 target_include_directories(test-projectfile PRIVATE ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/lib)
@@ -11,12 +12,8 @@ target_compile_definitions(test-projectfile PRIVATE SRCDIR="${CMAKE_CURRENT_SOUR
 target_link_libraries(test-projectfile ${QT_CORE_LIB} ${QT_TEST_LIB})
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(QT_VERSION VERSION_LESS "6.0.0")
-        # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-        target_compile_options_safe(test-projectfile -Wno-extra-semi-stmt)
-    endif()
-    if(QT_VERSION VERSION_EQUAL "6.9.0")
-        # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
         target_compile_options_safe(test-projectfile -Wno-ctad-maybe-unsupported)
     endif()
 endif()
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index 43bf382d629..1a66bd8de23 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,14 +18,16 @@
 
 #include "testprojectfile.h"
 
-#include "importproject.h"
+#include "addoninfo.h"
 #include "library.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "settings.h"
 #include "suppressions.h"
 
-#include <string>
+#ifdef HAVE_RULES
+#include "rule.h"
+#endif
 
 #include <QFile>
 #include <QIODevice>
@@ -41,13 +43,11 @@ const char Settings::SafeChecks::XmlExternalFunctions[] = "external-functions";
 const char Settings::SafeChecks::XmlInternalFunctions[] = "internal-functions";
 const char Settings::SafeChecks::XmlExternalVariables[] = "external-variables";
 Settings::Settings() : maxCtuDepth(10) {}
+Settings::~Settings() = default;
 Platform::Platform() = default;
 Library::Library() = default;
 Library::~Library() = default;
 struct Library::LibraryData {};
-bool ImportProject::sourceFileExists(const std::string & /*file*/) {
-    return true;
-}
 
 void TestProjectFile::loadInexisting() const
 {
@@ -142,6 +142,24 @@ void TestProjectFile::getAddonFilePath() const
     QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), filepath), filepath);
 }
 
+void TestProjectFile::getSearchPaths() const
+{
+#ifdef FILESDIR
+    const QString f(FILESDIR "\n"        // example: "/usr/local/share/cppcheck\n"
+                    FILESDIR "/dir\n");  // example: "/usr/local/share/cppcheck/dir\n"
+#else
+    const QString f;
+#endif
+
+    QCOMPARE(ProjectFile::getSearchPaths("projectPath", "appPath", "datadir", "dir").join("\n"),
+             "appPath\n"
+             "appPath/dir\n"
+             "projectPath\n" +
+             f +
+             "datadir\n"
+             "datadir/dir");
+}
+
 void TestProjectFile::getInlineSuppressionDefaultValue() const
 {
     ProjectFile projectFile;
@@ -187,5 +205,54 @@ void TestProjectFile::getCheckingSuppressionsStar() const
     QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "*.cpp");
 }
 
+void TestProjectFile::emptyUserInclude() const
+{
+    ProjectFile projectFile;
+    Settings settings;
+    projectFile.setUserInclude("   ");
+    projectFile.setSettingsUserIncludes(settings);
+    QCOMPARE(settings.userIncludes.size(), 0);
+}
+
+// Absolute path is made relative when it does not require walking up more than 3 parent folders
+void TestProjectFile::getRelativePathRelative() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/some/path/externals/foo.cpp"), QString("../externals/foo.cpp"));
+}
+
+// Absolute path is made relative even when it requires walking up 2 parent folders
+void TestProjectFile::getRelativePathTwoUp() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/some/externals/foo.cpp"), QString("../../externals/foo.cpp"));
+}
+
+// Absolute path is kept as-is when making it relative would require walking up more than 3 parent folders
+void TestProjectFile::getRelativePathTooFarUp() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/other/deep/foo.cpp"), QString("/other/deep/foo.cpp"));
+}
+
+// Absolute path in a subfolder of the project path is made relative without walking up at all
+void TestProjectFile::getRelativePathSubfolder() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/some/path/sub/src/file1.c"), QString("src/file1.c"));
+}
+
+// Absolute path is kept as-is when it is shorter than the relative path, even if it does not require walking up 3 or more parent folders
+void TestProjectFile::getRelativePathAbsoluteShorter() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/ab/path/sub/123.cppcheck");
+    QCOMPARE(projectFile.getRelativePath("/ab/foo.cpp"), QString("/ab/foo.cpp"));
+}
+
 QTEST_MAIN(TestProjectFile)
 
diff --git a/gui/test/projectfile/testprojectfile.h b/gui/test/projectfile/testprojectfile.h
index 8f3e54c3008..7203980eb7c 100644
--- a/gui/test/projectfile/testprojectfile.h
+++ b/gui/test/projectfile/testprojectfile.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -28,6 +28,7 @@ private slots:
     void loadSimpleNoroot() const;
 
     void getAddonFilePath() const;
+    void getSearchPaths() const;
 
     void getInlineSuppressionDefaultValue() const;
     void getInlineSuppression() const;
@@ -35,4 +36,12 @@ private slots:
     void getCheckingSuppressionsRelative() const;
     void getCheckingSuppressionsAbsolute() const;
     void getCheckingSuppressionsStar() const;
+
+    void emptyUserInclude() const;
+
+    void getRelativePathRelative() const;
+    void getRelativePathTwoUp() const;
+    void getRelativePathTooFarUp() const;
+    void getRelativePathSubfolder() const;
+    void getRelativePathAbsoluteShorter() const;
 };
diff --git a/gui/test/resultstree/CMakeLists.txt b/gui/test/resultstree/CMakeLists.txt
index 5348f460af7..a48b137e349 100644
--- a/gui/test/resultstree/CMakeLists.txt
+++ b/gui/test/resultstree/CMakeLists.txt
@@ -1,54 +1,52 @@
 qt_wrap_cpp(test-resultstree_SRC
         testresultstree.h
         ${CMAKE_SOURCE_DIR}/gui/resultstree.h
+        ${CMAKE_SOURCE_DIR}/gui/resultitem.h
         ${CMAKE_SOURCE_DIR}/gui/applicationlist.h
+        ${CMAKE_SOURCE_DIR}/gui/common.h
         ${CMAKE_SOURCE_DIR}/gui/projectfile.h
         ${CMAKE_SOURCE_DIR}/gui/threadhandler.h
         ${CMAKE_SOURCE_DIR}/gui/threadresult.h
 )
-if(USE_BUNDLED_TINYXML2)
-    list(APPEND test-resultstree_SRC $<TARGET_OBJECTS:tinyxml2_objs>)
-endif()
-list(APPEND test-resultstree_SRC $<TARGET_OBJECTS:simplecpp_objs> $<TARGET_OBJECTS:cppcheck-core>)
 add_custom_target(build-resultstree-deps SOURCES ${test-resultstree_SRC})
 add_dependencies(gui-build-deps build-resultstree-deps)
 add_executable(test-resultstree
         ${test-resultstree_SRC}
         testresultstree.cpp
         ${CMAKE_SOURCE_DIR}/gui/resultstree.cpp
+        ${CMAKE_SOURCE_DIR}/gui/resultitem.cpp
+        ${CMAKE_SOURCE_DIR}/gui/common.cpp
         ${CMAKE_SOURCE_DIR}/gui/erroritem.cpp
         ${CMAKE_SOURCE_DIR}/gui/showtypes.cpp
         ${CMAKE_SOURCE_DIR}/gui/report.cpp
         ${CMAKE_SOURCE_DIR}/gui/xmlreportv2.cpp
         )
-target_include_directories(test-resultstree PRIVATE ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/lib)
-target_externals_include_directories(test-resultstree PRIVATE ${CMAKE_SOURCE_DIR}/externals/simplecpp)
-if(USE_BUNDLED_TINYXML2)
-    target_externals_include_directories(test-resultstree PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-else()
-    target_include_directories(test-resultstree SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-endif()
+target_include_directories(test-resultstree PRIVATE ${CMAKE_SOURCE_DIR}/gui)
+target_link_libraries(test-resultstree cppcheck-core simplecpp tinyxml2)
 if (HAVE_RULES)
     target_link_libraries(test-resultstree ${PCRE_LIBRARY})
     target_include_directories(test-resultstree SYSTEM PRIVATE ${PCRE_INCLUDE})
 endif()
 target_compile_definitions(test-resultstree PRIVATE SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
 target_link_libraries(test-resultstree ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_TEST_LIB})
-if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-    target_link_libraries(test-resultstree ${tinyxml2_LIBRARIES})
-endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(QT_VERSION VERSION_LESS "6.0.0")
-        # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-        target_compile_options_safe(test-resultstree -Wno-extra-semi-stmt)
-    endif()
-    if(QT_VERSION VERSION_EQUAL "6.9.0")
-        # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
         target_compile_options_safe(test-resultstree -Wno-ctad-maybe-unsupported)
     endif()
     # caused by mocks
     target_compile_options_safe(test-resultstree -Wno-missing-noreturn)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    # caused by mocs
+    target_compile_options_safe(test-resultstree -Wno-useless-cast)
+    # caused by mocks
+    target_compile_options_safe(test-resultstree -Wno-suggest-attribute=noreturn)
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    # caused by mocks
+    target_compile_options_safe(test-resultstree -Wno-suggest-attribute=noreturn)
 endif()
 
 if (REGISTER_GUI_TESTS)
diff --git a/gui/test/resultstree/testresultstree.cpp b/gui/test/resultstree/testresultstree.cpp
index 8c92da7db8c..921abd69ff0 100644
--- a/gui/test/resultstree/testresultstree.cpp
+++ b/gui/test/resultstree/testresultstree.cpp
@@ -22,7 +22,7 @@
 
 // headers that declare mocked functions/variables
 #include "applicationlist.h"
-#include "common.h"
+#include "filesettings.h"
 #include "projectfile.h"
 #include "threadhandler.h"
 #include "threadresult.h"
@@ -33,6 +33,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "report.h"
+#include "resultitem.h"
 #include "showtypes.h"
 #include "suppressions.h"
 #include "xmlreport.h"
@@ -41,6 +42,7 @@
 #include <string>
 #include <utility>
 
+#include <QList>
 #include <QModelIndex>
 #include <QString>
 #include <QtTest>
@@ -90,16 +92,20 @@ void ThreadHandler::stop() {
 void ThreadHandler::threadDone() {
     throw 1;
 }
+// NOLINTBEGIN(performance-unnecessary-value-param)
+void ThreadHandler::startCheck(CheckThread::Details /*unused*/) {
+    throw 1;
+}
+void ThreadHandler::finishCheck(CheckThread::Details /*unused*/) {
+    throw 1;
+}
+// NOLINTEND(performance-unnecessary-value-param)
 Application& ApplicationList::getApplication(const int /*unused*/) {
     throw 1;
 }
 const Application& ApplicationList::getApplication(const int index) const {
     return mApplications.at(index);
 }
-QString getPath(const QString &type) {
-    return "/" + type;
-}
-void setPath(const QString & /*unused*/, const QString & /*unused*/) {}
 QString XmlReport::quoteMessage(const QString &message) {
     return message;
 }
@@ -107,7 +113,8 @@ QString XmlReport::unquoteMessage(const QString &message) {
     return message;
 }
 XmlReport::XmlReport(const QString& filename) : Report(filename) {}
-void ThreadResult::fileChecked(const QString & /*unused*/) {
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadResult::finishCheck(CheckThread::Details /*unused*/) {
     throw 1;
 }
 void ThreadResult::reportOut(const std::string & /*unused*/, Color /*unused*/) {
@@ -116,6 +123,9 @@ void ThreadResult::reportOut(const std::string & /*unused*/, Color /*unused*/) {
 void ThreadResult::reportErr(const ErrorMessage & /*unused*/) {
     throw 1;
 }
+void ThreadResult::reportProgress(const std::string &/*filename*/, const char /*stage*/[], const std::size_t /*value*/) {
+    throw 1;
+}
 
 // Test...
 
@@ -133,6 +143,128 @@ void TestResultsTree::test1() const
     QCOMPARE(tree.isRowHidden(0,QModelIndex()), false); // Show item
 }
 
+void TestResultsTree::duplicateResults() const
+{
+    // #14359 - filter out duplicate warnings
+    ResultsTree tree(nullptr);
+
+    ErrorItem errorItem;
+    errorItem.summary = errorItem.message = "test";
+    errorItem.severity = Severity::error;
+    errorItem.errorPath << QErrorPathItem();
+    QVERIFY(tree.addErrorItem(errorItem));
+    QVERIFY(!tree.addErrorItem(errorItem));
+}
+
+static QErrorPathItem createErrorPathItem(QString file, int line, int column, QString info) {
+    QErrorPathItem ret;
+    ret.file = std::move(file);
+    ret.line = line;
+    ret.column = column;
+    ret.info = std::move(info);
+    return ret;
+}
+
+static ErrorItem createErrorItem(const QString& file, int line, Severity sev, const QString& message, QString id) {
+    ErrorItem ret;
+    ret.errorId = std::move(id);
+    ret.severity = sev;
+    ret.cwe = ret.hash = 0;
+    ret.file0 = file;
+    ret.inconclusive = false;
+    ret.message = ret.summary = message;
+    ret.errorPath << createErrorPathItem(file, line, 1, message);
+    return ret;
+}
+
+void TestResultsTree::multiLineResult() const
+{
+    // Create tree with 1 multiline message
+    ResultsTree tree(nullptr);
+    ErrorItem errorItem = createErrorItem("file1.c", 10, Severity::style, "test", "bugId");
+    errorItem.errorPath << createErrorPathItem("file2.c", 23, 2, "abc");
+    tree.addErrorItem(errorItem);
+
+    // Verify model
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    QVERIFY(model->rowCount() == 1);
+
+    // Verify file item
+    const ResultItem* fileItem = dynamic_cast<ResultItem*>(model->item(0,0));
+    QVERIFY(fileItem != nullptr);
+    QCOMPARE(fileItem->getType(), ResultItem::Type::file);
+    QCOMPARE(fileItem->text(), "file2.c");
+    QCOMPARE(fileItem->getErrorPathItem().file, "file2.c");
+    QVERIFY(fileItem->rowCount() == 1);
+
+    // Verify message item
+    const ResultItem* res = dynamic_cast<ResultItem*>(fileItem->child(0,0));
+    QVERIFY(res != nullptr);
+    QCOMPARE(res->text(), "file2.c");
+    QVERIFY(res->errorItem != nullptr);
+    QCOMPARE(res->errorItem->toString(),
+             "file2.c:23:2:style: test [bugId]\n"
+             "file1.c:10:1:note: test\n"
+             "file2.c:23:2:note: abc");
+    QCOMPARE(res->getErrorPathItem().file, "file2.c");
+    QVERIFY(res->rowCount() == 2);
+    QVERIFY(res->columnCount() > 5);
+    // Verify both notes
+    for (int row = 0; row < 2; ++row) {
+        for (int col = 0; col < res->columnCount(); ++col) {
+            const ResultItem* item = dynamic_cast<ResultItem*>(res->child(row,col));
+            QVERIFY(item);
+            QCOMPARE(item->errorItem.get(), res->errorItem.get());
+            QCOMPARE(item->getType(), ResultItem::Type::note);
+            QCOMPARE(item->getErrorPathItem().file, row == 0 ? "file1.c" : "file2.c");
+        }
+    }
+}
+
+void TestResultsTree::resultsInSameFile() const
+{
+    ResultsTree tree(nullptr);
+    tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "test", "bugId"));
+    tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "test", "bugId"));
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    QVERIFY(model->rowCount() == 1);
+
+    const ResultItem* fileItem = dynamic_cast<ResultItem*>(model->item(0,0));
+    QVERIFY(fileItem != nullptr);
+    QCOMPARE(fileItem->getType(), ResultItem::Type::file);
+    QCOMPARE(fileItem->text(), "file1.c");
+    QCOMPARE(fileItem->getErrorPathItem().file, "file1.c");
+    QVERIFY(fileItem->rowCount() == 2);
+
+    const ResultItem* res1 = dynamic_cast<ResultItem*>(fileItem->child(0,0));
+    QVERIFY(res1 != nullptr);
+    QCOMPARE(res1->text(), "file1.c");
+    QVERIFY(res1->errorItem != nullptr);
+    QCOMPARE(res1->errorItem->toString(), "file1.c:10:1:style: test [bugId]");
+    QVERIFY(res1->rowCount() == 0);
+    for (int col = 0; col < fileItem->columnCount(); ++col) {
+        const ResultItem* item = dynamic_cast<ResultItem*>(fileItem->child(0,col));
+        QVERIFY(item);
+        QCOMPARE(item->errorItem.get(), res1->errorItem.get());
+        QCOMPARE(item->getType(), ResultItem::Type::message);
+    }
+
+    const ResultItem* res2 = dynamic_cast<ResultItem*>(fileItem->child(1,0));
+    QVERIFY(res2 != nullptr);
+    QCOMPARE(res2->text(), "file1.c");
+    QVERIFY(res2->errorItem != nullptr);
+    QCOMPARE(res2->errorItem->toString(), "file1.c:20:1:style: test [bugId]");
+    QVERIFY(res2->rowCount() == 0);
+    for (int col = 0; col < fileItem->columnCount(); ++col) {
+        const ResultItem* item = dynamic_cast<ResultItem*>(fileItem->child(1,col));
+        QVERIFY(item);
+        QCOMPARE(item->errorItem.get(), res2->errorItem.get());
+        QCOMPARE(item->getType(), ResultItem::Type::message);
+    }
+}
+
 void TestResultsTree::testReportType() const
 {
     TestReport report("{id},{classification},{guideline}");
@@ -157,7 +289,7 @@ void TestResultsTree::testReportType() const
     QCOMPARE(report.output, "id1,,\nunusedVariable,,");
 
     // switch to Misra C report and check that "id1" is not shown
-    tree.setReportType(ReportType::misraC);
+    tree.setReportType(ReportType::misraC2012);
     tree.saveResults(&report);
     QCOMPARE(report.output, "unusedVariable,Advisory,2.8");
 
@@ -169,6 +301,35 @@ void TestResultsTree::testReportType() const
              "missingReturn,Mandatory,17.4");
 }
 
+void TestResultsTree::testReportTypeIcon() const {
+    ResultsTree tree(nullptr);
+    tree.setReportType(ReportType::misraC2012);
+    tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "some rule text", "premium-misra-c-2012-1.1")); // Required
+    tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "some rule text", "premium-misra-c-2012-1.2")); // Advisory
+    tree.addErrorItem(createErrorItem("file1.c", 30, Severity::style, "some rule text", "premium-misra-c-2012-9.1")); // Mandatory
+
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    const ResultItem* fileItem = dynamic_cast<ResultItem*>(model->item(0,0));
+
+    const ResultItem* err1 = dynamic_cast<ResultItem*>(fileItem->child(0,0));
+    const ResultItem* err2 = dynamic_cast<ResultItem*>(fileItem->child(1,0));
+    const ResultItem* err3 = dynamic_cast<ResultItem*>(fileItem->child(2,0));
+
+    QCOMPARE(err1->getIconFileName(), ":images/dialog-warning.png");
+    QCOMPARE(err2->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err3->getIconFileName(), ":images/dialog-error.png");
+
+    tree.setReportType(ReportType::normal);
+    QCOMPARE(err1->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err2->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err3->getIconFileName(), ":images/applications-development.png");
+
+    tree.setReportType(ReportType::misraC2012);
+    QCOMPARE(err1->getIconFileName(), ":images/dialog-warning.png");
+    QCOMPARE(err2->getIconFileName(), ":images/applications-development.png");
+    QCOMPARE(err3->getIconFileName(), ":images/dialog-error.png");
+}
 
 void TestResultsTree::testGetGuidelineError() const
 {
@@ -187,11 +348,56 @@ void TestResultsTree::testGetGuidelineError() const
 
     // normal report with 2 errors
     ResultsTree tree(nullptr);
-    tree.setReportType(ReportType::misraC);
+    tree.setReportType(ReportType::misraC2012);
     tree.addErrorItem(createErrorItem(Severity::error, "id1")); // error severity => guideline 1.3
     tree.saveResults(&report);
     QCOMPARE(report.output, "id1,Required,1.3");
 }
 
+void TestResultsTree::misraCReportShowClassifications() const
+{
+    ResultsTree tree(nullptr);
+    tree.showResults(ShowTypes::ShowType::ShowErrors, true);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, true);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, true);
+    tree.setReportType(ReportType::misraC2012);
+    tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "some rule text", "premium-misra-c-2012-1.1")); // Required
+    tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "some rule text", "premium-misra-c-2012-1.2")); // Advisory
+    tree.addErrorItem(createErrorItem("file1.c", 30, Severity::style, "some rule text", "premium-misra-c-2012-9.1")); // Mandatory
+    QCOMPARE(tree.isRowHidden(0, QModelIndex()), false);
+
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    QVERIFY(model->rowCount() == 1);
+    const ResultItem* fileItem = dynamic_cast<ResultItem*>(model->item(0,0));
+    QVERIFY(fileItem != nullptr);
+    QVERIFY(fileItem->rowCount() == 3);
+
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), false);
+
+    tree.showResults(ShowTypes::ShowType::ShowErrors, false);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, true);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, true);
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), true);
+
+    tree.showResults(ShowTypes::ShowType::ShowErrors, true);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, false);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, true);
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), true);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), false);
+
+    tree.showResults(ShowTypes::ShowType::ShowErrors, true);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, true);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, false);
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), true);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), false);
+}
+
 QTEST_MAIN(TestResultsTree)
 
diff --git a/gui/test/resultstree/testresultstree.h b/gui/test/resultstree/testresultstree.h
index a718690be32..8604dc81c6b 100644
--- a/gui/test/resultstree/testresultstree.h
+++ b/gui/test/resultstree/testresultstree.h
@@ -23,6 +23,11 @@ class TestResultsTree : public QObject {
 
 private slots:
     void test1() const;
+    void duplicateResults() const;
+    void multiLineResult() const;
+    void resultsInSameFile() const;
     void testReportType() const;
+    void testReportTypeIcon() const;
     void testGetGuidelineError() const;
+    void misraCReportShowClassifications() const;
 };
diff --git a/gui/test/translationhandler/CMakeLists.txt b/gui/test/translationhandler/CMakeLists.txt
index 03e53b2eb50..f70b5759148 100644
--- a/gui/test/translationhandler/CMakeLists.txt
+++ b/gui/test/translationhandler/CMakeLists.txt
@@ -11,12 +11,8 @@ target_include_directories(test-translationhandler PRIVATE ${CMAKE_SOURCE_DIR}/g
 target_link_libraries(test-translationhandler ${QT_CORE_LIB} ${QT_WIDGETS_LIB} ${QT_TEST_LIB})
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(QT_VERSION VERSION_LESS "6.0.0")
-        # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-        target_compile_options_safe(test-translationhandler -Wno-extra-semi-stmt)
-    endif()
-    if(QT_VERSION VERSION_EQUAL "6.9.0")
-        # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
         target_compile_options_safe(test-translationhandler -Wno-ctad-maybe-unsupported)
     endif()
 endif()
diff --git a/gui/test/xmlreportv2/CMakeLists.txt b/gui/test/xmlreportv2/CMakeLists.txt
index 905377f5764..fde9da7d0db 100644
--- a/gui/test/xmlreportv2/CMakeLists.txt
+++ b/gui/test/xmlreportv2/CMakeLists.txt
@@ -1,12 +1,6 @@
 qt_wrap_cpp(test-xmlreportv2_SRC testxmlreportv2.h)
 add_custom_target(build-xmlreportv2-deps SOURCES ${test-xmlreportv2_SRC})
 add_dependencies(gui-build-deps build-xmlreportv2-deps)
-if (NOT BUILD_CORE_DLL)
-    list(APPEND test-xmlreportv2_SRC $<TARGET_OBJECTS:cppcheck-core> $<TARGET_OBJECTS:simplecpp_objs>)
-    if(USE_BUNDLED_TINYXML2)
-        list(APPEND test-xmlreportv2_SRC $<TARGET_OBJECTS:tinyxml2_objs>)
-    endif()
-endif()
 add_executable(test-xmlreportv2
         ${test-xmlreportv2_SRC}
         testxmlreportv2.cpp
@@ -15,26 +9,12 @@ add_executable(test-xmlreportv2
         ${CMAKE_SOURCE_DIR}/gui/xmlreport.cpp
         ${CMAKE_SOURCE_DIR}/gui/xmlreportv2.cpp
         )
-target_include_directories(test-xmlreportv2 PRIVATE ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/lib)
+target_include_directories(test-xmlreportv2 PRIVATE ${CMAKE_SOURCE_DIR}/gui)
 target_compile_definitions(test-xmlreportv2 PRIVATE SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
-target_link_libraries(test-xmlreportv2 ${QT_CORE_LIB} ${QT_TEST_LIB})
-if (HAVE_RULES)
-    target_link_libraries(test-xmlreportv2 ${PCRE_LIBRARY})
-endif()
-if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-    target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES})
-endif()
-if (BUILD_CORE_DLL)
-    target_compile_definitions(test-xmlreportv2 PRIVATE CPPCHECKLIB_IMPORT TINYXML2_IMPORT)
-    target_link_libraries(test-xmlreportv2 cppcheck-core)
-endif()
+target_link_libraries(test-xmlreportv2 ${QT_CORE_LIB} ${QT_TEST_LIB} cppcheck-core)
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(QT_VERSION VERSION_LESS "6.0.0")
-        # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-        target_compile_options_safe(test-xmlreportv2 -Wno-extra-semi-stmt)
-    endif()
-    if(QT_VERSION VERSION_EQUAL "6.9.0")
-        # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
         target_compile_options_safe(test-xmlreportv2 -Wno-ctad-maybe-unsupported)
     endif()
 endif()
diff --git a/gui/threaddetails.cpp b/gui/threaddetails.cpp
new file mode 100644
index 00000000000..1fcb97772ef
--- /dev/null
+++ b/gui/threaddetails.cpp
@@ -0,0 +1,56 @@
+#include "threaddetails.h"
+#include "utils.h"
+
+#include "ui_threaddetails.h"
+
+#include <QMutexLocker>
+
+ThreadDetails* ThreadDetails::mInstance;
+
+ThreadDetails::ThreadDetails(QWidget *parent)
+    : QWidget(parent)
+    , mUi(new Ui::ThreadDetails)
+{
+    mInstance = this;
+    setWindowFlags(Qt::Window);
+    mUi->setupUi(this);
+    connect(&mTimer, &QTimer::timeout, this, &ThreadDetails::updateUI);
+    mTimer.start(1000);
+}
+
+ThreadDetails::~ThreadDetails()
+{
+    mInstance = nullptr;
+    delete mUi;
+}
+
+// NOLINTNEXTLINE(performance-unnecessary-value-param) - false positive
+void ThreadDetails::threadDetailsUpdated(QMap<int, CheckThread::Details> threadDetails)
+{
+    QMutexLocker locker(&mMutex);
+    mThreadDetails = threadDetails;
+    if (threadDetails.empty()) {
+        mProgress.clear();
+    }
+}
+
+// cppcheck-suppress passedByValue
+// NOLINTNEXTLINE(performance-unnecessary-value-param) - false positive
+void ThreadDetails::progress(QString filename, QString stage, std::size_t value) {
+    QMutexLocker locker(&mMutex);
+    mProgress[filename] = {QString(), stage + QString(value > 0 ? ": %1%" : "").arg(value)};
+}
+
+void ThreadDetails::updateUI() {
+    QString text("Thread\tStart time\tFile/Progress\n");
+    {
+        QMutexLocker locker(&mMutex);
+        for (const auto& td: utils::as_const(mThreadDetails)) {
+            auto& timeProgress = mProgress[td.file];
+            if (timeProgress.first.isEmpty() && !timeProgress.second.isEmpty())
+                timeProgress.first = QTime::currentTime().toString(Qt::TextDate);
+            text += QString("%1\t%2\t%3\n\t%4\t%5\n").arg(td.threadIndex).arg(td.startTime.toString(Qt::TextDate)).arg(td.file).arg(timeProgress.first).arg(timeProgress.second);
+        }
+    }
+    mUi->plainTextEdit->setPlainText(text);
+}
diff --git a/gui/threaddetails.h b/gui/threaddetails.h
new file mode 100644
index 00000000000..253b53d5407
--- /dev/null
+++ b/gui/threaddetails.h
@@ -0,0 +1,44 @@
+#ifndef THREADDETAILS_H
+#define THREADDETAILS_H
+
+#include <QWidget>
+#include <QMap>
+#include <QMutex>
+#include <QTimer>
+#include "checkthread.h"
+
+namespace Ui {
+    class ThreadDetails;
+}
+
+class ThreadDetails : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ThreadDetails(QWidget *parent = nullptr);
+    ~ThreadDetails() override;
+
+    static ThreadDetails* instance() {
+        return mInstance;
+    }
+
+public slots:
+    void threadDetailsUpdated(QMap<int, CheckThread::Details> threadDetails);
+    void progress(QString filename, QString stage, std::size_t value);
+
+private slots:
+    void updateUI();
+
+private:
+    static ThreadDetails* mInstance;
+    Ui::ThreadDetails *mUi;
+    QMap<QString, QPair<QString,QString>> mProgress;
+    QMap<int, CheckThread::Details> mThreadDetails;
+    QTimer mTimer;
+
+    /** accessing mProgress and mThreadDetails in slots that are triggered from different threads */
+    QMutex mMutex;
+};
+
+#endif // THREADDETAILS_H
diff --git a/gui/threaddetails.ui b/gui/threaddetails.ui
new file mode 100644
index 00000000000..420340cf77d
--- /dev/null
+++ b/gui/threaddetails.ui
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ThreadDetails</class>
+ <widget class="QWidget" name="ThreadDetails">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Thread Details</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QPlainTextEdit" name="plainTextEdit">
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index fecfb44b23b..3f89d58b558 100644
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,8 +20,10 @@
 
 #include "checkthread.h"
 #include "common.h"
+#include "filesettings.h"
 #include "resultsview.h"
 #include "settings.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <string>
@@ -35,12 +37,13 @@
 #include <QSettings>
 #include <QTextStream>
 #include <QVariant>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtLogging>
+#endif
 
 ThreadHandler::ThreadHandler(QObject *parent) :
     QObject(parent)
-{
-    setThreadCount(1);
-}
+{}
 
 ThreadHandler::~ThreadHandler()
 {
@@ -54,13 +57,13 @@ void ThreadHandler::clearFiles()
     mAnalyseWholeProgram = false;
     mCtuInfo.clear();
     mAddonsAndTools.clear();
-    mSuppressions.clear();
+    mSuppressionsUI.clear();
 }
 
-void ThreadHandler::setFiles(const QStringList &files)
+void ThreadHandler::setFiles(std::list<FileWithDetails> files)
 {
-    mResults.setFiles(files);
     mLastFiles = files;
+    mResults.setFiles(std::move(files));
 }
 
 void ThreadHandler::setProject(const ImportProject &prj)
@@ -76,13 +79,21 @@ void ThreadHandler::setCheckFiles(bool all)
     }
 }
 
-void ThreadHandler::setCheckFiles(const QStringList& files)
+void ThreadHandler::setCheckFiles(std::list<FileWithDetails> files)
 {
     if (mRunningThreadCount == 0) {
-        mResults.setFiles(files);
+        mResults.setFiles(std::move(files));
     }
 }
 
+void ThreadHandler::setupCheckThread(CheckThread &thread) const
+{
+    thread.setAddonsAndTools(mCheckAddonsAndTools);
+    thread.setSuppressions(mSuppressionsUI);
+    thread.setClangIncludePaths(mClangIncludePaths);
+    thread.setSettings(mCheckSettings, mCheckSuppressions);
+}
+
 void ThreadHandler::check(const Settings &settings, const std::shared_ptr<Suppressions>& supprs)
 {
     if (mResults.getFileCount() == 0 || mRunningThreadCount > 0 || settings.jobs == 0) {
@@ -91,25 +102,25 @@ void ThreadHandler::check(const Settings &settings, const std::shared_ptr<Suppre
         return;
     }
 
-    setThreadCount(settings.jobs);
+    mCheckSettings = settings;
+    mCheckSuppressions = supprs;
+
+    createThreads(mCheckSettings.jobs);
 
     mRunningThreadCount = mThreads.size();
     mRunningThreadCount = std::min(mResults.getFileCount(), mRunningThreadCount);
 
-    QStringList addonsAndTools = mAddonsAndTools;
-    for (const std::string& addon: settings.addons) {
+    mCheckAddonsAndTools = mAddonsAndTools;
+    for (const std::string& addon: mCheckSettings.addons) {
         QString s = QString::fromStdString(addon);
-        if (!addonsAndTools.contains(s))
-            addonsAndTools << s;
+        if (!mCheckAddonsAndTools.contains(s))
+            mCheckAddonsAndTools << s;
     }
 
     mCtuInfo.clear();
 
     for (int i = 0; i < mRunningThreadCount; i++) {
-        mThreads[i]->setAddonsAndTools(addonsAndTools);
-        mThreads[i]->setSuppressions(mSuppressions);
-        mThreads[i]->setClangIncludePaths(mClangIncludePaths);
-        mThreads[i]->setSettings(settings, supprs);
+        setupCheckThread(*mThreads[i]);
         mThreads[i]->start();
     }
 
@@ -123,14 +134,12 @@ void ThreadHandler::check(const Settings &settings, const std::shared_ptr<Suppre
 
 bool ThreadHandler::isChecking() const
 {
-    return mRunningThreadCount > 0;
+    return mRunningThreadCount > 0 || mAnalyseWholeProgram;
 }
 
-void ThreadHandler::setThreadCount(const int count)
+void ThreadHandler::createThreads(const int count)
 {
-    if (mRunningThreadCount > 0 ||
-        count == mThreads.size() ||
-        count <= 0) {
+    if (mRunningThreadCount > 0 || count <= 0) {
         return;
     }
 
@@ -138,43 +147,55 @@ void ThreadHandler::setThreadCount(const int count)
     removeThreads();
     //Create new threads
     for (int i = mThreads.size(); i < count; i++) {
-        mThreads << new CheckThread(mResults);
+        mThreads << new CheckThread(mResults, i + 1);
         connect(mThreads.last(), &CheckThread::done,
-                this, &ThreadHandler::threadDone);
-        connect(mThreads.last(), &CheckThread::fileChecked,
-                &mResults, &ThreadResult::fileChecked);
+                this, &ThreadHandler::threadDone, Qt::QueuedConnection);
+        connect(mThreads.last(), &CheckThread::finishCheck,
+                &mResults, &ThreadResult::finishCheck, Qt::QueuedConnection);
+        connect(mThreads.last(), &CheckThread::startCheck,
+                this, &ThreadHandler::startCheck, Qt::QueuedConnection);
+        connect(mThreads.last(), &CheckThread::finishCheck,
+                this, &ThreadHandler::finishCheck, Qt::QueuedConnection);
     }
 }
 
 
 void ThreadHandler::removeThreads()
 {
-    for (CheckThread* thread : mThreads) {
+    for (CheckThread* thread : utils::as_const(mThreads)) {
         if (thread->isRunning()) {
-            thread->terminate();
+            thread->stop();
             thread->wait();
         }
         disconnect(thread, &CheckThread::done,
                    this, &ThreadHandler::threadDone);
-        disconnect(thread, &CheckThread::fileChecked,
-                   &mResults, &ThreadResult::fileChecked);
+        disconnect(thread, &CheckThread::finishCheck,
+                   &mResults, &ThreadResult::finishCheck);
+        disconnect(mThreads.last(), &CheckThread::startCheck,
+                   this, &ThreadHandler::startCheck);
+        disconnect(mThreads.last(), &CheckThread::finishCheck,
+                   this, &ThreadHandler::finishCheck);
         delete thread;
     }
 
     mThreads.clear();
-    mAnalyseWholeProgram = false;
 }
 
 void ThreadHandler::threadDone()
 {
-    if (mRunningThreadCount == 1 && mAnalyseWholeProgram) {
+    mRunningThreadCount--;
+
+    // TODO: also run with projects?
+    if (mRunningThreadCount == 0 && mAnalyseWholeProgram) {
+        createThreads(1);
+        mRunningThreadCount = 1;
+        setupCheckThread(*mThreads[0]);
         mThreads[0]->analyseWholeProgram(mLastFiles, mCtuInfo);
         mAnalyseWholeProgram = false;
         mCtuInfo.clear();
         return;
     }
 
-    mRunningThreadCount--;
     if (mRunningThreadCount == 0) {
         emit done();
 
@@ -185,6 +206,9 @@ void ThreadHandler::threadDone()
             mLastCheckTime = mCheckStartTime;
             mCheckStartTime = QDateTime();
         }
+
+        mCheckAddonsAndTools.clear();
+        mCheckSuppressions.reset();
     }
 }
 
@@ -193,15 +217,15 @@ void ThreadHandler::stop()
     mCheckStartTime = QDateTime();
     mAnalyseWholeProgram = false;
     mCtuInfo.clear();
-    for (CheckThread* thread : mThreads) {
+    for (CheckThread* thread : utils::as_const(mThreads)) {
         thread->stop();
     }
 }
 
 void ThreadHandler::initialize(const ResultsView *view)
 {
-    connect(&mResults, &ThreadResult::progress,
-            view, &ResultsView::progress);
+    connect(&mResults, &ThreadResult::filesCheckedProgress,
+            view, &ResultsView::filesCheckedProgress);
 
     connect(&mResults, &ThreadResult::error,
             view, &ResultsView::error);
@@ -211,11 +235,14 @@ void ThreadHandler::initialize(const ResultsView *view)
 
     connect(&mResults, &ThreadResult::debugError,
             this, &ThreadHandler::debugError);
+
+    connect(&mResults, &ThreadResult::progress,
+            this, &ThreadHandler::progress);
 }
 
 void ThreadHandler::loadSettings(const QSettings &settings)
 {
-    setThreadCount(settings.value(SETTINGS_CHECK_THREADS, 1).toInt());
+    createThreads(settings.value(SETTINGS_CHECK_THREADS, 1).toInt());
 }
 
 void ThreadHandler::saveSettings(QSettings &settings) const
@@ -225,7 +252,7 @@ void ThreadHandler::saveSettings(QSettings &settings) const
 
 bool ThreadHandler::hasPreviousFiles() const
 {
-    return !mLastFiles.isEmpty();
+    return !mLastFiles.empty();
 }
 
 int ThreadHandler::getPreviousFilesCount() const
@@ -238,7 +265,7 @@ int ThreadHandler::getPreviousScanDuration() const
     return mScanDuration;
 }
 
-QStringList ThreadHandler::getReCheckFiles(bool all) const
+std::list<FileWithDetails> ThreadHandler::getReCheckFiles(bool all) const
 {
     if (mLastCheckTime.isNull() || all)
         return mLastFiles;
@@ -246,11 +273,10 @@ QStringList ThreadHandler::getReCheckFiles(bool all) const
     std::set<QString> modified;
     std::set<QString> unmodified;
 
-    QStringList files;
-    for (int i = 0; i < mLastFiles.size(); ++i) {
-        if (needsReCheck(mLastFiles[i], modified, unmodified))
-            files.push_back(mLastFiles[i]);
-    }
+    std::list<FileWithDetails> files;
+    std::copy_if(mLastFiles.cbegin(), mLastFiles.cend(), std::back_inserter(files), [&](const FileWithDetails &f) {
+        return needsReCheck(QString::fromStdString(f.path()), modified, unmodified);
+    });
     return files;
 }
 
@@ -303,3 +329,24 @@ void ThreadHandler::setCheckStartTime(QDateTime checkStartTime)
 {
     mCheckStartTime = std::move(checkStartTime);
 }
+
+// cppcheck-suppress passedByValueCallback
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadHandler::startCheck(CheckThread::Details details)
+{
+    mThreadDetails[details.threadIndex] = details;
+    emitThreadDetailsUpdated();
+}
+
+// cppcheck-suppress passedByValueCallback
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadHandler::finishCheck(CheckThread::Details details)
+{
+    mThreadDetails.remove(details.threadIndex);
+    emitThreadDetailsUpdated();
+}
+
+void ThreadHandler::emitThreadDetailsUpdated()
+{
+    emit threadDetailsUpdated(mThreadDetails);
+}
diff --git a/gui/threadhandler.h b/gui/threadhandler.h
index 49a326933b0..17f011c32ac 100644
--- a/gui/threadhandler.h
+++ b/gui/threadhandler.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,9 +20,12 @@
 #ifndef THREADHANDLER_H
 #define THREADHANDLER_H
 
+#include "settings.h"
 #include "suppressions.h"
 #include "threadresult.h"
 
+#include <cstddef>
+#include <list>
 #include <memory>
 #include <set>
 #include <string>
@@ -37,9 +40,9 @@
 class ResultsView;
 class CheckThread;
 class QSettings;
-class Settings;
 class ImportProject;
 class ErrorItem;
+class FileWithDetails;
 
 /// @addtogroup GUI
 /// @{
@@ -55,12 +58,6 @@ class ThreadHandler : public QObject {
     explicit ThreadHandler(QObject *parent = nullptr);
     ~ThreadHandler() override;
 
-    /**
-     * @brief Set the number of threads to use
-     * @param count The number of threads to use
-     */
-    void setThreadCount(int count);
-
     /**
      * @brief Initialize the threads (connect all signals to resultsview's slots)
      *
@@ -85,7 +82,7 @@ class ThreadHandler : public QObject {
     }
 
     void setSuppressions(const QList<SuppressionList::Suppression> &s) {
-        mSuppressions = s;
+        mSuppressionsUI = s;
     }
 
     void setClangIncludePaths(const QStringList &s) {
@@ -103,7 +100,7 @@ class ThreadHandler : public QObject {
      *
      * @param files files to check
      */
-    void setFiles(const QStringList &files);
+    void setFiles(std::list<FileWithDetails> files);
 
     /**
      * @brief Set project to check
@@ -132,7 +129,7 @@ class ThreadHandler : public QObject {
      *
      * @param files list of files to be checked
      */
-    void setCheckFiles(const QStringList& files);
+    void setCheckFiles(std::list<FileWithDetails> files);
 
     /**
      * @brief Is checking running?
@@ -166,7 +163,7 @@ class ThreadHandler : public QObject {
      * @brief Get files that should be rechecked because they have been
      * changed.
      */
-    QStringList getReCheckFiles(bool all) const;
+    std::list<FileWithDetails> getReCheckFiles(bool all) const;
 
     /**
      * @brief Get start time of last check
@@ -182,6 +179,11 @@ class ThreadHandler : public QObject {
      */
     void setCheckStartTime(QDateTime checkStartTime);
 
+    /**
+     * @brief Emit the threadDetailsUpdated signal
+     */
+    void emitThreadDetailsUpdated();
+
 signals:
     /**
      * @brief Signal that all threads are done
@@ -195,6 +197,11 @@ class ThreadHandler : public QObject {
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
     void debugError(const ErrorItem &item);
 
+    /**
+     * @brief Emitted when thread details are updated.
+     */
+    void threadDetailsUpdated(QMap<int, CheckThread::Details> threadDetails);
+
 public slots:
 
     /**
@@ -202,6 +209,22 @@ public slots:
      *
      */
     void stop();
+
+    /**
+     * @brief Slot threads use to signal this class that it started checking a file
+     * @param details Details about what file is being checked and by what thread
+     */
+    void startCheck(CheckThread::Details details);
+
+    /**
+     * @brief Slot threads use to signal this class that it finish checking a file
+     * @param details Details about what file finished being checked and by what thread
+     */
+    void finishCheck(CheckThread::Details details);
+
+signals:
+    void progress(QString filename, QString stage, std::size_t value);
+
 protected slots:
     /**
      * @brief Slot that a single thread is done
@@ -213,7 +236,7 @@ protected slots:
      * @brief List of files checked last time (used when rechecking)
      *
      */
-    QStringList mLastFiles;
+    std::list<FileWithDetails> mLastFiles;
 
     /** @brief date and time when current checking started */
     QDateTime mCheckStartTime;
@@ -235,12 +258,24 @@ protected slots:
      */
     int mScanDuration{};
 
+    /**
+     * @brief Create checker threads
+     * @param count The number of threads to spawn
+     */
+    void createThreads(int count);
+
     /**
      * @brief Function to delete all threads
      *
      */
     void removeThreads();
 
+    /*
+     * @brief Apply check settings to a checker thread
+     * @param thread The thread to setup
+     */
+    void setupCheckThread(CheckThread &thread) const;
+
     /**
      * @brief Thread results are stored here
      *
@@ -259,12 +294,30 @@ protected slots:
      */
     int mRunningThreadCount{};
 
+    /**
+     * @brief A whole program check is queued by check()
+     */
     bool mAnalyseWholeProgram{};
     std::string mCtuInfo;
 
     QStringList mAddonsAndTools;
-    QList<SuppressionList::Suppression> mSuppressions;
+    QList<SuppressionList::Suppression> mSuppressionsUI;
     QStringList mClangIncludePaths;
+
+    /// @{
+    /**
+     * @brief Settings specific to the current analysis
+     */
+    QStringList mCheckAddonsAndTools;
+    Settings mCheckSettings;
+    std::shared_ptr<Suppressions> mCheckSuppressions;
+    /// @}
+
+    /**
+     * @brief Details about currently running threads
+     */
+    QMap<int, CheckThread::Details> mThreadDetails;
+
 private:
 
     /**
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
index 008d201c42d..a3929da7cca 100644
--- a/gui/threadresult.cpp
+++ b/gui/threadresult.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,6 +25,7 @@
 #include "importproject.h"
 
 #include <numeric>
+#include <utility>
 
 #include <QFile>
 
@@ -33,18 +34,19 @@ void ThreadResult::reportOut(const std::string &outmsg, Color /*c*/)
     emit log(QString::fromStdString(outmsg));
 }
 
-void ThreadResult::fileChecked(const QString &file)
+// NOLINTNEXTLINE(performance-unnecessary-value-param)
+void ThreadResult::finishCheck(CheckThread::Details details)
 {
     std::lock_guard<std::mutex> locker(mutex);
 
-    mProgress += QFile(file).size();
+    mCheckedFileSize += QFile(details.file).size();
     mFilesChecked++;
 
-    if (mMaxProgress > 0) {
-        const int value = static_cast<int>(PROGRESS_MAX * mProgress / mMaxProgress);
+    if (mTotalFileSize > 0) {
+        const int value = static_cast<int>(PROGRESS_MAX * mCheckedFileSize / mTotalFileSize);
         const QString description = tr("%1 of %2 files checked").arg(mFilesChecked).arg(mTotalFiles);
 
-        emit progress(value, description);
+        emit filesCheckedProgress(value, description);
     }
 }
 
@@ -58,14 +60,20 @@ void ThreadResult::reportErr(const ErrorMessage &msg)
         emit debugError(item);
 }
 
-QString ThreadResult::getNextFile()
+// NOLINTNEXTLINE(readability-avoid-const-params-in-decls) - false positive this is an overload
+void ThreadResult::reportProgress(const std::string &filename, const char stage[], const std::size_t value) {
+    emit progress(QString::fromStdString(filename), stage, value);
+}
+
+void ThreadResult::getNextFile(const FileWithDetails*& file)
 {
     std::lock_guard<std::mutex> locker(mutex);
-    if (mFiles.isEmpty()) {
-        return QString();
+    file = nullptr;
+    if (mItNextFile == mFiles.cend()) {
+        return;
     }
-
-    return mFiles.takeFirst();
+    file = &(*mItNextFile);
+    ++mItNextFile;
 }
 
 void ThreadResult::getNextFileSettings(const FileSettings*& fs)
@@ -79,35 +87,37 @@ void ThreadResult::getNextFileSettings(const FileSettings*& fs)
     ++mItNextFileSettings;
 }
 
-void ThreadResult::setFiles(const QStringList &files)
+void ThreadResult::setFiles(std::list<FileWithDetails> files)
 {
     std::lock_guard<std::mutex> locker(mutex);
-    mFiles = files;
-    mProgress = 0;
-    mFilesChecked = 0;
     mTotalFiles = files.size();
+    mFiles = std::move(files);
+    mItNextFile = mFiles.cbegin();
+    mCheckedFileSize = 0;
+    mFilesChecked = 0;
 
     // Determine the total size of all of the files to check, so that we can
     // show an accurate progress estimate
-    quint64 sizeOfFiles = std::accumulate(files.begin(), files.end(), 0, [](quint64 total, const QString& file) {
-        return total + QFile(file).size();
+    quint64 sizeOfFiles = std::accumulate(mFiles.cbegin(), mFiles.cend(), 0, [](quint64 total, const FileWithDetails& file) {
+        return total + file.size();
     });
-    mMaxProgress = sizeOfFiles;
+    mTotalFileSize = sizeOfFiles;
 }
 
 void ThreadResult::setProject(const ImportProject &prj)
 {
     std::lock_guard<std::mutex> locker(mutex);
     mFiles.clear();
+    mItNextFile = mFiles.cbegin();
     mFileSettings = prj.fileSettings;
     mItNextFileSettings = mFileSettings.cbegin();
-    mProgress = 0;
+    mCheckedFileSize = 0;
     mFilesChecked = 0;
     mTotalFiles = prj.fileSettings.size();
 
     // Determine the total size of all of the files to check, so that we can
     // show an accurate progress estimate
-    mMaxProgress = std::accumulate(prj.fileSettings.begin(), prj.fileSettings.end(), quint64{ 0 }, [](quint64 v, const FileSettings& fs) {
+    mTotalFileSize = std::accumulate(prj.fileSettings.begin(), prj.fileSettings.end(), quint64{ 0 }, [](quint64 v, const FileSettings& fs) {
         return v + QFile(QString::fromStdString(fs.filename())).size();
     });
 }
diff --git a/gui/threadresult.h b/gui/threadresult.h
index b870cb9b38a..87560e87d78 100644
--- a/gui/threadresult.h
+++ b/gui/threadresult.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,7 +23,9 @@
 #include "color.h"
 #include "errorlogger.h"
 #include "filesettings.h"
+#include "checkthread.h"
 
+#include <cstddef>
 #include <list>
 #include <mutex>
 #include <string>
@@ -31,7 +33,6 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QtGlobal>
 
 class ErrorItem;
 class ImportProject;
@@ -50,9 +51,8 @@ class ThreadResult : public QObject, public ErrorLogger {
 
     /**
      * @brief Get next unprocessed file
-     * @return File path
      */
-    QString getNextFile();
+    void getNextFile(const FileWithDetails*& file);
 
     void getNextFileSettings(const FileSettings*& fs);
 
@@ -60,7 +60,7 @@ class ThreadResult : public QObject, public ErrorLogger {
      * @brief Set list of files to check
      * @param files List of files to check
      */
-    void setFiles(const QStringList &files);
+    void setFiles(std::list<FileWithDetails> files);
 
     void setProject(const ImportProject &prj);
 
@@ -79,24 +79,31 @@ class ThreadResult : public QObject, public ErrorLogger {
     /**
      * ErrorLogger methods
      */
-    void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
+    void reportOut(const std::string &outmsg, Color /*c*/ = Color::Reset) override;
     void reportErr(const ErrorMessage &msg) override;
+    void reportMetric(const std::string &metric) override
+    {
+        (void) metric;
+    }
+    // NOLINTNEXTLINE(readability-avoid-const-params-in-decls) - false positive this is an overload
+    void reportProgress(const std::string &filename, const char stage[], const std::size_t value) final;
 
 public slots:
 
     /**
-     * @brief Slot threads use to signal this class that a specific file is checked
-     * @param file File that is checked
+     * @brief Slot threads use to signal this class that it finish checking a file
+     * @param details Details about what file finished being checked and by what thread
      */
-    void fileChecked(const QString &file);
+    void finishCheck(CheckThread::Details details);
+
 signals:
     /**
-     * @brief Progress signal
-     * @param value Current progress
-     * @param description Description of the current stage
+     * @brief Files checked progress
+     * @param value Current progress (0 - PROGRESS_MAX)
+     * @param description Description of the current stage (example: "13/45 files checked")
      */
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
-    void progress(int value, const QString& description);
+    void filesCheckedProgress(int value, const QString& description);
 
     /**
      * @brief Signal of a new error
@@ -122,6 +129,8 @@ public slots:
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
     void debugError(const ErrorItem &item);
 
+    void progress(QString filename, QString stage, std::size_t value);
+
 protected:
 
     /**
@@ -134,22 +143,17 @@ public slots:
      * @brief List of files to check
      *
      */
-    QStringList mFiles;
+    std::list<FileWithDetails> mFiles;
+    std::list<FileWithDetails>::const_iterator mItNextFile{mFiles.cbegin()};
 
     std::list<FileSettings> mFileSettings;
-    std::list<FileSettings>::const_iterator mItNextFileSettings;
+    std::list<FileSettings>::const_iterator mItNextFileSettings{mFileSettings.cbegin()};
 
-    /**
-     * @brief Max progress
-     *
-     */
-    quint64 mMaxProgress{};
+    /** @brief Total file size */
+    quint64 mTotalFileSize{};
 
-    /**
-     * @brief Current progress
-     *
-     */
-    quint64 mProgress{};
+    /** @brief File size of checked files */
+    quint64 mCheckedFileSize{};
 
     /**
      * @brief Current number of files checked
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
index 758c873d2bb..14faedc04a2 100644
--- a/gui/translationhandler.cpp
+++ b/gui/translationhandler.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -28,7 +28,11 @@
 #include <QLocale>
 #include <QMessageBox>
 #include <QTranslator>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtPreprocessorSupport>
+#else
 #include <QtGlobal>
+#endif
 
 
 // Provide own translations for standard buttons. This (garbage) code is needed to enforce them to appear in .ts files even after "lupdate gui.pro"
@@ -129,7 +133,7 @@ bool TranslationHandler::setLanguage(const QString &code)
                              "the Preferences-dialog to select any of the available "
                              "languages.").arg(error));
         QMessageBox msgBox(QMessageBox::Warning,
-                           tr("Cppcheck"),
+                           "Cppcheck",
                            msg,
                            QMessageBox::Ok);
         msgBox.exec();
diff --git a/gui/translationhandler.h b/gui/translationhandler.h
index 0b2988f583e..4cea7d4ce80 100644
--- a/gui/translationhandler.h
+++ b/gui/translationhandler.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -59,7 +59,7 @@ struct TranslationInfo {
  * track which translation is the currently active translation.
  *
  */
-class TranslationHandler : QObject {
+class TranslationHandler : public QObject {
     Q_OBJECT
 public:
     explicit TranslationHandler(QObject *parent = nullptr);
diff --git a/gui/txtreport.cpp b/gui/txtreport.cpp
index caa3833ef8d..38753bfdd0c 100644
--- a/gui/txtreport.cpp
+++ b/gui/txtreport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -77,9 +77,5 @@ void TxtReport::writeError(const ErrorItem &error)
     line += temp.arg(GuiSeverity::toString(error.severity));
     line += error.summary;
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     mTxtWriter << line << Qt::endl;
-#else
-    mTxtWriter << line << endl;
-#endif
 }
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
index 3e432d62380..c5f00fc5bb7 100644
--- a/gui/xmlreport.cpp
+++ b/gui/xmlreport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -25,10 +25,6 @@
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-#include <QStringRef>
-#endif
-
 static constexpr char ResultElementName[] = "results";
 static constexpr char VersionAttribute[] = "version";
 
diff --git a/gui/xmlreportv2.cpp b/gui/xmlreportv2.cpp
index 81445fdc308..abf6aa361ba 100644
--- a/gui/xmlreportv2.cpp
+++ b/gui/xmlreportv2.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -32,9 +32,8 @@
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-#include <QStringRef>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtLogging>
 #endif
 
 static const QString ResultElementName = "results";
@@ -95,6 +94,7 @@ void XmlReportV2::writeHeader()
 {
     const auto nameAndVersion = Settings::getNameAndVersion(mProductName.toStdString());
     const QString name = QString::fromStdString(nameAndVersion.first);
+    // TODO: lacks extraVersion
     const QString version = nameAndVersion.first.empty() ? CppCheck::version() : QString::fromStdString(nameAndVersion.second);
 
     mXmlWriter->setAutoFormatting(true);
diff --git a/gui/xmlreportv2.h b/gui/xmlreportv2.h
index 6f5834b3417..58d368c4bc2 100644
--- a/gui/xmlreportv2.h
+++ b/gui/xmlreportv2.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,7 +22,6 @@
 #include "erroritem.h"
 #include "xmlreport.h"
 
-#include <QList>
 #include <QString>
 
 class QXmlStreamReader;
diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport
index c26a137a4ad..fb263c73d12 100755
--- a/htmlreport/cppcheck-htmlreport
+++ b/htmlreport/cppcheck-htmlreport
@@ -139,7 +139,7 @@ label.checkBtn > input {
 
 table.summaryTable td { padding: 0 5px 0 5px; }
 
-.statHeader, .severityHeader {
+.statHeader, .severityHeader, .classificationHeader {
     font-weight: bold;
 }
 
@@ -201,7 +201,7 @@ table.summaryTable td { padding: 0 5px 0 5px; }
     padding-right: 6px;
 }
 
-.id-filtered, .severity-filtered, .file-filtered, .tool-filtered, .text-filtered {
+.id-filtered, .severity-filtered, .classification-filtered, .file-filtered, .tool-filtered, .text-filtered {
     visibility: collapse;
 }
 """
@@ -279,6 +279,17 @@ HTML_HEAD = """
         updateFileRows();
       }
 
+      function toggleClassification(cb) {
+        cb.parentElement.classList.toggle("unchecked", !cb.checked);
+        var elements = document.querySelectorAll(".class_" + cb.id);
+
+        for (var i = 0, len = elements.length; i < len; i++) {
+          elements[i].classList.toggle("classification-filtered", !cb.checked);
+        }
+
+        updateFileRows();
+      }
+
       function toggleTool(cb) {
         cb.parentElement.classList.toggle("unchecked", !cb.checked);
 
@@ -340,11 +351,62 @@ HTML_HEAD = """
         var elements = document.querySelectorAll(".fileEntry");
 
         for (var i = 0, len = elements.length; i < len; i++) {
-          var visible = elements[i].querySelector(".issue:not(.id-filtered):not(.severity-filtered):not(.tool-filtered):not(.text-filtered)");
+          var visible = elements[i].querySelector(".issue:not(.id-filtered):not(.severity-filtered):not(.classification-filtered):not(.tool-filtered):not(.text-filtered)");
           elements[i].classList.toggle("file-filtered", !visible);
         }
       }
 
+      function reapplyFilters() {
+        // Reapply ID filters
+        var idToggles = document.querySelectorAll(".idToggle");
+        for (var i = 1; i < idToggles.length; i++) {
+          var cb = idToggles[i];
+          var elements = document.querySelectorAll("." + cb.id);
+          for (var j = 0; j < elements.length; j++) {
+            elements[j].classList.toggle("id-filtered", !cb.checked);
+          }
+        }
+
+        // Reapply severity filters
+        var sevToggles = document.querySelectorAll(".sev_toggle");
+        for (var i = 0; i < sevToggles.length; i++) {
+          var cb = sevToggles[i];
+            var elements = document.querySelectorAll(".sev_" + cb.id);
+          for (var j = 0; j < elements.length; j++) {
+            elements[j].classList.toggle("severity-filtered", !cb.checked);
+          }
+        }
+
+        // Reapply classification filters
+        var classToggles = document.querySelectorAll(".class_toggle");
+        for (var i = 0; i < classToggles.length; i++) {
+          var cb = classToggles[i];
+          var elements = document.querySelectorAll(".class_" + cb.id);
+          for (var j = 0; j < elements.length; j++) {
+            elements[j].classList.toggle("classification-filtered", !cb.checked);
+          }
+        }
+
+        // Reapply tool filters
+        var toolToggles = document.querySelectorAll(".tool_toggle");
+        for (var i = 0; i < toolToggles.length; i++) {
+          var cb = toolToggles[i];
+          var elements;
+          if (cb.id == "clang-tidy")
+            elements = document.querySelectorAll("[class^=clang-tidy-]");
+          else
+            elements = document.querySelectorAll(".issue:not([class^=clang-tidy-])");
+
+          for (var j = 0; j < elements.length; j++) {
+            elements[j].classList.toggle("tool-filtered", !cb.checked);
+          }
+        }
+
+        // Update file rows
+        updateFileRows();
+      }
+
+      window.addEventListener("pageshow", reapplyFilters);
       window.addEventListener("load", initExpandables);
     </script>
   </head>
@@ -372,7 +434,7 @@ HTML_FOOTER = """
     </div>
     <div id="footer" class="footer">
       <p>
-        Created by Cppcheck %s (<a href="https://cppcheck.sourceforge.io">Sourceforge</a>, <a href="irc://irc.freenode.net/cppcheck">IRC</a>)
+        Created by Cppcheck %s (<a href="https://cppcheck.sourceforge.io">Sourceforge</a>, <a href="irc://irc.libera.chat/#cppcheck">IRC</a>)
       </p>
     </div>
     </div>
@@ -399,20 +461,27 @@ def html_escape(text):
 
 def filter_button(enabled_filters, id, function):
     enabled = enabled_filters.get(id, False)
-    return '\n        <label class="checkBtn%s"><input type="checkbox" onclick="%s(this)" id="%s"%s/>%s</label>'\
+    if not id:
+        id = 'None'
+    return '\n        <label class="checkBtn%s"><input type="checkbox" onclick="%s(this)" id="%s" %s>%s</label>'\
           % (' disabled' if not enabled else '', function, id, 'checked' if enabled else 'disabled', id)
 
 def filter_bar(enabled):
+    severity_bar = ''.join([filter_button(enabled, severity, 'toggleSeverity') for severity in ['error', 'warning', 'portability', 'performance', 'style', 'information']]) + '\n        | '
+    classification_bar = ''.join([filter_button(enabled, _class, 'toggleClassification') for _class in ['Mandatory', 'Required', 'Advisory', 'Document', 'Disapplied', 'L1','L2','L3','']]) + '\n        | '
+    if "checked>" not in severity_bar:
+        severity_bar = ''
+    if "checked>" not in classification_bar:
+        classification_bar = ''
     return ''.join([
      '      <div id="filters">\n'
-    ,''.join([filter_button(enabled, severity, 'toggleSeverity') for severity in ['error', 'warning', 'portability', 'performance', 'style', 'information']])
-    ,'\n        | '
+    ,severity_bar
+    , classification_bar
     ,''.join([filter_button(enabled, tool, 'toggleTool') for tool in ['cppcheck', 'clang-tidy']])
     ,'\n        | '
-    ,'\n        <label class="severityHeader">File: <input type="search" oninput="filterFile(this.value)"/></label>'
-    ,'\n        <label class="severityHeader">Filter: <input type="search" oninput="filterText(this.value)"/></label>'
+    ,'\n        <label class="severityHeader">File: <input type="search" oninput="filterFile(this.value)"></label>'
+    ,'\n        <label class="severityHeader">Filter: <input type="search" oninput="filterText(this.value)"></label>'
     ,'\n      </div>\n'])
-
 def git_blame(errors, path, file, blame_options):
     last_line= errors[-1]['line']
     if last_line == 0:
@@ -423,9 +492,8 @@ def git_blame(errors, path, file, blame_options):
     full_path = os.path.join(path, file)
     path, filename = os.path.split(full_path)
 
-    cwd = os.getcwd()
-    if path:
-        os.chdir(path)
+    if not path:
+        path = None  # make sure this is None
 
     cmd_args = ['git', 'blame', '-L %d,%d' % (first_line, last_line)]
     if '-w' in blame_options:
@@ -435,12 +503,10 @@ def git_blame(errors, path, file, blame_options):
     cmd_args = cmd_args + ['--porcelain', '--incremental', '--', filename]
 
     try:
-        result = subprocess.check_output(cmd_args)
+        result = subprocess.check_output(cmd_args, cwd=path)
         result = result.decode(locale.getpreferredencoding())
     except:
         return []
-    finally:
-        os.chdir(cwd)
 
     if result.startswith('fatal'):
         return []
@@ -471,14 +537,31 @@ def blame_lookup(blame_data, line):
     return next((data for start, end, data in blame_data if line >= start and line < end), {})
 
 
-def tr_str(td_th, line, id, cwe, severity, message, timestamp, author, author_mail, date, add_author, tr_class=None, htmlfile=None, message_class=None):
+def tr_str(td_th, line, id, cwe, severity, classification, guideline, message, timestamp, author, author_mail, date, add_author, tr_class=None, htmlfile=None, message_class=None):
     ret = ''
+    items = [id, cwe]
+    if severity:
+        items.append(severity)
+    if classification:
+        items.extend([classification, guideline])
     if htmlfile:
-        ret += '<%s><a href="%s#line-%d">%d</a></%s>' % (td_th, htmlfile, line, line, td_th)
-        for item in (id, cwe, severity):
-            ret += '<%s>%s</%s>' % (td_th, item, td_th)
+        if htmlfile.startswith("http://") or htmlfile.startswith("https://"):
+            # GitHub/GitLab style line anchor
+            href = f"{htmlfile.rstrip('#L1')}#L{line}"
+            # Emit **line number with link**
+            ret += f'<{td_th}><a href="{href}" target="_blank" rel="noopener noreferrer">{line}</a></{td_th}>'
+        else:
+            # local HTML annotated
+            href = f"{htmlfile}#line-{line}"
+            # Emit **line number with link**
+            ret += f'<{td_th}><a href="{href}">{line}</a></{td_th}>'
+
+        # Emit id, cwe, severity, classification, ...
+        for item in items:
+            ret += f'<{td_th}>{item}</{td_th}>'
     else:
-        for item in (line, id, cwe, severity):
+        items.insert(0,line)
+        for item in items:
             ret += '<%s>%s</%s>' % (td_th, item, td_th)
     if message_class:
         message_attribute = ' class="%s"' % message_class
@@ -561,6 +644,7 @@ class CppCheckHandler(XmlContentHandler):
         self.version = '1'
         self.versionCppcheck = ''
         self.timestamp = ''
+        self.report_type = False
 
     def startElement(self, name, attributes):
         if name == 'results':
@@ -574,7 +658,10 @@ class CppCheckHandler(XmlContentHandler):
     def handleVersion1(self, name, attributes):
         if name != 'error':
             return
-
+        att_class = attributes.get('classification', '')
+        att_guide = attributes.get('guideline', '')
+        if att_class and not self.report_type:
+            self.report_type = True
         self.errors.append({
             'file': attributes.get('file', ''),
             'line': int(attributes.get('line', 0)),
@@ -584,6 +671,8 @@ class CppCheckHandler(XmlContentHandler):
             }],
             'id': attributes['id'],
             'severity': attributes['severity'],
+            'classification': att_class,
+            'guideline': att_guide,
             'timestamp': self.timestamp,
             'msg': attributes['msg']
         })
@@ -592,12 +681,18 @@ class CppCheckHandler(XmlContentHandler):
         if name == 'cppcheck':
             self.versionCppcheck = attributes['version']
         if name == 'error':
+            att_class = attributes.get('classification', '')
+            att_guide = attributes.get('guideline', '')
+            if att_class and not self.report_type:
+                self.report_type = True
             error = {
                 'locations': [],
                 'file': '',
                 'line': 0,
                 'id': attributes['id'],
+                'classification': att_class,
                 'severity': attributes['severity'],
+                'guideline': att_guide,
                 'timestamp': self.timestamp,
                 'msg': attributes['msg'],
                 'verbose': attributes.get('verbose')
@@ -623,7 +718,6 @@ class CppCheckHandler(XmlContentHandler):
                 'line': line,
                 'info': attributes.get('info')
             })
-
 def main() -> None:
     # Configure all the options this little utility is using.
     parser = argparse.ArgumentParser()
@@ -643,7 +737,9 @@ def main() -> None:
                               'written.')
     parser.add_argument('--source-dir', dest='source_dir',
                          help='Base directory where source code files can be '
-                              'found.')
+                              'found, or a URL to a remote GitHub/GitLab '
+                              'repository including a branch, e.g. '
+                              '--source-dir=https://github.com/<username>/<repo>/blob/<branch>/')
     parser.add_argument('--add-author-information', dest='add_author_information',
                         help='Blame information to include. '
                              'Adds specified author information. '
@@ -669,11 +765,14 @@ def main() -> None:
         parser.error('No report directory set.')
 
     # Get the directory where source code files are located.
-    cwd = os.getcwd()
     source_dir = os.getcwd()
     if options.source_dir:
         source_dir = options.source_dir
 
+    is_remote = False
+    if source_dir.startswith("http://") or source_dir.startswith("https://"):
+        is_remote = True
+
     add_author_information = []
     if options.add_author_information:
         fields = [x.strip() for x in options.add_author_information.split(',')]
@@ -722,9 +821,14 @@ def main() -> None:
     for error in contentHandler.errors:
         filename = error['file']
         if filename not in files:
-            files[filename] = {
-                'errors': [], 'htmlfile': str(file_no) + '.html'}
-            file_no = file_no + 1
+            if is_remote:
+                # Construct remote URL for GitHub/GitLab
+                # tr_str() will use the actual line number, so we can just start with line 1
+                remote_url = source_dir.rstrip('/') + '/' + filename + '#L1'
+                files[filename] = {'errors': [], 'htmlfile': remote_url}
+            else:
+                files[filename] = {'errors': [], 'htmlfile': str(file_no) + '.html'}
+                file_no += 1
         files[filename]['errors'].append(error)
 
     # Make sure that the report directory is created if it doesn't exist.
@@ -751,6 +855,8 @@ def main() -> None:
                     if location.get('info'):
                         newError['msg'] = location['info']
                         newError['severity'] = 'information'
+                        newError['classification'] = ''
+                        newError['guideline'] = ''
                         del newError['verbose']
 
                     errors.append(newError)
@@ -762,6 +868,11 @@ def main() -> None:
         if filename == '':
             continue
 
+        if is_remote:
+            # Remote source: do NOT generate local annotated HTML files.
+            # The index will still point directly to GitHub/GitLab URLs.
+            continue
+
         source_filename = os.path.join(source_dir, filename)
         try:
             with io.open(source_filename, 'r', encoding=options.source_encoding) as input_file:
@@ -804,8 +915,8 @@ def main() -> None:
                     lexer = guess_lexer(content, stripnl=False)
                 except ClassNotFound:
                     sys.stderr.write("ERROR: Couldn't determine lexer for the file' " + source_filename + " '. Won't be able to syntax highlight this file.")
-                    output_file.write("\n <tr><td colspan=\"5\"> Could not generate content because pygments failed to determine the code type.</td></tr>")
-                    output_file.write("\n <tr><td colspan=\"5\"> Sorry about this.</td></tr>")
+                    output_file.write("\n <tr><td colspan=\"6\"> Could not generate content because pygments failed to determine the code type.</td></tr>")
+                    output_file.write("\n <tr><td colspan=\"6\"> Sorry about this.</td></tr>")
                     continue
 
             if options.source_encoding:
@@ -832,7 +943,12 @@ def main() -> None:
         for filename, data in sorted(files.items()):
             for error in data['errors']:
                 stats.append(error['id'])  # get the stats
-                filter_enabled[error['severity']] = True
+                if contentHandler.report_type:
+                    filter_enabled[error['severity']] = False
+                    filter_enabled[error['classification']] = True
+                else:
+                    filter_enabled[error['severity']] = True
+                    filter_enabled[error['classification']] = False
                 filter_enabled['clang-tidy' if error['id'].startswith('clang-tidy-') else 'cppcheck'] = True
                 stats_count += 1
 
@@ -877,9 +993,15 @@ def main() -> None:
         output_file.write(HTML_MENU_END.replace("content", "content_index", 1))
 
         output_file.write('\n       <table class=\"summaryTable\">')
-        output_file.write(
-            '\n       %s' %
-            tr_str('th', 'Line', 'Id', 'CWE', 'Severity', 'Message', 'Timestamp', 'Author', 'Author mail', 'Date (DD/MM/YYYY)', add_author=add_author_information))
+        if contentHandler.report_type:
+            output_file.write(
+                '\n       %s' %
+                tr_str('th', 'Line', 'Id', 'CWE', '', 'Classification', 'Guideline', 'Message', 'Timestamp',
+                       'Author', 'Author mail', 'Date (DD/MM/YYYY)', add_author=add_author_information))
+        else:
+            output_file.write(
+                '\n       %s' %
+                tr_str('th', 'Line', 'Id', 'CWE', 'Severity', '', '', 'Message', 'Timestamp', 'Author', 'Author mail', 'Date (DD/MM/YYYY)', add_author=add_author_information))
 
         for filename, data in sorted(files.items()):
             file_error = filename in decode_errors or filename.endswith('*')
@@ -888,10 +1010,10 @@ def main() -> None:
             htmlfile = data.get('htmlfile') if is_file else None
 
             output_file.write("\n      <tbody class=\"fileEntry\">")
-            output_file.write("\n       <tr><td colspan=\"5\">%s</td></tr>" % row_content)
+            output_file.write("\n       <tr><td colspan=\"6\">%s</td></tr>" % row_content)
 
             if filename in decode_errors:
-                output_file.write("\n       <tr><td colspan=\"5\">Could not generated due to UnicodeDecodeError</td></tr>")
+                output_file.write("\n       <tr><td colspan=\"6\">Could not generated due to UnicodeDecodeError</td></tr>")
 
             sorted_errors = sorted(data['errors'], key=lambda k: k['line'])
             blame_data = git_blame(sorted_errors, source_dir, filename, blame_options) if add_author_information else []
@@ -916,13 +1038,20 @@ def main() -> None:
                     message_class = error['severity']
 
                 line = error["line"] if is_file else ""
-
+                _severity = error.get('severity', '')
+                _classification = error.get('classification', '')
+                _guideline = error.get('guideline', '')
+                if contentHandler.report_type:
+                    _severity = ''
+                    if not _classification:
+                        _classification = 'None'
+                        _guideline = 'None'
                 output_file.write(
                     '\n         %s' %
-                    tr_str('td', line, error["id"], cwe_url, error["severity"], error["msg"], error["timestamp"],
+                    tr_str('td', line, error["id"], cwe_url, _severity, _classification, _guideline, error["msg"], error["timestamp"],
                            git_blame_dict.get('author', 'Unknown'), git_blame_dict.get('author-mail', '---'),
                            git_blame_dict.get('author-time', '---'),
-                           tr_class=to_css_selector(error["id"]) + ' sev_' + error["severity"] + ' issue',
+                           tr_class=to_css_selector(error["id"]) + ' sev_' + _severity  +' class_' + _classification + ' issue',
                            message_class=message_class,
                            add_author=add_author_information,
                            htmlfile=htmlfile))
@@ -935,7 +1064,6 @@ def main() -> None:
         sys.stderr.write("\nConsider changing source-encoding (for example: \"htmlreport ... --source-encoding=\"iso8859-1\"\"\n")
 
     print('Creating style.css file')
-    os.chdir(cwd)       # going back to the cwd to find style.css
     with io.open(os.path.join(options.report_dir, 'style.css'), 'w') as css_file:
         css_file.write(STYLE_FILE)
 
diff --git a/htmlreport/setup.py b/htmlreport/setup.py
index 3e049181ce6..9f85000a090 100755
--- a/htmlreport/setup.py
+++ b/htmlreport/setup.py
@@ -16,7 +16,7 @@
     ),
     long_description=readme,
     author="Cppcheck Team",
-    url="https://github.com/danmar/cppcheck",
+    url="https://github.com/cppcheck-opensource/cppcheck",
     license="GPL",
     packages=find_packages(exclude=("tests", "docs")),
     use_scm_version={"root": ".."},
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 7a884164761..b826bc0b265 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,6 +12,8 @@ function(build_src output filename)
     set(${output} ${${output}} ${outfile} PARENT_SCOPE)
     if (USE_MATCHCOMPILER_OPT STREQUAL "Verify")
         set(verify_option "--verify")
+    else()
+        set(verify_option "")
     endif()
     add_custom_command(
         OUTPUT ${outfile}
@@ -28,6 +30,7 @@ function(build_src output filename)
 endfunction()
 
 if (NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
+    set(srcs_build "")
     foreach(file ${srcs})
         build_src(srcs_build ${file})
     endforeach()
@@ -37,25 +40,26 @@ else()
     set(srcs_lib ${srcs})
 endif()
 
-if (BUILD_CORE_DLL)
-    add_library(cppcheck-core SHARED ${srcs_lib} ${hdrs} $<TARGET_OBJECTS:tinyxml2_objs> $<TARGET_OBJECTS:simplecpp_objs> version.rc)
-    target_compile_definitions(cppcheck-core PRIVATE CPPCHECKLIB_EXPORT TINYXML2_EXPORT SIMPLECPP_EXPORT)
+if(BUILD_SHARED_LIBS)
+    add_library(cppcheck-core ${srcs_lib} ${hdrs})
 else()
+    # A OBJECT library is used because the auto-registration doesn't work with static libraries
     add_library(cppcheck-core OBJECT ${srcs_lib} ${hdrs})
 endif()
-target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/)
-if(USE_BUNDLED_TINYXML2)
-    target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-else()
-    target_include_directories(cppcheck-core SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
+if (BUILD_SHARED_LIBS AND MSVC)
+    target_sources(cppcheck-core PRIVATE version.rc)
 endif()
-target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
-target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
+
+target_dll_compile_definitions(cppcheck-core EXPORT CPPCHECKLIB_EXPORT IMPORT CPPCHECKLIB_IMPORT)
+
+target_include_directories(cppcheck-core PUBLIC .)
+target_link_libraries(cppcheck-core PRIVATE tinyxml2 simplecpp picojson ${PCRE_LIBRARY})
+
 if (HAVE_RULES)
     target_include_directories(cppcheck-core SYSTEM PRIVATE ${PCRE_INCLUDE})
 endif()
 if (Boost_FOUND)
-    target_include_directories(cppcheck-core SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
+    target_include_directories(cppcheck-core SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
 endif()
 
 if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
index 82effa13834..388484916ea 100644
--- a/lib/addoninfo.cpp
+++ b/lib/addoninfo.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -34,25 +34,41 @@ static std::string getFullPath(const std::string &fileName, const std::string &e
     if (Path::isFile(fileName))
         return fileName;
 
+    const bool is_abs_path = Path::isAbsolute(fileName);
+    if (is_abs_path)
+        return "";
+
     const std::string exepath = Path::getPathFromFilename(exename);
-    if (debug)
-        std::cout << "looking for addon '" << (exepath + fileName) << "'" << std::endl;
-    if (Path::isFile(exepath + fileName))
-        return exepath + fileName;
-    if (debug)
-        std::cout << "looking for addon '" << (exepath + "addons/" + fileName) << "'" << std::endl;
-    if (Path::isFile(exepath + "addons/" + fileName))
-        return exepath + "addons/" + fileName;
+    {
+        std::string p = Path::join(exepath, fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
+    {
+        std::string p = Path::join(exepath, "addons", fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
 
 #ifdef FILESDIR
-    if (debug)
-        std::cout << "looking for addon '" << (FILESDIR + ("/" + fileName)) << "'" << std::endl;
-    if (Path::isFile(FILESDIR + ("/" + fileName)))
-        return FILESDIR + ("/" + fileName);
-    if (debug)
-        std::cout << "looking for addon '" << (FILESDIR + ("/addons/" + fileName)) << "'" << std::endl;
-    if (Path::isFile(FILESDIR + ("/addons/" + fileName)))
-        return FILESDIR + ("/addons/" + fileName);
+    {
+        std::string p = Path::join(FILESDIR, fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
+    {
+        std::string p = Path::join(FILESDIR, "addons", fileName);
+        if (debug)
+            std::cout << "looking for addon '" << p << "'" << std::endl;
+        if (Path::isFile(p))
+            return p;
+    }
 #endif
     return "";
 }
@@ -110,6 +126,28 @@ static std::string parseAddonInfo(AddonInfo& addoninfo, const picojson::value &j
         }
     }
 
+    {
+        const auto it = obj.find("checkers");
+        if (it != obj.cend()) {
+            const auto& val = it->second;
+            if (!val.is<picojson::array>())
+                return "Loading " + fileName + " failed. 'checkers' must be an array.";
+            for (const picojson::value &v : val.get<picojson::array>()) {
+                if (!v.is<picojson::object>())
+                    return "Loading " + fileName + " failed. 'checkers' entry is not an object.";
+
+                const picojson::object& checkerObj = v.get<picojson::object>();
+                if (checkerObj.size() == 1) {
+                    const std::string c = checkerObj.begin()->first;
+                    if (!checkerObj.begin()->second.is<std::string>())
+                        return "Loading " + fileName + " failed. 'checkers' entry requirement is not a string.";
+                    const std::string req = checkerObj.begin()->second.get<std::string>();
+                    addoninfo.checkers.emplace(c, req);
+                }
+            }
+        }
+    }
+
     {
         const auto it = obj.find("executable");
         if (it != obj.cend()) {
diff --git a/lib/addoninfo.h b/lib/addoninfo.h
index 592833c2162..902a26c2e12 100644
--- a/lib/addoninfo.h
+++ b/lib/addoninfo.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string>
+#include <map>
 
 struct CPPCHECKLIB AddonInfo {
     std::string name;
@@ -31,6 +32,7 @@ struct CPPCHECKLIB AddonInfo {
     std::string python;     // script interpreter
     bool ctu = false;
     std::string runScript;
+    std::map<std::string, std::string> checkers; // checker name and its requirement
 
     std::string getAddonInfo(const std::string &fileName, const std::string &exename, bool debug = false);
 };
diff --git a/lib/analyzer.h b/lib/analyzer.h
index a02e6b11d63..9b87310530f 100644
--- a/lib/analyzer.h
+++ b/lib/analyzer.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -153,9 +153,13 @@ struct Analyzer {
     struct Assume {
         enum Flags : std::uint8_t {
             None = 0,
-            Quiet = (1 << 0),
-            Absolute = (1 << 1),
-            ContainerEmpty = (1 << 2),
+            Quiet = (1u << 0),
+            Absolute = (1u << 1),
+            ContainerEmpty = (1u << 2),
+            // The branch this condition guards is not traversed yet (a separate path walks it), so
+            // the assume must not record the program state at the branch boundaries - they would be
+            // premature. When unset, the branch has been traversed and control is leaving it.
+            Pending = (1u << 3),
         };
     };
 
@@ -186,7 +190,7 @@ struct Analyzer {
     /// Update the state of the program at the token
     virtual void updateState(const Token* tok) = 0;
     /// Return analyzer for expression at token
-    virtual ValuePtr<Analyzer> reanalyze(Token* tok, const std::string& msg = emptyString) const = 0;
+    virtual ValuePtr<Analyzer> reanalyze(Token* tok, const std::string& msg = "") const = 0;
     virtual bool invalid() const {
         return false;
     }
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index dfb953c9445..aa8d82c27fa 100644
--- a/lib/analyzerinfo.cpp
+++ b/lib/analyzerinfo.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,9 +23,14 @@
 #include "path.h"
 #include "utils.h"
 
+#include <array>
 #include <cstring>
+#include <exception>
+#include <iostream>
 #include <map>
 #include <sstream>
+#include <stdexcept>
+#include <utility>
 
 #include "xml.h"
 
@@ -46,14 +51,76 @@ static std::string getFilename(const std::string &fullpath)
     return fullpath.substr(pos1,pos2);
 }
 
-void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings)
+void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings)
 {
     const std::string filesTxt(buildDir + "/files.txt");
     std::ofstream fout(filesTxt);
-    fout << getFilesTxt(sourcefiles, userDefines, fileSettings);
+    fout << getFilesTxt(sourcefiles, fileSettings);
 }
 
-std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings) {
+void AnalyzerInformation::writeIncludes(const std::set<std::string> &files)
+{
+    if (!files.empty() && mOutputStream.is_open()) {
+        mOutputStream << "  <includes>\n";
+        for (const std::string &file : files) {
+            mOutputStream << "    <filename>" << file << "</filename>\n";
+        }
+        mOutputStream << "  </includes>\n";
+    }
+}
+
+std::set<std::string> AnalyzerInformation::getIncludes(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId) const
+{
+    if (mOutputStream.is_open())
+        throw std::runtime_error("analyzer information file is already open");
+
+    std::set<std::string> files;
+
+    if (buildDir.empty() || sourcefile.empty())
+        return files;
+
+    const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir, sourcefile, cfg, fsFileId);
+
+    tinyxml2::XMLDocument analyzerInfoDoc;
+    if (analyzerInfoDoc.LoadFile(analyzerInfoFile.c_str()) != tinyxml2::XML_SUCCESS)
+        return files;
+
+    const tinyxml2::XMLElement *const rootNode = analyzerInfoDoc.FirstChildElement();
+    if (rootNode == nullptr)
+        return files;
+
+    if (strcmp(rootNode->Name(), "analyzerinfo") != 0)
+        return files;
+
+    const tinyxml2::XMLElement *includesNode = nullptr;
+    for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        if (strcmp(e->Name(), "includes") == 0) {
+            includesNode = e;
+            break;
+        }
+    }
+
+    if (includesNode == nullptr)
+        return files;
+
+    for (const tinyxml2::XMLElement *e = includesNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        if (strcmp(e->Name(), "filename") != 0)
+            continue;
+
+        files.insert(e->GetText());
+    }
+
+    return files;
+}
+
+void AnalyzerInformation::writeHash(std::size_t hash)
+{
+    if (mOutputStream.is_open()) {
+        mOutputStream << "  <hash>" << hash << "</hash>\n";
+    }
+}
+
+std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings) {
     std::ostringstream ret;
 
     std::map<std::string, unsigned int> fileCount;
@@ -61,13 +128,11 @@ std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourc
     for (const std::string &f : sourcefiles) {
         const std::string afile = getFilename(f);
         ret << afile << ".a" << (++fileCount[afile]) << sep << sep << sep << Path::simplifyPath(f) << '\n';
-        if (!userDefines.empty())
-            ret << afile << ".a" << (++fileCount[afile]) << sep << userDefines << sep << sep << Path::simplifyPath(f) << '\n';
     }
 
     for (const FileSettings &fs : fileSettings) {
         const std::string afile = getFilename(fs.filename());
-        const std::string id = fs.fileIndex > 0 ? std::to_string(fs.fileIndex) : "";
+        const std::string id = fs.file.fsFileId() > 0 ? std::to_string(fs.file.fsFileId()) : "";
         ret << afile << ".a" << (++fileCount[afile]) << sep << fs.cfg << sep << id << sep << Path::simplifyPath(fs.filename()) << std::endl;
     }
 
@@ -76,56 +141,78 @@ std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourc
 
 void AnalyzerInformation::close()
 {
-    mAnalyzerInfoFile.clear();
     if (mOutputStream.is_open()) {
         mOutputStream << "</analyzerinfo>\n";
         mOutputStream.close();
     }
 }
 
-static bool skipAnalysis(const std::string &analyzerInfoFile, std::size_t hash, std::list<ErrorMessage> &errors)
+std::string AnalyzerInformation::skipAnalysis(const tinyxml2::XMLDocument &analyzerInfoDoc, std::size_t hash, std::list<ErrorMessage> &errors)
 {
-    tinyxml2::XMLDocument doc;
-    const tinyxml2::XMLError error = doc.LoadFile(analyzerInfoFile.c_str());
-    if (error != tinyxml2::XML_SUCCESS)
-        return false;
-
-    const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
+    const tinyxml2::XMLElement * const rootNode = analyzerInfoDoc.FirstChildElement();
     if (rootNode == nullptr)
-        return false;
+        return "no root node found";
 
-    const char *attr = rootNode->Attribute("hash");
-    if (!attr || attr != std::to_string(hash))
-        return false;
+    if (strcmp(rootNode->Name(), "analyzerinfo") != 0)
+        return "unexpected root node";
 
+    const tinyxml2::XMLElement *hashNode = nullptr;
     for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
-        if (std::strcmp(e->Name(), "error") == 0)
-            errors.emplace_back(e);
+        if (strcmp(e->Name(), "hash") == 0) {
+            hashNode = e;
+            break;
+        }
     }
 
-    return true;
+    if (!hashNode)
+        return "no 'hash' node found";
+    if (hashNode->GetText() != std::to_string(hash))
+        return "hash mismatch";
+
+    for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        if (std::strcmp(e->Name(), "error") != 0)
+            continue;
+
+        // TODO: discarding results on internalError doesn't make sense since that won't fix itself
+        // Check for invalid license error or internal error, in which case we should retry analysis
+        static const std::array<const char*, 3> s_ids{
+            "premium-invalidLicense",
+            "premium-internalError",
+            "internalError"
+        };
+        for (const auto* id : s_ids)
+        {
+            // cppcheck-suppress useStlAlgorithm
+            if (e->Attribute("id", id)) {
+                errors.clear();
+                return std::string("'") + id + "' encountered";
+            }
+        }
+
+        errors.emplace_back(e);
+    }
+
+    return "";
 }
 
-std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, int fileIndex)
+std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, size_t fsFileId)
 {
-    const std::string id = (fileIndex > 0) ? std::to_string(fileIndex) : "";
     std::string line;
-    const std::string end(sep + cfg + sep + id + sep + Path::simplifyPath(sourcefile));
     while (std::getline(filesTxt,line)) {
-        if (line.size() <= end.size() + 2U)
-            continue;
-        if (!endsWith(line, end.c_str(), end.size()))
-            continue;
-        return line.substr(0,line.find(sep));
+        AnalyzerInformation::Info filesTxtInfo;
+        if (!filesTxtInfo.parse(line))
+            continue; // TODO: report error?
+        if (endsWith(sourcefile, filesTxtInfo.sourceFile) && filesTxtInfo.cfg == cfg && filesTxtInfo.fsFileId == fsFileId)
+            return filesTxtInfo.afile;
     }
     return "";
 }
 
-std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex)
+std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId)
 {
     std::ifstream fin(Path::join(buildDir, "files.txt"));
     if (fin.is_open()) {
-        const std::string& ret = getAnalyzerInfoFileFromFilesTxt(fin, sourcefile, cfg, fileIndex);
+        const std::string& ret = getAnalyzerInfoFileFromFilesTxt(fin, sourcefile, cfg, fsFileId);
         if (!ret.empty())
             return Path::join(buildDir, ret);
     }
@@ -136,28 +223,48 @@ std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir
         filename = sourcefile;
     else
         filename = sourcefile.substr(pos + 1);
-    return Path::join(buildDir, filename) + ".analyzerinfo";
+    // TODO: is this correct? the above code will return files ending in '.aN'. Also does not consider the ID
+    return Path::join(buildDir, std::move(filename)) + ".analyzerinfo";
 }
 
-bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex, std::size_t hash, std::list<ErrorMessage> &errors)
+bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId, std::size_t hash, std::list<ErrorMessage> &errors, bool debug)
 {
+    if (mOutputStream.is_open())
+        throw std::runtime_error("analyzer information file is already open");
+
     if (buildDir.empty() || sourcefile.empty())
         return true;
-    close();
 
-    mAnalyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg,fileIndex);
-
-    if (skipAnalysis(mAnalyzerInfoFile, hash, errors))
-        return false;
-
-    mOutputStream.open(mAnalyzerInfoFile);
-    if (mOutputStream.is_open()) {
-        mOutputStream << "<?xml version=\"1.0\"?>\n";
-        mOutputStream << "<analyzerinfo hash=\"" << hash << "\">\n";
-    } else {
-        mAnalyzerInfoFile.clear();
+    const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg,fsFileId);
+
+    {
+        tinyxml2::XMLDocument analyzerInfoDoc;
+        const tinyxml2::XMLError xmlError = analyzerInfoDoc.LoadFile(analyzerInfoFile.c_str());
+        if (xmlError == tinyxml2::XML_SUCCESS) {
+            const std::string err = skipAnalysis(analyzerInfoDoc, hash, errors);
+            if (err.empty()) {
+                if (debug)
+                    std::cout << "skipping analysis - loaded " << errors.size() << " cached finding(s) from '" << analyzerInfoFile << "' for '" << sourcefile <<  "'" << std::endl;
+                return false;
+            }
+            if (debug) {
+                std::cout << "discarding cached result from '" << analyzerInfoFile << "' for '" << sourcefile << "' - " << err << std::endl;
+            }
+        }
+        else if (xmlError != tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
+            if (debug)
+                std::cout << "discarding cached result - failed to load '" << analyzerInfoFile << "' for '" << sourcefile << "' (" << tinyxml2::XMLDocument::ErrorIDToName(xmlError) << ")" << std::endl;
+        }
+        else if (debug)
+            std::cout << "no cached result '" << analyzerInfoFile << "' for '" << sourcefile << "' found" << std::endl;
     }
 
+    mOutputStream.open(analyzerInfoFile);
+    if (!mOutputStream.is_open())
+        throw std::runtime_error("failed to open '" + analyzerInfoFile + "'");
+    mOutputStream << "<?xml version=\"1.0\"?>\n";
+    mOutputStream << "<analyzerinfo>\n";
+
     return true;
 }
 
@@ -173,6 +280,7 @@ void AnalyzerInformation::setFileInfo(const std::string &check, const std::strin
         mOutputStream << "  <FileInfo check=\"" << check << "\">\n" << fileInfo << "  </FileInfo>\n";
 }
 
+// TODO: report detailed errors?
 bool AnalyzerInformation::Info::parse(const std::string& filesTxtLine) {
     const std::string::size_type sep1 = filesTxtLine.find(sep);
     if (sep1 == std::string::npos)
@@ -185,10 +293,10 @@ bool AnalyzerInformation::Info::parse(const std::string& filesTxtLine) {
         return false;
 
     if (sep3 == sep2 + 1)
-        fileIndex = 0;
+        fsFileId = 0;
     else {
         try {
-            fileIndex = std::stoi(filesTxtLine.substr(sep2+1, sep3-sep2-1));
+            fsFileId = std::stoi(filesTxtLine.substr(sep2+1, sep3-sep2-1));
         } catch (const std::exception&) {
             return false;
         }
@@ -200,3 +308,78 @@ bool AnalyzerInformation::Info::parse(const std::string& filesTxtLine) {
     return true;
 }
 
+std::string AnalyzerInformation::processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler, bool debug)
+{
+    const std::string filesTxt(buildDir + "/files.txt");
+    std::ifstream fin(filesTxt.c_str());
+    std::string filesTxtLine;
+    while (std::getline(fin, filesTxtLine)) {
+        AnalyzerInformation::Info filesTxtInfo;
+        if (!filesTxtInfo.parse(filesTxtLine))
+            return "failed to parse '" + filesTxtLine + "' from '" + filesTxt + "'";
+
+        if (filesTxtInfo.afile.empty())
+            return "empty afile from '" + filesTxt + "'";
+
+        const std::string xmlfile = buildDir + '/' + filesTxtInfo.afile;
+
+        tinyxml2::XMLDocument doc;
+        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
+        if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
+            /* FIXME: this can currently not be reported as an error because:
+             * - --clang does not generate any analyzer information - see #14456
+             * - markup files might not generate analyzer information
+             * - files with preprocessor errors might not generate analyzer information
+             */
+            if (debug)
+                std::cout << "'" + xmlfile + "' from '" + filesTxt + "' not found";
+            continue;
+        }
+
+        if (error != tinyxml2::XML_SUCCESS)
+            return "failed to load '" + xmlfile + "' from '" + filesTxt + "'";
+
+        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
+        if (rootNode == nullptr)
+            return "no root node found in '" + xmlfile + "' from '" + filesTxt + "'";
+
+        if (strcmp(rootNode->Name(), "analyzerinfo") != 0)
+            return "unexpected root node in '" + xmlfile + "' from '" + filesTxt + "'";
+
+        for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+            if (std::strcmp(e->Name(), "FileInfo") != 0)
+                continue;
+            const char *checkattr = e->Attribute("check");
+            if (checkattr == nullptr) {
+                if (debug)
+                    std::cout << "'check' attribute missing in 'FileInfo' in '" << xmlfile << "' from '" << filesTxt + "'";
+                continue;
+            }
+            handler(checkattr, e, filesTxtInfo);
+        }
+    }
+
+    // TODO: error on empty file?
+    return "";
+}
+
+void AnalyzerInformation::reopen(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId)
+{
+    if (buildDir.empty() || sourcefile.empty())
+        return;
+
+    const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg,fsFileId);
+    std::ifstream ifs(analyzerInfoFile);
+    if (!ifs.is_open())
+        return;
+
+    std::ostringstream iss;
+    iss << ifs.rdbuf();
+    ifs.close();
+
+    std::string content = iss.str();
+    content.resize(content.find("</analyzerinfo>"));
+
+    mOutputStream.open(analyzerInfoFile, std::ios::trunc);
+    mOutputStream << content;
+}
diff --git a/lib/analyzerinfo.h b/lib/analyzerinfo.h
index e5466906707..75ff519db84 100644
--- a/lib/analyzerinfo.h
+++ b/lib/analyzerinfo.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,12 +25,19 @@
 
 #include <cstddef>
 #include <fstream>
+#include <functional>
 #include <list>
+#include <set>
 #include <string>
 
 class ErrorMessage;
 struct FileSettings;
 
+namespace tinyxml2 {
+    class XMLDocument;
+    class XMLElement;
+}
+
 /// @addtogroup Core
 /// @{
 
@@ -51,16 +58,22 @@ class CPPCHECKLIB AnalyzerInformation {
 public:
     ~AnalyzerInformation();
 
-    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
-
-    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
+    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
 
     /** Close current TU.analyzerinfo file */
     void close();
-    bool analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex, std::size_t hash, std::list<ErrorMessage> &errors);
+    /**
+     * @throws std::runtime_error thrown if the output file is already open or the output file cannot be opened
+     */
+    bool analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId, std::size_t hash, std::list<ErrorMessage> &errors, bool debug = false);
     void reportErr(const ErrorMessage &msg);
     void setFileInfo(const std::string &check, const std::string &fileInfo);
-    static std::string getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex);
+    void writeIncludes(const std::set<std::string> &files);
+    std::set<std::string> getIncludes(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId) const;
+    void writeHash(std::size_t hash);
+    static std::string getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId);
+
+    void reopen(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t fsFileId);
 
     static const char sep = ':';
 
@@ -69,15 +82,21 @@ class CPPCHECKLIB AnalyzerInformation {
         bool parse(const std::string& filesTxtLine);
         std::string afile;
         std::string cfg;
-        int fileIndex = 0;
+        std::size_t fsFileId = 0;
         std::string sourceFile;
     };
 
+    static std::string processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler, bool debug = false);
+
 protected:
-    static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, int fileIndex);
+    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::list<FileSettings> &fileSettings);
+
+    static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, size_t fsFileId);
+
+    static std::string skipAnalysis(const tinyxml2::XMLDocument &analyzerInfoDoc, std::size_t hash, std::list<ErrorMessage> &errors);
+
 private:
     std::ofstream mOutputStream;
-    std::string mAnalyzerInfoFile;
 };
 
 /// @}
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index 306cf546aeb..25249e7be6f 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -37,7 +37,6 @@
 #include "checkclass.h"
 
 #include <algorithm>
-#include <cassert>
 #include <cstring>
 #include <functional>
 #include <initializer_list>
@@ -109,7 +108,7 @@ static int getArgumentPos(const Token* ftok, const Token* tokToFind){
 }
 
 template<class T, class OuputIterator, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-static void astFlattenCopy(T* tok, const char* op, OuputIterator out, nonneg int depth = 100)
+static void astFlattenCopy(T* tok, const char* op, OuputIterator out, int depth = 100)
 {
     --depth;
     if (!tok || depth < 0)
@@ -321,12 +320,12 @@ Library::Container::Yield astContainerYield(const Token* tok, const Library& lib
     return ftokCont.second->getYield(ftokCont.first->str());
 }
 
-Library::Container::Yield astFunctionYield(const Token* tok, const Settings& settings, const Token** ftok)
+Library::Container::Yield astFunctionYield(const Token* tok, const Library& library, const Token** ftok)
 {
     if (!tok)
         return Library::Container::Yield::NO_YIELD;
 
-    const auto* function = settings.library.getFunction(tok);
+    const auto* function = library.getFunction(tok);
     if (!function)
         return Library::Container::Yield::NO_YIELD;
 
@@ -401,6 +400,8 @@ const Token * astIsVariableComparison(const Token *tok, const std::string &comp,
     }
     while (ret && ret->str() == ".")
         ret = ret->astOperand2();
+    while (ret && ret->isCast())
+        ret = ret->astOperand2() ? ret->astOperand2() : ret->astOperand1();
     if (ret && ret->str() == "=" && ret->astOperand1() && ret->astOperand1()->varId())
         ret = ret->astOperand1();
     else if (ret && ret->varId() == 0U)
@@ -429,6 +430,12 @@ bool isStlStringType(const Token* tok)
            (Token::simpleMatch(tok, "std :: basic_string <") && !Token::simpleMatch(tok->linkAt(3), "> ::"));
 }
 
+bool isVoidCast(const Token* tok)
+{
+    return Token::simpleMatch(tok, "(") && tok->isCast() && tok->valueType() &&
+           tok->valueType()->type == ValueType::Type::VOID && tok->valueType()->pointer == 0;
+}
+
 bool isTemporary(const Token* tok, const Library* library, bool unknown)
 {
     if (!tok)
@@ -456,7 +463,7 @@ bool isTemporary(const Token* tok, const Library* library, bool unknown)
             return false;
         return !branchTok->astOperand1()->valueType()->isTypeEqual(branchTok->astOperand2()->valueType());
     }
-    if (Token::simpleMatch(tok, "(") && tok->astOperand1() &&
+    if (Token::Match(tok, "(|{") && tok->astOperand1() &&
         (tok->astOperand2() || Token::simpleMatch(tok->next(), ")"))) {
         if (Token::simpleMatch(tok->astOperand1(), "typeid"))
             return false;
@@ -488,14 +495,9 @@ bool isTemporary(const Token* tok, const Library* library, bool unknown)
         }
         return unknown;
     }
-    if (tok->isCast())
-        return false;
     // Currying a function is unknown in cppcheck
     if (Token::simpleMatch(tok, "(") && Token::simpleMatch(tok->astOperand1(), "("))
         return unknown;
-    if (Token::simpleMatch(tok, "{") && Token::simpleMatch(tok->astParent(), "return") && tok->astOperand1() &&
-        !tok->astOperand2())
-        return isTemporary(tok->astOperand1(), library);
     return true;
 }
 
@@ -775,10 +777,11 @@ std::vector<ValueType> getParentValueTypes(const Token* tok, const Settings& set
                 if (scope && scope->numConstructors == 0 && t->derivedFrom.empty() &&
                     (t->isClassType() || t->isStructType()) && numberOfArguments(ftok) <= scope->varlist.size() &&
                     !scope->varlist.empty()) {
-                    assert(argn < scope->varlist.size());
-                    auto it = std::next(scope->varlist.cbegin(), argn);
-                    if (it->valueType())
-                        return {*it->valueType()};
+                    if (argn < scope->varlist.size()) {
+                        auto it = std::next(scope->varlist.cbegin(), argn);
+                        if (it->valueType())
+                            return { *it->valueType() };
+                    }
                 }
             }
         }
@@ -1016,6 +1019,11 @@ const Token* isInLoopCondition(const Token* tok)
     return Token::Match(top->previous(), "for|while (") ? top : nullptr;
 }
 
+bool isDesignatedInitializer(const Token* tok)
+{
+    return tok && tok->isUnaryOp(".");
+}
+
 /// If tok2 comes after tok1
 bool precedes(const Token * tok1, const Token * tok2)
 {
@@ -1061,17 +1069,30 @@ bool isAliasOf(const Token *tok, nonneg int varid, bool* inconclusive)
     return false;
 }
 
-bool isAliasOf(const Token* tok, const Token* expr, int* indirect)
+bool isIteratorOf(const Token* tok, nonneg int exprId)
+{
+    if (!astIsIterator(tok))
+        return false;
+    // An iterator into a subcontainer (e.g. c[0].begin()) aliases the container but iterates
+    // an unrelated range, so require an iterator value recording the container itself
+    return std::any_of(tok->values().cbegin(), tok->values().cend(), [&](const ValueFlow::Value& v) {
+        return v.isIteratorValue() && v.container && v.container->exprId() == exprId;
+    });
+}
+
+bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect)
 {
-    const Token* r = nullptr;
     if (indirect)
         *indirect = 1;
-    for (const ReferenceToken& ref : followAllReferences(tok)) {
+    if (!tok)
+        return false;
+    const Token* r = nullptr;
+    for (const ReferenceToken& ref : tok->refs()) {
         const bool pointer = astIsPointer(ref.token);
         r = findAstNode(expr, [&](const Token* childTok) {
             if (childTok->exprId() == 0)
                 return false;
-            if (ref.token != tok && expr->exprId() == childTok->exprId()) {
+            if (ref.token != tok && expr->exprId() == childTok->exprId() && ref.token->isUnaryOp("*") && expr->exprId() == ref.token->astOperand1()->exprId()) {
                 if (indirect)
                     *indirect = 0;
                 return true;
@@ -1196,6 +1217,8 @@ static const Token * followVariableExpression(const Settings& settings, const To
         return tok;
     if (hasUnknownVars(varTok))
         return tok;
+    if (astIsRangeBasedForDecl(var->nameToken()))
+        return tok;
     if (var->isVolatile())
         return tok;
     if (!var->isLocal() && !var->isConst())
@@ -1212,7 +1235,8 @@ static const Token * followVariableExpression(const Settings& settings, const To
     const Token * lastTok = precedes(tok, end) ? end : tok;
     // If this is in a loop then check if variables are modified in the entire scope
     const Token * endToken = (isInLoopCondition(tok) || isInLoopCondition(varTok) || var->scope() != tok->scope()) ? var->scope()->bodyEnd : lastTok;
-    if (!var->isConst() && (!precedes(varTok, endToken) || isVariableChanged(varTok, endToken, tok->varId(), false, settings)))
+    const int indirect = var->isArray() ? var->dimensions().size() : 0;
+    if (!var->isConst() && (!precedes(varTok, endToken) || isVariableChanged(varTok, endToken, indirect, tok->varId(), false, settings)))
         return tok;
     if (precedes(varTok, endToken) && isAliased(varTok, endToken, tok->varId()))
         return tok;
@@ -1244,11 +1268,11 @@ static void followVariableExpressionError(const Token *tok1, const Token *tok2,
     errors->push_back(std::move(item));
 }
 
-SmallVector<ReferenceToken> followAllReferences(const Token* tok,
-                                                bool temporary,
-                                                bool inconclusive,
-                                                ErrorPath errors,
-                                                int depth)
+static SmallVector<ReferenceToken> followAllReferencesInternal(const Token* tok,
+                                                               bool temporary = true,
+                                                               bool inconclusive = true,
+                                                               ErrorPath errors = ErrorPath{},
+                                                               int depth = 20)
 {
     struct ReferenceTokenLess {
         bool operator()(const ReferenceToken& x, const ReferenceToken& y) const {
@@ -1294,16 +1318,16 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
                     return refs_result;
                 }
                 if (vartok)
-                    return followAllReferences(vartok, temporary, inconclusive, std::move(errors), depth - 1);
+                    return followAllReferencesInternal(vartok, temporary, inconclusive, std::move(errors), depth - 1);
             }
         }
     } else if (Token::simpleMatch(tok, "?") && Token::simpleMatch(tok->astOperand2(), ":")) {
         std::set<ReferenceToken, ReferenceTokenLess> result;
         const Token* tok2 = tok->astOperand2();
 
-        auto refs = followAllReferences(tok2->astOperand1(), temporary, inconclusive, errors, depth - 1);
+        auto refs = followAllReferencesInternal(tok2->astOperand1(), temporary, inconclusive, errors, depth - 1);
         result.insert(refs.cbegin(), refs.cend());
-        refs = followAllReferences(tok2->astOperand2(), temporary, inconclusive, errors, depth - 1);
+        refs = followAllReferencesInternal(tok2->astOperand2(), temporary, inconclusive, errors, depth - 1);
         result.insert(refs.cbegin(), refs.cend());
 
         if (!inconclusive && result.size() != 1) {
@@ -1331,7 +1355,7 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
             if (returnTok == tok)
                 continue;
             for (const ReferenceToken& rt :
-                 followAllReferences(returnTok, temporary, inconclusive, errors, depth - returns.size())) {
+                 followAllReferencesInternal(returnTok, temporary, inconclusive, errors, depth - returns.size())) {
                 const Variable* argvar = rt.token->variable();
                 if (!argvar) {
                     SmallVector<ReferenceToken> refs_result;
@@ -1356,7 +1380,7 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
                     er.emplace_back(returnTok, "Return reference.");
                     er.emplace_back(tok->previous(), "Called function passing '" + argTok->expressionString() + "'.");
                     auto refs =
-                        followAllReferences(argTok, temporary, inconclusive, std::move(er), depth - returns.size());
+                        followAllReferencesInternal(argTok, temporary, inconclusive, std::move(er), depth - returns.size());
                     result.insert(refs.cbegin(), refs.cend());
                     if (!inconclusive && result.size() > 1) {
                         SmallVector<ReferenceToken> refs_result;
@@ -1377,11 +1401,16 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
     return refs_result;
 }
 
+SmallVector<ReferenceToken> followAllReferences(const Token* tok, bool temporary)
+{
+    return followAllReferencesInternal(tok, temporary);
+}
+
 const Token* followReferences(const Token* tok, ErrorPath* errors)
 {
     if (!tok)
         return nullptr;
-    auto refs = followAllReferences(tok, true, false);
+    auto refs = followAllReferencesInternal(tok, true, false);
     if (refs.size() == 1) {
         if (errors)
             *errors = std::move(refs.front().errors);
@@ -1409,7 +1438,7 @@ static bool compareKnownValue(const Token * const tok1, const Token * const tok2
     if (v1 == tok1->values().end()) {
         return false;
     }
-    if (v1->isNonValue() || v1->isContainerSizeValue() || v1->isSymbolicValue())
+    if (v1->isNonValue() || v1->isContainerSizeValue() || v1->isBufferSizeValue() || v1->isSymbolicValue())
         return false;
     const auto v2 = std::find_if(tok2->values().cbegin(), tok2->values().cend(), isKnownFn);
     if (v2 == tok2->values().end()) {
@@ -1523,10 +1552,8 @@ bool isUsedAsBool(const Token* const tok, const Settings& settings)
         return true;
     if (parent->isCast())
         return !Token::simpleMatch(parent->astOperand1(), "dynamic_cast") && isUsedAsBool(parent, settings);
-    if (parent->isUnaryOp("*"))
-        return isUsedAsBool(parent, settings);
-    if (Token::Match(parent, "==|!=") && (tok->astSibling()->isNumber() || tok->astSibling()->isKeyword()) && tok->astSibling()->hasKnownIntValue() &&
-        tok->astSibling()->getKnownIntValue() == 0)
+    if (Token::Match(parent, "==|!=") && tok->valueType() && tok->valueType()->pointer &&
+        tok->astSibling()->hasKnownIntValue() && tok->astSibling()->getKnownIntValue() == 0)
         return true;
     if (parent->str() == "(" && astIsRHS(tok) && Token::Match(parent->astOperand1(), "if|while"))
         return true;
@@ -1599,10 +1626,14 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
         return false;
 
     const Token *followTok1 = tok1, *followTok2 = tok2;
-    while (Token::simpleMatch(followTok1, "::") && followTok1->astOperand2())
-        followTok1 = followTok1->astOperand2();
-    while (Token::simpleMatch(followTok2, "::") && followTok2->astOperand2())
-        followTok2 = followTok2->astOperand2();
+    while (Token::simpleMatch(followTok1, "::"))
+        followTok1 = followTok1->astOperand2() ? followTok1->astOperand2() : followTok1->astOperand1();
+    if (!followTok1)
+        followTok1 = tok1; // TODO: remove after #14235 has been fixed
+    while (Token::simpleMatch(followTok2, "::"))
+        followTok2 = followTok2->astOperand2() ? followTok2->astOperand2() : followTok2->astOperand1();
+    if (!followTok2)
+        followTok2 = tok2;
     if (isSameConstantValue(macro, followTok1, followTok2))
         return true;
 
@@ -1680,7 +1711,7 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
                     compare = true;
                 }
             }
-            if (compare && astIsBoolLike(varTok1, settings) && astIsBoolLike(varTok2, settings))
+            if (compare && varTok1 != varTok2 && astIsBoolLike(varTok1, settings) && astIsBoolLike(varTok2, settings))
                 return isSameExpression(macro, varTok1, varTok2, settings, pure, followVar, errors);
 
         }
@@ -1785,21 +1816,31 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
     return commutativeEquals;
 }
 
-static bool isZeroBoundCond(const Token * const cond)
+static bool isZeroBoundCond(const Token * const cond, bool reverse)
 {
-    if (cond == nullptr)
+    if (cond == nullptr || !cond->isBinaryOp())
         return false;
+
+    const Token* op = reverse ? cond->astOperand1() : cond->astOperand2();
+    if (!op->hasKnownIntValue())
+        return true;
+
     // Assume unsigned
-    // TODO: Handle reverse conditions
-    const bool isZero = cond->astOperand2()->getValue(0);
-    if (cond->str() == "==" || cond->str() == ">=")
+    const bool isZero = op->getKnownIntValue() == 0;
+    std::string cmp = cond->str();
+    if (reverse) {
+        if (cmp[0] == '>')
+            cmp[0] = '<';
+        else if (cmp[0] == '<')
+            cmp[0] = '>';
+    }
+
+    if (cmp == "==" || cmp == ">=")
         return isZero;
-    if (cond->str() == "<=")
+    if (cmp == "<=")
         return true;
-    if (cond->str() == "<")
+    if (cmp == "<")
         return !isZero;
-    if (cond->str() == ">")
-        return false;
     return false;
 }
 
@@ -1863,7 +1904,7 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
             if (isSameExpression(true, cond1->astOperand2(), cond2->astOperand2(), settings, pure, followVar, errors))
                 return isDifferentKnownValues(cond1->astOperand1(), cond2->astOperand1());
         }
-        // TODO: Handle reverse conditions
+
         if (Library::isContainerYield(cond1, Library::Container::Yield::EMPTY, "empty") &&
             Library::isContainerYield(cond2->astOperand1(), Library::Container::Yield::SIZE, "size") &&
             isSameExpression(true,
@@ -1873,7 +1914,19 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
                              pure,
                              followVar,
                              errors)) {
-            return !isZeroBoundCond(cond2);
+            return !isZeroBoundCond(cond2, false);
+        }
+
+        if (Library::isContainerYield(cond1, Library::Container::Yield::EMPTY, "empty") &&
+            Library::isContainerYield(cond2->astOperand2(), Library::Container::Yield::SIZE, "size") &&
+            isSameExpression(true,
+                             cond1->astOperand1()->astOperand1(),
+                             cond2->astOperand2()->astOperand1()->astOperand1(),
+                             settings,
+                             pure,
+                             followVar,
+                             errors)) {
+            return !isZeroBoundCond(cond2, true);
         }
 
         if (Library::isContainerYield(cond2, Library::Container::Yield::EMPTY, "empty") &&
@@ -1885,7 +1938,19 @@ bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const c
                              pure,
                              followVar,
                              errors)) {
-            return !isZeroBoundCond(cond1);
+            return !isZeroBoundCond(cond1, false);
+        }
+
+        if (Library::isContainerYield(cond2, Library::Container::Yield::EMPTY, "empty") &&
+            Library::isContainerYield(cond1->astOperand2(), Library::Container::Yield::SIZE, "size") &&
+            isSameExpression(true,
+                             cond2->astOperand1()->astOperand1(),
+                             cond1->astOperand2()->astOperand1()->astOperand1(),
+                             settings,
+                             pure,
+                             followVar,
+                             errors)) {
+            return !isZeroBoundCond(cond1, true);
         }
     }
 
@@ -1981,9 +2046,7 @@ bool isOppositeExpression(const Token * const tok1, const Token * const tok2, co
 static bool functionModifiesArguments(const Function* f)
 {
     return std::any_of(f->argumentList.cbegin(), f->argumentList.cend(), [](const Variable& var) {
-        if (var.isReference() || var.isPointer())
-            return !var.isConst();
-        return true;
+        return var.isReference() && !var.isConst();
     });
 }
 
@@ -2064,7 +2127,7 @@ bool isConstFunctionCall(const Token* ftok, const Library& library)
             return false;
         });
     }
-    return true;
+    return false;
 }
 
 bool isConstExpression(const Token *tok, const Library& library)
@@ -2100,7 +2163,8 @@ bool isWithoutSideEffects(const Token* tok, bool checkArrayAccess, bool checkRef
         tok = tok->astOperand2();
     if (tok && tok->varId()) {
         const Variable* var = tok->variable();
-        return var && ((!var->isClass() && (checkReference || !var->isReference())) || var->isPointer() || (checkArrayAccess ? var->isStlType() && !var->isStlType(CheckClass::stl_containers_not_const) : var->isStlType()));
+        return var && ((!var->isClass() && (checkReference || !var->isReference())) || var->isPointer() ||
+                       (checkArrayAccess ? var->isArray() || (var->isStlType() && !var->isStlType(CheckClassImpl::stl_containers_not_const)) : var->isStlType()));
     }
     return true;
 }
@@ -2173,43 +2237,31 @@ static bool isEscapedOrJump(const Token* tok, bool functionsScope, const Library
     return Token::Match(tok, "return|goto|throw|continue|break");
 }
 
+static bool isNoreturnFunction(const Token* ftok, const Library& library)
+{
+    if (const Function* function = ftok->function())
+        return function->isEscapeFunction() || function->isAttributeNoreturn();
+    return library.isnoreturn(ftok);
+}
+
 bool isEscapeFunction(const Token* ftok, const Library& library)
 {
     if (!Token::Match(ftok, "%name% ("))
         return false;
-    const Function* function = ftok->function();
-    if (function) {
-        if (function->isEscapeFunction())
-            return true;
-        if (function->isAttributeNoreturn())
-            return true;
-    } else {
-        if (library.isnoreturn(ftok))
-            return true;
-    }
-    return false;
+    return isNoreturnFunction(ftok, library);
 }
 
 static bool hasNoreturnFunction(const Token* tok, const Library& library, const Token** unknownFunc)
 {
     if (!tok)
         return false;
-    const Token* ftok = tok->str() == "(" ? tok->previous() : nullptr;
+    const Token* ftok = (tok->str() == "(" && !tok->isCast()) ? tok->previous() : nullptr;
     while (Token::simpleMatch(ftok, "("))
         ftok = ftok->astOperand1();
     if (ftok) {
-        const Function * function = ftok->function();
-        if (function) {
-            if (function->isEscapeFunction())
-                return true;
-            if (function->isAttributeNoreturn())
-                return true;
-        } else if (library.isnoreturn(ftok)) {
+        if (isNoreturnFunction(ftok, library))
             return true;
-        } else if (Token::Match(ftok, "exit|abort")) {
-            return true;
-        }
-        if (unknownFunc && !function && library.functions().count(library.getFunctionName(ftok)) == 0)
+        if (unknownFunc && !ftok->function() && library.functions().count(library.getFunctionName(ftok)) == 0)
             *unknownFunc = ftok;
         return false;
     }
@@ -2281,14 +2333,14 @@ bool isWithinScope(const Token* tok, const Variable* var, ScopeType type)
     return false;
 }
 
-bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Settings &settings, bool *inconclusive)
+bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Library &library, bool *inconclusive)
 {
     if (!tok)
         return false;
     if (tok->varId() == varid)
-        return isVariableChangedByFunctionCall(tok, indirect, settings, inconclusive);
-    return isVariableChangedByFunctionCall(tok->astOperand1(), indirect, varid, settings, inconclusive) ||
-           isVariableChangedByFunctionCall(tok->astOperand2(), indirect, varid, settings, inconclusive);
+        return isVariableChangedByFunctionCall(tok, indirect, library, inconclusive);
+    return isVariableChangedByFunctionCall(tok->astOperand1(), indirect, varid, library, inconclusive) ||
+           isVariableChangedByFunctionCall(tok->astOperand2(), indirect, varid, library, inconclusive);
 }
 
 bool isScopeBracket(const Token* tok)
@@ -2388,28 +2440,28 @@ Token* getTokenArgumentFunction(Token* tok, int& argn) {
 
 std::vector<const Variable*> getArgumentVars(const Token* tok, int argnr)
 {
-    std::vector<const Variable*> result;
     if (!tok)
-        return result;
+        return {};
     if (tok->function()) {
         const Variable* argvar = tok->function()->getArgumentVar(argnr);
         if (argvar)
             return {argvar};
-        return result;
+        return {};
     }
     if (tok->variable() || Token::simpleMatch(tok, "{") || Token::Match(tok->previous(), "%type% (|{")) {
         const Type* type = Token::typeOf(tok);
         if (!type)
-            return result;
+            return {};
         const Scope* typeScope = type->classScope;
         if (!typeScope)
-            return result;
+            return {};
         const bool tokIsBrace = Token::simpleMatch(tok, "{");
         // Aggregate constructor
         if (tokIsBrace && typeScope->numConstructors == 0 && argnr < typeScope->varlist.size()) {
             auto it = std::next(typeScope->varlist.cbegin(), argnr);
             return {&*it};
         }
+        std::vector<const Variable*> result;
         const int argCount = numberOfArguments(tok);
         const bool constructor = tokIsBrace || (tok->variable() && tok->variable()->nameToken() == tok);
         for (const Function &function : typeScope->functionList) {
@@ -2423,8 +2475,9 @@ std::vector<const Variable*> getArgumentVars(const Token* tok, int argnr)
             if (argvar)
                 result.push_back(argvar);
         }
+        return result;
     }
-    return result;
+    return {};
 }
 
 static bool isCPPCastKeyword(const Token* tok)
@@ -2445,24 +2498,6 @@ static bool isTrivialConstructor(const Token* tok)
     return false;
 }
 
-static bool isArray(const Token* tok)
-{
-    if (!tok)
-        return false;
-    if (tok->variable())
-        return tok->variable()->isArray();
-    if (Token::simpleMatch(tok, "."))
-        return isArray(tok->astOperand2());
-    return false;
-}
-
-static inline
-// limit it to CLang as compiling with GCC might fail with
-// error: inlining failed in call to always_inline 'bool isMutableExpression(const Token*)': function not considered for inlining
-// error: inlining failed in call to ‘always_inline’ ‘bool isMutableExpression(const Token*)’: recursive inlining
-#if defined(__clang__)
-__attribute__((always_inline))
-#endif
 bool isMutableExpression(const Token* tok)
 {
     if (!tok)
@@ -2480,15 +2515,13 @@ bool isMutableExpression(const Token* tok)
     if (tok->astOperand1() && Token::simpleMatch(tok, "["))
         return isMutableExpression(tok->astOperand1());
     if (const Variable* var = tok->variable()) {
-        if (var->nameToken() == tok)
-            return false;
-        if (!var->isPointer() && var->isConst())
+        if (var->isConst() && !var->isPointer() && (!var->isArray() || !var->isArgument()))
             return false;
     }
     return true;
 }
 
-bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Settings &settings, bool *inconclusive)
+bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Library &library, bool *inconclusive)
 {
     if (!tok)
         return false;
@@ -2528,20 +2561,13 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
 
     if (!tok->function() && !tok->variable() && tok->isName()) {
         // Check if direction (in, out, inout) is specified in the library configuration and use that
-        const Library::ArgumentChecks::Direction argDirection = settings.library.getArgDirection(tok, 1 + argnr, indirect);
+        const Library::ArgumentChecks::Direction argDirection = library.getArgDirection(tok, 1 + argnr, indirect);
         if (argDirection == Library::ArgumentChecks::Direction::DIR_IN)
             return false;
+        if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT || argDirection == Library::ArgumentChecks::Direction::DIR_INOUT)
+            return true;
 
-        const bool requireNonNull = settings.library.isnullargbad(tok, 1 + argnr);
-        if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT ||
-            argDirection == Library::ArgumentChecks::Direction::DIR_INOUT) {
-            if (indirect == 0 && isArray(tok1))
-                return true;
-            const bool requireInit = settings.library.isuninitargbad(tok, 1 + argnr);
-            // Assume that if the variable must be initialized then the indirection is 1
-            if (indirect > 0 && requireInit && requireNonNull)
-                return true;
-        }
+        const bool requireNonNull = library.isnullargbad(tok, 1 + argnr);
         if (Token::simpleMatch(tok->tokAt(-2), "std :: tie"))
             return true;
         // if the library says 0 is invalid
@@ -2561,6 +2587,8 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
     if (const Variable* var = tok->variable()) {
         if (tok == var->nameToken() && (!var->isReference() || (var->isConst() && var->type() == tok1->type())) && (!var->isClass() || (var->valueType() && var->valueType()->container))) // const ref or passed to (copy) ctor
             return false;
+        if (var->isArray() && var->valueType() && var->valueType()->pointer == 0 && var->valueType()->isPrimitive())
+            return false;
     }
 
     std::vector<const Variable*> args = getArgumentVars(tok, argnr);
@@ -2596,12 +2624,22 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
     return false;
 }
 
+static bool hasOverloadedMemberAccess(const Token* tok)
+{
+    if (!Token::simpleMatch(tok, "."))
+        return false;
+    const Token* varTok = tok->astOperand2();
+    return !varTok || !varTok->variable() || !varTok->variable()->valueType() || varTok->variable()->valueType()->pointer == 0;
+}
+
 bool isVariableChanged(const Token *tok, int indirect, const Settings &settings, int depth)
 {
-    if (!isMutableExpression(tok))
+    if (!tok)
+        return false;
+    if (!tok->isMutableExpr())
         return false;
 
-    if (indirect == 0 && isConstVarExpression(tok))
+    if (isConstVarExpression(tok))
         return false;
 
     const Token *tok2 = tok;
@@ -2609,8 +2647,9 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings &settings,
     while ((tok2->astParent() && tok2->astParent()->isUnaryOp("*")) ||
            (Token::simpleMatch(tok2->astParent(), ".") && !Token::Match(tok2->astParent()->astParent(), "[(,]")) ||
            (tok2->astParent() && tok2->astParent()->isUnaryOp("&") && Token::simpleMatch(tok2->astParent()->astParent(), ".") && tok2->astParent()->astParent()->originalName()=="->") ||
-           (Token::simpleMatch(tok2->astParent(), "[") && tok2 == tok2->astParent()->astOperand1())) {
-        if (tok2->astParent() && (tok2->astParent()->isUnaryOp("*") || (astIsLHS(tok2) && tok2->astParent()->originalName() == "->")))
+           (Token::simpleMatch(tok2->astParent(), "[") && tok2 == tok2->astParent()->astOperand1()) ||
+           (Token::simpleMatch(tok2->astParent(), "(") && tok2->astParent()->isCast())) {
+        if (tok2->astParent() && (tok2->astParent()->isUnaryOp("*") || (astIsLHS(tok2) && tok2->astParent()->originalName() == "->" && !hasOverloadedMemberAccess(tok2))))
             derefs++;
         if (derefs > indirect)
             break;
@@ -2665,7 +2704,7 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings &settings,
         if (isVariableChanged(tok2->astParent(), indirect + 1, settings, depth - 1))
             return true;
     } else {
-        // If its already const then it cant be modified
+        // If its already const then it can't be modified
         if (vt && vt->isConst(indirect))
             return false;
     }
@@ -2750,13 +2789,13 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings &settings,
         if (ftok->str() == "(" && Token::simpleMatch(ftok->astOperand1(), "[")) // operator() on array element, bail out
             return true;
         const Token * ptok = tok2;
-        while (Token::Match(ptok->astParent(), ".|::|["))
+        while (Token::Match(ptok->astParent(), ".|::"))
             ptok = ptok->astParent();
         int pindirect = indirect;
         if (indirect == 0 && astIsLHS(tok2) && Token::Match(ptok, ". %var%") && astIsPointer(ptok->next()))
             pindirect = 1;
         bool inconclusive = false;
-        bool isChanged = isVariableChangedByFunctionCall(ptok, pindirect, settings, &inconclusive);
+        bool isChanged = isVariableChangedByFunctionCall(ptok, pindirect, settings.library, &inconclusive);
         isChanged |= inconclusive;
         if (isChanged)
             return true;
@@ -2890,7 +2929,9 @@ static bool isExpressionChangedAt(const F& getExprTok,
 {
     if (depth < 0)
         return true;
-    if (!isMutableExpression(tok))
+    if (!tok)
+        return false;
+    if (!tok->isMutableExpr())
         return false;
     if (tok->exprId() != exprid || (!tok->varId() && !tok->isName())) {
         if (globalvar && Token::Match(tok, "%name% (") &&
@@ -2903,17 +2944,23 @@ static bool isExpressionChangedAt(const F& getExprTok,
                 // TODO: Is global variable really changed by function call?
                 return true;
         }
-        int i = 1;
+        nonneg int i = 1;
         bool aliased = false;
         // If we can't find the expression then assume it is an alias
         auto expr = getExprTok();
         if (!expr && !(tok->valueType() && tok->valueType()->pointer == 0 && tok->valueType()->reference == Reference::None))
             aliased = true;
+        if (!aliased && expr && expr->varId() && tok->isCast() && tok->valueType() && tok->valueType()->reference != Reference::None &&
+            Token::Match(tok->astOperand2() ? tok->astOperand2() : tok->astOperand1(), "%varid%", expr->varId()))
+            aliased = true;
         if (!aliased)
             aliased = isAliasOf(tok, expr, &i);
         if (!aliased)
             return false;
-        if (isVariableChanged(tok, indirect + i, settings, depth))
+        i += indirect;
+        if (tok->valueType() && tok->valueType()->pointer)
+            i = std::min(i, tok->valueType()->pointer);
+        if (isVariableChanged(tok, i, settings, depth))
             return true;
         // TODO: Try to traverse the lambda function
         if (Token::Match(tok, "%var% ("))
@@ -2965,7 +3012,7 @@ bool isVariableChanged(const Variable * var, const Settings &settings, int depth
     const Token * start = var->declEndToken();
     if (!start)
         return false;
-    if (Token::Match(start, "; %varid% =", var->declarationId()))
+    if (start->isSplittedVarDeclEq() && Token::Match(start, "; %varid% =", var->declarationId()))
         start = start->tokAt(2);
     if (Token::simpleMatch(start, "=")) {
         const Token* next = nextAfterAstRightmostLeafGeneric(start);
@@ -3051,10 +3098,7 @@ static const Token* findExpressionChangedImpl(const Token* expr,
         }
         bool global = false;
         if (tok->variable()) {
-            if (tok->variable()->isConst())
-                return false;
-            global = !tok->variable()->isLocal() && !tok->variable()->isArgument() &&
-                     !(tok->variable()->isMember() && !tok->variable()->isStatic());
+            global = !tok->variable()->isLocal() && !tok->variable()->isArgument();
         } else if (tok->isIncompleteVar() && !tok->isIncompleteConstant()) {
             global = true;
         }
@@ -3067,6 +3111,8 @@ static const Token* findExpressionChangedImpl(const Token* expr,
                     if (vt->type == ValueType::ITERATOR)
                         ++indirect;
                 }
+                if (indirect == 0 && tok2->astParent() && tok2->astParent()->isUnaryOp("*"))
+                    ++indirect;
                 for (int i = 0; i <= indirect; ++i) {
                     if (isExpressionChangedAt(tok, tok2, i, global, settings, depth))
                         return true;
@@ -3336,7 +3382,7 @@ bool isConstVarExpression(const Token *tok, const std::function<bool(const Token
     if (!tok)
         return false;
     if (tok->str() == "?" && tok->astOperand2() && tok->astOperand2()->str() == ":") // ternary operator
-        return isConstVarExpression(tok->astOperand2()->astOperand1()) && isConstVarExpression(tok->astOperand2()->astOperand2()); // left and right of ":"
+        return isConstVarExpression(tok->astOperand2()->astOperand1()) || isConstVarExpression(tok->astOperand2()->astOperand2()); // left and right of ":"
     if (skipPredicate && skipPredicate(tok))
         return false;
     if (Token::simpleMatch(tok->previous(), "sizeof ("))
@@ -3374,7 +3420,7 @@ bool isConstVarExpression(const Token *tok, const std::function<bool(const Token
     return false;
 }
 
-static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings& settings)
+static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Library& library)
 {
     const bool addressOf = tok->astParent() && tok->astParent()->isUnaryOp("&");
 
@@ -3386,13 +3432,19 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings
     // variable init/constructor call?
     if (!func && ftok->variable() && ftok == ftok->variable()->nameToken()) {
         // STL types or containers don't initialize external variables
-        if (ftok->variable()->isStlType() || (ftok->variable()->valueType() && ftok->variable()->valueType()->container))
+        if (indirect == 0 && (ftok->variable()->isStlType() || (ftok->variable()->valueType() && ftok->variable()->valueType()->container)))
             return ExprUsage::Used;
         // TODO: resolve multiple constructors
         if (ftok->variable()->type() && ftok->variable()->type()->classScope) {
             const int nCtor = ftok->variable()->type()->classScope->numConstructors;
-            if (nCtor == 0)
+            if (nCtor == 0) {
+                if (indirect > 0) {
+                    const std::vector<const Variable*> argvar = getArgumentVars(ftok->astParent(), argnr);
+                    if (argvar.size() == 1 && argvar[0]->valueType() && argvar[0]->valueType()->pointer == indirect)
+                        return ExprUsage::NotUsed;
+                }
                 return ExprUsage::Used;
+            }
             if (nCtor == 1) {
                 const Scope* scope = ftok->variable()->type()->classScope;
                 auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [](const Function& f) {
@@ -3430,13 +3482,18 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings
     } else if (ftok->str() == "{") {
         return indirect == 0 ? ExprUsage::Used : ExprUsage::Inconclusive;
     } else {
-        const bool isnullbad = settings.library.isnullargbad(ftok, argnr + 1);
+        const bool isnullbad = library.isnullargbad(ftok, argnr + 1);
         if (indirect == 0 && astIsPointer(tok) && !addressOf && isnullbad)
             return ExprUsage::Used;
         bool hasIndirect = false;
-        const bool isuninitbad = settings.library.isuninitargbad(ftok, argnr + 1, indirect, &hasIndirect);
+        const bool isuninitbad = library.isuninitargbad(ftok, argnr + 1, indirect, &hasIndirect);
         if (isuninitbad && (!addressOf || isnullbad))
             return ExprUsage::Used;
+        const Library::ArgumentChecks::Direction argDirection = library.getArgDirection(ftok, argnr + 1, indirect);
+        if (argDirection == Library::ArgumentChecks::Direction::DIR_IN) // TODO: DIR_INOUT?
+            return ExprUsage::Used;
+        if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT)
+            return ExprUsage::NotUsed;
     }
     return ExprUsage::Inconclusive;
 }
@@ -3502,7 +3559,7 @@ ExprUsage getExprUsage(const Token* tok, int indirect, const Settings& settings)
             (astIsLHS(tok) || Token::simpleMatch(parent, "( )")))
             return ExprUsage::Used;
     }
-    return getFunctionUsage(tok, indirect, settings);
+    return getFunctionUsage(tok, indirect, settings.library);
 }
 
 static void getLHSVariablesRecursive(std::vector<const Variable*>& vars, const Token* tok)
@@ -3528,13 +3585,13 @@ static void getLHSVariablesRecursive(std::vector<const Variable*>& vars, const T
 
 std::vector<const Variable*> getLHSVariables(const Token* tok)
 {
-    std::vector<const Variable*> result;
     if (!Token::Match(tok, "%assign%|(|{"))
-        return result;
+        return {};
     if (!tok->astOperand1())
-        return result;
+        return {};
     if (tok->astOperand1()->varId() > 0 && tok->astOperand1()->variable())
         return {tok->astOperand1()->variable()};
+    std::vector<const Variable*> result;
     getLHSVariablesRecursive(result, tok->astOperand1());
     return result;
 }
@@ -3637,21 +3694,27 @@ bool isGlobalData(const Token *expr)
             globalData = true;
             return ChildrenToVisit::none;
         }
-        if (Token::Match(tok, "[*[]") && tok->astOperand1() && tok->astOperand1()->variable()) {
+        if (Token::Match(tok, "[*[]") && tok->astOperand1()) {
             // TODO check if pointer points at local data
-            const Variable *lhsvar = tok->astOperand1()->variable();
-            const ValueType *lhstype = tok->astOperand1()->valueType();
-            if (lhsvar->isPointer()) {
-                globalData = true;
-                return ChildrenToVisit::none;
-            }
-            if (lhsvar->isArgument() && lhsvar->isArray()) {
-                globalData = true;
-                return ChildrenToVisit::none;
+            const Token *lhs = tok->astOperand1();
+            if (lhs->isCast()) {
+                lhs = lhs->astOperand2() ? lhs->astOperand2() : lhs->astOperand1();
             }
-            if (lhsvar->isArgument() && (!lhstype || (lhstype->type <= ValueType::Type::VOID && !lhstype->container))) {
-                globalData = true;
-                return ChildrenToVisit::none;
+            if (lhs && lhs->variable()) {
+                const Variable *lhsvar = lhs->variable();
+                const ValueType *lhstype = lhs->valueType();
+                if (lhsvar->isPointer() || !lhstype || lhstype->type == ValueType::Type::ITERATOR) {
+                    globalData = true;
+                    return ChildrenToVisit::none;
+                }
+                if (lhsvar->isArgument() && lhsvar->isArray()) {
+                    globalData = true;
+                    return ChildrenToVisit::none;
+                }
+                if (lhsvar->isArgument() && lhstype->type <= ValueType::Type::VOID && !lhstype->container) {
+                    globalData = true;
+                    return ChildrenToVisit::none;
+                }
             }
         }
         if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") {
@@ -3866,3 +3929,23 @@ const Token *skipUnreachableBranch(const Token *tok)
 
     return tok;
 }
+
+bool isEscapeKeyword(const Token *tok, const Settings &settings)
+{
+    if (!tok)
+        return false;
+
+    if (tok->str() == "return")
+        return true;
+
+    if (!tok->isCpp())
+        return false;
+
+    if (tok->str() == "throw")
+        return true;
+
+    if (settings.standards.cpp < Standards::CPP20)
+        return false;
+
+    return tok->str() == "co_return";
+}
diff --git a/lib/astutils.h b/lib/astutils.h
index a1781ea1edf..578763124ac 100644
--- a/lib/astutils.h
+++ b/lib/astutils.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,7 +25,6 @@
 #include <cstdint>
 #include <functional>
 #include <list>
-#include <stack>
 #include <string>
 #include <type_traits>
 #include <utility>
@@ -64,29 +63,29 @@ void visitAstNodes(T *ast, const TFunc &visitor)
 
     // the size of 8 was determined in tests to be sufficient to avoid excess allocations. also add 1 as a buffer.
     // we might need to increase that value in the future.
-    std::stack<T *, SmallVector<T *, 8 + 1>> tokens;
+    SmallVector<T *, 8 + 1> tokens;
     T *tok = ast;
     do {
         const ChildrenToVisit c = visitor(tok);
-
         if (c == ChildrenToVisit::done)
             break;
+
         if (c == ChildrenToVisit::op2 || c == ChildrenToVisit::op1_and_op2) {
             T *t2 = tok->astOperand2();
             if (t2)
-                tokens.push(t2);
+                tokens.push_back(t2);
         }
         if (c == ChildrenToVisit::op1 || c == ChildrenToVisit::op1_and_op2) {
             T *t1 = tok->astOperand1();
             if (t1)
-                tokens.push(t1);
+                tokens.push_back(t1);
         }
 
         if (tokens.empty())
             break;
 
-        tok = tokens.top();
-        tokens.pop();
+        tok = tokens.back();
+        tokens.pop_back();
     } while (true);
 }
 
@@ -167,7 +166,7 @@ bool astIsContainerString(const Token* tok);
 Library::Container::Action astContainerAction(const Token* tok, const Library& library, const Token** ftok = nullptr);
 Library::Container::Yield astContainerYield(const Token* tok, const Library& library, const Token** ftok = nullptr);
 
-Library::Container::Yield astFunctionYield(const Token* tok, const Settings& settings, const Token** ftok = nullptr);
+Library::Container::Yield astFunctionYield(const Token* tok, const Library& library, const Token** ftok = nullptr);
 
 /** Is given token a range-declaration in a range-based for loop */
 bool astIsRangeBasedForDecl(const Token* tok);
@@ -189,6 +188,8 @@ const Token * astIsVariableComparison(const Token *tok, const std::string &comp,
 bool isVariableDecl(const Token* tok);
 bool isStlStringType(const Token* tok);
 
+bool isVoidCast(const Token* tok);
+
 bool isTemporary(const Token* tok, const Library* library, bool unknown = false);
 
 const Token* previousBeforeAstLeftmostLeaf(const Token* tok);
@@ -253,11 +254,7 @@ struct ReferenceToken {
     ErrorPath errors;
 };
 
-SmallVector<ReferenceToken> followAllReferences(const Token* tok,
-                                                bool temporary = true,
-                                                bool inconclusive = true,
-                                                ErrorPath errors = ErrorPath{},
-                                                int depth = 20);
+SmallVector<ReferenceToken> followAllReferences(const Token* tok, bool temporary = true);
 const Token* followReferences(const Token* tok, ErrorPath* errors = nullptr);
 
 CPPCHECKLIB bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors=nullptr);
@@ -268,6 +265,11 @@ bool isStructuredBindingVariable(const Variable* var);
 
 const Token* isInLoopCondition(const Token* tok);
 
+/**
+ * Is token the dot of a designated initializer?
+ */
+bool isDesignatedInitializer(const Token* tok);
+
 /**
  * Is token used as boolean, that is to say cast to a bool, or used as a condition in a if/while/for
  */
@@ -317,26 +319,28 @@ Token* getTokenArgumentFunction(Token* tok, int& argn);
 
 std::vector<const Variable*> getArgumentVars(const Token* tok, int argnr);
 
+bool isMutableExpression(const Token* tok);
+
 /** Is variable changed by function call?
  * In case the answer of the question is inconclusive, e.g. because the function declaration is not known
  * the return value is false and the output parameter inconclusive is set to true
  *
  * @param tok           ast tree
  * @param varid         Variable Id
- * @param settings      program settings
+ * @param library       library configurations
  * @param inconclusive  pointer to output variable which indicates that the answer of the question is inconclusive
  */
-bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Settings &settings, bool *inconclusive);
+bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int varid, const Library &library, bool *inconclusive);
 
 /** Is variable changed by function call?
  * In case the answer of the question is inconclusive, e.g. because the function declaration is not known
  * the return value is false and the output parameter inconclusive is set to true
  *
- * @param tok           token of variable in function call
- * @param settings      program settings
+ * @param tok          token of variable in function call
+ * @param library      library configurations
  * @param inconclusive pointer to output variable which indicates that the answer of the question is inconclusive
  */
-CPPCHECKLIB bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Settings &settings, bool *inconclusive);
+CPPCHECKLIB bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Library &library, bool *inconclusive);
 
 /** Is variable changed in block of code? */
 CPPCHECKLIB bool isVariableChanged(const Token *start, const Token *end, nonneg int exprid, bool globalvar, const Settings &settings, int depth = 20);
@@ -380,7 +384,10 @@ bool isExpressionChangedAt(const Token* expr,
 /// If token is an alias if another variable
 bool isAliasOf(const Token *tok, nonneg int varid, bool* inconclusive = nullptr);
 
-bool isAliasOf(const Token* tok, const Token* expr, int* indirect = nullptr);
+bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect = nullptr);
+
+/// If token is an iterator into the container expression with the given expression id
+bool isIteratorOf(const Token* tok, nonneg int exprId);
 
 const Token* getArgumentStart(const Token* ftok);
 
@@ -459,4 +466,6 @@ bool isUnreachableOperand(const Token *tok);
 
 const Token *skipUnreachableBranch(const Token *tok);
 
+bool isEscapeKeyword(const Token *tok, const Settings &settings);
+
 #endif // astutilsH
diff --git a/lib/calculate.h b/lib/calculate.h
index 610acd5584a..c33e37fd3b7 100644
--- a/lib/calculate.h
+++ b/lib/calculate.h
@@ -46,6 +46,9 @@ bool isZero(T x)
     return isEqual(x, T(0));
 }
 
+/**
+ * @throws InternalError thrown in case of unknown operator
+ */
 template<class R, class T>
 R calculate(const std::string& s, const T& x, const T& y, bool* error = nullptr)
 {
diff --git a/lib/check.cpp b/lib/check.cpp
deleted file mode 100644
index 29285f14833..00000000000
--- a/lib/check.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 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/>.
- */
-
-//---------------------------------------------------------------------------
-
-#include "check.h"
-
-#include "errorlogger.h"
-#include "settings.h"
-#include "token.h"
-#include "tokenize.h"
-#include "vfvalue.h"
-
-#include <algorithm>
-#include <cctype>
-#include <iostream>
-#include <stdexcept>
-#include <utility>
-
-//---------------------------------------------------------------------------
-
-Check::Check(const std::string &aname)
-    : mName(aname)
-{
-    {
-        const auto it = std::find_if(instances().begin(), instances().end(), [&](const Check *i) {
-            return i->name() == aname;
-        });
-        if (it != instances().end())
-            throw std::runtime_error("'" + aname + "' instance already exists");
-    }
-
-    // make sure the instances are sorted
-    const auto it = std::find_if(instances().begin(), instances().end(), [&](const Check* i) {
-        return i->name() > aname;
-    });
-    if (it == instances().end())
-        instances().push_back(this);
-    else
-        instances().insert(it, this);
-}
-
-void Check::writeToErrorList(const ErrorMessage &errmsg)
-{
-    std::cout << errmsg.toXML() << std::endl;
-}
-
-
-void Check::reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty)
-{
-    // TODO: report debug warning when error is for a disabled severity
-    const ErrorMessage errmsg(callstack, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
-    if (mErrorLogger)
-        mErrorLogger->reportErr(errmsg);
-    else
-        writeToErrorList(errmsg);
-}
-
-void Check::reportError(const ErrorPath &errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
-{
-    // TODO: report debug warning when error is for a disabled severity
-    const ErrorMessage errmsg(errorPath, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
-    if (mErrorLogger)
-        mErrorLogger->reportErr(errmsg);
-    else
-        writeToErrorList(errmsg);
-}
-
-bool Check::wrongData(const Token *tok, const char *str)
-{
-    if (mSettings->daca)
-        reportError(tok, Severity::debug, "DacaWrongData", "Wrong data detected by condition " + std::string(str));
-    return true;
-}
-
-std::list<Check *> &Check::instances()
-{
-#ifdef __SVR4
-    // Under Solaris, destructors are called in wrong order which causes a segmentation fault.
-    // This fix ensures pointer remains valid and reachable until program terminates.
-    static std::list<Check *> *_instances= new std::list<Check *>;
-    return *_instances;
-#else
-    static std::list<Check *> _instances;
-    return _instances;
-#endif
-}
-
-std::string Check::getMessageId(const ValueFlow::Value &value, const char id[])
-{
-    if (value.condition != nullptr)
-        return id + std::string("Cond");
-    if (value.safe)
-        return std::string("safe") + static_cast<char>(std::toupper(id[0])) + (id + 1);
-    return id;
-}
-
-ErrorPath Check::getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const
-{
-    ErrorPath errorPath;
-    if (!value) {
-        errorPath.emplace_back(errtok, std::move(bug));
-    } else if (mSettings->verbose || mSettings->outputFormat == Settings::OutputFormat::xml || !mSettings->templateLocation.empty()) {
-        errorPath = value->errorPath;
-        errorPath.emplace_back(errtok, std::move(bug));
-    } else {
-        if (value->condition)
-            errorPath.emplace_back(value->condition, "condition '" + value->condition->expressionString() + "'");
-        //else if (!value->isKnown() || value->defaultArg)
-        //    errorPath = value->callstack;
-        errorPath.emplace_back(errtok, std::move(bug));
-    }
-    return errorPath;
-}
-
-void Check::logChecker(const char id[])
-{
-    reportError(nullptr, Severity::internal, "logChecker", id);
-}
-
diff --git a/lib/check.h b/lib/check.h
index 6729443f783..7adde886f7f 100644
--- a/lib/check.h
+++ b/lib/check.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,7 +22,6 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "errortypes.h"
 
 #include <list>
 #include <string>
@@ -36,19 +35,10 @@ namespace CTU {
     class FileInfo;
 }
 
-namespace ValueFlow {
-    class Value;
-}
-
 class Settings;
-class Token;
 class ErrorLogger;
-class ErrorMessage;
 class Tokenizer;
 
-/** Use WRONG_DATA in checkers to mark conditions that check that data is correct */
-#define WRONG_DATA(COND, TOK)  ((COND) && wrongData((TOK), #COND))
-
 /// @addtogroup Core
 /// @{
 
@@ -57,32 +47,22 @@ class Tokenizer;
  * All checking classes must inherit from this class
  */
 class CPPCHECKLIB Check {
-public:
-    /** This constructor is used when registering the CheckClass */
-    explicit Check(const std::string &aname);
-
 protected:
-    /** This constructor is used when running checks. */
-    Check(std::string aname, const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : mTokenizer(tokenizer), mSettings(settings), mErrorLogger(errorLogger), mName(std::move(aname)) {}
+    /** This constructor is used when registering the check */
+    explicit Check(std::string aname)
+        : mName(std::move(aname))
+    {}
+    virtual ~Check() = default;
 
 public:
-    virtual ~Check() {
-        if (!mTokenizer)
-            instances().remove(this);
-    }
-
     Check(const Check &) = delete;
     Check& operator=(const Check &) = delete;
 
-    /** List of registered check classes. This is used by Cppcheck to run checks and generate documentation */
-    static std::list<Check *> &instances();
-
     /** run checks, the token list is not simplified */
-    virtual void runChecks(const Tokenizer &, ErrorLogger *) = 0;
+    virtual void runChecks(const Tokenizer &, ErrorLogger&) = 0;
 
     /** get error messages */
-    virtual void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const = 0;
+    virtual void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const = 0;
 
     /** class name, used to generate documentation */
     const std::string& name() const {
@@ -92,77 +72,30 @@ class CPPCHECKLIB Check {
     /** get information about this class, used to generate documentation */
     virtual std::string classInfo() const = 0;
 
-    /**
-     * Write given error to stdout in xml format.
-     * This is for for printout out the error list with --errorlist
-     * @param errmsg Error message to write
-     */
-    static void writeToErrorList(const ErrorMessage &errmsg);
-
     /** Base class used for whole-program analysis */
     class CPPCHECKLIB FileInfo {
     public:
-        explicit FileInfo(std::string f0 = {}) : file0(std::move(f0)) {}
+        explicit FileInfo(std::string f0) : file0(std::move(f0)) {}
         virtual ~FileInfo() = default;
-        virtual std::string toString() const {
-            return std::string();
-        }
+        virtual std::string toString() const = 0;
         std::string file0;
     };
 
-    virtual FileInfo * getFileInfo(const Tokenizer& /*tokenizer*/, const Settings& /*settings*/) const {
+    virtual const FileInfo * getFileInfo(const Tokenizer& /*tokenizer*/, const Settings& /*settings*/, const std::string& /*currentConfig*/) const {
         return nullptr;
     }
 
-    virtual FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const {
+    virtual const FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const {
         (void)xmlElement;
+        (void)file0;
         return nullptr;
     }
 
     // Return true if an error is reported.
-    virtual bool analyseWholeProgram(const CTU::FileInfo& /*ctu*/, const std::list<FileInfo*>& /*fileInfo*/, const Settings& /*settings*/, ErrorLogger & /*errorLogger*/) {
+    virtual bool analyseWholeProgram(const CTU::FileInfo& /*ctu*/, const std::list<const FileInfo*>& /*fileInfo*/, const Settings& /*settings*/, ErrorLogger & /*errorLogger*/) {
         return false;
     }
 
-protected:
-    static std::string getMessageId(const ValueFlow::Value &value, const char id[]);
-
-    const Tokenizer* const mTokenizer{};
-    const Settings* const mSettings{};
-    ErrorLogger* const mErrorLogger{};
-
-    /** report an error */
-    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg) {
-        reportError(tok, severity, id, msg, CWE(0U), Certainty::normal);
-    }
-
-    /** report an error */
-    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty) {
-        const std::list<const Token *> callstack(1, tok);
-        reportError(callstack, severity, id, msg, cwe, certainty);
-    }
-
-    /** report an error */
-    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg) {
-        reportError(callstack, severity, id, msg, CWE(0U), Certainty::normal);
-    }
-
-    /** report an error */
-    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty);
-
-    void reportError(const ErrorPath &errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty);
-
-    /** log checker */
-    void logChecker(const char id[]);
-
-    ErrorPath getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const;
-
-    /**
-     * Use WRONG_DATA in checkers when you check for wrong data. That
-     * will call this method
-     */
-    bool wrongData(const Token *tok, const char *str);
-
 private:
     const std::string mName;
 };
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
index 794795eff26..174237eef5a 100644
--- a/lib/check64bit.cpp
+++ b/lib/check64bit.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 #include "check64bit.h"
 
 #include "errortypes.h"
+#include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -35,14 +36,24 @@
 // CWE ids used
 static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    Check64BitPortability instance;
+static bool is32BitIntegerReturn(const Function* func, const Settings& settings)
+{
+    if (settings.platform.sizeof_pointer != 8)
+        return false;
+    const ValueType* vt = func->arg->valueType();
+    return vt && vt->pointer == 0 && vt->isIntegral() && vt->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer) == 4;
 }
 
-void Check64BitPortability::pointerassignment()
+static bool isFunctionPointer(const Token* tok)
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!tok || !tok->variable())
+        return false;
+    return Tokenizer::isFunctionPointer(tok->variable()->nameToken());
+}
+
+void Check64BitPortabilityImpl::pointerassignment()
+{
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("Check64BitPortability::pointerassignment"); // portability
@@ -57,7 +68,7 @@ void Check64BitPortability::pointerassignment()
         bool retPointer = false;
         if (scope->function->token->strAt(-1) == "*") // Function returns a pointer
             retPointer = true;
-        else if (Token::Match(scope->function->token->previous(), "int|long|DWORD")) // Function returns an integer
+        else if (is32BitIntegerReturn(scope->function, mSettings))
             ;
         else
             continue;
@@ -79,11 +90,20 @@ void Check64BitPortability::pointerassignment()
             if (!returnType)
                 continue;
 
-            if (retPointer && !returnType->typeScope && returnType->pointer == 0U)
+            if (retPointer && !returnType->typeScope && returnType->pointer == 0)
                 returnIntegerError(tok);
 
-            if (!retPointer && returnType->pointer >= 1U)
-                returnPointerError(tok);
+            if (!retPointer) {
+                bool warn = returnType->pointer >= 1;
+                if (!warn) {
+                    const Token* tok2 = tok->astOperand1();
+                    while (tok2 && tok2->isCast())
+                        tok2 = tok2->astOperand2() ? tok2->astOperand2() : tok2->astOperand1();
+                    warn = tok2 && tok2->valueType() && tok2->valueType()->pointer;
+                }
+                if (warn)
+                    returnPointerError(tok);
+            }
         }
     }
 
@@ -99,16 +119,17 @@ void Check64BitPortability::pointerassignment()
                 continue;
 
             // Assign integer to pointer..
-            if (lhstype->pointer >= 1U &&
+            if (lhstype->pointer >= 1 &&
                 !tok->astOperand2()->isNumber() &&
-                rhstype->pointer == 0U &&
+                rhstype->pointer == 0 &&
                 rhstype->originalTypeName.empty() &&
-                rhstype->type == ValueType::Type::INT)
+                rhstype->type == ValueType::Type::INT &&
+                !isFunctionPointer(tok->astOperand1()))
                 assignmentIntegerToAddressError(tok);
 
             // Assign pointer to integer..
-            if (rhstype->pointer >= 1U &&
-                lhstype->pointer == 0U &&
+            if (rhstype->pointer >= 1 &&
+                lhstype->pointer == 0 &&
                 lhstype->originalTypeName.empty() &&
                 lhstype->isIntegral() &&
                 lhstype->type >= ValueType::Type::CHAR &&
@@ -118,7 +139,7 @@ void Check64BitPortability::pointerassignment()
     }
 }
 
-void Check64BitPortability::assignmentAddressToIntegerError(const Token *tok)
+void Check64BitPortabilityImpl::assignmentAddressToIntegerError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "AssignmentAddressToInteger",
@@ -129,7 +150,7 @@ void Check64BitPortability::assignmentAddressToIntegerError(const Token *tok)
                 "way is to store addresses only in pointer types (or typedefs like uintptr_t).", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::assignmentIntegerToAddressError(const Token *tok)
+void Check64BitPortabilityImpl::assignmentIntegerToAddressError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "AssignmentIntegerToAddress",
@@ -140,7 +161,7 @@ void Check64BitPortability::assignmentIntegerToAddressError(const Token *tok)
                 "way is to store addresses only in pointer types (or typedefs like uintptr_t).", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::returnPointerError(const Token *tok)
+void Check64BitPortabilityImpl::returnPointerError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "CastAddressToIntegerAtReturn",
@@ -148,10 +169,10 @@ void Check64BitPortability::returnPointerError(const Token *tok)
                 "Returning an address value in a function with integer (int/long/etc) return type is not portable across "
                 "different platforms and compilers. For example in 32-bit Windows and Linux they are same width, but in "
                 "64-bit Windows and Linux they are of different width. In worst case you end up casting 64-bit address down "
-                "to 32-bit integer. The safe way is to always return an integer.", CWE758, Certainty::normal);
+                "to 32-bit integer. The safe way is to return a type such as intptr_t.", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::returnIntegerError(const Token *tok)
+void Check64BitPortabilityImpl::returnIntegerError(const Token *tok)
 {
     reportError(tok, Severity::portability,
                 "CastIntegerToAddressAtReturn",
@@ -162,15 +183,15 @@ void Check64BitPortability::returnIntegerError(const Token *tok)
                 "The safe way is to always return a pointer.", CWE758, Certainty::normal);
 }
 
-void Check64BitPortability::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void Check64BitPortability::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    Check64BitPortability check64BitPortability(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    Check64BitPortabilityImpl check64BitPortability(&tokenizer, tokenizer.getSettings(), errorLogger);
     check64BitPortability.pointerassignment();
 }
 
-void Check64BitPortability::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void Check64BitPortability::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    Check64BitPortability c(nullptr, settings, errorLogger);
+    Check64BitPortabilityImpl c(nullptr, settings, errorLogger);
     c.assignmentAddressToIntegerError(nullptr);
     c.assignmentIntegerToAddressError(nullptr);
     c.returnIntegerError(nullptr);
diff --git a/lib/check64bit.h b/lib/check64bit.h
index 79397e98e5f..cab82cf1148 100644
--- a/lib/check64bit.h
+++ b/lib/check64bit.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -40,19 +41,28 @@ class Tokenizer;
  */
 
 class CPPCHECKLIB Check64BitPortability : public Check {
-    friend class Test64BitPortability;
-
 public:
     /** This constructor is used when registering the Check64BitPortability */
-    Check64BitPortability() : Check(myName()) {}
+    Check64BitPortability() : Check("64-bit portability") {}
 
 private:
-    /** This constructor is used when running checks. */
-    Check64BitPortability(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check if there is 64-bit portability issues:\n"
+               "- assign address to/from int/long\n"
+               "- casting address from/to integer when returning from function\n";
+    }
+};
+
+class CPPCHECKLIB Check64BitPortabilityImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    Check64BitPortabilityImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Check for pointer assignment */
     void pointerassignment();
@@ -61,18 +71,6 @@ class CPPCHECKLIB Check64BitPortability : public Check {
     void assignmentIntegerToAddressError(const Token *tok);
     void returnIntegerError(const Token *tok);
     void returnPointerError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "64-bit portability";
-    }
-
-    std::string classInfo() const override {
-        return "Check if there is 64-bit portability issues:\n"
-               "- assign address to/from int/long\n"
-               "- casting address from/to integer when returning from function\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkassert.cpp b/lib/checkassert.cpp
index 3ab55967ede..00bb95e319a 100644
--- a/lib/checkassert.cpp
+++ b/lib/checkassert.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,14 +39,9 @@
 // CWE ids used
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckAssert instance;
-}
-
-void CheckAssert::assertWithSideEffects()
+void CheckAssertImpl::assertWithSideEffects()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckAssert::assertWithSideEffects"); // warning
@@ -63,7 +58,7 @@ void CheckAssert::assertWithSideEffects()
             checkVariableAssignment(tmp, tok->scope());
 
             if (tmp->tokType() != Token::eFunction) {
-                if (const Library::Function* f = mSettings->library.getFunction(tmp)) {
+                if (const Library::Function* f = mSettings.library.getFunction(tmp)) {
                     if (f->isconst || f->ispure)
                         continue;
                     if (Library::getContainerYield(tmp->next()) != Library::Container::Yield::NO_YIELD) // bailout, assume read access
@@ -78,17 +73,22 @@ void CheckAssert::assertWithSideEffects()
                         f->containerYield == Library::Container::Yield::END_ITERATOR ||
                         f->containerYield == Library::Container::Yield::ITERATOR)
                         continue;
-                    sideEffectInAssertError(tmp, mSettings->library.getFunctionName(tmp));
+                    sideEffectInAssertError(tmp, mSettings.library.getFunctionName(tmp));
                 }
                 continue;
             }
 
+            const Token* parent = tmp->astParent();
+            while (Token::Match(parent, ".|::"))
+                parent = parent->astParent();
+            if (!Token::simpleMatch(parent, "("))
+                continue;
             const Function* f = tmp->function();
             const Scope* scope = f->functionScope;
             if (!scope) {
                 // guess that const method doesn't have side effects
                 if (f->nestedIn->isClassOrStruct() && !f->isConst() && !f->isStatic())
-                    sideEffectInAssertError(tmp, f->name()); // Non-const member function called, assume it has side effects
+                    sideEffectInAssertError(tmp, f->name(), " If there are no side effects, consider declaring the method const."); // Non-const member function called, assume it has side effects
                 continue;
             }
 
@@ -122,19 +122,19 @@ void CheckAssert::assertWithSideEffects()
 //---------------------------------------------------------------------------
 
 
-void CheckAssert::sideEffectInAssertError(const Token *tok, const std::string& functionName)
+void CheckAssertImpl::sideEffectInAssertError(const Token *tok, const std::string& functionName, const std::string &extra)
 {
     reportError(tok, Severity::warning,
                 "assertWithSideEffect",
                 "$symbol:" + functionName + "\n"
-                "Assert statement calls a function which may have desired side effects: '$symbol'.\n"
+                "Assert statement calls a function which may have desired side effects: '$symbol'." + extra + "\n"
                 "Non-pure function: '$symbol' is called inside assert statement. "
                 "Assert statements are removed from release builds so the code inside "
                 "assert statement is not executed. If the code is needed also in release "
                 "builds, this is a bug.", CWE398, Certainty::normal);
 }
 
-void CheckAssert::assignmentInAssertError(const Token *tok, const std::string& varname)
+void CheckAssertImpl::assignmentInAssertError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::warning,
                 "assignmentInAssert",
@@ -147,7 +147,7 @@ void CheckAssert::assignmentInAssertError(const Token *tok, const std::string& v
 }
 
 // checks if side effects happen on the variable prior to tmp
-void CheckAssert::checkVariableAssignment(const Token* assignTok, const Scope *assertionScope)
+void CheckAssertImpl::checkVariableAssignment(const Token* assignTok, const Scope *assertionScope)
 {
     if (!assignTok->isAssignmentOp() && assignTok->tokType() != Token::eIncDecOp)
         return;
@@ -177,21 +177,21 @@ void CheckAssert::checkVariableAssignment(const Token* assignTok, const Scope *a
     // TODO: function calls on var
 }
 
-bool CheckAssert::inSameScope(const Token* returnTok, const Token* assignTok)
+bool CheckAssertImpl::inSameScope(const Token* returnTok, const Token* assignTok)
 {
     // TODO: even if a return is in the same scope, the assignment might not affect it.
     return returnTok->scope() == assignTok->scope();
 }
 
-void CheckAssert::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckAssert::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckAssert checkAssert(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckAssertImpl checkAssert(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkAssert.assertWithSideEffects();
 }
 
-void CheckAssert::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckAssert::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckAssert c(nullptr, settings, errorLogger);
+    CheckAssertImpl c(nullptr, settings, errorLogger);
     c.sideEffectInAssertError(nullptr, "function");
     c.assignmentInAssertError(nullptr, "var");
 }
diff --git a/lib/checkassert.h b/lib/checkassert.h
index b01831a5eec..15f97fb1746 100644
--- a/lib/checkassert.h
+++ b/lib/checkassert.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -42,32 +43,30 @@ class Tokenizer;
 
 class CPPCHECKLIB CheckAssert : public Check {
 public:
-    CheckAssert() : Check(myName()) {}
+    CheckAssert() : Check("Assert") {}
 
 private:
-    CheckAssert(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** run checks, the token list is not simplified */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Warn if there are side effects in assert statements (since this cause different behaviour in debug/release builds).\n";
+    }
+};
+
+class CPPCHECKLIB CheckAssertImpl : public CheckImpl {
+public:
+    CheckAssertImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     void assertWithSideEffects();
 
     void checkVariableAssignment(const Token* assignTok, const Scope *assertionScope);
     static bool inSameScope(const Token* returnTok, const Token* assignTok);
 
-    void sideEffectInAssertError(const Token *tok, const std::string& functionName);
+    void sideEffectInAssertError(const Token *tok, const std::string& functionName, const std::string &extra = "");
     void assignmentInAssertError(const Token *tok, const std::string &varname);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Assert";
-    }
-
-    std::string classInfo() const override {
-        return "Warn if there are side effects in assert statements (since this cause different behaviour in debug/release builds).\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
index 2ea5a3de0fa..de70772a279 100644
--- a/lib/checkautovariables.cpp
+++ b/lib/checkautovariables.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,12 +39,6 @@
 
 //---------------------------------------------------------------------------
 
-
-// Register this check class into cppcheck by creating a static instance of it..
-namespace {
-    CheckAutoVariables instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE562(562U);  // Return of Stack Variable Address
 static const CWE CWE590(590U);  // Free of Memory not on the Heap
@@ -99,6 +93,8 @@ static bool isAutoVar(const Token *tok)
         } while (Token::Match(tok, "%name% .|::"));
         if (Token::Match(tok, "%name% ("))
             return false;
+        if (tok->variable() && tok->variable()->isPointer())
+            return false;
     }
     return true;
 }
@@ -143,14 +139,14 @@ static bool isAutoVarArray(const Token *tok)
     return false;
 }
 
-static bool isLocalContainerBuffer(const Token* tok, const Settings& settings)
+static bool isLocalContainerBuffer(const Token* tok, const Library& library)
 {
     if (!tok)
         return false;
 
     // x+y
     if (tok->str() == "+")
-        return isLocalContainerBuffer(tok->astOperand1(), settings) || isLocalContainerBuffer(tok->astOperand2(), settings);
+        return isLocalContainerBuffer(tok->astOperand1(), library) || isLocalContainerBuffer(tok->astOperand2(), library);
 
     if (tok->str() != "(" || !Token::simpleMatch(tok->astOperand1(), "."))
         return false;
@@ -161,7 +157,7 @@ static bool isLocalContainerBuffer(const Token* tok, const Settings& settings)
     if (!var || !var->isLocal() || var->isStatic())
         return false;
 
-    const Library::Container::Yield yield = astContainerYield(tok, settings.library);
+    const Library::Container::Yield yield = astContainerYield(tok, library);
 
     return yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT;
 }
@@ -206,11 +202,11 @@ static bool variableIsUsedInScope(const Token* start, nonneg int varId, const Sc
     return false;
 }
 
-void CheckAutoVariables::assignFunctionArg()
+void CheckAutoVariablesImpl::assignFunctionArg()
 {
-    const bool printStyle = mSettings->severity.isEnabled(Severity::style);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarning && !mSettings->isPremiumEnabled("uselessAssignmentPtrArg"))
+    const bool printStyle = mSettings.severity.isEnabled(Severity::style);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    if (!printStyle && !printWarning && !mSettings.isPremiumEnabled("uselessAssignmentPtrArg"))
         return;
 
     logChecker("CheckAutoVariables::assignFunctionArg"); // style,warning
@@ -237,8 +233,8 @@ void CheckAutoVariables::assignFunctionArg()
     }
 }
 
-static bool isAutoVariableRHS(const Token* tok, const Settings& settings) {
-    return isAddressOfLocalVariable(tok) || isAutoVarArray(tok) || isLocalContainerBuffer(tok, settings);
+static bool isAutoVariableRHS(const Token* tok, const Library& library) {
+    return isAddressOfLocalVariable(tok) || isAutoVarArray(tok) || isLocalContainerBuffer(tok, library);
 }
 
 static bool hasOverloadedAssignment(const Token* tok, bool& inconclusive)
@@ -261,11 +257,34 @@ static bool hasOverloadedAssignment(const Token* tok, bool& inconclusive)
     return true;
 }
 
-void CheckAutoVariables::autoVariables()
+static bool isMemberAssignment(const Token* tok, const Token*& rhs, const Library& library)
+{
+    const Token *endBracket = nullptr;
+    if (!Token::Match(tok, "[;{}] %var% . %var%")) {
+        if (!Token::Match(tok, "[;{}] %var% ["))
+            return false;
+        endBracket = tok->linkAt(2);
+        if (!Token::Match(endBracket, "] . %var%"))
+            return false;
+    }
+    if (!isPtrArg(tok->next()))
+        return false;
+    const Token* assign = (endBracket ? endBracket->next() : tok->tokAt(2))->astParent();
+    while (Token::simpleMatch(assign, "["))
+        assign = assign->astParent();
+    if (!Token::simpleMatch(assign, "="))
+        return false;
+    if (!isAutoVariableRHS(assign->astOperand2(), library))
+        return false;
+    rhs = assign->astOperand2();
+    return true;
+}
+
+void CheckAutoVariablesImpl::autoVariables()
 {
     logChecker("CheckAutoVariables::autoVariables");
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
@@ -275,27 +294,28 @@ void CheckAutoVariables::autoVariables()
                 continue;
             }
             // Critical assignment
-            if (Token::Match(tok, "[;{}] %var% =") && isRefPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(2)->astOperand2(), *mSettings)) {
+            const Token* rhs{};
+            if (Token::Match(tok, "[;{}] %var% =") && isRefPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(2)->astOperand2(), mSettings.library)) {
                 checkAutoVariableAssignment(tok->next(), false);
-            } else if (Token::Match(tok, "[;{}] * %var% =") && isPtrArg(tok->tokAt(2)) && isAutoVariableRHS(tok->tokAt(3)->astOperand2(), *mSettings)) {
+            } else if (Token::Match(tok, "[;{}] * %var% =") && isPtrArg(tok->tokAt(2)) && isAutoVariableRHS(tok->tokAt(3)->astOperand2(), mSettings.library)) {
                 const Token* lhs = tok->tokAt(2);
                 bool inconclusive = false;
                 if (!hasOverloadedAssignment(lhs, inconclusive) || (printInconclusive && inconclusive))
                     checkAutoVariableAssignment(tok->next(), inconclusive);
                 tok = tok->tokAt(4);
-            } else if (Token::Match(tok, "[;{}] %var% . %var% =") && isPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(4)->astOperand2(), *mSettings)) {
+            } else if (isMemberAssignment(tok, rhs, mSettings.library)) {
                 const Token* lhs = tok->tokAt(3);
                 bool inconclusive = false;
                 if (!hasOverloadedAssignment(lhs, inconclusive) || (printInconclusive && inconclusive))
                     checkAutoVariableAssignment(tok->next(), inconclusive);
-                tok = tok->tokAt(5);
+                tok = rhs;
             } else if (Token::Match(tok, "[;{}] %var% [") && Token::simpleMatch(tok->linkAt(2), "] =") &&
-                       (isPtrArg(tok->next()) || isArrayArg(tok->next(), *mSettings)) &&
-                       isAutoVariableRHS(tok->linkAt(2)->next()->astOperand2(), *mSettings)) {
+                       (isPtrArg(tok->next()) || isArrayArg(tok->next(), mSettings)) &&
+                       isAutoVariableRHS(tok->linkAt(2)->next()->astOperand2(), mSettings.library)) {
                 errorAutoVariableAssignment(tok->next(), false);
             }
             // Invalid pointer deallocation
-            else if ((Token::Match(tok, "%name% ( %var%|%str% ) ;") && mSettings->library.getDeallocFuncInfo(tok)) ||
+            else if ((Token::Match(tok, "%name% ( %var%|%str% ) ;") && mSettings.library.getDeallocFuncInfo(tok)) ||
                      (tok->isCpp() && Token::Match(tok, "delete [| ]| (| %var%|%str% !!["))) {
                 tok = Token::findmatch(tok->next(), "%var%|%str%");
                 if (Token::simpleMatch(tok->astParent(), "."))
@@ -306,14 +326,14 @@ void CheckAutoVariables::autoVariables()
                     for (const ValueFlow::Value &v : tok->values()) {
                         if (v.isImpossible())
                             continue;
-                        if ((v.isTokValue() && (isArrayVar(v.tokvalue) || ((v.tokvalue->tokType() == Token::eString)))) ||
+                        if ((v.isTokValue() && (isArrayVar(v.tokvalue) || (v.tokvalue->tokType() == Token::eString))) ||
                             (v.isLocalLifetimeValue() && v.lifetimeKind == ValueFlow::Value::LifetimeKind::Address && !Token::simpleMatch(v.tokvalue, "("))) {
                             errorInvalidDeallocation(tok, &v);
                             break;
                         }
                     }
                 }
-            } else if ((Token::Match(tok, "%name% ( & %var% ) ;") && mSettings->library.getDeallocFuncInfo(tok)) ||
+            } else if ((Token::Match(tok, "%name% ( & %var% ) ;") && mSettings.library.getDeallocFuncInfo(tok)) ||
                        (tok->isCpp() && Token::Match(tok, "delete [| ]| (| & %var% !!["))) {
                 tok = Token::findmatch(tok->next(), "%var%");
                 if (isAutoVar(tok))
@@ -323,13 +343,15 @@ void CheckAutoVariables::autoVariables()
     }
 }
 
-bool CheckAutoVariables::checkAutoVariableAssignment(const Token *expr, bool inconclusive, const Token *startToken)
+bool CheckAutoVariablesImpl::checkAutoVariableAssignment(const Token *expr, bool inconclusive, const Token *startToken)
 {
     if (!startToken)
         startToken = Token::findsimplematch(expr, "=")->next();
     for (const Token *tok = startToken; tok; tok = tok->next()) {
-        if (tok->str() == "}" && tok->scope()->type == ScopeType::eFunction)
+        if (tok->str() == "}" && tok->scope()->type == ScopeType::eFunction) {
             errorAutoVariableAssignment(expr, inconclusive);
+            return true;
+        }
 
         if (Token::Match(tok, "return|throw|break|continue")) {
             errorAutoVariableAssignment(expr, inconclusive);
@@ -364,8 +386,10 @@ bool CheckAutoVariables::checkAutoVariableAssignment(const Token *expr, bool inc
 
 //---------------------------------------------------------------------------
 
-void CheckAutoVariables::errorAutoVariableAssignment(const Token *tok, bool inconclusive)
+void CheckAutoVariablesImpl::errorAutoVariableAssignment(const Token *tok, bool inconclusive)
 {
+    diag(tok);
+
     if (!inconclusive) {
         reportError(tok, Severity::error, "autoVariables",
                     "Address of local auto-variable assigned to a function parameter.\n"
@@ -385,7 +409,7 @@ void CheckAutoVariables::errorAutoVariableAssignment(const Token *tok, bool inco
     }
 }
 
-void CheckAutoVariables::errorUselessAssignmentArg(const Token *tok)
+void CheckAutoVariablesImpl::errorUselessAssignmentArg(const Token *tok)
 {
     reportError(tok,
                 Severity::style,
@@ -393,7 +417,7 @@ void CheckAutoVariables::errorUselessAssignmentArg(const Token *tok)
                 "Assignment of function parameter has no effect outside the function.", CWE398, Certainty::normal);
 }
 
-void CheckAutoVariables::errorUselessAssignmentPtrArg(const Token *tok)
+void CheckAutoVariablesImpl::errorUselessAssignmentPtrArg(const Token *tok)
 {
     reportError(tok,
                 Severity::warning,
@@ -401,7 +425,7 @@ void CheckAutoVariables::errorUselessAssignmentPtrArg(const Token *tok)
                 "Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?", CWE398, Certainty::normal);
 }
 
-bool CheckAutoVariables::diag(const Token* tokvalue)
+bool CheckAutoVariablesImpl::diag(const Token* tokvalue)
 {
     if (!tokvalue)
         return true;
@@ -538,9 +562,9 @@ static bool isAssignedToNonLocal(const Token* tok)
     return !var->isLocal() || var->isStatic();
 }
 
-void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token * end)
+void CheckAutoVariablesImpl::checkVarLifetimeScope(const Token * start, const Token * end)
 {
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     if (!start)
         return;
     const Scope * scope = start->scope();
@@ -553,7 +577,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
     for (const Token *tok = start; tok && tok != end; tok = tok->next()) {
         // Return reference from function
         if (returnRef && Token::simpleMatch(tok->astParent(), "return")) {
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok, *mSettings, true)) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok, mSettings, true)) {
                 if (!printInconclusive && lt.inconclusive)
                     continue;
                 const Variable* var = lt.token->variable();
@@ -562,7 +586,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                     errorReturnReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
-                if (isDeadTemporary(lt.token, nullptr, mSettings->library)) {
+                if (isDeadTemporary(lt.token, nullptr, mSettings.library)) {
                     errorReturnTempReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
@@ -573,56 +597,60 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                    tok->variable()->declarationId() == tok->varId() && tok->variable()->isStatic() &&
                    !tok->variable()->isArgument()) {
             ErrorPath errorPath;
-            const Variable *var = ValueFlow::getLifetimeVariable(tok, errorPath, *mSettings);
+            const Variable *var = ValueFlow::getLifetimeVariable(tok, errorPath, mSettings);
             if (var && isInScope(var->nameToken(), tok->scope())) {
                 errorDanglingReference(tok, var, std::move(errorPath));
                 continue;
             }
             // Reference to temporary
         } else if (tok->variable() && (tok->variable()->isReference() || tok->variable()->isRValueReference())) {
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(getParentLifetime(tok), *mSettings)) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(getParentLifetime(tok), mSettings)) {
                 if (!printInconclusive && lt.inconclusive)
                     continue;
                 const Token * tokvalue = lt.token;
-                if (isDeadTemporary(tokvalue, tok, mSettings->library)) {
+                if (isDeadTemporary(tokvalue, tok, mSettings.library)) {
                     errorDanglingTempReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
             }
         }
-        const bool escape = Token::simpleMatch(tok->astParent(), "throw") ||
-                            (Token::simpleMatch(tok->astParent(), "return") && !Function::returnsStandardType(scope->function));
+        const Token* retThrow = tok->astParent();
+        if (Token::simpleMatch(retThrow, "new"))
+            retThrow = retThrow->astParent();
+        const bool escape = Token::simpleMatch(retThrow, "throw") ||
+                            (Token::simpleMatch(retThrow, "return") && !Function::returnsStandardType(scope->function));
         std::unordered_set<const Token*> exprs;
         for (const ValueFlow::Value& val:tok->values()) {
             if (!val.isLocalLifetimeValue() && !val.isSubFunctionLifetimeValue())
                 continue;
             if (!printInconclusive && val.isInconclusive())
                 continue;
-            const Token* parent = getParentLifetime(val.tokvalue, mSettings->library);
+            const Token* parent = getParentLifetime(val.tokvalue, mSettings.library);
             if (!exprs.insert(parent).second)
                 continue;
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(parent, *mSettings, escape || isAssignedToNonLocal(tok))) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(parent, mSettings, escape || isAssignedToNonLocal(tok))) {
                 const Token * tokvalue = lt.token;
                 if (val.isLocalLifetimeValue()) {
                     if (escape) {
                         if (getPointerDepth(tok) < getPointerDepth(tokvalue))
                             continue;
-                        if (!ValueFlow::isLifetimeBorrowed(tok, *mSettings))
+                        if (!ValueFlow::isLifetimeBorrowed(tok, mSettings))
                             continue;
                         if (tokvalue->exprId() == tok->exprId() && !(tok->variable() && tok->variable()->isArray()) &&
                             !astIsContainerView(tok->astParent()))
                             continue;
                         if ((tokvalue->variable() && !isEscapedReference(tokvalue->variable()) &&
                              isInScope(tokvalue->variable()->nameToken(), scope)) ||
-                            isDeadTemporary(tokvalue, nullptr, mSettings->library)) {
-                            errorReturnDanglingLifetime(tok, &val);
+                            isDeadTemporary(tokvalue, nullptr, mSettings.library)) {
+                            if (!diag(tokvalue))
+                                errorReturnDanglingLifetime(tok, &val);
                             break;
                         }
                     } else if (tokvalue->variable() && isDeadScope(tokvalue->variable()->nameToken(), tok->scope())) {
                         errorInvalidLifetime(tok, &val);
                         break;
                     } else if (!tokvalue->variable() &&
-                               isDeadTemporary(tokvalue, tok, mSettings->library)) {
+                               isDeadTemporary(tokvalue, tok, mSettings.library)) {
                         if (!diag(tokvalue))
                             errorDanglingTemporaryLifetime(tok, &val, tokvalue);
                         break;
@@ -640,19 +668,21 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                     } else if (tok->variable() && tok->variable()->declarationId() == tok->varId()) {
                         var = tok->variable();
                     }
-                    if (!ValueFlow::isLifetimeBorrowed(tok, *mSettings))
+                    if (!ValueFlow::isLifetimeBorrowed(tok, mSettings))
                         continue;
                     const Token* nextTok = nextAfterAstRightmostLeaf(tok->astTop());
                     if (!nextTok)
                         nextTok = tok->next();
-                    if (var && (!var->isLocal() || var->isStatic()) && !var->isArgument() && !(val.tokvalue && val.tokvalue->variable() && val.tokvalue->variable()->isStatic()) &&
+                    if (var && (!var->isLocal() || var->isStatic()) && (!var->isArgument() || (var->isReference() && isInScope(val.tokvalue, var->scope()))) &&
+                        !(val.tokvalue && val.tokvalue->variable() && val.tokvalue->variable()->isStatic()) &&
                         !isVariableChanged(nextTok,
                                            tok->scope()->bodyEnd,
                                            var->valueType() ? var->valueType()->pointer : 0,
                                            var->declarationId(),
                                            var->isGlobal(),
-                                           *mSettings)) {
-                        errorDanglngLifetime(tok2, &val, var->isLocal());
+                                           mSettings)) {
+                        if (!diag(tok2))
+                            errorDanglngLifetime(tok2, &val, var->isLocal());
                         break;
                     }
                 }
@@ -678,7 +708,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
     }
 }
 
-void CheckAutoVariables::checkVarLifetime()
+void CheckAutoVariablesImpl::checkVarLifetime()
 {
     logChecker("CheckAutoVariables::checkVarLifetime");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -689,32 +719,32 @@ void CheckAutoVariables::checkVarLifetime()
     }
 }
 
-void CheckAutoVariables::errorReturnDanglingLifetime(const Token *tok, const ValueFlow::Value *val)
+void CheckAutoVariablesImpl::errorReturnDanglingLifetime(const Token *tok, const ValueFlow::Value *val)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
     std::string msg = "Returning " + lifetimeMessage(tok, val, errorPath);
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::error, "returnDanglingLifetime", msg + " that will be invalid when returning.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
+    reportError(std::move(errorPath), Severity::error, "returnDanglingLifetime", msg + " that will be invalid when returning.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorInvalidLifetime(const Token *tok, const ValueFlow::Value* val)
+void CheckAutoVariablesImpl::errorInvalidLifetime(const Token *tok, const ValueFlow::Value* val)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
     std::string msg = "Using " + lifetimeMessage(tok, val, errorPath);
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::error, "invalidLifetime", msg + " that is out of scope.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
+    reportError(std::move(errorPath), Severity::error, "invalidLifetime", msg + " that is out of scope.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglingTemporaryLifetime(const Token* tok, const ValueFlow::Value* val, const Token* tempTok)
+void CheckAutoVariablesImpl::errorDanglingTemporaryLifetime(const Token* tok, const ValueFlow::Value* val, const Token* tempTok)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
     std::string msg = "Using " + lifetimeMessage(tok, val, errorPath);
     errorPath.emplace_back(tempTok, "Temporary created here.");
     errorPath.emplace_back(tok, "");
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 Severity::error,
                 "danglingTemporaryLifetime",
                 msg + " that is a temporary.",
@@ -722,7 +752,7 @@ void CheckAutoVariables::errorDanglingTemporaryLifetime(const Token* tok, const
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val, bool isStatic)
+void CheckAutoVariablesImpl::errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val, bool isStatic)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
@@ -730,40 +760,40 @@ void CheckAutoVariables::errorDanglngLifetime(const Token *tok, const ValueFlow:
     std::string msg = isStatic ? "Static" : "Non-local";
     msg += " variable '" + tokName + "' will use " + lifetimeMessage(tok, val, errorPath);
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::error, "danglingLifetime", msg + ".", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
+    reportError(std::move(errorPath), Severity::error, "danglingLifetime", msg + ".", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglingTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
+void CheckAutoVariablesImpl::errorDanglingTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
 {
     errorPath.emplace_back(tok, "");
     reportError(
-        errorPath, Severity::error, "danglingTempReference", "Using reference to dangling temporary.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
+        std::move(errorPath), Severity::error, "danglingTempReference", "Using reference to dangling temporary.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorReturnReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
+void CheckAutoVariablesImpl::errorReturnReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
 {
     errorPath.emplace_back(tok, "");
     reportError(
-        errorPath, Severity::error, "returnReference", "Reference to local variable returned.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
+        std::move(errorPath), Severity::error, "returnReference", "Reference to local variable returned.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglingReference(const Token *tok, const Variable *var, ErrorPath errorPath)
+void CheckAutoVariablesImpl::errorDanglingReference(const Token *tok, const Variable *var, ErrorPath errorPath)
 {
     std::string tokName = tok ? tok->str() : "x";
     std::string varName = var ? var->name() : "y";
     std::string msg = "Non-local reference variable '" + tokName + "' to local variable '" + varName + "'";
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::error, "danglingReference", msg, CWE562, Certainty::normal);
+    reportError(std::move(errorPath), Severity::error, "danglingReference", msg, CWE562, Certainty::normal);
 }
 
-void CheckAutoVariables::errorReturnTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
+void CheckAutoVariablesImpl::errorReturnTempReference(const Token* tok, ErrorPath errorPath, bool inconclusive)
 {
     errorPath.emplace_back(tok, "");
     reportError(
-        errorPath, Severity::error, "returnTempReference", "Reference to temporary returned.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
+        std::move(errorPath), Severity::error, "returnTempReference", "Reference to temporary returned.", CWE562, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorInvalidDeallocation(const Token *tok, const ValueFlow::Value *val)
+void CheckAutoVariablesImpl::errorInvalidDeallocation(const Token *tok, const ValueFlow::Value *val)
 {
     const Variable *var = val ? val->tokvalue->variable() : (tok ? tok->variable() : nullptr);
 
@@ -790,17 +820,17 @@ void CheckAutoVariables::errorInvalidDeallocation(const Token *tok, const ValueF
                 "that has been allocated dynamically.", CWE590, Certainty::normal);
 }
 
-void CheckAutoVariables::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckAutoVariables::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckAutoVariables checkAutoVariables(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckAutoVariablesImpl checkAutoVariables(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkAutoVariables.assignFunctionArg();
-    checkAutoVariables.checkVarLifetime();
     checkAutoVariables.autoVariables();
+    checkAutoVariables.checkVarLifetime();
 }
 
-void CheckAutoVariables::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckAutoVariables::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckAutoVariables c(nullptr,settings,errorLogger);
+    CheckAutoVariablesImpl c(nullptr,settings,errorLogger);
     c.errorAutoVariableAssignment(nullptr, false);
     c.errorReturnReference(nullptr, ErrorPath{}, false);
     c.errorDanglingReference(nullptr, nullptr, ErrorPath{});
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
index d94f254508f..23d7a55a488 100644
--- a/lib/checkautovariables.h
+++ b/lib/checkautovariables.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "errortypes.h"
 
@@ -47,15 +48,32 @@ namespace ValueFlow {
 class CPPCHECKLIB CheckAutoVariables : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckAutoVariables() : Check(myName()) {}
+    CheckAutoVariables() : Check("Auto Variables") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckAutoVariables(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "A pointer to a variable is only valid as long as the variable is in scope.\n"
+               "Check:\n"
+               "- returning a pointer to auto or temporary variable\n"
+               "- assigning address of an variable to an effective parameter of a function\n"
+               "- returning reference to local/temporary variable\n"
+               "- returning address of function parameter\n"
+               "- suspicious assignment of pointer argument\n"
+               "- useless assignment of function argument\n";
+    }
+};
+
+class CPPCHECKLIB CheckAutoVariablesImpl : public CheckImpl
+{
+public:
+    /** This constructor is used when running checks. */
+    CheckAutoVariablesImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** assign function argument */
     void assignFunctionArg();
@@ -69,7 +87,6 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
     bool checkAutoVariableAssignment(const Token *expr, bool inconclusive, const Token *startToken = nullptr);
 
     void checkVarLifetime();
-
     void checkVarLifetimeScope(const Token * start, const Token * end);
 
     void errorAutoVariableAssignment(const Token *tok, bool inconclusive);
@@ -85,24 +102,8 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
     void errorUselessAssignmentArg(const Token *tok);
     void errorUselessAssignmentPtrArg(const Token *tok);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Auto Variables";
-    }
-
-    std::string classInfo() const override {
-        return "A pointer to a variable is only valid as long as the variable is in scope.\n"
-               "Check:\n"
-               "- returning a pointer to auto or temporary variable\n"
-               "- assigning address of an variable to an effective parameter of a function\n"
-               "- returning reference to local/temporary variable\n"
-               "- returning address of function parameter\n"
-               "- suspicious assignment of pointer argument\n"
-               "- useless assignment of function argument\n";
-    }
-
     /** returns true if tokvalue has already been diagnosed */
+private:
     bool diag(const Token* tokvalue);
 
     std::set<const Token*> mDiagDanglingTemp;
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
index 77848624a3f..3d36c9936a1 100644
--- a/lib/checkbool.cpp
+++ b/lib/checkbool.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -32,11 +32,6 @@
 #include <vector>
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckBool instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE571(571U);  // Expression is Always True
 static const CWE CWE587(587U);  // Assignment of a Fixed Address to a Pointer
@@ -48,9 +43,9 @@ static bool isBool(const Variable* var)
 }
 
 //---------------------------------------------------------------------------
-void CheckBool::checkIncrementBoolean()
+void CheckBoolImpl::checkIncrementBoolean()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("incrementboolean"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("incrementboolean"))
         return;
 
     logChecker("CheckBool::checkIncrementBoolean"); // style
@@ -65,7 +60,7 @@ void CheckBool::checkIncrementBoolean()
     }
 }
 
-void CheckBool::incrementBooleanError(const Token *tok)
+void CheckBoolImpl::incrementBooleanError(const Token *tok)
 {
     reportError(
         tok,
@@ -88,14 +83,13 @@ static bool isConvertedToBool(const Token* tok)
 // if (bool & bool) -> if (bool && bool)
 // if (bool | bool) -> if (bool || bool)
 //---------------------------------------------------------------------------
-void CheckBool::checkBitwiseOnBoolean()
+void CheckBoolImpl::checkBitwiseOnBoolean()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
-        return;
-
-    // danmar: this is inconclusive because I don't like that there are
-    //         warnings for calculations. Example: set_flag(a & b);
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.isPremiumEnabled("bitwiseOnBoolean") &&
+        !mSettings.severity.isEnabled(Severity::style) &&
+        // danmar: this is inconclusive because I don't like that there are
+        //         warnings for calculations. Example: set_flag(a & b);
+        !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckBool::checkBitwiseOnBoolean"); // style,inconclusive
@@ -122,7 +116,7 @@ void CheckBool::checkBitwiseOnBoolean()
                 if (tok->str() == "|" && !isConvertedToBool(tok) && !(isBoolOp1 && isBoolOp2))
                     continue;
                 // first operand will always be evaluated
-                if (!isConstExpression(tok->astOperand2(), mSettings->library))
+                if (!isConstExpression(tok->astOperand2(), mSettings.library))
                     continue;
                 if (tok->astOperand2()->variable() && tok->astOperand2()->variable()->nameToken() == tok->astOperand2())
                     continue;
@@ -133,7 +127,7 @@ void CheckBool::checkBitwiseOnBoolean()
     }
 }
 
-void CheckBool::bitwiseOnBooleanError(const Token* tok, const std::string& expression, const std::string& op, bool isCompound)
+void CheckBoolImpl::bitwiseOnBooleanError(const Token* tok, const std::string& expression, const std::string& op, bool isCompound)
 {
     std::string msg = "Boolean expression '" + expression + "' is used in bitwise operation.";
     if (!isCompound)
@@ -150,9 +144,9 @@ void CheckBool::bitwiseOnBooleanError(const Token* tok, const std::string& expre
 //    if (!x==3) <- Probably meant to be "x!=3"
 //---------------------------------------------------------------------------
 
-void CheckBool::checkComparisonOfBoolWithInt()
+void CheckBoolImpl::checkComparisonOfBoolWithInt()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) || !mTokenizer->isCPP())
+    if (!mSettings.severity.isEnabled(Severity::warning) || !mTokenizer->isCPP())
         return;
 
     logChecker("CheckBool::checkComparisonOfBoolWithInt"); // warning,c++
@@ -177,7 +171,7 @@ void CheckBool::checkComparisonOfBoolWithInt()
     }
 }
 
-void CheckBool::comparisonOfBoolWithInvalidComparator(const Token *tok, const std::string &expression)
+void CheckBoolImpl::comparisonOfBoolWithInvalidComparator(const Token *tok, const std::string &expression)
 {
     reportError(tok, Severity::warning, "comparisonOfBoolWithInvalidComparator",
                 "Comparison of a boolean value using relational operator (<, >, <= or >=).\n"
@@ -201,9 +195,9 @@ static bool tokenIsFunctionReturningBool(const Token* tok)
     return false;
 }
 
-void CheckBool::checkComparisonOfFuncReturningBool()
+void CheckBoolImpl::checkComparisonOfFuncReturningBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     if (!mTokenizer->isCPP())
@@ -245,7 +239,7 @@ void CheckBool::checkComparisonOfFuncReturningBool()
     }
 }
 
-void CheckBool::comparisonOfFuncReturningBoolError(const Token *tok, const std::string &expression)
+void CheckBoolImpl::comparisonOfFuncReturningBoolError(const Token *tok, const std::string &expression)
 {
     reportError(tok, Severity::style, "comparisonOfFuncReturningBoolError",
                 "Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.\n"
@@ -254,7 +248,7 @@ void CheckBool::comparisonOfFuncReturningBoolError(const Token *tok, const std::
                 " operator could cause unexpected results.", CWE398, Certainty::normal);
 }
 
-void CheckBool::comparisonOfTwoFuncsReturningBoolError(const Token *tok, const std::string &expression1, const std::string &expression2)
+void CheckBoolImpl::comparisonOfTwoFuncsReturningBoolError(const Token *tok, const std::string &expression1, const std::string &expression2)
 {
     reportError(tok, Severity::style, "comparisonOfTwoFuncsReturningBoolError",
                 "Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n"
@@ -267,9 +261,9 @@ void CheckBool::comparisonOfTwoFuncsReturningBoolError(const Token *tok, const s
 // Comparison of bool with bool
 //-------------------------------------------------------------------------------
 
-void CheckBool::checkComparisonOfBoolWithBool()
+void CheckBoolImpl::checkComparisonOfBoolWithBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     if (!mTokenizer->isCPP())
@@ -308,7 +302,7 @@ void CheckBool::checkComparisonOfBoolWithBool()
     }
 }
 
-void CheckBool::comparisonOfBoolWithBoolError(const Token *tok, const std::string &expression)
+void CheckBoolImpl::comparisonOfBoolWithBoolError(const Token *tok, const std::string &expression)
 {
     reportError(tok, Severity::style, "comparisonOfBoolWithBoolError",
                 "Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.\n"
@@ -318,7 +312,7 @@ void CheckBool::comparisonOfBoolWithBoolError(const Token *tok, const std::strin
 }
 
 //-----------------------------------------------------------------------------
-void CheckBool::checkAssignBoolToPointer()
+void CheckBoolImpl::checkAssignBoolToPointer()
 {
     logChecker("CheckBool::checkAssignBoolToPointer");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -331,7 +325,7 @@ void CheckBool::checkAssignBoolToPointer()
     }
 }
 
-void CheckBool::assignBoolToPointerError(const Token *tok)
+void CheckBoolImpl::assignBoolToPointerError(const Token *tok)
 {
     reportError(tok, Severity::error, "assignBoolToPointer",
                 "Boolean value assigned to pointer.", CWE587, Certainty::normal);
@@ -339,9 +333,9 @@ void CheckBool::assignBoolToPointerError(const Token *tok)
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void CheckBool::checkComparisonOfBoolExpressionWithInt()
+void CheckBoolImpl::checkComparisonOfBoolExpressionWithInt()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("compareBoolExpressionWithInt"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("compareBoolExpressionWithInt"))
         return;
 
     logChecker("CheckBool::checkComparisonOfBoolExpressionWithInt"); // warning
@@ -379,13 +373,13 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
             if (astIsBool(numTok))
                 continue;
 
-            const ValueFlow::Value *minval = numTok->getValueLE(0, *mSettings);
+            const ValueFlow::Value *minval = numTok->getValueLE(0, mSettings);
             if (minval && minval->intvalue == 0 &&
                 (numInRhs ? Token::Match(tok, ">|==|!=")
                  : Token::Match(tok, "<|==|!=")))
                 minval = nullptr;
 
-            const ValueFlow::Value *maxval = numTok->getValueGE(1, *mSettings);
+            const ValueFlow::Value *maxval = numTok->getValueGE(1, mSettings);
             if (maxval && maxval->intvalue == 1 &&
                 (numInRhs ? Token::Match(tok, "<|==|!=")
                  : Token::Match(tok, ">|==|!=")))
@@ -399,7 +393,7 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
     }
 }
 
-void CheckBool::comparisonOfBoolExpressionWithIntError(const Token *tok, bool not0or1)
+void CheckBoolImpl::comparisonOfBoolExpressionWithIntError(const Token *tok, bool not0or1)
 {
     if (not0or1)
         reportError(tok, Severity::warning, "compareBoolExpressionWithInt",
@@ -410,7 +404,7 @@ void CheckBool::comparisonOfBoolExpressionWithIntError(const Token *tok, bool no
 }
 
 
-void CheckBool::pointerArithBool()
+void CheckBoolImpl::pointerArithBool()
 {
     logChecker("CheckBool::pointerArithBool");
 
@@ -433,7 +427,7 @@ void CheckBool::pointerArithBool()
     }
 }
 
-void CheckBool::pointerArithBoolCond(const Token *tok)
+void CheckBoolImpl::pointerArithBoolCond(const Token *tok)
 {
     if (!tok)
         return;
@@ -453,7 +447,7 @@ void CheckBool::pointerArithBoolCond(const Token *tok)
         pointerArithBoolError(tok);
 }
 
-void CheckBool::pointerArithBoolError(const Token *tok)
+void CheckBoolImpl::pointerArithBoolError(const Token *tok)
 {
     reportError(tok,
                 Severity::error,
@@ -462,11 +456,11 @@ void CheckBool::pointerArithBoolError(const Token *tok)
                 "Converting pointer arithmetic result to bool. The boolean result is always true unless there is pointer arithmetic overflow, and overflow is undefined behaviour. Probably a dereference is forgotten.", CWE571, Certainty::normal);
 }
 
-void CheckBool::checkAssignBoolToFloat()
+void CheckBoolImpl::checkAssignBoolToFloat()
 {
     if (!mTokenizer->isCPP())
         return;
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
     logChecker("CheckBool::checkAssignBoolToFloat"); // style,c++
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -479,15 +473,15 @@ void CheckBool::checkAssignBoolToFloat()
     }
 }
 
-void CheckBool::assignBoolToFloatError(const Token *tok)
+void CheckBoolImpl::assignBoolToFloatError(const Token *tok)
 {
     reportError(tok, Severity::style, "assignBoolToFloat",
                 "Boolean value assigned to floating point variable.", CWE704, Certainty::normal);
 }
 
-void CheckBool::returnValueOfFunctionReturningBool()
+void CheckBoolImpl::returnValueOfFunctionReturningBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     logChecker("CheckBool::returnValueOfFunctionReturningBool"); // style
@@ -506,21 +500,21 @@ void CheckBool::returnValueOfFunctionReturningBool()
             else if (tok->scope() && tok->scope()->isClassOrStruct())
                 tok = tok->scope()->bodyEnd;
             else if (Token::simpleMatch(tok, "return") && tok->astOperand1() &&
-                     (tok->astOperand1()->getValueGE(2, *mSettings) || tok->astOperand1()->getValueLE(-1, *mSettings)) &&
+                     (tok->astOperand1()->getValueGE(2, mSettings) || tok->astOperand1()->getValueLE(-1, mSettings)) &&
                      !(tok->astOperand1()->astOperand1() && Token::Match(tok->astOperand1(), "&|%or%")))
                 returnValueBoolError(tok);
         }
     }
 }
 
-void CheckBool::returnValueBoolError(const Token *tok)
+void CheckBoolImpl::returnValueBoolError(const Token *tok)
 {
     reportError(tok, Severity::style, "returnNonBoolInBooleanFunction", "Non-boolean value returned from function returning bool");
 }
 
-void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckBool checkBool(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckBoolImpl checkBool(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkBool.checkComparisonOfBoolExpressionWithInt();
@@ -535,9 +529,9 @@ void CheckBool::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkBool.checkBitwiseOnBoolean();
 }
 
-void CheckBool::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckBool::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckBool c(nullptr, settings, errorLogger);
+    CheckBoolImpl c(nullptr, settings, errorLogger);
     c.assignBoolToPointerError(nullptr);
     c.assignBoolToFloatError(nullptr);
     c.comparisonOfFuncReturningBoolError(nullptr, "func_name");
diff --git a/lib/checkbool.h b/lib/checkbool.h
index 65e5d0254ea..53cc19c2486 100644
--- a/lib/checkbool.h
+++ b/lib/checkbool.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,15 +42,33 @@ class Tokenizer;
 class CPPCHECKLIB CheckBool : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckBool() : Check(myName()) {}
+    CheckBool() : Check("Boolean") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckBool(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Boolean type checks\n"
+               "- using increment on boolean\n"
+               "- comparison of a boolean expression with an integer other than 0 or 1\n"
+               "- comparison of a function returning boolean value using relational operator\n"
+               "- comparison of a boolean value with boolean value using relational operator\n"
+               "- using bool in bitwise expression\n"
+               "- pointer addition in condition (either dereference is forgot or pointer overflow is required to make the condition false)\n"
+               "- Assigning bool value to pointer or float\n"
+               "- Returning an integer other than 0 or 1 from a function with boolean return value\n";
+    }
+};
+
+class CPPCHECKLIB CheckBoolImpl : public CheckImpl
+{
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckBoolImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for comparison of function returning bool*/
     void checkComparisonOfFuncReturningBool();
@@ -94,24 +113,6 @@ class CPPCHECKLIB CheckBool : public Check {
     void comparisonOfBoolExpressionWithIntError(const Token *tok, bool not0or1);
     void pointerArithBoolError(const Token *tok);
     void returnValueBoolError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Boolean";
-    }
-
-    std::string classInfo() const override {
-        return "Boolean type checks\n"
-               "- using increment on boolean\n"
-               "- comparison of a boolean expression with an integer other than 0 or 1\n"
-               "- comparison of a function returning boolean value using relational operator\n"
-               "- comparison of a boolean value with boolean value using relational operator\n"
-               "- using bool in bitwise expression\n"
-               "- pointer addition in condition (either dereference is forgot or pointer overflow is required to make the condition false)\n"
-               "- Assigning bool value to pointer or float\n"
-               "- Returning an integer other than 0 or 1 from a function with boolean return value\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index e79f8d05c6f..b3aa09d137c 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -36,6 +36,7 @@
 #include "utils.h"
 #include "valueflow.h"
 #include "vfvalue.h"
+#include "vf_common.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -49,13 +50,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckBufferOverrun instance;
-}
-
-//---------------------------------------------------------------------------
-
 // CWE ids used:
 static const CWE CWE131(131U);  // Incorrect Calculation of Buffer Size
 static const CWE CWE170(170U);  // Improper Null Termination
@@ -71,11 +65,24 @@ static const CWE CWE_BUFFER_OVERRUN(788U);   // Access of Memory Location After
 static const ValueFlow::Value *getBufferSizeValue(const Token *tok)
 {
     const std::list<ValueFlow::Value> &tokenValues = tok->values();
-    const auto it = std::find_if(tokenValues.cbegin(), tokenValues.cend(), std::mem_fn(&ValueFlow::Value::isBufferSizeValue));
+    auto it = std::find_if(tokenValues.cbegin(), tokenValues.cend(), std::mem_fn(&ValueFlow::Value::isBufferSizeValue));
+    if (it != tokenValues.cend())
+        return &*it;
+    it = std::find_if(tokenValues.cbegin(), tokenValues.cend(), [](const ValueFlow::Value& v) {
+        return v.isContainerSizeValue() && !v.isImpossible();
+    });
     return it == tokenValues.cend() ? nullptr : &*it;
 }
 
-static int getMinFormatStringOutputLength(const std::vector<const Token*> &parameters, nonneg int formatStringArgNr)
+static const Token* getRealBufferTok(const Token* tok) {
+    if (!tok->isUnaryOp("&"))
+        return tok;
+
+    const Token* op = tok->astOperand1();
+    return (op->valueType() && op->valueType()->pointer) ? op : tok;
+}
+
+static int getMinFormatStringOutputLength(const std::vector<const Token*> &parameters, nonneg int formatStringArgNr, const Settings& settings)
 {
     if (formatStringArgNr <= 0 || formatStringArgNr > parameters.size())
         return 0;
@@ -88,7 +95,7 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
     std::string digits_string;
     bool i_d_x_f_found = false;
     int parameterLength = 0;
-    int inputArgNr = formatStringArgNr;
+    nonneg int inputArgNr = formatStringArgNr;
     for (std::size_t i = 1; i + 1 < formatString.length(); ++i) {
         if (formatString[i] == '\\') {
             if (i < formatString.length() - 1 && formatString[i + 1] == '0')
@@ -130,8 +137,8 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
                 break;
             case 's':
                 parameterLength = 0;
-                if (inputArgNr < parameters.size() && parameters[inputArgNr]->tokType() == Token::eString)
-                    parameterLength = Token::getStrLength(parameters[inputArgNr]);
+                if (inputArgNr < parameters.size())
+                    parameterLength = ValueFlow::valueFlowGetStrLength(parameters[inputArgNr], settings.library);
 
                 handleNextParameter = true;
                 break;
@@ -148,14 +155,14 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
             outputStringSize++;
 
         if (handleNextParameter) {
-            // NOLINTNEXTLINE(cert-err34-c) - intentional use
+            // NOLINTNEXTLINE(bugprone-unchecked-string-to-number-conversion) - intentional use
             int tempDigits = std::abs(std::atoi(digits_string.c_str()));
             if (i_d_x_f_found)
                 tempDigits = std::max(tempDigits, 1);
 
             if (digits_string.find('.') != std::string::npos) {
                 const std::string endStr = digits_string.substr(digits_string.find('.') + 1);
-                // NOLINTNEXTLINE(cert-err34-c) - intentional use
+                // NOLINTNEXTLINE(bugprone-unchecked-string-to-number-conversion) - intentional use
                 const int maxLen = std::max(std::abs(std::atoi(endStr.c_str())), 1);
 
                 if (formatString[i] == 's') {
@@ -221,10 +228,12 @@ static bool getDimensionsEtc(const Token * const arrayToken, const Settings &set
         Dimension dim;
         dim.known = value->isKnown();
         dim.tok = nullptr;
-        const MathLib::bigint typeSize = array->valueType()->typeSize(settings.platform, array->valueType()->pointer > 1);
+        const auto sizeOf = array->valueType()->pointer > 1 ? ValueType::SizeOf::Pointer : ValueType::SizeOf::Pointee;
+        const size_t typeSize = array->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, sizeOf);
         if (typeSize == 0)
             return false;
-        dim.num = value->intvalue / typeSize;
+        // a container size counts elements, a buffer size counts bytes
+        dim.num = value->isContainerSizeValue() ? value->intvalue : value->intvalue / typeSize;
         dimensions.emplace_back(dim);
     }
     return !dimensions.empty();
@@ -281,7 +290,7 @@ static std::vector<ValueFlow::Value> getOverrunIndexValues(const Token* tok,
     return {};
 }
 
-void CheckBufferOverrun::arrayIndex()
+void CheckBufferOverrunImpl::arrayIndex()
 {
     logChecker("CheckBufferOverrun::arrayIndex");
 
@@ -320,7 +329,7 @@ void CheckBufferOverrun::arrayIndex()
         ErrorPath errorPath;
         bool mightBeLarger = false;
         MathLib::bigint path = 0;
-        if (!getDimensionsEtc(tok->astOperand1(), *mSettings, dimensions, errorPath, mightBeLarger, path))
+        if (!getDimensionsEtc(tok->astOperand1(), mSettings, dimensions, errorPath, mightBeLarger, path))
             continue;
 
         const Variable* const var = array->variable();
@@ -328,7 +337,7 @@ void CheckBufferOverrun::arrayIndex()
             const Token* changeTok = var->scope()->bodyStart;
             bool isChanged = false;
             while ((changeTok = findVariableChanged(changeTok->next(), var->scope()->bodyEnd, /*indirect*/ 0, var->declarationId(),
-                                                    /*globalvar*/ false, *mSettings))) {
+                                                    /*globalvar*/ false, mSettings))) {
                 if (!Token::simpleMatch(changeTok->astParent(), "[")) {
                     isChanged = true;
                     break;
@@ -350,7 +359,7 @@ void CheckBufferOverrun::arrayIndex()
         bool neg = false;
         std::vector<ValueFlow::Value> negativeIndexes;
         for (const Token * indexToken : indexTokens) {
-            const ValueFlow::Value *negativeValue = indexToken->getValueLE(-1, *mSettings);
+            const ValueFlow::Value *negativeValue = indexToken->getValueLE(-1, mSettings);
             if (negativeValue) {
                 negativeIndexes.emplace_back(*negativeValue);
                 neg = true;
@@ -402,9 +411,9 @@ static std::string arrayIndexMessage(const Token* tok,
     return errmsg.str();
 }
 
-void CheckBufferOverrun::arrayIndexError(const Token* tok,
-                                         const std::vector<Dimension>& dimensions,
-                                         const std::vector<ValueFlow::Value>& indexes)
+void CheckBufferOverrunImpl::arrayIndexError(const Token* tok,
+                                             const std::vector<Dimension>& dimensions,
+                                             const std::vector<ValueFlow::Value>& indexes)
 {
     if (!tok) {
         reportError(tok, Severity::error, "arrayIndexOutOfBounds", "Array 'arr[16]' accessed at index 16, which is out of bounds.", CWE_BUFFER_OVERRUN, Certainty::normal);
@@ -415,7 +424,7 @@ void CheckBufferOverrun::arrayIndexError(const Token* tok,
     const Token *condition = nullptr;
     const ValueFlow::Value *index = nullptr;
     for (const ValueFlow::Value& indexValue : indexes) {
-        if (!indexValue.errorSeverity() && !mSettings->severity.isEnabled(Severity::warning))
+        if (!indexValue.errorSeverity() && !mSettings.severity.isEnabled(Severity::warning))
             return;
         if (indexValue.condition)
             condition = indexValue.condition;
@@ -431,9 +440,9 @@ void CheckBufferOverrun::arrayIndexError(const Token* tok,
                 index->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckBufferOverrun::negativeIndexError(const Token* tok,
-                                            const std::vector<Dimension>& dimensions,
-                                            const std::vector<ValueFlow::Value>& indexes)
+void CheckBufferOverrunImpl::negativeIndexError(const Token* tok,
+                                                const std::vector<Dimension>& dimensions,
+                                                const std::vector<ValueFlow::Value>& indexes)
 {
     if (!tok) {
         reportError(tok, Severity::error, "negativeIndex", "Negative array index", CWE_BUFFER_UNDERRUN, Certainty::normal);
@@ -443,7 +452,7 @@ void CheckBufferOverrun::negativeIndexError(const Token* tok,
     const Token *condition = nullptr;
     const ValueFlow::Value *negativeValue = nullptr;
     for (const ValueFlow::Value& indexValue : indexes) {
-        if (!indexValue.errorSeverity() && !mSettings->severity.isEnabled(Severity::warning))
+        if (!indexValue.errorSeverity() && !mSettings.severity.isEnabled(Severity::warning))
             return;
         if (indexValue.condition)
             condition = indexValue.condition;
@@ -461,9 +470,9 @@ void CheckBufferOverrun::negativeIndexError(const Token* tok,
 
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::pointerArithmetic()
+void CheckBufferOverrunImpl::pointerArithmetic()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability) && !mSettings->isPremiumEnabled("pointerOutOfBounds"))
+    if (!mSettings.severity.isEnabled(Severity::portability) && !mSettings.isPremiumEnabled("pointerOutOfBounds"))
         return;
 
     logChecker("CheckBufferOverrun::pointerArithmetic"); // portability
@@ -494,7 +503,7 @@ void CheckBufferOverrun::pointerArithmetic()
         ErrorPath errorPath;
         bool mightBeLarger = false;
         MathLib::bigint path = 0;
-        if (!getDimensionsEtc(arrayToken, *mSettings, dimensions, errorPath, mightBeLarger, path))
+        if (!getDimensionsEtc(arrayToken, mSettings, dimensions, errorPath, mightBeLarger, path))
             continue;
 
         if (tok->str() == "+") {
@@ -507,7 +516,7 @@ void CheckBufferOverrun::pointerArithmetic()
                     pointerArithmeticError(tok, indexToken, &indexValues.front());
             }
 
-            if (const ValueFlow::Value *neg = indexToken->getValueLE(-1, *mSettings))
+            if (const ValueFlow::Value *neg = indexToken->getValueLE(-1, mSettings))
                 pointerArithmeticError(tok, indexToken, neg);
         } else if (tok->str() == "-") {
             if (arrayToken->variable() && arrayToken->variable()->isArgument())
@@ -517,7 +526,7 @@ void CheckBufferOverrun::pointerArithmetic()
             while (Token::Match(array, ".|::"))
                 array = array->astOperand2();
             if (array->variable() && array->variable()->isArray()) {
-                const ValueFlow::Value *v = indexToken->getValueGE(1, *mSettings);
+                const ValueFlow::Value *v = indexToken->getValueGE(1, mSettings);
                 if (v)
                     pointerArithmeticError(tok, indexToken, v);
             }
@@ -525,7 +534,7 @@ void CheckBufferOverrun::pointerArithmetic()
     }
 }
 
-void CheckBufferOverrun::pointerArithmeticError(const Token *tok, const Token *indexToken, const ValueFlow::Value *indexValue)
+void CheckBufferOverrunImpl::pointerArithmeticError(const Token *tok, const Token *indexToken, const ValueFlow::Value *indexValue)
 {
     if (!tok) {
         reportError(tok, Severity::portability, "pointerOutOfBounds", "Pointer arithmetic overflow.", CWE_POINTER_ARITHMETIC_OVERFLOW, Certainty::normal);
@@ -549,22 +558,59 @@ void CheckBufferOverrun::pointerArithmeticError(const Token *tok, const Token *i
 
 //---------------------------------------------------------------------------
 
-ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
+ValueFlow::Value CheckBufferOverrunImpl::getBufferSize(const Token *bufTok, const Settings& settings) const
 {
     if (!bufTok->valueType())
         return ValueFlow::Value(-1);
+
+    MathLib::bigint index = 0;
+    if (bufTok->isUnaryOp("&")) {
+        bufTok = bufTok->astOperand1();
+        if (Token::simpleMatch(bufTok, "[")) {
+            if (const Token* indexTok = bufTok->astOperand2()) {
+                if (indexTok->hasKnownIntValue())
+                    index = indexTok->getKnownIntValue();
+                else if (const ValueFlow::Value* maxValue = indexTok->getMaxValue(false))
+                    index = maxValue->intvalue;
+                else
+                    return ValueFlow::Value(-1);
+            }
+            bufTok = bufTok->astOperand1();
+        }
+    }
     const Variable *var = bufTok->variable();
 
     if (!var || var->dimensions().empty()) {
-        const ValueFlow::Value *value = getBufferSizeValue(bufTok);
-        if (value)
-            return *value;
+        if (const ValueFlow::Value *value = getBufferSizeValue(bufTok)) {
+            if (value->isBufferSizeValue())
+                return *value;
+            if (value->isContainerSizeValue() && bufTok->valueType()) {
+                size_t elementSize = 0;
+                if (bufTok->valueType()->containerTypeToken) {
+                    const ValueType vtElement = ValueType::parseDecl(bufTok->valueType()->containerTypeToken, settings);
+                    elementSize =
+                        vtElement.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                } else if (bufTok->valueType()->pointer == 1) {
+                    elementSize = bufTok->valueType()->getSizeOf(settings,
+                                                                 ValueType::Accuracy::ExactOrZero,
+                                                                 ValueType::SizeOf::Pointee);
+                }
+                if (elementSize > 0) {
+                    ValueFlow::Value bufSizeVal;
+                    bufSizeVal.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
+                    bufSizeVal.intvalue = value->intvalue * elementSize;
+                    bufSizeVal.valueKind = value->valueKind;
+                    bufSizeVal.errorPath = value->errorPath;
+                    return bufSizeVal;
+                }
+            }
+        }
     }
 
-    if (!var || var->isPointer())
+    if (!var || var->isPointer() || (astIsContainer(bufTok) && var->getTypeName() != "std::array"))
         return ValueFlow::Value(-1);
 
-    const MathLib::bigint dim = std::accumulate(var->dimensions().cbegin(), var->dimensions().cend(), 1LL, [](MathLib::bigint i1, const Dimension &dim) {
+    const MathLib::bigint dim = std::accumulate(var->dimensions().cbegin(), var->dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint i1, const Dimension &dim) {
         return i1 * dim.num;
     });
 
@@ -573,17 +619,17 @@ ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
     v.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
 
     if (var->isPointerArray())
-        v.intvalue = dim * mSettings->platform.sizeof_pointer;
+        v.intvalue = (dim - index) * mSettings.platform.sizeof_pointer;
     else {
-        const MathLib::bigint typeSize = bufTok->valueType()->typeSize(mSettings->platform);
-        v.intvalue = dim * typeSize;
+        const size_t typeSize = bufTok->valueType()->getSizeOf(mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
+        v.intvalue = (dim - index) * typeSize;
     }
 
     return v;
 }
 //---------------------------------------------------------------------------
 
-static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::MinSize &minsize, const std::vector<const Token *> &args, const MathLib::bigint bufferSize, const Settings &settings, const Tokenizer* tokenizer)
+static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::MinSize &minsize, const std::vector<const Token *> &args, ValueFlow::Value& bufferSize, const Settings &settings, const Tokenizer* tokenizer)
 {
     const Token * const arg = (minsize.arg > 0 && minsize.arg - 1 < args.size()) ? args[minsize.arg - 1] : nullptr;
     const Token * const arg2 = (minsize.arg2 > 0 && minsize.arg2 - 1 < args.size()) ? args[minsize.arg2 - 1] : nullptr;
@@ -591,20 +637,31 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
     switch (minsize.type) {
     case Library::ArgumentChecks::MinSize::Type::STRLEN:
         if (settings.library.isargformatstr(ftok, minsize.arg)) {
-            return getMinFormatStringOutputLength(args, minsize.arg) < bufferSize;
+            return getMinFormatStringOutputLength(args, minsize.arg, settings) < bufferSize.intvalue;
         } else if (arg) {
             const Token *strtoken = arg->getValueTokenMaxStrLength();
             if (strtoken)
-                return Token::getStrLength(strtoken) < bufferSize;
+                return Token::getStrLength(strtoken) < bufferSize.intvalue;
         }
         break;
     case Library::ArgumentChecks::MinSize::Type::ARGVALUE: {
-        if (arg && arg->hasKnownIntValue()) {
-            MathLib::bigint myMinsize = arg->getKnownIntValue();
+        if (arg) {
+            const ValueFlow::Value* argVal = arg->hasKnownIntValue() ?
+                                             arg->getKnownValue(ValueFlow::Value::ValueType::INT) :
+                                             arg->getMaxValue(/*condition*/ true);
+            if (!argVal)
+                break;
+            MathLib::bigint myMinsize = argVal->intvalue;
             const int baseSize = tokenizer->sizeOfType(minsize.baseType);
             if (baseSize != 0)
                 myMinsize *= baseSize;
-            return myMinsize <= bufferSize;
+            const bool ok = myMinsize <= bufferSize.intvalue;
+            if (!ok) {
+                bufferSize.errorPath.insert(bufferSize.errorPath.end(), argVal->errorPath.begin(), argVal->errorPath.end());
+                if (!bufferSize.condition)
+                    bufferSize.condition = argVal->condition;
+            }
+            return ok;
         }
         break;
     }
@@ -613,14 +670,14 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
         break;
     case Library::ArgumentChecks::MinSize::Type::MUL:
         if (arg && arg2 && arg->hasKnownIntValue() && arg2->hasKnownIntValue())
-            return (arg->getKnownIntValue() * arg2->getKnownIntValue()) <= bufferSize;
+            return (arg->getKnownIntValue() * arg2->getKnownIntValue()) <= bufferSize.intvalue;
         break;
     case Library::ArgumentChecks::MinSize::Type::VALUE: {
         MathLib::bigint myMinsize = minsize.value;
         const int baseSize = tokenizer->sizeOfType(minsize.baseType);
         if (baseSize != 0)
             myMinsize *= baseSize;
-        return myMinsize <= bufferSize;
+        return myMinsize <= bufferSize.intvalue;
     }
     case Library::ArgumentChecks::MinSize::Type::NONE:
         break;
@@ -629,7 +686,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
 }
 
 
-void CheckBufferOverrun::bufferOverflow()
+void CheckBufferOverrunImpl::bufferOverflow()
 {
     logChecker("CheckBufferOverrun::bufferOverflow");
 
@@ -638,13 +695,13 @@ void CheckBufferOverrun::bufferOverflow()
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
             if (!Token::Match(tok, "%name% (") || Token::simpleMatch(tok, ") {"))
                 continue;
-            if (!mSettings->library.hasminsize(tok))
+            if (!mSettings.library.hasminsize(tok))
                 continue;
             const std::vector<const Token *> args = getArguments(tok);
-            for (int argnr = 0; argnr < args.size(); ++argnr) {
+            for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                 if (!args[argnr]->valueType() || args[argnr]->valueType()->pointer == 0)
                     continue;
-                const std::vector<Library::ArgumentChecks::MinSize> *minsizes = mSettings->library.argminsizes(tok, argnr + 1);
+                const std::vector<Library::ArgumentChecks::MinSize> *minsizes = mSettings.library.argminsizes(tok, argnr + 1);
                 if (!minsizes || minsizes->empty())
                     continue;
                 // Get buffer size..
@@ -653,12 +710,12 @@ void CheckBufferOverrun::bufferOverflow()
                     argtok = argtok->astOperand2() ? argtok->astOperand2() : argtok->astOperand1();
                 while (Token::Match(argtok, ".|::"))
                     argtok = argtok->astOperand2();
-                if (!argtok || !argtok->variable())
+                if (!argtok)
                     continue;
                 if (argtok->valueType() && argtok->valueType()->pointer == 0)
                     continue;
                 // TODO: strcpy(buf+10, "hello");
-                const ValueFlow::Value bufferSize = getBufferSize(argtok);
+                ValueFlow::Value bufferSize = getBufferSize(argtok, mSettings);
                 if (bufferSize.intvalue <= 0)
                     continue;
                 // buffer size == 1 => do not warn for dynamic memory
@@ -677,7 +734,7 @@ void CheckBufferOverrun::bufferOverflow()
                     }
                 }
                 const bool error = std::none_of(minsizes->begin(), minsizes->end(), [&](const Library::ArgumentChecks::MinSize &minsize) {
-                    return checkBufferSize(tok, minsize, args, bufferSize.intvalue, *mSettings, mTokenizer);
+                    return checkBufferSize(tok, minsize, args, bufferSize, mSettings, mTokenizer);
                 });
                 if (error)
                     bufferOverflowError(args[argnr], &bufferSize, Certainty::normal);
@@ -686,19 +743,22 @@ void CheckBufferOverrun::bufferOverflow()
     }
 }
 
-void CheckBufferOverrun::bufferOverflowError(const Token *tok, const ValueFlow::Value *value, Certainty certainty)
+void CheckBufferOverrunImpl::bufferOverflowError(const Token *tok, const ValueFlow::Value *value, Certainty certainty)
 {
-    reportError(getErrorPath(tok, value, "Buffer overrun"), Severity::error, "bufferAccessOutOfBounds", "Buffer is accessed out of bounds: " + (tok ? tok->expressionString() : "buf"), CWE_BUFFER_OVERRUN, certainty);
+    const auto errorPath = getErrorPath(tok, value, "Buffer overrun");
+    const auto severity = !value || (value->isKnown() && !value->condition) ? Severity::error : Severity::warning;
+    const std::string msg = "Buffer is accessed out of bounds: " + (tok ? getRealBufferTok(tok)->expressionString() : "buf");
+    reportError(errorPath, severity, "bufferAccessOutOfBounds", msg, CWE_BUFFER_OVERRUN, certainty);
 }
 
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::arrayIndexThenCheck()
+void CheckBufferOverrunImpl::arrayIndexThenCheck()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
-    logChecker("CheckBufferOverrun::arrayIndexThenCheck");
+    logChecker("CheckBufferOverrun::arrayIndexThenCheck"); // style
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * const scope : symbolDatabase->functionScopes) {
@@ -737,7 +797,7 @@ void CheckBufferOverrun::arrayIndexThenCheck()
     }
 }
 
-void CheckBufferOverrun::arrayIndexThenCheckError(const Token *tok, const std::string &indexName)
+void CheckBufferOverrunImpl::arrayIndexThenCheckError(const Token *tok, const std::string &indexName)
 {
     reportError(tok, Severity::style, "arrayIndexThenCheck",
                 "$symbol:" + indexName + "\n"
@@ -750,10 +810,10 @@ void CheckBufferOverrun::arrayIndexThenCheckError(const Token *tok, const std::s
 
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::stringNotZeroTerminated()
+void CheckBufferOverrunImpl::stringNotZeroTerminated()
 {
     // this is currently 'inconclusive'. See TestBufferOverrun::terminateStrncpy3
-    if (!mSettings->severity.isEnabled(Severity::warning) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.severity.isEnabled(Severity::warning) || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckBufferOverrun::stringNotZeroTerminated"); // warning,inconclusive
@@ -769,7 +829,7 @@ void CheckBufferOverrun::stringNotZeroTerminated()
             const Token *sizeToken = args[2];
             if (!sizeToken->hasKnownIntValue())
                 continue;
-            const ValueFlow::Value &bufferSize = getBufferSize(args[0]);
+            const ValueFlow::Value &bufferSize = getBufferSize(args[0], mSettings);
             if (bufferSize.intvalue < 0 || sizeToken->getKnownIntValue() < bufferSize.intvalue)
                 continue;
             if (Token::simpleMatch(args[1], "(") && Token::simpleMatch(args[1]->astOperand1(), ". c_str") && args[1]->astOperand1()->astOperand1()) {
@@ -792,18 +852,18 @@ void CheckBufferOverrun::stringNotZeroTerminated()
                 const Token *rhs = tok2->next()->astOperand2();
                 if (!rhs || !rhs->hasKnownIntValue() || rhs->getKnownIntValue() != 0)
                     continue;
-                if (isSameExpression(false, args[0], tok2->link()->astOperand1(), *mSettings, false, false))
+                if (isSameExpression(false, args[0], tok2->link()->astOperand1(), mSettings, false, false))
                     isZeroTerminated = true;
             }
             if (isZeroTerminated)
                 continue;
             // TODO: Locate unsafe string usage..
-            terminateStrncpyError(tok, args[0]->expressionString());
+            terminateStrncpyError(tok, getRealBufferTok(args[0])->expressionString());
         }
     }
 }
 
-void CheckBufferOverrun::terminateStrncpyError(const Token *tok, const std::string &varname)
+void CheckBufferOverrunImpl::terminateStrncpyError(const Token *tok, const std::string &varname)
 {
     const std::string shortMessage = "The buffer '$symbol' may not be null-terminated after the call to strncpy().";
     reportError(tok, Severity::warning, "terminateStrncpy",
@@ -816,10 +876,10 @@ void CheckBufferOverrun::terminateStrncpyError(const Token *tok, const std::stri
 }
 //---------------------------------------------------------------------------
 
-void CheckBufferOverrun::argumentSize()
+void CheckBufferOverrunImpl::argumentSize()
 {
     // Check '%type% x[10]' arguments
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("argumentSize"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("argumentSize"))
         return;
 
     logChecker("CheckBufferOverrun::argumentSize"); // warning
@@ -833,7 +893,7 @@ void CheckBufferOverrun::argumentSize()
             // If argument is '%type% a[num]' then check bounds against num
             const Function *callfunc = tok->function();
             const std::vector<const Token *> callargs = getArguments(tok);
-            for (nonneg int paramIndex = 0; paramIndex < callargs.size() && paramIndex < callfunc->argCount(); ++paramIndex) {
+            for (size_t paramIndex = 0; paramIndex < callargs.size() && paramIndex < callfunc->argCount(); ++paramIndex) {
                 const Variable* const argument = callfunc->getArgumentVar(paramIndex);
                 if (!argument || !argument->nameToken() || !argument->isArray())
                     continue;
@@ -864,7 +924,7 @@ void CheckBufferOverrun::argumentSize()
     }
 }
 
-void CheckBufferOverrun::argumentSizeError(const Token *tok, const std::string &functionName, nonneg int paramIndex, const std::string &paramExpression, const Variable *paramVar, const Variable *functionArg)
+void CheckBufferOverrunImpl::argumentSizeError(const Token *tok, const std::string &functionName, nonneg int paramIndex, const std::string &paramExpression, const Variable *paramVar, const Variable *functionArg)
 {
     const std::string strParamNum = std::to_string(paramIndex + 1) + getOrdinalText(paramIndex + 1);
     ErrorPath errorPath;
@@ -875,7 +935,7 @@ void CheckBufferOverrun::argumentSizeError(const Token *tok, const std::string &
         errorPath.emplace_back(paramVar->nameToken(), "Passing buffer '" + paramVar->name() + "' to function that is declared here");
     errorPath.emplace_back(tok, "");
 
-    reportError(errorPath, Severity::warning, "argumentSize",
+    reportError(std::move(errorPath), Severity::warning, "argumentSize",
                 "$symbol:" + functionName + '\n' +
                 "Buffer '" + paramExpression + "' is too small, the function '" + functionName + "' expects a bigger buffer in " + strParamNum + " argument", CWE_ARGUMENT_SIZE, Certainty::normal);
 }
@@ -895,6 +955,8 @@ namespace
     /** data for multifile checking */
     class MyFileInfo : public Check::FileInfo {
     public:
+        explicit MyFileInfo(std::string f0) : Check::FileInfo(std::move(f0)) {}
+
         using Check::FileInfo::FileInfo;
         /** unsafe array index usage */
         std::list<CTU::FileInfo::UnsafeUsage> unsafeArrayIndex;
@@ -915,11 +977,11 @@ namespace
     };
 }
 
-bool CheckBufferOverrun::isCtuUnsafeBufferUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset, int type)
+bool CheckBufferOverrunImpl::isCtuUnsafeBufferUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset, int type)
 {
     if (!offset)
         return false;
-    if (!argtok->valueType() || argtok->valueType()->typeSize(settings.platform) == 0)
+    if (!argtok->valueType() || argtok->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee) == 0)
         return false;
     const Token *indexTok = nullptr;
     if (type == 1 && Token::Match(argtok, "%name% [") && argtok->astParent() == argtok->next() && !Token::simpleMatch(argtok->linkAt(1), "] ["))
@@ -932,25 +994,25 @@ bool CheckBufferOverrun::isCtuUnsafeBufferUsage(const Settings &settings, const
         return false;
     if (!indexTok->hasKnownIntValue())
         return false;
-    offset->value = indexTok->getKnownIntValue() * argtok->valueType()->typeSize(settings.platform);
+    offset->value = indexTok->getKnownIntValue() * argtok->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
     return true;
 }
 
-bool CheckBufferOverrun::isCtuUnsafeArrayIndex(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset)
+bool CheckBufferOverrunImpl::isCtuUnsafeArrayIndex(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset)
 {
     return isCtuUnsafeBufferUsage(settings, argtok, offset, 1);
 }
 
-bool CheckBufferOverrun::isCtuUnsafePointerArith(const Settings &settings, const Token *argtok, CTU::FileInfo::Value* offset)
+bool CheckBufferOverrunImpl::isCtuUnsafePointerArith(const Settings &settings, const Token *argtok, CTU::FileInfo::Value* offset)
 {
     return isCtuUnsafeBufferUsage(settings, argtok, offset, 2);
 }
 
 /** @brief Parse current TU and extract file info */
-Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer &tokenizer, const Settings &settings) const
+const Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
 {
-    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeArrayIndex = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafeArrayIndex);
-    const std::list<CTU::FileInfo::UnsafeUsage> &unsafePointerArith = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafePointerArith);
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeArrayIndex = CTU::getUnsafeUsage(tokenizer, settings, CheckBufferOverrunImpl::isCtuUnsafeArrayIndex);
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafePointerArith = CTU::getUnsafeUsage(tokenizer, settings, CheckBufferOverrunImpl::isCtuUnsafePointerArith);
     if (unsafeArrayIndex.empty() && unsafePointerArith.empty()) {
         return nullptr;
     }
@@ -960,13 +1022,12 @@ Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer &tokenizer, con
     return fileInfo;
 }
 
-Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
-    // cppcheck-suppress shadowFunction - TODO: fix this
     const std::string arrayIndex("array-index");
     const std::string pointerArith("pointer-arith");
 
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
         const char* name = e->Name();
         if (name == arrayIndex)
@@ -984,9 +1045,9 @@ Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLEle
 }
 
 /** @brief Analyse all file infos for all TU */
-bool CheckBufferOverrun::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckBufferOverrun::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
-    CheckBufferOverrun dummy(nullptr, &settings, &errorLogger);
+    CheckBufferOverrunImpl dummy(nullptr, settings, errorLogger);
     dummy.
     logChecker("CheckBufferOverrun::analyseWholeProgram");
 
@@ -1014,7 +1075,7 @@ bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::l
 {
     const CTU::FileInfo::FunctionCall *functionCall = nullptr;
 
-    const std::list<ErrorMessage::FileLocation> &locationList =
+    std::list<ErrorMessage::FileLocation> locationList =
         CTU::FileInfo::getErrorPath(CTU::FileInfo::InvalidValueType::bufferOverflow,
                                     unsafeUsage,
                                     callsMap,
@@ -1042,7 +1103,7 @@ bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::l
         cwe = CWE_POINTER_ARITHMETIC_OVERFLOW;
     }
 
-    const ErrorMessage errorMessage(locationList,
+    const ErrorMessage errorMessage(std::move(locationList),
                                     file0,
                                     Severity::error,
                                     errmsg,
@@ -1053,7 +1114,7 @@ bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::l
     return true;
 }
 
-void CheckBufferOverrun::objectIndex()
+void CheckBufferOverrunImpl::objectIndex()
 {
     logChecker("CheckBufferOverrun::objectIndex");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -1072,9 +1133,15 @@ void CheckBufferOverrun::objectIndex()
 
             std::vector<ValueFlow::Value> values = ValueFlow::getLifetimeObjValues(obj, false, -1);
             for (const ValueFlow::Value& v:values) {
-                if (v.lifetimeKind != ValueFlow::Value::LifetimeKind::Address)
+                if (v.lifetimeKind != ValueFlow::Value::LifetimeKind::Address && v.lifetimeKind != ValueFlow::Value::LifetimeKind::Object)
                     continue;
-                const Variable *var = v.tokvalue->variable();
+                const Token* varTok = v.tokvalue;
+                if (Token::simpleMatch(varTok->astParent(), ".")) {
+                    varTok = varTok->astParent();
+                    while (Token::simpleMatch(varTok, "."))
+                        varTok = varTok->astOperand2();
+                }
+                const Variable *var = varTok ? varTok->variable() : nullptr;
                 if (!var)
                     continue;
                 if (var->isReference())
@@ -1092,7 +1159,7 @@ void CheckBufferOverrun::objectIndex()
                         continue;
                 }
                 if (obj->valueType() && var->valueType() && (obj->isCast() || (obj->isCpp() && isCPPCast(obj)) || obj->valueType()->pointer)) { // allow cast to a different type
-                    const auto varSize = var->valueType()->typeSize(mSettings->platform);
+                    const auto varSize = var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
                     if (varSize == 0)
                         continue;
                     if (obj->valueType()->type != var->valueType()->type) {
@@ -1125,7 +1192,7 @@ void CheckBufferOverrun::objectIndex()
     }
 }
 
-void CheckBufferOverrun::objectIndexError(const Token *tok, const ValueFlow::Value *v, bool known)
+void CheckBufferOverrunImpl::objectIndexError(const Token *tok, const ValueFlow::Value *v, bool known)
 {
     ErrorPath errorPath;
     std::string name;
@@ -1138,7 +1205,7 @@ void CheckBufferOverrun::objectIndexError(const Token *tok, const ValueFlow::Val
     }
     errorPath.emplace_back(tok, "");
     std::string verb = known ? "is" : "might be";
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 known ? Severity::error : Severity::warning,
                 "objectIndex",
                 "The address of variable '" + name + "' " + verb + " accessed at non-zero index.",
@@ -1162,7 +1229,7 @@ static bool isVLAIndex(const Token* tok)
     return isVLAIndex(tok->astOperand1()) || isVLAIndex(tok->astOperand2());
 }
 
-void CheckBufferOverrun::negativeArraySize()
+void CheckBufferOverrunImpl::negativeArraySize()
 {
     logChecker("CheckBufferOverrun::negativeArraySize");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -1172,7 +1239,7 @@ void CheckBufferOverrun::negativeArraySize()
         const Token* const nameToken = var->nameToken();
         if (!Token::Match(nameToken, "%var% [") || !nameToken->next()->astOperand2())
             continue;
-        const ValueFlow::Value* sz = nameToken->next()->astOperand2()->getValueLE(-1, *mSettings);
+        const ValueFlow::Value* sz = nameToken->next()->astOperand2()->getValueLE(-1, mSettings);
         // don't warn about constant negative index because that is a compiler error
         if (sz && isVLAIndex(nameToken->next()->astOperand2()))
             negativeArraySizeError(nameToken);
@@ -1185,14 +1252,14 @@ void CheckBufferOverrun::negativeArraySize()
             const Token* valOperand = tok->astOperand1()->astOperand2();
             if (!valOperand)
                 continue;
-            const ValueFlow::Value* sz = valOperand->getValueLE(-1, *mSettings);
+            const ValueFlow::Value* sz = valOperand->getValueLE(-1, mSettings);
             if (sz)
                 negativeMemoryAllocationSizeError(tok, sz);
         }
     }
 }
 
-void CheckBufferOverrun::negativeArraySizeError(const Token* tok)
+void CheckBufferOverrunImpl::negativeArraySizeError(const Token* tok)
 {
     const std::string arrayName = tok ? tok->expressionString() : std::string();
     const std::string line1 = arrayName.empty() ? std::string() : ("$symbol:" + arrayName + '\n');
@@ -1201,18 +1268,18 @@ void CheckBufferOverrun::negativeArraySizeError(const Token* tok)
                 "Declaration of array '" + arrayName + "' with negative size is undefined behaviour", CWE758, Certainty::normal);
 }
 
-void CheckBufferOverrun::negativeMemoryAllocationSizeError(const Token* tok, const ValueFlow::Value* value)
+void CheckBufferOverrunImpl::negativeMemoryAllocationSizeError(const Token* tok, const ValueFlow::Value* value)
 {
     const std::string msg = "Memory allocation size is negative.";
-    const ErrorPath errorPath = getErrorPath(tok, value, msg);
+    ErrorPath errorPath = getErrorPath(tok, value, msg);
     const bool inconclusive = value != nullptr && !value->isKnown();
-    reportError(errorPath, inconclusive ? Severity::warning : Severity::error, "negativeMemoryAllocationSize",
+    reportError(std::move(errorPath), inconclusive ? Severity::warning : Severity::error, "negativeMemoryAllocationSize",
                 msg, CWE131, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckBufferOverrun checkBufferOverrun(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckBufferOverrunImpl checkBufferOverrun(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkBufferOverrun.arrayIndex();
     checkBufferOverrun.pointerArithmetic();
     checkBufferOverrun.bufferOverflow();
@@ -1223,9 +1290,9 @@ void CheckBufferOverrun::runChecks(const Tokenizer &tokenizer, ErrorLogger *erro
     checkBufferOverrun.negativeArraySize();
 }
 
-void CheckBufferOverrun::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckBufferOverrun::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckBufferOverrun c(nullptr, settings, errorLogger);
+    CheckBufferOverrunImpl c(nullptr, settings, errorLogger);
     c.arrayIndexError(nullptr, std::vector<Dimension>(), std::vector<ValueFlow::Value>());
     c.pointerArithmeticError(nullptr, nullptr, nullptr);
     c.negativeIndexError(nullptr, std::vector<Dimension>(), std::vector<ValueFlow::Value>());
@@ -1235,4 +1302,7 @@ void CheckBufferOverrun::getErrorMessages(ErrorLogger *errorLogger, const Settin
     c.argumentSizeError(nullptr, "function", 1, "buffer", nullptr, nullptr);
     c.negativeMemoryAllocationSizeError(nullptr, nullptr);
     c.negativeArraySizeError(nullptr);
+    c.terminateStrncpyError(nullptr, "var_name");
+    // TODO: ctuArrayIndex
+    // TODO: ctuPointerArith
 }
diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
index d945fd7b1e5..b9b82c897e0 100644
--- a/lib/checkbufferoverrun.h
+++ b/lib/checkbufferoverrun.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "ctu.h"
 
@@ -60,22 +61,43 @@ namespace ValueFlow
 class CPPCHECKLIB CheckBufferOverrun : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckBufferOverrun() : Check(myName()) {}
+    CheckBufferOverrun() : Check("Bounds checking") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckBufferOverrun(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
     /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings) const override;
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const override;
 
     /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
+
+    std::string classInfo() const override {
+        return "Out of bounds checking:\n"
+               "- Array index out of bounds\n"
+               "- Pointer arithmetic overflow\n"
+               "- Buffer overflow\n"
+               "- Dangerous usage of strncat()\n"
+               "- Using array index before checking it\n"
+               "- Partial string write that leads to buffer that is not zero terminated.\n"
+               "- Check for large enough arrays being passed to functions\n"
+               "- Allocating memory with a negative size\n";
+    }
+
+    static bool analyseWholeProgram1(const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap, const CTU::FileInfo::UnsafeUsage &unsafeUsage,
+                                     int type, ErrorLogger &errorLogger, int maxCtuDepth, const std::string& file0);
+};
+
+class CPPCHECKLIB CheckBufferOverrunImpl : public CheckImpl
+{
+public:
+    /** This constructor is used when running checks. */
+    CheckBufferOverrunImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     void arrayIndex();
     void arrayIndexError(const Token* tok,
@@ -107,33 +129,12 @@ class CPPCHECKLIB CheckBufferOverrun : public Check {
     void objectIndex();
     void objectIndexError(const Token *tok, const ValueFlow::Value *v, bool known);
 
-    ValueFlow::Value getBufferSize(const Token *bufTok) const;
+    ValueFlow::Value getBufferSize(const Token *bufTok, const Settings& settings) const;
 
     // CTU
     static bool isCtuUnsafeBufferUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset, int type);
     static bool isCtuUnsafeArrayIndex(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset);
     static bool isCtuUnsafePointerArith(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset);
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-    static bool analyseWholeProgram1(const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap, const CTU::FileInfo::UnsafeUsage &unsafeUsage,
-                                     int type, ErrorLogger &errorLogger, int maxCtuDepth, const std::string& file0);
-
-
-    static std::string myName() {
-        return "Bounds checking";
-    }
-
-    std::string classInfo() const override {
-        return "Out of bounds checking:\n"
-               "- Array index out of bounds\n"
-               "- Pointer arithmetic overflow\n"
-               "- Buffer overflow\n"
-               "- Dangerous usage of strncat()\n"
-               "- Using array index before checking it\n"
-               "- Partial string write that leads to buffer that is not zero terminated.\n"
-               "- Check for large enough arrays being passed to functions\n"
-               "- Allocating memory with a negative size\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index 6fd15dafc72..372adf839ff 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,7 +31,6 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
-#include "valueflow.h"
 
 #include <algorithm>
 #include <cctype>
@@ -44,11 +43,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register CheckClass..
-namespace {
-    CheckClass instance;
-}
-
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE404(404U);  // Improper Resource Shutdown or Release
 static const CWE CWE665(665U);  // Improper Initialization
@@ -112,27 +106,111 @@ static bool isVclTypeInit(const Type *type)
 }
 //---------------------------------------------------------------------------
 
-CheckClass::CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-    : Check(myName(), tokenizer, settings, errorLogger),
+CheckClassImpl::CheckClassImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+    : CheckImpl(tokenizer, settings, errorLogger),
     mSymbolDatabase(tokenizer?tokenizer->getSymbolDatabase():nullptr)
 {}
 
+bool CheckClassImpl::isInitialized(const Usage& usage, FunctionType funcType) const
+{
+    const Variable& var = *usage.var;
+
+    if (usage.assign || usage.init || var.isStatic())
+        return true;
+
+    if (!var.nameToken() || var.nameToken()->isAnonymous())
+        return true;
+
+    if (var.valueType() && var.valueType()->pointer == 0 && var.type() && var.type()->needInitialization == Type::NeedInitialization::False && var.type()->derivedFrom.empty())
+        return true;
+
+    if (var.isConst() && funcType == FunctionType::eOperatorEqual) // We can't set const members in assignment operator
+        return true;
+
+    // Check if this is a class constructor
+    if (!var.isPointer() && !var.isPointerArray() && var.isClass() && funcType == FunctionType::eConstructor) {
+        // Unknown type so assume it is initialized
+        if (!var.type()) {
+            if (var.isStlType() && var.valueType() && var.valueType()->containerTypeToken) {
+                if (var.valueType()->type == ValueType::Type::ITERATOR)
+                {
+                    // needs initialization
+                }
+                else if (var.getTypeName() == "std::array") {
+                    const Token* ctt = var.valueType()->containerTypeToken;
+                    if (!ctt->isStandardType() &&
+                        (!ctt->type() || ctt->type()->needInitialization != Type::NeedInitialization::True) &&
+                        !mSettings.library.podtype(ctt->str())) // TODO: handle complex type expression
+                        return true;
+                }
+                else
+                    return true;
+            }
+            else
+                return true;
+        }
+
+        // Known type that doesn't need initialization or
+        // known type that has member variables of an unknown type
+        else if (var.type()->needInitialization != Type::NeedInitialization::True)
+            return true;
+    }
+
+    // Check if type can't be copied
+    if (!var.isPointer() && !var.isPointerArray() && var.typeScope()) {
+        if (funcType == FunctionType::eMoveConstructor) {
+            if (canNotMove(var.typeScope()))
+                return true;
+        }
+        else {
+            if (canNotCopy(var.typeScope()))
+                return true;
+        }
+    }
+    return false;
+}
+
+void CheckClassImpl::handleUnionMembers(std::vector<Usage>& usageList)
+{
+    // Assign 1 union member => assign all union members
+    for (const Usage& usage : usageList) {
+        const Variable& var = *usage.var;
+        if (!usage.assign && !usage.init)
+            continue;
+        const Scope* varScope1 = var.nameToken()->scope();
+        while (varScope1->type == ScopeType::eStruct)
+            varScope1 = varScope1->nestedIn;
+        if (varScope1->type == ScopeType::eUnion) {
+            for (Usage& usage2 : usageList) {
+                const Variable& var2 = *usage2.var;
+                if (usage2.assign || usage2.init || var2.isStatic())
+                    continue;
+                const Scope* varScope2 = var2.nameToken()->scope();
+                while (varScope2->type == ScopeType::eStruct)
+                    varScope2 = varScope2->nestedIn;
+                if (varScope1 == varScope2)
+                    usage2.assign = true;
+            }
+        }
+    }
+}
+
 //---------------------------------------------------------------------------
 // ClassCheck: Check that all class constructors are ok.
 //---------------------------------------------------------------------------
 
-void CheckClass::constructors()
+void CheckClassImpl::constructors()
 {
-    const bool printStyle = mSettings->severity.isEnabled(Severity::style);
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarnings && !mSettings->isPremiumEnabled("uninitMemberVar"))
+    const bool printStyle = mSettings.severity.isEnabled(Severity::style);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
+    if (!printStyle && !printWarnings && !mSettings.isPremiumEnabled("uninitMemberVar"))
         return;
 
     logChecker("CheckClass::checkConstructors"); // style,warning
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
-        if (mSettings->hasLib("vcl") && isVclTypeInit(scope->definedType))
+        if (mSettings.hasLib("vcl") && isVclTypeInit(scope->definedType))
             continue;
 
         const bool unusedTemplate = Token::simpleMatch(scope->classDef->previous(), ">");
@@ -146,6 +224,7 @@ void CheckClass::constructors()
         });
 
         // There are no constructors.
+        std::set<const Variable*> diagVars;
         if (scope->numConstructors == 0 && printStyle && !usedInUnion) {
             // If there is a private variable, there should be a constructor..
             int needInit = 0, haveInit = 0;
@@ -164,8 +243,10 @@ void CheckClass::constructors()
                 if (haveInit == 0)
                     noConstructorError(scope->classDef, scope->className, scope->classDef->str() == "struct");
                 else
-                    for (const Variable* uv : uninitVars)
+                    for (const Variable* uv : uninitVars) {
                         uninitVarError(uv->typeStartToken(), uv->scope()->className, uv->name());
+                        diagVars.emplace(uv);
+                    }
             }
         }
 
@@ -202,74 +283,15 @@ void CheckClass::constructors()
             std::list<const Function *> callstack;
             initializeVarList(func, callstack, scope, usageList);
 
-            // Assign 1 union member => assign all union members
-            for (const Usage &usage : usageList) {
-                const Variable& var = *usage.var;
-                if (!usage.assign && !usage.init)
-                    continue;
-                const Scope* varScope1 = var.nameToken()->scope();
-                while (varScope1->type == ScopeType::eStruct)
-                    varScope1 = varScope1->nestedIn;
-                if (varScope1->type == ScopeType::eUnion) {
-                    for (Usage &usage2 : usageList) {
-                        const Variable& var2 = *usage2.var;
-                        if (usage2.assign || usage2.init || var2.isStatic())
-                            continue;
-                        const Scope* varScope2 = var2.nameToken()->scope();
-                        while (varScope2->type == ScopeType::eStruct)
-                            varScope2 = varScope2->nestedIn;
-                        if (varScope1 == varScope2)
-                            usage2.assign = true;
-                    }
-                }
-            }
+            handleUnionMembers(usageList);
 
             // Check if any variables are uninitialized
             for (const Usage &usage : usageList) {
-                const Variable& var = *usage.var;
-
-                if (usage.assign || usage.init || var.isStatic())
-                    continue;
-
-                if (var.valueType() && var.valueType()->pointer == 0 && var.type() && var.type()->needInitialization == Type::NeedInitialization::False && var.type()->derivedFrom.empty())
-                    continue;
-
-                if (var.isConst() && func.isOperator()) // We can't set const members in assignment operator
+                if (isInitialized(usage, func.type))
                     continue;
 
-                // Check if this is a class constructor
-                if (!var.isPointer() && !var.isPointerArray() && var.isClass() && func.type == FunctionType::eConstructor) {
-                    // Unknown type so assume it is initialized
-                    if (!var.type()) {
-                        if (var.isStlType() && var.valueType() && var.valueType()->containerTypeToken && var.getTypeName() == "std::array") {
-                            const Token* ctt = var.valueType()->containerTypeToken;
-                            if (!ctt->isStandardType() &&
-                                (!ctt->type() || ctt->type()->needInitialization != Type::NeedInitialization::True) &&
-                                !mSettings->library.podtype(ctt->str())) // TODO: handle complex type expression
-                                continue;
-                        }
-                        else
-                            continue;
-                    }
-
-                    // Known type that doesn't need initialization or
-                    // known type that has member variables of an unknown type
-                    else if (var.type()->needInitialization != Type::NeedInitialization::True)
-                        continue;
-                }
-
-                // Check if type can't be copied
-                if (!var.isPointer() && !var.isPointerArray() && var.typeScope()) {
-                    if (func.type == FunctionType::eMoveConstructor) {
-                        if (canNotMove(var.typeScope()))
-                            continue;
-                    } else {
-                        if (canNotCopy(var.typeScope()))
-                            continue;
-                    }
-                }
-
                 // Is there missing member copy in copy/move constructor or assignment operator?
+                const Variable& var = *usage.var;
                 bool missingCopy = false;
 
                 // Don't warn about unknown types in copy constructors since we
@@ -293,9 +315,9 @@ void CheckClass::constructors()
                         }
                     }
 
-                    if (classNameUsed && mSettings->library.getTypeCheck("operatorEqVarError", var.getTypeName()) != Library::TypeCheck::suppress)
+                    if (classNameUsed && mSettings.library.getTypeCheck("operatorEqVarError", var.getTypeName()) != Library::TypeCheck::suppress)
                         operatorEqVarError(func.token, scope->className, var.name(), missingCopy);
-                } else if (func.access != AccessControl::Private || mSettings->standards.cpp >= Standards::CPP11) {
+                } else if (func.access != AccessControl::Private || mSettings.standards.cpp >= Standards::CPP11) {
                     // If constructor is not in scope then we maybe using a constructor from a different template specialization
                     if (!precedes(scope->bodyStart, func.tokenDef))
                         continue;
@@ -316,12 +338,56 @@ void CheckClass::constructors()
                 }
             }
         }
+
+        if (scope->numConstructors == 0) {
+
+            // Mark all variables not used
+            clearAllVar(usageList);
+
+            // Variables with default initializers
+            bool hasAnyDefaultInit = false;
+            bool hasAnySelfInit = false;
+            const bool cpp14OrLater = mSettings.standards.cpp >= Standards::CPP14;
+            for (Usage& usage : usageList) {
+                const Variable& var = *usage.var;
+
+                // check for C++11 initializer
+                if (var.hasDefault()) {
+                    usage.init = true;
+                    hasAnyDefaultInit = true;
+                } else if (cpp14OrLater && !hasAnySelfInit && isInitialized(usage, FunctionType::eConstructor)) {
+                    hasAnySelfInit = true;
+                }
+            }
+            if (!hasAnyDefaultInit && !hasAnySelfInit)
+                continue;
+
+            handleUnionMembers(usageList);
+
+            // Check if any variables are uninitialized
+            for (const Usage& usage : usageList) {
+                if (isInitialized(usage, FunctionType::eConstructor))
+                    continue;
+
+                const Variable& var = *usage.var;
+                if (var.typeScope() && var.typeScope()->numConstructors > 0)
+                    continue;
+
+                if (diagVars.count(&var) == 0)
+                    uninitVarError(var.nameToken(), false, FunctionType::eConstructor, var.scope()->className, var.name(), false, false, true);
+            }
+        }
     }
 }
 
-void CheckClass::checkExplicitConstructors()
+static bool isPermissibleConversion(const std::string& type)
+{
+    return type == "std::initializer_list" || type == "std::nullptr_t";
+}
+
+void CheckClassImpl::checkExplicitConstructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("noExplicitConstructor"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("noExplicitConstructor"))
         return;
 
     logChecker("CheckClass::checkExplicitConstructors"); // style
@@ -339,7 +405,7 @@ void CheckClass::checkExplicitConstructors()
 
         // Abstract classes can't be instantiated. But if there is C++11
         // "misuse" by derived classes then these constructors must be explicit.
-        if (isAbstractClass && mSettings->standards.cpp >= Standards::CPP11)
+        if (isAbstractClass && mSettings.standards.cpp >= Standards::CPP11)
             continue;
 
         for (const Function &func : scope->functionList) {
@@ -357,7 +423,7 @@ void CheckClass::checkExplicitConstructors()
                 func.type != FunctionType::eCopyConstructor &&
                 func.type != FunctionType::eMoveConstructor &&
                 !(func.templateDef && Token::simpleMatch(func.argumentList.front().typeEndToken(), "...")) &&
-                func.argumentList.front().getTypeName() != "std::initializer_list") {
+                !isPermissibleConversion(func.argumentList.front().getTypeName())) {
                 noExplicitConstructorError(func.tokenDef, scope->className, scope->type == ScopeType::eStruct);
             }
         }
@@ -388,39 +454,59 @@ static bool hasNonCopyableBase(const Scope *scope, bool *unknown)
     return false;
 }
 
-void CheckClass::copyconstructors()
+void CheckClassImpl::copyconstructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckClass::checkCopyConstructors"); // warning
 
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
         std::map<int, const Token*> allocatedVars;
+        std::map<int, const Token*> deallocatedVars;
 
         for (const Function &func : scope->functionList) {
-            if (func.type != FunctionType::eConstructor || !func.functionScope)
-                continue;
-            const Token* tok = func.token->linkAt(1);
-            for (const Token* const end = func.functionScope->bodyStart; tok != end; tok = tok->next()) {
-                if (Token::Match(tok, "%var% ( new") ||
-                    (Token::Match(tok, "%var% ( %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) {
-                    const Variable* var = tok->variable();
-                    if (var && var->isPointer() && var->scope() == scope)
-                        allocatedVars[tok->varId()] = tok;
+            if (func.type == FunctionType::eConstructor && func.functionScope) {
+                // Allocations in constructors
+                const Token* tok = func.token->linkAt(1);
+                for (const Token* const end = func.functionScope->bodyStart; tok != end; tok = tok->next()) {
+                    if (Token::Match(tok, "%var% ( new") ||
+                        (Token::Match(tok, "%var% ( %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) {
+                        const Variable* var = tok->variable();
+                        if (var && var->scope() == scope && var->valueType() && var->valueType()->type != ValueType::SMART_POINTER)
+                            allocatedVars[tok->varId()] = tok;
+                    }
                 }
-            }
-            for (const Token* const end = func.functionScope->bodyEnd; tok != end; tok = tok->next()) {
-                if (Token::Match(tok, "%var% = new") ||
-                    (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) {
-                    const Variable* var = tok->variable();
-                    if (var && var->isPointer() && var->scope() == scope && !var->isStatic())
-                        allocatedVars[tok->varId()] = tok;
+                for (const Token* const end = func.functionScope->bodyEnd; tok != end; tok = tok->next()) {
+                    if (Token::Match(tok, "%var% = new") ||
+                        (Token::Match(tok, "%var% = %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) {
+                        const Variable* var = tok->variable();
+                        if (var && var->scope() == scope && !var->isStatic() && var->valueType() && var->valueType()->type != ValueType::SMART_POINTER)
+                            allocatedVars[tok->varId()] = tok;
+                    }
+                }
+            } else if (func.type == FunctionType::eDestructor && func.functionScope) {
+                // Deallocations in destructors
+                const Token* tok = func.functionScope->bodyStart;
+                for (const Token* const end = func.functionScope->bodyEnd; tok != end; tok = tok->next()) {
+                    if (Token::Match(tok, "delete %var%") ||
+                        (Token::Match(tok, "%name% ( %var%") && mSettings.library.getDeallocFuncInfo(tok))) {
+                        const Token *vartok = tok->str() == "delete" ? tok->next() : tok->tokAt(2);
+                        const Variable* var = vartok->variable();
+                        if (var && var->scope() == scope && !var->isStatic() &&
+                            var->valueType() && ((var->valueType()->type != ValueType::CONTAINER &&
+                                                  var->valueType()->type != ValueType::RECORD &&
+                                                  var->valueType()->type != ValueType::UNKNOWN_TYPE) || var->valueType()->pointer))
+                            deallocatedVars[vartok->varId()] = vartok;
+                    }
                 }
             }
         }
 
-        if (!allocatedVars.empty()) {
+        const bool hasAllocatedVars = !allocatedVars.empty();
+        const bool hasDeallocatedVars = !deallocatedVars.empty();
+
+        if (hasAllocatedVars || hasDeallocatedVars) {
             const Function *funcCopyCtor = nullptr;
             const Function *funcOperatorEq = nullptr;
             const Function *funcDestructor = nullptr;
@@ -434,13 +520,21 @@ void CheckClass::copyconstructors()
             }
             if (!funcCopyCtor || funcCopyCtor->isDefault()) {
                 bool unknown = false;
-                if (!hasNonCopyableBase(scope, &unknown) && !unknown)
-                    noCopyConstructorError(scope, funcCopyCtor, allocatedVars.cbegin()->second, unknown);
+                if (!hasNonCopyableBase(scope, &unknown) && !unknown) {
+                    if (hasAllocatedVars)
+                        noCopyConstructorError(scope, funcCopyCtor, allocatedVars.cbegin()->second, unknown);
+                    else
+                        noCopyConstructorError(scope, funcCopyCtor, deallocatedVars.cbegin()->second, unknown);
+                }
             }
             if (!funcOperatorEq || funcOperatorEq->isDefault()) {
                 bool unknown = false;
-                if (!hasNonCopyableBase(scope, &unknown) && !unknown)
-                    noOperatorEqError(scope, funcOperatorEq, allocatedVars.cbegin()->second, unknown);
+                if (!hasNonCopyableBase(scope, &unknown) && !unknown) {
+                    if (hasAllocatedVars)
+                        noOperatorEqError(scope, funcOperatorEq, allocatedVars.cbegin()->second, unknown);
+                    else
+                        noOperatorEqError(scope, funcOperatorEq, deallocatedVars.cbegin()->second, unknown);
+                }
             }
             if (!funcDestructor || funcDestructor->isDefault()) {
                 const Token * mustDealloc = nullptr;
@@ -489,7 +583,7 @@ void CheckClass::copyconstructors()
             }
             for (tok = func.functionScope->bodyStart; tok != func.functionScope->bodyEnd; tok = tok->next()) {
                 if ((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
-                    (Token::Match(tok, "%var% = %name% (") && (mSettings->library.getAllocFuncInfo(tok->tokAt(2)) || mSettings->library.getReallocFuncInfo(tok->tokAt(2))))) {
+                    (Token::Match(tok, "%var% = %name% (") && (mSettings.library.getAllocFuncInfo(tok->tokAt(2)) || mSettings.library.getReallocFuncInfo(tok->tokAt(2))))) {
                     allocatedVars.erase(tok->varId());
                 } else if (Token::Match(tok, "%var% = %name% . %name% ;") && allocatedVars.find(tok->varId()) != allocatedVars.end()) {
                     copiedVars.insert(tok);
@@ -520,7 +614,7 @@ void CheckClass::copyconstructors()
    }
  */
 
-void CheckClass::copyConstructorShallowCopyError(const Token *tok, const std::string& varname)
+void CheckClassImpl::copyConstructorShallowCopyError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::warning, "copyCtorPointerCopying",
                 "$symbol:" + varname + "\nValue of pointer '$symbol', which points to allocated memory, is copied in copy constructor instead of allocating new memory.", CWE398, Certainty::normal);
@@ -540,28 +634,28 @@ static std::string noMemberErrorMessage(const Scope *scope, const char function[
         else
             errmsg += " It is recommended to define or delete the " + std::string(function) + '.';
     } else {
-        errmsg += type + " '$symbol' does not have a " + function + " which is recommended since it has dynamic memory/resource allocation(s).";
+        errmsg += type + " '$symbol' does not have a " + function + " which is recommended since it has dynamic memory/resource management.";
     }
 
     return errmsg;
 }
 
-void CheckClass::noCopyConstructorError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
+void CheckClassImpl::noCopyConstructorError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
 {
     reportError(alloc, Severity::warning, "noCopyConstructor", noMemberErrorMessage(scope, "copy constructor", isdefault), CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckClass::noOperatorEqError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
+void CheckClassImpl::noOperatorEqError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive)
 {
     reportError(alloc, Severity::warning, "noOperatorEq", noMemberErrorMessage(scope, "operator=", isdefault), CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckClass::noDestructorError(const Scope *scope, bool isdefault, const Token *alloc)
+void CheckClassImpl::noDestructorError(const Scope *scope, bool isdefault, const Token *alloc)
 {
     reportError(alloc, Severity::warning, "noDestructor", noMemberErrorMessage(scope, "destructor", isdefault), CWE398, Certainty::normal);
 }
 
-bool CheckClass::canNotCopy(const Scope *scope)
+bool CheckClassImpl::canNotCopy(const Scope *scope)
 {
     bool constructor = false;
     bool publicAssign = false;
@@ -585,7 +679,7 @@ bool CheckClass::canNotCopy(const Scope *scope)
     return constructor && !(publicAssign || publicCopy);
 }
 
-bool CheckClass::canNotMove(const Scope *scope)
+bool CheckClassImpl::canNotMove(const Scope *scope)
 {
     bool constructor = false;
     bool publicAssign = false;
@@ -630,7 +724,7 @@ static void getAllVariableMembers(const Scope *scope, std::vector<const Variable
     }
 }
 
-std::vector<CheckClass::Usage> CheckClass::createUsageList(const Scope *scope)
+std::vector<CheckClassImpl::Usage> CheckClassImpl::createUsageList(const Scope *scope)
 {
     std::vector<Usage> ret;
     std::vector<const Variable *> varlist;
@@ -642,7 +736,7 @@ std::vector<CheckClass::Usage> CheckClass::createUsageList(const Scope *scope)
     return ret;
 }
 
-void CheckClass::assignVar(std::vector<Usage> &usageList, nonneg int varid)
+void CheckClassImpl::assignVar(std::vector<Usage> &usageList, nonneg int varid)
 {
     auto it = std::find_if(usageList.begin(), usageList.end(), [varid](const Usage& usage) {
         return usage.var->declarationId() == varid;
@@ -651,7 +745,7 @@ void CheckClass::assignVar(std::vector<Usage> &usageList, nonneg int varid)
         it->assign = true;
 }
 
-void CheckClass::assignVar(std::vector<Usage> &usageList, const Token* vartok)
+void CheckClassImpl::assignVar(std::vector<Usage> &usageList, const Token* vartok)
 {
     if (vartok->varId() > 0) {
         assignVar(usageList, vartok->varId());
@@ -665,7 +759,7 @@ void CheckClass::assignVar(std::vector<Usage> &usageList, const Token* vartok)
         it->assign = true;
 }
 
-void CheckClass::initVar(std::vector<Usage> &usageList, nonneg int varid)
+void CheckClassImpl::initVar(std::vector<Usage> &usageList, nonneg int varid)
 {
     auto it = std::find_if(usageList.begin(), usageList.end(), [varid](const Usage& usage) {
         return usage.var->declarationId() == varid;
@@ -674,13 +768,13 @@ void CheckClass::initVar(std::vector<Usage> &usageList, nonneg int varid)
         it->init = true;
 }
 
-void CheckClass::assignAllVar(std::vector<Usage> &usageList)
+void CheckClassImpl::assignAllVar(std::vector<Usage> &usageList)
 {
     for (Usage & i : usageList)
         i.assign = true;
 }
 
-void CheckClass::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, const Scope* scope)
+void CheckClassImpl::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, const Scope* scope)
 {
     for (Usage& usage : usageList) {
         if (usage.var->scope() == scope)
@@ -696,7 +790,7 @@ void CheckClass::assignAllVarsVisibleFromScope(std::vector<Usage>& usageList, co
     }
 }
 
-void CheckClass::clearAllVar(std::vector<Usage> &usageList)
+void CheckClassImpl::clearAllVar(std::vector<Usage> &usageList)
 {
     for (Usage & i : usageList) {
         i.assign = false;
@@ -704,7 +798,7 @@ void CheckClass::clearAllVar(std::vector<Usage> &usageList)
     }
 }
 
-bool CheckClass::isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope)
+bool CheckClassImpl::isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope)
 {
     // Iterate through each base class...
     for (const Type::BaseInfo & i : scope->definedType->derivedFrom) {
@@ -731,7 +825,7 @@ bool CheckClass::isBaseClassMutableMemberFunc(const Token *tok, const Scope *sco
     return false;
 }
 
-void CheckClass::initializeVarList(const Function &func, std::list<const Function *> &callstack, const Scope *scope, std::vector<Usage> &usage) const
+void CheckClassImpl::initializeVarList(const Function &func, std::list<const Function *> &callstack, const Scope *scope, std::vector<Usage> &usage) const
 {
     if (!func.functionScope)
         return;
@@ -968,7 +1062,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
                             tok2 = tok2->next();
                             if (tok2->str() == "&")
                                 tok2 = tok2->next();
-                            if (isVariableChangedByFunctionCall(tok2, tok2->strAt(-1) == "&", tok2->varId(), *mSettings, nullptr))
+                            if (isVariableChangedByFunctionCall(tok2, tok2->strAt(-1) == "&", tok2->varId(), mSettings.library, nullptr))
                                 assignVar(usage, tok2->varId());
                         }
                     }
@@ -1043,13 +1137,11 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
         }
 
         // Assignment of array item of member variable?
-        else if (Token::Match(ftok, "* %name% =")) {
+        else if (Token::Match(ftok, "* %name% =") && (!func.isConstructor() || (!ftok->next()->variable() || ftok->next()->variable()->isArray()))) {
             assignVar(usage, ftok->next()->varId());
-        } else if (Token::Match(ftok, "( * %name% ) =")) {
+        } else if (Token::Match(ftok, "( * %name% ) =") && (!func.isConstructor() || (!ftok->tokAt(2)->variable() || ftok->tokAt(2)->variable()->isArray()))) {
             assignVar(usage, ftok->tokAt(2)->varId());
-        } else if (Token::Match(ftok, "* ( %name% ) =")) {
-            assignVar(usage, ftok->tokAt(2)->varId());
-        } else if (Token::Match(ftok, "* this . %name% =")) {
+        } else if (Token::Match(ftok, "* this . %name% =") && (!func.isConstructor() || (!ftok->tokAt(3)->variable() || ftok->tokAt(3)->variable()->isArray()))) {
             assignVar(usage, ftok->tokAt(3)->varId());
         } else if (astIsRangeBasedForDecl(ftok)) {
             if (const Variable* rangeVar = ftok->astParent()->astOperand1()->variable()) {
@@ -1065,7 +1157,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
     }
 }
 
-void CheckClass::noConstructorError(const Token *tok, const std::string &classname, bool isStruct)
+void CheckClassImpl::noConstructorError(const Token *tok, const std::string &classname, bool isStruct)
 {
     // For performance reasons the constructor might be intentionally missing. Therefore this is not a "warning"
     const std::string message {"The " + std::string(isStruct ? "struct" : "class") + " '$symbol' does not declare a constructor although it has private member variables which likely require initialization."};
@@ -1073,29 +1165,34 @@ void CheckClass::noConstructorError(const Token *tok, const std::string &classna
     reportError(tok, Severity::style, "noConstructor", "$symbol:" + classname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
-void CheckClass::noExplicitConstructorError(const Token *tok, const std::string &classname, bool isStruct)
+void CheckClassImpl::noExplicitConstructorError(const Token *tok, const std::string &classname, bool isStruct)
 {
     const std::string message(std::string(isStruct ? "Struct" : "Class") + " '$symbol' has a constructor with 1 argument that is not explicit.");
     const std::string verbose(message + " Such, so called \"Converting constructors\", should in general be explicit for type safety reasons as that prevents unintended implicit conversions.");
     reportError(tok, Severity::style, "noExplicitConstructor", "$symbol:" + classname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
-void CheckClass::uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive)
+void CheckClassImpl::uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive, bool noCtor)
 {
-    std::string ctor;
-    if (functionType == FunctionType::eCopyConstructor)
-        ctor = "copy ";
-    else if (functionType == FunctionType::eMoveConstructor)
-        ctor = "move ";
-    std::string message("Member variable '$symbol' is not initialized in the " + ctor + "constructor.");
+    std::string message("Member variable '$symbol' ");
+    if (noCtor)
+        message += "has no initializer.";
+    else {
+        message += "is not initialized in the ";
+        if (functionType == FunctionType::eCopyConstructor)
+            message += "copy ";
+        else if (functionType == FunctionType::eMoveConstructor)
+            message += "move ";
+        message += "constructor.";
+    }
     if (derived)
         message += " Maybe it should be initialized directly in the class " + classname + "?";
-    std::string id = std::string("uninit") + (derived ? "Derived" : "") + "MemberVar" + (isprivate ? "Private" : "");
+    std::string id = std::string("uninit") + (derived ? "Derived" : "") + "MemberVar" + (isprivate ? "Private" : "") + (noCtor ? "NoCtor" : "");
     const std::string verbose {message + " Member variables of native types, pointers, or references are left uninitialized when the class is instantiated. That may cause bugs or undefined behavior."};
     reportError(tok, Severity::warning, id, "$symbol:" + classname + "::" + varname + '\n' + message + '\n' + verbose, CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckClass::uninitVarError(const Token *tok, const std::string &classname, const std::string &varname)
+void CheckClassImpl::uninitVarError(const Token *tok, const std::string &classname, const std::string &varname)
 {
     const std::string message("Member variable '$symbol' is not initialized."); // report missing in-class initializer
     const std::string verbose {message + " Member variables of native types, pointers, or references are left uninitialized when the class is instantiated. That may cause bugs or undefined behavior."};
@@ -1103,7 +1200,7 @@ void CheckClass::uninitVarError(const Token *tok, const std::string &classname,
     reportError(tok, Severity::warning, id, "$symbol:" + classname + "::" + varname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
-void CheckClass::missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname)
+void CheckClassImpl::missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname)
 {
     const std::string ctor(functionType == FunctionType::eCopyConstructor ? "copy" : "move");
     const std::string action(functionType == FunctionType::eCopyConstructor ? "copied?" : "moved?");
@@ -1113,7 +1210,7 @@ void CheckClass::missingMemberCopyError(const Token *tok, FunctionType functionT
     reportError(tok, Severity::warning, "missingMemberCopy", message, CWE398, Certainty::inconclusive);
 }
 
-void CheckClass::operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname, bool inconclusive)
+void CheckClassImpl::operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname, bool inconclusive)
 {
     reportError(tok, Severity::warning, "operatorEqVarError", "$symbol:" + classname + "::" + varname + "\nMember variable '$symbol' is not assigned a value in '" + classname + "::operator='.", CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
@@ -1122,9 +1219,9 @@ void CheckClass::operatorEqVarError(const Token *tok, const std::string &classna
 // ClassCheck: Use initialization list instead of assignment
 //---------------------------------------------------------------------------
 
-void CheckClass::initializationListUsage()
+void CheckClassImpl::initializationListUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckClass::initializationListUsage"); // performance
@@ -1154,7 +1251,7 @@ void CheckClass::initializationListUsage()
                 continue;
             if (var->isPointer() || var->isReference() || var->isEnumType())
                 continue;
-            if (!WRONG_DATA(!var->valueType(), tok) && var->valueType()->type > ValueType::Type::ITERATOR)
+            if (!var->valueType() || var->valueType()->type > ValueType::Type::ITERATOR)
                 continue;
 
             // bailout: multi line lambda in rhs => do not warn
@@ -1185,6 +1282,10 @@ void CheckClass::initializationListUsage()
                         allowed = false;
                         return ChildrenToVisit::done;
                     }
+                    if (var2->isLocal() && isVariableChanged(var2->nameToken(), previousBeforeAstLeftmostLeaf(tok), var2->declarationId(), /*globalvar*/ false, mSettings)) {
+                        allowed = false;
+                        return ChildrenToVisit::done;
+                    }
                 } else if (tok2->str() == "this") { // 'this' instance is not completely constructed in initialization list
                     allowed = false;
                     return ChildrenToVisit::done;
@@ -1202,7 +1303,7 @@ void CheckClass::initializationListUsage()
     }
 }
 
-void CheckClass::suggestInitializationList(const Token* tok, const std::string& varname)
+void CheckClassImpl::suggestInitializationList(const Token* tok, const std::string& varname)
 {
     reportError(tok, Severity::performance, "useInitializationList", "$symbol:" + varname + "\nVariable '$symbol' is assigned in constructor body. Consider performing initialization in initialization list.\n"
                 "When an object of a class is created, the constructors of all member variables are called consecutively "
@@ -1264,9 +1365,9 @@ static bool checkFunctionUsage(const Function *privfunc, const Scope* scope)
     return false; // Unused in this scope
 }
 
-void CheckClass::privateFunctions()
+void CheckClassImpl::privateFunctions()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedPrivateFunction"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedPrivateFunction"))
         return;
 
     logChecker("CheckClass::privateFunctions"); // style
@@ -1297,7 +1398,11 @@ void CheckClass::privateFunctions()
 
         while (!privateFuncs.empty()) {
             const auto& pf = privateFuncs.front();
-            if (pf->retDef && pf->retDef->isAttributeMaybeUnused()) {
+            if (pf->token->isAttributeMaybeUnused() || pf->token->isAttributeUnused()) {
+                privateFuncs.pop_front();
+                continue;
+            }
+            if (pf->tokenDef && (pf->tokenDef->isAttributeMaybeUnused() || pf->tokenDef->isAttributeUnused())) {
                 privateFuncs.pop_front();
                 continue;
             }
@@ -1320,7 +1425,7 @@ void CheckClass::privateFunctions()
     }
 }
 
-void CheckClass::unusedPrivateFunctionError(const Token* tok1, const Token *tok2, const std::string &classname, const std::string &funcname)
+void CheckClassImpl::unusedPrivateFunctionError(const Token* tok1, const Token *tok2, const std::string &classname, const std::string &funcname)
 {
     std::list<const Token *> toks{ tok1 };
     if (tok2)
@@ -1342,10 +1447,10 @@ static const Scope* findFunctionOf(const Scope* scope)
     return nullptr;
 }
 
-void CheckClass::checkMemset()
+void CheckClassImpl::checkMemset()
 {
     logChecker("CheckClass::checkMemset");
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
     for (const Scope *scope : mSymbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
             if (Token::Match(tok, "memset|memcpy|memmove (")) {
@@ -1403,7 +1508,7 @@ void CheckClass::checkMemset()
                             type = var->typeScope();
 
                         if (!type && !var->isPointer() && !Token::simpleMatch(var->typeStartToken(), "std :: array") &&
-                            mSettings->library.detectContainerOrIterator(var->typeStartToken())) {
+                            mSettings.library.detectContainerOrIterator(var->typeStartToken())) {
                             memsetError(tok, tok->str(), var->getTypeName(), {}, /*isContainer*/ true);
                         }
                     }
@@ -1423,9 +1528,9 @@ void CheckClass::checkMemset()
                     checkMemsetType(scope, tok, type, false, {});
                 }
             } else if (tok->variable() && tok->variable()->isPointer() && tok->variable()->typeScope() && Token::Match(tok, "%var% = %name% (")) {
-                const Library::AllocFunc* alloc = mSettings->library.getAllocFuncInfo(tok->tokAt(2));
+                const Library::AllocFunc* alloc = mSettings.library.getAllocFuncInfo(tok->tokAt(2));
                 if (!alloc)
-                    alloc = mSettings->library.getReallocFuncInfo(tok->tokAt(2));
+                    alloc = mSettings.library.getReallocFuncInfo(tok->tokAt(2));
                 if (!alloc || alloc->bufferSize == Library::AllocFunc::BufferSize::none)
                     continue;
                 std::set<const Scope *> parsedTypes;
@@ -1438,14 +1543,14 @@ void CheckClass::checkMemset()
     }
 }
 
-void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::set<const Scope *> parsedTypes)
+void CheckClassImpl::checkMemsetType(const Scope *start, const Token *tok, const Scope *type, bool allocation, std::set<const Scope *> parsedTypes)
 {
     // If type has been checked there is no need to check it again
     if (parsedTypes.find(type) != parsedTypes.end())
         return;
     parsedTypes.insert(type);
 
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
 
     // recursively check all parent classes
     for (const Type::BaseInfo & i : type->definedType->derivedFrom) {
@@ -1486,7 +1591,7 @@ void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Sco
             }
 
             // check for std:: type
-            if (var.isStlType() && typeName != "std::array" && !mSettings->library.podtype(typeName)) {
+            if (var.isStlType() && typeName != "std::array" && !mSettings.library.podtype(typeName)) {
                 if (allocation)
                     mallocOnClassError(tok, tok->str(), type->classDef, "'" + typeName + "'");
                 else
@@ -1504,7 +1609,7 @@ void CheckClass::checkMemsetType(const Scope *start, const Token *tok, const Sco
     }
 }
 
-void CheckClass::mallocOnClassWarning(const Token* tok, const std::string &memfunc, const Token* classTok)
+void CheckClassImpl::mallocOnClassWarning(const Token* tok, const std::string &memfunc, const Token* classTok)
 {
     std::list<const Token *> toks = { tok, classTok };
     reportError(toks, Severity::warning, "mallocOnClassWarning",
@@ -1514,7 +1619,7 @@ void CheckClass::mallocOnClassWarning(const Token* tok, const std::string &memfu
                 "since no constructor is called and class members remain uninitialized. Consider using 'new' instead.", CWE762, Certainty::normal);
 }
 
-void CheckClass::mallocOnClassError(const Token* tok, const std::string &memfunc, const Token* classTok, const std::string &classname)
+void CheckClassImpl::mallocOnClassError(const Token* tok, const std::string &memfunc, const Token* classTok, const std::string &classname)
 {
     std::list<const Token *> toks = { tok, classTok };
     reportError(toks, Severity::error, "mallocOnClassError",
@@ -1525,7 +1630,7 @@ void CheckClass::mallocOnClassError(const Token* tok, const std::string &memfunc
                 "since no constructor is called and class members remain uninitialized. Consider using 'new' instead.", CWE665, Certainty::normal);
 }
 
-void CheckClass::memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type, bool isContainer)
+void CheckClassImpl::memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type, bool isContainer)
 {
     const std::string typeStr = isContainer ? std::string() : (type + " that contains a ");
     const std::string msg = "$symbol:" + memfunc + "\n"
@@ -1537,14 +1642,14 @@ void CheckClass::memsetError(const Token *tok, const std::string &memfunc, const
     reportError(tok, Severity::error, "memsetClass", msg, CWE762, Certainty::normal);
 }
 
-void CheckClass::memsetErrorReference(const Token *tok, const std::string &memfunc, const std::string &type)
+void CheckClassImpl::memsetErrorReference(const Token *tok, const std::string &memfunc, const std::string &type)
 {
     reportError(tok, Severity::error, "memsetClassReference",
                 "$symbol:" + memfunc +"\n"
                 "Using '" + memfunc + "' on " + type + " that contains a reference.", CWE665, Certainty::normal);
 }
 
-void CheckClass::memsetErrorFloat(const Token *tok, const std::string &type)
+void CheckClassImpl::memsetErrorFloat(const Token *tok, const std::string &type)
 {
     reportError(tok, Severity::portability, "memsetClassFloat", "Using memset() on " + type + " which contains a floating point number.\n"
                 "Using memset() on " + type + " which contains a floating point number."
@@ -1559,9 +1664,9 @@ void CheckClass::memsetErrorFloat(const Token *tok, const std::string &type)
 // operator= should return a reference to *this
 //---------------------------------------------------------------------------
 
-void CheckClass::operatorEqRetRefThis()
+void CheckClassImpl::operatorEqRetRefThis()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("operatorEqRetRefThis"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("operatorEqRetRefThis"))
         return;
 
     logChecker("CheckClass::operatorEqRetRefThis"); // style
@@ -1578,13 +1683,13 @@ void CheckClass::operatorEqRetRefThis()
     }
 }
 
-void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last)
+void CheckClassImpl::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last)
 {
     std::set<const Function*> analyzedFunctions;
     checkReturnPtrThis(scope, func, tok, last, analyzedFunctions);
 }
 
-void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last, std::set<const Function*>& analyzedFunctions)
+void CheckClassImpl::checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last, std::set<const Function*>& analyzedFunctions)
 {
     bool foundReturn = false;
 
@@ -1660,7 +1765,7 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
         }
         return;
     }
-    if (mSettings->library.isScopeNoReturn(last, nullptr)) {
+    if (mSettings.library.isScopeNoReturn(last, nullptr)) {
         // Typical wrong way to prohibit default assignment operator
         // by always throwing an exception or calling a noreturn function
         operatorEqShouldBeLeftUnimplementedError(func->token);
@@ -1670,17 +1775,17 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
     operatorEqMissingReturnStatementError(func->token, func->access == AccessControl::Public);
 }
 
-void CheckClass::operatorEqRetRefThisError(const Token *tok)
+void CheckClassImpl::operatorEqRetRefThisError(const Token *tok)
 {
     reportError(tok, Severity::style, "operatorEqRetRefThis", "'operator=' should return reference to 'this' instance.", CWE398, Certainty::normal);
 }
 
-void CheckClass::operatorEqShouldBeLeftUnimplementedError(const Token *tok)
+void CheckClassImpl::operatorEqShouldBeLeftUnimplementedError(const Token *tok)
 {
     reportError(tok, Severity::style, "operatorEqShouldBeLeftUnimplemented", "'operator=' should either return reference to 'this' instance or be declared private and left unimplemented.", CWE398, Certainty::normal);
 }
 
-void CheckClass::operatorEqMissingReturnStatementError(const Token *tok, bool error)
+void CheckClassImpl::operatorEqMissingReturnStatementError(const Token *tok, bool error)
 {
     if (error) {
         reportError(tok, Severity::error, "operatorEqMissingReturnStatement", "No 'return' statement in non-void function causes undefined behavior.", CWE398, Certainty::normal);
@@ -1703,9 +1808,9 @@ void CheckClass::operatorEqMissingReturnStatementError(const Token *tok, bool er
 // assignment to self.
 //---------------------------------------------------------------------------
 
-void CheckClass::operatorEqToSelf()
+void CheckClassImpl::operatorEqToSelf()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("operatorEqToSelf"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("operatorEqToSelf"))
         return;
 
     logChecker("CheckClass::operatorEqToSelf"); // warning
@@ -1744,7 +1849,7 @@ void CheckClass::operatorEqToSelf()
     }
 }
 
-bool CheckClass::hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const
+bool CheckClassImpl::hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const
 {
     const Token *end;
     if (ifStatementScopeStart->str() == "{")
@@ -1754,24 +1859,24 @@ bool CheckClass::hasAllocationInIfScope(const Function *func, const Scope* scope
     return hasAllocation(func, scope, ifStatementScopeStart, end);
 }
 
-bool CheckClass::hasAllocation(const Function *func, const Scope* scope) const
+bool CheckClassImpl::hasAllocation(const Function *func, const Scope* scope) const
 {
     return hasAllocation(func, scope, func->functionScope->bodyStart, func->functionScope->bodyEnd);
 }
 
-bool CheckClass::hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const
+bool CheckClassImpl::hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const
 {
     if (!end)
         end = func->functionScope->bodyEnd;
     for (const Token *tok = start; tok && (tok != end); tok = tok->next()) {
         if (((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
-             (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) &&
+             (Token::Match(tok, "%var% = %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) &&
             isMemberVar(scope, tok))
             return true;
 
         // check for deallocating memory
         const Token *var;
-        if (Token::Match(tok, "%name% ( %var%") && mSettings->library.getDeallocFuncInfo(tok))
+        if (Token::Match(tok, "%name% ( %var%") && mSettings.library.getDeallocFuncInfo(tok))
             var = tok->tokAt(2);
         else if (tok->isCpp() && Token::Match(tok, "delete [ ] %var%"))
             var = tok->tokAt(3);
@@ -1805,7 +1910,7 @@ static bool isFalseKeyword(const Token* tok)
  * Checks if self-assignment test is inverse
  * For example 'if (this == &rhs)'
  */
-CheckClass::Bool CheckClass::isInverted(const Token *tok, const Token *rhs)
+CheckClassImpl::Bool CheckClassImpl::isInverted(const Token *tok, const Token *rhs)
 {
     bool res = true;
     for (const Token *itr = tok; itr && itr->str()!="("; itr=itr->astParent()) {
@@ -1826,31 +1931,31 @@ CheckClass::Bool CheckClass::isInverted(const Token *tok, const Token *rhs)
                                                      || (Token::simpleMatch(itr->astOperand2(), "this") && Token::simpleMatch(itr->astOperand1(), "&") && Token::simpleMatch(itr->astOperand1()->next(), rhs->str().c_str(), rhs->str().size())))) {
             //Do nothing
         } else {
-            return Bool::BAILOUT;
+            return Bool::Bailout;
         }
     }
     if (res)
-        return Bool::TRUE;
-    return Bool::FALSE;
+        return Bool::True;
+    return Bool::False;
 }
 
-const Token * CheckClass::getIfStmtBodyStart(const Token *tok, const Token *rhs)
+const Token * CheckClassImpl::getIfStmtBodyStart(const Token *tok, const Token *rhs)
 {
     const Token *top = tok->astTop();
     if (Token::simpleMatch(top->link(), ") {")) {
         switch (isInverted(tok->astParent(), rhs)) {
-        case Bool::BAILOUT:
+        case Bool::Bailout:
             return nullptr;
-        case Bool::TRUE:
+        case Bool::True:
             return top->link()->next();
-        case Bool::FALSE:
+        case Bool::False:
             return top->link()->linkAt(1);
         }
     }
     return nullptr;
 }
 
-bool CheckClass::hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart)
+bool CheckClassImpl::hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart)
 {
     if (!rhs)
         return false;
@@ -1884,7 +1989,7 @@ bool CheckClass::hasAssignSelf(const Function *func, const Token *rhs, const Tok
     return false;
 }
 
-void CheckClass::operatorEqToSelfError(const Token *tok)
+void CheckClassImpl::operatorEqToSelfError(const Token *tok)
 {
     reportError(tok, Severity::warning, "operatorEqToSelf",
                 "'operator=' should check for assignment to self to avoid problems with dynamic memory.\n"
@@ -1896,7 +2001,7 @@ void CheckClass::operatorEqToSelfError(const Token *tok)
 // A destructor in a base class should be virtual
 //---------------------------------------------------------------------------
 
-void CheckClass::virtualDestructor()
+void CheckClassImpl::virtualDestructor()
 {
     // This error should only be given if:
     // * base class doesn't have virtual destructor
@@ -1904,7 +2009,7 @@ void CheckClass::virtualDestructor()
     // * base class is deleted
     // unless inconclusive in which case:
     // * A class with any virtual functions should have a destructor that is either public and virtual or protected
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
 
     std::list<const Function *> inconclusiveErrors;
 
@@ -1927,7 +2032,7 @@ void CheckClass::virtualDestructor()
         }
 
         // Check if destructor is empty and non-empty ..
-        if (mSettings->standards.cpp <= Standards::CPP03) {
+        if (mSettings.standards.cpp <= Standards::CPP03) {
             // Find the destructor
             const Function *destructor = scope->getDestructor();
 
@@ -2031,10 +2136,10 @@ void CheckClass::virtualDestructor()
         virtualDestructorError(func->tokenDef, func->name(), "", true);
 }
 
-void CheckClass::virtualDestructorError(const Token *tok, const std::string &Base, const std::string &Derived, bool inconclusive)
+void CheckClassImpl::virtualDestructorError(const Token *tok, const std::string &Base, const std::string &Derived, bool inconclusive)
 {
     if (inconclusive) {
-        if (mSettings->severity.isEnabled(Severity::warning))
+        if (mSettings.severity.isEnabled(Severity::warning))
             reportError(tok, Severity::warning, "virtualDestructor", "$symbol:" + Base + "\nClass '$symbol' which has virtual members does not have a virtual destructor.", CWE404, Certainty::inconclusive);
     } else {
         reportError(tok, Severity::error, "virtualDestructor",
@@ -2052,9 +2157,9 @@ void CheckClass::virtualDestructorError(const Token *tok, const std::string &Bas
 // warn for "this-x". The indented code may be "this->x"
 //---------------------------------------------------------------------------
 
-void CheckClass::thisSubtraction()
+void CheckClassImpl::thisSubtraction()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckClass::thisSubtraction"); // warning
@@ -2072,7 +2177,7 @@ void CheckClass::thisSubtraction()
     }
 }
 
-void CheckClass::thisSubtractionError(const Token *tok)
+void CheckClassImpl::thisSubtractionError(const Token *tok)
 {
     reportError(tok, Severity::warning, "thisSubtraction", "Suspicious pointer subtraction. Did you intend to write '->'?", CWE398, Certainty::normal);
 }
@@ -2081,15 +2186,11 @@ void CheckClass::thisSubtractionError(const Token *tok)
 // can member function be const?
 //---------------------------------------------------------------------------
 
-void CheckClass::checkConst()
+void CheckClassImpl::checkConst()
 {
-    // This is an inconclusive check. False positives: #3322.
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
-        return;
-
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("functionConst") &&
-        !mSettings->isPremiumEnabled("functionStatic"))
+    if (!mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("functionConst") &&
+        !mSettings.isPremiumEnabled("functionStatic"))
         return;
 
     logChecker("CheckClass::checkConst"); // style,inconclusive
@@ -2150,7 +2251,7 @@ void CheckClass::checkConst()
                 const std::string& opName = func.tokenDef->str();
                 if (opName.compare(8, 5, "const") != 0 && (endsWith(opName,'&') || endsWith(opName,'*')))
                     continue;
-            } else if (mSettings->library.isSmartPointer(func.retDef)) {
+            } else if (mSettings.library.isSmartPointer(func.retDef)) {
                 // Don't warn if a std::shared_ptr etc is returned
                 continue;
             } else {
@@ -2173,6 +2274,20 @@ void CheckClass::checkConst()
             const bool suggestStatic = memberAccessed != MemberAccess::MEMBER && !func.isOperator();
             if ((returnsPtrOrRef || func.isConst() || func.hasLvalRefQualifier()) && !suggestStatic)
                 continue;
+            if (!suggestStatic && !mSettings.certainty.isEnabled(Certainty::inconclusive))
+                // functionConst is inconclusive. False positives: #3322.
+                continue;
+            if (suggestStatic && func.isConst()) {
+                const auto overloads = func.getOverloadedFunctions();
+                if (overloads.size() > 1 && std::any_of(overloads.begin(), overloads.end(), [&](const Function* ovl) {
+                    if (&func == ovl)
+                        return false;
+                    if (!ovl->functionScope)
+                        return true;
+                    return func.argCount() == ovl->argCount() && func.argsMatch(ovl->functionScope, ovl->argDef, func.argDef, "", 0);
+                }))
+                    continue;
+            }
 
             std::string classname = scope->className;
             const Scope *nest = scope->nestedIn;
@@ -2207,7 +2322,7 @@ static const Token* getFuncTokFromThis(const Token* tok) {
     return Token::Match(tok, "%name% (") ? tok : nullptr;
 }
 
-bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
+bool CheckClassImpl::isMemberVar(const Scope *scope, const Token *tok) const
 {
     bool again = false;
 
@@ -2231,11 +2346,18 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
         } else if (tok->str() == "]") {
             tok = tok->link()->previous();
             again = true;
+        } else if (Token::Match(tok, "%name% ::")) {
+            tok = tok->tokAt(2);
+            again = true;
         }
     } while (again);
 
     if (tok->isKeyword() || tok->isStandardType())
         return false;
+    if (tok->variable() && (tok->variable()->isArgument() || tok->variable()->isLocal()))
+        return false;
+    if (tok->function() || tok->type() || tok->enumerator())
+        return false;
 
     for (const Variable& var : scope->varlist) {
         if (var.name() == tok->str()) {
@@ -2287,13 +2409,15 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
     return false;
 }
 
-bool CheckClass::isMemberFunc(const Scope *scope, const Token *tok)
+bool CheckClassImpl::isMemberFunc(const Scope *scope, const Token *tok)
 {
     if (!tok->function()) {
+        if (Token::simpleMatch(tok->astParent(), ".") && Token::simpleMatch(tok->astParent()->astOperand1(), "this"))
+            return true;
         for (const Function &func : scope->functionList) {
             if (func.name() == tok->str()) {
                 const Token* tok2 = tok->tokAt(2);
-                int argsPassed = tok2->str() == ")" ? 0 : 1;
+                size_t argsPassed = tok2->str() == ")" ? 0 : 1;
                 for (;;) {
                     tok2 = tok2->nextArgument();
                     if (tok2)
@@ -2328,7 +2452,7 @@ bool CheckClass::isMemberFunc(const Scope *scope, const Token *tok)
     return false;
 }
 
-bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok)
+bool CheckClassImpl::isConstMemberFunc(const Scope *scope, const Token *tok)
 {
     if (!tok->function())
         return false;
@@ -2353,9 +2477,17 @@ bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok)
     return false;
 }
 
-const std::set<std::string> CheckClass::stl_containers_not_const = { "map", "unordered_map", "std :: map|unordered_map <" }; // start pattern
+const std::set<std::string> CheckClassImpl::stl_containers_not_const = { "map", "unordered_map", "std :: map|unordered_map <" }; // start pattern
+
+static bool isNonConstPtrCast(const Token* tok)
+{
+    if (!tok || !tok->isCast())
+        return false;
+    const ValueType* vt = tok->valueType();
+    return !vt || (vt->pointer > 0 && !vt->isConst(vt->pointer));
+}
 
-bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, MemberAccess& memberAccessed) const
+bool CheckClassImpl::checkConstFunc(const Scope *scope, const Function *func, MemberAccess& memberAccessed) const
 {
     if (mTokenizer->hasIfdef(func->functionScope->bodyStart, func->functionScope->bodyEnd))
         return false;
@@ -2382,9 +2514,9 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
 
         if (const Function* f = funcTok->function()) { // check known function
             const std::vector<const Token*> args = getArguments(funcTok);
-            const auto argMax = std::min<nonneg int>(args.size(), f->argCount());
+            const auto argMax = std::min<size_t>(args.size(), f->argCount());
 
-            for (nonneg int argIndex = 0; argIndex < argMax; ++argIndex) {
+            for (size_t argIndex = 0; argIndex < argMax; ++argIndex) {
                 const Variable* const argVar = f->getArgumentVar(argIndex);
                 if (!argVar || ((argVar->isArrayOrPointer() || argVar->isReference()) &&
                                 !(argVar->valueType() && argVar->valueType()->isConst(argVar->valueType()->pointer)))) { // argument might be modified
@@ -2406,7 +2538,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
             return true;
         }
 
-        if (const Library::Function* fLib = mSettings->library.getFunction(funcTok))
+        if (const Library::Function* fLib = mSettings.library.getFunction(funcTok))
             if (fLib->isconst || fLib->ispure)
                 return true;
 
@@ -2440,14 +2572,12 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                     return false;
                 if (Token::Match(tok1->previous(), "( this . * %var% )")) // call using ptr to member function TODO: check constness
                     return false;
-                if (Token::simpleMatch(tok1->astParent(), "*") && tok1->astParent()->astParent() && tok1->astParent()->astParent()->isIncDecOp())
+                if (Token::simpleMatch(tok1->astParent(), "*"))
                     return false;
             }
 
             // non const pointer cast
-            if (tok1->valueType() && tok1->valueType()->pointer > 0 && tok1->astParent() && tok1->astParent()->isCast() &&
-                !(tok1->astParent()->valueType() &&
-                  (tok1->astParent()->valueType()->pointer == 0 || tok1->astParent()->valueType()->isConst(tok1->astParent()->valueType()->pointer))))
+            if (tok1->valueType() && tok1->valueType()->pointer > 0 && isNonConstPtrCast(tok1->astParent()))
                 return false;
 
             const Token* lhs = tok1->previous();
@@ -2458,6 +2588,12 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
             else if (lhs->str() == ":" && lhs->astParent() && lhs->astParent()->astParent() && lhs->astParent()->str() == "?")
                 lhs = lhs->astParent()->astParent();
             if (lhs->str() == "&") {
+                const Token* parent = lhs->astParent();
+                while (Token::Match(parent, "[+(]")) {
+                    if (isNonConstPtrCast(parent))
+                        return false;
+                    parent = parent->astParent();
+                }
                 const Token* const top = lhs->astTop();
                 if (top->isAssignmentOp()) {
                     if (Token::simpleMatch(top->astOperand2(), "{") && !top->astOperand2()->previous()->function()) // TODO: check usage in init list
@@ -2468,14 +2604,19 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                     }
                 }
             } else if (lhs->str() == ":" && lhs->astParent() && lhs->astParent()->str() == "(") { // range-based for-loop (C++11)
-                // TODO: We could additionally check what is done with the elements to avoid false negatives. Here we just rely on "const" keyword being used.
-                if (lhs->astParent()->strAt(1) != "const")
+                const Variable* loopVar = lhs->astOperand1()->variable();
+                if (!loopVar || !loopVar->valueType())
+                    return false;
+                if (!loopVar->valueType()->isConst(loopVar->valueType()->pointer))
                     return false;
             } else {
                 if (lhs->isAssignmentOp()) {
-                    const Variable* lhsVar = lhs->previous()->variable();
-                    if (lhsVar && !lhsVar->isConst() && lhsVar->isReference() && lhs == lhsVar->nameToken()->next())
-                        return false;
+                    if (const Variable* lhsVar = lhs->previous()->variable()) {
+                        if (!lhsVar->isConst() && lhsVar->isReference() && lhs == lhsVar->nameToken()->next())
+                            return false;
+                        if (lhsVar->isPointer() && v && v->isArray() && !(lhsVar->valueType() && lhsVar->valueType()->isConst(/*indirect*/ 1)))
+                            return false;
+                    }
                 }
             }
 
@@ -2532,10 +2673,10 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                 if (!vt || !vt->container)
                     return false;
                 const auto yield = vt->container->getYield(end->str());
-                if (yield == Library::Container::Yield::START_ITERATOR || yield == Library::Container::Yield::END_ITERATOR) {
-                    const Token* parent = tok1->astParent();
-                    while (Token::Match(parent, "(|.|::"))
-                        parent = parent->astParent();
+                const Token* parent = tok1->astParent();
+                while (Token::Match(parent, "(|.|::"))
+                    parent = parent->astParent();
+                if (contains({Library::Container::Yield::START_ITERATOR, Library::Container::Yield::END_ITERATOR, Library::Container::Yield::ITERATOR}, yield)) {
                     if (parent && parent->isComparisonOp())
                         return true;
                     // TODO: use AST
@@ -2543,7 +2684,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                         return true;
                 }
                 if ((yield == Library::Container::Yield::ITEM || yield == Library::Container::Yield::AT_INDEX) &&
-                    (lhs->isComparisonOp() || lhs->isAssignmentOp() || (lhs->str() == "(" && Token::Match(lhs->astParent(), "%cop%"))))
+                    ((parent && parent->isComparisonOp()) || lhs->isAssignmentOp() || (lhs->str() == "(" && Token::Match(lhs->astParent(), "%cop%"))))
                     return true; // assume that these functions have const overloads
                 return false;
             };
@@ -2561,12 +2702,12 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                 }
                 else if (var->smartPointerType() && var->smartPointerType()->classScope && isConstMemberFunc(var->smartPointerType()->classScope, end)) {
                     // empty body
-                } else if (var->isSmartPointer() && Token::simpleMatch(tok1->next(), ".") && tok1->next()->originalName().empty() && mSettings->library.isFunctionConst(end)) {
+                } else if (var->isSmartPointer() && Token::simpleMatch(tok1->next(), ".") && tok1->next()->originalName().empty() && mSettings.library.isFunctionConst(end)) {
                     // empty body
                 } else if (hasOverloadedMemberAccess(end, var->typeScope())) {
                     // empty body
                 } else if (!var->typeScope() || (end->function() != func && !isConstMemberFunc(var->typeScope(), end))) {
-                    if (!mSettings->library.isFunctionConst(end))
+                    if (!mSettings.library.isFunctionConst(end))
                         return false;
                 }
             }
@@ -2623,12 +2764,12 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
     return true;
 }
 
-void CheckClass::checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
+void CheckClassImpl::checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
 {
     checkConstError2(tok, nullptr, classname, funcname, suggestStatic, foundAllBaseClasses);
 }
 
-void CheckClass::checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
+void CheckClassImpl::checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
 {
     std::list<const Token *> toks{ tok1 };
     if (tok2)
@@ -2647,16 +2788,10 @@ void CheckClass::checkConstError2(const Token *tok1, const Token *tok2, const st
     }
     else {
         const std::string msg = foundAllBaseClasses ?
-                                "Technically the member function '$symbol' can be static (but you may consider moving to unnamed namespace).\nThe member function '$symbol' can be made a static " :
-                                "Either there is a missing 'override', or the member function '$symbol' can be static.\nUnless it overrides a base class member, the member function '$symbol' can be made a static ";
-        reportError(toks, Severity::performance, "functionStatic",
-                    "$symbol:" + classname + "::" + funcname +"\n"
-                    + msg +
-                    "function. Making a function static can bring a performance benefit since no 'this' instance is "
-                    "passed to the function. This change should not cause compiler errors but it does not "
-                    "necessarily make sense conceptually. Think about your design and the task of the function first - "
-                    "is it a function that must not access members of class instances? And maybe it is more appropriate "
-                    "to move this function to an unnamed namespace.", CWE398, Certainty::inconclusive);
+                                "The member function '$symbol' can be static." :
+                                "Either there is a missing 'override', or the member function '$symbol' can be static.";
+        reportError(toks, Severity::style, "functionStatic",
+                    "$symbol:" + classname + "::" + funcname +"\n" + msg, CWE398, Certainty::normal);
     }
 }
 
@@ -2675,17 +2810,19 @@ namespace { // avoid one-definition-rule violation
     };
 }
 
-void CheckClass::initializerListOrder()
+void CheckClassImpl::initializerListOrder()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("initializerList"))
-        return;
+    if (!mSettings.isPremiumEnabled("initializerList")) {
+        if (!mSettings.severity.isEnabled(Severity::style))
+            return;
 
-    // This check is not inconclusive.  However it only determines if the initialization
-    // order is incorrect.  It does not determine if being out of order causes
-    // a real error.  Out of order is not necessarily an error but you can never
-    // have an error if the list is in order so this enforces defensive programming.
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
-        return;
+        // This check is not inconclusive.  However it only determines if the initialization
+        // order is incorrect.  It does not determine if being out of order causes
+        // a real error.  Out of order is not necessarily an error but you can never
+        // have an error if the list is in order so this enforces defensive programming.
+        if (!mSettings.certainty.isEnabled(Certainty::inconclusive))
+            return;
+    }
 
     logChecker("CheckClass::initializerListOrder"); // style,inconclusive
 
@@ -2752,7 +2889,7 @@ void CheckClass::initializerListOrder()
     }
 }
 
-void CheckClass::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname, const std::string& argname)
+void CheckClassImpl::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname, const std::string& argname)
 {
     std::list<const Token *> toks = { tok1, tok2 };
     const std::string msg = argname.empty() ?
@@ -2773,7 +2910,7 @@ void CheckClass::initializerListError(const Token *tok1, const Token *tok2, cons
 // Check for self initialization in initialization list
 //---------------------------------------------------------------------------
 
-void CheckClass::checkSelfInitialization()
+void CheckClassImpl::checkSelfInitialization()
 {
     logChecker("CheckClass::checkSelfInitialization");
 
@@ -2802,7 +2939,7 @@ void CheckClass::checkSelfInitialization()
     }
 }
 
-void CheckClass::selfInitializationError(const Token* tok, const std::string& varname)
+void CheckClassImpl::selfInitializationError(const Token* tok, const std::string& varname)
 {
     reportError(tok, Severity::error, "selfInitialization", "$symbol:" + varname + "\nMember variable '$symbol' is initialized by itself.", CWE665, Certainty::normal);
 }
@@ -2812,9 +2949,9 @@ void CheckClass::selfInitializationError(const Token* tok, const std::string& va
 // Check for virtual function calls in constructor/destructor
 //---------------------------------------------------------------------------
 
-void CheckClass::checkVirtualFunctionCallInConstructor()
+void CheckClassImpl::checkVirtualFunctionCallInConstructor()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckClass::checkVirtualFunctionCallInConstructor"); // warning
     std::map<const Function *, std::list<const Token *>> virtualFunctionCallsMap;
@@ -2842,8 +2979,8 @@ void CheckClass::checkVirtualFunctionCallInConstructor()
     }
 }
 
-const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Function & function,
-                                                                     std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap)
+const std::list<const Token *> & CheckClassImpl::getVirtualFunctionCalls(const Function & function,
+                                                                         std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap)
 {
     const auto found = utils::as_const(virtualFunctionCallsMap).find(&function);
     if (found != virtualFunctionCallsMap.end())
@@ -2881,8 +3018,8 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
             tok->strAt(-1) == "(") {
             const Token * prev = tok->previous();
             if (prev->previous() &&
-                (mSettings->library.ignorefunction(tok->str())
-                 || mSettings->library.ignorefunction(prev->strAt(-1))))
+                (mSettings.library.ignorefunction(tok->str())
+                 || mSettings.library.ignorefunction(prev->strAt(-1))))
                 continue;
         }
 
@@ -2900,7 +3037,7 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
     return virtualFunctionCalls;
 }
 
-void CheckClass::getFirstVirtualFunctionCallStack(
+void CheckClassImpl::getFirstVirtualFunctionCallStack(
     std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap,
     const Token * callToken,
     std::list<const Token *> & pureFuncStack)
@@ -2920,12 +3057,12 @@ void CheckClass::getFirstVirtualFunctionCallStack(
     getFirstVirtualFunctionCallStack(virtualFunctionCallsMap, firstCall, pureFuncStack);
 }
 
-void CheckClass::virtualFunctionCallInConstructorError(
+void CheckClassImpl::virtualFunctionCallInConstructorError(
     const Function * scopeFunction,
     const std::list<const Token *> & tokStack,
     const std::string &funcname)
 {
-    if (scopeFunction && !mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("virtualCallInConstructor"))
+    if (scopeFunction && !mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("virtualCallInConstructor"))
         return;
 
     const char * scopeFunctionTypeName = scopeFunction ? getFunctionTypeName(scopeFunction->type) : "constructor";
@@ -2954,11 +3091,11 @@ void CheckClass::virtualFunctionCallInConstructorError(
         }
     }
 
-    reportError(errorPath, Severity::style, "virtualCallInConstructor",
+    reportError(std::move(errorPath), Severity::style, "virtualCallInConstructor",
                 "Virtual function '" + funcname + "' is called from " + scopeFunctionTypeName + " '" + constructorName + "' at line " + std::to_string(lineNumber) + ". Dynamic binding is not used.", CWE(0U), Certainty::normal);
 }
 
-void CheckClass::pureVirtualFunctionCallInConstructorError(
+void CheckClassImpl::pureVirtualFunctionCallInConstructorError(
     const Function * scopeFunction,
     const std::list<const Token *> & tokStack,
     const std::string &purefuncname)
@@ -2972,7 +3109,7 @@ void CheckClass::pureVirtualFunctionCallInConstructorError(
     if (!errorPath.empty())
         errorPath.back().second = purefuncname + " is a pure virtual function without body";
 
-    reportError(errorPath, Severity::warning, "pureVirtualCall",
+    reportError(std::move(errorPath), Severity::warning, "pureVirtualCall",
                 "$symbol:" + purefuncname +"\n"
                 "Call of pure virtual function '$symbol' in " + scopeFunctionTypeName + ".\n"
                 "Call of pure virtual function '$symbol' in " + scopeFunctionTypeName + ". The call will fail during runtime.", CWE(0U), Certainty::normal);
@@ -2983,9 +3120,9 @@ void CheckClass::pureVirtualFunctionCallInConstructorError(
 // Check for members hiding inherited members with the same name
 //---------------------------------------------------------------------------
 
-void CheckClass::checkDuplInheritedMembers()
+void CheckClassImpl::checkDuplInheritedMembers()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("duplInheritedMember"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("duplInheritedMember"))
         return;
 
     logChecker("CheckClass::checkDuplInheritedMembers"); // warning
@@ -3052,11 +3189,13 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
                 continue;
             if (classFuncIt.tokenDef->isExpandedMacro())
                 continue;
+            if (classFuncIt.templateDef)
+                continue;
             for (const Function& parentClassFuncIt : parentClassIt.type->classScope->functionList) {
                 if (classFuncIt.name() == parentClassFuncIt.name() &&
                     (parentClassFuncIt.access != AccessControl::Private || !skipPrivate) &&
                     !classFuncIt.isConstructor() && !classFuncIt.isDestructor() &&
-                    classFuncIt.argsMatch(parentClassIt.type->classScope, parentClassFuncIt.argDef, classFuncIt.argDef, emptyString, 0) &&
+                    classFuncIt.argsMatch(parentClassIt.type->classScope, parentClassFuncIt.argDef, classFuncIt.argDef, "", 0) &&
                     (classFuncIt.isConst() == parentClassFuncIt.isConst() || Function::returnsConst(&classFuncIt) == Function::returnsConst(&parentClassFuncIt)) &&
                     !(classFuncIt.isDelete() || parentClassFuncIt.isDelete()))
                     results.emplace_back(&classFuncIt, &parentClassFuncIt, &parentClassIt);
@@ -3070,7 +3209,7 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
     return results;
 }
 
-void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, const Type* typeBase)
+void CheckClassImpl::checkDuplInheritedMembersRecursive(const Type* typeCurrent, const Type* typeBase)
 {
     const auto resultsVar = getDuplInheritedMembersRecursive(typeCurrent, typeBase);
     for (const auto& r : resultsVar) {
@@ -3089,9 +3228,9 @@ void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, con
     }
 }
 
-void CheckClass::duplInheritedMembersError(const Token *tok1, const Token* tok2,
-                                           const std::string &derivedName, const std::string &baseName,
-                                           const std::string &memberName, bool derivedIsStruct, bool baseIsStruct, bool isFunction)
+void CheckClassImpl::duplInheritedMembersError(const Token *tok1, const Token* tok2,
+                                               const std::string &derivedName, const std::string &baseName,
+                                               const std::string &memberName, bool derivedIsStruct, bool baseIsStruct, bool isFunction)
 {
     ErrorPath errorPath;
     const std::string member = isFunction ? "function" : "variable";
@@ -3103,7 +3242,7 @@ void CheckClass::duplInheritedMembersError(const Token *tok1, const Token* tok2,
     const std::string message = "The " + std::string(derivedIsStruct ? "struct" : "class") + " '" + derivedName +
                                 "' defines member " + member + " with name '" + memberName + "' also defined in its parent " +
                                 std::string(baseIsStruct ? "struct" : "class") + " '" + baseName + "'.";
-    reportError(errorPath, Severity::warning, "duplInheritedMember", symbols + '\n' + message, CWE398, Certainty::normal);
+    reportError(std::move(errorPath), Severity::warning, "duplInheritedMember", symbols + '\n' + message, CWE398, Certainty::normal);
 }
 
 
@@ -3117,12 +3256,11 @@ enum class CtorType : std::uint8_t {
     WITH_BODY
 };
 
-void CheckClass::checkCopyCtorAndEqOperator()
+void CheckClassImpl::checkCopyCtorAndEqOperator()
 {
-    // This is disabled because of #8388
+    // TODO: This is disabled because of #8388
     // The message must be clarified. How is the behaviour different?
-    // cppcheck-suppress unreachableCode - remove when code is enabled again
-    if ((true) || !mSettings->severity.isEnabled(Severity::warning)) // NOLINT(readability-simplify-boolean-expr)
+    if ((true) || !mSettings.severity.isEnabled(Severity::warning)) // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         return;
 
     // logChecker
@@ -3170,7 +3308,7 @@ void CheckClass::checkCopyCtorAndEqOperator()
     }
 }
 
-void CheckClass::copyCtorAndEqOperatorError(const Token *tok, const std::string &classname, bool isStruct, bool hasCopyCtor)
+void CheckClassImpl::copyCtorAndEqOperatorError(const Token *tok, const std::string &classname, bool isStruct, bool hasCopyCtor)
 {
     const std::string message = "$symbol:" + classname + "\n"
                                 "The " + std::string(isStruct ? "struct" : "class") + " '$symbol' has '" +
@@ -3180,11 +3318,11 @@ void CheckClass::copyCtorAndEqOperatorError(const Token *tok, const std::string
     reportError(tok, Severity::warning, "copyCtorAndEqOperator", message);
 }
 
-void CheckClass::checkOverride()
+void CheckClassImpl::checkOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("missingOverride"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("missingOverride"))
         return;
-    if (mSettings->standards.cpp < Standards::CPP11)
+    if (mSettings.standards.cpp < Standards::CPP11)
         return;
     logChecker("CheckClass::checkMissingOverride"); // style,c++03
     for (const Scope * classScope : mSymbolDatabase->classAndStructScopes) {
@@ -3195,6 +3333,8 @@ void CheckClass::checkOverride()
                 continue;
             if (func.tokenDef->isExpandedMacro())
                 continue;
+            if (func.templateDef)
+                continue;
             const Function *baseFunc = func.getOverriddenFunction();
             if (baseFunc)
                 overrideError(baseFunc, &func);
@@ -3202,7 +3342,7 @@ void CheckClass::checkOverride()
     }
 }
 
-void CheckClass::overrideError(const Function *funcInBase, const Function *funcInDerived)
+void CheckClassImpl::overrideError(const Function *funcInBase, const Function *funcInDerived)
 {
     const std::string functionName = funcInDerived ? ((funcInDerived->isDestructor() ? "~" : "") + funcInDerived->name()) : "";
     const std::string funcType = (funcInDerived && funcInDerived->isDestructor()) ? "destructor" : "function";
@@ -3213,14 +3353,14 @@ void CheckClass::overrideError(const Function *funcInBase, const Function *funcI
         errorPath.emplace_back(funcInDerived->tokenDef, char(std::toupper(funcType[0])) + funcType.substr(1) + " in derived class");
     }
 
-    reportError(errorPath, Severity::style, "missingOverride",
+    reportError(std::move(errorPath), Severity::style, "missingOverride",
                 "$symbol:" + functionName + "\n"
                 "The " + funcType + " '$symbol' overrides a " + funcType + " in a base class but is not marked with a 'override' specifier.",
                 CWE(0U) /* Unknown CWE! */,
                 Certainty::normal);
 }
 
-void CheckClass::uselessOverrideError(const Function *funcInBase, const Function *funcInDerived, bool isSameCode)
+void CheckClassImpl::uselessOverrideError(const Function *funcInBase, const Function *funcInDerived, bool isSameCode)
 {
     const std::string functionName = funcInDerived ? ((funcInDerived->isDestructor() ? "~" : "") + funcInDerived->name()) : "";
     const std::string funcType = (funcInDerived && funcInDerived->isDestructor()) ? "destructor" : "function";
@@ -3237,7 +3377,7 @@ void CheckClass::uselessOverrideError(const Function *funcInBase, const Function
     }
     else
         errStr += "just delegates back to the base class.";
-    reportError(errorPath, Severity::style, "uselessOverride",
+    reportError(std::move(errorPath), Severity::style, "uselessOverride",
                 "$symbol:" + functionName +
                 errStr,
                 CWE(0U) /* Unknown CWE! */,
@@ -3284,9 +3424,9 @@ static bool compareTokenRanges(const Token* start1, const Token* end1, const Tok
     return isEqual;
 }
 
-void CheckClass::checkUselessOverride()
+void CheckClassImpl::checkUselessOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("uselessOverride"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("uselessOverride"))
         return;
 
     logChecker("CheckClass::checkUselessOverride"); // style
@@ -3318,9 +3458,14 @@ void CheckClass::checkUselessOverride()
 
                     if (isSameCode) {
                         // bailout for shadowed members
-                        if (!classScope->definedType ||
-                            !getDuplInheritedMembersRecursive(classScope->definedType, classScope->definedType, /*skipPrivate*/ false).empty() ||
-                            !getDuplInheritedMemberFunctionsRecursive(classScope->definedType, classScope->definedType, /*skipPrivate*/ false).empty())
+                        if (!getDuplInheritedMembersRecursive(classScope->definedType,
+                                                              classScope->definedType,
+                                                              /*skipPrivate*/ false)
+                            .empty() ||
+                            !getDuplInheritedMemberFunctionsRecursive(classScope->definedType,
+                                                                      classScope->definedType,
+                                                                      /*skipPrivate*/ false)
+                            .empty())
                             continue;
                         uselessOverrideError(baseFunc, &func, true);
                         continue;
@@ -3365,9 +3510,9 @@ static const Variable* getSingleReturnVar(const Scope* scope) {
     return tok->variable();
 }
 
-void CheckClass::checkReturnByReference()
+void CheckClassImpl::checkReturnByReference()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance) && !mSettings->isPremiumEnabled("returnByReference"))
+    if (!mSettings.severity.isEnabled(Severity::performance) && !mSettings.isPremiumEnabled("returnByReference"))
         return;
 
     logChecker("CheckClass::checkReturnByReference"); // performance
@@ -3382,7 +3527,7 @@ void CheckClass::checkReturnByReference()
                 continue;
             if (func.functionPointerUsage)
                 continue;
-            if (const Library::Container* container = mSettings->library.detectContainer(func.retDef))
+            if (const Library::Container* container = mSettings.library.detectContainer(func.retDef))
                 if (container->view)
                     continue;
             if (!func.isConst() && func.hasRvalRefQualifier())
@@ -3397,8 +3542,8 @@ void CheckClass::checkReturnByReference()
                 const bool isView = isContainer && var->valueType()->container->view;
                 bool warn = isContainer && !isView;
                 if (!warn && !isView) {
-                    const std::size_t size = ValueFlow::getSizeOf(*var->valueType(), *mSettings);
-                    if (size > 2 * mSettings->platform.sizeof_pointer)
+                    const std::size_t size = var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
+                    if (size > 2 * mSettings.platform.sizeof_pointer)
                         warn = true;
                 }
                 if (warn)
@@ -3408,16 +3553,16 @@ void CheckClass::checkReturnByReference()
     }
 }
 
-void CheckClass::returnByReferenceError(const Function* func, const Variable* var)
+void CheckClassImpl::returnByReferenceError(const Function* func, const Variable* var)
 {
     const Token* tok = func ? func->tokenDef : nullptr;
     const std::string message = "Function '" + (func ? func->name() : "func") + "()' should return member '" + (var ? var->name() : "var") + "' by const reference.";
     reportError(tok, Severity::performance, "returnByReference", message);
 }
 
-void CheckClass::checkThisUseAfterFree()
+void CheckClassImpl::checkThisUseAfterFree()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckClass::checkThisUseAfterFree"); // warning
@@ -3427,7 +3572,7 @@ void CheckClass::checkThisUseAfterFree()
         for (const Variable &var : classScope->varlist) {
             // Find possible "self pointer".. pointer/smartpointer member variable of "self" type.
             if (var.valueType() && var.valueType()->smartPointerType != classScope->definedType && var.valueType()->typeScope != classScope) {
-                const ValueType valueType = ValueType::parseDecl(var.typeStartToken(), *mSettings);
+                const ValueType valueType = ValueType::parseDecl(var.typeStartToken(), mSettings);
                 if (valueType.smartPointerType != classScope->definedType)
                     continue;
             }
@@ -3464,7 +3609,7 @@ void CheckClass::checkThisUseAfterFree()
     }
 }
 
-bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token *&freeToken)
+bool CheckClassImpl::checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token *&freeToken)
 {
     if (!func || !func->functionScope)
         return false;
@@ -3503,21 +3648,21 @@ bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const F
     return false;
 }
 
-void CheckClass::thisUseAfterFree(const Token *self, const Token *free, const Token *use)
+void CheckClassImpl::thisUseAfterFree(const Token *self, const Token *free, const Token *use)
 {
     std::string selfPointer = self ? self->str() : "ptr";
-    const ErrorPath errorPath = { ErrorPathItem(self, "Assuming '" + selfPointer + "' is used as 'this'"), ErrorPathItem(free, "Delete '" + selfPointer + "', invalidating 'this'"), ErrorPathItem(use, "Call method when 'this' is invalid") };
+    ErrorPath errorPath = { ErrorPathItem(self, "Assuming '" + selfPointer + "' is used as 'this'"), ErrorPathItem(free, "Delete '" + selfPointer + "', invalidating 'this'"), ErrorPathItem(use, "Call method when 'this' is invalid") };
     const std::string usestr = use ? use->str() : "x";
     const std::string usemsg = use && use->function() ? ("Calling method '" + usestr + "()'") : ("Using member '" + usestr + "'");
-    reportError(errorPath, Severity::warning, "thisUseAfterFree",
+    reportError(std::move(errorPath), Severity::warning, "thisUseAfterFree",
                 "$symbol:" + selfPointer + "\n" +
                 usemsg + " when 'this' might be invalid",
                 CWE(0), Certainty::normal);
 }
 
-void CheckClass::checkUnsafeClassRefMember()
+void CheckClassImpl::checkUnsafeClassRefMember()
 {
-    if (!mSettings->safeChecks.classes || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.safeChecks.classes || !mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckClass::checkUnsafeClassRefMember"); // warning,safeChecks
     for (const Scope * classScope : mSymbolDatabase->classAndStructScopes) {
@@ -3539,7 +3684,7 @@ void CheckClass::checkUnsafeClassRefMember()
     }
 }
 
-void CheckClass::unsafeClassRefMemberError(const Token *tok, const std::string &varname)
+void CheckClassImpl::unsafeClassRefMemberError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "unsafeClassRefMember",
                 "$symbol:" + varname + "\n"
@@ -3559,10 +3704,13 @@ namespace
     /* multifile checking; one definition rule violations */
     class MyFileInfo : public Check::FileInfo {
     public:
+        explicit MyFileInfo(std::string f0) : Check::FileInfo(std::move(f0)) {}
+
         using Check::FileInfo::FileInfo;
         struct NameLoc {
             std::string className;
             std::string fileName;
+            std::string configuration;
             int lineNumber;
             int column;
             std::size_t hash;
@@ -3582,6 +3730,7 @@ namespace
             for (const NameLoc &nameLoc: classDefinitions) {
                 ret += "<class name=\"" + ErrorLogger::toxml(nameLoc.className) +
                        "\" file=\"" + ErrorLogger::toxml(nameLoc.fileName) +
+                       "\" configuration=\"" + ErrorLogger::toxml(nameLoc.configuration) +
                        "\" line=\"" + std::to_string(nameLoc.lineNumber) +
                        "\" col=\"" + std::to_string(nameLoc.column) +
                        "\" hash=\"" + std::to_string(nameLoc.hash) +
@@ -3592,7 +3741,7 @@ namespace
     };
 }
 
-Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Settings& /*settings*/) const
+const Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Settings& /*settings*/, const std::string& currentConfig) const
 {
     if (!tokenizer.isCPP())
         return nullptr;
@@ -3649,6 +3798,7 @@ Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Setti
             }
         }
         nameLoc.hash = std::hash<std::string> {}(def);
+        nameLoc.configuration = currentConfig;
 
         classDefinitions.push_back(std::move(nameLoc));
     }
@@ -3661,21 +3811,23 @@ Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Setti
     return fileInfo;
 }
 
-Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
         if (std::strcmp(e->Name(), "class") != 0)
             continue;
         const char *name = e->Attribute("name");
         const char *file = e->Attribute("file");
+        const char *configuration = e->Attribute("configuration");
         const char *line = e->Attribute("line");
         const char *col = e->Attribute("col");
         const char *hash = e->Attribute("hash");
-        if (name && file && line && col && hash) {
+        if (name && file && configuration && line && col && hash) {
             MyFileInfo::NameLoc nameLoc;
             nameLoc.className = name;
             nameLoc.fileName = file;
+            nameLoc.configuration = configuration;
             nameLoc.lineNumber = strToInt<int>(line);
             nameLoc.column = strToInt<int>(col);
             nameLoc.hash = strToInt<std::size_t>(hash);
@@ -3689,12 +3841,12 @@ Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xm
     return fileInfo;
 }
 
-bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
     (void)ctu;
     (void)settings;
 
-    CheckClass dummy(nullptr, &settings, &errorLogger);
+    CheckClassImpl dummy(nullptr, settings, errorLogger);
     dummy.
     logChecker("CheckClass::analyseWholeProgram");
 
@@ -3717,6 +3869,8 @@ bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<C
             }
             if (it->second.hash == nameLoc.hash)
                 continue;
+            if (it->second.fileName == nameLoc.fileName && it->second.configuration != nameLoc.configuration)
+                continue;
             // Same location, sometimes the hash is different wrongly (possibly because of different token simplifications).
             if (it->second.isSameLocation(nameLoc))
                 continue;
@@ -3741,12 +3895,12 @@ bool CheckClass::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<C
     return foundErrors;
 }
 
-void CheckClass::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckClass::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (tokenizer.isC())
         return;
 
-    CheckClass checkClass(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckClassImpl checkClass(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // can't be a simplified check .. the 'sizeof' is used.
     checkClass.checkMemset();
@@ -3772,9 +3926,9 @@ void CheckClass::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkClass.checkUnsafeClassRefMember();
 }
 
-void CheckClass::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckClass::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckClass c(nullptr, settings, errorLogger);
+    CheckClassImpl c(nullptr, settings, errorLogger);
     c.noConstructorError(nullptr, "classname", false);
     c.noExplicitConstructorError(nullptr, "classname", false);
     //c.copyConstructorMallocError(nullptr, 0, "var");
@@ -3814,4 +3968,5 @@ void CheckClass::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.virtualFunctionCallInConstructorError(nullptr, std::list<const Token *>(), "f");
     c.thisUseAfterFree(nullptr, nullptr, nullptr);
     c.unsafeClassRefMemberError(nullptr, "UnsafeClass::var");
+    // TODO: ctuOneDefinitionRuleViolation
 }
diff --git a/lib/checkclass.h b/lib/checkclass.h
index f59594b20ca..2573d99f2f5 100644
--- a/lib/checkclass.h
+++ b/lib/checkclass.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <cstdint>
@@ -48,23 +49,57 @@ enum class FunctionType : std::uint8_t;
 
 /** @brief %Check classes. Uninitialized member variables, non-conforming operators, missing virtual destructor, etc */
 class CPPCHECKLIB CheckClass : public Check {
-    friend class TestClass;
-    friend class TestConstructors;
-    friend class TestUnusedPrivateFunction;
-
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckClass() : Check(myName()) {}
+    CheckClass() : Check("Class") {}
 
-    /** @brief Set of the STL types whose operator[] is not const */
-    static const std::set<std::string> stl_containers_not_const;
+    /** @brief Run checks on the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** @brief Parse current TU and extract file info */
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings& /*settings*/, const std::string& currentConfig) const override;
 
-private:
-    /** @brief This constructor is used when running checks. */
-    CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger);
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
 
-    /** @brief Run checks on the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    /** @brief Analyse all file infos for all TU */
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check the code for each class.\n"
+               "- Missing constructors and copy constructors\n"
+               //"- Missing allocation of memory in copy constructor\n"
+               "- Constructors which should be explicit\n"
+               "- Are all variables initialized by the constructors?\n"
+               "- Are all variables assigned by 'operator='?\n"
+               "- Warn if memset, memcpy etc are used on a class\n"
+               "- Warn if memory for classes is allocated with malloc()\n"
+               "- If it's a base class, check that the destructor is virtual\n"
+               "- Are there unused private functions?\n"
+               "- 'operator=' should check for assignment to self\n"
+               "- Constness for member functions\n"
+               "- Order of initializations\n"
+               "- Suggest usage of initialization list\n"
+               "- Initialization of a member with itself\n"
+               "- Suspicious subtraction from 'this'\n"
+               "- Call of pure virtual function in constructor/destructor\n"
+               "- Duplicated inherited data members\n"
+               // disabled for now "- If 'copy constructor' defined, 'operator=' also should be defined and vice versa\n"
+               "- Check that arbitrary usage of public interface does not result in division by zero\n"
+               "- Delete \"self pointer\" and then access 'this'\n"
+               "- Check that the 'override' keyword is used when overriding virtual functions\n"
+               "- Check that the 'one definition rule' is not violated\n";
+    }
+};
+
+class CPPCHECKLIB CheckClassImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckClassImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger);
+
+    /** @brief Set of the STL types whose operator[] is not const */
+    static const std::set<std::string> stl_containers_not_const;
 
     /** @brief %Check that all class constructors are ok */
     void constructors();
@@ -125,7 +160,7 @@ class CPPCHECKLIB CheckClass : public Check {
     /** @brief Check that the override keyword is used when overriding virtual functions */
     void checkOverride();
 
-    /** @brief Check that the overriden function is not identical to the base function */
+    /** @brief Check that the overridden function is not identical to the base function */
     void checkUselessOverride();
 
     /** @brief Check that large members are returned by reference from getter function */
@@ -137,14 +172,6 @@ class CPPCHECKLIB CheckClass : public Check {
     /** @brief Unsafe class check - const reference member */
     void checkUnsafeClassRefMember();
 
-    /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings) const override;
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-
-    /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
-
     const SymbolDatabase* mSymbolDatabase{};
 
     // Reporting errors..
@@ -155,7 +182,7 @@ class CPPCHECKLIB CheckClass : public Check {
     void noCopyConstructorError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive);
     void noOperatorEqError(const Scope *scope, bool isdefault, const Token *alloc, bool inconclusive);
     void noDestructorError(const Scope *scope, bool isdefault, const Token *alloc);
-    void uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive);
+    void uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive, bool noCtor = false);
     void uninitVarError(const Token *tok, const std::string &classname, const std::string &varname);
     void missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname);
     void operatorEqVarError(const Token *tok, const std::string &classname, const std::string &varname, bool inconclusive);
@@ -187,38 +214,6 @@ class CPPCHECKLIB CheckClass : public Check {
     void unsafeClassRefMemberError(const Token *tok, const std::string &varname);
     void checkDuplInheritedMembersRecursive(const Type* typeCurrent, const Type* typeBase);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Class";
-    }
-
-    std::string classInfo() const override {
-        return "Check the code for each class.\n"
-               "- Missing constructors and copy constructors\n"
-               //"- Missing allocation of memory in copy constructor\n"
-               "- Constructors which should be explicit\n"
-               "- Are all variables initialized by the constructors?\n"
-               "- Are all variables assigned by 'operator='?\n"
-               "- Warn if memset, memcpy etc are used on a class\n"
-               "- Warn if memory for classes is allocated with malloc()\n"
-               "- If it's a base class, check that the destructor is virtual\n"
-               "- Are there unused private functions?\n"
-               "- 'operator=' should check for assignment to self\n"
-               "- Constness for member functions\n"
-               "- Order of initializations\n"
-               "- Suggest usage of initialization list\n"
-               "- Initialization of a member with itself\n"
-               "- Suspicious subtraction from 'this'\n"
-               "- Call of pure virtual function in constructor/destructor\n"
-               "- Duplicated inherited data members\n"
-               // disabled for now "- If 'copy constructor' defined, 'operator=' also should be defined and vice versa\n"
-               "- Check that arbitrary usage of public interface does not result in division by zero\n"
-               "- Delete \"self pointer\" and then access 'this'\n"
-               "- Check that the 'override' keyword is used when overriding virtual functions\n"
-               "- Check that the 'one definition rule' is not violated\n";
-    }
-
     // operatorEqRetRefThis helper functions
     void checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last);
     void checkReturnPtrThis(const Scope *scope, const Function *func, const Token *tok, const Token *last, std::set<const Function*>& analyzedFunctions);
@@ -228,7 +223,7 @@ class CPPCHECKLIB CheckClass : public Check {
     bool hasAllocation(const Function *func, const Scope* scope, const Token *start, const Token *end) const;
     bool hasAllocationInIfScope(const Function *func, const Scope* scope, const Token *ifStatementScopeStart) const;
     static bool hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart);
-    enum class Bool : std::uint8_t { TRUE, FALSE, BAILOUT };
+    enum class Bool : std::uint8_t { True, False, Bailout };
     static Bool isInverted(const Token *tok, const Token *rhs);
     static const Token * getIfStmtBodyStart(const Token *tok, const Token *rhs);
 
@@ -254,6 +249,10 @@ class CPPCHECKLIB CheckClass : public Check {
         bool init{};
     };
 
+    static void handleUnionMembers(std::vector<Usage>& usageList);
+
+    bool isInitialized(const Usage& usage, FunctionType funcType) const;
+
     static bool isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope);
 
     /**
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index f6c5d023567..4776cbea38f 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -52,12 +52,7 @@ static const CWE CWE571(571U);   // Expression is Always True
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckCondition instance;
-}
-
-bool CheckCondition::diag(const Token* tok, bool insert)
+bool CheckConditionImpl::diag(const Token* tok, bool insert)
 {
     if (!tok)
         return false;
@@ -78,7 +73,14 @@ bool CheckCondition::diag(const Token* tok, bool insert)
     return true;
 }
 
-bool CheckCondition::isAliased(const std::set<int> &vars) const
+bool CheckConditionImpl::diag(const Token* tok1, const Token* tok2)
+{
+    const bool b1 = diag(tok1);
+    const bool b2 = diag(tok2);
+    return b1 && b2;
+}
+
+bool CheckConditionImpl::isAliased(const std::set<int> &vars) const
 {
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::Match(tok, "= & %var% ;") && vars.find(tok->tokAt(2)->varId()) != vars.end())
@@ -87,9 +89,9 @@ bool CheckCondition::isAliased(const std::set<int> &vars) const
     return false;
 }
 
-void CheckCondition::assignIf()
+void CheckConditionImpl::assignIf()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignIfError"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("assignIfError"))
         return;
 
     logChecker("CheckCondition::assignIf"); // style
@@ -160,12 +162,12 @@ static bool isParameterChanged(const Token *partok)
 }
 
 /** parse scopes recursively */
-bool CheckCondition::assignIfParseScope(const Token * const assignTok,
-                                        const Token * const startTok,
-                                        const nonneg int varid,
-                                        const bool islocal,
-                                        const char bitop,
-                                        const MathLib::bigint num)
+bool CheckConditionImpl::assignIfParseScope(const Token * const assignTok,
+                                            const Token * const startTok,
+                                            const nonneg int varid,
+                                            const bool islocal,
+                                            const char bitop,
+                                            const MathLib::bigint num)
 {
     bool ret = false;
 
@@ -202,7 +204,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
                 // is variable changed in loop?
                 const Token *bodyStart = tok2->linkAt(1)->next();
                 const Token *bodyEnd   = bodyStart ? bodyStart->link() : nullptr;
-                if (!bodyEnd || bodyEnd->str() != "}" || isVariableChanged(bodyStart, bodyEnd, varid, !islocal, *mSettings))
+                if (!bodyEnd || bodyEnd->str() != "}" || isVariableChanged(bodyStart, bodyEnd, varid, !islocal, mSettings))
                     continue;
             }
 
@@ -238,7 +240,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
     return false;
 }
 
-void CheckCondition::assignIfError(const Token *tok1, const Token *tok2, const std::string &condition, bool result)
+void CheckConditionImpl::assignIfError(const Token *tok1, const Token *tok2, const std::string &condition, bool result)
 {
     if (tok2 && diag(tok2->tokAt(2)))
         return;
@@ -250,7 +252,7 @@ void CheckCondition::assignIfError(const Token *tok1, const Token *tok2, const s
 }
 
 
-void CheckCondition::mismatchingBitAndError(const Token *tok1, const MathLib::bigint num1, const Token *tok2, const MathLib::bigint num2)
+void CheckConditionImpl::mismatchingBitAndError(const Token *tok1, const MathLib::bigint num1, const Token *tok2, const MathLib::bigint num2)
 {
     std::list<const Token *> locations = { tok1, tok2 };
 
@@ -306,9 +308,9 @@ static bool isOperandExpanded(const Token *tok)
     return false;
 }
 
-void CheckCondition::checkBadBitmaskCheck()
+void CheckConditionImpl::checkBadBitmaskCheck()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("badBitmaskCheck"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("badBitmaskCheck"))
         return;
 
     logChecker("CheckCondition::checkBadBitmaskCheck"); // style
@@ -346,7 +348,7 @@ void CheckCondition::checkBadBitmaskCheck()
     }
 }
 
-void CheckCondition::badBitmaskCheckError(const Token *tok, bool isNoOp)
+void CheckConditionImpl::badBitmaskCheckError(const Token *tok, bool isNoOp)
 {
     if (isNoOp)
         reportError(tok, Severity::style, "badBitmaskCheck", "Operator '|' with one operand equal to zero is redundant.", CWE571, Certainty::normal);
@@ -354,9 +356,9 @@ void CheckCondition::badBitmaskCheckError(const Token *tok, bool isNoOp)
         reportError(tok, Severity::warning, "badBitmaskCheck", "Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?", CWE571, Certainty::normal);
 }
 
-void CheckCondition::comparison()
+void CheckConditionImpl::comparison()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("comparisonError"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("comparisonError"))
         return;
 
     logChecker("CheckCondition::comparison"); // style
@@ -419,7 +421,7 @@ void CheckCondition::comparison()
     }
 }
 
-void CheckCondition::comparisonError(const Token *tok, const std::string &bitop, MathLib::bigint value1, const std::string &op, MathLib::bigint value2, bool result)
+void CheckConditionImpl::comparisonError(const Token *tok, const std::string &bitop, MathLib::bigint value1, const std::string &op, MathLib::bigint value2, bool result)
 {
     std::ostringstream expression;
     expression << std::hex << "(X " << bitop << " 0x" << value1 << ") " << op << " 0x" << value2;
@@ -433,13 +435,13 @@ void CheckCondition::comparisonError(const Token *tok, const std::string &bitop,
     reportError(tok, Severity::style, "comparisonError", errmsg, CWE398, Certainty::normal);
 }
 
-bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token * const cond2, bool pure) const
+bool CheckConditionImpl::isOverlappingCond(const Token * const cond1, const Token * const cond2, bool pure) const
 {
     if (!cond1 || !cond2)
         return false;
 
     // same expressions
-    if (isSameExpression(true, cond1, cond2, *mSettings, pure, false))
+    if (isSameExpression(true, cond1, cond2, mSettings, pure, false))
         return true;
 
     // bitwise overlap for example 'x&7' and 'x==1'
@@ -453,7 +455,7 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
         if (!num1->isNumber() || MathLib::isNegative(num1->str()))
             return false;
 
-        if (!Token::Match(cond2, "&|==") || !cond2->astOperand1() || !cond2->astOperand2())
+        if (!Token::Match(cond2, "&|==") || !cond2->astOperand1())
             return false;
         const Token *expr2 = cond2->astOperand1();
         const Token *num2  = cond2->astOperand2();
@@ -462,7 +464,7 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
         if (!num2->isNumber() || MathLib::isNegative(num2->str()))
             return false;
 
-        if (!isSameExpression(true, expr1, expr2, *mSettings, pure, false))
+        if (!isSameExpression(true, expr1, expr2, mSettings, pure, false))
             return false;
 
         const MathLib::bigint value1 = MathLib::toBigNumber(num1);
@@ -474,9 +476,9 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
     return false;
 }
 
-void CheckCondition::duplicateCondition()
+void CheckConditionImpl::duplicateCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("duplicateCondition"))
         return;
 
     logChecker("CheckCondition::duplicateCondition"); // style
@@ -507,27 +509,27 @@ void CheckCondition::duplicateCondition()
             continue;
 
         ErrorPath errorPath;
-        if (!findExpressionChanged(cond1, scope.classDef->next(), cond2, *mSettings) &&
-            isSameExpression(true, cond1, cond2, *mSettings, true, true, &errorPath))
+        if (!findExpressionChanged(cond1, scope.classDef->next(), cond2, mSettings) &&
+            isSameExpression(true, cond1, cond2, mSettings, true, true, &errorPath))
             duplicateConditionError(cond1, cond2, std::move(errorPath));
     }
 }
 
-void CheckCondition::duplicateConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath)
+void CheckConditionImpl::duplicateConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath)
 {
-    if (diag(tok1) & diag(tok2))
+    if (diag(tok1, tok2))
         return;
     errorPath.emplace_back(tok1, "First condition");
     errorPath.emplace_back(tok2, "Second condition");
 
     std::string msg = "The if condition is the same as the previous if condition";
 
-    reportError(errorPath, Severity::style, "duplicateCondition", msg, CWE398, Certainty::normal);
+    reportError(std::move(errorPath), Severity::style, "duplicateCondition", msg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::multiCondition()
+void CheckConditionImpl::multiCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("multiCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("multiCondition"))
         return;
 
     logChecker("CheckCondition::multiCondition"); // style
@@ -557,18 +559,18 @@ void CheckCondition::multiCondition()
             if (tok2->astOperand2()) {
                 ErrorPath errorPath;
                 if (isOverlappingCond(cond1, tok2->astOperand2(), true) &&
-                    !findExpressionChanged(cond1, cond1, tok2->astOperand2(), *mSettings))
+                    !findExpressionChanged(cond1, cond1, tok2->astOperand2(), mSettings))
                     overlappingElseIfConditionError(tok2->astOperand2(), cond1->linenr());
                 else if (isOppositeCond(
-                             true, cond1, tok2->astOperand2(), *mSettings, true, true, &errorPath) &&
-                         !findExpressionChanged(cond1, cond1, tok2->astOperand2(), *mSettings))
+                             true, cond1, tok2->astOperand2(), mSettings, true, true, &errorPath) &&
+                         !findExpressionChanged(cond1, cond1, tok2->astOperand2(), mSettings))
                     oppositeElseIfConditionError(cond1, tok2->astOperand2(), std::move(errorPath));
             }
         }
     }
 }
 
-void CheckCondition::overlappingElseIfConditionError(const Token *tok, nonneg int line1)
+void CheckConditionImpl::overlappingElseIfConditionError(const Token *tok, nonneg int line1)
 {
     if (diag(tok))
         return;
@@ -579,9 +581,9 @@ void CheckCondition::overlappingElseIfConditionError(const Token *tok, nonneg in
     reportError(tok, Severity::style, "multiCondition", errmsg.str(), CWE398, Certainty::normal);
 }
 
-void CheckCondition::oppositeElseIfConditionError(const Token *ifCond, const Token *elseIfCond, ErrorPath errorPath)
+void CheckConditionImpl::oppositeElseIfConditionError(const Token *ifCond, const Token *elseIfCond, ErrorPath errorPath)
 {
-    if (diag(ifCond) & diag(elseIfCond))
+    if (diag(ifCond, elseIfCond))
         return;
     std::ostringstream errmsg;
     errmsg << "Expression is always true because 'else if' condition is opposite to previous condition at line "
@@ -590,12 +592,12 @@ void CheckCondition::oppositeElseIfConditionError(const Token *ifCond, const Tok
     errorPath.emplace_back(ifCond, "first condition");
     errorPath.emplace_back(elseIfCond, "else if condition is opposite to first condition");
 
-    reportError(errorPath, Severity::style, "multiCondition", errmsg.str(), CWE398, Certainty::normal);
+    reportError(std::move(errorPath), Severity::style, "multiCondition", errmsg.str(), CWE398, Certainty::normal);
 }
 
 //---------------------------------------------------------------------------
 // - Opposite inner conditions => always false
-// - (TODO) Same/Overlapping inner condition => always true
+// - Same/Overlapping inner condition => always true
 // - same condition after early exit => always false
 //---------------------------------------------------------------------------
 
@@ -612,6 +614,8 @@ static bool isNonConstFunctionCall(const Token *ftok, const Library &library)
         return false;
     if (ftok->function() && ftok->function()->isConst())
         return false;
+    if (ftok->isControlFlowKeyword())
+        return false;
     return true;
 }
 
@@ -625,11 +629,11 @@ static bool isNestedInLambda(const Scope* inner, const Scope* outer)
     return false;
 }
 
-void CheckCondition::multiCondition2()
+void CheckConditionImpl::multiCondition2()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) &&
-        !mSettings->isPremiumEnabled("identicalConditionAfterEarlyExit") &&
-        !mSettings->isPremiumEnabled("identicalInnerCondition"))
+    if (!mSettings.severity.isEnabled(Severity::warning) &&
+        !mSettings.isPremiumEnabled("identicalConditionAfterEarlyExit") &&
+        !mSettings.isPremiumEnabled("identicalInnerCondition"))
         return;
 
     logChecker("CheckCondition::multiCondition2"); // warning
@@ -664,7 +668,7 @@ void CheckCondition::multiCondition2()
                       [&](const Token *cond) {
             if (Token::Match(cond, "%name% (")) {
                 functionCall = true;
-                nonConstFunctionCall = isNonConstFunctionCall(cond, mSettings->library);
+                nonConstFunctionCall = isNonConstFunctionCall(cond, mSettings.library);
                 if (nonConstFunctionCall)
                     return ChildrenToVisit::done;
             }
@@ -675,7 +679,7 @@ void CheckCondition::multiCondition2()
                 if (!nonlocal && var) {
                     if (!(var->isLocal() || var->isArgument()))
                         nonlocal = true;
-                    else if ((var->isPointer() || var->isReference()) && !Token::Match(cond->astParent(), "%oror%|&&|!"))
+                    else if ((var->isPointer() || var->isReference() || var->isArray()) && !Token::Match(cond->astParent(), "%oror%|&&|!"))
                         // TODO: if var is pointer check what it points at
                         nonlocal = true;
                 }
@@ -721,18 +725,18 @@ void CheckCondition::multiCondition2()
             for (; tok && tok != endToken; tok = tok->next()) {
                 if (isNestedInLambda(tok->scope(), cond1->scope()))
                     continue;
-                if (isExpressionChangedAt(cond1, tok, 0, false, *mSettings))
+                if (isExpressionChangedAt(cond1, tok, 0, false, mSettings))
                     break;
                 if (Token::Match(tok, "if|return")) {
                     const Token * condStartToken = tok->str() == "if" ? tok->next() : tok;
                     const Token * condEndToken = tok->str() == "if" ? condStartToken->link() : Token::findsimplematch(condStartToken, ";");
                     // Does condition modify tracked variables?
-                    if (findExpressionChanged(cond1, condStartToken, condEndToken, *mSettings))
+                    if (findExpressionChanged(cond1, condStartToken, condEndToken, mSettings))
                         break;
 
                     // Condition..
                     const Token *cond2 = tok->str() == "if" ? condStartToken->astOperand2() : condStartToken->astOperand1();
-                    const bool isReturnVar = (tok->str() == "return" && (!Token::Match(cond2, "%cop%") || (cond2 && cond2->isUnaryOp("!"))));
+                    const bool isReturnVar = (tok->str() == "return" && (!Token::Match(cond2, "%cop%") || cond2->isUnaryOp("!") || cond2->isUnaryOp("*")));
 
                     ErrorPath errorPath;
 
@@ -741,15 +745,17 @@ void CheckCondition::multiCondition2()
                             if (!firstCondition)
                                 return ChildrenToVisit::none;
                             if (firstCondition->str() == "&&") {
-                                if (!isOppositeCond(false, firstCondition, cond2, *mSettings, true, true))
+                                if (!isOppositeCond(false, firstCondition, cond2, mSettings, true, true))
                                     return ChildrenToVisit::op1_and_op2;
                             }
                             if (!firstCondition->hasKnownIntValue()) {
-                                if (!isReturnVar && isOppositeCond(false, firstCondition, cond2, *mSettings, true, true, &errorPath)) {
+                                if (!isReturnVar && isOppositeCond(false, firstCondition, cond2, mSettings, true, true, &errorPath)) {
                                     if (!isAliased(vars))
                                         oppositeInnerConditionError(firstCondition, cond2, errorPath);
-                                } else if (!isReturnVar && isSameExpression(true, firstCondition, cond2, *mSettings, true, true, &errorPath)) {
+                                } else if (!isReturnVar && isSameExpression(true, firstCondition, cond2, mSettings, true, true, &errorPath)) {
                                     identicalInnerConditionError(firstCondition, cond2, errorPath);
+                                } else if (!isReturnVar && isOverlappingCond(cond2, firstCondition, true)) {
+                                    overlappingInnerConditionError(firstCondition, cond2, errorPath);
                                 }
                             }
                             return ChildrenToVisit::none;
@@ -760,7 +766,7 @@ void CheckCondition::multiCondition2()
                                 return ChildrenToVisit::op1_and_op2;
 
                             if ((!cond1->hasKnownIntValue() || !secondCondition->hasKnownIntValue()) &&
-                                isSameExpression(true, cond1, secondCondition, *mSettings, true, true, &errorPath)) {
+                                isSameExpression(true, cond1, secondCondition, mSettings, true, true, &errorPath)) {
                                 if (!isAliased(vars) && !mTokenizer->hasIfdef(cond1, secondCondition)) {
                                     identicalConditionAfterEarlyExitError(cond1, secondCondition, errorPath);
                                     return ChildrenToVisit::done;
@@ -771,10 +777,10 @@ void CheckCondition::multiCondition2()
                     }
                 }
                 if (Token::Match(tok, "%name% (") &&
-                    isVariablesChanged(tok, tok->linkAt(1), 0, varsInCond, *mSettings)) {
+                    isVariablesChanged(tok, tok->linkAt(1), 0, varsInCond, mSettings)) {
                     break;
                 }
-                if (Token::Match(tok, "%type% (") && nonlocal && isNonConstFunctionCall(tok, mSettings->library)) // non const function call -> bailout if there are nonlocal variables
+                if (Token::Match(tok, "%type% (") && nonlocal && isNonConstFunctionCall(tok, mSettings.library)) // non const function call -> bailout if there are nonlocal variables
                     break;
                 if (Token::Match(tok, "case|break|continue|return|throw") && tok->scope() == endToken->scope())
                     break;
@@ -800,7 +806,7 @@ void CheckCondition::multiCondition2()
                         break;
                     }
                     const bool changed = std::any_of(vars.cbegin(), vars.cend(), [&](int varid) {
-                        return isVariableChanged(tok1, tok2, varid, nonlocal, *mSettings);
+                        return isVariableChanged(tok1, tok2, varid, nonlocal, mSettings);
                     });
                     if (changed)
                         break;
@@ -855,9 +861,9 @@ static std::string innerSmtString(const Token * tok)
     return top->str();
 }
 
-void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
+void CheckConditionImpl::oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
 {
-    if (diag(tok1) & diag(tok2))
+    if (diag(tok1, tok2))
         return;
     const std::string s1(tok1 ? tok1->expressionString() : "x");
     const std::string s2(tok2 ? tok2->expressionString() : "!x");
@@ -867,12 +873,27 @@ void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token*
 
     const std::string msg("Opposite inner '" + innerSmt + "' condition leads to a dead code block.\n"
                           "Opposite inner '" + innerSmt + "' condition leads to a dead code block (outer condition is '" + s1 + "' and inner condition is '" + s2 + "').");
-    reportError(errorPath, Severity::warning, "oppositeInnerCondition", msg, CWE398, Certainty::normal);
+    reportError(std::move(errorPath), Severity::warning, "oppositeInnerCondition", msg, CWE398, Certainty::normal);
+}
+
+void CheckConditionImpl::overlappingInnerConditionError(const Token *tok1,  const Token* tok2, ErrorPath errorPath)
+{
+    if (diag(tok1, tok2))
+        return;
+    const std::string s1(tok1 ? tok1->expressionString() : "x");
+    const std::string s2(tok2 ? tok2->expressionString() : "x");
+    const std::string innerSmt = innerSmtString(tok2);
+    errorPath.emplace_back(tok1, "outer condition: " + s1);
+    errorPath.emplace_back(tok2, "overlapping inner condition: " + s2);
+
+    const std::string msg("Overlapping inner '" + innerSmt + "' condition is always true.\n"
+                          "Overlapping inner '" + innerSmt + "' condition is always true (outer condition is '" + s1 + "' and inner condition is '" + s2 + "').");
+    reportError(std::move(errorPath), Severity::warning, "overlappingInnerCondition", msg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::identicalInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
+void CheckConditionImpl::identicalInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
 {
-    if (diag(tok1) & diag(tok2))
+    if (diag(tok1, tok2))
         return;
     const std::string s1(tok1 ? tok1->expressionString() : "x");
     const std::string s2(tok2 ? tok2->expressionString() : "x");
@@ -882,12 +903,12 @@ void CheckCondition::identicalInnerConditionError(const Token *tok1, const Token
 
     const std::string msg("Identical inner '" + innerSmt + "' condition is always true.\n"
                           "Identical inner '" + innerSmt + "' condition is always true (outer condition is '" + s1 + "' and inner condition is '" + s2 + "').");
-    reportError(errorPath, Severity::warning, "identicalInnerCondition", msg, CWE398, Certainty::normal);
+    reportError(std::move(errorPath), Severity::warning, "identicalInnerCondition", msg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::identicalConditionAfterEarlyExitError(const Token *cond1, const Token* cond2, ErrorPath errorPath)
+void CheckConditionImpl::identicalConditionAfterEarlyExitError(const Token *cond1, const Token* cond2, ErrorPath errorPath)
 {
-    if (diag(cond1) & diag(cond2))
+    if (diag(cond1, cond2))
         return;
 
     const bool isReturnValue = cond2 && Token::simpleMatch(cond2->astParent(), "return");
@@ -898,7 +919,7 @@ void CheckCondition::identicalConditionAfterEarlyExitError(const Token *cond1, c
     errorPath.emplace_back(cond1, "If condition '" + cond + "' is true, the function will return/exit");
     errorPath.emplace_back(cond2, (isReturnValue ? "Returning identical expression '" : "Testing identical condition '") + cond + "'");
 
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 Severity::warning,
                 "identicalConditionAfterEarlyExit",
                 isReturnValue
@@ -1052,7 +1073,7 @@ static bool parseComparison(const Token *comp, bool &not1, std::string &op, std:
 {
     not1 = false;
     while (comp && comp->str() == "!") {
-        not1 = !(not1);
+        not1 = !not1;
         comp = comp->astOperand1();
     }
 
@@ -1089,7 +1110,7 @@ static bool parseComparison(const Token *comp, bool &not1, std::string &op, std:
         expr = comp;
     }
 
-    inconclusive = inconclusive || ((value)[0] == '\'' && !(op == "!=" || op == "=="));
+    inconclusive = inconclusive || (value[0] == '\'' && !(op == "!=" || op == "=="));
 
     // Only float and int values are currently handled
     return MathLib::isInt(value) || MathLib::isFloat(value) || (value[0] == '\'');
@@ -1135,13 +1156,13 @@ static bool isIfConstexpr(const Token* tok) {
     return Token::simpleMatch(top->astOperand1(), "if") && top->astOperand1()->isConstexpr();
 }
 
-void CheckCondition::checkIncorrectLogicOperator()
+void CheckConditionImpl::checkIncorrectLogicOperator()
 {
-    const bool printStyle = mSettings->severity.isEnabled(Severity::style);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printWarning && !printStyle && !mSettings->isPremiumEnabled("incorrectLogicOperator"))
+    const bool printStyle = mSettings.severity.isEnabled(Severity::style);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    if (!printWarning && !printStyle && !mSettings.isPremiumEnabled("incorrectLogicOperator"))
         return;
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
 
     logChecker("CheckCondition::checkIncorrectLogicOperator"); // style,warning
 
@@ -1161,7 +1182,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                 ((tok->str() == "||" && tok->astOperand2()->str() == "&&") ||
                  (tok->str() == "&&" && tok->astOperand2()->str() == "||"))) {
                 const Token* tok2 = tok->astOperand2()->astOperand1();
-                if (isOppositeCond(true, tok->astOperand1(), tok2, *mSettings, true, false)) {
+                if (isOppositeCond(true, tok->astOperand1(), tok2, mSettings, true, false)) {
                     std::string expr1(tok->astOperand1()->expressionString());
                     std::string expr2(tok->astOperand2()->astOperand1()->expressionString());
                     std::string expr3(tok->astOperand2()->astOperand2()->expressionString());
@@ -1193,7 +1214,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                     redundantConditionError(tok, msg, false);
                     continue;
                 }
-                if (isSameExpression(false, tok->astOperand1(), tok2, *mSettings, true, true)) {
+                if (isSameExpression(false, tok->astOperand1(), tok2, mSettings, true, true)) {
                     std::string expr1(tok->astOperand1()->expressionString());
                     std::string expr2(tok->astOperand2()->astOperand1()->expressionString());
                     std::string expr3(tok->astOperand2()->astOperand2()->expressionString());
@@ -1258,7 +1279,7 @@ void CheckCondition::checkIncorrectLogicOperator()
 
             // Opposite comparisons around || or && => always true or always false
             const bool isLogicalOr(tok->str() == "||");
-            if (!isfloat && isOppositeCond(isLogicalOr, tok->astOperand1(), tok->astOperand2(), *mSettings, true, true, &errorPath)) {
+            if (!isfloat && isOppositeCond(isLogicalOr, tok->astOperand1(), tok->astOperand2(), mSettings, true, true, &errorPath)) {
                 if (!isIfConstexpr(tok)) {
                     const bool alwaysTrue(isLogicalOr);
                     incorrectLogicOperatorError(tok, conditionString(tok), alwaysTrue, inconclusive, std::move(errorPath));
@@ -1269,9 +1290,9 @@ void CheckCondition::checkIncorrectLogicOperator()
             if (!parseable)
                 continue;
 
-            if (isSameExpression(true, comp1, comp2, *mSettings, true, true))
+            if (isSameExpression(true, comp1, comp2, mSettings, true, true))
                 continue; // same expressions => only report that there are same expressions
-            if (!isSameExpression(true, expr1, expr2, *mSettings, true, true))
+            if (!isSameExpression(true, expr1, expr2, mSettings, true, true))
                 continue;
 
 
@@ -1281,13 +1302,13 @@ void CheckCondition::checkIncorrectLogicOperator()
                 continue;
 
             // the expr are not the token of the value but they provide better context
-            const double d1 = (isfloat) ? MathLib::toDoubleNumber(value1) : 0;
-            const double d2 = (isfloat) ? MathLib::toDoubleNumber(value2) : 0;
-            const MathLib::bigint i1 = (isfloat) ? 0 : MathLib::toBigNumber(value1, expr1);
-            const MathLib::bigint i2 = (isfloat) ? 0 : MathLib::toBigNumber(value2, expr2);
+            const double d1 = isfloat ? MathLib::toDoubleNumber(value1) : 0;
+            const double d2 = isfloat ? MathLib::toDoubleNumber(value2) : 0;
+            const MathLib::bigint i1 = isfloat ? 0 : MathLib::toBigNumber(value1, expr1);
+            const MathLib::bigint i2 = isfloat ? 0 : MathLib::toBigNumber(value2, expr2);
             const bool useUnsignedInt = (std::numeric_limits<MathLib::bigint>::max()==i1) || (std::numeric_limits<MathLib::bigint>::max()==i2);
-            const MathLib::biguint u1 = (useUnsignedInt) ? MathLib::toBigUNumber(value1, expr1) : 0;
-            const MathLib::biguint u2 = (useUnsignedInt) ? MathLib::toBigUNumber(value2, expr2) : 0;
+            const MathLib::biguint u1 = useUnsignedInt ? MathLib::toBigUNumber(value1, expr1) : 0;
+            const MathLib::biguint u2 = useUnsignedInt ? MathLib::toBigUNumber(value2, expr2) : 0;
             // evaluate if expression is always true/false
             bool alwaysTrue = true, alwaysFalse = true;
             bool firstTrue = true, secondTrue = true;
@@ -1334,7 +1355,6 @@ void CheckCondition::checkIncorrectLogicOperator()
                 const std::string text = cond1str + " " + tok->str() + " " + cond2str;
                 incorrectLogicOperatorError(tok, text, alwaysTrue, inconclusive, std::move(errorPath));
             } else if (printStyle && (firstTrue || secondTrue)) {
-                // cppcheck-suppress accessMoved - TODO: FP - see #12174
                 const int which = isfloat ? sufficientCondition(std::move(op1), not1, d1, std::move(op2), not2, d2, isAnd) : sufficientCondition(std::move(op1), not1, i1, std::move(op2), not2, i2, isAnd);
                 std::string text;
                 if (which != 0) {
@@ -1347,24 +1367,24 @@ void CheckCondition::checkIncorrectLogicOperator()
     }
 }
 
-void CheckCondition::incorrectLogicOperatorError(const Token *tok, const std::string &condition, bool always, bool inconclusive, ErrorPath errors)
+void CheckConditionImpl::incorrectLogicOperatorError(const Token *tok, const std::string &condition, bool always, bool inconclusive, ErrorPath errors)
 {
     if (diag(tok))
         return;
     errors.emplace_back(tok, "");
     if (always)
-        reportError(errors, Severity::warning, "incorrectLogicOperator",
+        reportError(std::move(errors), Severity::warning, "incorrectLogicOperator",
                     "Logical disjunction always evaluates to true: " + condition + ".\n"
                     "Logical disjunction always evaluates to true: " + condition + ". "
                     "Are these conditions necessary? Did you intend to use && instead? Are the numbers correct? Are you comparing the correct variables?", CWE571, inconclusive ? Certainty::inconclusive : Certainty::normal);
     else
-        reportError(errors, Severity::warning, "incorrectLogicOperator",
+        reportError(std::move(errors), Severity::warning, "incorrectLogicOperator",
                     "Logical conjunction always evaluates to false: " + condition + ".\n"
                     "Logical conjunction always evaluates to false: " + condition + ". "
                     "Are these conditions necessary? Did you intend to use || instead? Are the numbers correct? Are you comparing the correct variables?", CWE570, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckCondition::redundantConditionError(const Token *tok, const std::string &text, bool inconclusive)
+void CheckConditionImpl::redundantConditionError(const Token *tok, const std::string &text, bool inconclusive)
 {
     if (diag(tok))
         return;
@@ -1374,9 +1394,9 @@ void CheckCondition::redundantConditionError(const Token *tok, const std::string
 //-----------------------------------------------------------------------------
 // Detect "(var % val1) > val2" where val2 is >= val1.
 //-----------------------------------------------------------------------------
-void CheckCondition::checkModuloAlwaysTrueFalse()
+void CheckConditionImpl::checkModuloAlwaysTrueFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckCondition::checkModuloAlwaysTrueFalse"); // warning
@@ -1404,7 +1424,7 @@ void CheckCondition::checkModuloAlwaysTrueFalse()
     }
 }
 
-void CheckCondition::moduloAlwaysTrueFalseError(const Token* tok, const std::string& maxVal)
+void CheckConditionImpl::moduloAlwaysTrueFalseError(const Token* tok, const std::string& maxVal)
 {
     if (diag(tok))
         return;
@@ -1430,9 +1450,9 @@ static int countPar(const Token *tok1, const Token *tok2)
 // Clarify condition '(x = a < 0)' into '((x = a) < 0)' or '(x = (a < 0))'
 // Clarify condition '(a & b == c)' into '((a & b) == c)' or '(a & (b == c))'
 //---------------------------------------------------------------------------
-void CheckCondition::clarifyCondition()
+void CheckConditionImpl::clarifyCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("clarifyCondition"))
         return;
 
     logChecker("CheckCondition::clarifyCondition"); // style
@@ -1471,7 +1491,7 @@ void CheckCondition::clarifyCondition()
     }
 }
 
-void CheckCondition::clarifyConditionError(const Token *tok, bool assign, bool boolop)
+void CheckConditionImpl::clarifyConditionError(const Token *tok, bool assign, bool boolop)
 {
     std::string errmsg;
 
@@ -1494,12 +1514,13 @@ void CheckCondition::clarifyConditionError(const Token *tok, bool assign, bool b
                 errmsg, CWE398, Certainty::normal);
 }
 
-void CheckCondition::alwaysTrueFalse()
+void CheckConditionImpl::alwaysTrueFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("alwaysTrue") &&
-        !mSettings->isPremiumEnabled("alwaysFalse") &&
-        !mSettings->isPremiumEnabled("knownConditionTrueFalse"))
+    const bool pedantic = mSettings.isPremiumEnabled("alwaysTrue") ||
+                          mSettings.isPremiumEnabled("alwaysFalse") ||
+                          mSettings.isPremiumEnabled("knownConditionTrueFalse");
+
+    if (!pedantic && !mSettings.severity.isEnabled(Severity::style))
         return;
 
     logChecker("CheckCondition::alwaysTrueFalse"); // style
@@ -1515,17 +1536,15 @@ void CheckCondition::alwaysTrueFalse()
             }
             if (!tok->hasKnownIntValue())
                 continue;
-            if (Token::Match(tok->previous(), "%name% (") && tok->previous()->function()) {
-                const Function* f = tok->previous()->function();
-                if (f->functionScope && Token::Match(f->functionScope->bodyStart, "{ return true|false ;"))
-                    continue;
-            }
             const Token* condition = nullptr;
             {
                 // is this a condition..
                 const Token *parent = tok->astParent();
-                while (Token::Match(parent, "%oror%|&&"))
+                bool hasComp = false;
+                while (Token::Match(parent, "%oror%|&&")) {
+                    hasComp = true;
                     parent = parent->astParent();
+                }
                 if (!parent)
                     continue;
                 if (parent->str() == "?" && precedes(tok, parent))
@@ -1539,24 +1558,36 @@ void CheckCondition::alwaysTrueFalse()
                     condition = parent->astParent()->astParent()->previous();
                 else if (Token::Match(tok, "%comp%"))
                     condition = tok;
+                else if ((tok->str() == "(" || (hasComp && Token::Match(tok, "!|%var%"))) && astIsBool(parent) && Token::Match(parent, "%assign%"))
+                    condition = tok;
                 else
                     continue;
+
             }
             // Skip already diagnosed values
             if (diag(tok, false))
                 continue;
             if (condition->isConstexpr())
                 continue;
-            if (!isUsedAsBool(tok, *mSettings))
+            if (!isUsedAsBool(tok, mSettings))
                 continue;
             if (Token::simpleMatch(condition, "return") && Token::Match(tok, "%assign%"))
                 continue;
             if (Token::simpleMatch(tok->astParent(), "return") && Token::Match(tok, ".|%var%"))
                 continue;
-            if (Token::Match(tok, "%num%|%bool%|%char%"))
-                continue;
-            if (Token::Match(tok, "! %num%|%bool%|%char%"))
-                continue;
+            bool warnForNumber = false;
+            if (Token::Match(tok, "%num%|%bool%|%char%")) {
+                const bool isZeroOrOne = (tok->getKnownIntValue() >> 1) == 0;
+                warnForNumber = !isZeroOrOne && tok->tokType() == Token::eNumber && tok->astParent() == condition->astParent();
+                if (!warnForNumber)
+                    continue;
+            }
+            if (Token::Match(tok, "! %num%|%bool%|%char%")) {
+                const bool isZeroOrOne = tok->next()->hasKnownIntValue() && (tok->next()->getKnownIntValue() >> 1) == 0;
+                warnForNumber = !isZeroOrOne && tok->next()->tokType() == Token::eNumber && tok->astParent() == condition->astParent();
+                if (!warnForNumber)
+                    continue;
+            }
             if (Token::Match(tok, "%oror%|&&")) {
                 bool bail = false;
                 for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) {
@@ -1576,11 +1607,12 @@ void CheckCondition::alwaysTrueFalse()
                 isSameExpression(true,
                                  tok->astOperand1(),
                                  tok->astOperand2(),
-                                 *mSettings,
+                                 mSettings,
                                  true,
                                  true))
                 continue;
-            if (isConstVarExpression(tok, [](const Token* tok) {
+
+            if (!pedantic && !warnForNumber && isConstVarExpression(tok, [](const Token* tok) {
                 return Token::Match(tok, "[|(|&|+|-|*|/|%|^|>>|<<") && !Token::simpleMatch(tok, "( )");
             }))
                 continue;
@@ -1590,8 +1622,8 @@ void CheckCondition::alwaysTrueFalse()
             {
                 const ValueFlow::Value *zeroValue = nullptr;
                 const Token *nonZeroExpr = nullptr;
-                if (CheckOther::comparisonNonZeroExpressionLessThanZero(tok, zeroValue, nonZeroExpr, /*suppress*/ true) ||
-                    CheckOther::testIfNonZeroExpressionIsPositive(tok, zeroValue, nonZeroExpr))
+                if (CheckOtherImpl::comparisonNonZeroExpressionLessThanZero(tok, zeroValue, nonZeroExpr, /*suppress*/ true) ||
+                    CheckOtherImpl::testIfNonZeroExpressionIsPositive(tok, zeroValue, nonZeroExpr))
                     continue;
             }
 
@@ -1641,21 +1673,30 @@ void CheckCondition::alwaysTrueFalse()
     }
 }
 
-void CheckCondition::alwaysTrueFalseError(const Token* tok, const Token* condition, const ValueFlow::Value* value)
+static std::string getConditionString(const Token* condition)
+{
+    if (Token::simpleMatch(condition, "return"))
+        return "Return value";
+    if (Token::simpleMatch(condition, "(") && Token::Match(condition->astParent(), "%assign%"))
+        return "Assigned value";
+    return "Condition";
+}
+
+void CheckConditionImpl::alwaysTrueFalseError(const Token* tok, const Token* condition, const ValueFlow::Value* value)
 {
     const bool alwaysTrue = value && (value->intvalue != 0 || value->isImpossible());
     const std::string expr = tok ? tok->expressionString() : std::string("x");
-    const std::string conditionStr = (Token::simpleMatch(condition, "return") ? "Return value" : "Condition");
+    const std::string conditionStr = getConditionString(condition);
     const std::string errmsg = conditionStr + " '" + expr + "' is always " + bool_to_string(alwaysTrue);
-    const ErrorPath errorPath = getErrorPath(tok, value, errmsg);
-    reportError(errorPath,
+    ErrorPath errorPath = getErrorPath(tok, value, errmsg);
+    reportError(std::move(errorPath),
                 Severity::style,
                 "knownConditionTrueFalse",
                 errmsg,
                 (alwaysTrue ? CWE571 : CWE570), Certainty::normal);
 }
 
-void CheckCondition::checkInvalidTestForOverflow()
+void CheckConditionImpl::checkInvalidTestForOverflow()
 {
     // Interesting blogs:
     // https://www.airs.com/blog/archives/120
@@ -1670,7 +1711,7 @@ void CheckCondition::checkInvalidTestForOverflow()
     // x + y < x       ->   y < 0
 
 
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckCondition::checkInvalidTestForOverflow"); // warning
@@ -1704,7 +1745,7 @@ void CheckCondition::checkInvalidTestForOverflow()
                 if (!isSameExpression(true,
                                       expr,
                                       lhs->astSibling(),
-                                      *mSettings,
+                                      mSettings,
                                       true,
                                       false))
                     continue;
@@ -1743,7 +1784,7 @@ void CheckCondition::checkInvalidTestForOverflow()
     }
 }
 
-void CheckCondition::invalidTestForOverflow(const Token* tok, const ValueType *valueType, const std::string &replace)
+void CheckConditionImpl::invalidTestForOverflow(const Token* tok, const ValueType *valueType, const std::string &replace)
 {
     const std::string expr = (tok ? tok->expressionString() : std::string("x + c < x"));
     const std::string overflow = (valueType && valueType->pointer) ? "pointer overflow" : "signed integer overflow";
@@ -1758,9 +1799,9 @@ void CheckCondition::invalidTestForOverflow(const Token* tok, const ValueType *v
 }
 
 
-void CheckCondition::checkPointerAdditionResultNotNull()
+void CheckConditionImpl::checkPointerAdditionResultNotNull()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckCondition::checkPointerAdditionResultNotNull"); // warning
@@ -1799,15 +1840,15 @@ void CheckCondition::checkPointerAdditionResultNotNull()
     }
 }
 
-void CheckCondition::pointerAdditionResultNotNullError(const Token *tok, const Token *calc)
+void CheckConditionImpl::pointerAdditionResultNotNullError(const Token *tok, const Token *calc)
 {
     const std::string s = calc ? calc->expressionString() : "ptr+1";
     reportError(tok, Severity::warning, "pointerAdditionResultNotNull", "Comparison is wrong. Result of '" + s + "' can't be 0 unless there is pointer overflow, and pointer overflow is undefined behaviour.");
 }
 
-void CheckCondition::checkDuplicateConditionalAssign()
+void CheckConditionImpl::checkDuplicateConditionalAssign()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateConditionalAssign"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("duplicateConditionalAssign"))
         return;
 
     logChecker("CheckCondition::checkDuplicateConditionalAssign"); // style
@@ -1851,10 +1892,10 @@ void CheckCondition::checkDuplicateConditionalAssign()
                 isRedundant = (isNegation && val == 0) || (!isNegation && val == 1);
             } else { // comparison
                 if (!isSameExpression(
-                        true, condTok->astOperand1(), assignTok->astOperand1(), *mSettings, true, true))
+                        true, condTok->astOperand1(), assignTok->astOperand1(), mSettings, true, true))
                     continue;
                 if (!isSameExpression(
-                        true, condTok->astOperand2(), assignTok->astOperand2(), *mSettings, true, true))
+                        true, condTok->astOperand2(), assignTok->astOperand2(), mSettings, true, true))
                     continue;
             }
             duplicateConditionalAssignError(condTok, assignTok, isRedundant);
@@ -1862,7 +1903,7 @@ void CheckCondition::checkDuplicateConditionalAssign()
     }
 }
 
-void CheckCondition::duplicateConditionalAssignError(const Token *condTok, const Token* assignTok, bool isRedundant)
+void CheckConditionImpl::duplicateConditionalAssignError(const Token *condTok, const Token* assignTok, bool isRedundant)
 {
     ErrorPath errors;
     std::string msg = "Duplicate expression for the condition and assignment.";
@@ -1880,13 +1921,13 @@ void CheckCondition::duplicateConditionalAssignError(const Token *condTok, const
     }
 
     reportError(
-        errors, Severity::style, "duplicateConditionalAssign", msg, CWE398, Certainty::normal);
+        std::move(errors), Severity::style, "duplicateConditionalAssign", msg, CWE398, Certainty::normal);
 }
 
 
-void CheckCondition::checkAssignmentInCondition()
+void CheckConditionImpl::checkAssignmentInCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignmentInCondition"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("assignmentInCondition"))
         return;
 
     logChecker("CheckCondition::checkAssignmentInCondition"); // style
@@ -1918,7 +1959,7 @@ void CheckCondition::checkAssignmentInCondition()
     }
 }
 
-void CheckCondition::assignmentInCondition(const Token *eq)
+void CheckConditionImpl::assignmentInCondition(const Token *eq)
 {
     std::string expr = eq ? eq->expressionString() : "x=y";
 
@@ -1931,13 +1972,12 @@ void CheckCondition::assignmentInCondition(const Token *eq)
         Certainty::normal);
 }
 
-void CheckCondition::checkCompareValueOutOfTypeRange()
+void CheckConditionImpl::checkCompareValueOutOfTypeRange()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("compareValueOutOfTypeRangeError"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("compareValueOutOfTypeRangeError"))
         return;
 
-    if (mSettings->platform.type == Platform::Type::Native ||
-        mSettings->platform.type == Platform::Type::Unspecified)
+    if (mSettings.platform.type == Platform::Type::Unspecified)
         return;
 
     logChecker("CheckCondition::checkCompareValueOutOfTypeRange"); // style,platform
@@ -1955,7 +1995,7 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                     continue;
                 if (valueTok->getKnownIntValue() < 0 && valueTok->valueType() && valueTok->valueType()->sign != ValueType::Sign::SIGNED)
                     continue;
-                if (valueTok->valueType() && valueTok->valueType()->isTypeEqual(typeTok->valueType()))
+                if (typeTok->isLiteral())
                     continue;
                 std::uint8_t bits = 0;
                 switch (typeTok->valueType()->type) {
@@ -1963,24 +2003,24 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                     bits = 1;
                     break;
                 case ValueType::Type::CHAR:
-                    bits = mSettings->platform.char_bit;
+                    bits = mSettings.platform.char_bit;
                     break;
                 case ValueType::Type::SHORT:
-                    bits = mSettings->platform.short_bit;
+                    bits = mSettings.platform.short_bit;
                     break;
                 case ValueType::Type::INT:
-                    bits = mSettings->platform.int_bit;
+                    bits = mSettings.platform.int_bit;
                     break;
                 case ValueType::Type::LONG:
-                    bits = mSettings->platform.long_bit;
+                    bits = mSettings.platform.long_bit;
                     break;
                 case ValueType::Type::LONGLONG:
-                    bits = mSettings->platform.long_long_bit;
+                    bits = mSettings.platform.long_long_bit;
                     break;
                 default:
                     break;
                 }
-                if (bits == 0 || bits >= 64)
+                if (bits == 0 || bits >= 63)
                     continue;
 
                 const auto typeMinValue = (typeTok->valueType()->sign == ValueType::Sign::UNSIGNED) ? 0 : (-(1LL << (bits-1)));
@@ -1988,13 +2028,15 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                 long long typeMaxValue;
                 if (typeTok->valueType()->sign != ValueType::Sign::SIGNED)
                     typeMaxValue = unsignedTypeMaxValue;
-                else if (bits >= mSettings->platform.int_bit && (!valueTok->valueType() || valueTok->valueType()->sign != ValueType::Sign::SIGNED))
+                else if (bits >= mSettings.platform.int_bit && (!valueTok->valueType() || valueTok->valueType()->sign != ValueType::Sign::SIGNED))
                     typeMaxValue = unsignedTypeMaxValue;
                 else
                     typeMaxValue = unsignedTypeMaxValue / 2;
 
                 bool result{};
                 const auto kiv = valueTok->getKnownIntValue();
+                if (kiv == 0)
+                    continue; // prevent overlap with TestOther::unsignedPositive/unsignedLessThanZero
                 if (tok->str() == "==")
                     result = false;
                 else if (tok->str() == "!=")
@@ -2043,17 +2085,18 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                         break;
                     }
                 }
-                if (error)
-                    compareValueOutOfTypeRangeError(valueTok, typeTok->valueType()->str(), kiv, result);
+                if (!error || diag(tok))
+                    continue;
+                compareValueOutOfTypeRangeError(valueTok, typeTok->valueType()->str(), kiv, result);
             }
         }
     }
 }
 
-void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result)
+void CheckConditionImpl::compareValueOutOfTypeRangeError(const Token *comparisonTok, const std::string &type, MathLib::bigint value, bool result)
 {
     reportError(
-        comparison,
+        comparisonTok,
         Severity::style,
         "compareValueOutOfTypeRangeError",
         "Comparing expression of type '" + type + "' against value " + MathLib::toString(value) + ". Condition is always " + bool_to_string(result) + ".",
@@ -2061,9 +2104,9 @@ void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparison, co
         Certainty::normal);
 }
 
-void CheckCondition::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckCondition::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckCondition checkCondition(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckConditionImpl checkCondition(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkCondition.multiCondition();
     checkCondition.clarifyCondition();   // not simplified because ifAssign
     checkCondition.multiCondition2();
@@ -2081,15 +2124,16 @@ void CheckCondition::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLog
     checkCondition.alwaysTrueFalse();
 }
 
-void CheckCondition::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckCondition::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckCondition c(nullptr, settings, errorLogger);
+    CheckConditionImpl c(nullptr, settings, errorLogger);
 
     c.assignIfError(nullptr, nullptr, "", false);
     c.badBitmaskCheckError(nullptr);
     c.comparisonError(nullptr, "&", 6, "==", 1, false);
     c.duplicateConditionError(nullptr, nullptr, ErrorPath{});
     c.overlappingElseIfConditionError(nullptr, 1);
+    c.overlappingInnerConditionError(nullptr, nullptr, ErrorPath());
     c.mismatchingBitAndError(nullptr, 0xf0, nullptr, 1);
     c.oppositeInnerConditionError(nullptr, nullptr, ErrorPath{});
     c.identicalInnerConditionError(nullptr, nullptr, ErrorPath{});
diff --git a/lib/checkcondition.h b/lib/checkcondition.h
index 496ac835065..232b2b5b340 100644
--- a/lib/checkcondition.h
+++ b/lib/checkcondition.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "mathlib.h"
 #include "errortypes.h"
@@ -50,14 +51,38 @@ namespace ValueFlow {
 class CPPCHECKLIB CheckCondition : public Check {
 public:
     /** This constructor is used when registering the CheckAssignIf */
-    CheckCondition() : Check(myName()) {}
+    CheckCondition() : Check("Condition") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckCondition(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Match conditions with assignments and other conditions:\n"
+               "- Mismatching assignment and comparison => comparison is always true/false\n"
+               "- Mismatching lhs and rhs in comparison => comparison is always true/false\n"
+               "- Detect usage of | where & should be used\n"
+               "- Duplicate condition and assignment\n"
+               "- Detect matching 'if' and 'else if' conditions\n"
+               "- Mismatching bitand (a &= 0xf0; a &= 1; => a = 0)\n"
+               "- Opposite inner condition is always false\n"
+               "- Identical condition after early exit is always false\n"
+               "- Condition that is always true/false\n"
+               "- Mutual exclusion over || always evaluating to true\n"
+               "- Comparisons of modulo results that are always true/false.\n"
+               "- Known variable values => condition is always true/false\n"
+               "- Invalid test for overflow. Some mainstream compilers remove such overflow tests when optimising code.\n"
+               "- Suspicious assignment of container/iterator in condition => condition is always true.\n";
+    }
+};
+
+
+class CPPCHECKLIB CheckConditionImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckConditionImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** mismatching assignment / comparison */
     void assignIf();
@@ -84,7 +109,7 @@ class CPPCHECKLIB CheckCondition : public Check {
     /**
      * multiconditions #2
      * - Opposite inner conditions => always false
-     * - (TODO) Same/Overlapping inner condition => always true
+     * - Same/Overlapping inner condition => always true
      * - same condition after early exit => always false
      **/
     void multiCondition2();
@@ -115,6 +140,8 @@ class CPPCHECKLIB CheckCondition : public Check {
     // The conditions that have been diagnosed
     std::set<const Token*> mCondDiags;
     bool diag(const Token* tok, bool insert=true);
+    /** @brief Mark both token as diagnosed */
+    bool diag(const Token* tok1, const Token* tok2);
     bool isAliased(const std::set<int> &vars) const;
     bool isOverlappingCond(const Token * cond1, const Token * cond2, bool pure) const;
     void assignIfError(const Token *tok1, const Token *tok2, const std::string &condition, bool result);
@@ -128,6 +155,7 @@ class CPPCHECKLIB CheckCondition : public Check {
                          bool result);
     void duplicateConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath);
     void overlappingElseIfConditionError(const Token *tok, nonneg int line1);
+    void overlappingInnerConditionError(const Token *tok1, const Token *tok2, ErrorPath errorPath);
     void oppositeElseIfConditionError(const Token *ifCond, const Token *elseIfCond, ErrorPath errorPath);
 
     void oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath);
@@ -153,31 +181,7 @@ class CPPCHECKLIB CheckCondition : public Check {
     void assignmentInCondition(const Token *eq);
 
     void checkCompareValueOutOfTypeRange();
-    void compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Condition";
-    }
-
-    std::string classInfo() const override {
-        return "Match conditions with assignments and other conditions:\n"
-               "- Mismatching assignment and comparison => comparison is always true/false\n"
-               "- Mismatching lhs and rhs in comparison => comparison is always true/false\n"
-               "- Detect usage of | where & should be used\n"
-               "- Duplicate condition and assignment\n"
-               "- Detect matching 'if' and 'else if' conditions\n"
-               "- Mismatching bitand (a &= 0xf0; a &= 1; => a = 0)\n"
-               "- Opposite inner condition is always false\n"
-               "- Identical condition after early exit is always false\n"
-               "- Condition that is always true/false\n"
-               "- Mutual exclusion over || always evaluating to true\n"
-               "- Comparisons of modulo results that are always true/false.\n"
-               "- Known variable values => condition is always true/false\n"
-               "- Invalid test for overflow. Some mainstream compilers remove such overflow tests when optimising code.\n"
-               "- Suspicious assignment of container/iterator in condition => condition is always true.\n";
-    }
+    void compareValueOutOfTypeRangeError(const Token *comparisonTok, const std::string &type, MathLib::bigint value, bool result);
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkers.cpp b/lib/checkers.cpp
index f79be438e3b..56d91cc4f05 100644
--- a/lib/checkers.cpp
+++ b/lib/checkers.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,877 +23,655 @@
 
 namespace checkers {
     const std::map<std::string, std::string> allCheckers{
-        {"CheckBool::checkIncrementBoolean","style"},
+        {"Check64BitPortability::pointerassignment","portability"},
+        {"CheckAssert::assertWithSideEffects","warning"},
+        {"CheckAutoVariables::assignFunctionArg","style,warning"},
+        {"CheckAutoVariables::autoVariables",""},
+        {"CheckAutoVariables::checkVarLifetime",""},
+        {"CheckBool::checkAssignBoolToFloat","style,c++"},
+        {"CheckBool::checkAssignBoolToPointer",""},
         {"CheckBool::checkBitwiseOnBoolean","style,inconclusive"},
+        {"CheckBool::checkComparisonOfBoolExpressionWithInt","warning"},
+        {"CheckBool::checkComparisonOfBoolWithBool","style,c++"},
         {"CheckBool::checkComparisonOfBoolWithInt","warning,c++"},
         {"CheckBool::checkComparisonOfFuncReturningBool","style,c++"},
-        {"CheckBool::checkComparisonOfBoolWithBool","style,c++"},
-        {"CheckBool::checkAssignBoolToPointer",""},
-        {"CheckBool::checkComparisonOfBoolExpressionWithInt","warning"},
+        {"CheckBool::checkIncrementBoolean","style"},
         {"CheckBool::pointerArithBool",""},
-        {"CheckBool::checkAssignBoolToFloat","style,c++"},
         {"CheckBool::returnValueOfFunctionReturningBool","style"},
-        {"CheckPostfixOperator::postfixOperator","performance"},
-        {"CheckSizeof::checkSizeofForNumericParameter","warning"},
-        {"CheckSizeof::checkSizeofForArrayParameter","warning"},
-        {"CheckSizeof::checkSizeofForPointerSize","warning"},
-        {"CheckSizeof::sizeofsizeof","warning"},
-        {"CheckSizeof::sizeofCalculation","warning"},
-        {"CheckSizeof::sizeofFunction","warning"},
-        {"CheckSizeof::suspiciousSizeofCalculation","warning,inconclusive"},
-        {"CheckSizeof::sizeofVoid","portability"},
-        {"Check64BitPortability::pointerassignment","portability"},
-        {"CheckStl::outOfBounds",""},
-        {"CheckStl::outOfBoundsIndexExpression",""},
-        {"CheckStl::iterators",""},
-        {"CheckStl::misMatchingContainers",""},
-        {"CheckStl::misMatchingContainerIterator",""},
-        {"CheckStl::invalidContainer",""},
-        {"CheckStl::stlOutOfBounds",""},
-        {"CheckStl::negativeIndex",""},
-        {"CheckStl::erase",""},
-        {"CheckStl::stlBoundaries",""},
-        {"CheckStl::if_find","warning,performance"},
-        {"CheckStl::checkFindInsert","performance"},
-        {"CheckStl::size","performance,c++03"},
-        {"CheckStl::redundantCondition","style"},
-        {"CheckStl::missingComparison","warning"},
-        {"CheckStl::string_c_str",""},
-        {"CheckStl::uselessCalls","performance,warning"},
-        {"CheckStl::checkDereferenceInvalidIterator","warning"},
-        {"CheckStl::checkDereferenceInvalidIterator2",""},
-        {"CheckStl::useStlAlgorithm","style"},
-        {"CheckStl::knownEmptyContainer","style"},
-        {"CheckStl::eraseIteratorOutOfBounds",""},
-        {"CheckStl::checkMutexes","warning"},
-        {"CheckNullPointer::nullPointer",""},
-        {"CheckNullPointer::nullConstantDereference",""},
-        {"CheckNullPointer::arithmetic",""},
-        {"CheckNullPointer::analyseWholeProgram","unusedfunctions"},
+        {"CheckBufferOverrun::analyseWholeProgram",""},
+        {"CheckBufferOverrun::argumentSize","warning"},
         {"CheckBufferOverrun::arrayIndex",""},
-        {"CheckBufferOverrun::pointerArithmetic","portability"},
+        {"CheckBufferOverrun::arrayIndexThenCheck","style"},
         {"CheckBufferOverrun::bufferOverflow",""},
-        {"CheckBufferOverrun::arrayIndexThenCheck",""},
-        {"CheckBufferOverrun::stringNotZeroTerminated","warning,inconclusive"},
-        {"CheckBufferOverrun::argumentSize","warning"},
-        {"CheckBufferOverrun::analyseWholeProgram",""},
-        {"CheckBufferOverrun::objectIndex",""},
         {"CheckBufferOverrun::negativeArraySize",""},
-        {"CheckUninitVar::check",""},
-        {"CheckUninitVar::valueFlowUninit",""},
-        {"CheckUninitVar::analyseWholeProgram",""},
-        {"CheckOther::checkCastIntToCharAndBack","warning"},
-        {"CheckOther::clarifyCalculation","style"},
-        {"CheckOther::clarifyStatement","warning"},
-        {"CheckOther::checkSuspiciousSemicolon","warning,inconclusive"},
-        {"CheckOther::warningOldStylePointerCast","style,c++"},
-        {"CheckOther::suspiciousFloatingPointCast","style"},
-        {"CheckOther::invalidPointerCast","portability"},
-        {"CheckOther::checkRedundantAssignment","style"},
-        {"CheckOther::redundantBitwiseOperationInSwitch","warning"},
-        {"CheckOther::checkSuspiciousCaseInSwitch","warning,inconclusive"},
-        {"CheckOther::checkUnreachableCode","style"},
-        {"CheckOther::checkVariableScope","style,notclang"},
-        {"CheckOther::checkPassByReference","performance,c++"},
-        {"CheckOther::checkConstVariable","style,c++"},
-        {"CheckOther::checkConstPointer","style"},
-        {"CheckOther::checkCharVariable","warning,portability"},
-        {"CheckOther::checkIncompleteStatement","warning"},
-        {"CheckOther::checkZeroDivision",""},
-        {"CheckOther::checkNanInArithmeticExpression","style"},
-        {"CheckOther::checkMisusedScopedObject","style,c++"},
-        {"CheckOther::checkDuplicateBranch","style,inconclusive"},
-        {"CheckOther::checkInvalidFree",""},
-        {"CheckOther::checkDuplicateExpression","style,warning"},
-        {"CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse","warning"},
-        {"CheckOther::checkSignOfUnsignedVariable","style"},
-        {"CheckOther::checkRedundantCopy","c++,performance,inconclusive"},
-        {"CheckOther::checkNegativeBitwiseShift",""},
-        {"CheckOther::checkIncompleteArrayFill","warning,portability,inconclusive"},
-        {"CheckOther::checkVarFuncNullUB","portability"},
-        {"CheckOther::checkRedundantPointerOp","style"},
-        {"CheckOther::checkInterlockedDecrement","windows-platform"},
-        {"CheckOther::checkUnusedLabel","style,warning"},
-        {"CheckOther::checkEvaluationOrder",""},
-        {"CheckOther::checkAccessOfMovedVariable","c++11,warning"},
-        {"CheckOther::checkFuncArgNamesDifferent","style,warning,inconclusive"},
-        {"CheckOther::checkShadowVariables","style"},
-        {"CheckOther::checkKnownArgument","style"},
-        {"CheckOther::checkKnownPointerToBool","style"},
-        {"CheckOther::checkComparePointers",""},
-        {"CheckOther::checkModuloOfOne","style"},
-        {"CheckOther::checkOverlappingWrite",""},
+        {"CheckBufferOverrun::objectIndex",""},
+        {"CheckBufferOverrun::pointerArithmetic","portability"},
+        {"CheckBufferOverrun::stringNotZeroTerminated","warning,inconclusive"},
+        {"CheckClass::analyseWholeProgram",""},
+        {"CheckClass::checkConst","style,inconclusive"},
         {"CheckClass::checkConstructors","style,warning"},
-        {"CheckClass::checkExplicitConstructors","style"},
         {"CheckClass::checkCopyConstructors","warning"},
-        {"CheckClass::initializationListUsage","performance"},
-        {"CheckClass::privateFunctions","style"},
-        {"CheckClass::checkMemset",""},
-        {"CheckClass::operatorEqRetRefThis","style"},
-        {"CheckClass::operatorEqToSelf","warning"},
-        {"CheckClass::virtualDestructor",""},
-        {"CheckClass::thisSubtraction","warning"},
-        {"CheckClass::checkConst","style,inconclusive"},
-        {"CheckClass::initializerListOrder","style,inconclusive"},
-        {"CheckClass::checkSelfInitialization",""},
-        {"CheckClass::checkVirtualFunctionCallInConstructor","warning"},
         {"CheckClass::checkDuplInheritedMembers","warning"},
+        {"CheckClass::checkExplicitConstructors","style"},
+        {"CheckClass::checkMemset",""},
         {"CheckClass::checkMissingOverride","style,c++03"},
-        {"CheckClass::checkUselessOverride","style"},
         {"CheckClass::checkReturnByReference","performance"},
+        {"CheckClass::checkSelfInitialization",""},
         {"CheckClass::checkThisUseAfterFree","warning"},
         {"CheckClass::checkUnsafeClassRefMember","warning,safeChecks"},
-        {"CheckClass::analyseWholeProgram",""},
-        {"CheckUnusedVar::checkFunctionVariableUsage","style"},
-        {"CheckUnusedVar::checkStructMemberUsage","style"},
-        {"CheckIO::checkCoutCerrMisusage","c"},
-        {"CheckIO::checkFileUsage",""},
-        {"CheckIO::invalidScanf",""},
-        {"CheckIO::checkWrongPrintfScanfArguments",""},
+        {"CheckClass::checkUselessOverride","style"},
+        {"CheckClass::checkVirtualFunctionCallInConstructor","warning"},
+        {"CheckClass::initializationListUsage","performance"},
+        {"CheckClass::initializerListOrder","style,inconclusive"},
+        {"CheckClass::operatorEqRetRefThis","style"},
+        {"CheckClass::operatorEqToSelf","warning"},
+        {"CheckClass::privateFunctions","style"},
+        {"CheckClass::thisSubtraction","warning"},
+        {"CheckClass::virtualDestructor",""},
+        {"CheckCondition::alwaysTrueFalse","style"},
         {"CheckCondition::assignIf","style"},
+        {"CheckCondition::checkAssignmentInCondition","style"},
         {"CheckCondition::checkBadBitmaskCheck","style"},
+        {"CheckCondition::checkCompareValueOutOfTypeRange","style,platform"},
+        {"CheckCondition::checkDuplicateConditionalAssign","style"},
+        {"CheckCondition::checkIncorrectLogicOperator","style,warning"},
+        {"CheckCondition::checkInvalidTestForOverflow","warning"},
+        {"CheckCondition::checkModuloAlwaysTrueFalse","warning"},
+        {"CheckCondition::checkPointerAdditionResultNotNull","warning"},
+        {"CheckCondition::clarifyCondition","style"},
         {"CheckCondition::comparison","style"},
         {"CheckCondition::duplicateCondition","style"},
         {"CheckCondition::multiCondition","style"},
         {"CheckCondition::multiCondition2","warning"},
-        {"CheckCondition::checkIncorrectLogicOperator","style,warning"},
-        {"CheckCondition::checkModuloAlwaysTrueFalse","warning"},
-        {"CheckCondition::clarifyCondition","style"},
-        {"CheckCondition::alwaysTrueFalse","style"},
-        {"CheckCondition::checkInvalidTestForOverflow","warning"},
-        {"CheckCondition::checkPointerAdditionResultNotNull","warning"},
-        {"CheckCondition::checkDuplicateConditionalAssign","style"},
-        {"CheckCondition::checkAssignmentInCondition","style"},
-        {"CheckCondition::checkCompareValueOutOfTypeRange","style,platform"},
-        {"CheckFunctions::checkProhibitedFunctions",""},
-        {"CheckFunctions::invalidFunctionUsage",""},
+        {"CheckExceptionSafety::checkCatchExceptionByValue","style"},
+        {"CheckExceptionSafety::checkRethrowCopy","style"},
+        {"CheckExceptionSafety::deallocThrow","warning"},
+        {"CheckExceptionSafety::destructors","warning"},
+        {"CheckExceptionSafety::nothrowThrows",""},
+        {"CheckExceptionSafety::rethrowNoCurrentException",""},
+        {"CheckExceptionSafety::unhandledExceptionSpecification","style,inconclusive"},
         {"CheckFunctions::checkIgnoredReturnValue","style,warning"},
-        {"CheckFunctions::checkMissingReturn",""},
         {"CheckFunctions::checkMathFunctions","style,warning,c99,c++11"},
-        {"CheckFunctions::memsetZeroBytes","warning"},
+        {"CheckFunctions::checkMissingReturn",""},
+        {"CheckFunctions::checkProhibitedFunctions",""},
+        {"CheckFunctions::invalidFunctionUsage",""},
         {"CheckFunctions::memsetInvalid2ndParam","warning,portability"},
+        {"CheckFunctions::memsetZeroBytes","warning"},
         {"CheckFunctions::returnLocalStdMove","performance,c++11"},
         {"CheckFunctions::useStandardLibrary","style"},
-        {"CheckVaarg::va_start_argument",""},
-        {"CheckVaarg::va_list_usage","notclang"},
-        {"CheckUnusedFunctions::check","unusedFunction"},
-        {"CheckType::checkTooBigBitwiseShift","platform"},
-        {"CheckType::checkIntegerOverflow","platform"},
-        {"CheckType::checkSignConversion","warning"},
-        {"CheckType::checkLongCast","style"},
-        {"CheckType::checkFloatToIntegerOverflow",""},
-        {"CheckString::stringLiteralWrite",""},
-        {"CheckString::checkAlwaysTrueOrFalseStringCompare","warning"},
-        {"CheckString::checkSuspiciousStringCompare","warning"},
-        {"CheckString::strPlusChar",""},
-        {"CheckString::checkIncorrectStringCompare","warning"},
-        {"CheckString::overlappingStrcmp","warning"},
-        {"CheckString::sprintfOverlappingData",""},
-        {"CheckAssert::assertWithSideEffects","warning"},
-        {"CheckExceptionSafety::destructors","warning"},
-        {"CheckExceptionSafety::deallocThrow","warning"},
-        {"CheckExceptionSafety::checkRethrowCopy","style"},
-        {"CheckExceptionSafety::checkCatchExceptionByValue","style"},
-        {"CheckExceptionSafety::nothrowThrows",""},
-        {"CheckExceptionSafety::unhandledExceptionSpecification","style,inconclusive"},
-        {"CheckExceptionSafety::rethrowNoCurrentException",""},
-        {"CheckAutoVariables::assignFunctionArg","style,warning"},
-        {"CheckAutoVariables::autoVariables",""},
-        {"CheckAutoVariables::checkVarLifetime",""},
+        {"CheckIO::checkCoutCerrMisusage","c"},
+        {"CheckIO::checkFileUsage",""},
+        {"CheckIO::checkWrongfeofUsage",""},
+        {"CheckIO::checkWrongPrintfScanfArguments",""},
+        {"CheckIO::invalidScanf",""},
         {"CheckLeakAutoVar::check","notclang"},
-        {"CheckMemoryLeakInFunction::checkReallocUsage",""},
         {"CheckMemoryLeakInClass::check",""},
-        {"CheckMemoryLeakStructMember::check",""},
+        {"CheckMemoryLeakInFunction::checkReallocUsage",""},
         {"CheckMemoryLeakNoVar::check",""},
         {"CheckMemoryLeakNoVar::checkForUnsafeArgAlloc",""},
+        {"CheckMemoryLeakStructMember::check",""},
+        {"CheckNullPointer::analyseWholeProgram",""},
+        {"CheckNullPointer::arithmetic",""},
+        {"CheckNullPointer::nullConstantDereference",""},
+        {"CheckNullPointer::nullPointer",""},
+        {"CheckOther::checkAccessOfMovedVariable","c++11,warning"},
+        {"CheckOther::checkCastIntToCharAndBack","warning"},
+        {"CheckOther::checkCharVariable","warning,portability"},
+        {"CheckOther::checkComparePointers",""},
+        {"CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse","warning"},
+        {"CheckOther::checkConstPointer","style"},
+        {"CheckOther::checkConstVariable","style,c++"},
+        {"CheckOther::checkDuplicateBranch","style,inconclusive"},
+        {"CheckOther::checkDuplicateExpression","style,warning"},
+        {"CheckOther::checkEvaluationOrder",""},
+        {"CheckOther::checkFuncArgNamesDifferent","style,warning,inconclusive"},
+        {"CheckOther::checkIncompleteArrayFill","warning,portability,inconclusive"},
+        {"CheckOther::checkIncompleteStatement","warning"},
+        {"CheckOther::checkInterlockedDecrement","windows-platform"},
+        {"CheckOther::checkInvalidFree",""},
+        {"CheckOther::checkKnownArgument","style"},
+        {"CheckOther::checkKnownPointerToBool","style"},
+        {"CheckOther::checkMisusedScopedObject","style,c++"},
+        {"CheckOther::checkModuloOfOne","style"},
+        {"CheckOther::checkNanInArithmeticExpression","style"},
+        {"CheckOther::checkNegativeBitwiseShift",""},
+        {"CheckOther::checkOverlappingWrite",""},
+        {"CheckOther::checkPassByReference","performance,c++"},
+        {"CheckOther::checkRedundantAssignment","style"},
+        {"CheckOther::checkRedundantCopy","c++,performance,inconclusive"},
+        {"CheckOther::checkRedundantPointerOp","style"},
+        {"CheckOther::checkShadowVariables","style"},
+        {"CheckOther::checkSignOfUnsignedVariable","style"},
+        {"CheckOther::checkSuspiciousCaseInSwitch","warning,inconclusive"},
+        {"CheckOther::checkSuspiciousSemicolon","warning,inconclusive"},
+        {"CheckOther::checkUnionZeroInit","portability"},
+        {"CheckOther::checkUnreachableCode","style"},
+        {"CheckOther::checkUnusedLabel","style,warning"},
+        {"CheckOther::checkVarFuncNullUB","portability"},
+        {"CheckOther::checkVariableScope","style,notclang"},
+        {"CheckOther::checkZeroDivision",""},
+        {"CheckOther::clarifyCalculation","style"},
+        {"CheckOther::clarifyStatement","warning"},
+        {"CheckOther::invalidPointerCast","portability"},
+        {"CheckOther::redundantBitwiseOperationInSwitch","warning"},
+        {"CheckOther::suspiciousFloatingPointCast","style"},
+        {"CheckOther::warningDangerousTypeCast","warning,c++"},
+        {"CheckOther::warningIntToPointerCast","portability"},
+        {"CheckOther::warningOldStylePointerCast","style,c++"},
+        {"CheckPostfixOperator::postfixOperator","performance"},
+        {"CheckSizeof::checkSizeofForArrayParameter","warning"},
+        {"CheckSizeof::checkSizeofForNumericParameter","warning"},
+        {"CheckSizeof::checkSizeofForPointerSize","warning"},
+        {"CheckSizeof::sizeofCalculation","warning"},
+        {"CheckSizeof::sizeofFunction","warning"},
+        {"CheckSizeof::sizeofVoid","portability"},
+        {"CheckSizeof::sizeofsizeof","warning"},
+        {"CheckSizeof::suspiciousSizeofCalculation","warning,inconclusive"},
+        {"CheckStl::algorithmOutOfBounds",""},
+        {"CheckStl::checkDereferenceInvalidIterator","warning"},
+        {"CheckStl::checkDereferenceInvalidIterator2",""},
+        {"CheckStl::checkFindInsert","performance"},
+        {"CheckStl::checkMutexes","warning"},
+        {"CheckStl::erase",""},
+        {"CheckStl::eraseIteratorOutOfBounds",""},
+        {"CheckStl::if_find","warning,performance"},
+        {"CheckStl::invalidContainer",""},
+        {"CheckStl::iterators",""},
+        {"CheckStl::knownEmptyContainer","style"},
+        {"CheckStl::misMatchingContainerIterator",""},
+        {"CheckStl::misMatchingContainers",""},
+        {"CheckStl::missingComparison","warning"},
+        {"CheckStl::negativeIndex",""},
+        {"CheckStl::outOfBounds",""},
+        {"CheckStl::outOfBoundsIndexExpression",""},
+        {"CheckStl::redundantCondition","style"},
+        {"CheckStl::size","performance,c++03"},
+        {"CheckStl::stlBoundaries",""},
+        {"CheckStl::stlOutOfBounds",""},
+        {"CheckStl::string_c_str",""},
+        {"CheckStl::useStlAlgorithm","style"},
+        {"CheckStl::uselessCalls","performance,warning"},
+        {"CheckString::checkAlwaysTrueOrFalseStringCompare","warning"},
+        {"CheckString::checkIncorrectStringCompare","warning"},
+        {"CheckString::checkSuspiciousStringCompare","warning"},
+        {"CheckString::overlappingStrcmp","warning"},
+        {"CheckString::sprintfOverlappingData",""},
+        {"CheckString::strPlusChar",""},
+        {"CheckString::stringLiteralWrite",""},
+        {"CheckType::checkFloatToIntegerOverflow",""},
+        {"CheckType::checkIntegerOverflow","platform"},
+        {"CheckType::checkLongCast","style"},
+        {"CheckType::checkSignConversion","warning"},
+        {"CheckType::checkTooBigBitwiseShift","platform"},
+        {"CheckUninitVar::analyseWholeProgram",""},
+        {"CheckUninitVar::check",""},
+        {"CheckUninitVar::valueFlowUninit",""},
+        {"CheckUnusedFunctions::check","unusedFunction"},
+        {"CheckUnusedVar::checkFunctionVariableUsage","style"},
+        {"CheckUnusedVar::checkStructMemberUsage","style"},
+        {"CheckVaarg::va_list_usage","notclang"},
+        {"CheckVaarg::va_start_argument",""},
+    };
+
+
+    const char Req[] = "Required";
+    const char Adv[] = "Advisory";
+    const char Man[] = "Mandatory";
+    const char Doc[] = "Document";
+    const char Dis[] = "Disapplied";
+    const std::vector<MisraInfo> misraC2012Directives{
+        {1,1,Req,0},
+        {2,1,Req,0},
+        {3,1,Req,0},
+        {4,1,Req,0},
+        {4,2,Adv,0},
+        {4,3,Req,0},
+        {4,4,Adv,0},
+        {4,5,Adv,0},
+        {4,6,Adv,3},
+        {4,7,Req,0},
+        {4,8,Adv,0},
+        {4,9,Adv,3},
+        {4,10,Req,0},
+        {4,11,Req,3},
+        {4,12,Req,0},
+        {4,13,Adv,0},
+        {4,14,Req,2},
+        {4,15,Req,3},
+        {5,1,Req,4},
+        {5,2,Req,4},
+        {5,3,Req,4},
+    };
+    const std::vector<MisraInfo> misraC2012Rules{
+        {1,1,Req,0},
+        {1,2,Adv,0},
+        {1,3,Req,0},
+        {1,4,Req,2}, // Amendment 2
+        {1,5,Req,3}, // Amendment 3
+        {2,1,Req,0},
+        {2,2,Req,0},
+        {2,3,Adv,0},
+        {2,4,Adv,0},
+        {2,5,Adv,0},
+        {2,6,Adv,0},
+        {2,7,Adv,0},
+        {2,8,Adv,0},
+        {3,1,Req,0},
+        {3,2,Req,0},
+        {4,1,Req,0},
+        {4,2,Adv,0},
+        {5,1,Req,0},
+        {5,2,Req,0},
+        {5,3,Req,0},
+        {5,4,Req,0},
+        {5,5,Req,0},
+        {5,6,Req,0},
+        {5,7,Req,0},
+        {5,8,Req,0},
+        {5,9,Adv,0},
+        {6,1,Req,0},
+        {6,2,Req,0},
+        {6,3,Req,0},
+        {7,1,Req,0},
+        {7,2,Req,0},
+        {7,3,Req,0},
+        {7,4,Req,0},
+        {7,5,Man,0},
+        {7,6,Req,0},
+        {8,1,Req,0},
+        {8,2,Req,0},
+        {8,3,Req,0},
+        {8,4,Req,0},
+        {8,5,Req,0},
+        {8,6,Req,0},
+        {8,7,Adv,0},
+        {8,8,Req,0},
+        {8,9,Adv,0},
+        {8,10,Req,0},
+        {8,11,Adv,0},
+        {8,12,Req,0},
+        {8,13,Adv,0},
+        {8,14,Req,0},
+        {8,15,Req,0},
+        {8,16,Adv,0},
+        {8,17,Adv,0},
+        {9,1,Man,0},
+        {9,2,Req,0},
+        {9,3,Req,0},
+        {9,4,Req,0},
+        {9,5,Req,0},
+        {9,6,Req,0},
+        {9,7,Man,0},
+        {10,1,Req,0},
+        {10,2,Req,0},
+        {10,3,Req,0},
+        {10,4,Req,0},
+        {10,5,Adv,0},
+        {10,6,Req,0},
+        {10,7,Req,0},
+        {10,8,Req,0},
+        {11,1,Req,0},
+        {11,2,Req,0},
+        {11,3,Req,0},
+        {11,4,Adv,0},
+        {11,5,Adv,0},
+        {11,6,Req,0},
+        {11,7,Req,0},
+        {11,8,Req,0},
+        {11,9,Req,0},
+        {11,10,Req,0},
+        {12,1,Adv,0},
+        {12,2,Req,0},
+        {12,3,Adv,0},
+        {12,4,Adv,0},
+        {12,5,Man,1}, // Amendment 1
+        {12,6,Req,4}, // Amendment 4
+        {13,1,Req,0},
+        {13,2,Req,0},
+        {13,3,Adv,0},
+        {13,4,Adv,0},
+        {13,5,Req,0},
+        {13,6,Req,0},
+        {14,1,Req,0},
+        {14,2,Req,0},
+        {14,3,Req,0},
+        {14,4,Req,0},
+        {15,1,Adv,0},
+        {15,2,Req,0},
+        {15,3,Req,0},
+        {15,4,Adv,0},
+        {15,5,Adv,0},
+        {15,6,Req,0},
+        {15,7,Req,0},
+        {16,1,Req,0},
+        {16,2,Req,0},
+        {16,3,Req,0},
+        {16,4,Req,0},
+        {16,5,Req,0},
+        {16,6,Req,0},
+        {16,7,Req,0},
+        {17,1,Req,0},
+        {17,2,Req,0},
+        {17,3,Man,0},
+        {17,4,Man,0},
+        {17,5,Req,0},
+        {17,6,Man,0},
+        {17,7,Req,0},
+        {17,8,Adv,0},
+        {17,9,Man,0},
+        {17,10,Req,0},
+        {17,11,Adv,0},
+        {17,12,Adv,0},
+        {17,13,Req,0},
+        {18,1,Req,0},
+        {18,2,Req,0},
+        {18,3,Req,0},
+        {18,4,Adv,0},
+        {18,5,Adv,0},
+        {18,6,Req,0},
+        {18,7,Req,0},
+        {18,8,Req,0},
+        {18,9,Req,0},
+        {18,10,Man,0},
+        {19,1,Man,0},
+        {19,2,Adv,0},
+        {20,1,Adv,0},
+        {20,2,Req,0},
+        {20,3,Req,0},
+        {20,4,Req,0},
+        {20,5,Adv,0},
+        {20,6,Req,0},
+        {20,7,Req,0},
+        {20,8,Req,0},
+        {20,9,Req,0},
+        {20,10,Adv,0},
+        {20,11,Req,0},
+        {20,12,Req,0},
+        {20,13,Req,0},
+        {20,14,Req,0},
+        {21,1,Req,0},
+        {21,2,Req,0},
+        {21,3,Req,0},
+        {21,4,Req,0},
+        {21,5,Req,0},
+        {21,6,Req,0},
+        {21,7,Req,0},
+        {21,8,Req,0},
+        {21,9,Req,0},
+        {21,10,Req,0},
+        {21,11,Adv,0},
+        {21,12,Req,0},
+        {21,13,Man,1}, // Amendment 1
+        {21,14,Req,1}, // Amendment 1
+        {21,15,Req,1}, // Amendment 1
+        {21,16,Req,1}, // Amendment 1
+        {21,17,Man,1}, // Amendment 1
+        {21,18,Man,1}, // Amendment 1
+        {21,19,Man,1}, // Amendment 1
+        {21,20,Man,1}, // Amendment 1
+        {21,21,Req,3}, // Amendment 3
+        {21,22,Man,3}, // Amendment 3
+        {21,23,Req,3}, // Amendment 3
+        {21,24,Req,3}, // Amendment 3
+        {21,25,Req,4}, // Amendment 4
+        {21,26,Req,4}, // Amendment 4
+        {22,1,Req,0},
+        {22,2,Man,0},
+        {22,3,Req,0},
+        {22,4,Man,0},
+        {22,5,Man,0},
+        {22,6,Man,0},
+        {22,7,Req,1}, // Amendment 1
+        {22,8,Req,1}, // Amendment 1
+        {22,9,Req,1}, // Amendment 1
+        {22,10,Req,1}, // Amendment 1
+        {22,11,Req,4}, // Amendment 4
+        {22,12,Man,4}, // Amendment 4
+        {22,13,Req,4}, // Amendment 4
+        {22,14,Req,4}, // Amendment 4
+        {22,15,Req,4}, // Amendment 4
+        {22,16,Req,4}, // Amendment 4
+        {22,17,Req,4}, // Amendment 4
+        {22,18,Req,4}, // Amendment 4
+        {22,19,Req,4}, // Amendment 4
+        {22,20,Man,4}, // Amendment 4
+        {23,1,Adv,3}, // Amendment 3
+        {23,2,Req,3}, // Amendment 3
+        {23,3,Adv,3}, // Amendment 3
+        {23,4,Req,3}, // Amendment 3
+        {23,5,Adv,3}, // Amendment 3
+        {23,6,Req,3}, // Amendment 3
+        {23,7,Adv,3}, // Amendment 3
+        {23,8,Req,3}, // Amendment 3
+    };
+    const std::vector<MisraInfo> misraC2023Directives{
+        {1,1,Req,0},
+        {2,1,Req,0},
+        {3,1,Req,0},
+        {4,1,Req,0},
+        {4,2,Adv,0},
+        {4,3,Req,0},
+        {4,4,Adv,0},
+        {4,5,Adv,0},
+        {4,6,Adv,0},
+        {4,7,Req,0},
+        {4,8,Adv,0},
+        {4,9,Adv,0},
+        {4,10,Req,0},
+        {4,11,Req,0},
+        {4,12,Req,0},
+        {4,13,Adv,0},
+        {4,14,Req,0},
+        {4,15,Req,0},
+        {5,1,Req,0},
+        {5,2,Req,0},
+        {5,3,Req,0},
+    };
+    const std::vector<MisraInfo> misraC2023Rules{
+        {1,1,Req,0},
+        {1,2,Adv,0},
+        {1,3,Req,0},
+        {1,4,Req,0},
+        {1,5,Req,0},
+        {2,1,Req,0},
+        {2,2,Req,0},
+        {2,3,Adv,0},
+        {2,4,Adv,0},
+        {2,5,Adv,0},
+        {2,6,Adv,0},
+        {2,7,Adv,0},
+        {2,8,Adv,0},
+        {3,1,Req,0},
+        {3,2,Req,0},
+        {4,1,Req,0},
+        {4,2,Adv,0},
+        {5,1,Req,0},
+        {5,2,Req,0},
+        {5,3,Req,0},
+        {5,4,Req,0},
+        {5,5,Req,0},
+        {5,6,Req,0},
+        {5,7,Req,0},
+        {5,8,Req,0},
+        {5,9,Adv,0},
+        {6,1,Req,0},
+        {6,2,Req,0},
+        {6,3,Req,0},
+        {7,1,Req,0},
+        {7,2,Req,0},
+        {7,3,Req,0},
+        {7,4,Req,0},
+        {7,5,Man,0},
+        {7,6,Req,0},
+        {8,1,Req,0},
+        {8,2,Req,0},
+        {8,3,Req,0},
+        {8,4,Req,0},
+        {8,5,Req,0},
+        {8,6,Req,0},
+        {8,7,Adv,0},
+        {8,8,Req,0},
+        {8,9,Adv,0},
+        {8,10,Req,0},
+        {8,11,Adv,0},
+        {8,12,Req,0},
+        {8,13,Adv,0},
+        {8,14,Req,0},
+        {8,15,Req,0},
+        {8,16,Adv,0},
+        {8,17,Adv,0},
+        {9,1,Man,0},
+        {9,2,Req,0},
+        {9,3,Req,0},
+        {9,4,Req,0},
+        {9,5,Req,0},
+        {9,6,Req,0},
+        {9,7,Man,0},
+        {10,1,Req,0},
+        {10,2,Req,0},
+        {10,3,Req,0},
+        {10,4,Req,0},
+        {10,5,Adv,0},
+        {10,6,Req,0},
+        {10,7,Req,0},
+        {10,8,Req,0},
+        {11,1,Req,0},
+        {11,2,Req,0},
+        {11,3,Req,0},
+        {11,4,Adv,0},
+        {11,5,Adv,0},
+        {11,6,Req,0},
+        {11,7,Req,0},
+        {11,8,Req,0},
+        {11,9,Req,0},
+        {11,10,Req,0},
+        {12,1,Adv,0},
+        {12,2,Req,0},
+        {12,3,Adv,0},
+        {12,4,Adv,0},
+        {12,5,Man,0},
+        {12,6,Req,0},
+        {13,1,Req,0},
+        {13,2,Req,0},
+        {13,3,Adv,0},
+        {13,4,Adv,0},
+        {13,5,Req,0},
+        {13,6,Req,0},
+        {14,1,Req,0},
+        {14,2,Req,0},
+        {14,3,Req,0},
+        {14,4,Req,0},
+        {15,1,Adv,0},
+        {15,2,Req,0},
+        {15,3,Req,0},
+        {15,4,Adv,0},
+        {15,5,Adv,0},
+        {15,6,Req,0},
+        {15,7,Req,0},
+        {16,1,Req,0},
+        {16,2,Req,0},
+        {16,3,Req,0},
+        {16,4,Req,0},
+        {16,5,Req,0},
+        {16,6,Req,0},
+        {16,7,Req,0},
+        {17,1,Req,0},
+        {17,2,Req,0},
+        {17,3,Man,0},
+        {17,4,Man,0},
+        {17,5,Req,0},
+        {17,6,Man,0},
+        {17,7,Req,0},
+        {17,8,Adv,0},
+        {17,9,Man,0},
+        {17,10,Req,0},
+        {17,11,Adv,0},
+        {17,12,Adv,0},
+        {17,13,Req,0},
+        {18,1,Req,0},
+        {18,2,Req,0},
+        {18,3,Req,0},
+        {18,4,Adv,0},
+        {18,5,Adv,0},
+        {18,6,Req,0},
+        {18,7,Req,0},
+        {18,8,Req,0},
+        {18,9,Req,0},
+        {18,10,Man,0},
+        {19,1,Man,0},
+        {19,2,Adv,0},
+        {20,1,Adv,0},
+        {20,2,Req,0},
+        {20,3,Req,0},
+        {20,4,Req,0},
+        {20,5,Adv,0},
+        {20,6,Req,0},
+        {20,7,Req,0},
+        {20,8,Req,0},
+        {20,9,Req,0},
+        {20,10,Adv,0},
+        {20,11,Req,0},
+        {20,12,Req,0},
+        {20,13,Req,0},
+        {20,14,Req,0},
+        {21,1,Req,0},
+        {21,2,Req,0},
+        {21,3,Req,0},
+        {21,4,Req,0},
+        {21,5,Req,0},
+        {21,6,Req,0},
+        {21,7,Req,0},
+        {21,8,Req,0},
+        {21,9,Req,0},
+        {21,10,Req,0},
+        {21,11,Adv,0},
+        {21,12,Req,0},
+        {21,13,Man,0},
+        {21,14,Req,0},
+        {21,15,Req,0},
+        {21,16,Req,0},
+        {21,17,Man,0},
+        {21,18,Man,0},
+        {21,19,Man,0},
+        {21,20,Man,0},
+        {21,21,Req,0},
+        {21,22,Man,0},
+        {21,23,Req,0},
+        {21,24,Req,0},
+        {21,25,Req,0},
+        {21,26,Req,0},
+        {22,1,Req,0},
+        {22,2,Man,0},
+        {22,3,Req,0},
+        {22,4,Man,0},
+        {22,5,Man,0},
+        {22,6,Man,0},
+        {22,7,Req,0},
+        {22,8,Req,0},
+        {22,9,Req,0},
+        {22,10,Req,0},
+        {22,11,Req,0},
+        {22,12,Man,0},
+        {22,13,Req,0},
+        {22,14,Man,0},
+        {22,15,Req,0},
+        {22,16,Req,0},
+        {22,17,Req,0},
+        {22,18,Req,0},
+        {22,19,Req,0},
+        {22,20,Man,0},
+        {23,1,Adv,0},
+        {23,2,Req,0},
+        {23,3,Adv,0},
+        {23,4,Req,0},
+        {23,5,Adv,0},
+        {23,6,Req,0},
+        {23,7,Adv,0},
+        {23,8,Req,0},
     };
-
-    const std::map<std::string, std::string> premiumCheckers{
-        {"Autosar: A0-1-3",""},
-        {"Autosar: A0-1-4",""},
-        {"Autosar: A0-1-5",""},
-        {"Autosar: A0-1-6",""},
-        {"Autosar: A0-4-2",""},
-        {"Autosar: A0-4-4",""},
-        {"Autosar: A10-1-1",""},
-        {"Autosar: A11-0-2",""},
-        {"Autosar: A11-3-1",""},
-        {"Autosar: A13-2-1",""},
-        {"Autosar: A13-2-3",""},
-        {"Autosar: A13-5-2",""},
-        {"Autosar: A13-5-5",""},
-        {"Autosar: A15-1-2",""},
-        {"Autosar: A15-3-5",""},
-        {"Autosar: A16-6-1",""},
-        {"Autosar: A16-7-1",""},
-        {"Autosar: A18-0-3",""},
-        {"Autosar: A18-1-1",""},
-        {"Autosar: A18-1-2",""},
-        {"Autosar: A18-1-3",""},
-        {"Autosar: A18-5-1",""},
-        {"Autosar: A18-9-1",""},
-        {"Autosar: A2-11-1",""},
-        {"Autosar: A2-13-1",""},
-        {"Autosar: A2-13-3",""},
-        {"Autosar: A2-13-5",""},
-        {"Autosar: A2-5-2",""},
-        {"Autosar: A2-7-1",""},
-        {"Autosar: A20-8-2","warning"},
-        {"Autosar: A20-8-3","warning"},
-        {"Autosar: A20-8-4",""},
-        {"Autosar: A20-8-5",""},
-        {"Autosar: A20-8-6",""},
-        {"Autosar: A21-8-1","warning"},
-        {"Autosar: A23-0-1",""},
-        {"Autosar: A25-1-1","warning"},
-        {"Autosar: A25-4-1","warning"},
-        {"Autosar: A26-5-1",""},
-        {"Autosar: A26-5-2",""},
-        {"Autosar: A27-0-1","warning"},
-        {"Autosar: A27-0-2",""},
-        {"Autosar: A27-0-4",""},
-        {"Autosar: A3-1-3",""},
-        {"Autosar: A3-1-4",""},
-        {"Autosar: A3-3-1",""},
-        {"Autosar: A3-9-1",""},
-        {"Autosar: A4-10-1",""},
-        {"Autosar: A4-7-1",""},
-        {"Autosar: A5-0-2",""},
-        {"Autosar: A5-0-3",""},
-        {"Autosar: A5-0-4",""},
-        {"Autosar: A5-1-1",""},
-        {"Autosar: A5-1-2",""},
-        {"Autosar: A5-1-3",""},
-        {"Autosar: A5-1-6",""},
-        {"Autosar: A5-1-7",""},
-        {"Autosar: A5-16-1",""},
-        {"Autosar: A5-2-1",""},
-        {"Autosar: A5-2-3",""},
-        {"Autosar: A5-2-4",""},
-        {"Autosar: A5-3-3",""},
-        {"Autosar: A6-5-3",""},
-        {"Autosar: A7-1-4",""},
-        {"Autosar: A7-1-6",""},
-        {"Autosar: A7-1-7",""},
-        {"Autosar: A7-2-1",""},
-        {"Autosar: A7-2-2",""},
-        {"Autosar: A7-6-1",""},
-        {"Autosar: A8-4-1",""},
-        {"Autosar: A8-5-3",""},
-        {"Autosar: A9-3-1",""},
-        {"Cert C++: CON50-CPP",""},
-        {"Cert C++: CON51-CPP",""},
-        {"Cert C++: CON52-CPP",""},
-        {"Cert C++: CON53-CPP",""},
-        {"Cert C++: CON54-CPP",""},
-        {"Cert C++: CON55-CPP",""},
-        {"Cert C++: CON56-CPP",""},
-        {"Cert C++: CTR50-CPP",""},
-        {"Cert C++: CTR52-CPP",""},
-        {"Cert C++: CTR53-CPP",""},
-        {"Cert C++: CTR56-CPP",""},
-        {"Cert C++: CTR57-CPP","warning"},
-        {"Cert C++: CTR58-CPP","warning"},
-        {"Cert C++: DCL50-CPP",""},
-        {"Cert C++: DCL51-CPP",""},
-        {"Cert C++: DCL52-CPP",""},
-        {"Cert C++: DCL53-CPP",""},
-        {"Cert C++: DCL54-CPP",""},
-        {"Cert C++: DCL56-CPP",""},
-        {"Cert C++: DCL58-CPP",""},
-        {"Cert C++: DCL59-CPP",""},
-        {"Cert C++: ERR50-CPP",""},
-        {"Cert C++: ERR51-CPP",""},
-        {"Cert C++: ERR52-CPP",""},
-        {"Cert C++: ERR53-CPP",""},
-        {"Cert C++: ERR54-CPP",""},
-        {"Cert C++: ERR55-CPP",""},
-        {"Cert C++: ERR56-CPP",""},
-        {"Cert C++: ERR58-CPP",""},
-        {"Cert C++: ERR59-CPP","warning"},
-        {"Cert C++: ERR60-CPP","warning"},
-        {"Cert C++: ERR61-CPP",""},
-        {"Cert C++: ERR62-CPP",""},
-        {"Cert C++: EXP50-CPP",""},
-        {"Cert C++: EXP51-CPP",""},
-        {"Cert C++: EXP55-CPP",""},
-        {"Cert C++: EXP56-CPP",""},
-        {"Cert C++: EXP57-CPP",""},
-        {"Cert C++: EXP58-CPP",""},
-        {"Cert C++: EXP59-CPP",""},
-        {"Cert C++: EXP60-CPP",""},
-        {"Cert C++: FIO51-CPP",""},
-        {"Cert C++: INT50-CPP",""},
-        {"Cert C++: MEM52-CPP",""},
-        {"Cert C++: MEM53-CPP",""},
-        {"Cert C++: MEM54-CPP",""},
-        {"Cert C++: MEM55-CPP",""},
-        {"Cert C++: MEM57-CPP",""},
-        {"Cert C++: MSC50-CPP",""},
-        {"Cert C++: MSC51-CPP",""},
-        {"Cert C++: MSC53-CPP",""},
-        {"Cert C++: MSC54-CPP",""},
-        {"Cert C++: OOP51-CPP",""},
-        {"Cert C++: OOP55-CPP",""},
-        {"Cert C++: OOP56-CPP",""},
-        {"Cert C++: OOP57-CPP",""},
-        {"Cert C++: OOP58-CPP",""},
-        {"Cert C++: STR50-CPP",""},
-        {"Cert C++: STR53-CPP",""},
-        {"Cert C: ARR30-C",""},
-        {"Cert C: ARR32-C",""},
-        {"Cert C: ARR37-C",""},
-        {"Cert C: ARR38-C",""},
-        {"Cert C: ARR39-C",""},
-        {"Cert C: CON30-C",""},
-        {"Cert C: CON31-C",""},
-        {"Cert C: CON32-C",""},
-        {"Cert C: CON33-C",""},
-        {"Cert C: CON34-C",""},
-        {"Cert C: CON35-C",""},
-        {"Cert C: CON36-C",""},
-        {"Cert C: CON37-C",""},
-        {"Cert C: CON38-C",""},
-        {"Cert C: CON39-C",""},
-        {"Cert C: CON40-C",""},
-        {"Cert C: CON41-C",""},
-        {"Cert C: DCL03-C",""},
-        {"Cert C: DCL04-C",""},
-        {"Cert C: DCL31-C",""},
-        {"Cert C: DCL36-C",""},
-        {"Cert C: DCL37-C",""},
-        {"Cert C: DCL38-C",""},
-        {"Cert C: DCL39-C",""},
-        {"Cert C: DCL40-C",""},
-        {"Cert C: DCL41-C",""},
-        {"Cert C: ENV30-C",""},
-        {"Cert C: ENV31-C",""},
-        {"Cert C: ENV32-C",""},
-        {"Cert C: ENV33-C",""},
-        {"Cert C: ENV34-C",""},
-        {"Cert C: ERR30-C",""},
-        {"Cert C: ERR32-C",""},
-        {"Cert C: ERR33-C",""},
-        {"Cert C: EXP03-C",""},
-        {"Cert C: EXP05-C",""},
-        {"Cert C: EXP09-C",""},
-        {"Cert C: EXP13-C",""},
-        {"Cert C: EXP15-C",""},
-        {"Cert C: EXP19-C",""},
-        {"Cert C: EXP32-C",""},
-        {"Cert C: EXP35-C",""},
-        {"Cert C: EXP36-C",""},
-        {"Cert C: EXP37-C",""},
-        {"Cert C: EXP39-C",""},
-        {"Cert C: EXP40-C",""},
-        {"Cert C: EXP42-C",""},
-        {"Cert C: EXP43-C",""},
-        {"Cert C: EXP44-C",""},
-        {"Cert C: EXP45-C",""},
-        {"Cert C: FIO30-C",""},
-        {"Cert C: FIO32-C",""},
-        {"Cert C: FIO34-C",""},
-        {"Cert C: FIO37-C",""},
-        {"Cert C: FIO38-C",""},
-        {"Cert C: FIO40-C",""},
-        {"Cert C: FIO41-C",""},
-        {"Cert C: FIO44-C",""},
-        {"Cert C: FIO45-C",""},
-        {"Cert C: FLP30-C",""},
-        {"Cert C: FLP36-C","portability"},
-        {"Cert C: FLP37-C",""},
-        {"Cert C: INT30-C",""},
-        {"Cert C: INT31-C",""},
-        {"Cert C: INT32-C",""},
-        {"Cert C: INT33-C",""},
-        {"Cert C: INT34-C",""},
-        {"Cert C: INT35-C",""},
-        {"Cert C: INT36-C",""},
-        {"Cert C: MEM33-C",""},
-        {"Cert C: MEM35-C",""},
-        {"Cert C: MEM36-C",""},
-        {"Cert C: MSC30-C",""},
-        {"Cert C: MSC32-C",""},
-        {"Cert C: MSC33-C",""},
-        {"Cert C: MSC38-C",""},
-        {"Cert C: MSC39-C",""},
-        {"Cert C: MSC40-C",""},
-        {"Cert C: PRE00-C",""},
-        {"Cert C: PRE01-C",""},
-        {"Cert C: PRE02-C",""},
-        {"Cert C: PRE04-C",""},
-        {"Cert C: PRE05-C",""},
-        {"Cert C: PRE06-C",""},
-        {"Cert C: PRE07-C",""},
-        {"Cert C: PRE08-C",""},
-        {"Cert C: PRE09-C",""},
-        {"Cert C: PRE10-C",""},
-        {"Cert C: PRE11-C",""},
-        {"Cert C: PRE12-C",""},
-        {"Cert C: PRE31-C",""},
-        {"Cert C: SIG30-C",""},
-        {"Cert C: SIG31-C",""},
-        {"Cert C: SIG34-C",""},
-        {"Cert C: SIG35-C",""},
-        {"Cert C: STR31-C",""},
-        {"Cert C: STR32-C",""},
-        {"Cert C: STR34-C",""},
-        {"Cert C: STR38-C",""},
-        {"Misra C++ 2008: 3-2-3",""},
-        {"Misra C++ 2008: 3-2-4",""},
-        {"Misra C++ 2008: 7-5-4",""},
-        {"Misra C++ 2008: M0-1-11",""},
-        {"Misra C++ 2008: M0-1-12",""},
-        {"Misra C++ 2008: M0-1-4",""},
-        {"Misra C++ 2008: M0-1-5",""},
-        {"Misra C++ 2008: M0-1-7",""},
-        {"Misra C++ 2008: M0-1-8",""},
-        {"Misra C++ 2008: M0-3-2",""},
-        {"Misra C++ 2008: M1-0-1","portability"},
-        {"Misra C++ 2008: M10-1-1",""},
-        {"Misra C++ 2008: M10-1-2",""},
-        {"Misra C++ 2008: M10-1-3",""},
-        {"Misra C++ 2008: M10-2-1",""},
-        {"Misra C++ 2008: M10-3-1",""},
-        {"Misra C++ 2008: M10-3-2",""},
-        {"Misra C++ 2008: M10-3-3",""},
-        {"Misra C++ 2008: M11-0-1",""},
-        {"Misra C++ 2008: M12-1-2",""},
-        {"Misra C++ 2008: M12-8-1",""},
-        {"Misra C++ 2008: M12-8-2",""},
-        {"Misra C++ 2008: M14-5-1","warning"},
-        {"Misra C++ 2008: M14-5-2","warning"},
-        {"Misra C++ 2008: M14-5-3","warning"},
-        {"Misra C++ 2008: M14-6-1","warning"},
-        {"Misra C++ 2008: M14-6-2","warning"},
-        {"Misra C++ 2008: M14-7-1",""},
-        {"Misra C++ 2008: M14-7-2",""},
-        {"Misra C++ 2008: M14-7-3",""},
-        {"Misra C++ 2008: M14-8-1",""},
-        {"Misra C++ 2008: M14-8-2",""},
-        {"Misra C++ 2008: M15-0-3",""},
-        {"Misra C++ 2008: M15-1-1",""},
-        {"Misra C++ 2008: M15-1-2",""},
-        {"Misra C++ 2008: M15-1-3",""},
-        {"Misra C++ 2008: M15-3-2","warning"},
-        {"Misra C++ 2008: M15-3-3",""},
-        {"Misra C++ 2008: M15-3-4",""},
-        {"Misra C++ 2008: M15-3-6",""},
-        {"Misra C++ 2008: M15-3-7",""},
-        {"Misra C++ 2008: M15-4-1",""},
-        {"Misra C++ 2008: M15-5-2",""},
-        {"Misra C++ 2008: M16-0-1",""},
-        {"Misra C++ 2008: M16-0-2",""},
-        {"Misra C++ 2008: M16-0-3",""},
-        {"Misra C++ 2008: M16-0-4",""},
-        {"Misra C++ 2008: M16-0-6",""},
-        {"Misra C++ 2008: M16-0-7",""},
-        {"Misra C++ 2008: M16-0-8",""},
-        {"Misra C++ 2008: M16-1-1",""},
-        {"Misra C++ 2008: M16-1-2",""},
-        {"Misra C++ 2008: M16-2-1",""},
-        {"Misra C++ 2008: M16-2-2",""},
-        {"Misra C++ 2008: M16-2-3",""},
-        {"Misra C++ 2008: M16-2-4",""},
-        {"Misra C++ 2008: M16-2-5",""},
-        {"Misra C++ 2008: M16-2-6",""},
-        {"Misra C++ 2008: M16-3-1",""},
-        {"Misra C++ 2008: M16-3-2",""},
-        {"Misra C++ 2008: M17-0-1",""},
-        {"Misra C++ 2008: M17-0-2",""},
-        {"Misra C++ 2008: M17-0-3",""},
-        {"Misra C++ 2008: M17-0-5",""},
-        {"Misra C++ 2008: M18-0-1",""},
-        {"Misra C++ 2008: M18-0-2",""},
-        {"Misra C++ 2008: M18-0-3",""},
-        {"Misra C++ 2008: M18-0-4",""},
-        {"Misra C++ 2008: M18-0-5",""},
-        {"Misra C++ 2008: M18-2-1",""},
-        {"Misra C++ 2008: M18-4-1",""},
-        {"Misra C++ 2008: M18-7-1",""},
-        {"Misra C++ 2008: M19-3-1",""},
-        {"Misra C++ 2008: M2-10-1",""},
-        {"Misra C++ 2008: M2-10-3",""},
-        {"Misra C++ 2008: M2-10-4",""},
-        {"Misra C++ 2008: M2-10-5",""},
-        {"Misra C++ 2008: M2-10-6",""},
-        {"Misra C++ 2008: M2-13-2",""},
-        {"Misra C++ 2008: M2-13-3",""},
-        {"Misra C++ 2008: M2-13-4",""},
-        {"Misra C++ 2008: M2-13-5",""},
-        {"Misra C++ 2008: M2-3-1",""},
-        {"Misra C++ 2008: M2-7-1",""},
-        {"Misra C++ 2008: M2-7-2",""},
-        {"Misra C++ 2008: M2-7-3",""},
-        {"Misra C++ 2008: M27-0-1",""},
-        {"Misra C++ 2008: M3-1-1",""},
-        {"Misra C++ 2008: M3-1-2",""},
-        {"Misra C++ 2008: M3-1-3",""},
-        {"Misra C++ 2008: M3-2-1",""},
-        {"Misra C++ 2008: M3-3-1",""},
-        {"Misra C++ 2008: M3-3-2",""},
-        {"Misra C++ 2008: M3-9-1",""},
-        {"Misra C++ 2008: M3-9-2",""},
-        {"Misra C++ 2008: M3-9-3",""},
-        {"Misra C++ 2008: M4-10-1",""},
-        {"Misra C++ 2008: M4-10-2",""},
-        {"Misra C++ 2008: M4-5-1",""},
-        {"Misra C++ 2008: M4-5-2",""},
-        {"Misra C++ 2008: M4-5-3",""},
-        {"Misra C++ 2008: M5-0-10",""},
-        {"Misra C++ 2008: M5-0-11",""},
-        {"Misra C++ 2008: M5-0-12",""},
-        {"Misra C++ 2008: M5-0-14",""},
-        {"Misra C++ 2008: M5-0-15",""},
-        {"Misra C++ 2008: M5-0-2",""},
-        {"Misra C++ 2008: M5-0-20",""},
-        {"Misra C++ 2008: M5-0-21",""},
-        {"Misra C++ 2008: M5-0-3",""},
-        {"Misra C++ 2008: M5-0-4",""},
-        {"Misra C++ 2008: M5-0-5",""},
-        {"Misra C++ 2008: M5-0-6",""},
-        {"Misra C++ 2008: M5-0-7",""},
-        {"Misra C++ 2008: M5-0-8",""},
-        {"Misra C++ 2008: M5-0-9",""},
-        {"Misra C++ 2008: M5-14-1",""},
-        {"Misra C++ 2008: M5-17-1",""},
-        {"Misra C++ 2008: M5-18-1",""},
-        {"Misra C++ 2008: M5-19-1",""},
-        {"Misra C++ 2008: M5-2-1",""},
-        {"Misra C++ 2008: M5-2-10",""},
-        {"Misra C++ 2008: M5-2-11",""},
-        {"Misra C++ 2008: M5-2-12",""},
-        {"Misra C++ 2008: M5-2-2",""},
-        {"Misra C++ 2008: M5-2-3",""},
-        {"Misra C++ 2008: M5-2-5",""},
-        {"Misra C++ 2008: M5-2-6",""},
-        {"Misra C++ 2008: M5-2-7",""},
-        {"Misra C++ 2008: M5-2-8",""},
-        {"Misra C++ 2008: M5-2-9",""},
-        {"Misra C++ 2008: M5-3-1",""},
-        {"Misra C++ 2008: M5-3-2",""},
-        {"Misra C++ 2008: M5-3-3",""},
-        {"Misra C++ 2008: M6-2-1",""},
-        {"Misra C++ 2008: M6-2-2",""},
-        {"Misra C++ 2008: M6-2-3",""},
-        {"Misra C++ 2008: M6-3-1",""},
-        {"Misra C++ 2008: M6-4-1",""},
-        {"Misra C++ 2008: M6-4-2",""},
-        {"Misra C++ 2008: M6-4-3",""},
-        {"Misra C++ 2008: M6-4-4",""},
-        {"Misra C++ 2008: M6-4-5",""},
-        {"Misra C++ 2008: M6-4-6",""},
-        {"Misra C++ 2008: M6-4-7",""},
-        {"Misra C++ 2008: M6-4-8",""},
-        {"Misra C++ 2008: M6-5-1",""},
-        {"Misra C++ 2008: M6-5-2",""},
-        {"Misra C++ 2008: M6-5-3",""},
-        {"Misra C++ 2008: M6-5-4",""},
-        {"Misra C++ 2008: M6-5-5",""},
-        {"Misra C++ 2008: M6-5-6",""},
-        {"Misra C++ 2008: M6-6-1",""},
-        {"Misra C++ 2008: M6-6-2",""},
-        {"Misra C++ 2008: M6-6-3",""},
-        {"Misra C++ 2008: M6-6-4",""},
-        {"Misra C++ 2008: M6-6-5",""},
-        {"Misra C++ 2008: M7-2-1",""},
-        {"Misra C++ 2008: M7-3-1",""},
-        {"Misra C++ 2008: M7-3-2",""},
-        {"Misra C++ 2008: M7-3-3",""},
-        {"Misra C++ 2008: M7-3-4",""},
-        {"Misra C++ 2008: M7-3-5",""},
-        {"Misra C++ 2008: M7-3-6",""},
-        {"Misra C++ 2008: M7-4-2",""},
-        {"Misra C++ 2008: M7-4-3",""},
-        {"Misra C++ 2008: M7-5-3",""},
-        {"Misra C++ 2008: M8-0-1",""},
-        {"Misra C++ 2008: M8-3-1",""},
-        {"Misra C++ 2008: M8-4-4",""},
-        {"Misra C++ 2008: M8-5-2",""},
-        {"Misra C++ 2008: M8-5-3",""},
-        {"Misra C++ 2008: M9-3-1",""},
-        {"Misra C++ 2008: M9-5-1",""},
-        {"Misra C++ 2008: M9-6-2",""},
-        {"Misra C++ 2008: M9-6-3",""},
-        {"Misra C++ 2008: M9-6-4",""},
-        {"Misra C++ 2023: 0.1.2",""},
-        {"Misra C++ 2023: 0.2.1",""},
-        {"Misra C++ 2023: 0.2.2",""},
-        {"Misra C++ 2023: 0.2.3",""},
-        {"Misra C++ 2023: 0.2.4",""},
-        {"Misra C++ 2023: 10.0.1",""},
-        {"Misra C++ 2023: 10.1.2",""},
-        {"Misra C++ 2023: 10.2.1",""},
-        {"Misra C++ 2023: 10.2.2",""},
-        {"Misra C++ 2023: 10.2.3",""},
-        {"Misra C++ 2023: 10.3.1",""},
-        {"Misra C++ 2023: 10.4.1",""},
-        {"Misra C++ 2023: 11.3.1",""},
-        {"Misra C++ 2023: 11.3.2",""},
-        {"Misra C++ 2023: 11.6.1",""},
-        {"Misra C++ 2023: 11.6.3",""},
-        {"Misra C++ 2023: 12.2.1",""},
-        {"Misra C++ 2023: 12.2.2",""},
-        {"Misra C++ 2023: 12.2.3",""},
-        {"Misra C++ 2023: 12.3.1",""},
-        {"Misra C++ 2023: 13.1.1",""},
-        {"Misra C++ 2023: 13.1.2",""},
-        {"Misra C++ 2023: 13.3.1",""},
-        {"Misra C++ 2023: 13.3.2",""},
-        {"Misra C++ 2023: 13.3.3",""},
-        {"Misra C++ 2023: 13.3.4",""},
-        {"Misra C++ 2023: 14.1.1",""},
-        {"Misra C++ 2023: 15.0.1",""},
-        {"Misra C++ 2023: 15.0.2",""},
-        {"Misra C++ 2023: 15.1.2",""},
-        {"Misra C++ 2023: 15.1.3",""},
-        {"Misra C++ 2023: 15.1.5",""},
-        {"Misra C++ 2023: 16.5.1",""},
-        {"Misra C++ 2023: 16.5.2",""},
-        {"Misra C++ 2023: 16.6.1",""},
-        {"Misra C++ 2023: 17.8.1",""},
-        {"Misra C++ 2023: 18.1.1",""},
-        {"Misra C++ 2023: 18.1.2",""},
-        {"Misra C++ 2023: 18.3.1",""},
-        {"Misra C++ 2023: 18.3.2",""},
-        {"Misra C++ 2023: 18.3.3",""},
-        {"Misra C++ 2023: 18.4.1",""},
-        {"Misra C++ 2023: 18.5.1",""},
-        {"Misra C++ 2023: 18.5.2",""},
-        {"Misra C++ 2023: 19.0.1",""},
-        {"Misra C++ 2023: 19.0.2",""},
-        {"Misra C++ 2023: 19.0.3",""},
-        {"Misra C++ 2023: 19.0.4",""},
-        {"Misra C++ 2023: 19.1.1",""},
-        {"Misra C++ 2023: 19.1.2",""},
-        {"Misra C++ 2023: 19.1.3",""},
-        {"Misra C++ 2023: 19.2.1",""},
-        {"Misra C++ 2023: 19.2.2",""},
-        {"Misra C++ 2023: 19.2.3",""},
-        {"Misra C++ 2023: 19.3.1",""},
-        {"Misra C++ 2023: 19.3.2",""},
-        {"Misra C++ 2023: 19.3.3",""},
-        {"Misra C++ 2023: 19.3.4",""},
-        {"Misra C++ 2023: 19.6.1",""},
-        {"Misra C++ 2023: 21.10.1",""},
-        {"Misra C++ 2023: 21.10.2",""},
-        {"Misra C++ 2023: 21.10.3",""},
-        {"Misra C++ 2023: 21.2.1",""},
-        {"Misra C++ 2023: 21.2.2",""},
-        {"Misra C++ 2023: 21.2.3",""},
-        {"Misra C++ 2023: 21.2.4",""},
-        {"Misra C++ 2023: 21.6.1",""},
-        {"Misra C++ 2023: 21.6.2",""},
-        {"Misra C++ 2023: 21.6.3",""},
-        {"Misra C++ 2023: 21.6.4",""},
-        {"Misra C++ 2023: 21.6.5",""},
-        {"Misra C++ 2023: 22.3.1",""},
-        {"Misra C++ 2023: 22.4.1",""},
-        {"Misra C++ 2023: 23.11.1",""},
-        {"Misra C++ 2023: 24.5.1",""},
-        {"Misra C++ 2023: 24.5.2",""},
-        {"Misra C++ 2023: 25.5.1",""},
-        {"Misra C++ 2023: 25.5.2",""},
-        {"Misra C++ 2023: 25.5.3",""},
-        {"Misra C++ 2023: 26.3.1",""},
-        {"Misra C++ 2023: 28.3.1",""},
-        {"Misra C++ 2023: 28.6.1",""},
-        {"Misra C++ 2023: 28.6.2",""},
-        {"Misra C++ 2023: 30.0.1",""},
-        {"Misra C++ 2023: 30.0.2",""},
-        {"Misra C++ 2023: 4.1.1",""},
-        {"Misra C++ 2023: 4.1.2",""},
-        {"Misra C++ 2023: 5.0.1",""},
-        {"Misra C++ 2023: 5.10.1",""},
-        {"Misra C++ 2023: 5.13.1",""},
-        {"Misra C++ 2023: 5.13.2",""},
-        {"Misra C++ 2023: 5.13.3",""},
-        {"Misra C++ 2023: 5.13.4",""},
-        {"Misra C++ 2023: 5.13.5",""},
-        {"Misra C++ 2023: 5.13.6",""},
-        {"Misra C++ 2023: 5.13.7",""},
-        {"Misra C++ 2023: 5.7.1",""},
-        {"Misra C++ 2023: 5.7.2",""},
-        {"Misra C++ 2023: 5.7.3",""},
-        {"Misra C++ 2023: 6.0.1",""},
-        {"Misra C++ 2023: 6.0.2",""},
-        {"Misra C++ 2023: 6.0.3",""},
-        {"Misra C++ 2023: 6.0.4",""},
-        {"Misra C++ 2023: 6.2.2",""},
-        {"Misra C++ 2023: 6.2.3",""},
-        {"Misra C++ 2023: 6.2.4",""},
-        {"Misra C++ 2023: 6.4.2",""},
-        {"Misra C++ 2023: 6.4.3",""},
-        {"Misra C++ 2023: 6.5.1",""},
-        {"Misra C++ 2023: 6.5.2",""},
-        {"Misra C++ 2023: 6.7.1",""},
-        {"Misra C++ 2023: 6.7.2",""},
-        {"Misra C++ 2023: 6.8.3",""},
-        {"Misra C++ 2023: 6.8.4",""},
-        {"Misra C++ 2023: 6.9.1",""},
-        {"Misra C++ 2023: 6.9.2",""},
-        {"Misra C++ 2023: 7.0.1",""},
-        {"Misra C++ 2023: 7.0.2",""},
-        {"Misra C++ 2023: 7.0.3",""},
-        {"Misra C++ 2023: 7.0.4",""},
-        {"Misra C++ 2023: 7.0.5",""},
-        {"Misra C++ 2023: 7.0.6",""},
-        {"Misra C++ 2023: 7.11.1",""},
-        {"Misra C++ 2023: 7.11.2",""},
-        {"Misra C++ 2023: 7.11.3",""},
-        {"Misra C++ 2023: 8.0.1",""},
-        {"Misra C++ 2023: 8.1.1",""},
-        {"Misra C++ 2023: 8.1.2",""},
-        {"Misra C++ 2023: 8.14.1",""},
-        {"Misra C++ 2023: 8.18.2",""},
-        {"Misra C++ 2023: 8.19.1",""},
-        {"Misra C++ 2023: 8.2.1",""},
-        {"Misra C++ 2023: 8.2.10",""},
-        {"Misra C++ 2023: 8.2.11",""},
-        {"Misra C++ 2023: 8.2.2",""},
-        {"Misra C++ 2023: 8.2.3",""},
-        {"Misra C++ 2023: 8.2.4",""},
-        {"Misra C++ 2023: 8.2.5",""},
-        {"Misra C++ 2023: 8.2.6",""},
-        {"Misra C++ 2023: 8.2.7",""},
-        {"Misra C++ 2023: 8.2.8",""},
-        {"Misra C++ 2023: 8.2.9",""},
-        {"Misra C++ 2023: 8.20.1",""},
-        {"Misra C++ 2023: 8.3.1",""},
-        {"Misra C++ 2023: 8.3.2",""},
-        {"Misra C++ 2023: 9.2.1",""},
-        {"Misra C++ 2023: 9.3.1",""},
-        {"Misra C++ 2023: 9.4.1",""},
-        {"Misra C++ 2023: 9.4.2",""},
-        {"Misra C++ 2023: 9.5.1",""},
-        {"Misra C++ 2023: 9.5.2",""},
-        {"Misra C++ 2023: 9.6.1",""},
-        {"Misra C++ 2023: 9.6.2",""},
-        {"Misra C++ 2023: 9.6.3",""},
-        {"Misra C++ 2023: 9.6.4",""},
-        {"Misra C: 1.4",""},
-        {"Misra C: 1.5",""},
-        {"Misra C: 10.1",""},
-        {"Misra C: 10.2",""},
-        {"Misra C: 10.3",""},
-        {"Misra C: 10.4",""},
-        {"Misra C: 10.5",""},
-        {"Misra C: 10.6",""},
-        {"Misra C: 10.7",""},
-        {"Misra C: 10.8",""},
-        {"Misra C: 11.1",""},
-        {"Misra C: 11.10",""},
-        {"Misra C: 11.2",""},
-        {"Misra C: 11.3",""},
-        {"Misra C: 11.4",""},
-        {"Misra C: 11.8",""},
-        {"Misra C: 12.2",""},
-        {"Misra C: 12.3",""},
-        {"Misra C: 12.6",""},
-        {"Misra C: 13.1",""},
-        {"Misra C: 13.2",""},
-        {"Misra C: 13.3",""},
-        {"Misra C: 13.4",""},
-        {"Misra C: 13.5",""},
-        {"Misra C: 13.6",""},
-        {"Misra C: 15.5",""},
-        {"Misra C: 16.3",""},
-        {"Misra C: 17.10",""},
-        {"Misra C: 17.11",""},
-        {"Misra C: 17.12",""},
-        {"Misra C: 17.13",""},
-        {"Misra C: 17.2",""},
-        {"Misra C: 17.3",""},
-        {"Misra C: 17.4",""},
-        {"Misra C: 17.9",""},
-        {"Misra C: 18.10",""},
-        {"Misra C: 18.5",""},
-        {"Misra C: 18.8",""},
-        {"Misra C: 18.9",""},
-        {"Misra C: 20.3",""},
-        {"Misra C: 20.7",""},
-        {"Misra C: 21.1",""},
-        {"Misra C: 21.12",""},
-        {"Misra C: 21.16",""},
-        {"Misra C: 21.2",""},
-        {"Misra C: 21.20",""},
-        {"Misra C: 21.22",""},
-        {"Misra C: 21.23",""},
-        {"Misra C: 21.24",""},
-        {"Misra C: 21.25","warning"},
-        {"Misra C: 21.26","warning"},
-        {"Misra C: 22.11",""},
-        {"Misra C: 22.12",""},
-        {"Misra C: 22.13",""},
-        {"Misra C: 22.14",""},
-        {"Misra C: 22.15",""},
-        {"Misra C: 22.16","warning"},
-        {"Misra C: 22.17","warning"},
-        {"Misra C: 22.18","warning"},
-        {"Misra C: 22.19","warning"},
-        {"Misra C: 22.20",""},
-        {"Misra C: 23.1",""},
-        {"Misra C: 23.2",""},
-        {"Misra C: 23.3",""},
-        {"Misra C: 23.4",""},
-        {"Misra C: 23.5",""},
-        {"Misra C: 23.6",""},
-        {"Misra C: 23.7",""},
-        {"Misra C: 23.8",""},
-        {"Misra C: 5.1",""},
-        {"Misra C: 5.2",""},
-        {"Misra C: 6.1",""},
-        {"Misra C: 6.3",""},
-        {"Misra C: 7.4","style"},
-        {"Misra C: 7.5",""},
-        {"Misra C: 7.6",""},
-        {"Misra C: 8.1",""},
-        {"Misra C: 8.10",""},
-        {"Misra C: 8.15",""},
-        {"Misra C: 8.15",""},
-        {"Misra C: 8.16",""},
-        {"Misra C: 8.17",""},
-        {"Misra C: 8.3",""},
-        {"Misra C: 8.4",""},
-        {"Misra C: 8.6",""},
-        {"Misra C: 8.7",""},
-        {"Misra C: 8.8",""},
-        {"Misra C: 9.6",""},
-        {"Misra C: 9.7",""},
-        {"Misra C: Dir 4.12",""},
-        {"Misra C: Dir 4.3",""},
-        {"Misra C: Dir 4.4",""},
-        {"Misra C: Dir 4.5",""},
-        {"Misra C: Dir 4.6",""},
-        {"Misra C: Dir 4.9",""},
-        {"PremiumCheckBufferOverrun::addressOfPointerArithmetic","warning"},
-        {"PremiumCheckBufferOverrun::negativeBufferSizeCheckedNonZero","warning"},
-        {"PremiumCheckBufferOverrun::negativeBufferSizeCheckedNonZero","warning"},
-        {"PremiumCheckHang::infiniteLoop",""},
-        {"PremiumCheckHang::infiniteLoopContinue",""},
-        {"PremiumCheckOther::arrayPointerComparison","style"},
-        {"PremiumCheckOther::invalidPointerLiteral",""},
-        {"PremiumCheckOther::knownResult","style"},
-        {"PremiumCheckOther::lossOfPrecision","style"},
-        {"PremiumCheckOther::pointerCast","style"},
-        {"PremiumCheckOther::reassignInLoop","style"},
-        {"PremiumCheckOther::unreachableCode","style"},
-        {"PremiumCheckOther::useAfterFree",""},
-        {"PremiumCheckStrictAlias::strictAliasCondition","warning"},
-        {"PremiumCheckUninitVar::uninitmember",""},
-        {"PremiumCheckUninitVar::uninitvar",""},
-        {"PremiumCheckUnusedVar::unreadVariable","style"},
-        {"PremiumCheckUnusedVar::unusedPrivateMember","style"}
-    };
-
-    const char Req[] = "Required";
-    const char Adv[] = "Advisory";
-    const char Man[] = "Mandatory";
-    const char Doc[] = "Document";
-
-    const std::vector<MisraInfo> misraC2012Directives =
-    {
+    const std::vector<MisraInfo> misraC2025Directives{
         {1,1,Req,0},
+        {1,2,Adv,0},
         {2,1,Req,0},
         {3,1,Req,0},
         {4,1,Req,0},
@@ -901,28 +679,25 @@ namespace checkers {
         {4,3,Req,0},
         {4,4,Adv,0},
         {4,5,Adv,0},
-        {4,6,Adv,3},
+        {4,6,Adv,0},
         {4,7,Req,0},
         {4,8,Adv,0},
-        {4,9,Adv,3},
+        {4,9,Adv,0},
         {4,10,Req,0},
-        {4,11,Req,3},
+        {4,11,Req,0},
         {4,12,Req,0},
         {4,13,Adv,0},
-        {4,14,Req,2},
-        {4,15,Req,3},
-        {5,1,Req,4},
-        {5,2,Req,4},
-        {5,3,Req,4},
+        {4,14,Req,0},
+        {4,15,Req,0},
+        {5,1,Req,0},
+        {5,2,Req,0},
+        {5,3,Req,0},
     };
-
-    const std::vector<MisraInfo> misraC2012Rules =
-    {
+    const std::vector<MisraInfo> misraC2025Rules{
         {1,1,Req,0},
-        {1,2,Adv,0},
         {1,3,Req,0},
-        {1,4,Req,2}, // amendment 2
-        {1,5,Req,3}, // Amendment 3
+        {1,4,Req,0},
+        {1,5,Req,0},
         {2,1,Req,0},
         {2,2,Req,0},
         {2,3,Adv,0},
@@ -944,6 +719,7 @@ namespace checkers {
         {5,7,Req,0},
         {5,8,Req,0},
         {5,9,Adv,0},
+        {5,10,Req,0},
         {6,1,Req,0},
         {6,2,Req,0},
         {6,3,Req,0},
@@ -970,6 +746,8 @@ namespace checkers {
         {8,15,Req,0},
         {8,16,Adv,0},
         {8,17,Adv,0},
+        {8,18,Req,0},
+        {8,19,Adv,0},
         {9,1,Man,0},
         {9,2,Req,0},
         {9,3,Req,0},
@@ -988,25 +766,25 @@ namespace checkers {
         {11,1,Req,0},
         {11,2,Req,0},
         {11,3,Req,0},
-        {11,4,Adv,0},
+        {11,4,Req,0},
         {11,5,Adv,0},
         {11,6,Req,0},
-        {11,7,Req,0},
         {11,8,Req,0},
         {11,9,Req,0},
         {11,10,Req,0},
+        {11,11,Req,0},
         {12,1,Adv,0},
         {12,2,Req,0},
         {12,3,Adv,0},
         {12,4,Adv,0},
-        {12,5,Man,1}, // amendment 1
-        {12,6,Req,4}, // amendment 4
+        {12,5,Man,0},
+        {12,6,Req,0},
         {13,1,Req,0},
         {13,2,Req,0},
         {13,3,Adv,0},
         {13,4,Adv,0},
         {13,5,Req,0},
-        {13,6,Man,0},
+        {13,6,Req,0},
         {14,1,Req,0},
         {14,2,Req,0},
         {14,3,Req,0},
@@ -1015,7 +793,7 @@ namespace checkers {
         {15,2,Req,0},
         {15,3,Req,0},
         {15,4,Adv,0},
-        {15,5,Adv,0},
+        {15,5,Dis,0},
         {15,6,Req,0},
         {15,7,Req,0},
         {16,1,Req,0},
@@ -1029,8 +807,7 @@ namespace checkers {
         {17,2,Req,0},
         {17,3,Man,0},
         {17,4,Man,0},
-        {17,5,Adv,0},
-        {17,6,Man,0},
+        {17,5,Req,0},
         {17,7,Req,0},
         {17,8,Adv,0},
         {17,9,Man,0},
@@ -1050,6 +827,7 @@ namespace checkers {
         {18,10,Man,0},
         {19,1,Man,0},
         {19,2,Adv,0},
+        {19,3,Req,0},
         {20,1,Adv,0},
         {20,2,Req,0},
         {20,3,Req,0},
@@ -1064,8 +842,7 @@ namespace checkers {
         {20,12,Req,0},
         {20,13,Req,0},
         {20,14,Req,0},
-        {21,1,Req,0},
-        {21,2,Req,0},
+        {20,15,Req,0},
         {21,3,Req,0},
         {21,4,Req,0},
         {21,5,Req,0},
@@ -1074,82 +851,50 @@ namespace checkers {
         {21,8,Req,0},
         {21,9,Req,0},
         {21,10,Req,0},
-        {21,11,Req,0},
-        {21,12,Adv,0},
-        {21,13,Man,1}, // Amendment 1
-        {21,14,Req,1}, // Amendment 1
-        {21,15,Req,1}, // Amendment 1
-        {21,16,Req,1}, // Amendment 1
-        {21,17,Req,1}, // Amendment 1
-        {21,18,Man,1}, // Amendment 1
-        {21,19,Man,1}, // Amendment 1
-        {21,20,Man,1}, // Amendment 1
-        {21,21,Req,3}, // Amendment 3
-        {21,22,Man,3}, // Amendment 3
-        {21,23,Req,3}, // Amendment 3
-        {21,24,Req,3}, // Amendment 3
-        {21,25,Req,4}, // Amendment 4
-        {21,26,Req,4}, // Amendment 4
+        {21,11,Adv,0},
+        {21,12,Req,0},
+        {21,13,Man,0},
+        {21,14,Req,0},
+        {21,15,Req,0},
+        {21,16,Req,0},
+        {21,17,Man,0},
+        {21,18,Man,0},
+        {21,19,Man,0},
+        {21,20,Man,0},
+        {21,21,Req,0},
+        {21,22,Man,0},
+        {21,23,Req,0},
+        {21,24,Req,0},
+        {21,25,Req,0},
+        {21,26,Req,0},
         {22,1,Req,0},
         {22,2,Man,0},
         {22,3,Req,0},
         {22,4,Man,0},
         {22,5,Man,0},
         {22,6,Man,0},
-        {22,7,Req,1}, // Amendment 1
-        {22,8,Req,1}, // Amendment 1
-        {22,9,Req,1}, // Amendment 1
-        {22,10,Req,1}, // Amendment 1
-        {22,11,Req,4}, // Amendment 4
-        {22,12,Man,4}, // Amendment 4
-        {22,13,Req,4}, // Amendment 4
-        {22,14,Man,4}, // Amendment 4
-        {22,15,Req,4}, // Amendment 4
-        {22,16,Req,4}, // Amendment 4
-        {22,17,Req,4}, // Amendment 4
-        {22,18,Req,4}, // Amendment 4
-        {22,19,Req,4}, // Amendment 4
-        {22,20,Man,4}, // Amendment 4
-        {23,1,Adv,3}, // Amendment 3
-        {23,2,Req,3}, // Amendment 3
-        {23,3,Adv,3}, // Amendment 3
-        {23,4,Req,3}, // Amendment 3
-        {23,5,Adv,3}, // Amendment 3
-        {23,6,Req,3}, // Amendment 3
-        {23,7,Adv,3}, // Amendment 3
-        {23,8,Req,3}, // Amendment 3
-    };
-
-    const std::map<std::string, std::string> misraRuleSeverity{
-        {"1.1", "error"}, //{"syntaxError", "unknownMacro"}},
-        {"1.3", "error"}, //most "error"
-        {"2.1", "style"}, //{"alwaysFalse", "duplicateBreak"}},
-        {"2.2", "style"}, //{"alwaysTrue", "redundantCondition", "redundantAssignment", "redundantAssignInSwitch", "unreadVariable"}},
-        {"2.6", "style"}, //{"unusedLabel"}},
-        {"2.8", "style"}, //{"unusedVariable"}},
-        {"5.3", "style"}, //{"shadowVariable"}},
-        {"8.3", "style"}, //{"funcArgNamesDifferent"}}, // inconclusive
-        {"8.13", "style"}, //{"constPointer"}},
-        {"9.1", "error"}, //{"uninitvar"}},
-        {"14.3", "style"}, //{"alwaysTrue", "alwaysFalse", "compareValueOutOfTypeRangeError", "knownConditionTrueFalse"}},
-        {"13.2", "error"}, //{"unknownEvaluationOrder"}},
-        {"13.6", "style"}, //{"sizeofCalculation"}},
-        {"17.4", "error"}, //{"missingReturn"}},
-        {"17.5", "warning"}, //{"argumentSize"}},
-        {"18.1", "error"}, //{"pointerOutOfBounds"}},
-        {"18.2", "error"}, //{"comparePointers"}},
-        {"18.3", "error"}, //{"comparePointers"}},
-        {"18.6", "error"}, //{"danglingLifetime"}},
-        {"19.1", "error"}, //{"overlappingWriteUnion", "overlappingWriteFunction"}},
-        {"20.6", "error"}, //{"preprocessorErrorDirective"}},
-        {"21.13", "error"}, //{"invalidFunctionArg"}},
-        {"21.17", "error"}, //{"bufferAccessOutOfBounds"}},
-        {"21.18", "error"}, //{"bufferAccessOutOfBounds"}},
-        {"22.1", "error"}, //{"memleak", "resourceLeak", "memleakOnRealloc", "leakReturnValNotUsed", "leakNoVarFunctionCall"}},
-        {"22.2", "error"}, //{"autovarInvalidDeallocation"}},
-        {"22.3", "error"}, //{"incompatibleFileOpen"}},
-        {"22.4", "error"}, //{"writeReadOnlyFile"}},
-        {"22.6", "error"}, //{"useClosedFile"}}
+        {22,7,Req,0},
+        {22,8,Req,0},
+        {22,9,Req,0},
+        {22,10,Req,0},
+        {22,11,Req,0},
+        {22,12,Man,0},
+        {22,13,Req,0},
+        {22,14,Man,0},
+        {22,15,Req,0},
+        {22,16,Req,0},
+        {22,17,Req,0},
+        {22,18,Req,0},
+        {22,19,Req,0},
+        {22,20,Man,0},
+        {23,1,Adv,0},
+        {23,2,Req,0},
+        {23,3,Adv,0},
+        {23,4,Req,0},
+        {23,5,Adv,0},
+        {23,6,Req,0},
+        {23,7,Adv,0},
+        {23,8,Req,0},
     };
 
     const std::vector<MisraCppInfo> misraCpp2008Rules =
@@ -1382,6 +1127,14 @@ namespace checkers {
         {27,0,1,Req}
     };
 
+    const std::vector<MisraCppInfo> misraCpp2023Directives =
+    {
+        {0,3,1,Adv},
+        {0,3,2,Req},
+        {5,7,2,Adv},
+        {15,8,1,Req},
+    };
+
     const std::vector<MisraCppInfo> misraCpp2023Rules =
     {
         {0,0,1,Req},
@@ -1392,15 +1145,12 @@ namespace checkers {
         {0,2,2,Req},
         {0,2,3,Adv},
         {0,2,4,Adv},
-        {0,3,1,Adv},
-        {0,3,2,Req},
         {4,1,1,Req},
         {4,1,2,Adv},
         {4,1,3,Req},
         {4,6,1,Req},
         {5,0,1,Adv},
         {5,7,1,Req},
-        {5,7,2,Adv},
         {5,7,3,Req},
         {5,10,1,Req},
         {5,13,1,Req},
@@ -1506,7 +1256,6 @@ namespace checkers {
         {15,1,3,Req},
         {15,1,4,Adv},
         {15,1,5,Req},
-        {15,8,1,Req},
         {16,5,2,Req},
         {16,6,1,Adv},
         {17,8,1,Req},
@@ -1930,9 +1679,25 @@ std::vector<checkers::Info> checkers::autosarInfo{
 };
 
 std::vector<checkers::Info> checkers::certCInfo{
-    {"PRE30-C", "L3"},
-    {"PRE31-C", "L3"},
-    {"PRE32-C", "L3"},
+    {"ARR30-C", "L2"},
+    {"ARR32-C", "L2"},
+    {"ARR36-C", "L3"},
+    {"ARR37-C", "L2"},
+    {"ARR38-C", "L2"},
+    {"ARR39-C", "L2"},
+    {"CON30-C", "L3"},
+    {"CON31-C", "L3"},
+    {"CON32-C", "L3"},
+    {"CON33-C", "L3"},
+    {"CON34-C", "L3"},
+    {"CON35-C", "L3"},
+    {"CON36-C", "L3"},
+    {"CON37-C", "L3"},
+    {"CON38-C", "L3"},
+    {"CON39-C", "L3"},
+    {"CON40-C", "L2"},
+    {"CON41-C", "L3"},
+    {"CON43-C", "L3"},
     {"DCL30-C", "L2"},
     {"DCL31-C", "L3"},
     {"DCL36-C", "L2"},
@@ -1940,181 +1705,368 @@ std::vector<checkers::Info> checkers::certCInfo{
     {"DCL38-C", "L3"},
     {"DCL39-C", "L3"},
     {"DCL40-C", "L3"},
-    {"DCL41-C", "L3"},
+    {"DCL41-C", "L2"},
+    {"ENV30-C", "L3"},
+    {"ENV31-C", "L3"},
+    {"ENV32-C", "L1"},
+    {"ENV33-C", "L1"},
+    {"ENV34-C", "L3"},
+    {"ERR30-C", "L1"},
+    {"ERR32-C", "L3"},
+    {"ERR33-C", "L1"},
+    {"ERR34-C", "L2"},
     {"EXP30-C", "L2"},
     {"EXP32-C", "L2"},
     {"EXP33-C", "L1"},
     {"EXP34-C", "L1"},
-    {"EXP35-C", "L3"},
+    {"EXP35-C", "L2"},
     {"EXP36-C", "L3"},
     {"EXP37-C", "L3"},
     {"EXP39-C", "L3"},
     {"EXP40-C", "L3"},
-    {"EXP42-C", "L2"},
+    {"EXP42-C", "L1"},
     {"EXP43-C", "L3"},
     {"EXP44-C", "L3"},
     {"EXP45-C", "L2"},
     {"EXP46-C", "L2"},
-    {"INT30-C", "L2"},
-    {"INT31-C", "L2"},
-    {"INT32-C", "L2"},
-    {"INT33-C", "L2"},
-    {"INT34-C", "L3"},
-    {"INT35-C", "L3"},
-    {"INT36-C", "L3"},
-    {"FLP30-C", "L2"},
-    {"FLP32-C", "L2"},
-    {"FLP34-C", "L3"},
-    {"FLP36-C", "L3"},
-    {"FLP37-C", "L3"},
-    {"ARR30-C", "L2"},
-    {"ARR32-C", "L2"},
-    {"ARR36-C", "L2"},
-    {"ARR37-C", "L2"},
-    {"ARR38-C", "L1"},
-    {"ARR39-C", "L2"},
-    {"STR30-C", "L2"},
-    {"STR31-C", "L1"},
-    {"STR32-C", "L1"},
-    {"STR34-C", "L2"},
-    {"STR37-C", "L3"},
-    {"STR38-C", "L1"},
-    {"MEM30-C", "L1"},
-    {"MEM31-C", "L2"},
-    {"MEM33-C", "L3"},
-    {"MEM34-C", "L1"},
-    {"MEM35-C", "L2"},
-    {"MEM36-C", "L3"},
+    {"EXP47-C", "L2"},
     {"FIO30-C", "L1"},
     {"FIO32-C", "L3"},
     {"FIO34-C", "L1"},
     {"FIO37-C", "L1"},
     {"FIO38-C", "L3"},
     {"FIO39-C", "L2"},
-    {"FIO40-C", "L3"},
+    {"FIO40-C", "L2"},
     {"FIO41-C", "L3"},
     {"FIO42-C", "L3"},
     {"FIO44-C", "L3"},
     {"FIO45-C", "L2"},
     {"FIO46-C", "L3"},
     {"FIO47-C", "L2"},
-    {"ENV30-C", "L3"},
-    {"ENV31-C", "L3"},
-    {"ENV32-C", "L1"},
-    {"ENV33-C", "L1"},
-    {"ENV34-C", "L3"},
-    {"SIG30-C", "L1"},
-    {"SIG31-C", "L2"},
-    {"SIG34-C", "L3"},
-    {"SIG35-C", "L3"},
-    {"ERR30-C", "L2"},
-    {"ERR32-C", "L3"},
-    {"ERR33-C", "L1"},
-    {"CON30-C", "L3"},
-    {"CON31-C", "L3"},
-    {"CON32-C", "L2"},
-    {"CON33-C", "L3"},
-    {"CON34-C", "L3"},
-    {"CON35-C", "L3"},
-    {"CON36-C", "L3"},
-    {"CON37-C", "L2"},
-    {"CON38-C", "L3"},
-    {"CON39-C", "L2"},
-    {"CON40-C", "L2"},
-    {"CON41-C", "L3"},
-    {"MSC30-C", "L2"},
+    {"FLP30-C", "L2"},
+    {"FLP32-C", "L1"},
+    {"FLP34-C", "L3"},
+    {"FLP36-C", "L3"},
+    {"FLP37-C", "L3"},
+    {"INT30-C", "L2"},
+    {"INT31-C", "L1"},
+    {"INT32-C", "L1"},
+    {"INT33-C", "L2"},
+    {"INT34-C", "L3"},
+    {"INT35-C", "L3"},
+    {"INT36-C", "L3"},
+    {"MEM30-C", "L2"},
+    {"MEM31-C", "L3"},
+    {"MEM33-C", "L3"},
+    {"MEM34-C", "L2"},
+    {"MEM35-C", "L2"},
+    {"MEM36-C", "L3"},
+    {"MSC30-C", "L3"},
     {"MSC32-C", "L1"},
-    {"MSC33-C", "L1"},
+    {"MSC33-C", "L2"},
     {"MSC37-C", "L2"},
     {"MSC38-C", "L3"},
     {"MSC39-C", "L3"},
     {"MSC40-C", "L3"},
+    {"MSC41-C", "L2"},
+    {"POS30-C", "L1"},
+    {"POS34-C", "L2"},
+    {"POS35-C", "L2"},
+    {"POS36-C", "L1"},
+    {"POS37-C", "L1"},
+    {"POS38-C", "L3"},
+    {"POS39-C", "L1"},
+    {"POS44-C", "L3"},
+    {"POS47-C", "L3"},
+    {"POS48-C", "L3"},
+    {"POS49-C", "L3"},
+    {"POS50-C", "L3"},
+    {"POS51-C", "L3"},
+    {"POS52-C", "L3"},
+    {"POS53-C", "L2"},
+    {"POS54-C", "L1"},
+    {"PRE30-C", "L3"},
+    {"PRE31-C", "L3"},
+    {"PRE32-C", "L3"},
+    {"SIG30-C", "L1"},
+    {"SIG31-C", "L1"},
+    {"SIG34-C", "L3"},
+    {"SIG35-C", "L3"},
+    {"STR30-C", "L2"},
+    {"STR31-C", "L2"},
+    {"STR32-C", "L1"},
+    {"STR34-C", "L2"},
+    {"STR37-C", "L3"},
+    {"STR38-C", "L1"},
+    {"WIN30-C", "L3"},
+    // Recommendations
+    {"API00-C", "L3"},
+    {"API01-C", "L1"},
+    {"API02-C", "L1"},
+    {"API03-C", "L3"},
+    {"API04-C", "L3"},
+    {"API05-C", "L1"},
+    {"API07-C", "L3"},
+    {"API09-C", "L3"},
+    {"API10-C", "L3"},
+    {"ARR00-C", "L2"},
+    {"ARR01-C", "L1"},
+    {"ARR02-C", "L2"},
+    {"CON01-C", "L3"},
+    {"CON02-C", "L3"},
+    {"CON03-C", "L3"},
+    {"CON04-C", "L3"},
+    {"CON05-C", "L3"},
+    {"CON06-C", "L3"},
+    {"CON07-C", "L2"},
+    {"CON08-C", "L3"},
+    {"CON09-C", "L3"},
+    {"DCL00-C", "L3"},
+    {"DCL01-C", "L3"},
+    {"DCL02-C", "L3"},
+    {"DCL03-C", "L3"},
+    {"DCL04-C", "L3"},
+    {"DCL05-C", "L3"},
+    {"DCL06-C", "L3"},
+    {"DCL07-C", "L3"},
+    {"DCL08-C", "L3"},
+    {"DCL09-C", "L3"},
+    {"DCL10-C", "L2"},
+    {"DCL11-C", "L1"},
+    {"DCL12-C", "L3"},
+    {"DCL13-C", "L3"},
+    {"DCL15-C", "L3"},
+    {"DCL16-C", "L3"},
+    {"DCL17-C", "L3"},
+    {"DCL18-C", "L3"},
+    {"DCL19-C", "L3"},
+    {"DCL20-C", "L1"},
+    {"DCL21-C", "L3"},
+    {"DCL22-C", "L3"},
+    {"DCL23-C", "L2"},
+    {"ENV01-C", "L2"},
+    {"ENV02-C", "L3"},
+    {"ENV03-C", "L2"},
+    {"ERR00-C", "L3"},
+    {"ERR01-C", "L2"},
+    {"ERR02-C", "L3"},
+    {"ERR04-C", "L3"},
+    {"ERR05-C", "L2"},
+    {"ERR06-C", "L3"},
+    {"ERR07-C", "L1"},
+    {"EXP00-C", "L2"},
+    {"EXP02-C", "L3"},
+    {"EXP03-C", "L3"},
+    {"EXP05-C", "L3"},
+    {"EXP07-C", "L3"},
+    {"EXP08-C", "L2"},
+    {"EXP09-C", "L2"},
+    {"EXP10-C", "L2"},
+    {"EXP11-C", "L3"},
+    {"EXP12-C", "L3"},
+    {"EXP13-C", "L3"},
+    {"EXP14-C", "L3"},
+    {"EXP15-C", "L1"},
+    {"EXP16-C", "L2"},
+    {"EXP19-C", "L1"},
+    {"EXP20-C", "L1"},
+    {"FIO01-C", "L1"},
+    {"FIO02-C", "L3"},
+    {"FIO03-C", "L3"},
+    {"FIO05-C", "L3"},
+    {"FIO06-C", "L3"},
+    {"FIO08-C", "L3"},
+    {"FIO09-C", "L3"},
+    {"FIO10-C", "L3"},
+    {"FIO11-C", "L3"},
+    {"FIO13-C", "L3"},
+    {"FIO14-C", "L3"},
+    {"FIO15-C", "L3"},
+    {"FIO17-C", "L2"},
+    {"FIO18-C", "L3"},
+    {"FIO19-C", "L3"},
+    {"FIO20-C", "L1"},
+    {"FIO21-C", "L3"},
+    {"FIO22-C", "L3"},
+    {"FIO23-C", "L3"},
+    {"FIO24-C", "L3"},
+    {"FLP00-C", "L3"},
+    {"FLP01-C", "L3"},
+    {"FLP02-C", "L3"},
+    {"FLP03-C", "L3"},
+    {"FLP04-C", "L3"},
+    {"FLP05-C", "L3"},
+    {"FLP06-C", "L3"},
+    {"FLP07-C", "L3"},
+    {"INT00-C", "L3"},
+    {"INT01-C", "L2"},
+    {"INT02-C", "L3"},
+    {"INT04-C", "L1"},
+    {"INT05-C", "L2"},
+    {"INT07-C", "L1"},
+    {"INT08-C", "L3"},
+    {"INT09-C", "L3"},
+    {"INT10-C", "L3"},
+    {"INT12-C", "L3"},
+    {"INT13-C", "L2"},
+    {"INT14-C", "L3"},
+    {"INT15-C", "L2"},
+    {"INT16-C", "L3"},
+    {"INT17-C", "L3"},
+    {"INT18-C", "L1"},
+    {"MEM00-C", "L1"},
+    {"MEM01-C", "L2"},
+    {"MEM02-C", "L3"},
+    {"MEM03-C", "L3"},
+    {"MEM04-C", "L2"},
+    {"MEM05-C", "L2"},
+    {"MEM06-C", "L3"},
+    {"MEM07-C", "L2"},
+    {"MEM10-C", "L3"},
+    {"MEM11-C", "L3"},
+    {"MEM12-C", "L3"},
+    {"MSC00-C", "L3"},
+    {"MSC01-C", "L3"},
+    {"MSC04-C", "L3"},
+    {"MSC05-C", "L3"},
+    {"MSC06-C", "L1"},
+    {"MSC07-C", "L3"},
+    {"MSC09-C", "L3"},
+    {"MSC10-C", "L3"},
+    {"MSC11-C", "L3"},
+    {"MSC12-C", "L3"},
+    {"MSC13-C", "L3"},
+    {"MSC14-C", "L3"},
+    {"MSC15-C", "L2"},
+    {"MSC17-C", "L1"},
+    {"MSC18-C", "L3"},
+    {"MSC19-C", "L3"},
+    {"MSC20-C", "L2"},
+    {"MSC21-C", "L3"},
+    {"MSC22-C", "L3"},
+    {"MSC23-C", "L3"},
+    {"MSC24-C", "L1"},
+    {"MSC25-C", "L3"},
+    {"POS01-C", "L2"},
+    {"POS02-C", "L2"},
+    {"POS04-C", "L3"},
+    {"POS05-C", "L3"},
+    {"PRE00-C", "L3"},
+    {"PRE01-C", "L1"},
+    {"PRE02-C", "L1"},
+    {"PRE04-C", "L3"},
+    {"PRE05-C", "L3"},
+    {"PRE06-C", "L3"},
+    {"PRE07-C", "L3"},
+    {"PRE08-C", "L3"},
+    {"PRE09-C", "L1"},
+    {"PRE10-C", "L1"},
+    {"PRE11-C", "L2"},
+    {"PRE12-C", "L3"},
+    {"PRE13-C", "L3"},
+    {"SIG00-C", "L2"},
+    {"SIG01-C", "L3"},
+    {"SIG02-C", "L2"},
+    {"STR00-C", "L3"},
+    {"STR01-C", "L3"},
+    {"STR02-C", "L2"},
+    {"STR03-C", "L3"},
+    {"STR04-C", "L3"},
+    {"STR05-C", "L3"},
+    {"STR06-C", "L2"},
+    {"STR09-C", "L3"},
+    {"STR10-C", "L3"},
+    {"STR11-C", "L2"},
+    {"WIN00-C", "L2"},
+    {"WIN01-C", "L1"},
+    {"WIN02-C", "L1"},
+    {"WIN03-C", "L3"},
+    {"WIN04-C", "L3"},
 };
 
 std::vector<checkers::Info> checkers::certCppInfo{
+    {"CON50-CPP", "L3"},
+    {"CON51-CPP", "L2"},
+    {"CON52-CPP", "L3"},
+    {"CON53-CPP", "L3"},
+    {"CON54-CPP", "L3"},
+    {"CON55-CPP", "L3"},
+    {"CON56-CPP", "L3"},
+    {"CTR50-CPP", "L2"},
+    {"CTR51-CPP", "L2"},
+    {"CTR52-CPP", "L2"},
+    {"CTR53-CPP", "L2"},
+    {"CTR54-CPP", "L3"},
+    {"CTR55-CPP", "L2"},
+    {"CTR56-CPP", "L2"},
+    {"CTR57-CPP", "L3"},
+    {"CTR58-CPP", "L2"},
     {"DCL50-CPP", "L1"},
     {"DCL51-CPP", "L3"},
     {"DCL52-CPP", "L3"},
     {"DCL53-CPP", "L3"},
-    {"DCL54-CPP", "L2"},
+    {"DCL54-CPP", "L3"},
     {"DCL55-CPP", "L3"},
     {"DCL56-CPP", "L3"},
-    {"DCL57-CPP", "L3"},
-    {"DCL58-CPP", "L3"},
+    {"DCL57-CPP", "L2"},
+    {"DCL58-CPP", "L2"},
     {"DCL59-CPP", "L3"},
-    {"DCL60-CPP", "L3"},
+    {"DCL60-CPP", "L2"},
+    {"ERR50-CPP", "L3"},
+    {"ERR51-CPP", "L2"},
+    {"ERR52-CPP", "L3"},
+    {"ERR53-CPP", "L3"},
+    {"ERR54-CPP", "L1"},
+    {"ERR55-CPP", "L2"},
+    {"ERR56-CPP", "L2"},
+    {"ERR57-CPP", "L3"},
+    {"ERR58-CPP", "L2"},
+    {"ERR59-CPP", "L2"},
+    {"ERR60-CPP", "L3"},
+    {"ERR61-CPP", "L3"},
+    {"ERR62-CPP", "L3"},
     {"EXP50-CPP", "L2"},
     {"EXP51-CPP", "L3"},
     {"EXP52-CPP", "L3"},
     {"EXP53-CPP", "L1"},
     {"EXP54-CPP", "L2"},
-    {"EXP55-CPP", "L2"},
+    {"EXP55-CPP", "L3"},
     {"EXP56-CPP", "L3"},
     {"EXP57-CPP", "L3"},
     {"EXP58-CPP", "L3"},
     {"EXP59-CPP", "L3"},
-    {"EXP60-CPP", "L1"},
+    {"EXP60-CPP", "L2"},
     {"EXP61-CPP", "L2"},
-    {"EXP62-CPP", "L2"},
+    {"EXP62-CPP", "L1"},
     {"EXP63-CPP", "L2"},
-    {"INT50-CPP", "L3"},
-    {"CTR50-CPP", "L2"},
-    {"CTR51-CPP", "L2"},
-    {"CTR52-CPP", "L1"},
-    {"CTR53-CPP", "L2"},
-    {"CTR54-CPP", "L2"},
-    {"CTR55-CPP", "L1"},
-    {"CTR56-CPP", "L2"},
-    {"CTR57-CPP", "L3"},
-    {"CTR58-CPP", "L3"},
-    {"STR50-CPP", "L1"},
-    {"STR51-CPP", "L1"},
-    {"STR52-CPP", "L2"},
-    {"STR53-CPP", "L2"},
-    {"MEM50-CPP", "L1"},
-    {"MEM51-CPP", "L1"},
-    {"MEM52-CPP", "L1"},
-    {"MEM53-CPP", "L1"},
-    {"MEM54-CPP", "L1"},
-    {"MEM55-CPP", "L1"},
-    {"MEM56-CPP", "L1"},
-    {"MEM57-CPP", "L2"},
     {"FIO50-CPP", "L2"},
     {"FIO51-CPP", "L3"},
-    {"ERR50-CPP", "L3"},
-    {"ERR51-CPP", "L3"},
-    {"ERR52-CPP", "L3"},
-    {"ERR53-CPP", "L3"},
-    {"ERR54-CPP", "L1"},
-    {"ERR55-CPP", "L2"},
-    {"ERR56-CPP", "L2"},
-    {"ERR57-CPP", "L3"},
-    {"ERR58-CPP", "L2"},
-    {"ERR59-CPP", "L1"},
-    {"ERR60-CPP", "L3"},
-    {"ERR61-CPP", "L3"},
-    {"ERR62-CPP", "L3"},
+    {"INT50-CPP", "L3"},
+    {"MEM50-CPP", "L2"},
+    {"MEM51-CPP", "L2"},
+    {"MEM52-CPP", "L1"},
+    {"MEM53-CPP", "L2"},
+    {"MEM54-CPP", "L2"},
+    {"MEM55-CPP", "L2"},
+    {"MEM56-CPP", "L2"},
+    {"MEM57-CPP", "L3"},
+    {"MSC50-CPP", "L3"},
+    {"MSC51-CPP", "L1"},
+    {"MSC52-CPP", "L2"},
+    {"MSC53-CPP", "L3"},
+    {"MSC54-CPP", "L2"},
     {"OOP50-CPP", "L3"},
     {"OOP51-CPP", "L3"},
-    {"OOP52-CPP", "L2"},
-    {"OOP53-CPP", "L3"},
+    {"OOP52-CPP", "L3"},
+    {"OOP53-CPP", "L2"},
     {"OOP54-CPP", "L3"},
     {"OOP55-CPP", "L2"},
     {"OOP56-CPP", "L3"},
-    {"OOP57-CPP", "L2"},
+    {"OOP57-CPP", "L1"},
     {"OOP58-CPP", "L2"},
-    {"CON50-CPP", "L3"},
-    {"CON51-CPP", "L2"},
-    {"CON52-CPP", "L2"},
-    {"CON53-CPP", "L3"},
-    {"CON54-CPP", "L3"},
-    {"CON55-CPP", "L3"},
-    {"CON56-CPP", "L3"},
-    {"MSC50-CPP", "L2"},
-    {"MSC51-CPP", "L1"},
-    {"MSC52-CPP", "L3"},
-    {"MSC53-CPP", "L2"},
-    {"MSC54-CPP", "L2"},
+    {"STR50-CPP", "L2"},
+    {"STR51-CPP", "L1"},
+    {"STR52-CPP", "L2"},
+    {"STR53-CPP", "L3"},
 };
 
-
diff --git a/lib/checkers.h b/lib/checkers.h
index b87971a514e..bda4a0320f5 100644
--- a/lib/checkers.h
+++ b/lib/checkers.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,14 +31,15 @@ enum class ReportType : std::uint8_t {
     autosar = 1,
     certC = 2,
     certCpp = 3,
-    misraC = 4,
+    misraC2012 = 4,
     misraCpp2008 = 5,
     misraCpp2023 = 6,
+    misraC2023 = 7,
+    misraC2025 = 8,
 };
 
 namespace checkers {
     extern CPPCHECKLIB const std::map<std::string, std::string> allCheckers;
-    extern CPPCHECKLIB const std::map<std::string, std::string> premiumCheckers;
 
     struct CPPCHECKLIB MisraInfo {
         int a;
@@ -61,11 +62,14 @@ namespace checkers {
 
     extern CPPCHECKLIB const std::vector<MisraInfo> misraC2012Directives;
     extern CPPCHECKLIB const std::vector<MisraInfo> misraC2012Rules;
+    extern CPPCHECKLIB const std::vector<MisraInfo> misraC2023Directives;
+    extern CPPCHECKLIB const std::vector<MisraInfo> misraC2023Rules;
+    extern CPPCHECKLIB const std::vector<MisraInfo> misraC2025Directives;
+    extern CPPCHECKLIB const std::vector<MisraInfo> misraC2025Rules;
     extern CPPCHECKLIB const std::vector<MisraCppInfo> misraCpp2008Rules;
+    extern CPPCHECKLIB const std::vector<MisraCppInfo> misraCpp2023Directives;
     extern CPPCHECKLIB const std::vector<MisraCppInfo> misraCpp2023Rules;
 
-    extern CPPCHECKLIB const std::map<std::string, std::string> misraRuleSeverity;
-
     struct CPPCHECKLIB IdMapping {
         const char* guideline;
         const char* cppcheckId;
diff --git a/lib/checkersidmapping.cpp b/lib/checkersidmapping.cpp
index 35741f65204..e9636843853 100644
--- a/lib/checkersidmapping.cpp
+++ b/lib/checkersidmapping.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,14 +18,13 @@
 // This file is auto generated by script, do not edit
 // Mappings of Cppcheck warning IDs to guidelines
 #include "checkers.h"
-
 #include <vector>
 
 std::vector<checkers::IdMapping> checkers::idMappingAutosar{
     {"m0-1-1", "unreachableCode,duplicateBreak"},
     {"m0-1-2", "unsignedLessThanZero"},
     {"m0-1-3", "unusedVariable,unusedStructMember"},
-    {"a0-1-1", "unreadVariable,unusedValue,redundantAssignment"},
+    {"a0-1-1", "unreadVariable,redundantAssignment"},
     {"m0-1-9", "redundantAssignment,redundantInitialization"},
     {"m0-1-10", "unusedFunction"},
     {"m0-2-1", "overlappingWriteUnion,overlappingWriteFunction"},
@@ -42,7 +41,6 @@ std::vector<checkers::IdMapping> checkers::idMappingAutosar{
     {"m5-0-17", "comparePointers"},
     {"m5-0-18", "comparePointers"},
     {"a5-1-4", "returnDanglingLifetime"},
-    {"a5-2-2", "cstyleCast"},
     {"a5-2-5", "arrayIndexOutOfBounds,arrayIndexOutOfBoundsCond,pointerOutOfBounds,pointerOutOfBoundsCond,negativeIndex,arrayIndexThenCheck,bufferAccessOutOfBounds,objectIndex,argumentSize"},
     {"m5-3-4", "sizeofFunctionCall"},
     {"a5-3-2", "nullPointer,nullPointerRedundantCheck,nullPointerArithmetic,nullPointerArithmeticRedundantCheck,nullPointerDefaultArg"},
@@ -79,8 +77,10 @@ std::vector<checkers::IdMapping> checkers::idMappingCertC{
     {"EXP34", "nullPointer,nullPointerDefaultArg,nullPointerRedundantCheck,nullPointerArithmetic,nullPointerArithmeticRedundantCheck"},
     {"EXP44", "sizeofCalculation"},
     {"EXP46", "bitwiseOnBoolean"},
+    {"INT32", "integerOverflow"},
     {"FLP32", "invalidFunctionArg"},
     {"FLP34", "floatConversionOverflow"},
+    {"ARR30", "arrayIndexOutOfBounds,arrayIndexOutOfBoundsCond,pointerOutOfBounds,pointerOutOfBoundsCond,negativeIndex,arrayIndexThenCheck,bufferAccessOutOfBounds,objectIndex,argumentSize"},
     {"ARR36", "comparePointers"},
     {"STR30", "stringLiteralWrite"},
     {"STR37", "invalidFunctionArg"},
@@ -95,35 +95,35 @@ std::vector<checkers::IdMapping> checkers::idMappingCertC{
 };
 
 std::vector<checkers::IdMapping> checkers::idMappingCertCpp{
-    {"DCL57", "deallocThrow,exceptThrowInDestructor"},
+    {"CTR51", "eraseDereference"},
+    {"CTR54", "comparePointers"},
+    {"CTR55", "containerOutOfBounds"},
+    {"DCL57", "exceptDeallocThrow,exceptThrowInDestructor"},
     {"DCL60", "ctuOneDefinitionRuleViolation"},
+    {"ERR57", "memleak"},
     {"EXP52", "sizeofCalculation"},
-    {"EXP53", "uninitvar"},
+    {"EXP53", "uninitvar,uninitdata,uninitStructMember"},
     {"EXP54", "uninitvar,danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
-    {"EXP61", "danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
+    {"EXP61", "danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime,deallocuse,deallocret"},
     {"EXP63", "accessMoved"},
-    {"CTR51", "eraseDereference"},
-    {"CTR54", "comparePointers"},
-    {"CTR55", "containerOutOfBounds"},
-    {"STR51", "nullPointer"},
-    {"STR52", "invalidContainer"},
+    {"FIO50", "IOWithoutPositioning"},
     {"MEM50", "deallocuse"},
     {"MEM51", "mismatchAllocDealloc"},
     {"MEM56", "doubleFree"},
-    {"FIO50", "IOWithoutPositioning"},
-    {"ERR57", "memleak"},
+    {"MSC52", "missingReturn"},
     {"OOP50", "virtualCallInConstructor"},
     {"OOP52", "virtualDestructor"},
     {"OOP53", "initializerList"},
     {"OOP54", "operatorEqToSelf"},
-    {"MSC52", "missingReturn"},
+    {"STR51", "nullPointer"},
+    {"STR52", "invalidContainer"},
 };
 
 std::vector<checkers::IdMapping> checkers::idMappingMisraC{
     {"1.1", "syntaxError"},
     {"1.3", "error"},
     {"2.1", "duplicateBreak,unreachableCode"},
-    {"2.2", "constStatement,redundantCondition,redundantAssignment,redundantAssignInSwitch,unreadVariable"},
+    {"2.2", "constStatement,redundantCondition,redundantAssignment,redundantAssignInSwitch,unreadVariable,unusedFunction"},
     {"2.6", "unusedLabel"},
     {"2.8", "unusedVariable"},
     {"5.3", "shadowVariable"},
@@ -167,7 +167,7 @@ std::vector<checkers::IdMapping> checkers::idMappingMisraCpp2008{
     {"5-0-16", "pointerOutOfBounds"},
     {"5-0-17", "comparePointers"},
     {"5-0-18", "comparePointers"},
-    {"5-2-4", "cstyleCast"},
+    {"5-2-4", "cstyleCast,dangerousTypeCast"},
     {"5-3-4", "sizeofFunctionCall"},
     {"5-8-1", "shiftTooManyBits"},
     {"6-6-5", "missingReturn"},
@@ -192,6 +192,7 @@ std::vector<checkers::IdMapping> checkers::idMappingMisraCpp2023{
     {"0.0.1", "unreachableCode"},
     {"0.0.2", "compareBoolExpressionWithInt,compareValueOutOfTypeRangeError,identicalConditionAfterEarlyExit,identicalInnerCondition,knownConditionTrueFalse"},
     {"0.1.1", "redundantAssignInSwitch,redundantAssignment,redundantCopy,redundantInitialization,unreadVariable"},
+    {"Dir 0.3.1", "floatConversionOverflow"},
     {"Dir 0.3.2", "invalidFunctionArg,invalidFunctionArgBool,invalidFunctionArgStr"},
     {"4.1.3", "error"},
     {"4.6.1", "unknownEvaluationOrder"},
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
index 350ca3bfe6b..f2c4a84653f 100644
--- a/lib/checkersreport.cpp
+++ b/lib/checkersreport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,8 +20,8 @@
 
 #include "addoninfo.h"
 #include "checkers.h"
-#include "errortypes.h"
 #include "settings.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -30,15 +30,13 @@
 #include <unordered_set>
 #include <vector>
 
-static bool isCppcheckPremium(const Settings& settings) {
-    return (settings.cppcheckCfgProductName.compare(0, 16, "Cppcheck Premium") == 0);
-}
-
 static int getMisraCVersion(const Settings& settings) {
-    if (settings.premiumArgs.find("misra-c-2012") != std::string::npos)
-        return 2012;
+    if (settings.premiumArgs.find("misra-c-2025") != std::string::npos)
+        return 2025;
     if (settings.premiumArgs.find("misra-c-2023") != std::string::npos)
         return 2023;
+    if (settings.premiumArgs.find("misra-c-2012") != std::string::npos)
+        return 2012;
     if (settings.addons.count("misra"))
         return 2012;
     const bool misraAddonInfo = std::any_of(settings.addonInfos.cbegin(), settings.addonInfos.cend(), [](const AddonInfo& addonInfo) {
@@ -135,15 +133,22 @@ void CheckersReport::countCheckers()
             ++mActiveCheckersCount;
         ++mAllCheckersCount;
     }
-    for (const auto& checkReq: checkers::premiumCheckers) {
-        if (mActiveCheckers.count(checkReq.first) > 0)
-            ++mActiveCheckersCount;
-        ++mAllCheckersCount;
+    for (const auto& addonInfo: mSettings.addonInfos) {
+        for (const auto& checkReq: addonInfo.checkers) {
+            if (mActiveCheckers.count(checkReq.first) > 0)
+                ++mActiveCheckersCount;
+            ++mAllCheckersCount;
+        }
     }
-    if (mSettings.premiumArgs.find("misra-c-") != std::string::npos || 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);
-            const bool active = isMisraRuleActive(mActiveCheckers, rule);
+            // this will return some rules as always active even if they are not in the active checkers.
+            // this leads to a difference in the shown count and in the checkers stored in the builddir
+            // TODO: fix this?
+            const bool active = !doUnusedFunctionOnly && isMisraRuleActive(mActiveCheckers, rule);
             if (active)
                 ++mActiveCheckersCount;
             ++mAllCheckersCount;
@@ -165,7 +170,7 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
         // TODO: mention "information" and "debug" as source for indications of bailouts
         // TODO: still rephrase this - this message does not provides confidence in the results
         // TODO: document what a bailout is and why it is done - mention it in the upcoming security/tuning guide
-        // TODO: make bailouts a seperate group - need to differentiate between user bailouts (missing data like configuration/includes) and internal bailouts (e.g. limitations of ValueFlow)
+        // TODO: make bailouts a separate group - need to differentiate between user bailouts (missing data like configuration/includes) and internal bailouts (e.g. limitations of ValueFlow)
         fout << "Note: There might still have been non-critical bailouts which might lead to false negatives." << std::endl;
     }
 
@@ -188,106 +193,39 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
         fout << std::endl;
     }
 
-    const bool cppcheckPremium = isCppcheckPremium(mSettings);
-
-    auto reportSection = [&fout, cppcheckPremium]
-                         (const std::string& title,
-                          const Settings& settings,
-                          const std::set<std::string>& activeCheckers,
-                          const std::map<std::string, std::string>& premiumCheckers,
-                          const std::string& substring) {
+    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")
+            title = "Cppcheck Premium";
+        else {
+            title = addonInfo.name;
+            if (endsWith(title, ".json"))
+                title.erase(title.rfind('.'));
+        }
+        title += " checkers";
         fout << title << std::endl;
         fout << std::string(title.size(), '-') << std::endl;
-        if (!cppcheckPremium) {
-            fout << "Not available, Cppcheck Premium is not used" << std::endl;
-            return;
-        }
-        int maxCheckerSize = 0;
-        for (const auto& checkReq: premiumCheckers) {
+
+        maxCheckerSize = 0;
+        for (const auto& checkReq: addonInfo.checkers) {
             const std::string& checker = checkReq.first;
-            if (checker.find(substring) != std::string::npos && checker.size() > maxCheckerSize)
-                maxCheckerSize = checker.size();
+            maxCheckerSize = std::max(checker.size(), maxCheckerSize);
         }
-        for (const auto& checkReq: premiumCheckers) {
+
+        for (const auto& checkReq: addonInfo.checkers) {
             const std::string& checker = checkReq.first;
-            if (checker.find(substring) == std::string::npos)
-                continue;
-            std::string req = checkReq.second;
-            bool active = cppcheckPremium && activeCheckers.count(checker) > 0;
-            if (substring == "::") {
-                if (req == "warning")
-                    active &= settings.severity.isEnabled(Severity::warning);
-                else if (req == "style")
-                    active &= settings.severity.isEnabled(Severity::style);
-                else if (req == "portability")
-                    active &= settings.severity.isEnabled(Severity::portability);
-                else if (!req.empty())
-                    active = false; // FIXME: handle req
-            }
+            const bool active = mActiveCheckers.count(checkReq.first) > 0;
+            const std::string& req = checkReq.second;
             fout << (active ? "Yes  " : "No   ") << checker;
-            if (!cppcheckPremium) {
-                if (!req.empty())
-                    req = "premium," + req;
-                else
-                    req = "premium";
-            }
-            if (!req.empty())
-                req = "require:" + req;
-            if (!active)
-                fout << std::string(maxCheckerSize + 4 - checker.size(), ' ') << req;
+            if (!active && !req.empty())
+                fout << std::string(maxCheckerSize + 4 - checker.size(), ' ') << "require:" << req;
             fout << std::endl;
         }
-    };
-
-    reportSection("Premium checkers", mSettings, mActiveCheckers, checkers::premiumCheckers, "::");
-    reportSection("Autosar", mSettings, mActiveCheckers, checkers::premiumCheckers, "Autosar: ");
-    reportSection("Cert C", mSettings, mActiveCheckers, checkers::premiumCheckers, "Cert C: ");
-    reportSection("Cert C++", mSettings, mActiveCheckers, checkers::premiumCheckers, "Cert C++: ");
-
-    const int misraCVersion = getMisraCVersion(mSettings);
-
-    if (misraCVersion == 0) {
-        fout << std::endl << std::endl;
-        fout << "Misra C" << std::endl;
-        fout << "-------" << std::endl;
-        fout << "Misra is not enabled" << std::endl;
-    } else {
-        fout << std::endl << std::endl;
-        fout << "Misra C " << misraCVersion << std::endl;
-        fout << "------------" << std::endl;
-        for (const checkers::MisraInfo& info: checkers::misraC2012Directives) {
-            const std::string directive = "Dir " + std::to_string(info.a) + "." + std::to_string(info.b);
-            const bool active = isMisraRuleActive(mActiveCheckers, directive);
-            fout << (active ? "Yes  " : "No   ") << "Misra C " << misraCVersion << ": " << directive;
-            std::string extra;
-            if (misraCVersion == 2012 && info.amendment >= 1)
-                extra = " amendment:" + std::to_string(info.amendment);
-            if (!extra.empty())
-                fout << std::string(10 - directive.size(), ' ') << extra;
-            fout << '\n';
-        }
-        for (const checkers::MisraInfo& info: checkers::misraC2012Rules) {
-            const std::string rule = std::to_string(info.a) + "." + std::to_string(info.b);
-            const bool active = isMisraRuleActive(mActiveCheckers, rule);
-            fout << (active ? "Yes  " : "No   ") << "Misra C " << misraCVersion << ": " << rule;
-            std::string extra;
-            if (misraCVersion == 2012 && info.amendment >= 1)
-                extra = " amendment:" + std::to_string(info.amendment);
-            std::string reqs;
-            if (info.amendment >= 3)
-                reqs += ",premium";
-            if (!active && !reqs.empty())
-                extra += " require:" + reqs.substr(1);
-            if (!extra.empty())
-                fout << std::string(10 - rule.size(), ' ') << extra;
-            fout << '\n';
-        }
     }
 
-    reportSection("Misra C++ 2008", mSettings, mActiveCheckers, checkers::premiumCheckers, "Misra C++ 2008: ");
-    reportSection("Misra C++ 2023", mSettings, mActiveCheckers, checkers::premiumCheckers, "Misra C++ 2023: ");
-
     return fout.str();
 }
 
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
index 3d93ce6042e..29342fb4dbc 100644
--- a/lib/checkexceptionsafety.cpp
+++ b/lib/checkexceptionsafety.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -34,20 +34,15 @@
 
 //---------------------------------------------------------------------------
 
-// Register CheckExceptionSafety..
-namespace {
-    CheckExceptionSafety instance;
-}
-
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 static const CWE CWE703(703U);   // Improper Check or Handling of Exceptional Conditions
 static const CWE CWE480(480U);   // Use of Incorrect Operator
 
 //---------------------------------------------------------------------------
 
-void CheckExceptionSafety::destructors()
+void CheckExceptionSafetyImpl::destructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckExceptionSafety::destructors"); // warning
@@ -83,7 +78,7 @@ void CheckExceptionSafety::destructors()
     }
 }
 
-void CheckExceptionSafety::destructorsError(const Token * const tok, const std::string &className)
+void CheckExceptionSafetyImpl::destructorsError(const Token * const tok, const std::string &className)
 {
     reportError(tok, Severity::warning, "exceptThrowInDestructor",
                 "Class " + className + " is not safe, destructor throws exception\n"
@@ -93,14 +88,14 @@ void CheckExceptionSafety::destructorsError(const Token * const tok, const std::
 }
 
 
-void CheckExceptionSafety::deallocThrow()
+void CheckExceptionSafetyImpl::deallocThrow()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("exceptDeallocThrow"))
         return;
 
     logChecker("CheckExceptionSafety::deallocThrow"); // warning
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Deallocate a global/member pointer and then throw exception
@@ -156,7 +151,7 @@ void CheckExceptionSafety::deallocThrow()
     }
 }
 
-void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std::string &varname)
+void CheckExceptionSafetyImpl::deallocThrowError(const Token * const tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "exceptDeallocThrow", "Exception thrown in invalid state, '" +
                 varname + "' points at deallocated memory.", CWE398, Certainty::normal);
@@ -168,9 +163,9 @@ void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std:
 //         throw err;            // <- should be just "throw;"
 //      }
 //---------------------------------------------------------------------------
-void CheckExceptionSafety::checkRethrowCopy()
+void CheckExceptionSafetyImpl::checkRethrowCopy()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("exceptRethrowCopy"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("exceptRethrowCopy"))
         return;
 
     logChecker("CheckExceptionSafety::checkRethrowCopy"); // style
@@ -201,7 +196,7 @@ void CheckExceptionSafety::checkRethrowCopy()
     }
 }
 
-void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::string &varname)
+void CheckExceptionSafetyImpl::rethrowCopyError(const Token * const tok, const std::string &varname)
 {
     reportError(tok, Severity::style, "exceptRethrowCopy",
                 "Throwing a copy of the caught exception instead of rethrowing the original exception.\n"
@@ -212,9 +207,9 @@ void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::
 //---------------------------------------------------------------------------
 //    try {} catch (std::exception err) {} <- Should be "std::exception& err"
 //---------------------------------------------------------------------------
-void CheckExceptionSafety::checkCatchExceptionByValue()
+void CheckExceptionSafetyImpl::checkCatchExceptionByValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("catchExceptionByValue"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("catchExceptionByValue"))
         return;
 
     logChecker("CheckExceptionSafety::checkCatchExceptionByValue"); // style
@@ -233,7 +228,7 @@ void CheckExceptionSafety::checkCatchExceptionByValue()
     }
 }
 
-void CheckExceptionSafety::catchExceptionByValueError(const Token *tok)
+void CheckExceptionSafetyImpl::catchExceptionByValueError(const Token *tok)
 {
     reportError(tok, Severity::style,
                 "catchExceptionByValue", "Exception should be caught by reference.\n"
@@ -257,7 +252,8 @@ static const Token * functionThrowsRecursive(const Function * function, std::set
             tok = tok->linkAt(1);  // skip till start of catch clauses
         if (tok->str() == "throw")
             return tok;
-        if (tok->function() && Token::simpleMatch(tok->astParent(), "(")) {
+        if (tok->function() && (Token::simpleMatch(tok->astParent(), "(") ||
+                                (Token::simpleMatch(tok->astParent(), ".") && Token::simpleMatch(tok->astParent()->astParent(), "(")))) {
             const Function * called = tok->function();
             // check if called function has an exception specification
             if (called->isThrow() && called->throwArg)
@@ -285,7 +281,7 @@ static const Token * functionThrows(const Function * function)
 //    void func() throw() { throw x; }
 //    void func() __attribute__((nothrow)); void func() { throw x; }
 //--------------------------------------------------------------------------
-void CheckExceptionSafety::nothrowThrows()
+void CheckExceptionSafetyImpl::nothrowThrows()
 {
     logChecker("CheckExceptionSafety::nothrowThrows");
 
@@ -296,41 +292,44 @@ void CheckExceptionSafety::nothrowThrows()
         if (!function)
             continue;
 
-        // check noexcept and noexcept(true) functions
-        if (function->isNoExcept()) {
-            const Token *throws = functionThrows(function);
-            if (throws)
-                noexceptThrowError(throws);
+        bool isNoExcept = false, isEntryPoint = false;
+        if (function->isNoExcept() || // noexcept and noexcept(true) functions
+            (function->isThrow() && !function->throwArg) || //  throw() functions
+            function->isAttributeNothrow()) { // __attribute__((nothrow)) or __declspec(nothrow) functions
+            isNoExcept = true;
         }
-
-        // check throw() functions
-        else if (function->isThrow() && !function->throwArg) {
-            const Token *throws = functionThrows(function);
-            if (throws)
-                noexceptThrowError(throws);
+        else if (mSettings.library.isentrypoint(function->name())) {
+            isEntryPoint = true;
         }
+        if (!isNoExcept && !isEntryPoint)
+            continue;
 
-        // check __attribute__((nothrow)) or __declspec(nothrow) functions
-        else if (function->isAttributeNothrow()) {
-            const Token *throws = functionThrows(function);
-            if (throws)
+        if (const Token* throws = functionThrows(function)) {
+            if (isEntryPoint)
+                entryPointThrowError(throws);
+            else
                 noexceptThrowError(throws);
         }
     }
 }
 
-void CheckExceptionSafety::noexceptThrowError(const Token * const tok)
+void CheckExceptionSafetyImpl::noexceptThrowError(const Token * const tok)
+{
+    reportError(tok, Severity::error, "throwInNoexceptFunction", "Unhandled exception thrown in function declared not to throw exceptions.", CWE398, Certainty::normal);
+}
+
+void CheckExceptionSafetyImpl::entryPointThrowError(const Token * const tok)
 {
-    reportError(tok, Severity::error, "throwInNoexceptFunction", "Exception thrown in function declared not to throw exceptions.", CWE398, Certainty::normal);
+    reportError(tok, Severity::error, "throwInEntryPoint", "Unhandled exception thrown in function that is an entry point.", CWE398, Certainty::normal);
 }
 
 //--------------------------------------------------------------------------
 //    void func() { functionWithExceptionSpecification(); }
 //--------------------------------------------------------------------------
-void CheckExceptionSafety::unhandledExceptionSpecification()
+void CheckExceptionSafetyImpl::unhandledExceptionSpecification()
 {
-    if ((!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive)) &&
-        !mSettings->isPremiumEnabled("unhandledExceptionSpecification"))
+    if ((!mSettings.severity.isEnabled(Severity::style) || !mSettings.certainty.isEnabled(Certainty::inconclusive)) &&
+        !mSettings.isPremiumEnabled("unhandledExceptionSpecification"))
         return;
 
     logChecker("CheckExceptionSafety::unhandledExceptionSpecification"); // style,inconclusive
@@ -339,7 +338,7 @@ void CheckExceptionSafety::unhandledExceptionSpecification()
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
         // only check functions without exception specification
-        if (scope->function && !scope->function->isThrow() && !mSettings->library.isentrypoint(scope->className)) {
+        if (scope->function && !scope->function->isThrow() && !mSettings.library.isentrypoint(scope->className)) {
             for (const Token *tok = scope->function->functionScope->bodyStart->next();
                  tok != scope->function->functionScope->bodyEnd; tok = tok->next()) {
                 if (tok->str() == "try")
@@ -357,7 +356,7 @@ void CheckExceptionSafety::unhandledExceptionSpecification()
     }
 }
 
-void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname)
+void CheckExceptionSafetyImpl::unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname)
 {
     const std::string str1(tok1 ? tok1->str() : "foo");
     const std::list<const Token*> locationList = { tok1, tok2 };
@@ -370,7 +369,7 @@ void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * co
 //--------------------------------------------------------------------------
 // 7.6.18.4 If no exception is presently being handled, evaluating a throw-expression with no operand calls std​::​​terminate().
 //--------------------------------------------------------------------------
-void CheckExceptionSafety::rethrowNoCurrentException()
+void CheckExceptionSafetyImpl::rethrowNoCurrentException()
 {
     logChecker("CheckExceptionSafety::rethrowNoCurrentException");
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -401,7 +400,7 @@ void CheckExceptionSafety::rethrowNoCurrentException()
     }
 }
 
-void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok)
+void CheckExceptionSafetyImpl::rethrowNoCurrentExceptionError(const Token *tok)
 {
     reportError(tok, Severity::error, "rethrowNoCurrentException",
                 "Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."
@@ -410,12 +409,12 @@ void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok)
                 CWE480, Certainty::normal);
 }
 
-void CheckExceptionSafety::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckExceptionSafety::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (tokenizer.isC())
         return;
 
-    CheckExceptionSafety checkExceptionSafety(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckExceptionSafetyImpl checkExceptionSafety(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkExceptionSafety.destructors();
     checkExceptionSafety.deallocThrow();
     checkExceptionSafety.checkRethrowCopy();
@@ -425,14 +424,15 @@ void CheckExceptionSafety::runChecks(const Tokenizer &tokenizer, ErrorLogger *er
     checkExceptionSafety.rethrowNoCurrentException();
 }
 
-void CheckExceptionSafety::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckExceptionSafety::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckExceptionSafety c(nullptr, settings, errorLogger);
+    CheckExceptionSafetyImpl c(nullptr, settings, errorLogger);
     c.destructorsError(nullptr, "Class");
     c.deallocThrowError(nullptr, "p");
     c.rethrowCopyError(nullptr, "varname");
     c.catchExceptionByValueError(nullptr);
     c.noexceptThrowError(nullptr);
+    c.entryPointThrowError(nullptr);
     c.unhandledExceptionSpecificationError(nullptr, nullptr, "funcname");
     c.rethrowNoCurrentExceptionError(nullptr);
 }
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
index 37b8ddf3a33..8b52d773a93 100644
--- a/lib/checkexceptionsafety.h
+++ b/lib/checkexceptionsafety.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -46,14 +47,32 @@ class Tokenizer;
 class CPPCHECKLIB CheckExceptionSafety : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckExceptionSafety() : Check(myName()) {}
+    CheckExceptionSafety() : Check("Exception Safety") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckExceptionSafety(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** Generate all possible errors (for --errorlist) */
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    /** wiki formatted description of the class (for --doc) */
+    std::string classInfo() const override {
+        return "Checking exception safety\n"
+               "- Throwing exceptions in destructors\n"
+               "- Throwing exception during invalid state\n"
+               "- Throwing a copy of a caught exception instead of rethrowing the original exception\n"
+               "- Exception caught by value instead of by reference\n"
+               "- Throwing exception in noexcept, nothrow(), __attribute__((nothrow)) or __declspec(nothrow) function\n"
+               "- Unhandled exception specification when calling function foo()\n"
+               "- Rethrow without currently handled exception\n";
+    }
+};
+
+class CPPCHECKLIB CheckExceptionSafetyImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckExceptionSafetyImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Don't throw exceptions in destructors */
     void destructors();
@@ -82,30 +101,11 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
     void rethrowCopyError(const Token * tok, const std::string &varname);
     void catchExceptionByValueError(const Token *tok);
     void noexceptThrowError(const Token * tok);
+    void entryPointThrowError(const Token * tok);
     /** Missing exception specification */
     void unhandledExceptionSpecificationError(const Token * tok1, const Token * tok2, const std::string & funcname);
     /** Rethrow without currently handled exception */
     void rethrowNoCurrentExceptionError(const Token *tok);
-
-    /** Generate all possible errors (for --errorlist) */
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    /** Short description of class (for --doc) */
-    static std::string myName() {
-        return "Exception Safety";
-    }
-
-    /** wiki formatted description of the class (for --doc) */
-    std::string classInfo() const override {
-        return "Checking exception safety\n"
-               "- Throwing exceptions in destructors\n"
-               "- Throwing exception during invalid state\n"
-               "- Throwing a copy of a caught exception instead of rethrowing the original exception\n"
-               "- Exception caught by value instead of by reference\n"
-               "- Throwing exception in noexcept, nothrow(), __attribute__((nothrow)) or __declspec(nothrow) function\n"
-               "- Unhandled exception specification when calling function foo()\n"
-               "- Rethrow without currently handled exception\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
index 26ff9736f43..0c5101750a6 100644
--- a/lib/checkfunctions.cpp
+++ b/lib/checkfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -44,12 +44,6 @@
 
 //---------------------------------------------------------------------------
 
-
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckFunctions instance;
-}
-
 static const CWE CWE252(252U);  // Unchecked Return Value
 static const CWE CWE477(477U);  // Use of Obsolete Functions
 static const CWE CWE758(758U);  // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
@@ -58,9 +52,9 @@ static const CWE CWE686(686U);  // Function Call With Incorrect Argument Type
 static const CWE CWE687(687U);  // Function Call With Incorrectly Specified Argument Value
 static const CWE CWE688(688U);  // Function Call With Incorrect Variable or Reference as Argument
 
-void CheckFunctions::checkProhibitedFunctions()
+void CheckFunctionsImpl::checkProhibitedFunctions()
 {
-    const bool checkAlloca = mSettings->severity.isEnabled(Severity::warning) && ((mTokenizer->isC() && mSettings->standards.c >= Standards::C99) || mSettings->standards.cpp >= Standards::CPP11);
+    const bool checkAlloca = mSettings.severity.isEnabled(Severity::warning) && ((mTokenizer->isC() && mSettings.standards.c >= Standards::C99) || mSettings.standards.cpp >= Standards::CPP11);
 
     logChecker("CheckFunctions::checkProhibitedFunctions");
 
@@ -72,7 +66,7 @@ void CheckFunctions::checkProhibitedFunctions()
             // alloca() is special as it depends on the code being C or C++, so it is not in Library
             if (checkAlloca && Token::simpleMatch(tok, "alloca (") && (!tok->function() || tok->function()->nestedIn->type == ScopeType::eGlobal)) {
                 if (tok->isC()) {
-                    if (mSettings->standards.c > Standards::C89)
+                    if (mSettings.standards.c > Standards::C89)
                         reportError(tok, Severity::warning, "allocaCalled",
                                     "$symbol:alloca\n"
                                     "Obsolete function 'alloca' called. In C99 and later it is recommended to use a variable length array instead.\n"
@@ -90,11 +84,12 @@ void CheckFunctions::checkProhibitedFunctions()
                 if (tok->function() && tok->function()->hasBody())
                     continue;
 
-                const Library::WarnInfo* wi = mSettings->library.getWarnInfo(tok);
+                const Library::WarnInfo* wi = mSettings.library.getWarnInfo(tok);
                 if (wi) {
-                    if (mSettings->severity.isEnabled(wi->severity) && ((tok->isC() && mSettings->standards.c >= wi->standards.c) || (tok->isCpp() && mSettings->standards.cpp >= wi->standards.cpp))) {
-                        const std::string daca = mSettings->daca ? "prohibited" : "";
-                        reportError(tok, wi->severity, daca + tok->str() + "Called", wi->message, CWE477, Certainty::normal);
+                    if (mSettings.severity.isEnabled(wi->severity) && ((tok->isC() && mSettings.standards.c >= wi->standards.c) || (tok->isCpp() && mSettings.standards.cpp >= wi->standards.cpp))) {
+                        const std::string daca = mSettings.daca ? "prohibited" : "";
+                        const std::string prefix = daca + tok->str();
+                        functionCalledError(tok, wi->severity, prefix, wi->message);
                     }
                 }
             }
@@ -102,10 +97,15 @@ void CheckFunctions::checkProhibitedFunctions()
     }
 }
 
+void CheckFunctionsImpl::functionCalledError(const Token* tok, Severity severity, const std::string& prefix, const std::string& msg)
+{
+    reportError(tok, severity, prefix + "Called", msg, CWE477, Certainty::normal);
+}
+
 //---------------------------------------------------------------------------
 // Check <valid>, <strz> and <not-bool>
 //---------------------------------------------------------------------------
-void CheckFunctions::invalidFunctionUsage()
+void CheckFunctionsImpl::invalidFunctionUsage()
 {
     logChecker("CheckFunctions::invalidFunctionUsage");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -116,28 +116,28 @@ void CheckFunctions::invalidFunctionUsage()
                 continue;
             const Token * const functionToken = tok;
             const std::vector<const Token *> arguments = getArguments(tok);
-            for (int argnr = 1; argnr <= arguments.size(); ++argnr) {
+            for (size_t argnr = 1; argnr <= arguments.size(); ++argnr) {
                 const Token * const argtok = arguments[argnr-1];
 
                 // check <valid>...</valid>
-                const ValueFlow::Value *invalidValue = argtok->getInvalidValue(functionToken,argnr,*mSettings);
+                const ValueFlow::Value *invalidValue = argtok->getInvalidValue(functionToken,argnr,mSettings);
                 if (invalidValue) {
-                    invalidFunctionArgError(argtok, functionToken->next()->astOperand1()->expressionString(), argnr, invalidValue, mSettings->library.validarg(functionToken, argnr));
+                    invalidFunctionArgError(argtok, functionToken->next()->astOperand1()->expressionString(), argnr, invalidValue, mSettings.library.validarg(functionToken, argnr));
                 }
 
                 if (astIsBool(argtok)) {
                     // check <not-bool>
-                    if (mSettings->library.isboolargbad(functionToken, argnr))
+                    if (mSettings.library.isboolargbad(functionToken, argnr))
                         invalidFunctionArgBoolError(argtok, functionToken->str(), argnr);
 
                     // Are the values 0 and 1 valid?
-                    else if (!mSettings->library.isIntArgValid(functionToken, argnr, 0, *mSettings))
-                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings->library.validarg(functionToken, argnr));
-                    else if (!mSettings->library.isIntArgValid(functionToken, argnr, 1, *mSettings))
-                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings->library.validarg(functionToken, argnr));
+                    else if (!mSettings.library.isIntArgValid(functionToken, argnr, 0, mSettings))
+                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings.library.validarg(functionToken, argnr));
+                    else if (!mSettings.library.isIntArgValid(functionToken, argnr, 1, mSettings))
+                        invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings.library.validarg(functionToken, argnr));
                 }
                 // check <strz>
-                if (mSettings->library.isargstrz(functionToken, argnr)) {
+                if (mSettings.library.isargstrz(functionToken, argnr)) {
                     if (Token::Match(argtok, "& %var% !![") && argtok->next() && argtok->next()->valueType()) {
                         const ValueType * valueType = argtok->next()->valueType();
                         const Variable * variable = argtok->next()->variable();
@@ -153,7 +153,7 @@ void CheckFunctions::invalidFunctionUsage()
                     // Is non-null terminated local variable of type char (e.g. char buf[] = {'x'};) ?
                     if (variable && variable->isLocal()
                         && valueType && (valueType->type == ValueType::Type::CHAR || valueType->type == ValueType::Type::WCHAR_T)
-                        && !isVariablesChanged(variable->declEndToken(), functionToken, 0 /*indirect*/, { variable }, *mSettings)) {
+                        && !isVariablesChanged(variable->declEndToken(), functionToken, valueType->pointer, { variable }, mSettings)) {
                         const Token* varTok = variable->declEndToken();
                         MathLib::bigint count = -1; // Find out explicitly set count, e.g.: char buf[3] = {...}. Variable 'count' is set to 3 then.
                         if (varTok && Token::simpleMatch(varTok->astOperand1(), "["))
@@ -183,7 +183,7 @@ void CheckFunctions::invalidFunctionUsage()
                                 invalidFunctionArgStrError(argtok, functionToken->str(), argnr);
                             }
                         } else if (count > -1 && Token::Match(varTok, "= %str%")) {
-                            const Token* strTok = varTok->getValueTokenMinStrSize(*mSettings);
+                            const Token* strTok = varTok->getValueTokenMinStrSize(mSettings);
                             if (strTok) {
                                 const int strSize = Token::getStrArraySize(strTok);
                                 if (strSize > count && strTok->str().find('\0') == std::string::npos)
@@ -197,7 +197,7 @@ void CheckFunctions::invalidFunctionUsage()
     }
 }
 
-void CheckFunctions::invalidFunctionArgError(const Token *tok, const std::string &functionName, int argnr, const ValueFlow::Value *invalidValue, const std::string &validstr)
+void CheckFunctionsImpl::invalidFunctionArgError(const Token *tok, const std::string &functionName, int argnr, const ValueFlow::Value *invalidValue, const std::string &validstr)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << functionName << '\n';
@@ -226,7 +226,7 @@ void CheckFunctions::invalidFunctionArgError(const Token *tok, const std::string
                     Certainty::normal);
 }
 
-void CheckFunctions::invalidFunctionArgBoolError(const Token *tok, const std::string &functionName, int argnr)
+void CheckFunctionsImpl::invalidFunctionArgBoolError(const Token *tok, const std::string &functionName, int argnr)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << functionName << '\n';
@@ -234,7 +234,7 @@ void CheckFunctions::invalidFunctionArgBoolError(const Token *tok, const std::st
     reportError(tok, Severity::error, "invalidFunctionArgBool", errmsg.str(), CWE628, Certainty::normal);
 }
 
-void CheckFunctions::invalidFunctionArgStrError(const Token *tok, const std::string &functionName, nonneg int argnr)
+void CheckFunctionsImpl::invalidFunctionArgStrError(const Token *tok, const std::string &functionName, nonneg int argnr)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << functionName << '\n';
@@ -245,11 +245,11 @@ void CheckFunctions::invalidFunctionArgStrError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 // Check for ignored return values.
 //---------------------------------------------------------------------------
-void CheckFunctions::checkIgnoredReturnValue()
+void CheckFunctionsImpl::checkIgnoredReturnValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) &&
-        !mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("ignoredReturnValue"))
+    if (!mSettings.severity.isEnabled(Severity::warning) &&
+        !mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("ignoredReturnValue"))
         return;
 
     logChecker("CheckFunctions::checkIgnoredReturnValue"); // style,warning
@@ -282,13 +282,13 @@ void CheckFunctions::checkIgnoredReturnValue()
 
             if ((!tok->function() || !Token::Match(tok->function()->retDef, "void %name%")) &&
                 tok->next()->astOperand1()) {
-                const Library::UseRetValType retvalTy = mSettings->library.getUseRetValType(tok);
+                const Library::UseRetValType retvalTy = mSettings.library.getUseRetValType(tok);
                 const bool warn = (tok->function() && (tok->function()->isAttributeNodiscard() || tok->function()->isAttributePure() || tok->function()->isAttributeConst())) ||
                                   // avoid duplicate warnings for resource-allocating functions
-                                  (retvalTy == Library::UseRetValType::DEFAULT && mSettings->library.getAllocFuncInfo(tok) == nullptr);
-                if (mSettings->severity.isEnabled(Severity::warning) && warn)
+                                  (retvalTy == Library::UseRetValType::DEFAULT && mSettings.library.getAllocFuncInfo(tok) == nullptr);
+                if (mSettings.severity.isEnabled(Severity::warning) && warn)
                     ignoredReturnValueError(tok, tok->next()->astOperand1()->expressionString());
-                else if (mSettings->severity.isEnabled(Severity::style) &&
+                else if (mSettings.severity.isEnabled(Severity::style) &&
                          retvalTy == Library::UseRetValType::ERROR_CODE)
                     ignoredReturnErrorCode(tok, tok->next()->astOperand1()->expressionString());
             }
@@ -296,13 +296,13 @@ void CheckFunctions::checkIgnoredReturnValue()
     }
 }
 
-void CheckFunctions::ignoredReturnValueError(const Token* tok, const std::string& function)
+void CheckFunctionsImpl::ignoredReturnValueError(const Token* tok, const std::string& function)
 {
     reportError(tok, Severity::warning, "ignoredReturnValue",
                 "$symbol:" + function + "\nReturn value of function $symbol() is not used.", CWE252, Certainty::normal);
 }
 
-void CheckFunctions::ignoredReturnErrorCode(const Token* tok, const std::string& function)
+void CheckFunctionsImpl::ignoredReturnErrorCode(const Token* tok, const std::string& function)
 {
     reportError(tok, Severity::style, "ignoredReturnErrorCode",
                 "$symbol:" + function + "\nError code from the return value of function $symbol() is not used.", CWE252, Certainty::normal);
@@ -313,7 +313,7 @@ void CheckFunctions::ignoredReturnErrorCode(const Token* tok, const std::string&
 //---------------------------------------------------------------------------
 static const Token *checkMissingReturnScope(const Token *tok, const Library &library);
 
-void CheckFunctions::checkMissingReturn()
+void CheckFunctionsImpl::checkMissingReturn()
 {
     logChecker("CheckFunctions::checkMissingReturn");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -321,7 +321,7 @@ void CheckFunctions::checkMissingReturn()
         const Function *function = scope->function;
         if (!function || !function->hasBody())
             continue;
-        if (function->name() == "main" && !(mTokenizer->isC() && mSettings->standards.c < Standards::C99))
+        if (function->name() == "main" && !(mTokenizer->isC() && mSettings.standards.c < Standards::C99))
             continue;
         if (function->type != FunctionType::eFunction && function->type != FunctionType::eOperatorEqual)
             continue;
@@ -329,7 +329,9 @@ void CheckFunctions::checkMissingReturn()
             continue;
         if (Function::returnsVoid(function, true))
             continue;
-        const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings->library);
+        if (Function::isCoroutine(function, mSettings.standards, *mTokenizer))
+            continue;
+        const Token *errorToken = checkMissingReturnScope(scope->bodyEnd, mSettings.library);
         if (errorToken)
             missingReturnError(errorToken);
     }
@@ -384,7 +386,12 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
                 if (!isExhaustiveSwitch(tok->link()))
                     return tok->link();
             } else if (tok->scope()->type == ScopeType::eIf) {
-                const Token *condition = tok->scope()->classDef->next()->astOperand2();
+                const Token *paren = tok->link()->linkAt(-1);
+                if (!paren || !Token::simpleMatch(paren->astOperand1(), "if")) {
+                    tok = tok->link();
+                    continue;
+                }
+                const Token *condition = paren->astOperand2();
                 if (condition && condition->hasKnownIntValue() && condition->getKnownIntValue() == 1)
                     return checkMissingReturnScope(tok, library);
                 return tok;
@@ -396,6 +403,19 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
                 if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
                     return checkMissingReturnScope(tok->tokAt(-2), library);
                 return tok;
+            } else if (tok->scope()->type == ScopeType::eCatch) {
+                while (tok->str() == "}") {
+                    const Token *errorToken = checkMissingReturnScope(tok, library);
+                    if (errorToken || tok->scope()->type == ScopeType::eTry)
+                        return errorToken;
+                    tok = tok->link();
+                    if (Token::simpleMatch(tok->previous(), ") {") && Token::simpleMatch(tok->linkAt(-1)->tokAt(-2), "} catch ("))
+                        tok = tok->linkAt(-1)->tokAt(-2);
+                    else
+                        break;
+                }
+                // FIXME this should not be reached
+                return nullptr;
             }
             // FIXME
             return nullptr;
@@ -418,7 +438,7 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
     return nullptr;
 }
 
-void CheckFunctions::missingReturnError(const Token* tok)
+void CheckFunctionsImpl::missingReturnError(const Token* tok)
 {
     reportError(tok, Severity::error, "missingReturn",
                 "Found an exit path from function with non-void return type that has missing return statement", CWE758, Certainty::normal);
@@ -426,12 +446,12 @@ void CheckFunctions::missingReturnError(const Token* tok)
 //---------------------------------------------------------------------------
 // Detect passing wrong values to <cmath> functions like atan(0, x);
 //---------------------------------------------------------------------------
-void CheckFunctions::checkMathFunctions()
+void CheckFunctionsImpl::checkMathFunctions()
 {
-    const bool styleC99 = mSettings->severity.isEnabled(Severity::style) && ((mTokenizer->isC() && mSettings->standards.c != Standards::C89) || (mTokenizer->isCPP() && mSettings->standards.cpp != Standards::CPP03));
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool styleC99 = mSettings.severity.isEnabled(Severity::style) && ((mTokenizer->isC() && mSettings.standards.c != Standards::C89) || (mTokenizer->isCPP() && mSettings.standards.cpp != Standards::CPP03));
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
 
-    if (!styleC99 && !printWarnings && !mSettings->isPremiumEnabled("wrongmathcall"))
+    if (!styleC99 && !printWarnings && !mSettings.isPremiumEnabled("wrongmathcall"))
         return;
 
     logChecker("CheckFunctions::checkMathFunctions"); // style,warning,c99,c++11
@@ -487,7 +507,7 @@ void CheckFunctions::checkMathFunctions()
     }
 }
 
-void CheckFunctions::mathfunctionCallWarning(const Token *tok, const nonneg int numParam)
+void CheckFunctionsImpl::mathfunctionCallWarning(const Token *tok, const nonneg int numParam)
 {
     if (tok) {
         if (numParam == 1)
@@ -498,7 +518,7 @@ void CheckFunctions::mathfunctionCallWarning(const Token *tok, const nonneg int
         reportError(tok, Severity::warning, "wrongmathcall", "Passing value '#' to #() leads to implementation-defined result.", CWE758, Certainty::normal);
 }
 
-void CheckFunctions::mathfunctionCallWarning(const Token *tok, const std::string& oldexp, const std::string& newexp)
+void CheckFunctionsImpl::mathfunctionCallWarning(const Token *tok, const std::string& oldexp, const std::string& newexp)
 {
     reportError(tok, Severity::style, "unpreciseMathCall", "Expression '" + oldexp + "' can be replaced by '" + newexp + "' to avoid loss of precision.", CWE758, Certainty::normal);
 }
@@ -506,7 +526,7 @@ void CheckFunctions::mathfunctionCallWarning(const Token *tok, const std::string
 //---------------------------------------------------------------------------
 // memset(p, y, 0 /* bytes to fill */) <- 2nd and 3rd arguments inverted
 //---------------------------------------------------------------------------
-void CheckFunctions::memsetZeroBytes()
+void CheckFunctionsImpl::memsetZeroBytes()
 {
 // FIXME:
 //  Replace this with library configuration.
@@ -515,7 +535,7 @@ void CheckFunctions::memsetZeroBytes()
 //       <warn knownIntValue="0" severity="warning" msg="..."/>
 //     </arg>
 
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckFunctions::memsetZeroBytes"); // warning
@@ -523,9 +543,9 @@ void CheckFunctions::memsetZeroBytes()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
-            if (Token::Match(tok, "memset|wmemset (") && (numberOfArguments(tok)==3)) {
+            if (Token::Match(tok, "memset|wmemset (")) {
                 const std::vector<const Token *> &arguments = getArguments(tok);
-                if (WRONG_DATA(arguments.size() != 3U, tok))
+                if (arguments.size() != 3U)
                     continue;
                 const Token* lastParamTok = arguments[2];
                 if (MathLib::isNullValue(lastParamTok->str()))
@@ -535,7 +555,7 @@ void CheckFunctions::memsetZeroBytes()
     }
 }
 
-void CheckFunctions::memsetZeroBytesError(const Token *tok)
+void CheckFunctionsImpl::memsetZeroBytesError(const Token *tok)
 {
     const std::string summary("memset() called to fill 0 bytes.");
     const std::string verbose(summary + " The second and third arguments might be inverted."
@@ -544,7 +564,7 @@ void CheckFunctions::memsetZeroBytesError(const Token *tok)
     reportError(tok, Severity::warning, "memsetZeroBytes", summary + "\n" + verbose, CWE687, Certainty::normal);
 }
 
-void CheckFunctions::memsetInvalid2ndParam()
+void CheckFunctionsImpl::memsetInvalid2ndParam()
 {
 // FIXME:
 //  Replace this with library configuration.
@@ -554,8 +574,8 @@ void CheckFunctions::memsetInvalid2ndParam()
 //       <warn possibleIntValue=":-129,256:" severity="warning" msg="..."/>
 //     </arg>
 
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
     if (!printWarning && !printPortability)
         return;
 
@@ -583,8 +603,8 @@ void CheckFunctions::memsetInvalid2ndParam()
 
             if (printWarning && secondParamTok->isNumber()) { // Check if the second parameter is a literal and is out of range
                 const MathLib::bigint value = MathLib::toBigNumber(secondParamTok);
-                const long long sCharMin = mSettings->platform.signedCharMin();
-                const long long uCharMax = mSettings->platform.unsignedCharMax();
+                const long long sCharMin = mSettings.platform.signedCharMin();
+                const long long uCharMax = mSettings.platform.unsignedCharMax();
                 if (value < sCharMin || value > uCharMax)
                     memsetValueOutOfRangeError(secondParamTok, secondParamTok->str());
             }
@@ -592,7 +612,7 @@ void CheckFunctions::memsetInvalid2ndParam()
     }
 }
 
-void CheckFunctions::memsetFloatError(const Token *tok, const std::string &var_value)
+void CheckFunctionsImpl::memsetFloatError(const Token *tok, const std::string &var_value)
 {
     const std::string message("The 2nd memset() argument '" + var_value +
                               "' is a float, its representation is implementation defined.");
@@ -601,7 +621,7 @@ void CheckFunctions::memsetFloatError(const Token *tok, const std::string &var_v
     reportError(tok, Severity::portability, "memsetFloat", message + "\n" + verbose, CWE688, Certainty::normal);
 }
 
-void CheckFunctions::memsetValueOutOfRangeError(const Token *tok, const std::string &value)
+void CheckFunctionsImpl::memsetValueOutOfRangeError(const Token *tok, const std::string &value)
 {
     const std::string message("The 2nd memset() argument '" + value + "' doesn't fit into an 'unsigned char'.");
     const std::string verbose(message + " The 2nd parameter is passed as an 'int', but the function fills the block of memory using the 'unsigned char' conversion of this value.");
@@ -612,9 +632,9 @@ void CheckFunctions::memsetValueOutOfRangeError(const Token *tok, const std::str
 // --check-library => warn for unconfigured functions
 //---------------------------------------------------------------------------
 
-void CheckFunctions::checkLibraryMatchFunctions()
+void CheckFunctionsImpl::checkLibraryMatchFunctions()
 {
-    if (!mSettings->checkLibrary)
+    if (!mSettings.checkLibrary)
         return;
 
     bool insideNew = false;
@@ -622,6 +642,12 @@ void CheckFunctions::checkLibraryMatchFunctions()
         if (!tok->scope() || !tok->scope()->isExecutable())
             continue;
 
+        // skip uninstantiated templates
+        if (tok == tok->scope()->bodyStart && tok->scope()->function && tok->scope()->function->templateDef) {
+            tok = tok->link();
+            continue;
+        }
+
         if (tok->str() == "new")
             insideNew = true;
         else if (tok->str() == ";")
@@ -646,32 +672,32 @@ void CheckFunctions::checkLibraryMatchFunctions()
 
         if (Token::simpleMatch(tok->astParent(), ".")) {
             const Token* contTok = tok->astParent()->astOperand1();
-            if (astContainerAction(contTok, mSettings->library) != Library::Container::Action::NO_ACTION)
+            if (astContainerAction(contTok, mSettings.library) != Library::Container::Action::NO_ACTION)
                 continue;
-            if (astContainerYield(contTok, mSettings->library) != Library::Container::Yield::NO_YIELD)
+            if (astContainerYield(contTok, mSettings.library) != Library::Container::Yield::NO_YIELD)
                 continue;
         }
 
-        if (!mSettings->library.isNotLibraryFunction(tok))
+        if (!mSettings.library.isNotLibraryFunction(tok))
             continue;
 
-        const std::string &functionName = mSettings->library.getFunctionName(tok);
+        const std::string &functionName = mSettings.library.getFunctionName(tok);
         if (functionName.empty())
             continue;
 
-        if (mSettings->library.functions().find(functionName) != mSettings->library.functions().end())
+        if (mSettings.library.functions().find(functionName) != mSettings.library.functions().end())
             continue;
 
-        if (mSettings->library.podtype(tok->expressionString()))
+        if (mSettings.library.podtype(tok->expressionString()))
             continue;
 
-        if (mSettings->library.getTypeCheck("unusedvar", functionName) != Library::TypeCheck::def)
+        if (mSettings.library.getTypeCheck("unusedvar", functionName) != Library::TypeCheck::def)
             continue;
 
         const Token* start = tok;
         while (Token::Match(start->tokAt(-2), "%name% ::") && !start->tokAt(-2)->isKeyword())
             start = start->tokAt(-2);
-        if (mSettings->library.detectContainerOrIterator(start))
+        if (mSettings.library.detectContainerOrIterator(start))
             continue;
 
         reportError(tok,
@@ -684,12 +710,12 @@ void CheckFunctions::checkLibraryMatchFunctions()
 // Check for problems to compiler apply (Named) Return Value Optimization for local variable
 // Technically we have different guarantees between standard versions
 // details: https://en.cppreference.com/w/cpp/language/copy_elision
-void CheckFunctions::returnLocalStdMove()
+void CheckFunctionsImpl::returnLocalStdMove()
 {
-    if (!mTokenizer->isCPP() || mSettings->standards.cpp < Standards::CPP11)
+    if (!mTokenizer->isCPP() || mSettings.standards.cpp < Standards::CPP11)
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckFunctions::returnLocalStdMove"); // performance,c++11
@@ -714,7 +740,7 @@ void CheckFunctions::returnLocalStdMove()
     }
 }
 
-void CheckFunctions::copyElisionError(const Token *tok)
+void CheckFunctionsImpl::copyElisionError(const Token *tok)
 {
     reportError(tok,
                 Severity::performance,
@@ -723,9 +749,9 @@ void CheckFunctions::copyElisionError(const Token *tok)
                 " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local");
 }
 
-void CheckFunctions::useStandardLibrary()
+void CheckFunctionsImpl::useStandardLibrary()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings.severity.isEnabled(Severity::style))
         return;
 
     logChecker("CheckFunctions::useStandardLibrary"); // style
@@ -761,10 +787,10 @@ void CheckFunctions::useStandardLibrary()
 
         const auto& secondOp = condToken->str();
         const bool isLess = "<" == secondOp &&
-                            isConstExpression(condToken->astOperand2(), mSettings->library) &&
+                            isConstExpression(condToken->astOperand2(), mSettings.library) &&
                             condToken->astOperand1()->varId() == idxVarId;
         const bool isMore = ">" == secondOp &&
-                            isConstExpression(condToken->astOperand1(), mSettings->library) &&
+                            isConstExpression(condToken->astOperand1(), mSettings.library) &&
                             condToken->astOperand2()->varId() == idxVarId;
 
         if (!(isLess || isMore))
@@ -827,16 +853,16 @@ void CheckFunctions::useStandardLibrary()
     }
 }
 
-void CheckFunctions::useStandardLibraryError(const Token *tok, const std::string& expected)
+void CheckFunctionsImpl::useStandardLibraryError(const Token *tok, const std::string& expected)
 {
     reportError(tok, Severity::style,
                 "useStandardLibrary",
                 "Consider using " + expected + " instead of loop.");
 }
 
-void CheckFunctions::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckFunctions::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckFunctions checkFunctions(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckFunctionsImpl checkFunctions(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     checkFunctions.checkIgnoredReturnValue();
     checkFunctions.checkMissingReturn();  // Missing "return" in exit path
@@ -853,18 +879,19 @@ void CheckFunctions::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLog
     checkFunctions.useStandardLibrary();
 }
 
-void CheckFunctions::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckFunctions::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckFunctions c(nullptr, settings, errorLogger);
+    CheckFunctionsImpl c(nullptr, settings, errorLogger);
 
-    for (auto i = settings->library.functionwarn().cbegin(); i != settings->library.functionwarn().cend(); ++i) {
-        c.reportError(nullptr, Severity::style, i->first+"Called", i->second.message);
+    for (auto i = settings.library.functionwarn().cbegin(); i != settings.library.functionwarn().cend(); ++i) {
+        c.functionCalledError(nullptr, Severity::style, i->first, i->second.message);
     }
 
     c.invalidFunctionArgError(nullptr, "func_name", 1, nullptr,"1:4");
     c.invalidFunctionArgBoolError(nullptr, "func_name", 1);
     c.invalidFunctionArgStrError(nullptr, "func_name", 1);
     c.ignoredReturnValueError(nullptr, "malloc");
+    c.ignoredReturnErrorCode(nullptr, "func_name");
     c.mathfunctionCallWarning(nullptr);
     c.mathfunctionCallWarning(nullptr, "1 - erf(x)", "erfc(x)");
     c.memsetZeroBytesError(nullptr);
@@ -873,4 +900,5 @@ void CheckFunctions::getErrorMessages(ErrorLogger *errorLogger, const Settings *
     c.missingReturnError(nullptr);
     c.copyElisionError(nullptr);
     c.useStandardLibraryError(nullptr, "memcpy");
+    // TODO: allocaCalled, <funcname>Called
 }
diff --git a/lib/checkfunctions.h b/lib/checkfunctions.h
index f5954d14043..ea7278bf0c8 100644
--- a/lib/checkfunctions.h
+++ b/lib/checkfunctions.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -47,15 +48,33 @@ namespace ValueFlow {
 class CPPCHECKLIB CheckFunctions : public Check {
 public:
     /** This constructor is used when registering the CheckFunctions */
-    CheckFunctions() : Check(myName()) {}
+    CheckFunctions() : Check("Check function usage") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckFunctions(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check function usage:\n"
+               "- missing 'return' in non-void function\n"
+               "- return value of certain functions not used\n"
+               "- invalid input values for functions\n"
+               "- Warn if a function is called whose usage is discouraged\n"
+               "- memset() third argument is zero\n"
+               "- memset() with a value out of range as the 2nd parameter\n"
+               "- memset() with a float as the 2nd parameter\n"
+               "- copy elision optimization for returning value affected by std::move\n"
+               "- use memcpy()/memset() instead of for loop\n";
+    }
+};
+
+class CPPCHECKLIB CheckFunctionsImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckFunctionsImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Check for functions that should not be used */
     void checkProhibitedFunctions();
@@ -106,25 +125,7 @@ class CPPCHECKLIB CheckFunctions : public Check {
     void missingReturnError(const Token *tok);
     void copyElisionError(const Token *tok);
     void useStandardLibraryError(const Token *tok, const std::string& expected);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Check function usage";
-    }
-
-    std::string classInfo() const override {
-        return "Check function usage:\n"
-               "- missing 'return' in non-void function\n"
-               "- return value of certain functions not used\n"
-               "- invalid input values for functions\n"
-               "- Warn if a function is called whose usage is discouraged\n"
-               "- memset() third argument is zero\n"
-               "- memset() with a value out of range as the 2nd parameter\n"
-               "- memset() with a float as the 2nd parameter\n"
-               "- copy elision optimization for returning value affected by std::move\n"
-               "- use memcpy()/memset() instead of for loop\n";
-    }
+    void functionCalledError(const Token* tok, Severity severity, const std::string& prefix, const std::string& msg);
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkimpl.cpp b/lib/checkimpl.cpp
new file mode 100644
index 00000000000..99954315d26
--- /dev/null
+++ b/lib/checkimpl.cpp
@@ -0,0 +1,65 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+#include "checkimpl.h"
+
+#include "errorlogger.h"
+#include "settings.h"
+#include "token.h"
+#include "tokenize.h"
+#include "vfvalue.h"
+
+#include <utility>
+
+void CheckImpl::reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty)
+{
+    // TODO: report debug warning when error is for a disabled severity
+    const ErrorMessage errmsg(callstack, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
+    mErrorLogger.reportErr(errmsg);
+}
+
+void CheckImpl::reportError(ErrorPath errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
+{
+    // TODO: report debug warning when error is for a disabled severity
+    const ErrorMessage errmsg(std::move(errorPath), mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, certainty);
+    mErrorLogger.reportErr(errmsg);
+}
+
+ErrorPath CheckImpl::getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const
+{
+    ErrorPath errorPath;
+    if (!value) {
+        errorPath.emplace_back(errtok, std::move(bug));
+    } else if (mSettings.verbose || mSettings.outputFormat == Settings::OutputFormat::xml || !mSettings.templateLocation.empty()) {
+        errorPath = value->errorPath;
+        errorPath.emplace_back(errtok, std::move(bug));
+    } else {
+        if (value->condition)
+            errorPath.emplace_back(value->condition, "condition '" + value->condition->expressionString() + "'");
+        //else if (!value->isKnown() || value->defaultArg)
+        //    errorPath = value->callstack;
+        errorPath.emplace_back(errtok, std::move(bug));
+    }
+    return errorPath;
+}
+
+void CheckImpl::logChecker(const char id[])
+{
+    if (!mSettings.buildDir.empty() || mSettings.collectLogCheckers())
+        reportError(nullptr, Severity::internal, "logChecker", id);
+}
diff --git a/lib/checkimpl.h b/lib/checkimpl.h
new file mode 100644
index 00000000000..aeff9bfca21
--- /dev/null
+++ b/lib/checkimpl.h
@@ -0,0 +1,79 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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 checkimplH
+#define checkimplH
+
+#include "config.h"
+#include "errortypes.h"
+
+#include <list>
+#include <string>
+
+class Settings;
+class ErrorLogger;
+class Tokenizer;
+class Token;
+namespace ValueFlow {
+    class Value;
+}
+
+class CPPCHECKLIB CheckImpl
+{
+protected:
+    /** This constructor is used when running checks. */
+    CheckImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : mTokenizer(tokenizer), mSettings(settings), mErrorLogger(errorLogger) {}
+
+public:
+    CheckImpl(const CheckImpl &) = delete;
+    CheckImpl& operator=(const CheckImpl &) = delete;
+
+protected:
+    const Tokenizer* const mTokenizer{};
+    const Settings& mSettings;
+    ErrorLogger& mErrorLogger;
+
+    /** report an error */
+    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg) {
+        reportError(tok, severity, id, msg, CWE(0U), Certainty::normal);
+    }
+
+    /** report an error */
+    void reportError(const Token *tok, const Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty) {
+        const std::list<const Token *> callstack(1, tok);
+        reportError(callstack, severity, id, msg, cwe, certainty);
+    }
+
+    /** report an error */
+    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg) {
+        reportError(callstack, severity, id, msg, CWE(0U), Certainty::normal);
+    }
+
+    /** report an error */
+    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty);
+
+    void reportError(ErrorPath errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty);
+
+    ErrorPath getErrorPath(const Token* errtok, const ValueFlow::Value* value, std::string bug) const;
+
+public: // TODO: should be protected
+    void logChecker(const char id[]);
+};
+
+#endif // checkimplH
diff --git a/lib/checkinternal.cpp b/lib/checkinternal.cpp
index d1130c90031..93b10210404 100644
--- a/lib/checkinternal.cpp
+++ b/lib/checkinternal.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,13 +31,7 @@
 #include <set>
 #include <vector>
 
-// Register this check class (by creating a static instance of it).
-// Disabled in release builds
-namespace {
-    CheckInternal instance;
-}
-
-void CheckInternal::checkTokenMatchPatterns()
+void CheckInternalImpl::checkTokenMatchPatterns()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
@@ -88,7 +82,7 @@ void CheckInternal::checkTokenMatchPatterns()
     }
 }
 
-void CheckInternal::checkRedundantTokCheck()
+void CheckInternalImpl::checkRedundantTokCheck()
 {
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::Match(tok, "&& Token :: simpleMatch|Match|findsimplematch|findmatch (")) {
@@ -123,13 +117,13 @@ void CheckInternal::checkRedundantTokCheck()
 }
 
 
-void CheckInternal::checkRedundantTokCheckError(const Token* tok)
+void CheckInternalImpl::checkRedundantTokCheckError(const Token* tok)
 {
     reportError(tok, Severity::style, "redundantTokCheck",
                 "Unnecessary check of \"" + (tok? tok->expressionString(): "") + "\", match-function already checks if it is null.");
 }
 
-void CheckInternal::checkTokenSimpleMatchPatterns()
+void CheckInternalImpl::checkTokenSimpleMatchPatterns()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -213,7 +207,7 @@ namespace {
     };
 }
 
-void CheckInternal::checkMissingPercentCharacter()
+void CheckInternalImpl::checkMissingPercentCharacter()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -254,7 +248,7 @@ void CheckInternal::checkMissingPercentCharacter()
     }
 }
 
-void CheckInternal::checkUnknownPattern()
+void CheckInternalImpl::checkUnknownPattern()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -288,7 +282,7 @@ void CheckInternal::checkUnknownPattern()
     }
 }
 
-void CheckInternal::checkRedundantNextPrevious()
+void CheckInternalImpl::checkRedundantNextPrevious()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -311,7 +305,7 @@ void CheckInternal::checkRedundantNextPrevious()
     }
 }
 
-void CheckInternal::checkExtraWhitespace()
+void CheckInternalImpl::checkExtraWhitespace()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope* scope : symbolDatabase->functionScopes) {
@@ -337,65 +331,58 @@ void CheckInternal::checkExtraWhitespace()
     }
 }
 
-void CheckInternal::multiComparePatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
-{
-    reportError(tok, Severity::error, "multiComparePatternError",
-                "Bad multicompare pattern (a %cmd% must be first unless it is %or%,%op%,%cop%,%name%,%oror%) inside Token::" + funcname + "() call: \"" + pattern + "\""
-                );
-}
-
-void CheckInternal::simplePatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::simplePatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::warning, "simplePatternError",
                 "Found simple pattern inside Token::" + funcname + "() call: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::complexPatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::complexPatternError(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::error, "complexPatternError",
                 "Found complex pattern inside Token::" + funcname + "() call: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::missingPercentCharacterError(const Token* tok, const std::string& pattern, const std::string& funcname)
+void CheckInternalImpl::missingPercentCharacterError(const Token* tok, const std::string& pattern, const std::string& funcname)
 {
     reportError(tok, Severity::error, "missingPercentCharacter",
                 "Missing percent end character in Token::" + funcname + "() pattern: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::unknownPatternError(const Token* tok, const std::string& pattern)
+void CheckInternalImpl::unknownPatternError(const Token* tok, const std::string& pattern)
 {
     reportError(tok, Severity::error, "unknownPattern",
                 "Unknown pattern used: \"" + pattern + "\"");
 }
 
-void CheckInternal::redundantNextPreviousError(const Token* tok, const std::string& func1, const std::string& func2)
+void CheckInternalImpl::redundantNextPreviousError(const Token* tok, const std::string& func1, const std::string& func2)
 {
     reportError(tok, Severity::style, "redundantNextPrevious",
                 "Call to 'Token::" + func1 + "()' followed by 'Token::" + func2 + "()' can be simplified.");
 }
 
-void CheckInternal::orInComplexPattern(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::orInComplexPattern(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::error, "orInComplexPattern",
                 "Token::" + funcname + "() pattern \"" + pattern + "\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\".");
 }
 
-void CheckInternal::extraWhitespaceError(const Token* tok, const std::string& pattern, const std::string &funcname)
+void CheckInternalImpl::extraWhitespaceError(const Token* tok, const std::string& pattern, const std::string &funcname)
 {
     reportError(tok, Severity::warning, "extraWhitespaceError",
                 "Found extra whitespace inside Token::" + funcname + "() call: \"" + pattern + "\""
                 );
 }
 
-void CheckInternal::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckInternal::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (!tokenizer.getSettings().checks.isEnabled(Checks::internalCheck))
         return;
 
-    CheckInternal checkInternal(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckInternalImpl checkInternal(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     checkInternal.checkTokenMatchPatterns();
     checkInternal.checkTokenSimpleMatchPatterns();
@@ -406,10 +393,9 @@ void CheckInternal::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogg
     checkInternal.checkRedundantTokCheck();
 }
 
-void CheckInternal::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckInternal::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckInternal c(nullptr, settings, errorLogger);
-    c.multiComparePatternError(nullptr, ";|%type%", "Match");
+    CheckInternalImpl c(nullptr, settings, errorLogger);
     c.simplePatternError(nullptr, "class {", "Match");
     c.complexPatternError(nullptr, "%type% ( )", "Match");
     c.missingPercentCharacterError(nullptr, "%num", "Match");
diff --git a/lib/checkinternal.h b/lib/checkinternal.h
index bb58f09ea93..18a1535a73f 100644
--- a/lib/checkinternal.h
+++ b/lib/checkinternal.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,7 +22,10 @@
 #define checkinternalH
 //---------------------------------------------------------------------------
 
+#ifdef CHECK_INTERNAL
+
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -40,14 +43,25 @@ class Settings;
 class CPPCHECKLIB CheckInternal : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckInternal() : Check(myName()) {}
+    CheckInternal() : Check("cppcheck internal API usage") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckInternal(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        // Don't include these checks on the WIKI where people can read what
+        // checks there are. These checks are not intended for users.
+        return "";
+    }
+};
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+class CPPCHECKLIB CheckInternalImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckInternalImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check if a simple pattern is used inside Token::Match or Token::findmatch */
     void checkTokenMatchPatterns();
@@ -70,7 +84,6 @@ class CPPCHECKLIB CheckInternal : public Check {
     /** @brief %Check if there is a redundant check for none-nullness of parameter before Match functions, such as (tok && Token::Match(tok, "foo")) */
     void checkRedundantTokCheck();
 
-    void multiComparePatternError(const Token *tok, const std::string &pattern, const std::string &funcname);
     void simplePatternError(const Token *tok, const std::string &pattern, const std::string &funcname);
     void complexPatternError(const Token *tok, const std::string &pattern, const std::string &funcname);
     void missingPercentCharacterError(const Token *tok, const std::string &pattern, const std::string &funcname);
@@ -79,19 +92,10 @@ class CPPCHECKLIB CheckInternal : public Check {
     void orInComplexPattern(const Token *tok, const std::string &pattern, const std::string &funcname);
     void extraWhitespaceError(const Token *tok, const std::string &pattern, const std::string &funcname);
     void checkRedundantTokCheckError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "cppcheck internal API usage";
-    }
-
-    std::string classInfo() const override {
-        // Don't include these checks on the WIKI where people can read what
-        // checks there are. These checks are not intended for users.
-        return "";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
+
+#endif // CHECK_INTERNAL
+
 #endif // checkinternalH
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index 8276ab00bd9..f726cef0cc7 100644
--- a/lib/checkio.cpp
+++ b/lib/checkio.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -45,14 +45,10 @@
 
 //---------------------------------------------------------------------------
 
-// Register CheckIO..
-namespace {
-    CheckIO instance;
-}
-
 // CVE ID used:
 static const CWE CWE119(119U);  // Improper Restriction of Operations within the Bounds of a Memory Buffer
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
+static const CWE CWE474(474U);  // Use of Function with Inconsistent Implementations
 static const CWE CWE664(664U);  // Improper Control of a Resource Through its Lifetime
 static const CWE CWE685(685U);  // Function Call With Incorrect Number of Arguments
 static const CWE CWE686(686U);  // Function Call With Incorrect Argument Type
@@ -63,7 +59,7 @@ static const CWE CWE910(910U);  // Use of Expired File Descriptor
 //---------------------------------------------------------------------------
 //    std::cout << std::cout;
 //---------------------------------------------------------------------------
-void CheckIO::checkCoutCerrMisusage()
+void CheckIOImpl::checkCoutCerrMisusage()
 {
     if (mTokenizer->isC())
         return;
@@ -85,7 +81,7 @@ void CheckIO::checkCoutCerrMisusage()
     }
 }
 
-void CheckIO::coutCerrMisusageError(const Token* tok, const std::string& streamName)
+void CheckIOImpl::coutCerrMisusageError(const Token* tok, const std::string& streamName)
 {
     reportError(tok, Severity::error, "coutCerrMisusage", "Invalid usage of output stream: '<< std::" + streamName + "'.", CWE398, Certainty::normal);
 }
@@ -116,6 +112,8 @@ namespace {
         nonneg int op_indent{};
         enum class AppendMode : std::uint8_t { UNKNOWN_AM, APPEND, APPEND_EX };
         AppendMode append_mode = AppendMode::UNKNOWN_AM;
+        enum class ReadMode : std::uint8_t { READ_TEXT, READ_BIN };
+        ReadMode read_mode = ReadMode::READ_BIN;
         std::string filename;
         explicit Filepointer(OpenMode mode_ = OpenMode::UNKNOWN_OM)
             : mode(mode_) {}
@@ -124,11 +122,11 @@ namespace {
     const std::unordered_set<std::string> whitelist = { "clearerr", "feof", "ferror", "fgetpos", "ftell", "setbuf", "setvbuf", "ungetc", "ungetwc" };
 }
 
-void CheckIO::checkFileUsage()
+void CheckIOImpl::checkFileUsage()
 {
-    const bool windows = mSettings->platform.isWindows();
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool windows = mSettings.platform.isWindows();
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
 
     std::map<int, Filepointer> filepointers;
 
@@ -157,6 +155,8 @@ void CheckIO::checkFileUsage()
                 tok = tok->linkAt(1);
                 continue;
             }
+            if (tok->function() && tok->function()->nestedIn)
+                continue;
             if (tok->str() == "{")
                 indent++;
             else if (tok->str() == "}") {
@@ -171,7 +171,7 @@ void CheckIO::checkFileUsage()
                         filepointer.second.lastOperation = Filepointer::Operation::UNKNOWN_OP;
                     }
                 }
-            } else if (tok->str() == "return" || tok->str() == "continue" || tok->str() == "break" || mSettings->library.isnoreturn(tok)) { // Reset upon return, continue or break
+            } else if (tok->str() == "return" || tok->str() == "continue" || tok->str() == "break" || mSettings.library.isnoreturn(tok)) { // Reset upon return, continue or break
                 for (std::pair<const int, Filepointer>& filepointer : filepointers) {
                     filepointer.second.mode_indent = 0;
                     filepointer.second.mode = OpenMode::UNKNOWN_OM;
@@ -188,6 +188,7 @@ void CheckIO::checkFileUsage()
                 }
             } else if (Token::Match(tok, "%name% (") && tok->previous() && (!tok->previous()->isName() || Token::Match(tok->previous(), "return|throw"))) {
                 std::string mode;
+                bool isftell = false;
                 const Token* fileTok = nullptr;
                 const Token* fileNameTok = nullptr;
                 Filepointer::Operation operation = Filepointer::Operation::NONE;
@@ -245,12 +246,37 @@ void CheckIO::checkFileUsage()
                 } else if (tok->str() == "fclose") {
                     fileTok = tok->tokAt(2);
                     operation = Filepointer::Operation::CLOSE;
+
+                    // #1473 Check if fclose is in a while loop condition
+                    if (fileTok && fileTok->isVariable()) {
+                        const Token* loopTok = tok->astTop()->previous();
+
+                        if (loopTok && loopTok->str() == "while") {
+                            const Token* bodyEnd = nullptr;
+                            const Token* bodyStart = nullptr;
+
+                            if (Token::simpleMatch(loopTok->previous(), "}") && loopTok->previous()->scope()->type == ScopeType::eDo) { // Handle do-while loops
+                                bodyEnd = loopTok->previous();
+                                bodyStart = bodyEnd->link();
+                            } else {
+                                bodyStart = loopTok->linkAt(1)->next();
+                                bodyEnd = bodyStart->link();
+                            }
+
+                            // Do not trigger a warning if the loop always exits or if the file is opened again in the loop.
+                            if (!isReturnScope(bodyEnd, mSettings.library) && Token::findmatch(bodyStart, "%var% =", bodyEnd, fileTok->varId()) == nullptr)
+                                fcloseInLoopConditionError(tok, fileTok->str());
+                        }
+                    }
                 } else if (whitelist.find(tok->str()) != whitelist.end()) {
                     fileTok = tok->tokAt(2);
                     if ((tok->str() == "ungetc" || tok->str() == "ungetwc") && fileTok)
                         fileTok = fileTok->nextArgument();
+                    else if (tok->str() == "ftell") {
+                        isftell = true;
+                    }
                     operation = Filepointer::Operation::UNIMPORTANT;
-                } else if (!Token::Match(tok, "if|for|while|catch|switch") && !mSettings->library.isFunctionConst(tok->str(), true)) {
+                } else if (!Token::Match(tok, "if|for|while|catch|switch") && !mSettings.library.isFunctionConst(tok->str(), true)) {
                     const Token* const end2 = tok->linkAt(1);
                     if (scope->functionOf && scope->functionOf->isClassOrStruct() && !scope->function->isStatic() && ((tok->strAt(-1) != "::" && tok->strAt(-1) != ".") || tok->strAt(-2) == "this")) {
                         if (!tok->function() || (tok->function()->nestedIn && tok->function()->nestedIn->isClassOrStruct())) {
@@ -304,10 +330,15 @@ void CheckIO::checkFileUsage()
                             f.append_mode = Filepointer::AppendMode::APPEND_EX;
                         else
                             f.append_mode = Filepointer::AppendMode::APPEND;
+                    }
+                    else if (mode.find('r') != std::string::npos &&
+                             mode.find('t') != std::string::npos) {
+                        f.read_mode = Filepointer::ReadMode::READ_TEXT;
                     } else
                         f.append_mode = Filepointer::AppendMode::UNKNOWN_AM;
                     f.mode_indent = indent;
                     break;
+
                 case Filepointer::Operation::POSITIONING:
                     if (f.mode == OpenMode::CLOSED)
                         useClosedFileError(tok);
@@ -340,6 +371,8 @@ void CheckIO::checkFileUsage()
                 case Filepointer::Operation::UNIMPORTANT:
                     if (f.mode == OpenMode::CLOSED)
                         useClosedFileError(tok);
+                    if (isftell && f.read_mode == Filepointer::ReadMode::READ_TEXT && printPortability)
+                        ftellFileError(tok);
                     break;
                 case Filepointer::Operation::UNKNOWN_OP:
                     f.mode = OpenMode::UNKNOWN_OM;
@@ -362,43 +395,58 @@ void CheckIO::checkFileUsage()
     }
 }
 
-void CheckIO::fflushOnInputStreamError(const Token *tok, const std::string &varname)
+void CheckIOImpl::fflushOnInputStreamError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::portability,
                 "fflushOnInputStream", "fflush() called on input stream '" + varname + "' may result in undefined behaviour on non-linux systems.", CWE398, Certainty::normal);
 }
 
-void CheckIO::ioWithoutPositioningError(const Token *tok)
+void CheckIOImpl::ioWithoutPositioningError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "IOWithoutPositioning", "Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.", CWE664, Certainty::normal);
 }
 
-void CheckIO::readWriteOnlyFileError(const Token *tok)
+void CheckIOImpl::readWriteOnlyFileError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "readWriteOnlyFile", "Read operation on a file that was opened only for writing.", CWE664, Certainty::normal);
 }
 
-void CheckIO::writeReadOnlyFileError(const Token *tok)
+void CheckIOImpl::writeReadOnlyFileError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "writeReadOnlyFile", "Write operation on a file that was opened only for reading.", CWE664, Certainty::normal);
 }
 
-void CheckIO::useClosedFileError(const Token *tok)
+void CheckIOImpl::useClosedFileError(const Token *tok)
 {
     reportError(tok, Severity::error,
                 "useClosedFile", "Used file that is not opened.", CWE910, Certainty::normal);
 }
 
-void CheckIO::seekOnAppendedFileError(const Token *tok)
+void CheckIOImpl::fcloseInLoopConditionError(const Token *tok, const std::string &varname)
+{
+    reportError(tok, Severity::warning,
+                "fcloseInLoopCondition",
+                "fclose() used as loop condition may skip loop body or double-close file handle.\n"
+                "fclose() closes '" + varname + "' each time it is evaluated. On success the loop body might never execute, on failure fclose() might be called again on the already-closed file handle.",
+                CWE910, Certainty::normal);
+}
+
+void CheckIOImpl::seekOnAppendedFileError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "seekOnAppendedFile", "Repositioning operation performed on a file opened in append mode has no effect.", CWE398, Certainty::normal);
 }
 
-void CheckIO::incompatibleFileOpenError(const Token *tok, const std::string &filename)
+void CheckIOImpl::ftellFileError(const Token *tok)
+{
+    reportError(tok, Severity::portability,
+                "ftellTextModeFile", "ftell() result is unspecified when file is opened in mode \"t\"", CWE474, Certainty::normal);
+}
+
+void CheckIOImpl::incompatibleFileOpenError(const Token *tok, const std::string &filename)
 {
     reportError(tok, Severity::warning,
                 "incompatibleFileOpen", "The file '" + filename + "' is opened for read and write access at the same time on different streams", CWE664, Certainty::normal);
@@ -408,9 +456,9 @@ void CheckIO::incompatibleFileOpenError(const Token *tok, const std::string &fil
 //---------------------------------------------------------------------------
 // scanf without field width limits can crash with huge input data
 //---------------------------------------------------------------------------
-void CheckIO::invalidScanf()
+void CheckIOImpl::invalidScanf()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("invalidscanf"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("invalidscanf"))
         return;
 
     logChecker("CheckIO::invalidScanf");
@@ -455,7 +503,7 @@ void CheckIO::invalidScanf()
     }
 }
 
-void CheckIO::invalidScanfError(const Token *tok)
+void CheckIOImpl::invalidScanfError(const Token *tok)
 {
     const std::string fname = (tok ? tok->str() : std::string("scanf"));
     reportError(tok, Severity::warning,
@@ -481,22 +529,157 @@ void CheckIO::invalidScanfError(const Token *tok)
                 CWE119, Certainty::normal);
 }
 
+static const Token* findFileReadCall(const Token *start, const Token *end, int varid)
+{
+    const Token* found = Token::findmatch(start, "fgets|fgetc|getc|fread|fscanf (", end);
+    while (found) {
+        const std::vector<const Token*> args = getArguments(found);
+        if (!args.empty()) {
+            const bool match = (found->str() == "fscanf")
+                               ? args.front()->varId() == varid
+                               : args.back()->varId() == varid;
+            if (match)
+                return found;
+        }
+        found = Token::findmatch(found->next(), "fgets|fgetc|getc|fread|fscanf (", end);
+    }
+    return nullptr;
+}
+
+void CheckIOImpl::checkWrongfeofUsage()
+{
+    const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
+
+    logChecker("CheckIO::checkWrongfeofUsage");
+
+    for (const Scope * scope : symbolDatabase->functionScopes) {
+        for (const Token *tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
+            // TODO: Handle for loops
+            if (!Token::Match(tok, "while ( ! feof ( %var% )"))
+                continue;
+
+            // Bail out if we cannot identify file pointer
+            const int fpVarId = tok->tokAt(5)->varId();
+            if (fpVarId == 0)
+                continue;
+
+            const Token *endCond = tok->linkAt(1);
+            const Token *bodyStart;
+            const Token *bodyEnd;
+
+            if (Token::simpleMatch(tok->previous(), "}") && tok->previous()->scope()->type == ScopeType::eDo) {
+                bodyEnd = tok->previous();
+                bodyStart = bodyEnd->link();
+            } else {
+                if (!Token::simpleMatch(endCond, ") {"))
+                    continue;
+                bodyEnd = endCond->linkAt(1);
+                bodyStart = endCond->next();
+            }
+
+            // Bail out if the loop contains control flow (too complex to analyze)
+            if (Token::findmatch(bodyStart, "return|break|goto|continue|throw", bodyEnd))
+                continue;
+
+            // Bail out if fp is used outside of known file I/O functions.
+            // If it is passed to an unknown function, reads may occur there.
+            bool fpUsedElsewhere = false;
+            for (const Token *t = bodyStart->next(); t && t != bodyEnd; t = t->next()) {
+                if (t->varId() != fpVarId)
+                    continue;
+                const Token *p = t->astParent();
+                while (p && p->str() == ",")
+                    p = p->astParent();
+                if (!p || !Token::Match(p->astOperand1(), "fgets|fgetc|getc|fread|fscanf|fprintf|fwrite|fputs|fputc|putc")) {
+                    fpUsedElsewhere = true;
+                    break;
+                }
+            }
+            if (fpUsedElsewhere)
+                continue;
+
+            // No file read call in the loop: feof can never become true inside it
+            const Token *loopFileReadCallTok = findFileReadCall(bodyStart, bodyEnd, fpVarId);
+            if (!loopFileReadCallTok) {
+                // TODO: Warn about infinite loop
+                continue;
+            }
+
+            // Find last file read
+            const Token *lastLoopFileReadCallTok = loopFileReadCallTok;
+            while (loopFileReadCallTok) {
+                lastLoopFileReadCallTok = loopFileReadCallTok;
+                loopFileReadCallTok = findFileReadCall(lastLoopFileReadCallTok->next(), bodyEnd, fpVarId);
+            }
+
+            // Warn if the destination of the last file read is used after the call before bodyEnd.
+            // If it is not, the stale buffer is never accessed on the extra iteration at EOF.
+
+            if (lastLoopFileReadCallTok->str() == "fgetc" || lastLoopFileReadCallTok->str() == "getc") {
+                // Warn if the return value feeds into an expression (astParent of the call node)
+                if (lastLoopFileReadCallTok->astParent() && lastLoopFileReadCallTok->astParent()->astParent())
+                    wrongfeofUsage(getCondTok(tok));
+            } else {
+                const std::vector<const Token*> args = getArguments(lastLoopFileReadCallTok);
+                // Collect destination varIds
+                std::vector<nonneg int> destVarIds;
+                if (lastLoopFileReadCallTok->str() == "fscanf") {
+                    // args[0]=fp, args[1]=format, args[2+]=destinations (typically &var)
+                    for (std::size_t i = 2; i < args.size(); ++i) {
+                        const Token *destTok = Token::Match(args[i], "& %var%") ? args[i]->next() : args[i];
+                        if (destTok->varId() != 0)
+                            destVarIds.push_back(destTok->varId());
+                    }
+                } else {
+                    // Handle fgets, fread
+                    // First argument is the destination buffer
+                    if (!args.empty() && args.front()->varId() != 0)
+                        destVarIds.push_back(args.front()->varId());
+                }
+
+                // Search for any destination use between this call's ';' and endBody
+                const Token *semiColonTok = lastLoopFileReadCallTok->linkAt(1)->next();
+                for (const Token *t = semiColonTok; t && t != bodyEnd; t = t->next()) {
+                    if (std::find(destVarIds.begin(), destVarIds.end(), t->varId()) != destVarIds.end()) {
+                        wrongfeofUsage(getCondTok(tok));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void CheckIOImpl::wrongfeofUsage(const Token * tok)
+{
+    reportError(tok, Severity::warning,
+                "wrongfeofUsage",
+                "Using feof() as a loop condition causes the last line to be processed twice.\n"
+                "feof() returns true only after a read has failed due to end-of-file, so the loop "
+                "body executes once more after the last successful read. Check the return value of "
+                "the read function instead (e.g. fgets, fread, fscanf).");
+}
+
 //---------------------------------------------------------------------------
 //    printf("%u", "xyz"); // Wrong argument type
 //    printf("%u%s", 1); // Too few arguments
 //    printf("", 1); // Too much arguments
 //---------------------------------------------------------------------------
 
-static bool findFormat(nonneg int arg, const Token *firstArg,
+static bool findFormat(nonneg int arg, nonneg int argc, const Token *firstArg,
                        const Token *&formatStringTok, const Token *&formatArgTok)
 {
+    formatArgTok = firstArg;
+
+    for (int i = 0; i < argc && formatArgTok; ++i)
+        formatArgTok = formatArgTok->nextArgument();
+
     const Token* argTok = firstArg;
 
     for (int i = 0; i < arg && argTok; ++i)
         argTok = argTok->nextArgument();
 
     if (Token::Match(argTok, "%str% [,)]")) {
-        formatArgTok = argTok->nextArgument();
         formatStringTok = argTok;
         return true;
     }
@@ -507,7 +690,6 @@ static bool findFormat(nonneg int arg, const Token *firstArg,
          (argTok->variable()->dimensions().size() == 1 &&
           argTok->variable()->dimensionKnown(0) &&
           argTok->variable()->dimension(0) != 0))) {
-        formatArgTok = argTok->nextArgument();
         if (!argTok->values().empty()) {
             const auto value = std::find_if(
                 argTok->values().cbegin(), argTok->values().cend(), std::mem_fn(&ValueFlow::Value::isTokValue));
@@ -527,10 +709,21 @@ static inline bool typesMatch(const std::string& iToTest, const std::string& iTy
     return (iToTest == iTypename) || (iToTest == iOptionalPrefix + iTypename);
 }
 
-void CheckIO::checkWrongPrintfScanfArguments()
+static int getMaxArgNo(const Library::Function *func)
+{
+    const auto &checks = func->argumentChecks;
+    return std::max_element(checks.cbegin(), checks.cend(),
+                            [](const std::pair<int, Library::ArgumentChecks> &lhs,
+                               const std::pair<int, Library::ArgumentChecks> &rhs) {
+        return lhs.first < rhs.first;
+    }
+                            )->first;
+}
+
+void CheckIOImpl::checkWrongPrintfScanfArguments()
 {
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
-    const bool isWindows = mSettings->platform.isWindows();
+    const bool isWindows = mSettings.platform.isWindows();
 
     logChecker("CheckIO::checkWrongPrintfScanfArguments");
 
@@ -544,46 +737,48 @@ void CheckIO::checkWrongPrintfScanfArguments()
             bool scan = false;
             bool scanf_s = false;
             int formatStringArgNo = -1;
+            int argc = -1;
 
-            if (tok->strAt(1) == "(" && mSettings->library.formatstr_function(tok)) {
-                formatStringArgNo = mSettings->library.formatstr_argno(tok);
-                scan = mSettings->library.formatstr_scan(tok);
-                scanf_s = mSettings->library.formatstr_secure(tok);
+            if (tok->strAt(1) == "(" && mSettings.library.formatstr_function(tok)) {
+                argc = getMaxArgNo(mSettings.library.getFunction(tok));
+                formatStringArgNo = mSettings.library.formatstr_argno(tok);
+                scan = mSettings.library.formatstr_scan(tok);
+                scanf_s = mSettings.library.formatstr_secure(tok);
             }
 
             if (formatStringArgNo >= 0) {
                 // formatstring found in library. Find format string and first argument belonging to format string.
-                if (!findFormat(formatStringArgNo, tok->tokAt(2), formatStringTok, argListTok))
+                if (!findFormat(formatStringArgNo, argc, tok->tokAt(2), formatStringTok, argListTok))
                     continue;
             } else if (Token::simpleMatch(tok, "swprintf (")) {
                 if (Token::Match(tok->tokAt(2)->nextArgument(), "%str%")) {
                     // Find third parameter and format string
-                    if (!findFormat(1, tok->tokAt(2), formatStringTok, argListTok))
+                    if (!findFormat(1, 2, tok->tokAt(2), formatStringTok, argListTok))
                         continue;
                 } else {
                     // Find fourth parameter and format string
-                    if (!findFormat(2, tok->tokAt(2), formatStringTok, argListTok))
+                    if (!findFormat(2, 3, tok->tokAt(2), formatStringTok, argListTok))
                         continue;
                 }
             } else if (isWindows && Token::Match(tok, "sprintf_s|swprintf_s (")) {
                 // template <size_t size> int sprintf_s(char (&buffer)[size], const char *format, ...);
-                if (findFormat(1, tok->tokAt(2), formatStringTok, argListTok)) {
+                if (findFormat(1, 2, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
                 // int sprintf_s(char *buffer, size_t sizeOfBuffer, const char *format, ...);
-                else if (findFormat(2, tok->tokAt(2), formatStringTok, argListTok)) {
+                else if (findFormat(2, 3, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
             } else if (isWindows && Token::Match(tok, "_snprintf_s|_snwprintf_s (")) {
                 // template <size_t size> int _snprintf_s(char (&buffer)[size], size_t count, const char *format, ...);
-                if (findFormat(2, tok->tokAt(2), formatStringTok, argListTok)) {
+                if (findFormat(2, 3, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
                 // int _snprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, ...);
-                else if (findFormat(3, tok->tokAt(2), formatStringTok, argListTok)) {
+                else if (findFormat(3, 4, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
@@ -599,14 +794,14 @@ void CheckIO::checkWrongPrintfScanfArguments()
     }
 }
 
-void CheckIO::checkFormatString(const Token * const tok,
-                                const Token * const formatStringTok,
-                                const Token *       argListTok,
-                                const bool scan,
-                                const bool scanf_s)
+void CheckIOImpl::checkFormatString(const Token * const tok,
+                                    const Token * const formatStringTok,
+                                    const Token *       argListTok,
+                                    const bool scan,
+                                    const bool scanf_s)
 {
-    const bool isWindows = mSettings->platform.isWindows();
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
+    const bool isWindows = mSettings.platform.isWindows();
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
     const std::string &formatString = formatStringTok->str();
 
     // Count format string parameters..
@@ -664,6 +859,8 @@ void CheckIO::checkFormatString(const Token * const tok,
                 }
                 ++i;
             }
+            while (!width.empty() && width[0] == '0')
+                width = width.substr(1);
             auto bracketBeg = formatString.cend();
             if (i != formatString.cend() && *i == '[') {
                 bracketBeg = i;
@@ -674,7 +871,6 @@ void CheckIO::checkFormatString(const Token * const tok,
                     ++i;
                 }
                 if (scanf_s && !skip) {
-                    numSecure++;
                     if (argListTok) {
                         argListTok = argListTok->nextArgument();
                     }
@@ -697,9 +893,9 @@ void CheckIO::checkFormatString(const Token * const tok,
                 }
 
                 // Perform type checks
-                ArgumentInfo argInfo(argListTok, *mSettings, mTokenizer->isCPP());
+                ArgumentInfo argInfo(argListTok, mSettings, mTokenizer->isCPP());
 
-                if ((argInfo.typeToken && !argInfo.isLibraryType(*mSettings)) || *i == ']') {
+                if ((argInfo.typeToken && !argInfo.isLibraryType(mSettings.library)) || *i == ']') {
                     if (scan) {
                         std::string specifier;
                         bool done = false;
@@ -722,7 +918,7 @@ void CheckIO::checkFormatString(const Token * const tok,
                                     if (!(argInfo.isArrayOrPointer() && argInfo.element && !argInfo.typeToken->isStandardType()))
                                         invalidScanfArgTypeError_s(tok, numFormat, specifier, &argInfo);
                                 }
-                                if (scanf_s && argInfo.typeToken) {
+                                if (scanf_s) {
                                     numSecure++;
                                     if (argListTok) {
                                         argListTok = argListTok->nextArgument();
@@ -1343,7 +1539,7 @@ void CheckIO::checkFormatString(const Token * const tok,
 // We currently only support string literals, variables, and functions.
 /// @todo add non-string literals, and generic expressions
 
-CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings, bool _isCPP)
+CheckIOImpl::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings, bool _isCPP)
     : isCPP(_isCPP)
 {
     if (!arg)
@@ -1399,7 +1595,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
             for (int p = 0; p < valuetype->pointer; p++)
                 tempToken->insertToken("*");
             tempToken = const_cast<Token*>(typeToken);
-            if (top->isBinaryOp() && valuetype->pointer == 1 && (valuetype->type == ValueType::CHAR || valuetype->type == ValueType::WCHAR_T))
+            if (top->isBinaryOp() && Token::Match(top, "[+-]") && valuetype->pointer == 1 && (valuetype->type == ValueType::CHAR || valuetype->type == ValueType::WCHAR_T))
                 tempToken->tokType(Token::eString);
             return;
         }
@@ -1540,9 +1736,10 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
                 if (element && isStdVectorOrString()) { // isStdVectorOrString sets type token if true
                     element = false;    // not really an array element
                 } else if (variableInfo->isEnumType()) {
-                    if (variableInfo->type() && variableInfo->type()->classScope && variableInfo->type()->classScope->enumType)
+                    const bool hasEnumType = variableInfo->type() && variableInfo->type()->classScope && variableInfo->type()->classScope->enumType;
+                    if (hasEnumType && variableInfo->type()->classScope->enumType->isStandardType())
                         typeToken = variableInfo->type()->classScope->enumType;
-                    else {
+                    else if (!hasEnumType) {
                         tempToken = new Token(tok1);
                         tempToken->str("int");
                         typeToken = tempToken;
@@ -1556,7 +1753,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
     }
 }
 
-CheckIO::ArgumentInfo::~ArgumentInfo()
+CheckIOImpl::ArgumentInfo::~ArgumentInfo()
 {
     if (tempToken) {
         while (tempToken->next())
@@ -1571,7 +1768,7 @@ namespace {
     const std::set<std::string> stl_string = { "string", "u16string", "u32string", "wstring" };
 }
 
-bool CheckIO::ArgumentInfo::isStdVectorOrString()
+bool CheckIOImpl::ArgumentInfo::isStdVectorOrString()
 {
     if (!isCPP)
         return false;
@@ -1633,7 +1830,7 @@ static const std::set<std::string> stl_container = {
     "unordered_map", "unordered_multimap", "unordered_multiset", "unordered_set", "vector"
 };
 
-bool CheckIO::ArgumentInfo::isStdContainer(const Token *tok)
+bool CheckIOImpl::ArgumentInfo::isStdContainer(const Token *tok)
 {
     if (!isCPP)
         return false;
@@ -1665,7 +1862,7 @@ bool CheckIO::ArgumentInfo::isStdContainer(const Token *tok)
     return false;
 }
 
-bool CheckIO::ArgumentInfo::isArrayOrPointer() const
+bool CheckIOImpl::ArgumentInfo::isArrayOrPointer() const
 {
     if (address)
         return true;
@@ -1678,10 +1875,10 @@ bool CheckIO::ArgumentInfo::isArrayOrPointer() const
     return tok && tok->strAt(1) == "*";
 }
 
-bool CheckIO::ArgumentInfo::isComplexType() const
+bool CheckIOImpl::ArgumentInfo::isComplexType() const
 {
     if (variableInfo->type())
-        return (true);
+        return true;
 
     const Token* varTypeTok = typeToken;
     if (varTypeTok->str() == "std")
@@ -1690,7 +1887,7 @@ bool CheckIO::ArgumentInfo::isComplexType() const
     return ((variableInfo->isStlStringType() || (varTypeTok->strAt(1) == "<" && varTypeTok->linkAt(1) && varTypeTok->linkAt(1)->strAt(1) != "::")) && !variableInfo->isArrayOrPointer());
 }
 
-bool CheckIO::ArgumentInfo::isKnownType() const
+bool CheckIOImpl::ArgumentInfo::isKnownType() const
 {
     if (variableInfo)
         return (typeToken->isStandardType() || typeToken->next()->isStandardType() || isComplexType());
@@ -1700,18 +1897,18 @@ bool CheckIO::ArgumentInfo::isKnownType() const
     return typeToken->isStandardType() || Token::Match(typeToken, "std :: string|wstring");
 }
 
-bool CheckIO::ArgumentInfo::isLibraryType(const Settings &settings) const
+bool CheckIOImpl::ArgumentInfo::isLibraryType(const Library &library) const
 {
-    return typeToken && typeToken->isStandardType() && settings.library.podtype(typeToken->str());
+    return typeToken && typeToken->isStandardType() && library.podtype(typeToken->str());
 }
 
-void CheckIO::wrongPrintfScanfArgumentsError(const Token* tok,
-                                             const std::string &functionName,
-                                             nonneg int numFormat,
-                                             nonneg int numFunction)
+void CheckIOImpl::wrongPrintfScanfArgumentsError(const Token* tok,
+                                                 const std::string &functionName,
+                                                 nonneg int numFormat,
+                                                 nonneg int numFunction)
 {
     const Severity severity = numFormat > numFunction ? Severity::error : Severity::warning;
-    if (severity != Severity::error && !mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("wrongPrintfScanfArgNum"))
+    if (severity != Severity::error && !mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("wrongPrintfScanfArgNum"))
         return;
 
     std::ostringstream errmsg;
@@ -1727,10 +1924,10 @@ void CheckIO::wrongPrintfScanfArgumentsError(const Token* tok,
     reportError(tok, severity, "wrongPrintfScanfArgNum", errmsg.str(), CWE685, Certainty::normal);
 }
 
-void CheckIO::wrongPrintfScanfPosixParameterPositionError(const Token* tok, const std::string& functionName,
-                                                          nonneg int index, nonneg int numFunction)
+void CheckIOImpl::wrongPrintfScanfPosixParameterPositionError(const Token* tok, const std::string& functionName,
+                                                              nonneg int index, nonneg int numFunction)
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("wrongPrintfScanfParameterPositionError"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("wrongPrintfScanfParameterPositionError"))
         return;
     std::ostringstream errmsg;
     errmsg << functionName << ": ";
@@ -1742,10 +1939,10 @@ void CheckIO::wrongPrintfScanfPosixParameterPositionError(const Token* tok, cons
     reportError(tok, Severity::warning, "wrongPrintfScanfParameterPositionError", errmsg.str(), CWE685, Certainty::normal);
 }
 
-void CheckIO::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires a \'";
@@ -1758,10 +1955,10 @@ void CheckIO::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat,
     errmsg << ".";
     reportError(tok, severity, "invalidScanfArgType_s", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidScanfArgTypeError_int(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo, bool isUnsigned)
+void CheckIOImpl::invalidScanfArgTypeError_int(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo, bool isUnsigned)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires \'";
@@ -1803,10 +2000,10 @@ void CheckIO::invalidScanfArgTypeError_int(const Token* tok, nonneg int numForma
     errmsg << ".";
     reportError(tok, severity, "invalidScanfArgType_int", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires \'";
@@ -1822,10 +2019,10 @@ void CheckIO::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFor
     reportError(tok, severity, "invalidScanfArgType_float", errmsg.str(), CWE686, Certainty::normal);
 }
 
-void CheckIO::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%s in format string (no. " << numFormat << ") requires \'char *\' but the argument type is ";
@@ -1833,10 +2030,10 @@ void CheckIO::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat
     errmsg << ".";
     reportError(tok, severity, "invalidPrintfArgType_s", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%n in format string (no. " << numFormat << ") requires \'int *\' but the argument type is ";
@@ -1844,10 +2041,10 @@ void CheckIO::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat
     errmsg << ".";
     reportError(tok, severity, "invalidPrintfArgType_n", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidPrintfArgTypeError_p(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_p(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%p in format string (no. " << numFormat << ") requires an address but the argument type is ";
@@ -1894,10 +2091,10 @@ static void printfFormatType(std::ostream& os, const std::string& specifier, boo
     os << "\'";
 }
 
-void CheckIO::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires ";
@@ -1908,10 +2105,10 @@ void CheckIO::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFor
     reportError(tok, severity, "invalidPrintfArgType_uint", errmsg.str(), CWE686, Certainty::normal);
 }
 
-void CheckIO::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires ";
@@ -1921,10 +2118,10 @@ void CheckIO::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFor
     errmsg << ".";
     reportError(tok, severity, "invalidPrintfArgType_sint", errmsg.str(), CWE686, Certainty::normal);
 }
-void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
+void CheckIOImpl::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
     const Severity severity = getSeverity(argInfo);
-    if (!mSettings->severity.isEnabled(severity))
+    if (!mSettings.severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
     errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires \'";
@@ -1936,12 +2133,12 @@ void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFo
     reportError(tok, severity, "invalidPrintfArgType_float", errmsg.str(), CWE686, Certainty::normal);
 }
 
-Severity CheckIO::getSeverity(const CheckIO::ArgumentInfo *argInfo)
+Severity CheckIOImpl::getSeverity(const ArgumentInfo *argInfo)
 {
     return (argInfo && argInfo->typeToken && !argInfo->typeToken->originalName().empty()) ? Severity::portability : Severity::warning;
 }
 
-void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
+void CheckIOImpl::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
 {
     if (argInfo) {
         os << "\'";
@@ -1991,16 +2188,16 @@ void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
         os << "Unknown";
 }
 
-void CheckIO::invalidLengthModifierError(const Token* tok, nonneg int numFormat, const std::string& modifier)
+void CheckIOImpl::invalidLengthModifierError(const Token* tok, nonneg int numFormat, const std::string& modifier)
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("invalidLengthModifierError"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("invalidLengthModifierError"))
         return;
     std::ostringstream errmsg;
     errmsg << "'" << modifier << "' in format string (no. " << numFormat << ") is a length modifier and cannot be used without a conversion specifier.";
     reportError(tok, Severity::warning, "invalidLengthModifierError", errmsg.str(), CWE704, Certainty::normal);
 }
 
-void CheckIO::invalidScanfFormatWidthError(const Token* tok, nonneg int numFormat, int width, const Variable *var, const std::string& specifier)
+void CheckIOImpl::invalidScanfFormatWidthError(const Token* tok, nonneg int numFormat, int width, const Variable *var, const std::string& specifier)
 {
     MathLib::bigint arrlen = 0;
     std::string varname;
@@ -2012,7 +2209,7 @@ void CheckIO::invalidScanfFormatWidthError(const Token* tok, nonneg int numForma
 
     std::ostringstream errmsg;
     if (arrlen > width) {
-        if (tok != nullptr && (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning)))
+        if (tok != nullptr && (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning)))
             return;
         errmsg << "Width " << width << " given in format string (no. " << numFormat << ") is smaller than destination buffer"
                << " '" << varname << "[" << arrlen << "]'.";
@@ -2024,27 +2221,30 @@ void CheckIO::invalidScanfFormatWidthError(const Token* tok, nonneg int numForma
     }
 }
 
-void CheckIO::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckIO::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckIO checkIO(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckIOImpl checkIO(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     checkIO.checkWrongPrintfScanfArguments();
     checkIO.checkCoutCerrMisusage();
     checkIO.checkFileUsage();
+    checkIO.checkWrongfeofUsage();
     checkIO.invalidScanf();
 }
 
-void CheckIO::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckIO::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckIO c(nullptr, settings, errorLogger);
+    CheckIOImpl c(nullptr, settings, errorLogger);
     c.coutCerrMisusageError(nullptr,  "cout");
     c.fflushOnInputStreamError(nullptr,  "stdin");
     c.ioWithoutPositioningError(nullptr);
     c.readWriteOnlyFileError(nullptr);
     c.writeReadOnlyFileError(nullptr);
     c.useClosedFileError(nullptr);
+    c.fcloseInLoopConditionError(nullptr, "fp");
     c.seekOnAppendedFileError(nullptr);
     c.incompatibleFileOpenError(nullptr, "tmp");
+    c.wrongfeofUsage(nullptr);
     c.invalidScanfError(nullptr);
     c.wrongPrintfScanfArgumentsError(nullptr, "printf",3,2);
     c.invalidScanfArgTypeError_s(nullptr,  1, "s", nullptr);
diff --git a/lib/checkio.h b/lib/checkio.h
index e37a942770b..06c6d8d973b 100644
--- a/lib/checkio.h
+++ b/lib/checkio.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <cstdint>
@@ -34,6 +35,7 @@ class Token;
 class Variable;
 class ErrorLogger;
 class Tokenizer;
+class Library;
 enum class Severity : std::uint8_t;
 
 /// @addtogroup Checks
@@ -41,19 +43,36 @@ enum class Severity : std::uint8_t;
 
 /** @brief %Check input output operations. */
 class CPPCHECKLIB CheckIO : public Check {
-    friend class TestIO;
-
 public:
     /** @brief This constructor is used when registering CheckIO */
-    CheckIO() : Check(myName()) {}
+    CheckIO() : Check("IO using format string") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckIO(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks on the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check format string input/output operations.\n"
+               "- Bad usage of the function 'sprintf' (overlapping data)\n"
+               "- Missing or wrong width specifiers in 'scanf' format string\n"
+               "- Use a file that has been closed\n"
+               "- File input/output without positioning results in undefined behaviour\n"
+               "- Read to a file that has only been opened for writing (or vice versa)\n"
+               "- Repositioning operation on a file opened in append mode\n"
+               "- The same file can't be open for read and write at the same time on different streams\n"
+               "- Using fflush() on an input stream\n"
+               "- Invalid usage of output stream. For example: 'std::cout << std::cout;'\n"
+               "- Wrong number of arguments given to 'printf' or 'scanf;'\n";
+    }
+};
+
+class CPPCHECKLIB CheckIOImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckIOImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for missusage of std::cout */
     void checkCoutCerrMisusage();
@@ -64,6 +83,9 @@ class CPPCHECKLIB CheckIO : public Check {
     /** @brief scanf can crash if width specifiers are not used */
     void invalidScanf();
 
+    /** @brief %Check wrong usage of feof */
+    void checkWrongfeofUsage();
+
     /** @brief %Checks type and number of arguments given to functions like printf or scanf*/
     void checkWrongPrintfScanfArguments();
 
@@ -80,7 +102,7 @@ class CPPCHECKLIB CheckIO : public Check {
         bool isKnownType() const;
         bool isStdVectorOrString();
         bool isStdContainer(const Token *tok);
-        bool isLibraryType(const Settings &settings) const;
+        bool isLibraryType(const Library &library) const;
 
         const Variable* variableInfo{};
         const Token* typeToken{};
@@ -105,9 +127,12 @@ class CPPCHECKLIB CheckIO : public Check {
     void readWriteOnlyFileError(const Token *tok);
     void writeReadOnlyFileError(const Token *tok);
     void useClosedFileError(const Token *tok);
+    void fcloseInLoopConditionError(const Token *tok, const std::string &varname);
     void seekOnAppendedFileError(const Token *tok);
+    void ftellFileError(const Token *tok);
     void incompatibleFileOpenError(const Token *tok, const std::string &filename);
     void invalidScanfError(const Token *tok);
+    void wrongfeofUsage(const Token *tok);
     void wrongPrintfScanfArgumentsError(const Token* tok,
                                         const std::string &functionName,
                                         nonneg int numFormat,
@@ -127,26 +152,6 @@ class CPPCHECKLIB CheckIO : public Check {
     void invalidScanfFormatWidthError(const Token* tok, nonneg int numFormat, int width, const Variable *var, const std::string& specifier);
     static void argumentType(std::ostream & os, const ArgumentInfo * argInfo);
     static Severity getSeverity(const ArgumentInfo *argInfo);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "IO using format string";
-    }
-
-    std::string classInfo() const override {
-        return "Check format string input/output operations.\n"
-               "- Bad usage of the function 'sprintf' (overlapping data)\n"
-               "- Missing or wrong width specifiers in 'scanf' format string\n"
-               "- Use a file that has been closed\n"
-               "- File input/output without positioning results in undefined behaviour\n"
-               "- Read to a file that has only been opened for writing (or vice versa)\n"
-               "- Repositioning operation on a file opened in append mode\n"
-               "- The same file can't be open for read and write at the same time on different streams\n"
-               "- Using fflush() on an input stream\n"
-               "- Invalid usage of output stream. For example: 'std::cout << std::cout;'\n"
-               "- Wrong number of arguments given to 'printf' or 'scanf;'\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index 0f30c82147d..e5220e701a3 100644
--- a/lib/checkleakautovar.cpp
+++ b/lib/checkleakautovar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -34,20 +34,17 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <deque>
 #include <list>
 #include <vector>
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckLeakAutoVar instance;
-}
-
 static const CWE CWE672(672U);
 static const CWE CWE415(415U);
 
@@ -110,39 +107,39 @@ void VarInfo::possibleUsageAll(const std::pair<const Token*, Usage>& functionUsa
 }
 
 
-void CheckLeakAutoVar::leakError(const Token *tok, const std::string &varname, int type) const
+void CheckLeakAutoVarImpl::leakError(const Token *tok, const std::string &varname, int type) const
 {
-    const CheckMemoryLeak checkmemleak(mTokenizer, mErrorLogger, mSettings);
+    const CheckMemoryLeakImpl checkmemleak(mTokenizer, mSettings, mErrorLogger);
     if (Library::isresource(type))
         checkmemleak.resourceLeakError(tok, varname);
     else
         checkmemleak.memleakError(tok, varname);
 }
 
-void CheckLeakAutoVar::mismatchError(const Token *deallocTok, const Token *allocTok, const std::string &varname) const
+void CheckLeakAutoVarImpl::mismatchError(const Token *deallocTok, const Token *allocTok, const std::string &varname) const
 {
-    const CheckMemoryLeak c(mTokenizer, mErrorLogger, mSettings);
+    const CheckMemoryLeakImpl c(mTokenizer, mSettings, mErrorLogger);
     const std::list<const Token *> callstack = { allocTok, deallocTok };
     c.mismatchAllocDealloc(callstack, varname);
 }
 
-void CheckLeakAutoVar::deallocUseError(const Token *tok, const std::string &varname) const
+void CheckLeakAutoVarImpl::deallocUseError(const Token *tok, const std::string &varname) const
 {
-    const CheckMemoryLeak c(mTokenizer, mErrorLogger, mSettings);
+    const CheckMemoryLeakImpl c(mTokenizer, mSettings, mErrorLogger);
     c.deallocuseError(tok, varname);
 }
 
-void CheckLeakAutoVar::deallocReturnError(const Token *tok, const Token *deallocTok, const std::string &varname)
+void CheckLeakAutoVarImpl::deallocReturnError(const Token *tok, const Token *deallocTok, const std::string &varname)
 {
     const std::list<const Token *> locations = { deallocTok, tok };
     reportError(locations, Severity::error, "deallocret", "$symbol:" + varname + "\nReturning/dereferencing '$symbol' after it is deallocated / released", CWE672, Certainty::normal);
 }
 
-void CheckLeakAutoVar::configurationInfo(const Token* tok, const std::pair<const Token*, VarInfo::Usage>& functionUsage)
+void CheckLeakAutoVarImpl::configurationInfo(const Token* tok, const std::pair<const Token*, VarInfo::Usage>& functionUsage)
 {
-    if (mSettings->checkLibrary && functionUsage.second == VarInfo::USED &&
+    if (mSettings.checkLibrary && functionUsage.second == VarInfo::USED &&
         (!functionUsage.first || !functionUsage.first->function() || !functionUsage.first->function()->hasBody())) {
-        std::string funcStr = functionUsage.first ? mSettings->library.getFunctionName(functionUsage.first) : "f";
+        std::string funcStr = functionUsage.first ? mSettings.library.getFunctionName(functionUsage.first) : "f";
         if (funcStr.empty())
             funcStr = "unknown::" + functionUsage.first->str();
         reportError(tok,
@@ -152,7 +149,7 @@ void CheckLeakAutoVar::configurationInfo(const Token* tok, const std::pair<const
     }
 }
 
-void CheckLeakAutoVar::doubleFreeError(const Token *tok, const Token *prevFreeTok, const std::string &varname, int type)
+void CheckLeakAutoVarImpl::doubleFreeError(const Token *tok, const Token *prevFreeTok, const std::string &varname, int type)
 {
     const std::list<const Token *> locations = { prevFreeTok, tok };
 
@@ -163,9 +160,9 @@ void CheckLeakAutoVar::doubleFreeError(const Token *tok, const Token *prevFreeTo
 }
 
 
-void CheckLeakAutoVar::check()
+void CheckLeakAutoVarImpl::check()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
     logChecker("CheckLeakAutoVar::check"); // notclang
@@ -191,11 +188,20 @@ static bool isVarUsedInTree(const Token *tok, nonneg int varid)
 {
     if (!tok)
         return false;
-    if (tok->varId() == varid)
-        return true;
-    if (tok->str() == "(" && Token::simpleMatch(tok->astOperand1(), "sizeof"))
-        return false;
-    return isVarUsedInTree(tok->astOperand1(), varid) || isVarUsedInTree(tok->astOperand2(), varid);
+    std::deque<const Token*> nodes{ tok };
+    while (!nodes.empty()) {
+        const Token* node = nodes.front();
+        if (node->varId() == varid)
+            return true;
+        if (node->str() != "(" || !Token::simpleMatch(node->astOperand1(), "sizeof")) {
+            if (node->astOperand1())
+                nodes.emplace_back(node->astOperand1());
+            if (node->astOperand2())
+                nodes.emplace_back(node->astOperand2());
+        }
+        nodes.pop_front();
+    }
+    return false;
 }
 
 static bool isPointerReleased(const Token *startToken, const Token *endToken, nonneg int varid)
@@ -261,7 +267,7 @@ static const Token * isFunctionCall(const Token * nameToken)
     return nullptr;
 }
 
-static const Token* getOutparamAllocation(const Token* tok, const Settings& settings)
+static const Token* getOutparamAllocation(const Token* tok, const Library& library)
 {
     if (!tok)
         return nullptr;
@@ -269,26 +275,38 @@ static const Token* getOutparamAllocation(const Token* tok, const Settings& sett
     const Token* ftok = getTokenArgumentFunction(tok, argn);
     if (!ftok)
         return nullptr;
-    if (const Library::AllocFunc* allocFunc = settings.library.getAllocFuncInfo(ftok)) {
+    if (const Library::AllocFunc* allocFunc = library.getAllocFuncInfo(ftok)) {
         if (allocFunc->arg == argn + 1)
             return ftok;
     }
     return nullptr;
 }
 
-static const Token* getReturnValueFromOutparamAlloc(const Token* alloc, const Settings& settings)
+static const Token* getReturnValueFromOutparamAlloc(const Token* alloc, const Library& library)
 {
-    if (const Token* ftok = getOutparamAllocation(alloc, settings)) {
+    if (const Token* ftok = getOutparamAllocation(alloc, library)) {
         if (Token::simpleMatch(ftok->astParent()->astParent(), "="))
             return ftok->next()->astParent()->astOperand1();
     }
     return nullptr;
 }
 
-bool CheckLeakAutoVar::checkScope(const Token * const startToken,
-                                  VarInfo &varInfo,
-                                  std::set<int> notzero,
-                                  nonneg int recursiveCount)
+static std::vector<const Token*> getComparisonTokens(const Token* tok)
+{
+    std::vector<const Token*> result{ tok };
+    if (tok->hasKnownValue(ValueFlow::Value::ValueType::SYMBOLIC))
+        result.push_back(tok->getKnownValue(ValueFlow::Value::ValueType::SYMBOLIC)->tokvalue);
+    for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) {
+        if (op && op->hasKnownValue(ValueFlow::Value::ValueType::SYMBOLIC))
+            result.push_back(op->getKnownValue(ValueFlow::Value::ValueType::SYMBOLIC)->tokvalue);
+    }
+    return result;
+}
+
+bool CheckLeakAutoVarImpl::checkScope(const Token * const startToken,
+                                      VarInfo &varInfo,
+                                      std::set<int> notzero,
+                                      nonneg int recursiveCount)
 {
 #if ASAN
     static const nonneg int recursiveLimit = 300;
@@ -324,6 +342,8 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             }
         }
 
+        if (tok == tok->scope()->bodyEnd && tok->scope()->type == ScopeType::eUnconditional)
+            ret(tok, varInfo, /*isEndOfScope*/ true);
 
         // look for end of statement
         const bool isInit = Token::Match(tok->tokAt(-1), "%var% {|(") && tok->tokAt(-1)->variable() && tok->tokAt(-1) == tok->tokAt(-1)->variable()->nameToken();
@@ -363,7 +383,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             ftok = ftok->tokAt(2);
 
         // bailout for variable passed to library function with out parameter
-        if (const Library::Function *libFunc = mSettings->library.getFunction(ftok)) {
+        if (const Library::Function *libFunc = mSettings.library.getFunction(ftok)) {
             using ArgumentChecks = Library::ArgumentChecks;
             using Direction = ArgumentChecks::Direction;
             const std::vector<const Token *> args = getArguments(ftok);
@@ -374,7 +394,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 });
             });
             if (hasOutParam) {
-                for (int i = 0; i < args.size(); i++) {
+                for (size_t i = 0; i < args.size(); i++) {
                     if (!argChecks.count(i + 1))
                         continue;
                     const ArgumentChecks argCheck = argChecks.at(i + 1);
@@ -396,6 +416,16 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             }
         }
 
+        if (tok->isCpp11init() == Token::Cpp11init::CPP11INIT) {
+            const Token *newTok = tok->astOperand1();
+            const Token *oldTok = tok->astOperand2();
+            if (newTok && newTok->varId() && oldTok && oldTok->varId()) {
+                leakIfAllocated(newTok, varInfo);
+                // no multivariable checking currently => bail out for rhs variables
+                varInfo.erase(oldTok->varId());
+            }
+        }
+
         auto isAssignment = [](const Token* varTok) -> const Token* {
             if (varTok->varId()) {
                 const Token* top = varTok;
@@ -413,8 +443,6 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
         // assignment..
         if (const Token* const tokAssignOp = isInit ? varTok : isAssignment(varTok)) {
 
-            if (Token::simpleMatch(tokAssignOp->astOperand1(), "."))
-                continue;
             // taking address of another variable..
             if (Token::Match(tokAssignOp, "= %var% +|;|?|%comp%")) {
                 if (varTok->tokAt(2)->varId() != varTok->varId()) {
@@ -426,7 +454,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                         if (tok2->str() == ";") {
                             break;
                         }
-                        if (tok2->varId()) {
+                        if (tok2->varId() && !Token::Match(tok2->astParent(), "%comp%|!")) {
                             varInfo.erase(tok2->varId());
                         }
                     }
@@ -453,7 +481,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             // allocation?
             const Token *const fTok = tokRightAstOperand ? tokRightAstOperand->previous() : nullptr;
             if (Token::Match(fTok, "%type% (")) {
-                const Library::AllocFunc* f = mSettings->library.getAllocFuncInfo(fTok);
+                const Library::AllocFunc* f = mSettings.library.getAllocFuncInfo(fTok);
                 if (f && f->arg == -1) {
                     VarInfo::AllocInfo& varAlloc = alloctype[varTok->varId()];
                     varAlloc.type = f->groupId;
@@ -519,7 +547,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                         tokRightAstOperand = tokRightAstOperand->astOperand2() ? tokRightAstOperand->astOperand2() : tokRightAstOperand->astOperand1();
                     if (tokRightAstOperand && Token::Match(tokRightAstOperand->previous(), "%type% (")) {
                         const Token * fTok = tokRightAstOperand->previous();
-                        const Library::AllocFunc* f = mSettings->library.getAllocFuncInfo(fTok);
+                        const Library::AllocFunc* f = mSettings.library.getAllocFuncInfo(fTok);
                         if (f && f->arg == -1) {
                             VarInfo::AllocInfo& varAlloc = alloctype[innerTok->varId()];
                             varAlloc.type = f->groupId;
@@ -542,7 +570,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
                 // check for function call
                 if (openingPar) {
-                    const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(innerTok);
+                    const Library::AllocFunc* allocFunc = mSettings.library.getDeallocFuncInfo(innerTok);
                     // innerTok is a function name
                     const VarInfo::AllocInfo allocation(0, VarInfo::NOALLOC);
                     functionCall(innerTok, openingPar, varInfo, allocation, allocFunc);
@@ -560,53 +588,56 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                     astOperand2AfterCommas = astOperand2AfterCommas->astOperand2();
 
                 // Recursively scan variable comparisons in condition
-                visitAstNodes(astOperand2AfterCommas, [&](const Token *tok3) {
-                    if (!tok3)
-                        return ChildrenToVisit::none;
-                    if (tok3->str() == "&&" || tok3->str() == "||") {
-                        // FIXME: handle && ! || better
-                        return ChildrenToVisit::op1_and_op2;
-                    }
-                    if (tok3->str() == "(" && Token::Match(tok3->astOperand1(), "UNLIKELY|LIKELY")) {
-                        return ChildrenToVisit::op2;
-                    }
-                    if (tok3->str() == "(" && tok3->previous()->isName()) {
-                        const std::vector<const Token *> params = getArguments(tok3->previous());
-                        for (const Token *par : params) {
-                            if (!par->isComparisonOp())
-                                continue;
-                            const Token *vartok = nullptr;
-                            if (isVarTokComparison(par, &vartok, alloc_success_conds) ||
-                                (isVarTokComparison(par, &vartok, alloc_failed_conds))) {
-                                varInfo1.erase(vartok->varId());
-                                varInfo2.erase(vartok->varId());
+                for (const Token* compTok : getComparisonTokens(astOperand2AfterCommas)) {
+                    visitAstNodes(compTok, [&](const Token* tok3) {
+                        if (!tok3)
+                            return ChildrenToVisit::none;
+                        if (tok3->str() == "&&" || tok3->str() == "||") {
+                            // FIXME: handle && ! || better
+                            return ChildrenToVisit::op1_and_op2;
+                        }
+                        if (tok3->str() == "(" && Token::Match(tok3->astOperand1(), "UNLIKELY|LIKELY")) {
+                            return ChildrenToVisit::op2;
+                        }
+                        if (tok3->str() == "(" && tok3->previous()->isName()) {
+                            const std::vector<const Token*> params = getArguments(tok3->previous());
+                            for (const Token* par : params) {
+                                if (!par->isComparisonOp())
+                                    continue;
+                                const Token* vartok = nullptr;
+                                if (isVarTokComparison(par, &vartok, alloc_success_conds) ||
+                                    (isVarTokComparison(par, &vartok, alloc_failed_conds))) {
+                                    varInfo1.erase(vartok->varId());
+                                    varInfo2.erase(vartok->varId());
+                                }
                             }
+                            return ChildrenToVisit::none;
                         }
-                        return ChildrenToVisit::none;
-                    }
 
-                    const Token *vartok = nullptr;
-                    if (isVarTokComparison(tok3, &vartok, alloc_success_conds)) {
-                        varInfo2.reallocToAlloc(vartok->varId());
-                        varInfo2.erase(vartok->varId());
-                        if (astIsVariableComparison(tok3, "!=", "0", &vartok) &&
-                            (notzero.find(vartok->varId()) != notzero.end()))
-                            varInfo2.clear();
-
-                        if (std::any_of(varInfo1.alloctype.begin(), varInfo1.alloctype.end(), [&](const std::pair<int, VarInfo::AllocInfo>& info) {
-                            if (info.second.status != VarInfo::ALLOC)
-                                return false;
-                            const Token* ret = getReturnValueFromOutparamAlloc(info.second.allocTok, *mSettings);
-                            return ret && vartok && ret->varId() && ret->varId() == vartok->varId();
-                        })) {
-                            varInfo1.clear();
+                        const Token* vartok = nullptr;
+                        if (isVarTokComparison(tok3, &vartok, alloc_success_conds)) {
+                            varInfo2.reallocToAlloc(vartok->varId());
+                            varInfo2.erase(vartok->varId());
+                            if (astIsVariableComparison(tok3, "!=", "0", &vartok) &&
+                                (notzero.find(vartok->varId()) != notzero.end()))
+                                varInfo2.clear();
+
+                            if (std::any_of(varInfo1.alloctype.begin(), varInfo1.alloctype.end(), [&](const std::pair<int, VarInfo::AllocInfo>& info) {
+                                if (info.second.status != VarInfo::ALLOC)
+                                    return false;
+                                const Token* ret = getReturnValueFromOutparamAlloc(info.second.allocTok, mSettings.library);
+                                return ret && vartok && ret->varId() && ret->varId() == vartok->varId();
+                            })) {
+                                varInfo1.clear();
+                            }
                         }
-                    } else if (isVarTokComparison(tok3, &vartok, alloc_failed_conds)) {
-                        varInfo1.reallocToAlloc(vartok->varId());
-                        varInfo1.erase(vartok->varId());
-                    }
-                    return ChildrenToVisit::none;
-                });
+                        else if (isVarTokComparison(tok3, &vartok, alloc_failed_conds)) {
+                            varInfo1.reallocToAlloc(vartok->varId());
+                            varInfo1.erase(vartok->varId());
+                        }
+                        return ChildrenToVisit::none;
+                    });
+                }
 
                 if (!skipIfBlock && !checkScope(closingParenthesis->next(), varInfo1, notzero, recursiveCount)) {
                     varInfo.clear();
@@ -726,12 +757,11 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
         // Function call..
         else if (const Token* openingPar = isFunctionCall(ftok)) {
-            const Library::AllocFunc* af = mSettings->library.getDeallocFuncInfo(ftok);
+            const Library::AllocFunc* af = mSettings.library.getDeallocFuncInfo(ftok);
             VarInfo::AllocInfo allocation(af ? af->groupId : 0, VarInfo::DEALLOC, ftok);
             if (allocation.type == 0)
                 allocation.status = VarInfo::NOALLOC;
-            if (Token::simpleMatch(ftok->astParent(), "(") && Token::simpleMatch(ftok->astParent()->astOperand2(), "."))
-                continue;
+
             functionCall(ftok, openingPar, varInfo, allocation, af);
 
             tok = ftok->linkAt(1);
@@ -748,8 +778,8 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                         if (ftok->function() && !ftok->function()->isAttributeNoreturn() &&
                             !(ftok->function()->functionScope && mTokenizer->isScopeNoReturn(ftok->function()->functionScope->bodyEnd))) // check function scope
                             continue;
-                        const std::string functionName(mSettings->library.getFunctionName(ftok));
-                        if (!mSettings->library.isLeakIgnore(functionName) && !mSettings->library.isUse(functionName)) {
+                        const std::string functionName(mSettings.library.getFunctionName(ftok));
+                        if (!mSettings.library.isLeakIgnore(functionName) && !mSettings.library.isUse(functionName)) {
                             const VarInfo::Usage usage = Token::simpleMatch(openingPar, "( )") ? VarInfo::NORET : VarInfo::USED; // TODO: check parameters passed to function
                             varInfo.possibleUsageAll({ ftok, usage });
                         }
@@ -772,7 +802,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
         }
 
         // Check smart pointer
-        else if (Token::Match(ftok, "%name% <") && mSettings->library.isSmartPointer(tok)) {
+        else if (Token::Match(ftok, "%name% <") && mSettings.library.isSmartPointer(tok)) {
             const Token * typeEndTok = ftok->linkAt(1);
             if (!Token::Match(typeEndTok, "> %var% {|( %var% ,|)|}"))
                 continue;
@@ -807,7 +837,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 const Token * dtok = Token::findmatch(deleterToken, "& %name%", endDeleterToken);
                 if (dtok) {
                     dtok = dtok->next();
-                    af = mSettings->library.getDeallocFuncInfo(dtok);
+                    af = mSettings.library.getDeallocFuncInfo(dtok);
                 }
                 if (!dtok || !af) {
                     const Token * tscopeStart = nullptr;
@@ -837,7 +867,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
                     if (tscopeStart && tscopeEnd) {
                         for (const Token *tok2 = tscopeStart; tok2 != tscopeEnd; tok2 = tok2->next()) {
-                            af = mSettings->library.getDeallocFuncInfo(tok2);
+                            af = mSettings.library.getDeallocFuncInfo(tok2);
                             if (af)
                                 break;
                         }
@@ -859,7 +889,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 }
 
 
-const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo, bool inFuncCall)
+const Token * CheckLeakAutoVarImpl::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo, bool inFuncCall)
 {
     // Deallocation and then dereferencing pointer..
     if (tok->varId() > 0) {
@@ -868,7 +898,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
         if (var != varInfo.alloctype.end()) {
             bool unknown = false;
             if (var->second.status == VarInfo::DEALLOC && tok->valueType() && tok->valueType()->pointer &&
-                CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings, /*checkNullArg*/ false) && !unknown) {
+                CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library, /*checkNullArg*/ false) && !unknown) {
                 deallocUseError(tok, tok->str());
             } else if (Token::simpleMatch(tok->tokAt(-2), "= &")) {
                 varInfo.erase(tok->varId());
@@ -886,12 +916,12 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
                 while (rhs->isCast()) {
                     rhs = rhs->astOperand2() ? rhs->astOperand2() : rhs->astOperand1();
                 }
-                if (rhs->varId() == tok->varId() && isAssignment) {
+                if ((rhs->str() == "." || rhs->varId() == tok->varId()) && isAssignment) {
                     // simple assignment
                     varInfo.erase(tok->varId());
-                } else if (rhs->astParent() && rhs->str() == "(" && !mSettings->library.returnValue(rhs->astOperand1()).empty()) {
+                } else if (rhs->astParent() && rhs->str() == "(" && !mSettings.library.returnValue(rhs->astOperand1()).empty()) {
                     // #9298, assignment through return value of a function
-                    const std::string &returnValue = mSettings->library.returnValue(rhs->astOperand1());
+                    const std::string &returnValue = mSettings.library.returnValue(rhs->astOperand1());
                     if (startsWith(returnValue, "arg")) {
                         int argn;
                         const Token *func = getTokenArgumentFunction(tok, argn);
@@ -912,12 +942,12 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
     // check for function call
     const Token * const openingPar = inFuncCall ? nullptr : isFunctionCall(tok);
     if (openingPar) {
-        const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(tok);
+        const Library::AllocFunc* allocFunc = mSettings.library.getDeallocFuncInfo(tok);
         VarInfo::AllocInfo alloc(allocFunc ? allocFunc->groupId : 0, VarInfo::DEALLOC, tok);
         if (alloc.type == 0)
             alloc.status = VarInfo::NOALLOC;
         functionCall(tok, openingPar, varInfo, alloc, nullptr);
-        const std::string &returnValue = mSettings->library.returnValue(tok);
+        const std::string &returnValue = mSettings.library.returnValue(tok);
         if (startsWith(returnValue, "arg"))
             // the function returns one of its argument, we need to process a potential assignment
             return openingPar;
@@ -928,9 +958,9 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
 }
 
 
-void CheckLeakAutoVar::changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocInfo> &alloctype, const Token *fTok, const Token *retTok) const
+void CheckLeakAutoVarImpl::changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocInfo> &alloctype, const Token *fTok, const Token *retTok) const
 {
-    const Library::AllocFunc* f = mSettings->library.getReallocFuncInfo(fTok);
+    const Library::AllocFunc* f = mSettings.library.getReallocFuncInfo(fTok);
     if (f && f->arg == -1 && f->reallocArg > 0 && f->reallocArg <= numberOfArguments(fTok)) {
         const Token* argTok = getArguments(fTok).at(f->reallocArg - 1);
         if (alloctype.find(argTok->varId()) != alloctype.end()) {
@@ -949,14 +979,14 @@ void CheckLeakAutoVar::changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocIn
 }
 
 
-void CheckLeakAutoVar::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Token* tok, const Token* arg)
+void CheckLeakAutoVarImpl::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Token* tok, const Token* arg)
 {
     std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
     const auto var = alloctype.find(arg->varId());
     if (var != alloctype.end()) {
         // bailout if function is also allocating, since the argument might be moved
         // to the return value, such as in fdopen
-        if (allocation.allocTok && mSettings->library.getAllocFuncInfo(allocation.allocTok)) {
+        if (allocation.allocTok && mSettings.library.getAllocFuncInfo(allocation.allocTok)) {
             varInfo.erase(arg->varId());
             return;
         }
@@ -986,11 +1016,11 @@ void CheckLeakAutoVar::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocI
     }
 }
 
-void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpeningPar, VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Library::AllocFunc* af)
+void CheckLeakAutoVarImpl::functionCall(const Token *tokName, const Token *tokOpeningPar, VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Library::AllocFunc* af)
 {
     // Ignore function call?
-    const bool isLeakIgnore = mSettings->library.isLeakIgnore(mSettings->library.getFunctionName(tokName));
-    if (mSettings->library.getReallocFuncInfo(tokName))
+    const bool isLeakIgnore = mSettings.library.isLeakIgnore(mSettings.library.getFunctionName(tokName));
+    if (mSettings.library.getReallocFuncInfo(tokName))
         return;
     if (tokName->next()->valueType() && tokName->next()->valueType()->container && tokName->next()->valueType()->container->stdStringLike)
         return;
@@ -1024,6 +1054,9 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
             arg = arg->astOperand2() ? arg->astOperand2() : arg->astOperand1();
         const Token * const argTypeStartTok = arg;
 
+        if (Token::simpleMatch(arg, "."))
+            arg = arg->next();
+
         while (Token::Match(arg, "%name% .|:: %name%"))
             arg = arg->tokAt(2);
 
@@ -1038,10 +1071,10 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
 
             // Is variable allocated?
             if (!isnull && (!af || af->arg == argNr)) {
-                const Library::AllocFunc* deallocFunc = mSettings->library.getDeallocFuncInfo(tokName);
+                const Library::AllocFunc* deallocFunc = mSettings.library.getDeallocFuncInfo(tokName);
                 VarInfo::AllocInfo dealloc(deallocFunc ? deallocFunc->groupId : 0, VarInfo::DEALLOC, tokName);
-                if (const Library::AllocFunc* allocFunc = mSettings->library.getAllocFuncInfo(tokName)) {
-                    if (mSettings->library.getDeallocFuncInfo(tokName)) {
+                if (const Library::AllocFunc* allocFunc = mSettings.library.getAllocFuncInfo(tokName)) {
+                    if (mSettings.library.getDeallocFuncInfo(tokName)) {
                         changeAllocStatus(varInfo, dealloc.type == 0 ? allocation : dealloc, tokName, arg);
                     }
                     if (allocFunc->arg == argNr &&
@@ -1061,7 +1094,7 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
             }
         }
         // Check smart pointer
-        else if (Token::Match(arg, "%name% < %type%") && mSettings->library.isSmartPointer(argTypeStartTok)) {
+        else if (Token::Match(arg, "%name% < %type%") && mSettings.library.isSmartPointer(argTypeStartTok)) {
             const Token * typeEndTok = arg->linkAt(1);
             const Token * allocTok = nullptr;
             if (!Token::Match(typeEndTok, "> {|( %var% ,|)|}"))
@@ -1086,14 +1119,14 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
                 // Check if its a pointer to a function
                 const Token * dtok = Token::findmatch(deleterToken, "& %name%", endDeleterToken);
                 if (dtok) {
-                    sp_af = mSettings->library.getDeallocFuncInfo(dtok->tokAt(1));
+                    sp_af = mSettings.library.getDeallocFuncInfo(dtok->tokAt(1));
                 } else {
                     // If the deleter is a class, check if class calls the dealloc function
                     dtok = Token::findmatch(deleterToken, "%type%", endDeleterToken);
                     if (dtok && dtok->type()) {
                         const Scope * tscope = dtok->type()->classScope;
                         for (const Token *tok2 = tscope->bodyStart; tok2 != tscope->bodyEnd; tok2 = tok2->next()) {
-                            sp_af = mSettings->library.getDeallocFuncInfo(tok2);
+                            sp_af = mSettings.library.getDeallocFuncInfo(tok2);
                             if (sp_af) {
                                 allocTok = tok2;
                                 break;
@@ -1122,13 +1155,13 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
 }
 
 
-void CheckLeakAutoVar::leakIfAllocated(const Token *vartok,
-                                       const VarInfo &varInfo)
+void CheckLeakAutoVarImpl::leakIfAllocated(const Token *vartok,
+                                           const VarInfo &varInfo)
 {
     const std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
     const auto& possibleUsage = varInfo.possibleUsage;
 
-    const auto var = utils::as_const(alloctype).find(vartok->varId());
+    const auto var = alloctype.find(vartok->varId());
     if (var != alloctype.cend() && var->second.status == VarInfo::ALLOC) {
         const auto use = possibleUsage.find(vartok->varId());
         if (use == possibleUsage.end()) {
@@ -1139,7 +1172,13 @@ void CheckLeakAutoVar::leakIfAllocated(const Token *vartok,
     }
 }
 
-void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndOfScope)
+static bool isSafeCast(const ValueType* vt, const Settings& settings)
+{
+    const size_t sizeOf = vt->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
+    return sizeOf == 0 || sizeOf >= settings.platform.sizeof_pointer;
+}
+
+void CheckLeakAutoVarImpl::ret(const Token *tok, VarInfo &varInfo, const bool isEndOfScope)
 {
     const std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
     const auto& possibleUsage = varInfo.possibleUsage;
@@ -1169,10 +1208,10 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
                     continue;
 
                 const Token* tok3 = tok2->next();
-                while (tok3 && tok3->isCast() && tok3->valueType() &&
-                       (tok3->valueType()->pointer ||
-                        (tok3->valueType()->typeSize(mSettings->platform) == 0) ||
-                        (tok3->valueType()->typeSize(mSettings->platform) >= mSettings->platform.sizeof_pointer)))
+                while (tok3 && tok3->isCast() &&
+                       (!tok3->valueType() ||
+                        tok3->valueType()->pointer ||
+                        isSafeCast(tok3->valueType(), mSettings)))
                     tok3 = tok3->astOperand2() ? tok3->astOperand2() : tok3->astOperand1();
                 if (tok3 && tok3->varId() == varid)
                     tok2 = tok3->next();
@@ -1195,7 +1234,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
             // don't warn when returning after checking return value of outparam allocation
             const Token* outparamFunc{};
             if ((tok->scope()->type == ScopeType::eIf || tok->scope()->type== ScopeType::eElse) &&
-                (outparamFunc = getOutparamAllocation(it->second.allocTok, *mSettings))) {
+                (outparamFunc = getOutparamAllocation(it->second.allocTok, mSettings.library))) {
                 const Scope* scope = tok->scope();
                 if (scope->type == ScopeType::eElse) {
                     scope = scope->bodyStart->tokAt(-2)->scope();
@@ -1241,15 +1280,15 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
         varInfo.erase(varId);
 }
 
-void CheckLeakAutoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckLeakAutoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckLeakAutoVar checkLeakAutoVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckLeakAutoVarImpl checkLeakAutoVar(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkLeakAutoVar.check();
 }
 
-void CheckLeakAutoVar::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckLeakAutoVar::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckLeakAutoVar c(nullptr, settings, errorLogger);
+    CheckLeakAutoVarImpl c(nullptr, settings, errorLogger);
     c.deallocReturnError(nullptr, nullptr, "p");
     c.configurationInfo(nullptr, { nullptr, VarInfo::USED });  // user configuration is needed to complete analysis
     c.doubleFreeError(nullptr, nullptr, "varname", 0);
diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
index ba4a949bbd8..b613b357119 100644
--- a/lib/checkleakautovar.h
+++ b/lib/checkleakautovar.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "library.h"
 
@@ -75,7 +76,7 @@ class CPPCHECKLIB VarInfo {
         referenced.erase(varid);
     }
 
-    void swap(VarInfo &other) NOEXCEPT {
+    void swap(VarInfo &other) noexcept {
         alloctype.swap(other.alloctype);
         possibleUsage.swap(other.possibleUsage);
         conditionalAlloc.swap(other.conditionalAlloc);
@@ -107,19 +108,30 @@ class CPPCHECKLIB VarInfo {
 class CPPCHECKLIB CheckLeakAutoVar : public Check {
 public:
     /** This constructor is used when registering the CheckLeakAutoVar */
-    CheckLeakAutoVar() : Check(myName()) {}
+    CheckLeakAutoVar() : Check("Leaks (auto variables)") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckLeakAutoVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    std::string classInfo() const override {
+        return "Detect when a auto variable is allocated but not deallocated or deallocated twice.\n";
+    }
+};
+
+class CPPCHECKLIB CheckLeakAutoVarImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckLeakAutoVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** check for leaks in all scopes */
     void check();
 
-    /** check for leaks in a function scope */
+    /** check for leaks in a function scope
+     * @throws InternalError thrown if recursion count is exceeded
+     */
     bool checkScope(const Token * startToken,
                     VarInfo &varInfo,
                     std::set<int> notzero,
@@ -155,16 +167,6 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
 
     /** message: user configuration is needed to complete analysis */
     void configurationInfo(const Token* tok, const std::pair<const Token*, VarInfo::Usage>& functionUsage);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Leaks (auto variables)";
-    }
-
-    std::string classInfo() const override {
-        return "Detect when a auto variable is allocated but not deallocated or deallocated twice.\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 04a94ea31a5..398240b06ab 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,27 +23,20 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "library.h"
-#include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "utils.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckMemoryLeakInFunction instance1;
-    CheckMemoryLeakInClass instance2;
-    CheckMemoryLeakStructMember instance3;
-    CheckMemoryLeakNoVar instance4;
-}
-
 // CWE ID used:
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 static const CWE CWE401(401U);  // Improper Release of Memory Before Removing Last Reference ('Memory Leak')
@@ -52,10 +45,12 @@ static const CWE CWE772(772U);  // Missing Release of Resource after Effective L
 
 //---------------------------------------------------------------------------
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2, nonneg int varid, std::list<const Function*> *callstack) const
+
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::getAllocationType(const Token *tok2, nonneg int varid, std::list<const Function*> *callstack) const
 {
     // What we may have...
     //     * var = (char *)malloc(10);
+    //     * var = static_cast<char *>(malloc(10));
     //     * var = new char[10];
     //     * var = strdup("hello");
     //     * var = strndup("hello", 3);
@@ -63,6 +58,8 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         tok2 = tok2->link();
         tok2 = tok2 ? tok2->next() : nullptr;
     }
+    if (tok2 && tok2->isCpp() && tok2->isKeyword() && endsWith(tok2->str(), "_cast"))
+        tok2 = tok2->astParent()->next();
     if (!tok2)
         return No;
     if (tok2->str() == "::")
@@ -97,7 +94,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
             return New;
         }
 
-        if (mSettings_->hasLib("posix")) {
+        if (mSettings.hasLib("posix")) {
             if (Token::Match(tok2, "open|openat|creat|mkstemp|mkostemp|socket (")) {
                 // simple sanity check of function parameters..
                 // TODO: Make such check for all these functions
@@ -116,11 +113,11 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         }
 
         // Does tok2 point on a Library allocation function?
-        const int alloctype = mSettings_->library.getAllocId(tok2, -1);
+        const int alloctype = mSettings.library.getAllocId(tok2, -1);
         if (alloctype > 0) {
-            if (alloctype == mSettings_->library.deallocId("free"))
+            if (alloctype == mSettings.library.deallocId("free"))
                 return Malloc;
-            if (alloctype == mSettings_->library.deallocId("fclose"))
+            if (alloctype == mSettings.library.deallocId("fclose"))
                 return File;
             return Library::ismemory(alloctype) ? OtherMem : OtherRes;
         }
@@ -147,7 +144,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
 }
 
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok2, nonneg int varid) const
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::getReallocationType(const Token *tok2, nonneg int varid) const
 {
     // What we may have...
     //     * var = (char *)realloc(..;
@@ -161,7 +158,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok
     if (!Token::Match(tok2, "%name% ("))
         return No;
 
-    const Library::AllocFunc *f = mSettings_->library.getReallocFuncInfo(tok2);
+    const Library::AllocFunc *f = mSettings.library.getReallocFuncInfo(tok2);
     if (!(f && f->reallocArg > 0 && f->reallocArg <= numberOfArguments(tok2)))
         return No;
     const auto args = getArguments(tok2);
@@ -175,11 +172,11 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok
     if (varid > 0 && !Token::Match(arg, "%varid% [,)]", varid))
         return No;
 
-    const int realloctype = mSettings_->library.getReallocId(tok2, -1);
+    const int realloctype = mSettings.library.getReallocId(tok2, -1);
     if (realloctype > 0) {
-        if (realloctype == mSettings_->library.deallocId("free"))
+        if (realloctype == mSettings.library.deallocId("free"))
             return Malloc;
-        if (realloctype == mSettings_->library.deallocId("fclose"))
+        if (realloctype == mSettings.library.deallocId("fclose"))
             return File;
         return Library::ismemory(realloctype) ? OtherMem : OtherRes;
     }
@@ -187,7 +184,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok
 }
 
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok, nonneg int varid) const
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::getDeallocationType(const Token *tok, nonneg int varid) const
 {
     if (tok->isCpp() && tok->str() == "delete" && tok->astOperand1()) {
         const Token* vartok = tok->astOperand1();
@@ -218,7 +215,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
                 if (tok->str() == "realloc" && Token::simpleMatch(vartok->next(), ", 0 )"))
                     return Malloc;
 
-                if (mSettings_->hasLib("posix")) {
+                if (mSettings.hasLib("posix")) {
                     if (tok->str() == "close")
                         return Fd;
                     if (tok->str() == "pclose")
@@ -226,11 +223,11 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
                 }
 
                 // Does tok point on a Library deallocation function?
-                const int dealloctype = mSettings_->library.getDeallocId(tok, argNr);
+                const int dealloctype = mSettings.library.getDeallocId(tok, argNr);
                 if (dealloctype > 0) {
-                    if (dealloctype == mSettings_->library.deallocId("free"))
+                    if (dealloctype == mSettings.library.deallocId("free"))
                         return Malloc;
-                    if (dealloctype == mSettings_->library.deallocId("fclose"))
+                    if (dealloctype == mSettings.library.deallocId("fclose"))
                         return File;
                     return Library::ismemory(dealloctype) ? OtherMem : OtherRes;
                 }
@@ -242,10 +239,10 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
     return No;
 }
 
-bool CheckMemoryLeak::isReopenStandardStream(const Token *tok) const
+bool CheckMemoryLeakImpl::isReopenStandardStream(const Token *tok) const
 {
     if (getReallocationType(tok, 0) == File) {
-        const Library::AllocFunc *f = mSettings_->library.getReallocFuncInfo(tok);
+        const Library::AllocFunc *f = mSettings.library.getReallocFuncInfo(tok);
         if (f && f->reallocArg > 0 && f->reallocArg <= numberOfArguments(tok)) {
             const Token* arg = getArguments(tok).at(f->reallocArg - 1);
             if (Token::Match(arg, "stdin|stdout|stderr"))
@@ -255,9 +252,9 @@ bool CheckMemoryLeak::isReopenStandardStream(const Token *tok) const
     return false;
 }
 
-bool CheckMemoryLeak::isOpenDevNull(const Token *tok) const
+bool CheckMemoryLeakImpl::isOpenDevNull(const Token *tok) const
 {
-    if (mSettings_->hasLib("posix") && tok->str() == "open" && numberOfArguments(tok) == 2) {
+    if (mSettings.hasLib("posix") && tok->str() == "open" && numberOfArguments(tok) == 2) {
         const Token* arg = getArguments(tok).at(0);
         if (Token::simpleMatch(arg, "\"/dev/null\""))
             return true;
@@ -265,24 +262,18 @@ bool CheckMemoryLeak::isOpenDevNull(const Token *tok) const
     return false;
 }
 
-//--------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------
-
-void CheckMemoryLeak::memoryLeak(const Token *tok, const std::string &varname, AllocType alloctype) const
+void CheckMemoryLeakImpl::memoryLeak(const Token *tok, const std::string &varname, AllocType alloctype) const
 {
-    if (alloctype == CheckMemoryLeak::File ||
-        alloctype == CheckMemoryLeak::Pipe ||
-        alloctype == CheckMemoryLeak::Fd ||
-        alloctype == CheckMemoryLeak::OtherRes)
+    if (alloctype == File ||
+        alloctype == Pipe ||
+        alloctype == Fd ||
+        alloctype == OtherRes)
         resourceLeakError(tok, varname);
     else
         memleakError(tok, varname);
 }
-//---------------------------------------------------------------------------
 
-void CheckMemoryLeak::reportErr(const Token *tok, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
+void CheckMemoryLeakImpl::reportErr(const Token *tok, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
 {
     std::list<const Token *> callstack;
 
@@ -292,26 +283,23 @@ void CheckMemoryLeak::reportErr(const Token *tok, Severity severity, const std::
     reportErr(callstack, severity, id, msg, cwe);
 }
 
-void CheckMemoryLeak::reportErr(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
+void CheckMemoryLeakImpl::reportErr(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
 {
-    const ErrorMessage errmsg(callstack, mTokenizer_ ? &mTokenizer_->list : nullptr, severity, id, msg, cwe, Certainty::normal);
-    if (mErrorLogger_)
-        mErrorLogger_->reportErr(errmsg);
-    else
-        Check::writeToErrorList(errmsg);
+    const ErrorMessage errmsg(callstack, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, Certainty::normal);
+    mErrorLogger.reportErr(errmsg);
 }
 
-void CheckMemoryLeak::memleakError(const Token *tok, const std::string &varname) const
+void CheckMemoryLeakImpl::memleakError(const Token *tok, const std::string &varname) const
 {
     reportErr(tok, Severity::error, "memleak", "$symbol:" + varname + "\nMemory leak: $symbol", CWE(401U));
 }
 
-void CheckMemoryLeak::memleakUponReallocFailureError(const Token *tok, const std::string &reallocfunction, const std::string &varname) const
+void CheckMemoryLeakImpl::memleakUponReallocFailureError(const Token *tok, const std::string &reallocfunction, const std::string &varname) const
 {
     reportErr(tok, Severity::error, "memleakOnRealloc", "$symbol:" + varname + "\nCommon " + reallocfunction + " mistake: \'$symbol\' nulled but not freed upon failure", CWE(401U));
 }
 
-void CheckMemoryLeak::resourceLeakError(const Token *tok, const std::string &varname) const
+void CheckMemoryLeakImpl::resourceLeakError(const Token *tok, const std::string &varname) const
 {
     std::string errmsg("Resource leak");
     if (!varname.empty())
@@ -319,17 +307,17 @@ void CheckMemoryLeak::resourceLeakError(const Token *tok, const std::string &var
     reportErr(tok, Severity::error, "resourceLeak", errmsg, CWE(775U));
 }
 
-void CheckMemoryLeak::deallocuseError(const Token *tok, const std::string &varname) const
+void CheckMemoryLeakImpl::deallocuseError(const Token *tok, const std::string &varname) const
 {
     reportErr(tok, Severity::error, "deallocuse", "$symbol:" + varname + "\nDereferencing '$symbol' after it is deallocated / released", CWE(416U));
 }
 
-void CheckMemoryLeak::mismatchAllocDealloc(const std::list<const Token *> &callstack, const std::string &varname) const
+void CheckMemoryLeakImpl::mismatchAllocDealloc(const std::list<const Token *> &callstack, const std::string &varname) const
 {
     reportErr(callstack, Severity::error, "mismatchAllocDealloc", "$symbol:" + varname + "\nMismatching allocation and deallocation: $symbol", CWE(762U));
 }
 
-CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* func, std::list<const Function*> *callstack) const
+CheckMemoryLeakImpl::AllocType CheckMemoryLeakImpl::functionReturnType(const Function* func, std::list<const Function*> *callstack) const
 {
     if (!func || !func->hasBody() || !func->functionScope)
         return No;
@@ -427,7 +415,7 @@ static bool ifvar(const Token *tok, nonneg int varid, const std::string &comp, c
 //     a = malloc(10); a = realloc(a, 100);
 //---------------------------------------------------------------------------
 
-void CheckMemoryLeakInFunction::checkReallocUsage()
+void CheckMemoryLeakInFunctionImpl::checkReallocUsage()
 {
     logChecker("CheckMemoryLeakInFunction::checkReallocUsage");
 
@@ -449,12 +437,12 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
                 const Token *const reallocTok = parTok->astOperand1();
                 if (!reallocTok)
                     continue;
-                const Library::AllocFunc* f = mSettings->library.getReallocFuncInfo(reallocTok);
-                if (!(f && f->arg == -1 && mSettings->library.isnotnoreturn(reallocTok)))
+                const Library::AllocFunc* f = mSettings.library.getReallocFuncInfo(reallocTok);
+                if (!(f && f->arg == -1 && mSettings.library.isnotnoreturn(reallocTok)))
                     continue;
 
                 const AllocType allocType = getReallocationType(reallocTok, tok->varId());
-                if (!((allocType == Malloc || allocType == OtherMem)))
+                if (!(allocType == Malloc || allocType == OtherMem))
                     continue;
                 const Token* arg = getArguments(reallocTok).at(f->reallocArg - 1);
                 while (arg && arg->isCast())
@@ -473,8 +461,11 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
 
                 // Check that another copy of the pointer wasn't saved earlier in the function
                 if (Token::findmatch(scope->bodyStart, "%name% = %varid% ;", tok, tok->varId()) ||
-                    Token::findmatch(scope->bodyStart, "[{};] %varid% = *| %var% .| %var%| [;=]", tok, tok->varId()))
+                    Token::findmatch(scope->bodyStart, "[{};] %varid% = *| %var%", tok, tok->varId()))
                     continue;
+                if (const Token* storeTok = Token::findmatch(scope->bodyStart, "[{};] %varid% = %name% (", tok, tok->varId()))
+                    if (storeTok->tokAt(3) != reallocTok && !mSettings.library.getAllocFuncInfo(storeTok->tokAt(3)))
+                        continue;
 
                 // Check if the argument is known to be null, which means it is not a memory leak
                 if (arg->hasKnownIntValue() && arg->getKnownIntValue() == 0) {
@@ -495,17 +486,16 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
         }
     }
 }
-//---------------------------------------------------------------------------
 
-void CheckMemoryLeakInFunction::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakInFunction::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakInFunctionImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.checkReallocUsage();
 }
 
-void CheckMemoryLeakInFunction::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+void CheckMemoryLeakInFunction::getErrorMessages(ErrorLogger& e, const Settings &settings) const
 {
-    CheckMemoryLeakInFunction c(nullptr, settings, e);
+    CheckMemoryLeakInFunctionImpl c(nullptr, settings, e);
     c.memleakError(nullptr, "varname");
     c.resourceLeakError(nullptr, "varname");
     c.deallocuseError(nullptr, "varname");
@@ -518,8 +508,7 @@ void CheckMemoryLeakInFunction::getErrorMessages(ErrorLogger *e, const Settings
 // Checks for memory leaks in classes..
 //---------------------------------------------------------------------------
 
-
-void CheckMemoryLeakInClass::check()
+void CheckMemoryLeakInClassImpl::check()
 {
     logChecker("CheckMemoryLeakInClass::check");
 
@@ -528,7 +517,7 @@ void CheckMemoryLeakInClass::check()
     // only check classes and structures
     for (const Scope * scope : symbolDatabase->classAndStructScopes) {
         for (const Variable &var : scope->varlist) {
-            if (!var.isStatic() && (var.isPointer() || var.isPointerArray())) {
+            if (!var.isStatic()) {
                 // allocation but no deallocation of private variables in public function..
                 const Token *tok = var.typeStartToken();
                 // Either it is of standard type or a non-derived type
@@ -544,15 +533,15 @@ void CheckMemoryLeakInClass::check()
 }
 
 
-void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarname)
+void CheckMemoryLeakInClassImpl::variable(const Scope *scope, const Token *tokVarname)
 {
     const std::string& varname = tokVarname->str();
     const int varid = tokVarname->varId();
     const std::string& classname = scope->className;
 
     // Check if member variable has been allocated and deallocated..
-    CheckMemoryLeak::AllocType memberAlloc = CheckMemoryLeak::No;
-    CheckMemoryLeak::AllocType memberDealloc = CheckMemoryLeak::No;
+    AllocType memberAlloc = AllocType::No;
+    AllocType memberDealloc = AllocType::No;
 
     bool allocInConstructor = false;
     bool deallocInDestructor = false;
@@ -564,7 +553,7 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
         if (!func.hasBody()) {
             if (destructor && !func.isDefault()) { // implementation for destructor is not seen and not defaulted => assume it deallocates all variables properly
                 deallocInDestructor = true;
-                memberDealloc = CheckMemoryLeak::Many;
+                memberDealloc = AllocType::Many;
             }
             continue;
         }
@@ -597,14 +586,14 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
                         allocTok = tok->astParent()->astParent()->astOperand2();
 
                     AllocType alloc = getAllocationType(allocTok, 0);
-                    if (alloc != CheckMemoryLeak::No) {
+                    if (alloc != AllocType::No) {
                         if (constructor)
                             allocInConstructor = true;
 
-                        if (memberAlloc != No && memberAlloc != alloc)
-                            alloc = CheckMemoryLeak::Many;
+                        if (memberAlloc != AllocType::No && memberAlloc != alloc)
+                            alloc = AllocType::Many;
 
-                        if (alloc != CheckMemoryLeak::Many && memberDealloc != CheckMemoryLeak::No && memberDealloc != CheckMemoryLeak::Many && memberDealloc != alloc) {
+                        if (alloc != AllocType::Many && memberDealloc != AllocType::No && memberDealloc != AllocType::Many && memberDealloc != alloc) {
                             mismatchAllocDealloc({tok}, classname + "::" + varname);
                         }
 
@@ -620,24 +609,24 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
                 // some usage in the destructor => assume it's related
                 // to deallocation
                 if (destructor && tok->str() == varname)
-                    dealloc = CheckMemoryLeak::Many;
-                if (dealloc != CheckMemoryLeak::No) {
+                    dealloc = AllocType::Many;
+                if (dealloc != AllocType::No) {
                     if (destructor)
                         deallocInDestructor = true;
 
-                    if (dealloc != CheckMemoryLeak::Many && memberAlloc != CheckMemoryLeak::No && memberAlloc != Many && memberAlloc != dealloc) {
+                    if (dealloc != AllocType::Many && memberAlloc != AllocType::No && memberAlloc != Many && memberAlloc != dealloc) {
                         mismatchAllocDealloc({tok}, classname + "::" + varname);
                     }
 
                     // several types of allocation/deallocation?
-                    if (memberDealloc != CheckMemoryLeak::No && memberDealloc != dealloc)
-                        dealloc = CheckMemoryLeak::Many;
+                    if (memberDealloc != AllocType::No && memberDealloc != dealloc)
+                        dealloc = AllocType::Many;
 
                     memberDealloc = dealloc;
                 }
 
                 // Function call .. possible deallocation
-                else if (Token::Match(tok->previous(), "[{};] %name% (") && !tok->isKeyword() && !mSettings->library.isLeakIgnore(tok->str())) {
+                else if (Token::Match(tok->previous(), "[{};] %name% (") && !tok->isKeyword() && !mSettings.library.isLeakIgnore(tok->str())) {
                     return;
                 }
             }
@@ -646,14 +635,14 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
 
     if (allocInConstructor && !deallocInDestructor) {
         unsafeClassError(tokVarname, classname, classname + "::" + varname /*, memberAlloc*/);
-    } else if (memberAlloc != CheckMemoryLeak::No && memberDealloc == CheckMemoryLeak::No) {
+    } else if (memberAlloc != AllocType::No && memberDealloc == AllocType::No) {
         unsafeClassError(tokVarname, classname, classname + "::" + varname /*, memberAlloc*/);
     }
 }
 
-void CheckMemoryLeakInClass::unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname)
+void CheckMemoryLeakInClassImpl::unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsafeClassCanLeak"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unsafeClassCanLeak"))
         return;
 
     reportError(tok, Severity::style, "unsafeClassCanLeak",
@@ -664,12 +653,12 @@ void CheckMemoryLeakInClass::unsafeClassError(const Token *tok, const std::strin
 }
 
 
-void CheckMemoryLeakInClass::checkPublicFunctions(const Scope *scope, const Token *classtok)
+void CheckMemoryLeakInClassImpl::checkPublicFunctions(const Scope *scope, const Token *classtok)
 {
     // Check that public functions deallocate the pointers that they allocate.
     // There is no checking how these functions are used and therefore it
     // isn't established if there is real leaks or not.
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     const int varid = classtok->varId();
@@ -681,44 +670,43 @@ void CheckMemoryLeakInClass::checkPublicFunctions(const Scope *scope, const Toke
             func.access == AccessControl::Public && func.hasBody()) {
             const Token *tok2 = func.functionScope->bodyStart->next();
             if (Token::Match(tok2, "%varid% =", varid)) {
-                const CheckMemoryLeak::AllocType alloc = getAllocationType(tok2->tokAt(2), varid);
-                if (alloc != CheckMemoryLeak::No)
+                const AllocType alloc = getAllocationType(tok2->tokAt(2), varid);
+                if (alloc != AllocType::No)
                     publicAllocationError(tok2, tok2->str());
             } else if (Token::Match(tok2, "%type% :: %varid% =", varid) &&
                        tok2->str() == scope->className) {
-                const CheckMemoryLeak::AllocType alloc = getAllocationType(tok2->tokAt(4), varid);
-                if (alloc != CheckMemoryLeak::No)
+                const AllocType alloc = getAllocationType(tok2->tokAt(4), varid);
+                if (alloc != AllocType::No)
                     publicAllocationError(tok2, tok2->strAt(2));
             }
         }
     }
 }
 
-void CheckMemoryLeakInClass::publicAllocationError(const Token *tok, const std::string &varname)
+void CheckMemoryLeakInClassImpl::publicAllocationError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "publicAllocationError", "$symbol:" + varname + "\nPossible leak in public function. The pointer '$symbol' is not deallocated before it is allocated.", CWE398, Certainty::normal);
 }
 
-void CheckMemoryLeakInClass::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakInClass::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (!tokenizer.isCPP())
         return;
 
-    CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakInClassImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.check();
 }
 
-void CheckMemoryLeakInClass::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+void CheckMemoryLeakInClass::getErrorMessages(ErrorLogger& e, const Settings &settings) const
 {
-    CheckMemoryLeakInClass c(nullptr, settings, e);
+    CheckMemoryLeakInClassImpl c(nullptr, settings, e);
     c.publicAllocationError(nullptr, "varname");
     c.unsafeClassError(nullptr, "class", "class::varname");
 }
 
-
-void CheckMemoryLeakStructMember::check()
+void CheckMemoryLeakStructMemberImpl::check()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
     logChecker("CheckMemoryLeakStructMember::check");
@@ -735,7 +723,7 @@ void CheckMemoryLeakStructMember::check()
     }
 }
 
-bool CheckMemoryLeakStructMember::isMalloc(const Variable *variable) const
+bool CheckMemoryLeakStructMemberImpl::isMalloc(const Variable *variable) const
 {
     if (!variable)
         return false;
@@ -744,13 +732,20 @@ bool CheckMemoryLeakStructMember::isMalloc(const Variable *variable) const
     for (const Token *tok2 = variable->nameToken(); tok2 && tok2 != variable->scope()->bodyEnd; tok2 = tok2->next()) {
         if (Token::Match(tok2, "= %varid% [;=]", declarationId))
             return false;
-        if (Token::Match(tok2, "%varid% = %name% (", declarationId) && mSettings->library.getAllocFuncInfo(tok2->tokAt(2)))
-            alloc = true;
+        if (Token::Match(tok2, "%varid% =", declarationId)) {
+            const Token* tok3 = tok2->tokAt(1)->astOperand2();
+            while (tok3 && tok3->isCast())
+                tok3 = tok3->astOperand2() ? tok3->astOperand2() : tok3->astOperand1();
+            if ((tok3 && Token::Match(tok3->tokAt(-1), "%name% (") && mSettings.library.getAllocFuncInfo(tok3->tokAt(-1))) ||
+                (Token::simpleMatch(tok3, "new") && tok3->isCpp())) {
+                alloc = true;
+            }
+        }
     }
     return alloc;
 }
 
-void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const variable) const
+void CheckMemoryLeakStructMemberImpl::checkStructVariable(const Variable* const variable) const
 {
     if (!variable)
         return;
@@ -769,14 +764,14 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
 
     auto deallocInFunction = [this](const Token* tok, int structid) -> bool {
         // Calling non-function / function that doesn't deallocate?
-        if (tok->isKeyword() || mSettings->library.isLeakIgnore(tok->str()))
+        if (tok->isKeyword() || mSettings.library.isLeakIgnore(tok->str()))
             return false;
 
         // Check if the struct is used..
         bool deallocated = false;
         const Token* const end = tok->linkAt(1);
         for (const Token* tok2 = tok; tok2 != end; tok2 = tok2->next()) {
-            if (Token::Match(tok2, "[(,] &| %varid% [,)]", structid)) {
+            if (Token::Match(tok2, "%varid%", structid)) {
                 /** @todo check if the function deallocates the memory */
                 deallocated = true;
                 break;
@@ -851,8 +846,14 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
             // This struct member is allocated.. check that it is deallocated
             int indentlevel3 = indentlevel2;
             for (const Token *tok3 = tok2; tok3; tok3 = tok3->next()) {
-                if (tok3->str() == "{")
+                if (tok3->str() == "{") {
+                    if (tok3->scope()->type == ScopeType::eIf && tok3 == tok3->scope()->bodyStart) { // bailout: member checked in if condition
+                        const Token* const condBeg = tok3->scope()->classDef->tokAt(1);
+                        if (Token::findmatch(condBeg, ". %varid%", condBeg->link(), assignToks.first->varId()))
+                            break;
+                    }
                     ++indentlevel3;
+                }
 
                 else if (tok3->str() == "}") {
                     if (indentlevel3 == 0) {
@@ -885,7 +886,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 }
 
                 // Deallocating the struct..
-                else if (Token::Match(tok3, "%name% ( %varid% )", structid) && mSettings->library.getDeallocFuncInfo(tok3)) {
+                else if (Token::Match(tok3, "%name% ( %varid% )", structid) && mSettings.library.getDeallocFuncInfo(tok3)) {
                     if (indentlevel2 == 0)
                         memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), allocType);
                     break;
@@ -919,7 +920,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                             --indentlevel4;
                             if (indentlevel4 == 0)
                                 break;
-                        } else if (Token::Match(tok4, "%name% ( %var% . %varid% )", structmemberid) && mSettings->library.getDeallocFuncInfo(tok4)) {
+                        } else if (Token::Match(tok4, "%name% ( %var% . %varid% )", structmemberid) && mSettings.library.getDeallocFuncInfo(tok4)) {
                             break;
                         }
                     }
@@ -930,7 +931,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 }
 
                 // Returning from function..
-                else if ((tok3->scope()->type != ScopeType::eLambda || tok3->scope() == variable->scope()) && tok3->str() == "return") {
+                else if (((!isWithinScope(tok3, variable, ScopeType::eLambda) && !isWithinScope(tok3, variable, ScopeType::eSwitch)) || tok3->scope() == variable->scope()) && tok3->str() == "return") {
                     // Returning from function without deallocating struct member?
                     if (!Token::Match(tok3, "return %varid% ;", structid) &&
                         !Token::Match(tok3, "return & %varid%", structid) &&
@@ -962,17 +963,19 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
     }
 }
 
-void CheckMemoryLeakStructMember::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakStructMember::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckMemoryLeakStructMember checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakStructMemberImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.check();
 }
 
-void CheckMemoryLeakStructMember::getErrorMessages(ErrorLogger * /*errorLogger*/, const Settings * /*settings*/) const
-{}
-
+void CheckMemoryLeakStructMember::getErrorMessages(ErrorLogger& errorLogger, const Settings & settings) const
+{
+    (void)&errorLogger;
+    (void)settings;
+}
 
-void CheckMemoryLeakNoVar::check()
+void CheckMemoryLeakNoVarImpl::check()
 {
     logChecker("CheckMemoryLeakNoVar::check");
 
@@ -998,7 +1001,7 @@ void CheckMemoryLeakNoVar::check()
 // Checks if an input argument to a function is the return value of an allocation function
 // like malloc(), and the function does not release it.
 //---------------------------------------------------------------------------
-void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
+void CheckMemoryLeakNoVarImpl::checkForUnreleasedInputArgument(const Scope *scope)
 {
     // parse the executable scope until tok is reached...
     for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -1010,10 +1013,8 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
         const Token* tok2 = tok->next()->astParent();
         while (tok2 && (tok2->isCast() || Token::Match(tok2, "?|:")))
             tok2 = tok2->astParent();
-        if (Token::Match(tok2, "%assign%")) // TODO: check if function returns allocated resource
-            continue;
-        if (Token::simpleMatch(tok->astTop(), "return"))
-            continue;
+        const bool hasAssign = Token::Match(tok2, "%assign%");
+        const bool hasReturn = Token::simpleMatch(tok->astTop(), "return");
 
         const std::string& functionName = tok->str();
         if ((tok->isCpp() && functionName == "delete") ||
@@ -1022,9 +1023,15 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
 
         if (Token::simpleMatch(tok->next()->astParent(), "(")) // passed to another function
             continue;
-        if (!tok->isKeyword() && !tok->function() && !mSettings->library.isLeakIgnore(functionName))
+        if (!tok->isKeyword() && !tok->function() && !mSettings.library.isLeakIgnore(functionName))
             continue;
 
+        if ((hasAssign || hasReturn) && !tok->function()) {
+            const std::string& ret = mSettings.library.returnValueType(tok);
+            if (ret.empty() || endsWith(ret, "*"))
+                continue;
+        }
+
         const std::vector<const Token *> args = getArguments(tok);
         int argnr = -1;
         for (const Token* arg : args) {
@@ -1042,8 +1049,11 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
             if (alloc == New || alloc == NewArray) {
                 const Token* typeTok = arg->next();
                 bool bail = !typeTok->isStandardType() &&
-                            !mSettings->library.detectContainerOrIterator(typeTok) &&
-                            !mSettings->library.podtype(typeTok->expressionString());
+                            (!typeTok->valueType() ||
+                             (typeTok->valueType()->type < ValueType::Type::SMART_POINTER &&
+                              typeTok->valueType()->type != ValueType::Type::POD)) &&
+                            !mSettings.library.detectContainerOrIterator(typeTok) &&
+                            !mSettings.library.podtype(typeTok->expressionString());
                 if (bail && typeTok->type() && typeTok->type()->classScope &&
                     typeTok->type()->classScope->numConstructors == 0 &&
                     typeTok->type()->classScope->getDestructor() == nullptr) {
@@ -1058,8 +1068,8 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
                 const Variable* argvar = tok->function()->getArgumentVar(argnr);
                 if (!argvar || !argvar->valueType())
                     continue;
-                const MathLib::bigint argSize = argvar->valueType()->typeSize(mSettings->platform, /*p*/ true);
-                if (argSize <= 0 || argSize >= mSettings->platform.sizeof_pointer)
+                const size_t argSize = argvar->valueType()->getSizeOf(mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                if (argSize == 0 || argSize >= mSettings.platform.sizeof_pointer)
                     continue;
             }
             functionCallLeak(arg, arg->str(), functionName);
@@ -1071,7 +1081,7 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
 //---------------------------------------------------------------------------
 // Checks if a call to an allocation function like malloc() is made and its return value is not assigned.
 //---------------------------------------------------------------------------
-void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
+void CheckMemoryLeakNoVarImpl::checkForUnusedReturnValue(const Scope *scope)
 {
     for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
         const bool isNew = tok->isCpp() && tok->str() == "new";
@@ -1085,7 +1095,10 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
         if (allocType == No)
             continue;
 
-        if (tok != tok->next()->astOperand1() && !isNew)
+        const Token* ftok = tok->next()->astOperand1();
+        while (Token::simpleMatch(ftok, "::"))
+            ftok = ftok->astOperand2() ? ftok->astOperand2() : ftok->astOperand1();
+        if (tok != ftok && !isNew)
             continue;
 
         if (isReopenStandardStream(tok))
@@ -1101,7 +1114,7 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
         bool warn = true;
         if (isNew) {
             const Token* typeTok = tok->next();
-            warn = typeTok && (typeTok->isStandardType() || mSettings->library.detectContainer(typeTok));
+            warn = typeTok && (typeTok->isStandardType() || mSettings.library.detectContainer(typeTok));
         }
 
         if (!parent && warn) {
@@ -1117,6 +1130,8 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
                 if (!(Token::simpleMatch(parent->astParent(), "?") && !parent->astParent()->astParent()))
                     continue;
             }
+            if (tok->str() == "freopen")
+                continue;
             returnValueNotUsedError(tok, tok->str());
         }
     }
@@ -1133,13 +1148,13 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
 //    f(shared_ptr<int>(new int(42)), g());
 // }
 //---------------------------------------------------------------------------
-void CheckMemoryLeakNoVar::checkForUnsafeArgAlloc(const Scope *scope)
+void CheckMemoryLeakNoVarImpl::checkForUnsafeArgAlloc(const Scope *scope)
 {
     // This test only applies to C++ source
     if (!mTokenizer->isCPP())
         return;
 
-    if (!mSettings->isPremiumEnabled("leakUnsafeArgAlloc") && (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning)))
+    if (!mSettings.isPremiumEnabled("leakUnsafeArgAlloc") && (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning)))
         return;
 
     logChecker("CheckMemoryLeakNoVar::checkForUnsafeArgAlloc");
@@ -1183,17 +1198,17 @@ void CheckMemoryLeakNoVar::checkForUnsafeArgAlloc(const Scope *scope)
     }
 }
 
-void CheckMemoryLeakNoVar::functionCallLeak(const Token *loc, const std::string &alloc, const std::string &functionCall)
+void CheckMemoryLeakNoVarImpl::functionCallLeak(const Token *loc, const std::string &alloc, const std::string &functionCall)
 {
     reportError(loc, Severity::error, "leakNoVarFunctionCall", "Allocation with " + alloc + ", " + functionCall + " doesn't release it.", CWE772, Certainty::normal);
 }
 
-void CheckMemoryLeakNoVar::returnValueNotUsedError(const Token *tok, const std::string &alloc)
+void CheckMemoryLeakNoVarImpl::returnValueNotUsedError(const Token *tok, const std::string &alloc)
 {
     reportError(tok, Severity::error, "leakReturnValNotUsed", "$symbol:" + alloc + "\nReturn value of allocation function '$symbol' is not stored.", CWE771, Certainty::normal);
 }
 
-void CheckMemoryLeakNoVar::unsafeArgAllocError(const Token *tok, const std::string &funcName, const std::string &ptrType, const std::string& objType)
+void CheckMemoryLeakNoVarImpl::unsafeArgAllocError(const Token *tok, const std::string &funcName, const std::string &ptrType, const std::string& objType)
 {
     const std::string factoryFunc = ptrType == "shared_ptr" ? "make_shared" : "make_unique";
     reportError(tok, Severity::warning, "leakUnsafeArgAlloc",
@@ -1203,15 +1218,15 @@ void CheckMemoryLeakNoVar::unsafeArgAllocError(const Token *tok, const std::stri
                 Certainty::inconclusive); // Inconclusive because funcName may never throw
 }
 
-void CheckMemoryLeakNoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckMemoryLeakNoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckMemoryLeakNoVar checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckMemoryLeakNoVarImpl checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkMemoryLeak.check();
 }
 
-void CheckMemoryLeakNoVar::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+void CheckMemoryLeakNoVar::getErrorMessages(ErrorLogger& e, const Settings &settings) const
 {
-    CheckMemoryLeakNoVar c(nullptr, settings, e);
+    CheckMemoryLeakNoVarImpl c(nullptr, settings, e);
     c.functionCallLeak(nullptr, "funcName", "funcName");
     c.returnValueNotUsedError(nullptr, "funcName");
     c.unsafeArgAllocError(nullptr, "funcName", "shared_ptr", "int");
diff --git a/lib/checkmemoryleak.h b/lib/checkmemoryleak.h
index cf8cc4c11a2..fdb7748f9ed 100644
--- a/lib/checkmemoryleak.h
+++ b/lib/checkmemoryleak.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -33,6 +33,7 @@
  */
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <cstdint>
@@ -52,18 +53,95 @@ enum class Severity : std::uint8_t;
 /// @addtogroup Core
 /// @{
 
-/** @brief Base class for memory leaks checking */
-class CPPCHECKLIB CheckMemoryLeak {
+
+/**
+ * @brief %CheckMemoryLeakInFunction detects when a function variable is allocated but not deallocated properly.
+ *
+ * The checking is done by looking at each function variable separately. By repeating these 4 steps over and over:
+ * -# locate a function variable
+ * -# create a simple token list that describes the usage of the function variable.
+ * -# simplify the token list.
+ * -# finally, check if the simplified token list contain any leaks.
+ */
+
+class CPPCHECKLIB CheckMemoryLeakInFunction : public Check {
+public:
+    /** @brief This constructor is used when registering this class */
+    CheckMemoryLeakInFunction() : Check("Memory leaks (function variables)") {}
+
+private:
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** Report all possible errors (for the --errorlist) */
+    void getErrorMessages(ErrorLogger& e, const Settings &settings) const override;
+
+    /**
+     * Get class information (--doc)
+     * @return Wiki formatted information about this class
+     */
+    std::string classInfo() const override {
+        return "Is there any allocated memory when a function goes out of scope\n";
+    }
+};
+
+
+/**
+ * @brief %Check class variables, variables that are allocated in the constructor should be deallocated in the destructor
+ */
+
+class CPPCHECKLIB CheckMemoryLeakInClass : public Check {
+public:
+    CheckMemoryLeakInClass() : Check("Memory leaks (class variables)") {}
+
+private:
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& e, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "If the constructor allocate memory then the destructor must deallocate it.\n";
+    }
+};
+
+
+
+/** @brief detect simple memory leaks for struct members */
+
+class CPPCHECKLIB CheckMemoryLeakStructMember : public Check {
+public:
+    CheckMemoryLeakStructMember() : Check("Memory leaks (struct members)") {}
+
+private:
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings & settings) const override;
+
+    std::string classInfo() const override {
+        return "Don't forget to deallocate struct members\n";
+    }
+};
+
+
+
+/** @brief detect simple memory leaks (address not taken) */
+
+class CPPCHECKLIB CheckMemoryLeakNoVar : public Check {
+public:
+    CheckMemoryLeakNoVar() : Check("Memory leaks (address not taken)") {}
+
 private:
-    /** For access to the tokens */
-    const Tokenizer * const mTokenizer_;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    /** ErrorLogger used to report errors */
-    ErrorLogger * const mErrorLogger_;
+    void getErrorMessages(ErrorLogger& e, const Settings &settings) const override;
 
-    /** Enabled standards */
-    const Settings * const mSettings_;
+    std::string classInfo() const override {
+        return "Not taking the address to allocated memory\n";
+    }
+};
 
+/** @brief Base class for memory leaks checking */
+class CPPCHECKLIB CheckMemoryLeakImpl : public CheckImpl {
+private:
     /**
      * Report error. Similar with the function Check::reportError
      * @param tok the token where the error occurs
@@ -85,12 +163,12 @@ class CPPCHECKLIB CheckMemoryLeak {
     void reportErr(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const;
 
 public:
-    CheckMemoryLeak() = delete;
-    CheckMemoryLeak(const CheckMemoryLeak &) = delete;
-    CheckMemoryLeak& operator=(const CheckMemoryLeak &) = delete;
+    CheckMemoryLeakImpl() = delete;
+    CheckMemoryLeakImpl(const CheckMemoryLeakImpl &) = delete;
+    CheckMemoryLeakImpl& operator=(const CheckMemoryLeakImpl &) = delete;
 
-    CheckMemoryLeak(const Tokenizer *t, ErrorLogger *e, const Settings *s)
-        : mTokenizer_(t), mErrorLogger_(e), mSettings_(s) {}
+    CheckMemoryLeakImpl(const Tokenizer *t, const Settings &s, ErrorLogger &e)
+        : CheckImpl(t, s, e) {}
 
     /** @brief What type of allocation are used.. the "Many" means that several types of allocation and deallocation are used */
     enum AllocType : std::uint8_t { No, Malloc, New, NewArray, File, Fd, Pipe, OtherMem, OtherRes, Many };
@@ -165,43 +243,16 @@ class CPPCHECKLIB CheckMemoryLeak {
  * -# finally, check if the simplified token list contain any leaks.
  */
 
-class CPPCHECKLIB CheckMemoryLeakInFunction : public Check, public CheckMemoryLeak {
-    friend class TestMemleakInFunction;
-
+class CPPCHECKLIB CheckMemoryLeakInFunctionImpl : public CheckMemoryLeakImpl {
 public:
-    /** @brief This constructor is used when registering this class */
-    CheckMemoryLeakInFunction() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
     /** @brief This constructor is used when running checks */
-    CheckMemoryLeakInFunction(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakInFunctionImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     /**
      * Checking for a memory leak caused by improper realloc usage.
      */
     void checkReallocUsage();
-
-    /** Report all possible errors (for the --errorlist) */
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
-
-    /**
-     * Get name of class (--doc)
-     * @return name of class
-     */
-    static std::string myName() {
-        return "Memory leaks (function variables)";
-    }
-
-    /**
-     * Get class information (--doc)
-     * @return Wiki formatted information about this class
-     */
-    std::string classInfo() const override {
-        return "Is there any allocated memory when a function goes out of scope\n";
-    }
 };
 
 
@@ -210,17 +261,10 @@ class CPPCHECKLIB CheckMemoryLeakInFunction : public Check, public CheckMemoryLe
  * @brief %Check class variables, variables that are allocated in the constructor should be deallocated in the destructor
  */
 
-class CPPCHECKLIB CheckMemoryLeakInClass : public Check, private CheckMemoryLeak {
-    friend class TestMemleakInClass;
-
+class CPPCHECKLIB CheckMemoryLeakInClassImpl : private CheckMemoryLeakImpl {
 public:
-    CheckMemoryLeakInClass() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
-    CheckMemoryLeakInClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakInClassImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     void check();
 
@@ -231,33 +275,17 @@ class CPPCHECKLIB CheckMemoryLeakInClass : public Check, private CheckMemoryLeak
     void publicAllocationError(const Token *tok, const std::string &varname);
 
     void unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname);
-
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Memory leaks (class variables)";
-    }
-
-    std::string classInfo() const override {
-        return "If the constructor allocate memory then the destructor must deallocate it.\n";
-    }
 };
 
 
 
 /** @brief detect simple memory leaks for struct members */
 
-class CPPCHECKLIB CheckMemoryLeakStructMember : public Check, private CheckMemoryLeak {
-    friend class TestMemleakStructMember;
-
+class CPPCHECKLIB CheckMemoryLeakStructMemberImpl : private CheckMemoryLeakImpl {
 public:
-    CheckMemoryLeakStructMember() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
-    CheckMemoryLeakStructMember(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakStructMemberImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     void check();
 
@@ -265,33 +293,16 @@ class CPPCHECKLIB CheckMemoryLeakStructMember : public Check, private CheckMemor
     bool isMalloc(const Variable *variable) const;
 
     void checkStructVariable(const Variable*  variable) const;
-
-    void getErrorMessages(ErrorLogger * errorLogger, const Settings * settings) const override;
-
-    static std::string myName() {
-        return "Memory leaks (struct members)";
-    }
-
-    std::string classInfo() const override {
-        return "Don't forget to deallocate struct members\n";
-    }
 };
 
 
 
 /** @brief detect simple memory leaks (address not taken) */
 
-class CPPCHECKLIB CheckMemoryLeakNoVar : public Check, private CheckMemoryLeak {
-    friend class TestMemleakNoVar;
-
+class CPPCHECKLIB CheckMemoryLeakNoVarImpl : private CheckMemoryLeakImpl {
 public:
-    CheckMemoryLeakNoVar() : Check(myName()), CheckMemoryLeak(nullptr, nullptr, nullptr) {}
-
-private:
-    CheckMemoryLeakNoVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
-
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    CheckMemoryLeakNoVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckMemoryLeakImpl(tokenizer, settings, errorLogger) {}
 
     void check();
 
@@ -317,16 +328,6 @@ class CPPCHECKLIB CheckMemoryLeakNoVar : public Check, private CheckMemoryLeak {
     void functionCallLeak(const Token *loc, const std::string &alloc, const std::string &functionCall);
     void returnValueNotUsedError(const Token* tok, const std::string &alloc);
     void unsafeArgAllocError(const Token *tok, const std::string &funcName, const std::string &ptrType, const std::string &objType);
-
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Memory leaks (address not taken)";
-    }
-
-    std::string classInfo() const override {
-        return "Not taking the address to allocated memory\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
index 3ad0a381d06..5c2e64e9a6c 100644
--- a/lib/checknullpointer.cpp
+++ b/lib/checknullpointer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -38,6 +38,7 @@
 #include <cctype>
 #include <map>
 #include <set>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
@@ -46,33 +47,21 @@
 static const CWE CWE_NULL_POINTER_DEREFERENCE(476U);
 static const CWE CWE_INCORRECT_CALCULATION(682U);
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckNullPointer instance;
-}
-
 //---------------------------------------------------------------------------
 
-static bool checkNullpointerFunctionCallPlausibility(const Function* func, unsigned int arg)
+static bool checkNullpointerFunctionCallPlausibility(const Function* func, size_t arg)
 {
     return !func || (func->argCount() >= arg && func->getArgumentVar(arg - 1) && func->getArgumentVar(arg - 1)->isPointer());
 }
 
-/**
- * @brief parse a function call and extract information about variable usage
- * @param tok first token
- * @param var variables that the function read / write.
- * @param library --library files data
- * @param checkNullArg perform isnullargbad check for each argument?
- */
-void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token *> &var, const Library &library, bool checkNullArg)
+std::list<const Token*> CheckNullPointerImpl::parseFunctionCall(const Token &tok, const Library &library, bool checkNullArg)
 {
     if (Token::Match(&tok, "%name% ( )") || !tok.tokAt(2))
-        return;
+        return {};
 
     const std::vector<const Token *> args = getArguments(&tok);
-
-    for (int argnr = 1; argnr <= args.size(); ++argnr) {
+    std::list<const Token*> var;
+    for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
         const Token *param = args[argnr - 1];
         if ((!checkNullArg || library.isnullargbad(&tok, argnr)) && checkNullpointerFunctionCallPlausibility(tok.function(), argnr))
             var.push_back(param);
@@ -86,14 +75,14 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
     if (library.formatstr_function(&tok)) {
         const int formatStringArgNr = library.formatstr_argno(&tok);
         if (formatStringArgNr < 0 || formatStringArgNr >= args.size())
-            return;
+            return var;
 
         // 1st parameter..
         if (Token::Match(&tok, "snprintf|vsnprintf|fnprintf|vfnprintf") && args.size() > 1 && !(args[1] && args[1]->hasKnownIntValue() && args[1]->getKnownIntValue() == 0)) // Only if length (second parameter) is not zero
             var.push_back(args[0]);
 
         if (args[formatStringArgNr]->tokType() != Token::eString)
-            return;
+            return var;
         const std::string &formatString = args[formatStringArgNr]->strValue();
         int argnr = formatStringArgNr + 1;
         const bool scan = library.formatstr_scan(&tok);
@@ -115,7 +104,7 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
                     }
                     ++i;
                     if (i == formatString.end())
-                        return;
+                        return var;
                 }
                 if (_continue)
                     continue;
@@ -128,6 +117,7 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
             }
         }
     }
+    return var;
 }
 
 namespace {
@@ -138,21 +128,12 @@ namespace {
     };
 }
 
-/**
- * Is there a pointer dereference? Everything that should result in
- * a nullpointer dereference error message will result in a true
- * return value. If it's unknown if the pointer is dereferenced false
- * is returned.
- * @param tok token for the pointer
- * @param unknown it is not known if there is a pointer dereference (could be reported as a debug message)
- * @return true => there is a dereference
- */
-bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown) const
+bool CheckNullPointerImpl::isPointerDeRef(const Token *tok, bool &unknown) const
 {
-    return isPointerDeRef(tok, unknown, *mSettings);
+    return isPointerDeRef(tok, unknown, mSettings.library);
 }
 
-bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Settings &settings, bool checkNullArg)
+bool CheckNullPointerImpl::isPointerDeRef(const Token *tok, bool &unknown, const Library &library, bool checkNullArg)
 {
     unknown = false;
 
@@ -165,8 +146,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
             ftok = ftok->previous();
         }
         if (ftok && ftok->previous()) {
-            std::list<const Token *> varlist;
-            parseFunctionCall(*ftok->previous(), varlist, settings.library, checkNullArg);
+            const std::list<const Token *> varlist = CheckNullPointerImpl::parseFunctionCall(*ftok->previous(), library, checkNullArg);
             if (std::find(varlist.cbegin(), varlist.cend(), tok) != varlist.cend()) {
                 return true;
             }
@@ -181,7 +161,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
         return false;
     const bool addressOf = parent->astParent() && parent->astParent()->str() == "&";
     if (parent->str() == "." && astIsRHS(tok))
-        return isPointerDeRef(parent, unknown, settings);
+        return isPointerDeRef(parent, unknown, library);
     const bool firstOperand = parent->astOperand1() == tok;
     parent = astParentSkipParens(tok);
     if (!parent)
@@ -193,6 +173,8 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
         // declaration of function pointer
         if (tok->variable() && tok->variable()->nameToken() == tok)
             return false;
+        if ((tok->valueType() && tok->valueType()->pointer == 0) && !astIsIterator(tok) && !astIsSmartPointer(tok))
+            return false;
         if (!addressOf)
             return true;
     }
@@ -222,10 +204,10 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
         return true;
 
     // std::string dereferences nullpointers
-    if (Token::Match(parent->tokAt(-3), "std :: string|wstring (|{ %name% )|}"))
+    if (Token::Match(parent->tokAt(-3), "std :: string|wstring (|{"))
         return true;
-    if (Token::Match(parent->previous(), "%name% (|{ %name% )|}")) {
-        const Variable* var = tok->tokAt(-2)->variable();
+    if (Token::Match(parent->previous(), "%name% (|{")) {
+        const Variable* var = parent->previous()->variable();
         if (var && !var->isPointer() && !var->isArray() && var->isStlStringType())
             return true;
     }
@@ -282,9 +264,9 @@ static bool isNullablePointer(const Token* tok)
     return false;
 }
 
-void CheckNullPointer::nullPointerByDeRefAndCheck()
+void CheckNullPointerImpl::nullPointerByDeRefAndCheck()
 {
-    const bool printInconclusive = (mSettings->certainty.isEnabled(Certainty::inconclusive));
+    const bool printInconclusive = (mSettings.certainty.isEnabled(Certainty::inconclusive));
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -309,13 +291,14 @@ void CheckNullPointer::nullPointerByDeRefAndCheck()
 
             return true;
         };
-        std::vector<const Token *> tokens = findTokensSkipDeadAndUnevaluatedCode(mSettings->library, scope->bodyStart, scope->bodyEnd, pred);
+        const Token* const start = (scope->function && scope->function->isConstructor()) ? scope->function->token : scope->bodyStart; // Check initialization list
+        std::vector<const Token *> tokens = findTokensSkipDeadAndUnevaluatedCode(mSettings.library, start, scope->bodyEnd, pred);
         for (const Token *tok : tokens) {
             const ValueFlow::Value *value = tok->getValue(0);
 
             // Pointer dereference.
             bool unknown = false;
-            if (!isPointerDeRef(tok, unknown)) {
+            if (!CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library)) {
                 if (unknown)
                     nullPointerError(tok, tok->expressionString(), value, true);
                 continue;
@@ -326,7 +309,7 @@ void CheckNullPointer::nullPointerByDeRefAndCheck()
     }
 }
 
-void CheckNullPointer::nullPointer()
+void CheckNullPointerImpl::nullPointer()
 {
     logChecker("CheckNullPointer::nullPointer");
     nullPointerByDeRefAndCheck();
@@ -340,7 +323,7 @@ namespace {
 }
 
 /** Dereferencing null constant (simplified token list) */
-void CheckNullPointer::nullConstantDereference()
+void CheckNullPointerImpl::nullConstantDereference()
 {
     logChecker("CheckNullPointer::nullConstantDereference");
 
@@ -374,8 +357,7 @@ void CheckNullPointer::nullConstantDereference()
                     if (var && !var->isPointer() && !var->isArray() && var->isStlStringType())
                         nullPointerError(tok);
                 } else { // function call
-                    std::list<const Token *> var;
-                    parseFunctionCall(*tok, var, mSettings->library);
+                    const std::list<const Token *> var = parseFunctionCall(*tok, mSettings.library);
 
                     // is one of the var items a NULL pointer?
                     for (const Token *vartok : var) {
@@ -388,13 +370,13 @@ void CheckNullPointer::nullConstantDereference()
 
             else if (Token::Match(tok->previous(), "::|. %name% (")) {
                 const std::vector<const Token *> &args = getArguments(tok);
-                for (int argnr = 0; argnr < args.size(); ++argnr) {
+                for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                     const Token *argtok = args[argnr];
                     if (!argtok->hasKnownIntValue())
                         continue;
                     if (argtok->getKnownIntValue() != 0)
                         continue;
-                    if (mSettings->library.isnullargbad(tok, argnr+1))
+                    if (mSettings.library.isnullargbad(tok, argnr+1))
                         nullPointerError(argtok);
                 }
             }
@@ -434,14 +416,14 @@ void CheckNullPointer::nullConstantDereference()
     }
 }
 
-void CheckNullPointer::nullPointerError(const Token *tok)
+void CheckNullPointerImpl::nullPointerError(const Token *tok)
 {
     ValueFlow::Value v(0);
     v.setKnown();
     nullPointerError(tok, "", &v, false);
 }
 
-void CheckNullPointer::nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
+void CheckNullPointerImpl::nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
 {
     const std::string errmsgcond("$symbol:" + varname + '\n' + ValueFlow::eitherTheConditionIsRedundant(value ? value->condition : nullptr) + " or there is possible null pointer dereference: $symbol.");
     const std::string errmsgdefarg("$symbol:" + varname + "\nPossible null pointer dereference if the default parameter value is used: $symbol");
@@ -454,21 +436,23 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
         reportError(tok, Severity::warning, "nullPointerOutOfResources", "Null pointer dereference", CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
         return;
     }
+    if (diag(tok))
+        return;
 
     if (!value) {
         reportError(tok, Severity::error, "nullPointer", "Null pointer dereference", CWE_NULL_POINTER_DEREFERENCE, inconclusive ? Certainty::inconclusive : Certainty::normal);
         return;
     }
 
-    if (!mSettings->isEnabled(value, inconclusive) && !mSettings->isPremiumEnabled("nullPointer"))
+    if (!mSettings.isEnabled(value, inconclusive) && !mSettings.isPremiumEnabled("nullPointer"))
         return;
 
-    const ErrorPath errorPath = getErrorPath(tok, value, "Null pointer dereference");
+    ErrorPath errorPath = getErrorPath(tok, value, "Null pointer dereference");
 
     if (value->condition) {
-        reportError(errorPath, Severity::warning, "nullPointerRedundantCheck", errmsgcond, CWE_NULL_POINTER_DEREFERENCE, inconclusive || value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
+        reportError(std::move(errorPath), Severity::warning, "nullPointerRedundantCheck", errmsgcond, CWE_NULL_POINTER_DEREFERENCE, inconclusive || value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
     } else if (value->defaultArg) {
-        reportError(errorPath, Severity::warning, "nullPointerDefaultArg", errmsgdefarg, CWE_NULL_POINTER_DEREFERENCE, inconclusive || value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
+        reportError(std::move(errorPath), Severity::warning, "nullPointerDefaultArg", errmsgdefarg, CWE_NULL_POINTER_DEREFERENCE, inconclusive || value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
     } else {
         std::string errmsg = std::string(value->isKnown() ? "Null" : "Possible null") + " pointer dereference";
 
@@ -485,7 +469,7 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
         if (!varname.empty())
             errmsg = "$symbol:" + varname + '\n' + errmsg + ": $symbol";
 
-        reportError(errorPath,
+        reportError(std::move(errorPath),
                     value->isKnown() ? Severity::error : Severity::warning,
                     id.c_str(),
                     errmsg,
@@ -493,7 +477,7 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
     }
 }
 
-void CheckNullPointer::arithmetic()
+void CheckNullPointerImpl::arithmetic()
 {
     logChecker("CheckNullPointer::arithmetic");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -519,9 +503,9 @@ void CheckNullPointer::arithmetic()
             const ValueFlow::Value* value = pointerOperand->getValue(0);
             if (!value)
                 continue;
-            if (!mSettings->certainty.isEnabled(Certainty::inconclusive) && value->isInconclusive())
+            if (!mSettings.certainty.isEnabled(Certainty::inconclusive) && value->isInconclusive())
                 continue;
-            if (value->condition && !mSettings->severity.isEnabled(Severity::warning))
+            if (value->condition && !mSettings.severity.isEnabled(Severity::warning))
                 continue;
             if (value->condition)
                 redundantConditionWarning(tok, value, value->condition, value->isInconclusive());
@@ -540,7 +524,7 @@ static std::string arithmeticTypeString(const Token *tok)
     return "arithmetic";
 }
 
-void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
+void CheckNullPointerImpl::pointerArithmeticError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
 {
     // cppcheck-suppress shadowFunction - TODO: fix this
     std::string arithmetic = arithmeticTypeString(tok);
@@ -561,8 +545,8 @@ void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow:
         id += "OutOfResources";
     }
 
-    const ErrorPath errorPath = getErrorPath(tok, value, "Null pointer " + arithmetic);
-    reportError(errorPath,
+    ErrorPath errorPath = getErrorPath(tok, value, "Null pointer " + arithmetic);
+    reportError(std::move(errorPath),
                 Severity::error,
                 id.c_str(),
                 errmsg,
@@ -570,7 +554,7 @@ void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow:
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckNullPointer::redundantConditionWarning(const Token* tok, const ValueFlow::Value *value, const Token *condition, bool inconclusive)
+void CheckNullPointerImpl::redundantConditionWarning(const Token* tok, const ValueFlow::Value *value, const Token *condition, bool inconclusive)
 {
     // cppcheck-suppress shadowFunction - TODO: fix this
     std::string arithmetic = arithmeticTypeString(tok);
@@ -580,8 +564,8 @@ void CheckNullPointer::redundantConditionWarning(const Token* tok, const ValueFl
     } else {
         errmsg = ValueFlow::eitherTheConditionIsRedundant(condition) + " or there is pointer arithmetic with NULL pointer.";
     }
-    const ErrorPath errorPath = getErrorPath(tok, value, "Null pointer " + arithmetic);
-    reportError(errorPath,
+    ErrorPath errorPath = getErrorPath(tok, value, "Null pointer " + arithmetic);
+    reportError(std::move(errorPath),
                 Severity::warning,
                 "nullPointerArithmeticRedundantCheck",
                 errmsg,
@@ -594,7 +578,7 @@ static bool isUnsafeUsage(const Settings &settings, const Token *vartok, CTU::Fi
 {
     (void)value;
     bool unknown = false;
-    return CheckNullPointer::isPointerDeRef(vartok, unknown, settings);
+    return CheckNullPointerImpl::isPointerDeRef(vartok, unknown, settings.library);
 }
 
 // a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
@@ -620,9 +604,11 @@ namespace
     };
 }
 
-Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer &tokenizer, const Settings &settings) const
+const Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& currentConfig) const
 {
-    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, isUnsafeUsage);
+    (void)currentConfig;
+
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, ::isUnsafeUsage);
     if (unsafeUsage.empty())
         return nullptr;
 
@@ -631,24 +617,24 @@ Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer &tokenizer, const
     return fileInfo;
 }
 
-Check::FileInfo * CheckNullPointer::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckNullPointer::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
     const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::loadUnsafeUsageListFromXml(xmlElement);
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
 
-bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
     (void)settings;
 
-    CheckNullPointer dummy(nullptr, &settings, &errorLogger);
+    CheckNullPointerImpl dummy(nullptr, settings, errorLogger);
     dummy.
-    logChecker("CheckNullPointer::analyseWholeProgram"); // unusedfunctions
+    logChecker("CheckNullPointer::analyseWholeProgram");
 
     if (fileInfo.empty())
         return false;
@@ -667,7 +653,7 @@ bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::
                     break;
 
                 ValueFlow::Value::UnknownFunctionReturn unknownFunctionReturn = ValueFlow::Value::UnknownFunctionReturn::no;
-                const std::list<ErrorMessage::FileLocation> &locationList =
+                std::list<ErrorMessage::FileLocation> locationList =
                     CTU::FileInfo::getErrorPath(CTU::FileInfo::InvalidValueType::null,
                                                 unsafeUsage,
                                                 callsMap,
@@ -689,12 +675,12 @@ bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::
                     message = "If resource allocation fails, then there is a possible null pointer dereference: " + unsafeUsage.myArgumentName;
                 }
 
-                const ErrorMessage errmsg(locationList,
-                                          fi->file0,
-                                          warning ? Severity::warning : Severity::error,
-                                          message,
-                                          std::move(id),
-                                          CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
+                ErrorMessage errmsg(std::move(locationList),
+                                    fi->file0,
+                                    warning ? Severity::warning : Severity::error,
+                                    message,
+                                    std::move(id),
+                                    CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
                 errorLogger.reportErr(errmsg);
 
                 foundErrors = true;
@@ -706,18 +692,22 @@ bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo &ctu, const std::
     return foundErrors;
 }
 
-void CheckNullPointer::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckNullPointer::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckNullPointer checkNullPointer(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckNullPointerImpl checkNullPointer(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkNullPointer.nullPointer();
     checkNullPointer.arithmetic();
     checkNullPointer.nullConstantDereference();
 }
 
-void CheckNullPointer::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckNullPointer::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckNullPointer c(nullptr, settings, errorLogger);
+    CheckNullPointerImpl c(nullptr, settings, errorLogger);
     c.nullPointerError(nullptr, "pointer", nullptr, false);
     c.pointerArithmeticError(nullptr, nullptr, false);
+    // TODO: nullPointerArithmeticOutOfMemory
     c.redundantConditionWarning(nullptr, nullptr, nullptr, false);
+    // TODO: ctunullpointer
+    // TODO: ctunullpointerOutOfMemory
+    // TODO: ctunullpointerOutOfResources
 }
diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
index fb59771a64e..ed6a617d81a 100644
--- a/lib/checknullpointer.h
+++ b/lib/checknullpointer.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,9 +23,11 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <list>
+#include <set>
 #include <string>
 
 class ErrorLogger;
@@ -46,11 +48,38 @@ namespace ValueFlow
 /** @brief check for null pointer dereferencing */
 
 class CPPCHECKLIB CheckNullPointer : public Check {
-    friend class TestNullPointer;
-
 public:
     /** @brief This constructor is used when registering the CheckNullPointer */
-    CheckNullPointer() : Check(myName()) {}
+    CheckNullPointer() : Check("Null pointer") {}
+
+private:
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    /** @brief Parse current TU and extract file info */
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& currentConfig) const override;
+
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
+
+    /** @brief Analyse all file infos for all TU */
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    /** Get error messages. Used by --errorlist */
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    /** class info in WIKI format. Used by --doc */
+    std::string classInfo() const override {
+        return "Null pointers\n"
+               "- null pointer dereferencing\n"
+               "- undefined null pointer arithmetic\n";
+    }
+};
+
+class CPPCHECKLIB CheckNullPointerImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckNullPointerImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /**
      * Is there a pointer dereference? Everything that should result in
@@ -63,25 +92,16 @@ class CPPCHECKLIB CheckNullPointer : public Check {
      */
     bool isPointerDeRef(const Token *tok, bool &unknown) const;
 
-    static bool isPointerDeRef(const Token *tok, bool &unknown, const Settings &settings, bool checkNullArg = true);
+    static bool isPointerDeRef(const Token *tok, bool &unknown, const Library &library, bool checkNullArg = true);
 
-private:
     /**
      * @brief parse a function call and extract information about variable usage
      * @param tok first token
-     * @param var variables that the function read / write.
      * @param library --library files data
+     * @param checkNullArg perform isnullargbad check for each argument?
+     * @return list of variables that the function reads / writes.
      */
-    static void parseFunctionCall(const Token &tok,
-                                  std::list<const Token *> &var,
-                                  const Library &library, bool checkNullArg = true);
-
-    /** @brief This constructor is used when running checks. */
-    CheckNullPointer(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
-    /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    static std::list<const Token*> parseFunctionCall(const Token &tok, const Library &library, bool checkNullArg = true);
 
     /** @brief possible null pointer dereference */
     void nullPointer();
@@ -92,29 +112,6 @@ class CPPCHECKLIB CheckNullPointer : public Check {
     void nullPointerError(const Token *tok);
     void nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value* value, bool inconclusive);
 
-    /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings) const override;
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-
-    /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
-
-    /** Get error messages. Used by --errorlist */
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    /** Name of check */
-    static std::string myName() {
-        return "Null pointer";
-    }
-
-    /** class info in WIKI format. Used by --doc */
-    std::string classInfo() const override {
-        return "Null pointers\n"
-               "- null pointer dereferencing\n"
-               "- undefined null pointer arithmetic\n";
-    }
-
     /**
      * @brief Does one part of the check for nullPointer().
      * Dereferencing a pointer and then checking if it's NULL..
@@ -125,6 +122,12 @@ class CPPCHECKLIB CheckNullPointer : public Check {
     void arithmetic();
     void pointerArithmeticError(const Token* tok, const ValueFlow::Value *value, bool inconclusive);
     void redundantConditionWarning(const Token* tok, const ValueFlow::Value *value, const Token *condition, bool inconclusive);
+
+    bool diag(const Token* tok) {
+        return !mDiag.emplace(tok).second;
+    }
+
+    std::set<const Token*> mDiag;
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 282f3f3e50e..7f22e531230 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -36,6 +36,7 @@
 #include "vfvalue.h"
 
 #include <algorithm> // find_if()
+#include <cassert>
 #include <cctype>
 #include <cstddef>
 #include <cstdint>
@@ -43,15 +44,11 @@
 #include <map>
 #include <set>
 #include <sstream>
+#include <unordered_map>
 #include <utility>
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckOther instance;
-}
-
 static const CWE CWE128(128U);   // Wrap-around Error
 static const CWE CWE131(131U);   // Incorrect Calculation of Buffer Size
 static const CWE CWE197(197U);   // Numeric Truncation Error
@@ -83,9 +80,9 @@ static const CWE CWE783(783U);   // Operator Precedence Logic Error
 // - http://www.cplusplus.com/reference/cstdio/getchar/
 // - http://www.cplusplus.com/reference/cstdio/ungetc/ ...
 //----------------------------------------------------------------------------------
-void CheckOther::checkCastIntToCharAndBack()
+void CheckOtherImpl::checkCastIntToCharAndBack()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::checkCastIntToCharAndBack"); // warning
@@ -133,7 +130,7 @@ void CheckOther::checkCastIntToCharAndBack()
     }
 }
 
-void CheckOther::checkCastIntToCharAndBackError(const Token *tok, const std::string &strFunctionName)
+void CheckOtherImpl::checkCastIntToCharAndBackError(const Token *tok, const std::string &strFunctionName)
 {
     reportError(
         tok,
@@ -153,9 +150,9 @@ void CheckOther::checkCastIntToCharAndBackError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 // Clarify calculation precedence for ternary operators.
 //---------------------------------------------------------------------------
-void CheckOther::clarifyCalculation()
+void CheckOtherImpl::clarifyCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCalculation"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("clarifyCalculation"))
         return;
 
     logChecker("CheckOther::clarifyCalculation"); // style
@@ -202,7 +199,7 @@ void CheckOther::clarifyCalculation()
     }
 }
 
-void CheckOther::clarifyCalculationError(const Token *tok, const std::string &op)
+void CheckOtherImpl::clarifyCalculationError(const Token *tok, const std::string &op)
 {
     // suspicious calculation
     const std::string calc("'a" + op + "b?c:d'");
@@ -224,9 +221,9 @@ void CheckOther::clarifyCalculationError(const Token *tok, const std::string &op
 //---------------------------------------------------------------------------
 // Clarify (meaningless) statements like *foo++; with parentheses.
 //---------------------------------------------------------------------------
-void CheckOther::clarifyStatement()
+void CheckOtherImpl::clarifyStatement()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::clarifyStatement"); // warning
@@ -250,7 +247,7 @@ void CheckOther::clarifyStatement()
     }
 }
 
-void CheckOther::clarifyStatementError(const Token *tok)
+void CheckOtherImpl::clarifyStatementError(const Token *tok)
 {
     reportError(tok, Severity::warning, "clarifyStatement", "In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n"
                 "A statement like '*A++;' might not do what you intended. Postfix 'operator++' is executed before 'operator*'. "
@@ -260,9 +257,9 @@ void CheckOther::clarifyStatementError(const Token *tok)
 //---------------------------------------------------------------------------
 // Check for suspicious occurrences of 'if(); {}'.
 //---------------------------------------------------------------------------
-void CheckOther::checkSuspiciousSemicolon()
+void CheckOtherImpl::checkSuspiciousSemicolon()
 {
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning))
         return;
 
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -284,23 +281,61 @@ void CheckOther::checkSuspiciousSemicolon()
     }
 }
 
-void CheckOther::suspiciousSemicolonError(const Token* tok)
+void CheckOtherImpl::suspiciousSemicolonError(const Token* tok)
 {
     reportError(tok, Severity::warning, "suspiciousSemicolon",
                 "Suspicious use of ; at the end of '" + (tok ? tok->str() : std::string()) + "' statement.", CWE398, Certainty::normal);
 }
 
+/** @brief would it make sense to use dynamic_cast instead of C style cast? */
+static bool isDangerousTypeConversion(const Token* const tok)
+{
+    const Token* from = tok->astOperand1();
+    if (!from)
+        return false;
+    if (!tok->valueType() || !from->valueType())
+        return false;
+    if (tok->valueType()->typeScope != nullptr &&
+        tok->valueType()->typeScope == from->valueType()->typeScope)
+        return false;
+    if (tok->valueType()->type == from->valueType()->type &&
+        tok->valueType()->isPrimitive())
+        return false;
+    // cast from derived object to base object is safe..
+    if (tok->valueType()->typeScope && from->valueType()->typeScope) {
+        const Type* fromType = from->valueType()->typeScope->definedType;
+        const Type* toType = tok->valueType()->typeScope->definedType;
+        if (fromType && toType && fromType->isDerivedFrom(toType->name()))
+            return false;
+    }
+    const bool refcast = (tok->valueType()->reference != Reference::None);
+    if (!refcast && tok->valueType()->pointer == 0)
+        return false;
+    if (!refcast && from->valueType()->pointer == 0)
+        return false;
+
+    if (tok->valueType()->type == ValueType::Type::VOID || from->valueType()->type == ValueType::Type::VOID)
+        return false;
+    if (tok->valueType()->pointer == 0 && tok->valueType()->isIntegral())
+        // ok: (uintptr_t)ptr;
+        return false;
+    if (from->valueType()->pointer == 0 && from->valueType()->isIntegral())
+        // ok: (int *)addr;
+        return false;
+
+    return true;
+}
 
 //---------------------------------------------------------------------------
 // For C++ code, warn if C-style casts are used on pointer types
 //---------------------------------------------------------------------------
-void CheckOther::warningOldStylePointerCast()
+void CheckOtherImpl::warningOldStylePointerCast()
 {
     // Only valid on C++ code
     if (!mTokenizer->isCPP())
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("cstyleCast"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("cstyleCast"))
         return;
 
     logChecker("CheckOther::warningOldStylePointerCast"); // style,c++
@@ -314,8 +349,11 @@ void CheckOther::warningOldStylePointerCast()
             tok = scope->bodyStart;
         for (; tok && tok != scope->bodyEnd; tok = tok->next()) {
             // Old style pointer casting..
-            if (tok->str() != "(")
+            if (!tok->isCast() || tok->isBinaryOp())
+                continue;
+            if (isDangerousTypeConversion(tok))
                 continue;
+            const Token* const errtok = tok;
             const Token* castTok = tok->next();
             while (Token::Match(castTok, "const|volatile|class|struct|union|%type%|::")) {
                 castTok = castTok->next();
@@ -332,7 +370,7 @@ void CheckOther::warningOldStylePointerCast()
                     isRef = true;
                 castTok = castTok->next();
             }
-            if ((!isPtr && !isRef) || !Token::Match(castTok, ") (| %name%|%num%|%bool%|%char%|%str%|&"))
+            if ((!isPtr && !isRef) || !Token::Match(castTok, ") (| %name%|%bool%|%char%|%str%|&"))
                 continue;
 
             if (Token::Match(tok->previous(), "%type%"))
@@ -351,12 +389,12 @@ void CheckOther::warningOldStylePointerCast()
                 continue;
 
             if (typeTok->tokType() == Token::eType || typeTok->tokType() == Token::eName)
-                cstyleCastError(tok, isPtr);
+                cstyleCastError(errtok, isPtr);
         }
     }
 }
 
-void CheckOther::cstyleCastError(const Token *tok, bool isPtr)
+void CheckOtherImpl::cstyleCastError(const Token *tok, bool isPtr)
 {
     const std::string type = isPtr ? "pointer" : "reference";
     reportError(tok, Severity::style, "cstyleCast",
@@ -367,9 +405,84 @@ void CheckOther::cstyleCastError(const Token *tok, bool isPtr)
                 "which kind of cast is expected.", CWE398, Certainty::normal);
 }
 
-void CheckOther::suspiciousFloatingPointCast()
+void CheckOtherImpl::warningDangerousTypeCast()
+{
+    // Only valid on C++ code
+    if (!mTokenizer->isCPP())
+        return;
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("dangerousTypeCast"))
+        return;
+
+    logChecker("CheckOther::warningDangerousTypeCast"); // warning,c++
+
+    const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
+    for (const Scope * scope : symbolDatabase->functionScopes) {
+        const Token* tok;
+        if (scope->function && scope->function->isConstructor())
+            tok = scope->classDef;
+        else
+            tok = scope->bodyStart;
+        for (; tok && tok != scope->bodyEnd; tok = tok->next()) {
+            // Old style pointer casting..
+            if (!tok->isCast() || tok->isBinaryOp())
+                continue;
+
+            if (isDangerousTypeConversion(tok))
+                dangerousTypeCastError(tok, tok->valueType()->pointer > 0);
+        }
+    }
+}
+
+void CheckOtherImpl::dangerousTypeCastError(const Token *tok, bool isPtr)
+{
+    //const std::string type = isPtr ? "pointer" : "reference";
+    (void)isPtr;
+    reportError(tok, Severity::warning, "dangerousTypeCast",
+                "Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast",
+                CWE398, Certainty::normal);
+}
+
+void CheckOtherImpl::warningIntToPointerCast()
+{
+    if (!mSettings.severity.isEnabled(Severity::portability) && !mSettings.isPremiumEnabled("cstyleCast"))
+        return;
+
+    logChecker("CheckOther::warningIntToPointerCast"); // portability
+
+    for (const Token* tok = mTokenizer->tokens(); tok; tok = tok->next()) {
+        // pointer casting..
+        if (!tok->isCast())
+            continue;
+        const Token* from = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
+        if (!from || !from->isNumber())
+            continue;
+        if (!tok->valueType() || tok->valueType()->pointer == 0)
+            continue;
+        if (!MathLib::isIntHex(from->str()) && from->hasKnownIntValue() && from->getKnownIntValue() != 0) {
+            std::string format;
+            if (MathLib::isDec(from->str()))
+                format = "decimal";
+            else if (MathLib::isOct(from->str()))
+                format = "octal";
+            else if (MathLib::isBin(from->str()))
+                format = "binary";
+            else
+                continue;
+            intToPointerCastError(tok, format);
+        }
+    }
+}
+
+void CheckOtherImpl::intToPointerCastError(const Token *tok, const std::string& format)
+{
+    reportError(tok, Severity::portability, "intToPointerCast",
+                "Casting non-zero " + format + " integer literal to pointer.",
+                CWE398, Certainty::normal);
+}
+
+void CheckOtherImpl::suspiciousFloatingPointCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("suspiciousFloatingPointCast"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("suspiciousFloatingPointCast"))
         return;
 
     logChecker("CheckOther::suspiciousFloatingPointCast"); // style
@@ -417,7 +530,7 @@ void CheckOther::suspiciousFloatingPointCast()
     }
 }
 
-void CheckOther::suspiciousFloatingPointCastError(const Token* tok)
+void CheckOtherImpl::suspiciousFloatingPointCastError(const Token* tok)
 {
     reportError(tok, Severity::style, "suspiciousFloatingPointCast",
                 "Floating-point cast causes loss of precision.\n"
@@ -428,14 +541,14 @@ void CheckOther::suspiciousFloatingPointCastError(const Token* tok)
 // float* f; double* d = (double*)f; <-- Pointer cast to a type with an incompatible binary data representation
 //---------------------------------------------------------------------------
 
-void CheckOther::invalidPointerCast()
+void CheckOtherImpl::invalidPointerCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("CheckOther::invalidPointerCast"); // portability
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -468,7 +581,7 @@ void CheckOther::invalidPointerCast()
 }
 
 
-void CheckOther::invalidPointerCastError(const Token* tok, const std::string& from, const std::string& to, bool inconclusive, bool toIsInt)
+void CheckOtherImpl::invalidPointerCastError(const Token* tok, const std::string& from, const std::string& to, bool inconclusive, bool toIsInt)
 {
     if (toIsInt) { // If we cast something to int*, this can be useful to play with its binary data representation
         reportError(tok, Severity::portability, "invalidPointerCast", "Casting from " + from + " to " + to + " is not portable due to different binary data representations on different platforms.", CWE704, inconclusive ? Certainty::inconclusive : Certainty::normal);
@@ -481,11 +594,11 @@ void CheckOther::invalidPointerCastError(const Token* tok, const std::string& fr
 // Detect redundant assignments: x = 0; x = 4;
 //---------------------------------------------------------------------------
 
-void CheckOther::checkRedundantAssignment()
+void CheckOtherImpl::checkRedundantAssignment()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("redundantAssignment") &&
-        !mSettings->isPremiumEnabled("redundantAssignInSwitch"))
+    if (!mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("redundantAssignment") &&
+        !mSettings.isPremiumEnabled("redundantAssignInSwitch"))
         return;
 
     logChecker("CheckOther::checkRedundantAssignment"); // style
@@ -515,7 +628,7 @@ void CheckOther::checkRedundantAssignment()
                                   [&](const Token *rhs) {
                         if (Token::simpleMatch(rhs, "{ 0 }"))
                             return ChildrenToVisit::none;
-                        if (Token::Match(rhs, "%str%|%num%|%name%") && !rhs->varId())
+                        if (Token::Match(rhs, "%num%|%name%") && !rhs->varId())
                             return ChildrenToVisit::none;
                         if (Token::Match(rhs, ":: %name%") && rhs->hasKnownIntValue())
                             return ChildrenToVisit::none;
@@ -555,17 +668,17 @@ void CheckOther::checkRedundantAssignment()
                     if (tok->astOperand1()->valueType()->type == ValueType::SMART_POINTER)
                         break;
                 }
-                if (inconclusive && !mSettings->certainty.isEnabled(Certainty::inconclusive))
+                if (inconclusive && !mSettings.certainty.isEnabled(Certainty::inconclusive))
                     continue;
 
-                FwdAnalysis fwdAnalysis(*mSettings);
+                FwdAnalysis fwdAnalysis(mSettings);
                 if (fwdAnalysis.hasOperand(tok->astOperand2(), tok->astOperand1()))
                     continue;
 
                 // Is there a redundant assignment?
                 const Token *start;
                 if (tok->isAssignmentOp())
-                    start = tok->next();
+                    start = tok->astOperand2();
                 else
                     start = tok->findExpressionStartEndTokens().second->next();
 
@@ -587,8 +700,12 @@ void CheckOther::checkRedundantAssignment()
                 // Get next assignment..
                 const Token *nextAssign = fwdAnalysis.reassign(tokenToCheck, start, scope->bodyEnd);
                 // extra check for union
-                if (nextAssign && tokenToCheck != tok->astOperand1())
+                if (nextAssign && tokenToCheck != tok->astOperand1()) {
                     nextAssign = fwdAnalysis.reassign(tok->astOperand1(), start, scope->bodyEnd);
+                    // reading another member of the same union in the rhs is a use through aliasing
+                    if (nextAssign && fwdAnalysis.hasOperand(nextAssign->astOperand2(), tokenToCheck))
+                        nextAssign = nullptr;
+                }
 
                 if (!nextAssign)
                     continue;
@@ -618,7 +735,7 @@ void CheckOther::checkRedundantAssignment()
     }
 }
 
-void CheckOther::redundantCopyError(const Token *tok1, const Token* tok2, const std::string& var)
+void CheckOtherImpl::redundantCopyError(const Token *tok1, const Token* tok2, const std::string& var)
 {
     const std::list<const Token *> callstack = { tok1, tok2 };
     reportError(callstack, Severity::performance, "redundantCopy",
@@ -626,42 +743,42 @@ void CheckOther::redundantCopyError(const Token *tok1, const Token* tok2, const
                 "Buffer '$symbol' is being written before its old content has been used.", CWE563, Certainty::normal);
 }
 
-void CheckOther::redundantAssignmentError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
+void CheckOtherImpl::redundantAssignmentError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
 {
-    const ErrorPath errorPath = { ErrorPathItem(tok1, var + " is assigned"), ErrorPathItem(tok2, var + " is overwritten") };
+    ErrorPath errorPath = { ErrorPathItem(tok1, var + " is assigned"), ErrorPathItem(tok2, var + " is overwritten") };
     if (inconclusive)
-        reportError(errorPath, Severity::style, "redundantAssignment",
+        reportError(std::move(errorPath), Severity::style, "redundantAssignment",
                     "$symbol:" + var + "\n"
                     "Variable '$symbol' is reassigned a value before the old one has been used if variable is no semaphore variable.\n"
                     "Variable '$symbol' is reassigned a value before the old one has been used. Make sure that this variable is not used like a semaphore in a threading environment before simplifying this code.", CWE563, Certainty::inconclusive);
     else
-        reportError(errorPath, Severity::style, "redundantAssignment",
+        reportError(std::move(errorPath), Severity::style, "redundantAssignment",
                     "$symbol:" + var + "\n"
                     "Variable '$symbol' is reassigned a value before the old one has been used.", CWE563, Certainty::normal);
 }
 
-void CheckOther::redundantInitializationError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
+void CheckOtherImpl::redundantInitializationError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive)
 {
-    const ErrorPath errorPath = { ErrorPathItem(tok1, var + " is initialized"), ErrorPathItem(tok2, var + " is overwritten") };
-    reportError(errorPath, Severity::style, "redundantInitialization",
+    ErrorPath errorPath = { ErrorPathItem(tok1, var + " is initialized"), ErrorPathItem(tok2, var + " is overwritten") };
+    reportError(std::move(errorPath), Severity::style, "redundantInitialization",
                 "$symbol:" + var + "\nRedundant initialization for '$symbol'. The initialized value is overwritten before it is read.",
                 CWE563,
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::redundantAssignmentInSwitchError(const Token *tok1, const Token* tok2, const std::string &var)
+void CheckOtherImpl::redundantAssignmentInSwitchError(const Token *tok1, const Token* tok2, const std::string &var)
 {
-    const ErrorPath errorPath = { ErrorPathItem(tok1, "$symbol is assigned"), ErrorPathItem(tok2, "$symbol is overwritten") };
-    reportError(errorPath, Severity::style, "redundantAssignInSwitch",
+    ErrorPath errorPath = { ErrorPathItem(tok1, "$symbol is assigned"), ErrorPathItem(tok2, "$symbol is overwritten") };
+    reportError(std::move(errorPath), Severity::style, "redundantAssignInSwitch",
                 "$symbol:" + var + "\n"
                 "Variable '$symbol' is reassigned a value before the old one has been used. 'break;' missing?", CWE563, Certainty::normal);
 }
 
-void CheckOther::redundantAssignmentSameValueError(const Token *tok, const ValueFlow::Value* val, const std::string &var)
+void CheckOtherImpl::redundantAssignmentSameValueError(const Token *tok, const ValueFlow::Value* val, const std::string &var)
 {
     auto errorPath = val->errorPath;
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::style, "redundantAssignment",
+    reportError(std::move(errorPath), Severity::style, "redundantAssignment",
                 "$symbol:" + var + "\n"
                 "Variable '$symbol' is assigned an expression that holds the same value.", CWE563, Certainty::normal);
 }
@@ -678,12 +795,12 @@ void CheckOther::redundantAssignmentSameValueError(const Token *tok, const Value
 //---------------------------------------------------------------------------
 static inline bool isFunctionOrBreakPattern(const Token *tok)
 {
-    return Token::Match(tok, "%name% (") || Token::Match(tok, "break|continue|return|exit|goto|throw");
+    return Token::Match(tok, "%name% (") || (tok->isKeyword() && Token::Match(tok, "break|continue|return|goto|throw"));
 }
 
-void CheckOther::redundantBitwiseOperationInSwitchError()
+void CheckOtherImpl::redundantBitwiseOperationInSwitchError()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::redundantBitwiseOperationInSwitch"); // warning
@@ -798,7 +915,7 @@ void CheckOther::redundantBitwiseOperationInSwitchError()
     }
 }
 
-void CheckOther::redundantBitwiseOperationInSwitchError(const Token *tok, const std::string &varname)
+void CheckOtherImpl::redundantBitwiseOperationInSwitchError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::style,
                 "redundantBitwiseOperationInSwitch",
@@ -810,9 +927,9 @@ void CheckOther::redundantBitwiseOperationInSwitchError(const Token *tok, const
 //---------------------------------------------------------------------------
 // Check for statements like case A||B: in switch()
 //---------------------------------------------------------------------------
-void CheckOther::checkSuspiciousCaseInSwitch()
+void CheckOtherImpl::checkSuspiciousCaseInSwitch()
 {
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.certainty.isEnabled(Certainty::inconclusive) || !mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::checkSuspiciousCaseInSwitch"); // warning,inconclusive
@@ -844,7 +961,7 @@ void CheckOther::checkSuspiciousCaseInSwitch()
     }
 }
 
-void CheckOther::suspiciousCaseInSwitchError(const Token* tok, const std::string& operatorString)
+void CheckOtherImpl::suspiciousCaseInSwitchError(const Token* tok, const std::string& operatorString)
 {
     reportError(tok, Severity::warning, "suspiciousCase",
                 "Found suspicious case label in switch(). Operator '" + operatorString + "' probably doesn't work as intended.\n"
@@ -894,18 +1011,18 @@ static bool isVardeclInSwitch(const Token* tok)
 //    Detect dead code, that follows such a statement. e.g.:
 //        return(0); foo();
 //---------------------------------------------------------------------------
-void CheckOther::checkUnreachableCode()
+void CheckOtherImpl::checkUnreachableCode()
 {
     // misra-c-2012-2.1
     // misra-c-2023-2.1
     // misra-cpp-2008-0-1-1
     // autosar
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateBreak") && !mSettings->isPremiumEnabled("unreachableCode"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("duplicateBreak") && !mSettings.isPremiumEnabled("unreachableCode"))
         return;
 
     logChecker("CheckOther::checkUnreachableCode"); // style
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         if (scope->hasInlineOrLambdaFunction(nullptr, /*onlyInline*/ true))
@@ -932,7 +1049,7 @@ void CheckOther::checkUnreachableCode()
             } else if (Token::Match(tok, "goto %any% ;")) {
                 secondBreak = tok->tokAt(3);
                 labelName = tok->next();
-            } else if (Token::Match(tok, "%name% (") && mSettings->library.isnoreturn(tok) && !Token::Match(tok->next()->astParent(), "?|:")) {
+            } else if (Token::Match(tok, "%name% (") && mSettings.library.isnoreturn(tok) && !Token::Match(tok->next()->astParent(), "?|:")) {
                 if ((!tok->function() || (tok->function()->token != tok && tok->function()->tokenDef != tok)) && tok->linkAt(1)->strAt(1) != "{")
                     secondBreak = tok->linkAt(1)->tokAt(2);
                 if (Token::simpleMatch(secondBreak, "return")) {
@@ -1014,7 +1131,7 @@ void CheckOther::checkUnreachableCode()
     }
 }
 
-void CheckOther::duplicateBreakError(const Token *tok, bool inconclusive)
+void CheckOtherImpl::duplicateBreakError(const Token *tok, bool inconclusive)
 {
     reportError(tok, Severity::style, "duplicateBreak",
                 "Consecutive return, break, continue, goto or throw statements are unnecessary.\n"
@@ -1022,10 +1139,10 @@ void CheckOther::duplicateBreakError(const Token *tok, bool inconclusive)
                 "The second statement can never be executed, and so should be removed.", CWE561, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::unreachableCodeError(const Token *tok, const Token* noreturn, bool inconclusive)
+void CheckOtherImpl::unreachableCodeError(const Token *tok, const Token* noreturn, bool inconclusive)
 {
     std::string msg = "Statements following ";
-    if (noreturn && (noreturn->function() || mSettings->library.isnoreturn(noreturn)))
+    if (noreturn && (noreturn->function() || mSettings.library.isnoreturn(noreturn)))
         msg += "noreturn function '" + noreturn->str() + "()'";
     else if (noreturn && noreturn->isKeyword())
         msg += "'" + noreturn->str() + "'";
@@ -1036,7 +1153,7 @@ void CheckOther::unreachableCodeError(const Token *tok, const Token* noreturn, b
                 msg, CWE561, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::redundantContinueError(const Token *tok)
+void CheckOtherImpl::redundantContinueError(const Token *tok)
 {
     reportError(tok, Severity::style, "redundantContinue",
                 "'continue' is redundant since it is the last statement in a loop.", CWE561, Certainty::normal);
@@ -1047,6 +1164,8 @@ static bool isSimpleExpr(const Token* tok, const Variable* var, const Settings&
         return false;
     if (tok->isNumber() || tok->tokType() == Token::eString || tok->tokType() == Token::eChar || tok->isBoolean())
         return true;
+    if (isNullOperand(tok))
+        return true;
     bool needsCheck = tok->varId() > 0;
     if (!needsCheck) {
         if (tok->isArithmeticalOp())
@@ -1070,19 +1189,19 @@ static bool isSimpleExpr(const Token* tok, const Variable* var, const Settings&
 //---------------------------------------------------------------------------
 // Check scope of variables..
 //---------------------------------------------------------------------------
-void CheckOther::checkVariableScope()
+void CheckOtherImpl::checkVariableScope()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("variableScope"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("variableScope"))
         return;
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // In C it is common practice to declare local variables at the
     // start of functions.
-    if (mSettings->daca && mTokenizer->isC())
+    if (mSettings.daca && mTokenizer->isC())
         return;
 
     logChecker("CheckOther::checkVariableScope"); // style,notclang
@@ -1098,7 +1217,7 @@ void CheckOther::checkVariableScope()
             continue;
 
         const bool isPtrOrRef = var->isPointer() || var->isReference();
-        const bool isSimpleType = var->typeStartToken()->isStandardType() || var->typeStartToken()->isEnumType() || (var->typeStartToken()->isC() && var->type() && var->type()->isStructType());
+        const bool isSimpleType = var->typeStartToken()->isStandardType() || var->typeStartToken()->isEnumType() || var->typeStartToken()->isC() || symbolDatabase->isRecordTypeWithoutSideEffects(var->type());
         if (!isPtrOrRef && !isSimpleType && !astIsContainer(var->nameToken()))
             continue;
 
@@ -1131,7 +1250,7 @@ void CheckOther::checkVariableScope()
         bool isConstructor = false;
         if (Token::Match(tok, "; %varid% =", var->declarationId())) { // bailout for assignment
             tok = tok->tokAt(2)->astOperand2();
-            if (!isSimpleExpr(tok, var, *mSettings))
+            if (!isSimpleExpr(tok, var, mSettings))
                 continue;
         }
         else if (Token::Match(tok, "{|(")) { // bailout for constructor
@@ -1140,11 +1259,11 @@ void CheckOther::checkVariableScope()
             bool bail = false;
             while (argTok) {
                 if (Token::simpleMatch(argTok, ",")) {
-                    if (!isSimpleExpr(argTok->astOperand2(), var, *mSettings)) {
+                    if (!isSimpleExpr(argTok->astOperand2(), var, mSettings)) {
                         bail = true;
                         break;
                     }
-                } else if (argTok->str() != "." && !isSimpleExpr(argTok, var, *mSettings)) {
+                } else if (argTok->str() != "." && !isSimpleExpr(argTok, var, mSettings)) {
                     bail = true;
                     break;
                 }
@@ -1174,7 +1293,7 @@ void CheckOther::checkVariableScope()
                 tok = tok->link();
 
                 // parse else if blocks..
-            } else if (Token::simpleMatch(tok, "else { if (") && Token::simpleMatch(tok->linkAt(3), ") {")) {
+            } else if (Token::simpleMatch(tok, "else { if (") && tok->next()->isInsertedBrace() && Token::simpleMatch(tok->linkAt(3), ") {")) {
                 tok = tok->next();
             } else if (tok->varId() == var->declarationId() || tok->str() == "goto") {
                 reduce = false;
@@ -1213,7 +1332,16 @@ static bool mayDependOn(const ValueType *other, const ValueType *original)
     return otherPtr > originalPtr;
 }
 
-bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& used) const
+static bool isOnlyUsedInCurrentScope(const Variable* var, const Token *tok, const Scope* scope)
+{
+    if (tok->scope() == scope)
+        return true;
+    if (tok->scope()->type == ScopeType::eSwitch)
+        return false;
+    return !Token::findmatch(tok->scope()->bodyEnd, "%varid%", var->scope()->bodyEnd, var->declarationId());
+}
+
+bool CheckOtherImpl::checkInnerScope(const Token *tok, const Variable* var, bool& used) const
 {
     const Scope* scope = tok->next()->scope();
     bool loopVariable = scope->isLoopScope();
@@ -1252,7 +1380,8 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
         if (tok == forHeadEnd)
             forHeadEnd = nullptr;
 
-        if (loopVariable && noContinue && tok->scope() == scope && !forHeadEnd && scope->type != ScopeType::eSwitch && Token::Match(tok, "%varid% =", var->declarationId())) { // Assigned in outer scope.
+        if (loopVariable && noContinue && !forHeadEnd && scope->type != ScopeType::eSwitch && Token::Match(tok, "%varid% =", var->declarationId()) &&
+            isOnlyUsedInCurrentScope(var, tok, scope)) { // Assigned in outer scope.
             loopVariable = false;
             std::pair<const Token*, const Token*> range = tok->next()->findExpressionStartEndTokens();
             if (range.first)
@@ -1290,7 +1419,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
                 if (scope->type == ScopeType::eSwitch)
                     return false; // Used in outer switch scope - unsafe or impossible to reduce scope
 
-                if (scope->bodyStart && scope->bodyStart->isSimplifiedScope())
+                if (scope->bodyStart && scope->bodyStart->isSimplifiedIfInitStmt())
                     return false; // simplified if/for/switch init statement
             }
             if (var->isArrayOrPointer()) {
@@ -1299,7 +1428,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
                     if (ftok->next()->astParent()) { // return value used?
                         if (ftok->function() && Function::returnsPointer(ftok->function()))
                             return false;
-                        const std::string ret = mSettings->library.returnValueType(ftok); // assume that var is returned
+                        const std::string ret = mSettings.library.returnValueType(ftok); // assume that var is returned
                         if (!ret.empty() && ret.back() == '*')
                             return false;
                     }
@@ -1314,7 +1443,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
                     }
                 }
             }
-            const auto yield = astContainerYield(tok, mSettings->library);
+            const auto yield = astContainerYield(tok, mSettings.library);
             if (yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT)
                 return false;
         }
@@ -1323,7 +1452,7 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
     return true;
 }
 
-void CheckOther::variableScopeError(const Token *tok, const std::string &varname)
+void CheckOtherImpl::variableScopeError(const Token *tok, const std::string &varname)
 {
     reportError(tok,
                 Severity::style,
@@ -1350,10 +1479,10 @@ void CheckOther::variableScopeError(const Token *tok, const std::string &varname
 //---------------------------------------------------------------------------
 // Comma in return statement: return a+1, b++;. (experimental)
 //---------------------------------------------------------------------------
-void CheckOther::checkCommaSeparatedReturn()
+void CheckOtherImpl::checkCommaSeparatedReturn()
 {
-    // This is experimental for now. See #5076
-    if ((true) || !mSettings->severity.isEnabled(Severity::style)) // NOLINT(readability-simplify-boolean-expr)
+    // TODO: This is experimental for now. See #5076
+    if ((true) || !mSettings.severity.isEnabled(Severity::style)) // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         return;
 
     // logChecker
@@ -1377,7 +1506,7 @@ void CheckOther::checkCommaSeparatedReturn()
     }
 }
 
-void CheckOther::commaSeparatedReturnError(const Token *tok)
+void CheckOtherImpl::commaSeparatedReturnError(const Token *tok)
 {
     reportError(tok,
                 Severity::style,
@@ -1390,13 +1519,15 @@ void CheckOther::commaSeparatedReturnError(const Token *tok)
                 "    if (x)\n"
                 "        return a + 1,\n"
                 "    b++;\n"
-                "However it can be useful to use comma in macros. Cppcheck does not warn when such a "
+                "However it can be useful to use comma in macros. No warning is reported when such a "
                 "macro is then used in a return statement, it is less likely such code is misunderstood.", CWE398, Certainty::normal);
 }
 
 static bool isLargeContainer(const Variable* var, const Settings& settings)
 {
     const ValueType* vt = var->valueType();
+    if (vt->container->startPattern == "std :: initializer_list <")
+        return false;
     if (vt->container->size_templateArgNo < 0)
         return true;
     const std::size_t maxByValueSize = 2 * settings.platform.sizeof_pointer;
@@ -1408,14 +1539,14 @@ static bool isLargeContainer(const Variable* var, const Settings& settings)
         return false;
     }
     const ValueType vtElem = ValueType::parseDecl(vt->containerTypeToken, settings);
-    const auto elemSize = std::max<std::size_t>(ValueFlow::getSizeOf(vtElem, settings), 1);
+    const auto elemSize = std::max<std::size_t>(vtElem.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer), 1);
     const auto arraySize = var->dimension(0) * elemSize;
     return arraySize > maxByValueSize;
 }
 
-void CheckOther::checkPassByReference()
+void CheckOtherImpl::checkPassByReference()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance) || mTokenizer->isC())
+    if (!mSettings.severity.isEnabled(Severity::performance) || mTokenizer->isC())
         return;
 
     logChecker("CheckOther::checkPassByReference"); // performance,c++
@@ -1441,26 +1572,41 @@ void CheckOther::checkPassByReference()
         bool inconclusive = false;
 
         const bool isContainer = var->valueType() && var->valueType()->type == ValueType::Type::CONTAINER && var->valueType()->container && !var->valueType()->container->view;
-        if (isContainer && !isLargeContainer(var, *mSettings))
+        if (isContainer && !isLargeContainer(var, mSettings))
             continue;
         if (!isContainer) {
             if (var->type() && !var->type()->isEnumType()) { // Check if type is a struct or class.
                 // Ensure that it is a large object.
                 if (!var->type()->classScope)
                     inconclusive = true;
-                else if (!var->valueType() || ValueFlow::getSizeOf(*var->valueType(), *mSettings) <= 2 * mSettings->platform.sizeof_pointer)
+                else if (!var->valueType() || var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer) <= 2 * mSettings.platform.sizeof_pointer)
                     continue;
             }
             else
                 continue;
         }
 
-        if (inconclusive && !mSettings->certainty.isEnabled(Certainty::inconclusive))
+        if (inconclusive && !mSettings.certainty.isEnabled(Certainty::inconclusive))
             continue;
 
         if (var->isArray() && (!var->isStlType() || Token::simpleMatch(var->nameToken()->next(), "[")))
             continue;
 
+        if (var->isArgument()) {
+            const Token *tok = var->typeStartToken();
+            for (; tok; tok = tok->next()) {
+                if (Token::simpleMatch(tok, "(")) {
+                    tok = tok->link();
+                    continue;
+                }
+                if (Token::simpleMatch(tok, ")"))
+                    break;
+            }
+
+            if (Token::simpleMatch(tok, ") ;"))
+                continue;
+        }
+
         const bool isConst = var->isConst();
         if (isConst) {
             passedByValueError(var, inconclusive, isRangeBasedFor);
@@ -1471,13 +1617,13 @@ void CheckOther::checkPassByReference()
         if (!isRangeBasedFor && (!var->scope() || var->scope()->function->isImplicitlyVirtual()))
             continue;
 
-        if (!isVariableChanged(var, *mSettings)) {
+        if (!isVariableChanged(var, mSettings)) {
             passedByValueError(var, inconclusive, isRangeBasedFor);
         }
     }
 }
 
-void CheckOther::passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor)
+void CheckOtherImpl::passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor)
 {
     std::string id = isRangeBasedFor ? "iterateByValue" : "passedByValue";
     const std::string action = isRangeBasedFor ? "declared as": "passed by";
@@ -1496,7 +1642,7 @@ void CheckOther::passedByValueError(const Variable* var, bool inconclusive, bool
         msg += "\nVariable '$symbol' is used to iterate by value. It could be declared as a const reference which is usually faster and recommended in C++.";
     else
         msg += "\nParameter '$symbol' is passed by value. It could be passed as a const reference which is usually faster and recommended in C++.";
-    reportError(errorPath, Severity::performance, id.c_str(), msg, CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
+    reportError(std::move(errorPath), Severity::performance, id.c_str(), msg, CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
 static bool isVariableMutableInInitializer(const Token* start, const Token * end, nonneg int varid)
@@ -1527,9 +1673,24 @@ static bool isVariableMutableInInitializer(const Token* start, const Token * end
     return false;
 }
 
-void CheckOther::checkConstVariable()
+static bool isCastToVoid(const Variable* var)
 {
-    if ((!mSettings->severity.isEnabled(Severity::style) || mTokenizer->isC()) && !mSettings->isPremiumEnabled("constVariable"))
+    if (!var)
+        return false;
+    if (!var->scope())
+        return false;
+    for (const Token* tok = var->scope()->bodyStart; tok != var->scope()->bodyEnd; tok = tok->next()) {
+        if (tok->varId() != var->declarationId())
+            continue;
+        if (isVoidCast(tok->astParent()))
+            return true;
+    }
+    return false;
+}
+
+void CheckOtherImpl::checkConstVariable()
+{
+    if ((!mSettings.severity.isEnabled(Severity::style) || mTokenizer->isC()) && !mSettings.isPremiumEnabled("constVariable"))
         return;
 
     logChecker("CheckOther::checkConstVariable"); // style,c++
@@ -1575,7 +1736,9 @@ void CheckOther::checkConstVariable()
             continue;
         if (isStructuredBindingVariable(var)) // TODO: check all bound variables
             continue;
-        if (isVariableChanged(var, *mSettings))
+        if (isCastToVoid(var))
+            continue;
+        if (isVariableChanged(var, mSettings))
             continue;
         const bool hasFunction = function != nullptr;
         if (!hasFunction) {
@@ -1590,12 +1753,15 @@ void CheckOther::checkConstVariable()
                 if (retTok->varId() == var->declarationId())
                     return true;
                 while (retTok && retTok->isCast())
-                    retTok = retTok->astOperand2();
+                    retTok = retTok->astOperand2() ? retTok->astOperand2() : retTok->astOperand1();
                 while (Token::simpleMatch(retTok, "."))
                     retTok = retTok->astOperand2();
                 if (Token::simpleMatch(retTok, "&"))
                     retTok = retTok->astOperand1();
-                return ValueFlow::hasLifetimeToken(getParentLifetime(retTok), var->nameToken(), *mSettings);
+                ValueFlow::Value ltVal = ValueFlow::getLifetimeObjValue(retTok);
+                if (ltVal.isLifetimeValue() && ltVal.tokvalue->varId() == var->declarationId())
+                    return true;
+                return ValueFlow::hasLifetimeToken(getParentLifetime(retTok), var->nameToken(), mSettings);
             }))
                 continue;
         }
@@ -1604,9 +1770,13 @@ void CheckOther::checkConstVariable()
             //Is it the right side of an initialization of a non-const reference
             bool usedInAssignment = false;
             for (const Token* tok = var->nameToken(); tok != scope->bodyEnd && tok != nullptr; tok = tok->next()) {
-                if (Token::Match(tok, "& %var% = %varid%", var->declarationId())) {
-                    const Variable* refvar = tok->next()->variable();
-                    if (refvar && !refvar->isConst() && refvar->nameToken() == tok->next()) {
+                if (Token::Match(tok, "%name% = %varid%", var->declarationId())) {
+                    const Variable* refvar = tok->variable();
+                    if (tok->strAt(-1) == "&" && refvar && !refvar->isConst() && refvar->nameToken() == tok) {
+                        usedInAssignment = true;
+                        break;
+                    }
+                    if (!tok->valueType() || tok->valueType()->type == ValueType::Type::RECORD) {
                         usedInAssignment = true;
                         break;
                     }
@@ -1627,7 +1797,7 @@ void CheckOther::checkConstVariable()
                             continue;
                     } else if (const Token* ftok = getTokenArgumentFunction(tok, argn)) {
                         bool inconclusive{};
-                        if (var->valueType() && !isVariableChangedByFunctionCall(ftok, var->valueType()->pointer, var->declarationId(), *mSettings, &inconclusive) && !inconclusive)
+                        if (var->valueType() && !isVariableChangedByFunctionCall(ftok, var->valueType()->pointer, var->declarationId(), mSettings.library, &inconclusive) && !inconclusive)
                             continue;
                     }
                     usedInAssignment = true;
@@ -1695,13 +1865,29 @@ namespace {
     };
 }
 
-void CheckOther::checkConstPointer()
+static bool isCastToInteger(const Token* tok)
+{
+    return tok && tok->isCast() && tok->valueType() && tok->valueType()->isIntegral() && tok->valueType()->pointer == 0;
+}
+
+static const Function* getEnclosingFunction(const Variable* var)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) &&
-        !mSettings->isPremiumEnabled("constParameter") &&
-        !mSettings->isPremiumEnabled("constParameterPointer") &&
-        !mSettings->isPremiumEnabled("constParameterReference") &&
-        !mSettings->isPremiumEnabled("constVariablePointer"))
+    if (var->isArgument())
+        return var->scope()->function;
+    const Scope* scope = var->scope();
+    while (scope && scope->type != ScopeType::eFunction) {
+        scope = scope->nestedIn;
+    }
+    return scope ? scope->function : nullptr;
+}
+
+void CheckOtherImpl::checkConstPointer()
+{
+    if (!mSettings.severity.isEnabled(Severity::style) &&
+        !mSettings.isPremiumEnabled("constParameter") &&
+        !mSettings.isPremiumEnabled("constParameterPointer") &&
+        !mSettings.isPremiumEnabled("constParameterReference") &&
+        !mSettings.isPremiumEnabled("constVariablePointer"))
         return;
 
     logChecker("CheckOther::checkConstPointer"); // style
@@ -1713,11 +1899,16 @@ void CheckOther::checkConstPointer()
             continue;
         if (!var->isLocal() && !var->isArgument())
             continue;
+        if (var->isArgument() && var->scope() && var->scope()->type == ScopeType::eLambda && !Token::simpleMatch(var->scope()->bodyEnd, "} ("))
+            continue;
         const Token* const nameTok = var->nameToken();
-        if (tok == nameTok) {
+        if (tok == nameTok && var->isLocal() && !astIsRangeBasedForDecl(nameTok)) {
+            if (var->isReference() && var->isPointer()) {
+                nonConstPointers.emplace(var);
+                continue;
+            }
             // declarations of (static) pointers are (not) split up, array declarations are never split up
-            if (var->isLocal() && (!var->isStatic() || Token::simpleMatch(nameTok->next(), "[")) &&
-                !astIsRangeBasedForDecl(nameTok))
+            if ((!var->isStatic() || Token::simpleMatch(nameTok->next(), "[")))
                 continue;
         }
         // Skip function pointers
@@ -1747,18 +1938,29 @@ void CheckOther::checkConstPointer()
             deref = MEMBER;
         else if (astIsRangeBasedForDecl(tok))
             continue;
+        else if (isCastToInteger(parent))
+            continue;
         if (deref != NONE) {
             const Token* gparent = parent->astParent();
-            while (Token::simpleMatch(gparent, "[") && parent != gparent->astOperand2() && parent->str() == gparent->str())
+            while (Token::simpleMatch(gparent, "[") && parent != gparent->astOperand2())
+                gparent = gparent->astParent();
+            while (Token::Match(gparent, "[?:]"))
                 gparent = gparent->astParent();
             if (deref == MEMBER) {
                 if (!gparent)
                     continue;
-                if (parent->astOperand2()) {
-                    if (parent->astOperand2()->function() && parent->astOperand2()->function()->isConst())
+                const Token* funcParent = parent;
+                while (Token::simpleMatch(funcParent->astParent(), "."))
+                    funcParent = funcParent->astParent();
+                if (funcParent->astOperand2()) {
+                    if (funcParent->astOperand2()->function() && funcParent->astOperand2()->function()->isConst())
                         continue;
-                    if (mSettings->library.isFunctionConst(parent->astOperand2()))
+                    if (mSettings.library.isFunctionConst(funcParent->astOperand2()))
                         continue;
+                    if (funcParent->astOperand2()->varId()) {
+                        if (gparent->str() == "?" && astIsLHS(funcParent))
+                            continue;
+                    }
                 }
             }
             if (hasIncDecPlus) {
@@ -1769,7 +1971,7 @@ void CheckOther::checkConstPointer()
                 continue;
             int argn = -1;
             if (Token::simpleMatch(gparent, "return")) {
-                const Function* function = gparent->scope()->function;
+                const Function* function = getEnclosingFunction(var);
                 if (function && (!Function::returnsReference(function) || Function::returnsConst(function)))
                     continue;
             }
@@ -1779,7 +1981,7 @@ void CheckOther::checkConstPointer()
                 if (lhs && lhs->variable() && lhs->variable()->isReference() && lhs->variable()->nameToken() == lhs && !lhs->variable()->isConst())
                     takingRef = true;
                 if (lhs && lhs->valueType() && lhs->valueType()->pointer && (lhs->valueType()->constness & 1) == 0 &&
-                    parent->valueType() && parent->valueType()->pointer)
+                    parent->valueType() && parent->valueType()->pointer && lhs->variable() != var)
                     nonConstPtrAssignment = true;
                 if (!takingRef && !nonConstPtrAssignment)
                     continue;
@@ -1791,19 +1993,24 @@ void CheckOther::checkConstPointer()
                 continue;
             else if (const Token* ftok = getTokenArgumentFunction(parent, argn)) {
                 bool inconclusive{};
-                if (!isVariableChangedByFunctionCall(ftok->next(), vt->pointer, var->declarationId(), *mSettings, &inconclusive) && !inconclusive)
+                if (!isVariableChangedByFunctionCall(ftok->next(), vt->pointer, var->declarationId(), mSettings.library, &inconclusive) && !inconclusive)
                     continue;
             }
         } else {
             int argn = -1;
-            if (Token::Match(parent, "%oror%|%comp%|&&|?|!|-|<<"))
+            if (Token::Match(parent, "%oror%|%comp%|&&|?|!|-|<<|;"))
                 continue;
-            if (hasIncDecPlus && !parent->astParent())
+            if (hasIncDecPlus && (!parent->astParent() || parent->astParent()->str() == ";"))
                 continue;
             if (Token::simpleMatch(parent, "(") && Token::Match(parent->astOperand1(), "if|while"))
                 continue;
-            if (Token::simpleMatch(parent, "=") && parent->astOperand1() == tok)
-                continue;
+            if (Token::simpleMatch(parent, "=")) {
+                const Token* lhs = parent->astOperand1();
+                if (lhs == tok)
+                    continue;
+                if (lhs && lhs->valueType() && lhs->valueType()->isConst(vt->pointer))
+                    continue;
+            }
             if (const Token* ftok = getTokenArgumentFunction(tok, argn)) {
                 if (ftok->function()) {
                     const bool isCastArg = parent->isCast() && !ftok->function()->getOverloadedFunctions().empty(); // assume that cast changes the called function
@@ -1811,12 +2018,12 @@ void CheckOther::checkConstPointer()
                         const Variable* argVar = ftok->function()->getArgumentVar(argn);
                         if (argVar && argVar->valueType() && argVar->valueType()->isConst(vt->pointer)) {
                             bool inconclusive{};
-                            if (!isVariableChangedByFunctionCall(ftok, vt->pointer, var->declarationId(), *mSettings, &inconclusive) && !inconclusive)
+                            if (!isVariableChangedByFunctionCall(ftok, vt->pointer, var->declarationId(), mSettings.library, &inconclusive) && !inconclusive)
                                 continue;
                         }
                     }
                 } else {
-                    const auto dir = mSettings->library.getArgDirection(ftok, argn + 1);
+                    const auto dir = mSettings.library.getArgDirection(ftok, argn + 1);
                     if (dir == Library::ArgumentChecks::Direction::DIR_IN)
                         continue;
                 }
@@ -1830,8 +2037,11 @@ void CheckOther::checkConstPointer()
             nonConstPointers.emplace(var);
     }
     for (const Variable *p: pointers) {
+        bool foundAllBaseClasses = true;
         if (p->isArgument()) {
-            if (!p->scope() || !p->scope()->function || p->scope()->function->isImplicitlyVirtual(true) || p->scope()->function->hasVirtualSpecifier())
+            if (!p->scope() || !p->scope()->function || p->scope()->function->hasVirtualSpecifier())
+                continue;
+            if (p->scope()->function->isImplicitlyVirtual(true, &foundAllBaseClasses) && foundAllBaseClasses)
                 continue;
             if (p->isMaybeUnused())
                 continue;
@@ -1844,16 +2054,16 @@ void CheckOther::checkConstPointer()
             // const int indirect = p->isArray() ? p->dimensions().size() : 1;
             // if (isVariableChanged(start, p->scope()->bodyEnd, indirect, p->declarationId(), false, *mSettings))
             //     continue;
-            if (!isConstPointerVariable(p, *mSettings))
+            if (!isConstPointerVariable(p, mSettings))
                 continue;
             if (p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
                 continue;
-            constVariableError(p, p->isArgument() ? p->scope()->function : nullptr);
+            constVariableError(p, p->isArgument() ? p->scope()->function : nullptr, foundAllBaseClasses);
         }
     }
 }
 
-void CheckOther::constVariableError(const Variable *var, const Function *function)
+void CheckOtherImpl::constVariableError(const Variable *var, const Function *function, bool foundAllBaseClasses)
 {
     if (!var) {
         reportError(nullptr, Severity::style, "constParameter", "Parameter 'x' can be declared with const");
@@ -1866,13 +2076,18 @@ void CheckOther::constVariableError(const Variable *var, const Function *functio
         return;
     }
 
-    const std::string vartype(var->isArgument() ? "Parameter" : "Variable");
+    std::string vartype(var->isArgument() ? "Parameter" : "Variable");
     const std::string& varname(var->name());
     const std::string ptrRefArray = var->isArray() ? "const array" : (var->isPointer() ? "pointer to const" : "reference to const");
 
     ErrorPath errorPath;
     std::string id = "const" + vartype;
-    std::string message = "$symbol:" + varname + "\n" + vartype + " '$symbol' can be declared as " + ptrRefArray;
+    std::string message = "$symbol:" + varname + "\n";
+    if (!foundAllBaseClasses) {
+        message += "Either there is a missing override/final keyword, or the ";
+        vartype[0] = std::tolower(vartype[0]);
+    }
+    message += vartype + " '$symbol' can be declared as " + ptrRefArray;
     errorPath.emplace_back(var->nameToken(), message);
     if (var->isArgument() && function && function->functionPointerUsage) {
         errorPath.emplace_front(function->functionPointerUsage, "You might need to cast the function pointer here");
@@ -1884,17 +2099,17 @@ void CheckOther::constVariableError(const Variable *var, const Function *functio
         id += "Pointer";
     }
 
-    reportError(errorPath, Severity::style, id.c_str(), message, CWE398, Certainty::normal);
+    reportError(std::move(errorPath), Severity::style, id.c_str(), message, CWE398, Certainty::normal);
 }
 
 //---------------------------------------------------------------------------
 // Check usage of char variables..
 //---------------------------------------------------------------------------
 
-void CheckOther::checkCharVariable()
+void CheckOtherImpl::checkCharVariable()
 {
-    const bool warning = mSettings->severity.isEnabled(Severity::warning);
-    const bool portability = mSettings->severity.isEnabled(Severity::portability);
+    const bool warning = mSettings.severity.isEnabled(Severity::warning);
+    const bool portability = mSettings.severity.isEnabled(Severity::portability);
     if (!warning && !portability)
         return;
 
@@ -1909,24 +2124,24 @@ void CheckOther::checkCharVariable()
                 if (!tok->variable()->isArray() && !tok->variable()->isPointer())
                     continue;
                 const Token *index = tok->next()->astOperand2();
-                if (warning && tok->variable()->isArray() && astIsSignedChar(index) && index->getValueGE(0x80, *mSettings))
+                if (warning && tok->variable()->isArray() && astIsSignedChar(index) && index->getValueGE(0x80, mSettings))
                     signedCharArrayIndexError(tok);
-                if (portability && astIsUnknownSignChar(index) && index->getValueGE(0x80, *mSettings))
+                if (portability && astIsUnknownSignChar(index) && index->getValueGE(0x80, mSettings))
                     unknownSignCharArrayIndexError(tok);
             } else if (warning && Token::Match(tok, "[&|^]") && tok->isBinaryOp()) {
                 bool warn = false;
                 if (astIsSignedChar(tok->astOperand1())) {
-                    const ValueFlow::Value *v1 = tok->astOperand1()->getValueLE(-1, *mSettings);
+                    const ValueFlow::Value *v1 = tok->astOperand1()->getValueLE(-1, mSettings);
                     const ValueFlow::Value *v2 = tok->astOperand2()->getMaxValue(false);
                     if (!v1)
-                        v1 = tok->astOperand1()->getValueGE(0x80, *mSettings);
+                        v1 = tok->astOperand1()->getValueGE(0x80, mSettings);
                     if (v1 && !(tok->str() == "&" && v2 && v2->isKnown() && v2->intvalue >= 0 && v2->intvalue < 0x100))
                         warn = true;
                 } else if (astIsSignedChar(tok->astOperand2())) {
-                    const ValueFlow::Value *v1 = tok->astOperand2()->getValueLE(-1, *mSettings);
+                    const ValueFlow::Value *v1 = tok->astOperand2()->getValueLE(-1, mSettings);
                     const ValueFlow::Value *v2 = tok->astOperand1()->getMaxValue(false);
                     if (!v1)
-                        v1 = tok->astOperand2()->getValueGE(0x80, *mSettings);
+                        v1 = tok->astOperand2()->getValueGE(0x80, mSettings);
                     if (v1 && !(tok->str() == "&" && v2 && v2->isKnown() && v2->intvalue >= 0 && v2->intvalue < 0x100))
                         warn = true;
                 }
@@ -1942,7 +2157,7 @@ void CheckOther::checkCharVariable()
     }
 }
 
-void CheckOther::signedCharArrayIndexError(const Token *tok)
+void CheckOtherImpl::signedCharArrayIndexError(const Token *tok)
 {
     reportError(tok,
                 Severity::warning,
@@ -1953,7 +2168,7 @@ void CheckOther::signedCharArrayIndexError(const Token *tok)
                 "because of sign extension.", CWE128, Certainty::normal);
 }
 
-void CheckOther::unknownSignCharArrayIndexError(const Token *tok)
+void CheckOtherImpl::unknownSignCharArrayIndexError(const Token *tok)
 {
     reportError(tok,
                 Severity::portability,
@@ -1963,7 +2178,7 @@ void CheckOther::unknownSignCharArrayIndexError(const Token *tok)
                 "treated depending on whether 'char' is signed or unsigned on target platform.", CWE758, Certainty::normal);
 }
 
-void CheckOther::charBitOpError(const Token *tok)
+void CheckOtherImpl::charBitOpError(const Token *tok)
 {
     reportError(tok,
                 Severity::warning,
@@ -2025,7 +2240,7 @@ static bool isConstant(const Token* tok) {
     return tok && (tok->isEnumerator() || Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL"));
 }
 
-static bool isConstStatement(const Token *tok, const Library& library, bool isNestedBracket = false)
+static bool isConstStatement(const Token *tok, const Library& library, bool platformIndependent, bool isNestedBracket = false)
 {
     if (!tok)
         return false;
@@ -2047,23 +2262,26 @@ static bool isConstStatement(const Token *tok, const Library& library, bool isNe
         tok2 = tok2->astParent();
     }
     if (Token::Match(tok, "&&|%oror%"))
-        return isConstStatement(tok->astOperand1(), library) && isConstStatement(tok->astOperand2(), library);
+        return isConstStatement(tok->astOperand1(), library, platformIndependent) && isConstStatement(tok->astOperand2(), library, platformIndependent);
     if (Token::Match(tok, "!|~|%cop%") && (tok->astOperand1() || tok->astOperand2()))
         return true;
     if (Token::simpleMatch(tok->previous(), "sizeof ("))
+        return !platformIndependent;
+    if (Token::Match(tok->previous(), "alignof|noexcept|typeid (") && tok->previous()->isKeyword())
         return true;
     if (isCPPCast(tok)) {
         if (Token::simpleMatch(tok->astOperand1(), "dynamic_cast") && Token::simpleMatch(tok->astOperand1()->linkAt(1)->previous(), "& >"))
             return false;
-        return isWithoutSideEffects(tok) && isConstStatement(tok->astOperand2(), library);
+        return isWithoutSideEffects(tok) && isConstStatement(tok->astOperand2(), library, platformIndependent);
     }
     if (tok->isCast() && tok->next() && tok->next()->isStandardType())
-        return isWithoutSideEffects(tok->astOperand1()) && isConstStatement(tok->astOperand1(), library);
+        return isWithoutSideEffects(tok->astOperand1()) && isConstStatement(tok->astOperand1(), library, platformIndependent);
     if (Token::simpleMatch(tok, "."))
-        return isConstStatement(tok->astOperand2(), library);
+        return isConstStatement(tok->astOperand2(), library, platformIndependent);
     if (Token::simpleMatch(tok, ",")) {
         if (tok->astParent()) // warn about const statement on rhs at the top level
-            return isConstStatement(tok->astOperand1(), library) && isConstStatement(tok->astOperand2(), library);
+            return isConstStatement(tok->astOperand1(), library, platformIndependent) &&
+                   isConstStatement(tok->astOperand2(), library, platformIndependent);
 
         const Token* lml = previousBeforeAstLeftmostLeaf(tok); // don't warn about matrix/vector assignment (e.g. Eigen)
         if (lml)
@@ -2071,18 +2289,21 @@ static bool isConstStatement(const Token *tok, const Library& library, bool isNe
         const Token* stream = lml;
         while (stream && Token::Match(stream->astParent(), ".|[|(|*"))
             stream = stream->astParent();
-        return (!stream || !isLikelyStream(stream)) && isConstStatement(tok->astOperand2(), library);
+        return (!stream || !isLikelyStream(stream)) && isConstStatement(tok->astOperand2(), library, platformIndependent);
     }
     if (Token::simpleMatch(tok, "?") && Token::simpleMatch(tok->astOperand2(), ":")) // ternary operator
-        return isConstStatement(tok->astOperand1(), library) && isConstStatement(tok->astOperand2()->astOperand1(), library) && isConstStatement(tok->astOperand2()->astOperand2(), library);
+        return isConstStatement(tok->astOperand1(), library, platformIndependent) &&
+               isConstStatement(tok->astOperand2()->astOperand1(), library, platformIndependent) &&
+               isConstStatement(tok->astOperand2()->astOperand2(), library, platformIndependent);
     if (isBracketAccess(tok) && isWithoutSideEffects(tok->astOperand1(), /*checkArrayAccess*/ true, /*checkReference*/ false)) {
         const bool isChained = succeeds(tok->astParent(), tok);
         if (Token::simpleMatch(tok->astParent(), "[")) {
             if (isChained)
-                return isConstStatement(tok->astOperand2(), library) && isConstStatement(tok->astParent(), library);
-            return isNestedBracket && isConstStatement(tok->astOperand2(), library);
+                return isConstStatement(tok->astOperand2(), library, platformIndependent) &&
+                       isConstStatement(tok->astParent(), library, platformIndependent);
+            return isNestedBracket && isConstStatement(tok->astOperand2(), library, platformIndependent);
         }
-        return isConstStatement(tok->astOperand2(), library, /*isNestedBracket*/ !isChained);
+        return isConstStatement(tok->astOperand2(), library, platformIndependent, /*isNestedBracket*/ !isChained);
     }
     if (!tok->astParent() && findLambdaEndToken(tok))
         return true;
@@ -2106,18 +2327,12 @@ static bool isConstStatement(const Token *tok, const Library& library, bool isNe
 
 static bool isVoidStmt(const Token *tok)
 {
-    if (Token::simpleMatch(tok, "( void"))
+    if (Token::simpleMatch(tok, "( void") && !(tok->astOperand1() && (tok->astOperand1()->isLiteral() || isNullOperand(tok->astOperand1()))))
         return true;
-    if (isCPPCast(tok) && tok->astOperand1() && Token::Match(tok->astOperand1()->next(), "< void *| >"))
+    if (isCPPCast(tok) && tok->astOperand1() && Token::Match(tok->astOperand1()->next(), "< void *| >") &&
+        !(tok->astOperand2() && (tok->astOperand2()->isLiteral() || isNullOperand(tok->astOperand2()))))
         return true;
-    const Token *tok2 = tok;
-    while (tok2->astOperand1())
-        tok2 = tok2->astOperand1();
-    if (Token::simpleMatch(tok2->previous(), ")") && Token::simpleMatch(tok2->linkAt(-1), "( void"))
-        return true;
-    if (Token::simpleMatch(tok2, "( void"))
-        return true;
-    return Token::Match(tok2->previous(), "delete|throw|return");
+    return false;
 }
 
 static bool isConstTop(const Token *tok)
@@ -2144,10 +2359,10 @@ static bool isConstTop(const Token *tok)
     return false;
 }
 
-void CheckOther::checkIncompleteStatement()
+void CheckOtherImpl::checkIncompleteStatement()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) &&
-        !mSettings->isPremiumEnabled("constStatement"))
+    if (!mSettings.severity.isEnabled(Severity::warning) &&
+        !mSettings.isPremiumEnabled("constStatement"))
         return;
 
     logChecker("CheckOther::checkIncompleteStatement"); // warning
@@ -2185,32 +2400,29 @@ void CheckOther::checkIncompleteStatement()
         if (!Token::simpleMatch(tok->astParent(), ";") && !Token::simpleMatch(rtok, ";") &&
             !Token::Match(tok->previous(), ";|}|{ %any% ;") &&
             !(tok->isCpp() && tok->isCast() && !tok->astParent()) &&
+            !(!tok->astParent() && tok->astOperand1() && Token::Match(tok->previous(), "%name% (") && tok->previous()->isKeyword()) &&
             !Token::simpleMatch(tok->tokAt(-2), "for (") &&
             !Token::Match(tok->tokAt(-1), "%var% [") &&
             !(tok->str() == "," && tok->astParent() && tok->astParent()->isAssignmentOp()))
             continue;
         // Skip statement expressions
-        if (Token::simpleMatch(rtok, "; } )"))
+        if (Token::simpleMatch(rtok, "; } )") || Token::simpleMatch(tok->next(), "; } )"))
             continue;
-        if (!isConstStatement(tok, mSettings->library))
+        if (!isConstStatement(tok, mSettings.library, false))
             continue;
         if (isVoidStmt(tok))
             continue;
         if (tok->isCpp() && tok->str() == "&" && !(tok->astOperand1() && tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->isIntegral()))
             // Possible archive
             continue;
-        const bool inconclusive = tok->isConstOp() && !mSettings->isPremiumEnabled("constStatement");
-        if (mSettings->certainty.isEnabled(Certainty::inconclusive) || !inconclusive)
+        const bool inconclusive = tok->isConstOp() && !mSettings.isPremiumEnabled("constStatement");
+        if (mSettings.certainty.isEnabled(Certainty::inconclusive) || !inconclusive)
             constStatementError(tok, tok->isNumber() ? "numeric" : "string", inconclusive);
     }
 }
 
-void CheckOther::constStatementError(const Token *tok, const std::string &type, bool inconclusive)
+void CheckOtherImpl::constStatementError(const Token *tok, const std::string &type, bool inconclusive)
 {
-    const Token *valueTok = tok;
-    while (valueTok && valueTok->isCast())
-        valueTok = valueTok->astOperand2() ? valueTok->astOperand2() : valueTok->astOperand1();
-
     std::string msg;
     if (Token::simpleMatch(tok, "=="))
         msg = "Found suspicious equality comparison. Did you intend to assign a value instead?";
@@ -2218,26 +2430,24 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
         msg = "Found suspicious operator '" + tok->str() + "', result is not used.";
     else if (Token::Match(tok, "%var%"))
         msg = "Unused variable value '" + tok->str() + "'";
-    else if (isConstant(valueTok)) {
+    else if (isConstant(tok)) {
         std::string typeStr("string");
-        if (valueTok->isNumber())
+        if (tok->isNumber())
             typeStr = "numeric";
-        else if (valueTok->isBoolean())
+        else if (tok->isBoolean())
             typeStr = "bool";
-        else if (valueTok->tokType() == Token::eChar)
+        else if (tok->tokType() == Token::eChar)
             typeStr = "character";
-        else if (isNullOperand(valueTok))
-            typeStr = "NULL";
-        else if (valueTok->isEnumerator())
+        else if (isNullOperand(tok))
+            typeStr = "null";
+        else if (tok->isEnumerator())
             typeStr = "enumerator";
         msg = "Redundant code: Found a statement that begins with " + typeStr + " constant.";
     }
     else if (!tok)
         msg = "Redundant code: Found a statement that begins with " + type + " constant.";
-    else if (tok->isCast() && tok->tokType() == Token::Type::eExtendedOp) {
-        msg = "Redundant code: Found unused cast ";
-        msg += valueTok ? "of expression '" + valueTok->expressionString() + "'." : "expression.";
-    }
+    else if (tok->isCast() && tok->tokType() == Token::Type::eExtendedOp)
+        msg = "Redundant code: Found unused cast in expression '" + tok->expressionString() + "'.";
     else if (tok->str() == "?" && tok->tokType() == Token::Type::eExtendedOp)
         msg = "Redundant code: Found unused result of ternary operator.";
     else if (tok->str() == "." && tok->tokType() == Token::Type::eOther)
@@ -2248,7 +2458,9 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
         msg = "Redundant code: Found unused lambda.";
     else if (Token::Match(tok, "%name%|::"))
         msg = "Redundant code: Found unused function.";
-    else if (mSettings->debugwarnings) {
+    else if (Token::Match(tok->previous(), "%name% ("))
+        msg = "Redundant code: Found unused '" + tok->strAt(-1) + "' expression.";
+    else if (mSettings.debugwarnings) {
         reportError(tok, Severity::debug, "debug", "constStatementError not handled.");
         return;
     }
@@ -2258,7 +2470,7 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
 //---------------------------------------------------------------------------
 // Detect division by zero.
 //---------------------------------------------------------------------------
-void CheckOther::checkZeroDivision()
+void CheckOtherImpl::checkZeroDivision()
 {
     logChecker("CheckOther::checkZeroDivision");
 
@@ -2274,12 +2486,12 @@ void CheckOther::checkZeroDivision()
 
         // Value flow..
         const ValueFlow::Value *value = tok->astOperand2()->getValue(0LL);
-        if (value && mSettings->isEnabled(value, false))
+        if (value && mSettings.isEnabled(value, false))
             zerodivError(tok, value);
     }
 }
 
-void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
+void CheckOtherImpl::zerodivError(const Token *tok, const ValueFlow::Value *value)
 {
     if (!tok && !value) {
         reportError(tok, Severity::error, "zerodiv", "Division by zero.", CWE369, Certainty::normal);
@@ -2287,7 +2499,7 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
         return;
     }
 
-    const ErrorPath errorPath = getErrorPath(tok, value, "Division by zero");
+    ErrorPath errorPath = getErrorPath(tok, value, "Division by zero");
 
     std::ostringstream errmsg;
     if (value->condition) {
@@ -2297,7 +2509,7 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
     } else
         errmsg << "Division by zero.";
 
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 value->errorSeverity() ? Severity::error : Severity::warning,
                 value->condition ? "zerodivcond" : "zerodiv",
                 errmsg.str(), CWE369, value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
@@ -2308,9 +2520,9 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
 // double d = 1.0 / 0.0 + 100.0;
 //---------------------------------------------------------------------------
 
-void CheckOther::checkNanInArithmeticExpression()
+void CheckOtherImpl::checkNanInArithmeticExpression()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("nanInArithmeticExpression"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("nanInArithmeticExpression"))
         return;
     logChecker("CheckOther::checkNanInArithmeticExpression"); // style
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -2323,7 +2535,7 @@ void CheckOther::checkNanInArithmeticExpression()
     }
 }
 
-void CheckOther::nanInArithmeticExpressionError(const Token *tok)
+void CheckOtherImpl::nanInArithmeticExpressionError(const Token *tok)
 {
     reportError(tok, Severity::style, "nanInArithmeticExpression",
                 "Using NaN/Inf in a computation.\n"
@@ -2334,13 +2546,13 @@ void CheckOther::nanInArithmeticExpressionError(const Token *tok)
 //---------------------------------------------------------------------------
 // Creating instance of classes which are destroyed immediately
 //---------------------------------------------------------------------------
-void CheckOther::checkMisusedScopedObject()
+void CheckOtherImpl::checkMisusedScopedObject()
 {
     // Skip this check for .c files
     if (mTokenizer->isC())
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedScopedObject"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedScopedObject"))
         return;
 
     logChecker("CheckOther::checkMisusedScopedObject"); // style,c++
@@ -2367,10 +2579,10 @@ void CheckOther::checkMisusedScopedObject()
     };
 
     auto isLibraryConstructor = [&](const Token* tok, const std::string& typeStr) -> bool {
-        const Library::TypeCheck typeCheck = mSettings->library.getTypeCheck("unusedvar", typeStr);
+        const Library::TypeCheck typeCheck = mSettings.library.getTypeCheck("unusedvar", typeStr);
         if (typeCheck == Library::TypeCheck::check || typeCheck == Library::TypeCheck::checkFiniteLifetime)
             return true;
-        return mSettings->library.detectContainerOrIterator(tok);
+        return mSettings.library.detectContainerOrIterator(tok);
     };
 
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -2385,7 +2597,7 @@ void CheckOther::checkMisusedScopedObject()
                 if (Token::simpleMatch(parTok, "<") && parTok->link())
                     parTok = parTok->link()->next();
                 if (const Token* arg = parTok->astOperand2()) {
-                    if (!isConstStatement(arg, mSettings->library))
+                    if (!isConstStatement(arg, mSettings.library, false))
                         continue;
                     if (parTok->str() == "(") {
                         if (arg->varId() && !(arg->variable() && arg->variable()->nameToken() != arg))
@@ -2409,7 +2621,7 @@ void CheckOther::checkMisusedScopedObject()
     }
 }
 
-void CheckOther::misusedScopeObjectError(const Token *tok, const std::string& varname, bool isAssignment)
+void CheckOtherImpl::misusedScopeObjectError(const Token *tok, const std::string& varname, bool isAssignment)
 {
     std::string msg = "Instance of '$symbol' object is destroyed immediately";
     msg += isAssignment ? ", assignment has no effect." : ".";
@@ -2434,7 +2646,7 @@ static const Token * getSingleExpressionInBlock(const Token * tok)
 // check for duplicate code in if and else branches
 // if (a) { b = true; } else { b = true; }
 //-----------------------------------------------------------------------------
-void CheckOther::checkDuplicateBranch()
+void CheckOtherImpl::checkDuplicateBranch()
 {
     // This is inconclusive since in practice most warnings are noise:
     // * There can be unfixed low-priority todos. The code is fine as it
@@ -2444,7 +2656,7 @@ void CheckOther::checkDuplicateBranch()
     //   and their conditional code is a duplicate of the condition that
     //   is always true just in case it would be false. See for instance
     //   abiword.
-    if (!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.severity.isEnabled(Severity::style) || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckOther::checkDuplicateBranch"); // style,inconclusive
@@ -2490,7 +2702,7 @@ void CheckOther::checkDuplicateBranch()
                 const std::string branch2 = tokElse->stringifyList(scope.bodyEnd->linkAt(2));
 
                 // check for duplicates
-                if (branch1 == branch2) {
+                if (branch1 == branch2 && branch1 != ";") {
                     duplicateBranchError(scope.classDef, scope.bodyEnd->next(), ErrorPath{});
                     continue;
                 }
@@ -2506,19 +2718,19 @@ void CheckOther::checkDuplicateBranch()
             if (branchTop1->str() != branchTop2->str())
                 continue;
             ErrorPath errorPath;
-            if (isSameExpression(false, branchTop1->astOperand1(), branchTop2->astOperand1(), *mSettings, true, true, &errorPath) &&
-                isSameExpression(false, branchTop1->astOperand2(), branchTop2->astOperand2(), *mSettings, true, true, &errorPath))
+            if (isSameExpression(false, branchTop1->astOperand1(), branchTop2->astOperand1(), mSettings, true, true, &errorPath) &&
+                isSameExpression(false, branchTop1->astOperand2(), branchTop2->astOperand2(), mSettings, true, true, &errorPath))
                 duplicateBranchError(scope.classDef, scope.bodyEnd->next(), std::move(errorPath));
         }
     }
 }
 
-void CheckOther::duplicateBranchError(const Token *tok1, const Token *tok2, ErrorPath errors)
+void CheckOtherImpl::duplicateBranchError(const Token *tok1, const Token *tok2, ErrorPath errors)
 {
     errors.emplace_back(tok2, "");
     errors.emplace_back(tok1, "");
 
-    reportError(errors, Severity::style, "duplicateBranch", "Found duplicate branches for 'if' and 'else'.\n"
+    reportError(std::move(errors), Severity::style, "duplicateBranch", "Found duplicate branches for 'if' and 'else'.\n"
                 "Finding the same code in an 'if' and related 'else' branch is suspicious and "
                 "might indicate a cut and paste or logic error. Please examine this code "
                 "carefully to determine if it is correct.", CWE398, Certainty::inconclusive);
@@ -2530,21 +2742,21 @@ void CheckOther::duplicateBranchError(const Token *tok1, const Token *tok2, Erro
 // char* p = malloc(100);
 // free(p + 10);
 //-----------------------------------------------------------------------------
-void CheckOther::checkInvalidFree()
+void CheckOtherImpl::checkInvalidFree()
 {
     std::map<int, bool> inconclusive;
     std::map<int, std::string> allocation;
 
     logChecker("CheckOther::checkInvalidFree");
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok && tok != scope->bodyEnd; tok = tok->next()) {
 
             // Keep track of which variables were assigned addresses to newly-allocated memory
             if ((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
-                (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) {
+                (Token::Match(tok, "%var% = %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2)))) {
                 allocation.emplace(tok->varId(), tok->strAt(2));
                 inconclusive.emplace(tok->varId(), false);
             }
@@ -2572,7 +2784,7 @@ void CheckOther::checkInvalidFree()
 
             // If a variable that was previously assigned a newly-allocated memory location is
             // added or subtracted from when used to free the memory, report an error.
-            else if ((Token::Match(tok, "%name% ( %any% +|-") && mSettings->library.getDeallocFuncInfo(tok)) ||
+            else if ((Token::Match(tok, "%name% ( %any% +|-") && mSettings.library.getDeallocFuncInfo(tok)) ||
                      Token::Match(tok, "delete [ ] ( %any% +|-") ||
                      Token::Match(tok, "delete %any% +|- %any%")) {
 
@@ -2592,7 +2804,7 @@ void CheckOther::checkInvalidFree()
             // If the previously-allocated variable is passed in to another function
             // as a parameter, it might be modified, so we shouldn't report an error
             // if it is later used to free memory
-            else if (Token::Match(tok, "%name% (") && !mSettings->library.isFunctionConst(tok->str(), true)) {
+            else if (Token::Match(tok, "%name% (") && !mSettings.library.isFunctionConst(tok->str(), true)) {
                 const Token* tok2 = Token::findmatch(tok->next(), "%var%", tok->linkAt(1));
                 while (tok2 != nullptr) {
                     allocation.erase(tok->varId());
@@ -2604,7 +2816,7 @@ void CheckOther::checkInvalidFree()
     }
 }
 
-void CheckOther::invalidFreeError(const Token *tok, const std::string &allocation, bool inconclusive)
+void CheckOtherImpl::invalidFreeError(const Token *tok, const std::string &allocation, bool inconclusive)
 {
     std::string alloc = allocation;
     if (alloc != "new")
@@ -2663,17 +2875,17 @@ isStaticAssert(const Settings &settings, const Token *tok)
     return false;
 }
 
-void CheckOther::checkDuplicateExpression()
+void CheckOtherImpl::checkDuplicateExpression()
 {
     {
-        const bool styleEnabled = mSettings->severity.isEnabled(Severity::style);
-        const bool premiumEnabled = mSettings->isPremiumEnabled("oppositeExpression") ||
-                                    mSettings->isPremiumEnabled("duplicateExpression") ||
-                                    mSettings->isPremiumEnabled("duplicateAssignExpression") ||
-                                    mSettings->isPremiumEnabled("duplicateExpressionTernary") ||
-                                    mSettings->isPremiumEnabled("duplicateValueTernary") ||
-                                    mSettings->isPremiumEnabled("selfAssignment") ||
-                                    mSettings->isPremiumEnabled("knownConditionTrueFalse");
+        const bool styleEnabled = mSettings.severity.isEnabled(Severity::style);
+        const bool premiumEnabled = mSettings.isPremiumEnabled("oppositeExpression") ||
+                                    mSettings.isPremiumEnabled("duplicateExpression") ||
+                                    mSettings.isPremiumEnabled("duplicateAssignExpression") ||
+                                    mSettings.isPremiumEnabled("duplicateExpressionTernary") ||
+                                    mSettings.isPremiumEnabled("duplicateValueTernary") ||
+                                    mSettings.isPremiumEnabled("selfAssignment") ||
+                                    mSettings.isPremiumEnabled("knownConditionTrueFalse");
 
         if (!styleEnabled && !premiumEnabled)
             return;
@@ -2711,8 +2923,8 @@ void CheckOther::checkDuplicateExpression()
                             Token::Match(tok->astOperand2()->previous(), "%name% (")
                             ) &&
                         tok->next()->tokType() != Token::eType &&
-                        isSameExpression(true, tok->next(), nextAssign->next(), *mSettings, true, false) &&
-                        isSameExpression(true, tok->astOperand2(), nextAssign->astOperand2(), *mSettings, true, false) &&
+                        isSameExpression(true, tok->next(), nextAssign->next(), mSettings, true, false) &&
+                        isSameExpression(true, tok->astOperand2(), nextAssign->astOperand2(), mSettings, true, false) &&
                         tok->astOperand2()->expressionString() == nextAssign->astOperand2()->expressionString()) {
                         bool differentDomain = false;
                         const Scope * varScope = var1->scope() ? var1->scope() : scope;
@@ -2730,7 +2942,7 @@ void CheckOther::checkDuplicateExpression()
                                 !isSameExpression(true,
                                                   tok->astOperand2(),
                                                   assignTok->astOperand1(),
-                                                  *mSettings,
+                                                  mSettings,
                                                   true,
                                                   true))
                                 continue;
@@ -2739,7 +2951,7 @@ void CheckOther::checkDuplicateExpression()
                                 !isSameExpression(true,
                                                   tok->astOperand2(),
                                                   assignTok->astOperand2(),
-                                                  *mSettings,
+                                                  mSettings,
                                                   true,
                                                   true))
                                 continue;
@@ -2748,7 +2960,7 @@ void CheckOther::checkDuplicateExpression()
                         }
                         if (!differentDomain && !isUniqueExpression(tok->astOperand2()))
                             duplicateAssignExpressionError(var1, var2, false);
-                        else if (mSettings->certainty.isEnabled(Certainty::inconclusive)) {
+                        else if (mSettings.certainty.isEnabled(Certainty::inconclusive)) {
                             diag(assignTok);
                             duplicateAssignExpressionError(var1, var2, true);
                         }
@@ -2765,20 +2977,23 @@ void CheckOther::checkDuplicateExpression()
             if (tok->isOp() && tok->astOperand1() && !Token::Match(tok, "+|*|<<|>>|+=|*=|<<=|>>=") && !isInsideLambdaCaptureList(tok)) {
                 if (Token::Match(tok, "==|!=|-") && astIsFloat(tok->astOperand1(), true))
                     continue;
+                if (tok->isArithmeticalOp() &&
+                    (tok->astOperand1()->isEnumerator() || (tok->astOperand2() && tok->astOperand2()->isEnumerator())))
+                    continue;
                 const bool pointerDereference = (tok->astOperand1() && tok->astOperand1()->isUnaryOp("*")) ||
                                                 (tok->astOperand2() && tok->astOperand2()->isUnaryOp("*"));
                 const bool followVar = (!isConstVarExpression(tok) || Token::Match(tok, "%comp%|%oror%|&&")) && !pointerDereference;
                 if (isSameExpression(true,
                                      tok->astOperand1(),
                                      tok->astOperand2(),
-                                     *mSettings,
+                                     mSettings,
                                      true,
                                      followVar,
                                      &errorPath)) {
                     if (isWithoutSideEffects(tok->astOperand1())) {
                         const Token* loopTok = isInLoopCondition(tok);
                         if (!loopTok ||
-                            !findExpressionChanged(tok, tok, loopTok->link()->linkAt(1), *mSettings)) {
+                            !findExpressionChanged(tok, tok, loopTok->link()->linkAt(1), mSettings)) {
                             const bool isEnum = tok->scope()->type == ScopeType::eEnum;
                             const bool assignment = !isEnum && tok->str() == "=";
                             if (assignment)
@@ -2789,7 +3004,9 @@ void CheckOther::checkDuplicateExpression()
                                     while (parent && parent->astParent()) {
                                         parent = parent->astParent();
                                     }
-                                    if (parent && parent->previous() && isStaticAssert(*mSettings, parent->previous())) {
+                                    if (parent && parent->previous() &&
+                                        (isStaticAssert(mSettings, parent->previous()) ||
+                                         Token::simpleMatch(parent->previous(), "assert"))) {
                                         continue;
                                     }
                                 }
@@ -2801,7 +3018,7 @@ void CheckOther::checkDuplicateExpression()
                            isSameExpression(false,
                                             tok->astOperand1(),
                                             tok->astOperand2()->astOperand1(),
-                                            *mSettings,
+                                            mSettings,
                                             true,
                                             false)) {
                     if (isWithoutSideEffects(tok->astOperand1())) {
@@ -2809,7 +3026,7 @@ void CheckOther::checkDuplicateExpression()
                     }
                 } else if (isOppositeExpression(tok->astOperand1(),
                                                 tok->astOperand2(),
-                                                *mSettings,
+                                                mSettings,
                                                 false,
                                                 true,
                                                 &errorPath) &&
@@ -2821,15 +3038,15 @@ void CheckOther::checkDuplicateExpression()
                         isSameExpression(true,
                                          tok->astOperand2(),
                                          tok->astOperand1()->astOperand2(),
-                                         *mSettings,
+                                         mSettings,
                                          true,
                                          followVar,
                                          &errorPath) &&
                         isWithoutSideEffects(tok->astOperand2()))
                         duplicateExpressionError(tok->astOperand2(), tok->astOperand1()->astOperand2(), tok, std::move(errorPath));
-                    else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings->library)) {
+                    else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings.library)) {
                         auto checkDuplicate = [&](const Token* exp1, const Token* exp2, const Token* ast1) {
-                            if (isSameExpression(true, exp1, exp2, *mSettings, true, true, &errorPath) &&
+                            if (isSameExpression(true, exp1, exp2, mSettings, true, true, &errorPath) &&
                                 isWithoutSideEffects(exp1) &&
                                 isWithoutSideEffects(ast1->astOperand2()))
                                 duplicateExpressionError(exp1, exp2, tok, errorPath, /*hasMultipleExpr*/ true);
@@ -2841,33 +3058,44 @@ void CheckOther::checkDuplicateExpression()
                                 checkDuplicate(ast1->astOperand1(), tok->astOperand2(), ast1);
                             ast1 = ast1->astOperand1();
                         }
+                        if (tok->str() != "=") {
+                            const Token* par = tok->astParent();
+                            while (par && tok->str() == par->str() && precedes(par->astOperand1(), tok)) { // chain of identical operators with parentheses
+                                checkDuplicate(par->astOperand1(), tok->astOperand1(), par);
+                                checkDuplicate(par->astOperand1(), tok->astOperand2(), par);
+                                checkDuplicate(par->astOperand2(), tok->astOperand1(), par);
+                                checkDuplicate(par->astOperand2(), tok->astOperand2(), par);
+                                par = par->astParent();
+                            }
+                        }
                     }
                 }
             } else if (tok->astOperand1() && tok->astOperand2() && tok->str() == ":" && tok->astParent() && tok->astParent()->str() == "?") {
-                if (!tok->astOperand1()->values().empty() && !tok->astOperand2()->values().empty() && isEqualKnownValue(tok->astOperand1(), tok->astOperand2()) &&
-                    !isVariableChanged(tok->astParent(), /*indirect*/ 0, *mSettings) &&
-                    isConstStatement(tok->astOperand1(), mSettings->library) && isConstStatement(tok->astOperand2(), mSettings->library))
-                    duplicateValueTernaryError(tok);
-                else if (isSameExpression(true, tok->astOperand1(), tok->astOperand2(), *mSettings, false, true, &errorPath))
+                if (isSameExpression(true, tok->astOperand1(), tok->astOperand2(), mSettings, false, true, &errorPath))
                     duplicateExpressionTernaryError(tok, std::move(errorPath));
+
+                else if (!tok->astOperand1()->values().empty() && !tok->astOperand2()->values().empty() && isEqualKnownValue(tok->astOperand1(), tok->astOperand2()) &&
+                         !isVariableChanged(tok->astParent(), /*indirect*/ 0, mSettings) &&
+                         isConstStatement(tok->astOperand1(), mSettings.library, true) && isConstStatement(tok->astOperand2(), mSettings.library, true))
+                    duplicateValueTernaryError(tok);
             }
         }
     }
 }
 
-void CheckOther::oppositeExpressionError(const Token *opTok, ErrorPath errors)
+void CheckOtherImpl::oppositeExpressionError(const Token *opTok, ErrorPath errors)
 {
     errors.emplace_back(opTok, "");
 
     const std::string& op = opTok ? opTok->str() : "&&";
 
-    reportError(errors, Severity::style, "oppositeExpression", "Opposite expression on both sides of \'" + op + "\'.\n"
+    reportError(std::move(errors), Severity::style, "oppositeExpression", "Opposite expression on both sides of \'" + op + "\'.\n"
                 "Finding the opposite expression on both sides of an operator is suspicious and might "
                 "indicate a cut and paste or logic error. Please examine this code carefully to "
                 "determine if it is correct.", CWE398, Certainty::normal);
 }
 
-void CheckOther::duplicateExpressionError(const Token *tok1, const Token *tok2, const Token *opTok, ErrorPath errors, bool hasMultipleExpr)
+void CheckOtherImpl::duplicateExpressionError(const Token *tok1, const Token *tok2, const Token *opTok, ErrorPath errors, bool hasMultipleExpr)
 {
     errors.emplace_back(opTok, "");
 
@@ -2889,13 +3117,13 @@ void CheckOther::duplicateExpressionError(const Token *tok1, const Token *tok2,
     if (expr1 != expr2 && !Token::Match(tok1, "%num%|NULL|nullptr") && !Token::Match(tok2, "%num%|NULL|nullptr"))
         msg += " because '" + expr1 + "' and '" + expr2 + "' represent the same value";
 
-    reportError(errors, Severity::style, id, msg +
+    reportError(std::move(errors), Severity::style, id, msg +
                 (std::string(".\nFinding the same expression ") + (hasMultipleExpr ? "more than once in a condition" : "on both sides of an operator")) +
                 " is suspicious and might indicate a cut and paste or logic error. Please examine this code carefully to "
                 "determine if it is correct.", CWE398, Certainty::normal);
 }
 
-void CheckOther::duplicateAssignExpressionError(const Token *tok1, const Token *tok2, bool inconclusive)
+void CheckOtherImpl::duplicateAssignExpressionError(const Token *tok1, const Token *tok2, bool inconclusive)
 {
     const std::list<const Token *> toks = { tok2, tok1 };
 
@@ -2909,22 +3137,22 @@ void CheckOther::duplicateAssignExpressionError(const Token *tok1, const Token *
                 "determine if it is correct.", CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::duplicateExpressionTernaryError(const Token *tok, ErrorPath errors)
+void CheckOtherImpl::duplicateExpressionTernaryError(const Token *tok, ErrorPath errors)
 {
     errors.emplace_back(tok, "");
-    reportError(errors, Severity::style, "duplicateExpressionTernary", "Same expression in both branches of ternary operator.\n"
+    reportError(std::move(errors), Severity::style, "duplicateExpressionTernary", "Same expression in both branches of ternary operator.\n"
                 "Finding the same expression in both branches of ternary operator is suspicious as "
                 "the same code is executed regardless of the condition.", CWE398, Certainty::normal);
 }
 
-void CheckOther::duplicateValueTernaryError(const Token *tok)
+void CheckOtherImpl::duplicateValueTernaryError(const Token *tok)
 {
     reportError(tok, Severity::style, "duplicateValueTernary", "Same value in both branches of ternary operator.\n"
                 "Finding the same value in both branches of ternary operator is suspicious as "
                 "the same code is executed regardless of the condition.", CWE398, Certainty::normal);
 }
 
-void CheckOther::selfAssignmentError(const Token *tok, const std::string &varname)
+void CheckOtherImpl::selfAssignmentError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::style,
                 "selfAssignment",
@@ -2941,9 +3169,9 @@ void CheckOther::selfAssignmentError(const Token *tok, const std::string &varnam
 // Reference:
 // - http://www.cplusplus.com/reference/cmath/
 //-----------------------------------------------------------------------------
-void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse()
+void CheckOtherImpl::checkComparisonFunctionIsAlwaysTrueOrFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse"); // warning
@@ -2971,7 +3199,7 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse()
         }
     }
 }
-void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* tok, const std::string &functionName, const std::string &varName, const bool result)
+void CheckOtherImpl::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* tok, const std::string &functionName, const std::string &varName, const bool result)
 {
     const std::string strResult = bool_to_string(result);
     const CWE cweResult = result ? CWE571 : CWE570;
@@ -2986,9 +3214,9 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* to
 //---------------------------------------------------------------------------
 // Check testing sign of unsigned variables and pointers.
 //---------------------------------------------------------------------------
-void CheckOther::checkSignOfUnsignedVariable()
+void CheckOtherImpl::checkSignOfUnsignedVariable()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsignedLessThanZero"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unsignedLessThanZero"))
         return;
 
     logChecker("CheckOther::checkSignOfUnsignedVariable"); // style
@@ -3017,7 +3245,7 @@ void CheckOther::checkSignOfUnsignedVariable()
     }
 }
 
-bool CheckOther::comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress)
+bool CheckOtherImpl::comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress)
 {
     if (!tok->isComparisonOp() || !tok->astOperand1() || !tok->astOperand2())
         return false;
@@ -3043,7 +3271,7 @@ bool CheckOther::comparisonNonZeroExpressionLessThanZero(const Token *tok, const
     return vt && (vt->pointer || vt->sign == ValueType::UNSIGNED);
 }
 
-bool CheckOther::testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr)
+bool CheckOtherImpl::testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr)
 {
     if (!tok->isComparisonOp() || !tok->astOperand1() || !tok->astOperand2())
         return false;
@@ -3065,7 +3293,7 @@ bool CheckOther::testIfNonZeroExpressionIsPositive(const Token *tok, const Value
     return vt && (vt->pointer || vt->sign == ValueType::UNSIGNED);
 }
 
-void CheckOther::unsignedLessThanZeroError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
+void CheckOtherImpl::unsignedLessThanZeroError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
 {
     reportError(getErrorPath(tok, v, "Unsigned less than zero"), Severity::style, "unsignedLessThanZero",
                 "$symbol:" + varname + "\n"
@@ -3074,20 +3302,20 @@ void CheckOther::unsignedLessThanZeroError(const Token *tok, const ValueFlow::Va
                 "is either pointless or an error to check if it is.", CWE570, Certainty::normal);
 }
 
-void CheckOther::pointerLessThanZeroError(const Token *tok, const ValueFlow::Value *v)
+void CheckOtherImpl::pointerLessThanZeroError(const Token *tok, const ValueFlow::Value *v)
 {
     reportError(getErrorPath(tok, v, "Pointer less than zero"), Severity::style, "pointerLessThanZero",
                 "A pointer can not be negative so it is either pointless or an error to check if it is.", CWE570, Certainty::normal);
 }
 
-void CheckOther::unsignedPositiveError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
+void CheckOtherImpl::unsignedPositiveError(const Token *tok, const ValueFlow::Value * v, const std::string &varname)
 {
     reportError(getErrorPath(tok, v, "Unsigned positive"), Severity::style, "unsignedPositive",
                 "$symbol:" + varname + "\n"
                 "Unsigned expression '$symbol' can't be negative so it is unnecessary to test it.", CWE570, Certainty::normal);
 }
 
-void CheckOther::pointerPositiveError(const Token *tok, const ValueFlow::Value * v)
+void CheckOtherImpl::pointerPositiveError(const Token *tok, const ValueFlow::Value * v)
 {
     reportError(getErrorPath(tok, v, "Pointer positive"), Severity::style, "pointerPositive",
                 "A pointer can not be negative so it is either pointless or an error to check if it is not.", CWE570, Certainty::normal);
@@ -3098,7 +3326,7 @@ static bool constructorTakesReference(const Scope * const classScope)
 {
     return std::any_of(classScope->functionList.begin(), classScope->functionList.end(), [&](const Function& constructor) {
         if (constructor.isConstructor()) {
-            for (int argnr = 0U; argnr < constructor.argCount(); argnr++) {
+            for (size_t argnr = 0U; argnr < constructor.argCount(); argnr++) {
                 const Variable * const argVar = constructor.getArgumentVar(argnr);
                 if (argVar && argVar->isReference()) {
                     return true;
@@ -3109,13 +3337,70 @@ static bool constructorTakesReference(const Scope * const classScope)
     });
 }
 
+static bool isLargeObject(const Variable* var, const Settings& settings)
+{
+    if (!var || var->isGlobal() || !var->valueType())
+        return false;
+    ValueType vt = *var->valueType();
+    vt.reference = Reference::None;
+    return vt.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer) > 2 * settings.platform.sizeof_pointer;
+}
+
 //---------------------------------------------------------------------------
 // This check rule works for checking the "const A a = getA()" usage when getA() returns "const A &" or "A &".
 // In most scenarios, "const A & a = getA()" will be more efficient.
 //---------------------------------------------------------------------------
-void CheckOther::checkRedundantCopy()
+static bool checkFunctionReturnsRef(const Token* tok, const Settings& settings)
 {
-    if (!mSettings->severity.isEnabled(Severity::performance) || mTokenizer->isC() || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!Token::Match(tok->previous(), "%name% ("))
+        return false;
+    if (!Token::Match(tok->link(), ") )|}| ;")) // bailout for usage like "const A a = getA()+3"
+        return false;
+    const Token* dot = tok->astOperand1();
+    if (Token::simpleMatch(dot, ".")) {
+        const Token* varTok = dot->astOperand1();
+        const int indirect = varTok->valueType() ? varTok->valueType()->pointer : 0;
+        if (isVariableChanged(tok, tok->scope()->bodyEnd, indirect, varTok->varId(), /*globalvar*/ true, settings))
+            return false;
+        if (isTemporary(dot, &settings.library, /*unknown*/ true))
+            return false;
+    }
+    if (exprDependsOnThis(tok->previous()))
+        return false;
+    const Function* func = tok->previous()->function();
+    if (func && func->tokenDef->strAt(-1) == "&") {
+        const Scope* fScope = func->functionScope;
+        if (fScope && fScope->bodyEnd && Token::Match(fScope->bodyEnd->tokAt(-3), "return %var% ;")) {
+            const Token* varTok = fScope->bodyEnd->tokAt(-2);
+            if (isLargeObject(varTok->variable(), settings))
+                return true;
+        }
+    }
+    return false;
+}
+
+static bool checkVariableAssignment(const Token* tok, const ValueType* vtLhs, const Settings& settings)
+{
+    if (!Token::Match(tok, "%var% ;"))
+        return false;
+    const Variable* var = tok->variable();
+    if (!var || !isLargeObject(var, settings))
+        return false;
+    if (!vtLhs || !vtLhs->isTypeEqual(var->valueType()))
+        return false;
+    if (findVariableChanged(tok->tokAt(2), tok->scope()->bodyEnd, /*indirect*/ 0, var->declarationId(), /*globalvar*/ false, settings))
+        return false;
+    if (var->isLocal() || (var->isArgument() && !var->isReference()))
+        return true;
+    const Scope* scope = tok->scope();
+    while (scope && scope->type != ScopeType::eFunction)
+        scope = scope->nestedIn;
+    return scope && scope->function && (!scope->functionOf || scope->function->isConst() || scope->function->isStatic());
+}
+
+void CheckOtherImpl::checkRedundantCopy()
+{
+    if (!mSettings.severity.isEnabled(Severity::performance) || mTokenizer->isC() || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckOther::checkRedundantCopy"); // c++,performance,inconclusive
@@ -3125,7 +3410,7 @@ void CheckOther::checkRedundantCopy()
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || var->isReference() || var->isPointer() ||
             (!var->type() && !var->isStlType() && !(var->valueType() && var->valueType()->container)) || // bailout if var is of standard type, if it is a pointer or non-const
-            (!var->isConst() && isVariableChanged(var, *mSettings)))
+            (!var->isConst() && isVariableChanged(var, mSettings)))
             continue;
 
         const Token* startTok = var->nameToken();
@@ -3145,38 +3430,13 @@ void CheckOther::checkRedundantCopy()
         const Token* tok = startTok->next()->astOperand2();
         if (!tok)
             continue;
-        if (!Token::Match(tok->previous(), "%name% ("))
+        if (!checkFunctionReturnsRef(tok, mSettings) && !checkVariableAssignment(tok, var->valueType(), mSettings))
             continue;
-        if (!Token::Match(tok->link(), ") )|}| ;")) // bailout for usage like "const A a = getA()+3"
-            continue;
-
-        const Token* dot = tok->astOperand1();
-        if (Token::simpleMatch(dot, ".")) {
-            const Token* varTok = dot->astOperand1();
-            const int indirect = varTok->valueType() ? varTok->valueType()->pointer : 0;
-            if (isVariableChanged(tok, tok->scope()->bodyEnd, indirect, varTok->varId(), /*globalvar*/ true, *mSettings))
-                continue;
-            if (isTemporary(dot, &mSettings->library, /*unknown*/ true))
-                continue;
-        }
-        if (exprDependsOnThis(tok->previous()))
-            continue;
-
-        const Function* func = tok->previous()->function();
-        if (func && func->tokenDef->strAt(-1) == "&") {
-            const Scope* fScope = func->functionScope;
-            if (fScope && fScope->bodyEnd && Token::Match(fScope->bodyEnd->tokAt(-3), "return %var% ;")) {
-                const Token* varTok = fScope->bodyEnd->tokAt(-2);
-                if (varTok->variable() && !varTok->variable()->isGlobal() &&
-                    (!varTok->variable()->type() || !varTok->variable()->type()->classScope ||
-                     (varTok->variable()->valueType() && ValueFlow::getSizeOf(*varTok->variable()->valueType(), *mSettings) > 2 * mSettings->platform.sizeof_pointer)))
-                    redundantCopyError(startTok, startTok->str());
-            }
-        }
+        redundantCopyError(startTok, startTok->str());
     }
 }
 
-void CheckOther::redundantCopyError(const Token *tok,const std::string& varname)
+void CheckOtherImpl::redundantCopyError(const Token *tok,const std::string& varname)
 {
     reportError(tok, Severity::performance, "redundantCopyLocalConst",
                 "$symbol:" + varname + "\n"
@@ -3196,9 +3456,9 @@ static bool isNegative(const Token *tok, const Settings &settings)
     return tok->valueType() && tok->valueType()->sign == ValueType::SIGNED && tok->getValueLE(-1LL, settings);
 }
 
-void CheckOther::checkNegativeBitwiseShift()
+void CheckOtherImpl::checkNegativeBitwiseShift()
 {
-    const bool portability = mSettings->severity.isEnabled(Severity::portability);
+    const bool portability = mSettings.severity.isEnabled(Severity::portability);
 
     logChecker("CheckOther::checkNegativeBitwiseShift");
 
@@ -3230,15 +3490,15 @@ void CheckOther::checkNegativeBitwiseShift()
             continue;
 
         // Get negative rhs value. preferably a value which doesn't have 'condition'.
-        if (portability && isNegative(tok->astOperand1(), *mSettings))
+        if (portability && isNegative(tok->astOperand1(), mSettings))
             negativeBitwiseShiftError(tok, 1);
-        else if (isNegative(tok->astOperand2(), *mSettings))
+        else if (isNegative(tok->astOperand2(), mSettings))
             negativeBitwiseShiftError(tok, 2);
     }
 }
 
 
-void CheckOther::negativeBitwiseShiftError(const Token *tok, int op)
+void CheckOtherImpl::negativeBitwiseShiftError(const Token *tok, int op)
 {
     if (op == 1)
         // LHS - this is used by intention in various software, if it
@@ -3252,12 +3512,12 @@ void CheckOther::negativeBitwiseShiftError(const Token *tok, int op)
 //---------------------------------------------------------------------------
 // Check for incompletely filled buffers.
 //---------------------------------------------------------------------------
-void CheckOther::checkIncompleteArrayFill()
+void CheckOtherImpl::checkIncompleteArrayFill()
 {
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    const bool printPortability = mSettings->severity.isEnabled(Severity::portability);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    const bool printPortability = mSettings.severity.isEnabled(Severity::portability);
     if (!printPortability && !printWarning)
         return;
 
@@ -3287,9 +3547,9 @@ void CheckOther::checkIncompleteArrayFill()
                     continue;
                 int size = mTokenizer->sizeOfType(var->typeStartToken());
                 if (size == 0 && var->valueType()->pointer)
-                    size = mSettings->platform.sizeof_pointer;
+                    size = mSettings.platform.sizeof_pointer;
                 else if (size == 0 && var->valueType())
-                    size = ValueFlow::getSizeOf(*var->valueType(), *mSettings);
+                    size = var->valueType()->getSizeOf(mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
                 const Token* tok3 = tok->next()->astOperand2()->astOperand1()->astOperand1();
                 if ((size != 1 && size != 100 && size != 0) || var->isPointer()) {
                     if (printWarning)
@@ -3301,7 +3561,7 @@ void CheckOther::checkIncompleteArrayFill()
     }
 }
 
-void CheckOther::incompleteArrayFillError(const Token* tok, const std::string& buffer, const std::string& function, bool boolean)
+void CheckOtherImpl::incompleteArrayFillError(const Token* tok, const std::string& buffer, const std::string& function, bool boolean)
 {
     if (boolean)
         reportError(tok, Severity::portability, "incompleteArrayFill",
@@ -3321,9 +3581,9 @@ void CheckOther::incompleteArrayFillError(const Token* tok, const std::string& b
 // Detect NULL being passed to variadic function.
 //---------------------------------------------------------------------------
 
-void CheckOther::checkVarFuncNullUB()
+void CheckOtherImpl::checkVarFuncNullUB()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("CheckOther::checkVarFuncNullUB"); // portability
@@ -3332,7 +3592,7 @@ void CheckOther::checkVarFuncNullUB()
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
             // Is NULL passed to a function?
-            if (Token::Match(tok,"[(,] NULL [,)]")) {
+            if (Token::Match(tok,"[(,] NULL )")) {
                 // Locate function name in this function call.
                 const Token *ftok = tok;
                 int argnr = 1;
@@ -3359,7 +3619,7 @@ void CheckOther::checkVarFuncNullUB()
     }
 }
 
-void CheckOther::varFuncNullUBError(const Token *tok)
+void CheckOtherImpl::varFuncNullUBError(const Token *tok)
 {
     reportError(tok,
                 Severity::portability,
@@ -3406,9 +3666,9 @@ void CheckOther::varFuncNullUBError(const Token *tok)
                 "}", CWE475, Certainty::normal);
 }
 
-void CheckOther::checkRedundantPointerOp()
+void CheckOtherImpl::checkRedundantPointerOp()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantPointerOp"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("redundantPointerOp"))
         return;
 
     logChecker("CheckOther::checkRedundantPointerOp"); // style
@@ -3445,16 +3705,16 @@ void CheckOther::checkRedundantPointerOp()
     }
 }
 
-void CheckOther::redundantPointerOpError(const Token* tok, const std::string &varname, bool inconclusive, bool addressOfDeref)
+void CheckOtherImpl::redundantPointerOpError(const Token* tok, const std::string &varname, bool inconclusive, bool addressOfDeref)
 {
     std::string msg = "$symbol:" + varname + "\nRedundant pointer operation on '$symbol' - it's already a ";
     msg += addressOfDeref ? "pointer." : "variable.";
     reportError(tok, Severity::style, "redundantPointerOp", msg, CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckOther::checkInterlockedDecrement()
+void CheckOtherImpl::checkInterlockedDecrement()
 {
-    if (!mSettings->platform.isWindows()) {
+    if (!mSettings.platform.isWindows()) {
         return;
     }
 
@@ -3492,15 +3752,15 @@ void CheckOther::checkInterlockedDecrement()
     }
 }
 
-void CheckOther::raceAfterInterlockedDecrementError(const Token* tok)
+void CheckOtherImpl::raceAfterInterlockedDecrementError(const Token* tok)
 {
     reportError(tok, Severity::error, "raceAfterInterlockedDecrement",
                 "Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.", CWE362, Certainty::normal);
 }
 
-void CheckOther::checkUnusedLabel()
+void CheckOtherImpl::checkUnusedLabel()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("unusedLabel"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("unusedLabel"))
         return;
 
     logChecker("CheckOther::checkUnusedLabel"); // style,warning
@@ -3521,9 +3781,9 @@ void CheckOther::checkUnusedLabel()
     }
 }
 
-void CheckOther::unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef)
+void CheckOtherImpl::unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef)
 {
-    if (tok && !mSettings->severity.isEnabled(inSwitch ? Severity::warning : Severity::style))
+    if (tok && !mSettings.severity.isEnabled(inSwitch ? Severity::warning : Severity::style) && !mSettings.isPremiumEnabled("unusedLabel"))
         return;
 
     std::string id = "unusedLabel";
@@ -3615,7 +3875,7 @@ static bool checkEvaluationOrderCpp17(const Token * tok, const Token * tok2, con
     return foundUndefined || foundUnspecified;
 }
 
-void CheckOther::checkEvaluationOrder()
+void CheckOtherImpl::checkEvaluationOrder()
 {
     logChecker("CheckOther::checkEvaluationOrder");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -3625,6 +3885,8 @@ void CheckOther::checkEvaluationOrder()
                 continue;
             if (!tok->astOperand1())
                 continue;
+            if (isDesignatedInitializer(tok->astOperand1()))
+                continue;
             for (const Token *tok2 = tok;; tok2 = tok2->astParent()) {
                 // If ast parent is a sequence point then break
                 const Token * const parent = tok2->astParent();
@@ -3653,14 +3915,14 @@ void CheckOther::checkEvaluationOrder()
                     break;
 
                 bool foundError{false}, foundUnspecified{false}, bSelfAssignmentError{false};
-                if (mTokenizer->isCPP() && mSettings->standards.cpp >= Standards::CPP11) {
-                    if (mSettings->standards.cpp >= Standards::CPP17)
-                        foundError = checkEvaluationOrderCpp17(tok, tok2, parent, *mSettings, foundUnspecified);
+                if (mTokenizer->isCPP() && mSettings.standards.cpp >= Standards::CPP11) {
+                    if (mSettings.standards.cpp >= Standards::CPP17)
+                        foundError = checkEvaluationOrderCpp17(tok, tok2, parent, mSettings, foundUnspecified);
                     else
-                        foundError = checkEvaluationOrderCpp11(tok, tok2, parent, *mSettings);
+                        foundError = checkEvaluationOrderCpp11(tok, tok2, parent, mSettings);
                 }
                 else
-                    foundError = checkEvaluationOrderC(tok, tok2, parent, *mSettings, bSelfAssignmentError);
+                    foundError = checkEvaluationOrderC(tok, tok2, parent, mSettings, bSelfAssignmentError);
 
                 if (foundError) {
                     unknownEvaluationOrder(parent, foundUnspecified);
@@ -3675,7 +3937,7 @@ void CheckOther::checkEvaluationOrder()
     }
 }
 
-void CheckOther::unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBehavior)
+void CheckOtherImpl::unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBehavior)
 {
     isUnspecifiedBehavior ?
     reportError(tok, Severity::portability, "unknownEvaluationOrder",
@@ -3684,14 +3946,14 @@ void CheckOther::unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBeha
                     "Expression '" + (tok ? tok->expressionString() : std::string("x = x++;")) + "' depends on order of evaluation of side effects", CWE768, Certainty::normal);
 }
 
-void CheckOther::checkAccessOfMovedVariable()
+void CheckOtherImpl::checkAccessOfMovedVariable()
 {
-    if (!mTokenizer->isCPP() || mSettings->standards.cpp < Standards::CPP11)
+    if (!mTokenizer->isCPP() || mSettings.standards.cpp < Standards::CPP11)
         return;
-    if (!mSettings->isPremiumEnabled("accessMoved") && !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.isPremiumEnabled("accessMoved") && !mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckOther::checkAccessOfMovedVariable"); // c++11,warning
-    const bool reportInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool reportInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         const Token * scopeStart = scope->bodyStart;
@@ -3717,11 +3979,11 @@ void CheckOther::checkAccessOfMovedVariable()
                 else
                     inconclusive = true;
             } else {
-                const ExprUsage usage = getExprUsage(tok, 0, *mSettings);
+                const ExprUsage usage = getExprUsage(tok, 0, mSettings);
                 if (usage == ExprUsage::Used)
                     accessOfMoved = true;
                 if (usage == ExprUsage::PassedByReference)
-                    accessOfMoved = !isVariableChangedByFunctionCall(tok, 0, *mSettings, &inconclusive);
+                    accessOfMoved = !isVariableChangedByFunctionCall(tok, 0, mSettings.library, &inconclusive);
                 else if (usage == ExprUsage::Inconclusive)
                     inconclusive = true;
             }
@@ -3731,7 +3993,7 @@ void CheckOther::checkAccessOfMovedVariable()
     }
 }
 
-void CheckOther::accessMovedError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
+void CheckOtherImpl::accessMovedError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive)
 {
     if (!tok) {
         reportError(tok, Severity::warning, "accessMoved", "Access of moved variable 'v'.", CWE672, Certainty::normal);
@@ -3754,19 +4016,19 @@ void CheckOther::accessMovedError(const Token *tok, const std::string &varname,
         return;
     }
     const std::string errmsg("$symbol:" + varname + "\nAccess of " + kindString + " variable '$symbol'.");
-    const ErrorPath errorPath = getErrorPath(tok, value, errmsg);
-    reportError(errorPath, Severity::warning, errorId, errmsg, CWE672, inconclusive ? Certainty::inconclusive : Certainty::normal);
+    ErrorPath errorPath = getErrorPath(tok, value, errmsg);
+    reportError(std::move(errorPath), Severity::warning, errorId, errmsg, CWE672, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
 
 
-void CheckOther::checkFuncArgNamesDifferent()
+void CheckOtherImpl::checkFuncArgNamesDifferent()
 {
-    const bool style = mSettings->severity.isEnabled(Severity::style);
-    const bool inconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
-    const bool warning = mSettings->severity.isEnabled(Severity::warning);
+    const bool style = mSettings.severity.isEnabled(Severity::style);
+    const bool inconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
+    const bool warning = mSettings.severity.isEnabled(Severity::warning);
 
-    if (!(warning || (style && inconclusive)) && !mSettings->isPremiumEnabled("funcArgNamesDifferent"))
+    if (!(warning || (style && inconclusive)) && !mSettings.isPremiumEnabled("funcArgNamesDifferent"))
         return;
 
     logChecker("CheckOther::checkFuncArgNamesDifferent"); // style,warning,inconclusive
@@ -3787,16 +4049,14 @@ void CheckOther::checkFuncArgNamesDifferent()
         std::vector<const Token *>  declarations(function->argCount());
         std::vector<const Token *>  definitions(function->argCount());
         const Token * decl = function->argDef->next();
-        for (int j = 0; j < function->argCount(); ++j) {
-            declarations[j] = nullptr;
-            definitions[j] = nullptr;
+        for (size_t j = 0; j < function->argCount(); ++j) {
             // get the definition
             const Variable * variable = function->getArgumentVar(j);
             if (variable) {
                 definitions[j] = variable->nameToken();
             }
             // get the declaration (search for first token with varId)
-            while (decl && !Token::Match(decl, ",|)|;")) {
+            while (decl && !Token::Match(decl, "[,;]")) {
                 // skip everything after the assignment because
                 // it could also have a varId or be the first
                 // token with a varId if there is no name token
@@ -3804,8 +4064,8 @@ void CheckOther::checkFuncArgNamesDifferent()
                     decl = decl->nextArgument();
                     break;
                 }
-                // skip over template
-                if (decl->link())
+                // skip over templates and arrays
+                if (decl->link() && precedes(decl, decl->link()) && !Token::Match(decl, "( [*&]"))
                     decl = decl->link();
                 else if (decl->varId())
                     declarations[j] = decl;
@@ -3817,11 +4077,11 @@ void CheckOther::checkFuncArgNamesDifferent()
         // check for different argument order
         if (warning) {
             bool order_different = false;
-            for (int j = 0; j < function->argCount(); ++j) {
+            for (size_t j = 0; j < function->argCount(); ++j) {
                 if (!declarations[j] || !definitions[j] || declarations[j]->str() == definitions[j]->str())
                     continue;
 
-                for (int k = 0; k < function->argCount(); ++k) {
+                for (size_t k = 0; k < function->argCount(); ++k) {
                     if (j != k && definitions[k] && declarations[j]->str() == definitions[k]->str()) {
                         order_different = true;
                         break;
@@ -3835,29 +4095,32 @@ void CheckOther::checkFuncArgNamesDifferent()
         }
         // check for different argument names
         if (style && inconclusive) {
-            for (int j = 0; j < function->argCount(); ++j) {
-                if (declarations[j] && definitions[j] && declarations[j]->str() != definitions[j]->str())
+            for (size_t j = 0; j < function->argCount(); ++j) {
+                const bool warn = (declarations[j] != nullptr) != (definitions[j] != nullptr) ||
+                                  (declarations[j] && definitions[j] && declarations[j]->str() != definitions[j]->str());
+                if (warn)
                     funcArgNamesDifferent(function->name(), j, declarations[j], definitions[j]);
             }
         }
     }
 }
 
-void CheckOther::funcArgNamesDifferent(const std::string & functionName, nonneg int index,
-                                       const Token* declaration, const Token* definition)
+void CheckOtherImpl::funcArgNamesDifferent(const std::string & functionName, size_t index,
+                                           const Token* declaration, const Token* definition)
 {
     std::list<const Token *> tokens = { declaration,definition };
-    reportError(tokens, Severity::style, "funcArgNamesDifferent",
+    const std::string id = (declaration != nullptr) == (definition != nullptr) ? "funcArgNamesDifferent" : "funcArgNamesDifferentUnnamed";
+    reportError(tokens, Severity::style, id,
                 "$symbol:" + functionName + "\n"
                 "Function '$symbol' argument " + std::to_string(index + 1) + " names different: declaration '" +
-                (declaration ? declaration->str() : std::string("A")) + "' definition '" +
-                (definition ? definition->str() : std::string("B")) + "'.", CWE628, Certainty::inconclusive);
+                (declaration ? declaration->str() : "<unnamed>") + "' definition '" +
+                (definition ? definition->str() : "<unnamed>") + "'.", CWE628, Certainty::inconclusive);
 }
 
-void CheckOther::funcArgOrderDifferent(const std::string & functionName,
-                                       const Token* declaration, const Token* definition,
-                                       const std::vector<const Token *> & declarations,
-                                       const std::vector<const Token *> & definitions)
+void CheckOtherImpl::funcArgOrderDifferent(const std::string & functionName,
+                                           const Token* declaration, const Token* definition,
+                                           const std::vector<const Token *> & declarations,
+                                           const std::vector<const Token *> & definitions)
 {
     std::list<const Token *> tokens = {
         !declarations.empty() ? declarations[0] ? declarations[0] : declaration : nullptr,
@@ -3892,7 +4155,8 @@ static const Token *findShadowed(const Scope *scope, const Variable& var, int li
             return v.nameToken();
     }
     auto it = std::find_if(scope->functionList.cbegin(), scope->functionList.cend(), [&](const Function& f) {
-        return f.type == FunctionType::eFunction && f.name() == var.name() && precedes(f.tokenDef, var.nameToken());
+        return f.type == FunctionType::eFunction && f.name() == var.name()
+               && (scope->isClassOrStructOrUnion() || precedes(f.tokenDef, var.nameToken()));
     });
     if (it != scope->functionList.end())
         return it->tokenDef;
@@ -3905,9 +4169,9 @@ static const Token *findShadowed(const Scope *scope, const Variable& var, int li
     return shadowed;
 }
 
-void CheckOther::checkShadowVariables()
+void CheckOtherImpl::checkShadowVariables()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("shadowVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("shadowVariable"))
         return;
     logChecker("CheckOther::checkShadowVariables"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -3917,18 +4181,21 @@ void CheckOther::checkShadowVariables()
         const Scope *functionScope = &scope;
         while (functionScope && functionScope->type != ScopeType::eFunction && functionScope->type != ScopeType::eLambda)
             functionScope = functionScope->nestedIn;
-        for (const Variable &var : scope.varlist) {
-            if (var.nameToken() && var.nameToken()->isExpandedMacro()) // #8903
-                continue;
+        const auto checkVar = [&](const Variable &var) {
+            if (!var.nameToken())
+                return;
+
+            if (var.nameToken()->isExpandedMacro()) // #8903
+                return;
 
-            if (functionScope && functionScope->type == ScopeType::eFunction && functionScope->function) {
+            if (!var.isArgument() && functionScope && functionScope->type == ScopeType::eFunction && functionScope->function) {
                 const auto & argList = functionScope->function->argumentList;
                 auto it = std::find_if(argList.cbegin(), argList.cend(), [&](const Variable& arg) {
                     return arg.nameToken() && var.name() == arg.name();
                 });
                 if (it != argList.end()) {
-                    shadowError(var.nameToken(), it->nameToken(), "argument");
-                    continue;
+                    shadowError(var.nameToken(), "local variable", it->nameToken(), "argument");
+                    return;
                 }
             }
 
@@ -3936,27 +4203,47 @@ void CheckOther::checkShadowVariables()
             if (!shadowed)
                 shadowed = findShadowed(scope.functionOf, var, var.nameToken()->linenr());
             if (!shadowed)
-                continue;
+                return;
             if (scope.type == ScopeType::eFunction && scope.className == var.name())
-                continue;
-            if (functionScope->functionOf && functionScope->functionOf->isClassOrStructOrUnion() && functionScope->function && functionScope->function->isStatic() &&
+                return;
+            if (functionScope->functionOf && functionScope->functionOf->isClassOrStructOrUnion() && functionScope->function &&
+                (functionScope->function->isStatic() || functionScope->function->isFriend()) &&
                 shadowed->variable() && !shadowed->variable()->isLocal())
-                continue;
-            shadowError(var.nameToken(), shadowed, (shadowed->varId() != 0) ? "variable" : "function");
-        }
+                return;
+            if (functionScope->functionOf && functionScope->functionOf->isClassOrStructOrUnion() && functionScope->function &&
+                functionScope->function->isStatic() && shadowed->function() && !shadowed->function()->isStatic())
+                return;
+            if (var.scope() && var.scope()->function && var.scope()->function->isConstructor()) {
+                if (shadowed->variable() && shadowed->variable()->isMember())
+                    return;
+                if (shadowed->function() && shadowed->function()->nestedIn &&
+                    shadowed->function()->nestedIn->isClassOrStruct())
+                    return;
+            }
+            shadowError(var.nameToken(), var.isArgument() ? "argument" : "local variable",
+                        shadowed, (shadowed->varId() != 0) ?
+                        (shadowed->variable()->isMember() ? "member" : "variable") : "function");
+        };
+        for (const Variable &var : scope.varlist)
+            checkVar(var);
+        if (functionScope && functionScope->type == ScopeType::eFunction && functionScope->function)
+            for (const Variable &arg: functionScope->function->argumentList)
+                checkVar(arg);
     }
 }
 
-void CheckOther::shadowError(const Token *var, const Token *shadowed, const std::string& type)
+void CheckOtherImpl::shadowError(const Token *shadows, const std::string &shadowsType,
+                                 const Token *shadowed, const std::string &shadowedType)
 {
     ErrorPath errorPath;
-    errorPath.emplace_back(shadowed, "Shadowed declaration");
-    errorPath.emplace_back(var, "Shadow variable");
-    const std::string &varname = var ? var->str() : type;
-    const std::string Type = char(std::toupper(type[0])) + type.substr(1);
-    const std::string id = "shadow" + Type;
-    const std::string message = "$symbol:" + varname + "\nLocal variable \'$symbol\' shadows outer " + type;
-    reportError(errorPath, Severity::style, id.c_str(), message, CWE398, Certainty::normal);
+    errorPath.emplace_back(shadowed, "Shadowed " + shadowedType);
+    errorPath.emplace_back(shadows, "Shadow " + shadowsType);
+    const std::string &varname = shadows ? shadows->str() : shadowsType;
+    const std::string ShadowsType = char(std::toupper(shadowsType[0])) + shadowsType.substr(1);
+    const std::string ShadowedType = char(std::toupper(shadowedType[0])) + shadowedType.substr(1);
+    const std::string id = "shadow" + ShadowedType;
+    const std::string message = "$symbol:" + varname + "\n" + ShadowsType + " \'$symbol\' shadows outer " + shadowedType;
+    reportError(std::move(errorPath), Severity::style, id.c_str(), message, CWE398, Certainty::normal);
 }
 
 static bool isVariableExpression(const Token* tok)
@@ -3986,9 +4273,9 @@ static bool isVariableExprHidden(const Token* tok)
     return false;
 }
 
-void CheckOther::checkKnownArgument()
+void CheckOtherImpl::checkKnownArgument()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownArgument"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("knownArgument"))
         return;
     logChecker("CheckOther::checkKnownArgument"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4023,7 +4310,7 @@ void CheckOther::checkKnownArgument()
                 continue;
             if (tok->isComparisonOp() &&
                 isSameExpression(
-                    true, tok->astOperand1(), tok->astOperand2(), *mSettings, true, true))
+                    true, tok->astOperand1(), tok->astOperand2(), mSettings, true, true))
                 continue;
             // ensure that there is a integer variable in expression with unknown value
             const Token* vartok = nullptr;
@@ -4055,7 +4342,7 @@ void CheckOther::checkKnownArgument()
     }
 }
 
-void CheckOther::knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value, const std::string &varexpr, bool isVariableExpressionHidden)
+void CheckOtherImpl::knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value, const std::string &varexpr, bool isVariableExpressionHidden)
 {
     if (!tok) {
         reportError(tok, Severity::style, "knownArgument", "Argument 'x-x' to function 'func' is always 0. It does not matter what value 'x' has.");
@@ -4083,13 +4370,13 @@ void CheckOther::knownArgumentError(const Token *tok, const Token *ftok, const V
         errmsg += "Constant literal calculation disable/hide variable expression '" + varexpr + "'.";
     }
 
-    const ErrorPath errorPath = getErrorPath(tok, value, errmsg);
-    reportError(errorPath, Severity::style, id, errmsg, CWE570, Certainty::normal);
+    ErrorPath errorPath = getErrorPath(tok, value, errmsg);
+    reportError(std::move(errorPath), Severity::style, id, errmsg, CWE570, Certainty::normal);
 }
 
-void CheckOther::checkKnownPointerToBool()
+void CheckOtherImpl::checkKnownPointerToBool()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownPointerToBool"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("knownPointerToBool"))
         return;
     logChecker("CheckOther::checkKnownPointerToBool"); // style
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4109,7 +4396,7 @@ void CheckOther::checkKnownPointerToBool()
                 return parent->isExpandedMacro();
             }))
                 continue;
-            if (!isUsedAsBool(tok, *mSettings))
+            if (!isUsedAsBool(tok, mSettings))
                 continue;
             const ValueFlow::Value& value = tok->values().front();
             knownPointerToBoolError(tok, &value);
@@ -4117,7 +4404,7 @@ void CheckOther::checkKnownPointerToBool()
     }
 }
 
-void CheckOther::knownPointerToBoolError(const Token* tok, const ValueFlow::Value* value)
+void CheckOtherImpl::knownPointerToBoolError(const Token* tok, const ValueFlow::Value* value)
 {
     if (!tok) {
         reportError(tok, Severity::style, "knownPointerToBool", "Pointer expression 'p' converted to bool is always true.");
@@ -4126,11 +4413,11 @@ void CheckOther::knownPointerToBoolError(const Token* tok, const ValueFlow::Valu
     std::string cond = bool_to_string(!!value->intvalue);
     const std::string& expr = tok->expressionString();
     std::string errmsg = "Pointer expression '" + expr + "' converted to bool is always " + cond + ".";
-    const ErrorPath errorPath = getErrorPath(tok, value, errmsg);
-    reportError(errorPath, Severity::style, "knownPointerToBool", errmsg, CWE570, Certainty::normal);
+    ErrorPath errorPath = getErrorPath(tok, value, errmsg);
+    reportError(std::move(errorPath), Severity::style, "knownPointerToBool", errmsg, CWE570, Certainty::normal);
 }
 
-void CheckOther::checkComparePointers()
+void CheckOtherImpl::checkComparePointers()
 {
     logChecker("CheckOther::checkComparePointers");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4160,10 +4447,10 @@ void CheckOther::checkComparePointers()
                 continue;
             if (var1->isRValueReference() || var2->isRValueReference())
                 continue;
-            if (const Token* parent2 = getParentLifetime(v2.tokvalue, mSettings->library))
+            if (const Token* parent2 = getParentLifetime(v2.tokvalue, mSettings.library))
                 if (var1 == parent2->variable())
                     continue;
-            if (const Token* parent1 = getParentLifetime(v1.tokvalue, mSettings->library))
+            if (const Token* parent1 = getParentLifetime(v1.tokvalue, mSettings.library))
                 if (var2 == parent1->variable())
                     continue;
             comparePointersError(tok, &v1, &v2);
@@ -4171,7 +4458,7 @@ void CheckOther::checkComparePointers()
     }
 }
 
-void CheckOther::comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2)
+void CheckOtherImpl::comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2)
 {
     ErrorPath errorPath;
     std::string verb = "Comparing";
@@ -4188,12 +4475,12 @@ void CheckOther::comparePointersError(const Token *tok, const ValueFlow::Value *
     }
     errorPath.emplace_back(tok, "");
     reportError(
-        errorPath, Severity::error, id, verb + " pointers that point to different objects", CWE570, Certainty::normal);
+        std::move(errorPath), Severity::error, id, verb + " pointers that point to different objects", CWE758, Certainty::normal);
 }
 
-void CheckOther::checkModuloOfOne()
+void CheckOtherImpl::checkModuloOfOne()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("moduloofone"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("moduloofone"))
         return;
 
     logChecker("CheckOther::checkModuloOfOne"); // style
@@ -4201,7 +4488,7 @@ void CheckOther::checkModuloOfOne()
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!tok->astOperand2() || !tok->astOperand1())
             continue;
-        if (tok->str() != "%")
+        if (tok->str() != "%" && tok->str() != "%=")
             continue;
         if (!tok->valueType() || !tok->valueType()->isIntegral())
             continue;
@@ -4213,11 +4500,144 @@ void CheckOther::checkModuloOfOne()
     }
 }
 
-void CheckOther::checkModuloOfOneError(const Token *tok)
+void CheckOtherImpl::checkModuloOfOneError(const Token *tok)
 {
     reportError(tok, Severity::style, "moduloofone", "Modulo of one is always equal to zero");
 }
 
+static const std::string noname;
+
+struct UnionMember {
+    UnionMember()
+        : name(noname)
+        , size(0) {}
+
+    UnionMember(const std::string &name, size_t size)
+        : name(name)
+        , size(size) {}
+
+    const std::string &name;
+    size_t size;
+};
+
+struct Union {
+    explicit Union(const Scope &scope)
+        : scope(&scope)
+        , name(scope.className) {}
+
+    const Scope *scope;
+    const std::string &name;
+    std::vector<UnionMember> members;
+
+    const UnionMember *largestMember() const {
+        const UnionMember *largest = nullptr;
+        for (const UnionMember &m : members) {
+            if (m.size == 0)
+                return nullptr;
+            if (largest == nullptr || m.size > largest->size)
+                largest = &m;
+        }
+        return largest;
+    }
+
+    bool isLargestMemberFirst() const {
+        const UnionMember *largest = largestMember();
+        return largest == nullptr || largest == &members[0];
+    }
+};
+
+static UnionMember parseUnionMember(const Variable &var,
+                                    const Settings &settings)
+{
+    const Token *nameToken = var.nameToken();
+    if (nameToken == nullptr)
+        return UnionMember();
+
+    const ValueType *vt = nameToken->valueType();
+    size_t size = 0;
+    if (var.isArray()) {
+        size = var.dimension(0);
+    } else if (vt != nullptr) {
+        size = vt->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+    }
+    return UnionMember(nameToken->str(), size);
+}
+
+static std::vector<Union> parseUnions(const SymbolDatabase &symbolDatabase,
+                                      const Settings &settings)
+{
+    std::vector<Union> unions;
+
+    for (const Scope &scope : symbolDatabase.scopeList) {
+        if (scope.type != ScopeType::eUnion)
+            continue;
+
+        Union u(scope);
+        for (const Variable &var : scope.varlist) {
+            u.members.push_back(parseUnionMember(var, settings));
+        }
+        unions.push_back(std::move(u));
+    }
+
+    return unions;
+}
+
+static bool isZeroInitializer(const Token *tok)
+{
+    return Token::Match(tok, "= { 0| } ;");
+}
+
+
+void CheckOtherImpl::checkUnionZeroInit()
+{
+    if (!mSettings.severity.isEnabled(Severity::portability))
+        return;
+
+    logChecker("CheckOther::checkUnionZeroInit"); // portability
+
+    const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
+
+    std::unordered_map<const Scope *, Union> unionsByScopeId;
+    const std::vector<Union> unions = parseUnions(*symbolDatabase, mSettings);
+    for (const Union &u : unions) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
+        unionsByScopeId.emplace(u.scope, u);
+    }
+
+    for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
+        if (!tok->isName() || !isZeroInitializer(tok->next()))
+            continue;
+
+        const ValueType *vt = tok->valueType();
+        if (vt == nullptr || vt->typeScope == nullptr)
+            continue;
+        auto it = unionsByScopeId.find(vt->typeScope);
+        if (it == unionsByScopeId.end())
+            continue;
+        const Union &u = it->second;
+        if (!u.isLargestMemberFirst()) {
+            const UnionMember *largestMember = u.largestMember();
+            if (largestMember == nullptr) {
+                throw InternalError(tok, "Largest union member not found",
+                                    InternalError::INTERNAL);
+            }
+            assert(largestMember != nullptr);
+            unionZeroInitError(tok, *largestMember);
+        }
+    }
+}
+
+void CheckOtherImpl::unionZeroInitError(const Token *tok,
+                                        const UnionMember& largestMember)
+{
+    reportError(tok, Severity::portability, "UnionZeroInit",
+                (tok != nullptr ? "$symbol:" + tok->str() + "\n" : "") +
+                "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().");
+}
+
 //-----------------------------------------------------------------------------
 // Overlapping write (undefined behavior)
 //-----------------------------------------------------------------------------
@@ -4231,7 +4651,7 @@ static bool getBufAndOffset(const Token *expr, const Token *&buf, MathLib::bigin
         bufToken = expr->astOperand1()->astOperand1();
         offsetToken = expr->astOperand1()->astOperand2();
         if (expr->astOperand1()->valueType())
-            elementSize =  ValueFlow::getSizeOf(*expr->astOperand1()->valueType(), settings);
+            elementSize = expr->astOperand1()->valueType()->getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
     } else if (Token::Match(expr, "+|-") && expr->isBinaryOp()) {
         const bool pointer1 = (expr->astOperand1()->valueType() && expr->astOperand1()->valueType()->pointer > 0);
         const bool pointer2 = (expr->astOperand2()->valueType() && expr->astOperand2()->valueType()->pointer > 0);
@@ -4240,13 +4660,13 @@ static bool getBufAndOffset(const Token *expr, const Token *&buf, MathLib::bigin
             offsetToken = expr->astOperand2();
             auto vt = *expr->astOperand1()->valueType();
             --vt.pointer;
-            elementSize = ValueFlow::getSizeOf(vt, settings);
+            elementSize = vt.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
         } else if (!pointer1 && pointer2) {
             bufToken = expr->astOperand2();
             offsetToken = expr->astOperand1();
             auto vt = *expr->astOperand2()->valueType();
             --vt.pointer;
-            elementSize = ValueFlow::getSizeOf(vt, settings);
+            elementSize = vt.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
         } else {
             return false;
         }
@@ -4255,7 +4675,7 @@ static bool getBufAndOffset(const Token *expr, const Token *&buf, MathLib::bigin
         *offset = 0;
         auto vt = *expr->valueType();
         --vt.pointer;
-        elementSize = ValueFlow::getSizeOf(vt, settings);
+        elementSize = vt.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
         if (elementSize > 0) {
             *offset *= elementSize;
             if (sizeValue)
@@ -4279,7 +4699,7 @@ static bool getBufAndOffset(const Token *expr, const Token *&buf, MathLib::bigin
     return true;
 }
 
-void CheckOther::checkOverlappingWrite()
+void CheckOtherImpl::checkOverlappingWrite()
 {
     logChecker("CheckOther::checkOverlappingWrite");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -4318,7 +4738,7 @@ void CheckOther::checkOverlappingWrite()
                 if (errorToken)
                     overlappingWriteUnion(tok);
             } else if (Token::Match(tok, "%name% (")) {
-                const Library::NonOverlappingData *nonOverlappingData = mSettings->library.getNonOverlappingData(tok);
+                const Library::NonOverlappingData *nonOverlappingData = mSettings.library.getNonOverlappingData(tok);
                 if (!nonOverlappingData)
                     continue;
                 const std::vector<const Token *> args = getArguments(tok);
@@ -4343,7 +4763,7 @@ void CheckOther::checkOverlappingWrite()
                         constexpr bool macro = true;
                         constexpr bool pure = true;
                         constexpr bool follow = true;
-                        if (!isSameExpression(macro, ptr1, ptr2, *mSettings, pure, follow, &errorPath))
+                        if (!isSameExpression(macro, ptr1, ptr2, mSettings, pure, follow, &errorPath))
                             continue;
                         overlappingWriteFunction(tok, tok->str());
                     }
@@ -4355,9 +4775,9 @@ void CheckOther::checkOverlappingWrite()
                 MathLib::bigint sizeValue = args[sizeArg-1]->getKnownIntValue();
                 const Token *buf1, *buf2;
                 MathLib::bigint offset1, offset2;
-                if (!getBufAndOffset(ptr1, buf1, &offset1, *mSettings, isCountArg ? &sizeValue : nullptr))
+                if (!getBufAndOffset(ptr1, buf1, &offset1, mSettings, isCountArg ? &sizeValue : nullptr))
                     continue;
-                if (!getBufAndOffset(ptr2, buf2, &offset2, *mSettings))
+                if (!getBufAndOffset(ptr2, buf2, &offset2, mSettings))
                     continue;
 
                 if (offset1 < offset2 && offset1 + sizeValue <= offset2)
@@ -4369,7 +4789,7 @@ void CheckOther::checkOverlappingWrite()
                 constexpr bool macro = true;
                 constexpr bool pure = true;
                 constexpr bool follow = true;
-                if (!isSameExpression(macro, buf1, buf2, *mSettings, pure, follow, &errorPath))
+                if (!isSameExpression(macro, buf1, buf2, mSettings, pure, follow, &errorPath))
                     continue;
                 overlappingWriteFunction(tok, tok->str());
             }
@@ -4377,22 +4797,24 @@ void CheckOther::checkOverlappingWrite()
     }
 }
 
-void CheckOther::overlappingWriteUnion(const Token *tok)
+void CheckOtherImpl::overlappingWriteUnion(const Token *tok)
 {
     reportError(tok, Severity::error, "overlappingWriteUnion", "Overlapping read/write of union is undefined behavior");
 }
 
-void CheckOther::overlappingWriteFunction(const Token *tok, const std::string& funcname)
+void CheckOtherImpl::overlappingWriteFunction(const Token *tok, const std::string& funcname)
 {
     reportError(tok, Severity::error, "overlappingWriteFunction", "Overlapping read/write in " + funcname + "() is undefined behavior");
 }
 
-void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckOther checkOther(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckOtherImpl checkOther(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkOther.warningOldStylePointerCast();
+    checkOther.warningDangerousTypeCast();
+    checkOther.warningIntToPointerCast();
     checkOther.suspiciousFloatingPointCast();
     checkOther.invalidPointerCast();
     checkOther.checkCharVariable();
@@ -4434,11 +4856,12 @@ void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkOther.checkAccessOfMovedVariable();
     checkOther.checkModuloOfOne();
     checkOther.checkOverlappingWrite();
+    checkOther.checkUnionZeroInit();
 }
 
-void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckOther::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckOther c(nullptr, settings, errorLogger);
+    CheckOtherImpl c(nullptr, settings, errorLogger);
 
     // error
     c.zerodivError(nullptr, nullptr);
@@ -4459,8 +4882,12 @@ void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.checkComparisonFunctionIsAlwaysTrueOrFalseError(nullptr, "isless","varName",false);
     c.checkCastIntToCharAndBackError(nullptr, "func_name");
     c.cstyleCastError(nullptr);
+    c.dangerousTypeCastError(nullptr, true);
+    c.intToPointerCastError(nullptr, "decimal");
     c.suspiciousFloatingPointCastError(nullptr);
     c.passedByValueError(nullptr, false);
+    // TODO: iterateByValue
+    // TODO: passedByValueCallback
     c.constVariableError(nullptr, nullptr);
     c.constStatementError(nullptr, "type", false);
     c.signedCharArrayIndexError(nullptr);
@@ -4498,16 +4925,20 @@ void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.accessMovedError(nullptr, "v", nullptr, false);
     c.funcArgNamesDifferent("function", 1, nullptr, nullptr);
     c.redundantBitwiseOperationInSwitchError(nullptr, "varname");
-    c.shadowError(nullptr, nullptr, "variable");
-    c.shadowError(nullptr, nullptr, "function");
-    c.shadowError(nullptr, nullptr, "argument");
+    c.shadowError(nullptr, "local variable", nullptr, "variable");
+    c.shadowError(nullptr, "local variable", nullptr, "argument");
+    c.shadowError(nullptr, "local variable", nullptr, "function");
+    c.shadowError(nullptr, "local variable", nullptr, "member");
     c.knownArgumentError(nullptr, nullptr, nullptr, "x", false);
     c.knownPointerToBoolError(nullptr, nullptr);
     c.comparePointersError(nullptr, nullptr, nullptr);
+    // TODO: subtractPointers
     c.redundantAssignmentError(nullptr, nullptr, "var", false);
     c.redundantInitializationError(nullptr, nullptr, "var", false);
+    c.redundantContinueError(nullptr);
 
     const std::vector<const Token *> nullvec;
     c.funcArgOrderDifferent("function", nullptr, nullptr, nullvec, nullvec);
     c.checkModuloOfOneError(nullptr);
+    c.unionZeroInitError(nullptr, UnionMember());
 }
diff --git a/lib/checkother.h b/lib/checkother.h
index b32461d07a9..caf9f4a9e57 100644
--- a/lib/checkother.h
+++ b/lib/checkother.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "errortypes.h"
 
@@ -40,6 +41,7 @@ class Function;
 class Variable;
 class ErrorLogger;
 class Tokenizer;
+struct UnionMember;
 
 /// @addtogroup Checks
 /// @{
@@ -48,28 +50,87 @@ class Tokenizer;
 /** @brief Various small checks */
 
 class CPPCHECKLIB CheckOther : public Check {
-    friend class TestCharVar;
-    friend class TestIncompleteStatement;
-    friend class TestOther;
-
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckOther() : Check(myName()) {}
+    CheckOther() : Check("Other") {}
 
-    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is less than zero? */
-    static bool comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress = false);
+private:
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is positive? */
-    static bool testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr);
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
 
-private:
+    std::string classInfo() const override {
+        return "Other checks\n"
+
+               // error
+               "- division with zero\n"
+               "- scoped object destroyed immediately after construction\n"
+               "- assignment in an assert statement\n"
+               "- free() or delete of an invalid memory location\n"
+               "- bitwise operation with negative right operand\n"
+               "- cast the return values of getc(),fgetc() and getchar() to character and compare it to EOF\n"
+               "- race condition with non-interlocked access after InterlockedDecrement() call\n"
+               "- expression 'x = x++;' depends on order of evaluation of side effects\n"
+               "- overlapping write of union\n"
+
+               // warning
+               "- either division by zero or useless condition\n"
+               "- access of moved or forwarded variable.\n"
+
+               // performance
+               "- redundant data copying for const variable\n"
+               "- subsequent assignment or copying to a variable or buffer\n"
+               "- passing parameter by value\n"
+
+               // portability
+               "- Passing NULL pointer to function with variable number of arguments leads to UB.\n"
+
+               // style
+               "- C-style pointer cast in C++ code\n"
+               "- casting between incompatible pointer types\n"
+               "- [Incomplete statement](IncompleteStatement)\n"
+               "- [check how signed char variables are used](CharVar)\n"
+               "- variable scope can be limited\n"
+               "- unusual pointer arithmetic. For example: \"abc\" + 'd'\n"
+               "- redundant assignment, increment, or bitwise operation in a switch statement\n"
+               "- redundant strcpy in a switch statement\n"
+               "- Suspicious case labels in switch()\n"
+               "- assignment of a variable to itself\n"
+               "- Comparison of values leading always to true or false\n"
+               "- Clarify calculation with parentheses\n"
+               "- suspicious comparison of '\\0' with a char\\* variable\n"
+               "- duplicate break statement\n"
+               "- unreachable code\n"
+               "- testing if unsigned variable is negative/positive\n"
+               "- Suspicious use of ; at the end of 'if/for/while' statement.\n"
+               "- Array filled incompletely using memset/memcpy/memmove.\n"
+               "- NaN (not a number) value used in arithmetic expression.\n"
+               "- comma in return statement (the comma can easily be misread as a semicolon).\n"
+               "- prefer erfc, expm1 or log1p to avoid loss of precision.\n"
+               "- identical code in both branches of if/else or ternary operator.\n"
+               "- redundant pointer operation on pointer like &\\*some_ptr.\n"
+               "- find unused 'goto' labels.\n"
+               "- function declaration and definition argument names different.\n"
+               "- function declaration and definition argument order different.\n"
+               "- shadow variable.\n"
+               "- variable can be declared const.\n"
+               "- calculating modulo of one.\n"
+               "- known function argument, suspicious calculation.\n";
+    }
+};
+
+class CPPCHECKLIB CheckOtherImpl : public CheckImpl {
+public:
     /** @brief This constructor is used when running checks. */
-    CheckOther(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    CheckOtherImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
+    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is less than zero? */
+    static bool comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress = false);
 
-    /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    /** Is expression a comparison that checks if a nonzero (unsigned/pointer) expression is positive? */
+    static bool testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr);
 
     /** @brief Clarify calculation for ".. a * b ? .." */
     void clarifyCalculation();
@@ -80,6 +141,12 @@ class CPPCHECKLIB CheckOther : public Check {
     /** @brief Are there C-style pointer casts in a c++ file? */
     void warningOldStylePointerCast();
 
+    /** @brief Dangerous type cast */
+    void warningDangerousTypeCast();
+
+    /** @brief Casting non-hexadecimal integer literal to pointer */
+    void warningIntToPointerCast();
+
     void suspiciousFloatingPointCast();
 
     /** @brief Check for pointer casts to a type with an incompatible binary data representation */
@@ -188,6 +255,11 @@ class CPPCHECKLIB CheckOther : public Check {
 
     void checkModuloOfOne();
 
+    /**
+     * @throws InternalError thrown if largest union member could not be found
+     */
+    void checkUnionZeroInit();
+
     void checkOverlappingWrite();
     void overlappingWriteUnion(const Token *tok);
     void overlappingWriteFunction(const Token *tok, const std::string& funcname);
@@ -198,10 +270,12 @@ class CPPCHECKLIB CheckOther : public Check {
     void clarifyCalculationError(const Token *tok, const std::string &op);
     void clarifyStatementError(const Token* tok);
     void cstyleCastError(const Token *tok, bool isPtr = true);
+    void dangerousTypeCastError(const Token *tok, bool isPtr);
+    void intToPointerCastError(const Token *tok, const std::string& format);
     void suspiciousFloatingPointCastError(const Token *tok);
     void invalidPointerCastError(const Token* tok, const std::string& from, const std::string& to, bool inconclusive, bool toIsInt);
     void passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor = false);
-    void constVariableError(const Variable *var, const Function *function);
+    void constVariableError(const Variable *var, const Function *function, bool foundAllBaseClasses = true);
     void constStatementError(const Token *tok, const std::string &type, bool inconclusive);
     void signedCharArrayIndexError(const Token *tok);
     void unknownSignCharArrayIndexError(const Token *tok);
@@ -242,78 +316,14 @@ class CPPCHECKLIB CheckOther : public Check {
     void unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef);
     void unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBehavior = false);
     void accessMovedError(const Token *tok, const std::string &varname, const ValueFlow::Value *value, bool inconclusive);
-    void funcArgNamesDifferent(const std::string & functionName, nonneg int index, const Token* declaration, const Token* definition);
+    void funcArgNamesDifferent(const std::string & functionName, size_t index, const Token* declaration, const Token* definition);
     void funcArgOrderDifferent(const std::string & functionName, const Token * declaration, const Token * definition, const std::vector<const Token*> & declarations, const std::vector<const Token*> & definitions);
-    void shadowError(const Token *var, const Token *shadowed, const std::string& type);
+    void shadowError(const Token *shadows, const std::string &shadowsType, const Token *shadowed, const std::string &shadowedType);
     void knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value, const std::string &varexpr, bool isVariableExpressionHidden);
     void knownPointerToBoolError(const Token* tok, const ValueFlow::Value* value);
     void comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2);
     void checkModuloOfOneError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Other";
-    }
-
-    std::string classInfo() const override {
-        return "Other checks\n"
-
-               // error
-               "- division with zero\n"
-               "- scoped object destroyed immediately after construction\n"
-               "- assignment in an assert statement\n"
-               "- free() or delete of an invalid memory location\n"
-               "- bitwise operation with negative right operand\n"
-               "- cast the return values of getc(),fgetc() and getchar() to character and compare it to EOF\n"
-               "- race condition with non-interlocked access after InterlockedDecrement() call\n"
-               "- expression 'x = x++;' depends on order of evaluation of side effects\n"
-               "- overlapping write of union\n"
-
-               // warning
-               "- either division by zero or useless condition\n"
-               "- access of moved or forwarded variable.\n"
-
-               // performance
-               "- redundant data copying for const variable\n"
-               "- subsequent assignment or copying to a variable or buffer\n"
-               "- passing parameter by value\n"
-
-               // portability
-               "- Passing NULL pointer to function with variable number of arguments leads to UB.\n"
-
-               // style
-               "- C-style pointer cast in C++ code\n"
-               "- casting between incompatible pointer types\n"
-               "- [Incomplete statement](IncompleteStatement)\n"
-               "- [check how signed char variables are used](CharVar)\n"
-               "- variable scope can be limited\n"
-               "- unusual pointer arithmetic. For example: \"abc\" + 'd'\n"
-               "- redundant assignment, increment, or bitwise operation in a switch statement\n"
-               "- redundant strcpy in a switch statement\n"
-               "- Suspicious case labels in switch()\n"
-               "- assignment of a variable to itself\n"
-               "- Comparison of values leading always to true or false\n"
-               "- Clarify calculation with parentheses\n"
-               "- suspicious comparison of '\\0' with a char\\* variable\n"
-               "- duplicate break statement\n"
-               "- unreachable code\n"
-               "- testing if unsigned variable is negative/positive\n"
-               "- Suspicious use of ; at the end of 'if/for/while' statement.\n"
-               "- Array filled incompletely using memset/memcpy/memmove.\n"
-               "- NaN (not a number) value used in arithmetic expression.\n"
-               "- comma in return statement (the comma can easily be misread as a semicolon).\n"
-               "- prefer erfc, expm1 or log1p to avoid loss of precision.\n"
-               "- identical code in both branches of if/else or ternary operator.\n"
-               "- redundant pointer operation on pointer like &\\*some_ptr.\n"
-               "- find unused 'goto' labels.\n"
-               "- function declaration and definition argument names different.\n"
-               "- function declaration and definition argument order different.\n"
-               "- shadow variable.\n"
-               "- variable can be declared const.\n"
-               "- calculating modulo of one.\n"
-               "- known function argument, suspicious calculation.\n";
-    }
+    void unionZeroInitError(const Token *tok, const UnionMember& largestMember);
 
     bool diag(const Token* tok) {
         return !mRedundantAssignmentDiag.emplace(tok).second;
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
index c6c9ccba77b..f15fa293c49 100644
--- a/lib/checkpostfixoperator.cpp
+++ b/lib/checkpostfixoperator.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -34,19 +34,12 @@
 //---------------------------------------------------------------------------
 
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckPostfixOperator instance;
-}
-
-
 // CWE ids used
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
-
-void CheckPostfixOperator::postfixOperator()
+void CheckPostfixOperatorImpl::postfixOperator()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckPostfixOperator::postfixOperator"); // performance
@@ -90,7 +83,7 @@ void CheckPostfixOperator::postfixOperator()
 //---------------------------------------------------------------------------
 
 
-void CheckPostfixOperator::postfixOperatorError(const Token *tok)
+void CheckPostfixOperatorImpl::postfixOperatorError(const Token *tok)
 {
     reportError(tok, Severity::performance, "postfixOperator",
                 "Prefer prefix ++/-- operators for non-primitive types.\n"
@@ -101,17 +94,17 @@ void CheckPostfixOperator::postfixOperatorError(const Token *tok)
                 "adds a little extra code.", CWE398, Certainty::normal);
 }
 
-void CheckPostfixOperator::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckPostfixOperator::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (tokenizer.isC())
         return;
 
-    CheckPostfixOperator checkPostfixOperator(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckPostfixOperatorImpl checkPostfixOperator(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkPostfixOperator.postfixOperator();
 }
 
-void CheckPostfixOperator::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckPostfixOperator::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckPostfixOperator c(nullptr, settings, errorLogger);
+    CheckPostfixOperatorImpl c(nullptr, settings, errorLogger);
     c.postfixOperatorError(nullptr);
 }
diff --git a/lib/checkpostfixoperator.h b/lib/checkpostfixoperator.h
index c9f58a7e143..5898cefcc3c 100644
--- a/lib/checkpostfixoperator.h
+++ b/lib/checkpostfixoperator.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -40,34 +41,30 @@ class Tokenizer;
  */
 
 class CPPCHECKLIB CheckPostfixOperator : public Check {
-    friend class TestPostfixOperator;
-
 public:
     /** This constructor is used when registering the CheckPostfixOperator */
-    CheckPostfixOperator() : Check(myName()) {}
+    CheckPostfixOperator() : Check("Using postfix operators") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckPostfixOperator(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+    std::string classInfo() const override {
+        return "Warn if using postfix operators ++ or -- rather than prefix operator\n";
+    }
+};
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+class CPPCHECKLIB CheckPostfixOperatorImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckPostfixOperatorImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Check postfix operators */
     void postfixOperator();
 
     /** Report Error */
     void postfixOperatorError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Using postfix operators";
-    }
-
-    std::string classInfo() const override {
-        return "Warn if using postfix operators ++ or -- rather than prefix operator\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checks.cpp b/lib/checks.cpp
new file mode 100644
index 00000000000..ef4b9fef3da
--- /dev/null
+++ b/lib/checks.cpp
@@ -0,0 +1,125 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+#include "checks.h"
+
+#include "check64bit.h"
+#include "checkassert.h"
+#include "checkautovariables.h"
+#include "checkbool.h"
+#include "checkbufferoverrun.h"
+#include "checkclass.h"
+#include "checkcondition.h"
+#include "checkexceptionsafety.h"
+#include "checkfunctions.h"
+#include "checkinternal.h"
+#include "checkio.h"
+#include "checkleakautovar.h"
+#include "checkmemoryleak.h"
+#include "checknullpointer.h"
+#include "checkother.h"
+#include "checkpostfixoperator.h"
+#include "checksizeof.h"
+#include "checkstl.h"
+#include "checkstring.h"
+#include "checktype.h"
+#include "checkuninitvar.h"
+#include "checkunusedvar.h"
+#include "checkvaarg.h"
+
+#include <memory>
+
+class CheckInstancesImpl
+{
+private:
+/* *INDENT-OFF* */
+#define UPI(c) std::unique_ptr<c> m##c{new c}
+/* *INDENT-ON* */
+    UPI(Check64BitPortability);
+    UPI(CheckAssert);
+    UPI(CheckAutoVariables);
+    UPI(CheckBool);
+    UPI(CheckBufferOverrun);
+    UPI(CheckClass);
+    UPI(CheckCondition);
+    UPI(CheckExceptionSafety);
+    UPI(CheckFunctions);
+#ifdef CHECK_INTERNAL
+    UPI(CheckInternal);
+#endif
+    UPI(CheckIO);
+    UPI(CheckLeakAutoVar);
+    UPI(CheckMemoryLeakInFunction);
+    UPI(CheckMemoryLeakInClass);
+    UPI(CheckMemoryLeakStructMember);
+    UPI(CheckMemoryLeakNoVar);
+    UPI(CheckNullPointer);
+    UPI(CheckOther);
+    UPI(CheckPostfixOperator);
+    UPI(CheckSizeof);
+    UPI(CheckStl);
+    UPI(CheckString);
+    UPI(CheckType);
+    UPI(CheckUninitVar);
+    UPI(CheckUnusedVar);
+    UPI(CheckVaarg);
+#undef UPI
+
+public:
+    const std::list<Check *>& get() const
+    {
+        static std::list<Check*> s_checks{
+            mCheck64BitPortability.get(),
+            mCheckAssert.get(),
+            mCheckAutoVariables.get(),
+            mCheckBool.get(),
+            mCheckBufferOverrun.get(),
+            mCheckClass.get(),
+            mCheckCondition.get(),
+            mCheckExceptionSafety.get(),
+            mCheckFunctions.get(),
+    #ifdef CHECK_INTERNAL
+            mCheckInternal.get(),
+    #endif
+            mCheckIO.get(),
+            mCheckLeakAutoVar.get(),
+            mCheckMemoryLeakInFunction.get(),
+            mCheckMemoryLeakInClass.get(),
+            mCheckMemoryLeakStructMember.get(),
+            mCheckMemoryLeakNoVar.get(),
+            mCheckNullPointer.get(),
+            mCheckOther.get(),
+            mCheckPostfixOperator.get(),
+            mCheckSizeof.get(),
+            mCheckStl.get(),
+            mCheckString.get(),
+            mCheckType.get(),
+            mCheckUninitVar.get(),
+            mCheckUnusedVar.get(),
+            mCheckVaarg.get()
+        };
+
+        return s_checks;
+    }
+};
+
+const std::list<Check*>& CheckInstances::get()
+{
+    static const CheckInstancesImpl s_impl;
+    return s_impl.get();
+}
diff --git a/lib/checks.h b/lib/checks.h
new file mode 100644
index 00000000000..9c053b81405
--- /dev/null
+++ b/lib/checks.h
@@ -0,0 +1,34 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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 checksH
+#define checksH
+
+#include "config.h"
+
+#include <list>
+
+class Check;
+
+namespace CheckInstances
+{
+    /** List of registered check classes. This is used by Cppcheck to run checks and generate documentation */
+    CPPCHECKLIB const std::list<Check *>& get();
+}
+
+#endif // checksH
diff --git a/lib/checksizeof.cpp b/lib/checksizeof.cpp
index 6bf51f97c82..2d9012078a6 100644
--- a/lib/checksizeof.cpp
+++ b/lib/checksizeof.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -34,19 +34,14 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckSizeof instance;
-}
-
 // CWE IDs used:
 static const CWE CWE467(467U);   // Use of sizeof() on a Pointer Type
 static const CWE CWE682(682U);   // Incorrect Calculation
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
-void CheckSizeof::checkSizeofForNumericParameter()
+void CheckSizeofImpl::checkSizeofForNumericParameter()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::checkSizeofForNumericParameter"); // warning
@@ -62,7 +57,7 @@ void CheckSizeof::checkSizeofForNumericParameter()
     }
 }
 
-void CheckSizeof::sizeofForNumericParameterError(const Token *tok)
+void CheckSizeofImpl::sizeofForNumericParameterError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofwithnumericparameter", "Suspicious usage of 'sizeof' with a numeric constant as parameter.\n"
@@ -74,9 +69,9 @@ void CheckSizeof::sizeofForNumericParameterError(const Token *tok)
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
-void CheckSizeof::checkSizeofForArrayParameter()
+void CheckSizeofImpl::checkSizeofForArrayParameter()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::checkSizeofForArrayParameter"); // warning
@@ -92,14 +87,14 @@ void CheckSizeof::checkSizeofForArrayParameter()
                 }
 
                 const Variable *var = varTok->variable();
-                if (var && var->isArray() && var->isArgument() && !var->isReference())
+                if (var && var->isArray() && var->isArgument() && !var->isReference() && !(var->isStlType() && var->getTypeName() == "std::array"))
                     sizeofForArrayParameterError(tok);
             }
         }
     }
 }
 
-void CheckSizeof::sizeofForArrayParameterError(const Token *tok)
+void CheckSizeofImpl::sizeofForArrayParameterError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofwithsilentarraypointer", "Using 'sizeof' on array given as function argument "
@@ -115,9 +110,9 @@ void CheckSizeof::sizeofForArrayParameterError(const Token *tok)
                 );
 }
 
-void CheckSizeof::checkSizeofForPointerSize()
+void CheckSizeofImpl::checkSizeofForPointerSize()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::checkSizeofForPointerSize"); // warning
@@ -134,12 +129,12 @@ void CheckSizeof::checkSizeofForPointerSize()
             // Once leaving those tests, it is mandatory to have:
             // - variable matching the used pointer
             // - tokVar pointing on the argument where sizeof may be used
-            if (Token::Match(tok->tokAt(2), "%name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2))) {
+            if (Token::Match(tok->tokAt(2), "%name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2))) {
                 if (Token::Match(tok, "%var% ="))
                     variable = tok;
                 else if (tok->strAt(1) == ")" && Token::Match(tok->linkAt(1)->tokAt(-2), "%var% ="))
                     variable = tok->linkAt(1)->tokAt(-2);
-                else if (tok->link() && Token::Match(tok, "> ( %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)) && Token::Match(tok->link()->tokAt(-3), "%var% ="))
+                else if (tok->link() && Token::Match(tok, "> ( %name% (") && Token::Match(tok->link()->tokAt(-3), "%var% ="))
                     variable = tok->link()->tokAt(-3);
                 tokSize = tok->tokAt(4);
                 tokFunc = tok->tokAt(2);
@@ -238,7 +233,8 @@ void CheckSizeof::checkSizeofForPointerSize()
             // Now check for the sizeof usage: Does the level of pointer indirection match?
             const Token * const tokLink = tokSize->linkAt(1);
             if (tokLink && tokLink->strAt(-1) == "*") {
-                if (variable && variable->valueType() && variable->valueType()->pointer == 1 && variable->valueType()->type != ValueType::VOID)
+                if (variable && variable->valueType() && variable->valueType()->pointer == 1 && variable->valueType()->type != ValueType::VOID &&
+                    variable->valueType()->isTypeEqual(tokSize->next()->astOperand2()->valueType()))
                     sizeofForPointerError(variable, variable->str());
                 else if (variable2 && variable2->valueType() && variable2->valueType()->pointer == 1 && variable2->valueType()->type != ValueType::VOID)
                     sizeofForPointerError(variable2, variable2->str());
@@ -267,7 +263,7 @@ void CheckSizeof::checkSizeofForPointerSize()
     }
 }
 
-void CheckSizeof::sizeofForPointerError(const Token *tok, const std::string &varname)
+void CheckSizeofImpl::sizeofForPointerError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::warning, "pointerSize",
                 "Size of pointer '" + varname + "' used instead of size of its data.\n"
@@ -276,7 +272,7 @@ void CheckSizeof::sizeofForPointerError(const Token *tok, const std::string &var
                 "write 'sizeof(*" + varname + ")'.", CWE467, Certainty::normal);
 }
 
-void CheckSizeof::divideBySizeofError(const Token *tok, const std::string &memfunc)
+void CheckSizeofImpl::divideBySizeofError(const Token *tok, const std::string &memfunc)
 {
     reportError(tok, Severity::warning, "sizeofDivisionMemfunc",
                 "Division by result of sizeof(). " + memfunc + "() expects a size in bytes, did you intend to multiply instead?", CWE682, Certainty::normal);
@@ -284,9 +280,9 @@ void CheckSizeof::divideBySizeofError(const Token *tok, const std::string &memfu
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void CheckSizeof::sizeofsizeof()
+void CheckSizeofImpl::sizeofsizeof()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::sizeofsizeof"); // warning
@@ -299,7 +295,7 @@ void CheckSizeof::sizeofsizeof()
     }
 }
 
-void CheckSizeof::sizeofsizeofError(const Token *tok)
+void CheckSizeofImpl::sizeofsizeofError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofsizeof", "Calling 'sizeof' on 'sizeof'.\n"
@@ -310,14 +306,14 @@ void CheckSizeof::sizeofsizeofError(const Token *tok)
 
 //-----------------------------------------------------------------------------
 
-void CheckSizeof::sizeofCalculation()
+void CheckSizeofImpl::sizeofCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckSizeof::sizeofCalculation"); // warning
 
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
 
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!Token::simpleMatch(tok, "sizeof ("))
@@ -348,7 +344,7 @@ void CheckSizeof::sizeofCalculation()
     }
 }
 
-void CheckSizeof::sizeofCalculationError(const Token *tok, bool inconclusive)
+void CheckSizeofImpl::sizeofCalculationError(const Token *tok, bool inconclusive)
 {
     reportError(tok, Severity::warning,
                 "sizeofCalculation", "Found calculation inside sizeof().", CWE682, inconclusive ? Certainty::inconclusive : Certainty::normal);
@@ -356,9 +352,9 @@ void CheckSizeof::sizeofCalculationError(const Token *tok, bool inconclusive)
 
 //-----------------------------------------------------------------------------
 
-void CheckSizeof::sizeofFunction()
+void CheckSizeofImpl::sizeofFunction()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("sizeofFunctionCall"))
+    if (!mSettings.severity.isEnabled(Severity::warning) && !mSettings.isPremiumEnabled("sizeofFunctionCall"))
         return;
 
     logChecker("CheckSizeof::sizeofFunction"); // warning
@@ -379,7 +375,7 @@ void CheckSizeof::sizeofFunction()
             if (const Token *argument = tok->next()->astOperand2()) {
                 const Token *checkToken = argument->previous();
                 if (checkToken->tokType() == Token::eName)
-                    break;
+                    continue;
                 const Function * fun = checkToken->function();
                 // Don't report error if the function is overloaded
                 if (fun && fun->nestedIn->functionMap.count(checkToken->str()) == 1) {
@@ -390,7 +386,7 @@ void CheckSizeof::sizeofFunction()
     }
 }
 
-void CheckSizeof::sizeofFunctionError(const Token *tok)
+void CheckSizeofImpl::sizeofFunctionError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "sizeofFunctionCall", "Found function call inside sizeof().", CWE682, Certainty::normal);
@@ -399,9 +395,9 @@ void CheckSizeof::sizeofFunctionError(const Token *tok)
 //-----------------------------------------------------------------------------
 // Check for code like sizeof()*sizeof() or sizeof(ptr)/value
 //-----------------------------------------------------------------------------
-void CheckSizeof::suspiciousSizeofCalculation()
+void CheckSizeofImpl::suspiciousSizeofCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings.severity.isEnabled(Severity::warning) || !mSettings.certainty.isEnabled(Certainty::inconclusive))
         return;
 
     logChecker("CheckSizeof::suspiciousSizeofCalculation"); // warning,inconclusive
@@ -429,13 +425,13 @@ void CheckSizeof::suspiciousSizeofCalculation()
     }
 }
 
-void CheckSizeof::multiplySizeofError(const Token *tok)
+void CheckSizeofImpl::multiplySizeofError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "multiplySizeof", "Multiplying sizeof() with sizeof() indicates a logic error.", CWE682, Certainty::inconclusive);
 }
 
-void CheckSizeof::divideSizeofError(const Token *tok)
+void CheckSizeofImpl::divideSizeofError(const Token *tok)
 {
     reportError(tok, Severity::warning,
                 "divideSizeof", "Division of result of sizeof() on pointer type.\n"
@@ -443,9 +439,9 @@ void CheckSizeof::divideSizeofError(const Token *tok)
                 "not the size of the memory area it points to.", CWE682, Certainty::inconclusive);
 }
 
-void CheckSizeof::sizeofVoid()
+void CheckSizeofImpl::sizeofVoid()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings.severity.isEnabled(Severity::portability))
         return;
 
     logChecker("CheckSizeof::sizeofVoid"); // portability
@@ -481,30 +477,30 @@ void CheckSizeof::sizeofVoid()
     }
 }
 
-void CheckSizeof::sizeofVoidError(const Token *tok)
+void CheckSizeofImpl::sizeofVoidError(const Token *tok)
 {
     const std::string message = "Behaviour of 'sizeof(void)' is not covered by the ISO C standard.";
     const std::string verbose = message + " A value for 'sizeof(void)' is defined only as part of a GNU C extension, which defines 'sizeof(void)' to be 1.";
     reportError(tok, Severity::portability, "sizeofVoid", message + "\n" + verbose, CWE682, Certainty::normal);
 }
 
-void CheckSizeof::sizeofDereferencedVoidPointerError(const Token *tok, const std::string &varname)
+void CheckSizeofImpl::sizeofDereferencedVoidPointerError(const Token *tok, const std::string &varname)
 {
     const std::string message = "'*" + varname + "' is of type 'void', the behaviour of 'sizeof(void)' is not covered by the ISO C standard.";
     const std::string verbose = message + " A value for 'sizeof(void)' is defined only as part of a GNU C extension, which defines 'sizeof(void)' to be 1.";
     reportError(tok, Severity::portability, "sizeofDereferencedVoidPointer", message + "\n" + verbose, CWE682, Certainty::normal);
 }
 
-void CheckSizeof::arithOperationsOnVoidPointerError(const Token* tok, const std::string &varname, const std::string &vartype)
+void CheckSizeofImpl::arithOperationsOnVoidPointerError(const Token* tok, const std::string &varname, const std::string &vartype)
 {
     const std::string message = "'$symbol' is of type '" + vartype + "'. When using void pointers in calculations, the behaviour is undefined.";
     const std::string verbose = message + " Arithmetic operations on 'void *' is a GNU C extension, which defines the 'sizeof(void)' to be 1.";
     reportError(tok, Severity::portability, "arithOperationsOnVoidPointer", "$symbol:" + varname + '\n' + message + '\n' + verbose, CWE467, Certainty::normal);
 }
 
-void CheckSizeof::runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger)
+void CheckSizeof::runChecks(const Tokenizer& tokenizer, ErrorLogger& errorLogger)
 {
-    CheckSizeof checkSizeof(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckSizeofImpl checkSizeof(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkSizeof.sizeofsizeof();
@@ -517,9 +513,9 @@ void CheckSizeof::runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger
     checkSizeof.sizeofVoid();
 }
 
-void CheckSizeof::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+void CheckSizeof::getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const
 {
-    CheckSizeof c(nullptr, settings, errorLogger);
+    CheckSizeofImpl c(nullptr, settings, errorLogger);
     c.sizeofForArrayParameterError(nullptr);
     c.sizeofForPointerError(nullptr, "varname");
     c.divideBySizeofError(nullptr, "memset");
diff --git a/lib/checksizeof.h b/lib/checksizeof.h
index 4c10ca88dac..7540fe6785d 100644
--- a/lib/checksizeof.h
+++ b/lib/checksizeof.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,15 +42,32 @@ class Tokenizer;
 class CPPCHECKLIB CheckSizeof : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckSizeof() : Check(myName()) {}
+    CheckSizeof() : Check("Sizeof") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckSizeof(const Tokenizer* tokenizer, const Settings* settings, ErrorLogger* errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger) override;
+    void runChecks(const Tokenizer& tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const override;
+
+    std::string classInfo() const override {
+        return "sizeof() usage checks\n"
+               "- sizeof for array given as function argument\n"
+               "- sizeof for numeric given as function argument\n"
+               "- using sizeof(pointer) instead of the size of pointed data\n"
+               "- look for 'sizeof sizeof ..'\n"
+               "- look for calculations inside sizeof()\n"
+               "- look for function calls inside sizeof()\n"
+               "- look for suspicious calculations with sizeof()\n"
+               "- using 'sizeof(void)' which is undefined\n";
+    }
+};
+
+class CPPCHECKLIB CheckSizeofImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckSizeofImpl(const Tokenizer* tokenizer, const Settings& settings, ErrorLogger& errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for 'sizeof sizeof ..' */
     void sizeofsizeof();
@@ -88,24 +106,6 @@ class CPPCHECKLIB CheckSizeof : public Check {
     void sizeofVoidError(const Token *tok);
     void sizeofDereferencedVoidPointerError(const Token *tok, const std::string &varname);
     void arithOperationsOnVoidPointerError(const Token* tok, const std::string &varname, const std::string &vartype);
-
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
-
-    static std::string myName() {
-        return "Sizeof";
-    }
-
-    std::string classInfo() const override {
-        return "sizeof() usage checks\n"
-               "- sizeof for array given as function argument\n"
-               "- sizeof for numeric given as function argument\n"
-               "- using sizeof(pointer) instead of the size of pointed data\n"
-               "- look for 'sizeof sizeof ..'\n"
-               "- look for calculations inside sizeof()\n"
-               "- look for function calls inside sizeof()\n"
-               "- look for suspicious calculations with sizeof()\n"
-               "- using 'sizeof(void)' which is undefined\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index bdade21bd48..637f5e1e8b8 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -35,6 +35,7 @@
 #include "checknullpointer.h"
 
 #include <algorithm>
+#include <functional>
 #include <initializer_list>
 #include <iterator>
 #include <list>
@@ -46,11 +47,6 @@
 #include <utility>
 #include <vector>
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckStl instance;
-}
-
 // CWE IDs used:
 static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 static const CWE CWE597(597U);   // Use of Wrong Operator in String Comparison
@@ -132,7 +128,17 @@ static const Token* getContainerFromSize(const Library::Container* container, co
     return nullptr;
 }
 
-void CheckStl::outOfBounds()
+// A value that out of bounds analysis can use: not impossible, and inconclusive only when enabled
+static bool isUsableValue(const ValueFlow::Value& value, const Settings& settings)
+{
+    if (value.isImpossible())
+        return false;
+    if (value.isInconclusive() && !settings.certainty.isEnabled(Certainty::inconclusive))
+        return false;
+    return true;
+}
+
+void CheckStlImpl::outOfBounds()
 {
     logChecker("CheckStl::outOfBounds");
 
@@ -153,11 +159,9 @@ void CheckStl::outOfBounds()
             for (const ValueFlow::Value &value : tok->values()) {
                 if (!value.isContainerSizeValue())
                     continue;
-                if (value.isImpossible())
+                if (!isUsableValue(value, mSettings))
                     continue;
-                if (value.isInconclusive() && !mSettings->certainty.isEnabled(Certainty::inconclusive))
-                    continue;
-                if (!value.errorSeverity() && !mSettings->severity.isEnabled(Severity::warning))
+                if (!value.errorSeverity() && !mSettings.severity.isEnabled(Severity::warning))
                     continue;
                 if (value.intvalue == 0 && (indexTok ||
                                             (containerYieldsElement(container, parent) && !containerAppendsElement(container, parent)) ||
@@ -170,7 +174,7 @@ void CheckStl::outOfBounds()
                 }
                 if (indexTok) {
                     std::vector<ValueFlow::Value> indexValues =
-                        ValueFlow::isOutOfBounds(value, indexTok, mSettings->severity.isEnabled(Severity::warning));
+                        ValueFlow::isOutOfBounds(value, indexTok, mSettings.severity.isEnabled(Severity::warning));
                     if (!indexValues.empty()) {
                         outOfBoundsError(
                             accessTok, tok->expressionString(), &value, indexTok->expressionString(), &indexValues.front());
@@ -180,7 +184,7 @@ void CheckStl::outOfBounds()
             }
             if (indexTok && !indexTok->hasKnownIntValue()) {
                 const ValueFlow::Value* value =
-                    ValueFlow::findValue(indexTok->values(), *mSettings, [&](const ValueFlow::Value& v) {
+                    ValueFlow::findValue(indexTok->values(), mSettings, [&](const ValueFlow::Value& v) {
                     if (!v.isSymbolicValue())
                         return false;
                     if (v.isImpossible())
@@ -203,7 +207,7 @@ void CheckStl::outOfBounds()
     }
 }
 
-static std::string indexValueString(const ValueFlow::Value& indexValue, const std::string& containerName = emptyString)
+static std::string indexValueString(const ValueFlow::Value& indexValue, const std::string& containerName = "")
 {
     if (indexValue.isIteratorStartValue())
         return "at position " + MathLib::toString(indexValue.intvalue) + " from the beginning";
@@ -220,7 +224,7 @@ static std::string indexValueString(const ValueFlow::Value& indexValue, const st
     return indexString;
 }
 
-void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerName, const ValueFlow::Value *containerSize, const std::string &index, const ValueFlow::Value *indexValue)
+void CheckStlImpl::outOfBoundsError(const Token *tok, const std::string &containerName, const ValueFlow::Value *containerSize, const std::string &index, const ValueFlow::Value *indexValue)
 {
     // Do not warn if both the container size and index value are possible
     if (containerSize && indexValue && containerSize->isPossible() && indexValue->isPossible())
@@ -255,23 +259,14 @@ void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerNa
         return;
     }
 
-    ErrorPath errorPath;
-    if (!indexValue)
-        errorPath = getErrorPath(tok, containerSize, "Access out of bounds");
-    else {
-        ErrorPath errorPath1 = getErrorPath(tok, containerSize, "Access out of bounds");
-        ErrorPath errorPath2 = getErrorPath(tok, indexValue, "Access out of bounds");
-        if (errorPath1.size() <= 1)
-            errorPath = std::move(errorPath2);
-        else if (errorPath2.size() <= 1)
-            errorPath = std::move(errorPath1);
-        else {
-            errorPath = std::move(errorPath1);
-            errorPath.splice(errorPath.end(), errorPath2);
-        }
+    ErrorPath errorPath = getErrorPath(tok, containerSize, "Access out of bounds");
+    if (indexValue) {
+        ErrorPath errorPathIdx = getErrorPath(tok, indexValue, "Access out of bounds");
+        if (errorPathIdx.size() >= errorPath.size())
+            errorPath = std::move(errorPathIdx);
     }
 
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 (containerSize && !containerSize->errorSeverity()) || (indexValue && !indexValue->errorSeverity()) ? Severity::warning : Severity::error,
                 "containerOutOfBounds",
                 "$symbol:" + containerName +"\n" + errmsg,
@@ -279,18 +274,18 @@ void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerNa
                 (containerSize && containerSize->isInconclusive()) || (indexValue && indexValue->isInconclusive()) ? Certainty::inconclusive : Certainty::normal);
 }
 
-bool CheckStl::isContainerSize(const Token *containerToken, const Token *expr) const
+bool CheckStlImpl::isContainerSize(const Token *containerToken, const Token *expr) const
 {
     if (!Token::simpleMatch(expr, "( )"))
         return false;
     if (!Token::Match(expr->astOperand1(), ". %name% ("))
         return false;
-    if (!isSameExpression(false, containerToken, expr->astOperand1()->astOperand1(), *mSettings, false, false))
+    if (!isSameExpression(false, containerToken, expr->astOperand1()->astOperand1(), mSettings, false, false))
         return false;
     return containerToken->valueType()->container->getYield(expr->strAt(-1)) == Library::Container::Yield::SIZE;
 }
 
-bool CheckStl::isContainerSizeGE(const Token * containerToken, const Token *expr) const
+bool CheckStlImpl::isContainerSizeGE(const Token * containerToken, const Token *expr) const
 {
     if (!expr)
         return false;
@@ -314,12 +309,12 @@ bool CheckStl::isContainerSizeGE(const Token * containerToken, const Token *expr
             op = expr->astOperand1();
         else
             return false;
-        return op && op->getValueGE(0, *mSettings);
+        return op && op->getValueGE(0, mSettings);
     }
     return false;
 }
 
-void CheckStl::outOfBoundsIndexExpression()
+void CheckStlImpl::outOfBoundsIndexExpression()
 {
     logChecker("CheckStl::outOfBoundsIndexExpression");
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -339,7 +334,7 @@ void CheckStl::outOfBoundsIndexExpression()
     }
 }
 
-void CheckStl::outOfBoundsIndexExpressionError(const Token *tok, const Token *index)
+void CheckStlImpl::outOfBoundsIndexExpressionError(const Token *tok, const Token *index)
 {
     const std::string varname = tok ? tok->str() : std::string("var");
     const std::string i = index ? index->expressionString() : (varname + ".size()");
@@ -357,12 +352,12 @@ void CheckStl::outOfBoundsIndexExpressionError(const Token *tok, const Token *in
 
 
 // Error message for bad iterator usage..
-void CheckStl::invalidIteratorError(const Token *tok, const std::string &iteratorName)
+void CheckStlImpl::invalidIteratorError(const Token *tok, const std::string &iteratorName)
 {
     reportError(tok, Severity::error, "invalidIterator1", "$symbol:"+iteratorName+"\nInvalid iterator: $symbol", CWE664, Certainty::normal);
 }
 
-void CheckStl::iteratorsError(const Token* tok, const std::string& containerName1, const std::string& containerName2)
+void CheckStlImpl::iteratorsError(const Token* tok, const std::string& containerName1, const std::string& containerName2)
 {
     reportError(tok, Severity::error, "iterators1",
                 "$symbol:" + containerName1 + "\n"
@@ -370,16 +365,7 @@ void CheckStl::iteratorsError(const Token* tok, const std::string& containerName
                 "Same iterator is used with different containers '" + containerName1 + "' and '" + containerName2 + "'.", CWE664, Certainty::normal);
 }
 
-void CheckStl::iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName1, const std::string& containerName2)
-{
-    std::list<const Token*> callstack = { tok, containerTok };
-    reportError(callstack, Severity::error, "iterators2",
-                "$symbol:" + containerName1 + "\n"
-                "$symbol:" + containerName2 + "\n"
-                "Same iterator is used with different containers '" + containerName1 + "' and '" + containerName2 + "'.", CWE664, Certainty::normal);
-}
-
-void CheckStl::iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName)
+void CheckStlImpl::iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName)
 {
     std::list<const Token*> callstack = { tok, containerTok };
     reportError(callstack,
@@ -393,7 +379,7 @@ void CheckStl::iteratorsError(const Token* tok, const Token* containerTok, const
 }
 
 // Error message used when dereferencing an iterator that has been erased..
-void CheckStl::dereferenceErasedError(const Token *erased, const Token* deref, const std::string &itername, bool inconclusive)
+void CheckStlImpl::dereferenceErasedError(const Token *erased, const Token* deref, const std::string &itername, bool inconclusive)
 {
     if (erased) {
         std::list<const Token*> callstack = { deref, erased };
@@ -463,7 +449,7 @@ static bool isVector(const Token* tok)
     return Token::simpleMatch(decltok, "std :: vector");
 }
 
-void CheckStl::iterators()
+void CheckStlImpl::iterators()
 {
     logChecker("CheckStl::iterators");
 
@@ -484,7 +470,7 @@ void CheckStl::iterators()
         bool inconclusiveType=false;
         if (!isIterator(var, inconclusiveType))
             continue;
-        if (inconclusiveType && !mSettings->certainty.isEnabled(Certainty::inconclusive))
+        if (inconclusiveType && !mSettings.certainty.isEnabled(Certainty::inconclusive))
             continue;
 
         const int iteratorId = var->declarationId();
@@ -563,7 +549,7 @@ void CheckStl::iterators()
                     }
 
                     // Not different containers if a reference is used..
-                    if (containerToken && containerToken->variable() && containerToken->variable()->isReference()) {
+                    if (containerToken->variable() && containerToken->variable()->isReference()) {
                         const Token *nameToken = containerToken->variable()->nameToken();
                         if (Token::Match(nameToken, "%name% =")) {
                             const Token *name1 = nameToken->tokAt(2);
@@ -648,21 +634,23 @@ void CheckStl::iterators()
     }
 }
 
-void CheckStl::mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2)
+void CheckStlImpl::mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2)
 {
     const std::string container(containerTok ? containerTok->expressionString() : std::string("v1"));
+    const std::string containerTemp(isTemporary(containerTok, &mSettings.library) ? " temporary " : " ");
     const std::string container2(containerTok2 ? containerTok2->expressionString() : std::string("v2"));
+    const std::string containerTemp2(isTemporary(containerTok2, &mSettings.library) ? " temporary " : " ");
     const std::string iter(iterTok ? iterTok->expressionString() : std::string("it"));
     reportError(containerTok,
                 Severity::error,
                 "mismatchingContainerIterator",
-                "Iterator '" + iter + "' referring to container '" + container2 + "' is used with container '" + container + "'.",
+                "Iterator '" + iter + "' referring to" + containerTemp2 + "container '" + container2 + "' is used with" + containerTemp + "container '" + container + "'.",
                 CWE664,
                 Certainty::normal);
 }
 
 // Error message for bad iterator usage..
-void CheckStl::mismatchingContainersError(const Token* tok1, const Token* tok2)
+void CheckStlImpl::mismatchingContainersError(const Token* tok1, const Token* tok2)
 {
     const std::string expr1(tok1 ? tok1->expressionString() : std::string("v1"));
     const std::string expr2(tok2 ? tok2->expressionString() : std::string("v2"));
@@ -674,7 +662,7 @@ void CheckStl::mismatchingContainersError(const Token* tok1, const Token* tok2)
                 Certainty::normal);
 }
 
-void CheckStl::mismatchingContainerExpressionError(const Token *tok1, const Token *tok2)
+void CheckStlImpl::mismatchingContainerExpressionError(const Token *tok1, const Token *tok2)
 {
     const std::string expr1(tok1 ? tok1->expressionString() : std::string("v1"));
     const std::string expr2(tok2 ? tok2->expressionString() : std::string("v2"));
@@ -683,7 +671,7 @@ void CheckStl::mismatchingContainerExpressionError(const Token *tok1, const Toke
                 expr1 + "' and '" + expr2 + "' are used together.", CWE664, Certainty::normal);
 }
 
-void CheckStl::sameIteratorExpressionError(const Token *tok)
+void CheckStlImpl::sameIteratorExpressionError(const Token *tok)
 {
     reportError(tok, Severity::style, "sameIteratorExpression", "Same iterators expression are used for algorithm.", CWE664, Certainty::normal);
 }
@@ -768,7 +756,17 @@ static ValueFlow::Value getLifetimeIteratorValue(const Token* tok, MathLib::bigi
     return ValueFlow::Value{};
 }
 
-bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2)
+// Whether a container size value found on an iterator token belongs to the range of the given
+// iterator value. Both values record the container they belong to when it is known.
+static bool sizeValueAppliesToIterator(const ValueFlow::Value& sizeValue, const ValueFlow::Value& iterValue)
+{
+    if (!sizeValue.container || !iterValue.container)
+        return true; // the container of the size or of the iterator is not known
+    return iterValue.container == sizeValue.container ||
+           (iterValue.container->exprId() != 0 && iterValue.container->exprId() == sizeValue.container->exprId());
+}
+
+bool CheckStlImpl::checkIteratorPair(const Token* tok1, const Token* tok2)
 {
     if (!tok1)
         return false;
@@ -786,7 +784,7 @@ bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2)
                 (!astIsContainer(val1.tokvalue) || !astIsContainer(val2.tokvalue)))
                 return false;
         }
-        if (isSameIteratorContainerExpression(val1.tokvalue, val2.tokvalue, *mSettings, val1.lifetimeKind))
+        if (isSameIteratorContainerExpression(val1.tokvalue, val2.tokvalue, mSettings, val1.lifetimeKind))
             return false;
         if (val1.tokvalue->expressionString() == val2.tokvalue->expressionString())
             iteratorsError(tok1, val1.tokvalue, val1.tokvalue->expressionString());
@@ -806,7 +804,7 @@ bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2)
     const Token* iter2 = getIteratorExpression(tok2);
     if (!iter2)
         return false;
-    if (!isSameIteratorContainerExpression(iter1, iter2, *mSettings)) {
+    if (!isSameIteratorContainerExpression(iter1, iter2, mSettings)) {
         mismatchingContainerExpressionError(iter1, iter2);
         return true;
     }
@@ -820,7 +818,7 @@ namespace {
     };
 }
 
-void CheckStl::mismatchingContainers()
+void CheckStlImpl::mismatchingContainers()
 {
     logChecker("CheckStl::misMatchingContainers");
 
@@ -842,8 +840,8 @@ void CheckStl::mismatchingContainers()
 
             // Group args together by container
             std::map<int, std::vector<ArgIteratorInfo>> containers;
-            for (int argnr = 1; argnr <= args.size(); ++argnr) {
-                const Library::ArgumentChecks::IteratorInfo *i = mSettings->library.getArgIteratorInfo(ftok, argnr);
+            for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
+                const Library::ArgumentChecks::IteratorInfo *i = mSettings.library.getArgIteratorInfo(ftok, argnr);
                 if (!i)
                     continue;
                 const Token * const argTok = args[argnr - 1];
@@ -860,7 +858,7 @@ void CheckStl::mismatchingContainers()
                             if (iter1.tok == iter2.tok)
                                 continue;
                             if (iter1.info->first && iter2.info->last &&
-                                isSameExpression(false, iter1.tok, iter2.tok, *mSettings, false, false))
+                                isSameExpression(false, iter1.tok, iter2.tok, mSettings, false, false))
                                 sameIteratorExpressionError(iter1.tok);
                             if (checkIteratorPair(iter1.tok, iter2.tok))
                                 return;
@@ -880,7 +878,7 @@ void CheckStl::mismatchingContainers()
     }
 }
 
-void CheckStl::mismatchingContainerIterator()
+void CheckStlImpl::mismatchingContainerIterator()
 {
     logChecker("CheckStl::misMatchingContainerIterator");
 
@@ -898,7 +896,7 @@ void CheckStl::mismatchingContainerIterator()
             const std::vector<const Token *> args = getArguments(ftok);
 
             const Library::Container * c = tok->valueType()->container;
-            const Library::Container::Action action = c->getAction(tok->strAt(2));
+            const Library::Container::Action action = c->getAction(ftok->str());
             const Token* iterTok = nullptr;
             if (action == Library::Container::Action::INSERT && args.size() == 2) {
                 // Skip if iterator pair
@@ -924,7 +922,7 @@ void CheckStl::mismatchingContainerIterator()
                 continue;
             if (iterTok->str() == "*" && iterTok->astOperand1()->valueType() && iterTok->astOperand1()->valueType()->type == ValueType::ITERATOR)
                 continue;
-            if (isSameIteratorContainerExpression(tok, val.tokvalue, *mSettings))
+            if (isSameIteratorContainerExpression(tok, val.tokvalue, mSettings))
                 continue;
             mismatchingContainerIteratorError(tok, iterTok, val.tokvalue);
         }
@@ -1132,7 +1130,7 @@ static const Token* endOfExpression(const Token* tok)
     return endToken;
 }
 
-void CheckStl::invalidContainer()
+void CheckStlImpl::invalidContainer()
 {
     logChecker("CheckStl::invalidContainer");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -1157,7 +1155,7 @@ void CheckStl::invalidContainer()
                         const Scope* s = tok2->scope();
                         if (!s)
                             continue;
-                        if (isReturnScope(s->bodyEnd, mSettings->library))
+                        if (isReturnScope(s->bodyEnd, mSettings.library))
                             continue;
                         invalidContainerLoopError(r.ftok, tok, r.errorPath);
                         bail = true;
@@ -1202,9 +1200,13 @@ void CheckStl::invalidContainer()
                         if (info.tok->variable()->isReference() && !isVariableDecl(info.tok) &&
                             reaches(info.tok->variable()->nameToken(), tok, nullptr)) {
 
+                            if ((assignExpr && Token::Match(assignExpr->astOperand1()->previous(), "& %varid%", info.tok->varId()))) {
+                                return false;
+                            }
+
                             ErrorPath ep;
                             bool addressOf = false;
-                            const Variable* var = ValueFlow::getLifetimeVariable(info.tok, ep, *mSettings, &addressOf);
+                            const Variable* var = ValueFlow::getLifetimeVariable(info.tok, ep, mSettings, &addressOf);
                             // Check the reference is created before the change
                             if (var && var->declarationId() == r.tok->varId() && !addressOf) {
                                 // An argument always reaches
@@ -1231,7 +1233,7 @@ void CheckStl::invalidContainer()
                     errorPath.insert(errorPath.end(), info.errorPath.cbegin(), info.errorPath.cend());
                     errorPath.insert(errorPath.end(), r.errorPath.cbegin(), r.errorPath.cend());
                     if (v) {
-                        invalidContainerError(info.tok, r.tok, v, std::move(errorPath));
+                        invalidContainerError(info.tok, v, std::move(errorPath));
                     } else {
                         invalidContainerReferenceError(info.tok, r.tok, std::move(errorPath));
                     }
@@ -1241,7 +1243,7 @@ void CheckStl::invalidContainer()
     }
 }
 
-void CheckStl::invalidContainerLoopError(const Token* tok, const Token* loopTok, ErrorPath errorPath)
+void CheckStlImpl::invalidContainerLoopError(const Token* tok, const Token* loopTok, ErrorPath errorPath)
 {
     const std::string method = tok ? tok->str() : "erase";
     errorPath.emplace_back(loopTok, "Iterating container here.");
@@ -1253,28 +1255,28 @@ void CheckStl::invalidContainerLoopError(const Token* tok, const Token* loopTok,
 
     const std::string msg = "Calling '" + method + "' while iterating the container is invalid.";
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::error, "invalidContainerLoop", msg, CWE664, Certainty::normal);
+    reportError(std::move(errorPath), Severity::error, "invalidContainerLoop", msg, CWE664, Certainty::normal);
 }
 
-void CheckStl::invalidContainerError(const Token *tok, const Token * /*contTok*/, const ValueFlow::Value *val, ErrorPath errorPath)
+void CheckStlImpl::invalidContainerError(const Token *tok, const ValueFlow::Value *val, ErrorPath errorPath)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     if (val)
         errorPath.insert(errorPath.begin(), val->errorPath.cbegin(), val->errorPath.cend());
     std::string msg = "Using " + lifetimeMessage(tok, val, errorPath);
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::error, "invalidContainer", msg + " that may be invalid.", CWE664, inconclusive ? Certainty::inconclusive : Certainty::normal);
+    reportError(std::move(errorPath), Severity::error, "invalidContainer", msg + " that may be invalid.", CWE664, inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckStl::invalidContainerReferenceError(const Token* tok, const Token* contTok, ErrorPath errorPath)
+void CheckStlImpl::invalidContainerReferenceError(const Token* tok, const Token* contTok, ErrorPath errorPath)
 {
     std::string name = contTok ? contTok->expressionString() : "x";
     std::string msg = "Reference to " + name;
     errorPath.emplace_back(tok, "");
-    reportError(errorPath, Severity::error, "invalidContainerReference", msg + " that may be invalid.", CWE664, Certainty::normal);
+    reportError(std::move(errorPath), Severity::error, "invalidContainerReference", msg + " that may be invalid.", CWE664, Certainty::normal);
 }
 
-void CheckStl::stlOutOfBounds()
+void CheckStlImpl::stlOutOfBounds()
 {
     logChecker("CheckStl::stlOutOfBounds");
 
@@ -1360,7 +1362,7 @@ void CheckStl::stlOutOfBounds()
     }
 }
 
-void CheckStl::stlOutOfBoundsError(const Token *tok, const std::string &num, const std::string &var, bool at)
+void CheckStlImpl::stlOutOfBoundsError(const Token *tok, const std::string &num, const std::string &var, bool at)
 {
     if (at)
         reportError(tok, Severity::error, "stlOutOfBounds", "$symbol:" + var + "\nWhen " + num + "==$symbol.size(), $symbol.at(" + num + ") is out of bounds.", CWE788, Certainty::normal);
@@ -1368,7 +1370,7 @@ void CheckStl::stlOutOfBoundsError(const Token *tok, const std::string &num, con
         reportError(tok, Severity::error, "stlOutOfBounds", "$symbol:" + var + "\nWhen " + num + "==$symbol.size(), $symbol[" + num + "] is out of bounds.", CWE788, Certainty::normal);
 }
 
-void CheckStl::negativeIndex()
+void CheckStlImpl::negativeIndex()
 {
     logChecker("CheckStl::negativeIndex");
 
@@ -1381,10 +1383,10 @@ void CheckStl::negativeIndex()
             const Variable * const var = tok->variable();
             if (!var || tok == var->nameToken())
                 continue;
-            const Library::Container * const container = mSettings->library.detectContainer(var->typeStartToken());
+            const Library::Container * const container = mSettings.library.detectContainer(var->typeStartToken());
             if (!container || !container->arrayLike_indexOp)
                 continue;
-            const ValueFlow::Value *index = tok->next()->astOperand2()->getValueLE(-1, *mSettings);
+            const ValueFlow::Value *index = tok->next()->astOperand2()->getValueLE(-1, mSettings);
             if (!index)
                 continue;
             negativeIndexError(tok, *index);
@@ -1392,9 +1394,9 @@ void CheckStl::negativeIndex()
     }
 }
 
-void CheckStl::negativeIndexError(const Token *tok, const ValueFlow::Value &index)
+void CheckStlImpl::negativeIndexError(const Token *tok, const ValueFlow::Value &index)
 {
-    const ErrorPath errorPath = getErrorPath(tok, &index, "Negative array index");
+    ErrorPath errorPath = getErrorPath(tok, &index, "Negative array index");
     std::ostringstream errmsg;
     if (index.condition)
         errmsg << ValueFlow::eitherTheConditionIsRedundant(index.condition)
@@ -1403,10 +1405,10 @@ void CheckStl::negativeIndexError(const Token *tok, const ValueFlow::Value &inde
         errmsg << "Array index " << index.intvalue << " is out of bounds.";
     const auto severity = index.errorSeverity() && index.isKnown() ? Severity::error : Severity::warning;
     const auto certainty = index.isInconclusive() ? Certainty::inconclusive : Certainty::normal;
-    reportError(errorPath, severity, "negativeContainerIndex", errmsg.str(), CWE786, certainty);
+    reportError(std::move(errorPath), severity, "negativeContainerIndex", errmsg.str(), CWE786, certainty);
 }
 
-void CheckStl::erase()
+void CheckStlImpl::erase()
 {
     logChecker("CheckStl::erase");
 
@@ -1427,7 +1429,7 @@ void CheckStl::erase()
     }
 }
 
-void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
+void CheckStlImpl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
 {
     bool inconclusiveType=false;
     if (!isIterator(var, inconclusiveType))
@@ -1443,7 +1445,7 @@ void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
         if (Token::Match(tok->astParent(), "=|return"))
             continue;
         // Iterator is invalid..
-        int indentlevel = 0U;
+        int indentlevel = 0;
         const Token *tok2 = tok->link();
         for (; tok2 != scope.bodyEnd; tok2 = tok2->next()) {
             if (tok2->str() == "{") {
@@ -1451,7 +1453,7 @@ void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
                 continue;
             }
             if (tok2->str() == "}") {
-                if (indentlevel > 0U)
+                if (indentlevel > 0)
                     --indentlevel;
                 else if (Token::simpleMatch(tok2, "} else {"))
                     tok2 = tok2->linkAt(2);
@@ -1471,7 +1473,7 @@ void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
     }
 }
 
-void CheckStl::stlBoundaries()
+void CheckStlImpl::stlBoundaries()
 {
     logChecker("CheckStl::stlBoundaries");
 
@@ -1480,7 +1482,7 @@ void CheckStl::stlBoundaries()
         if (!var || !var->scope() || !var->scope()->isExecutable())
             continue;
 
-        const Library::Container* container = mSettings->library.detectIterator(var->typeStartToken());
+        const Library::Container* container = mSettings.library.detectIterator(var->typeStartToken());
         if (!container || container->opLessAllowed)
             continue;
 
@@ -1496,7 +1498,7 @@ void CheckStl::stlBoundaries()
 }
 
 // Error message for bad boundary usage..
-void CheckStl::stlBoundariesError(const Token *tok)
+void CheckStlImpl::stlBoundariesError(const Token *tok)
 {
     reportError(tok, Severity::error, "stlBoundaries",
                 "Dangerous comparison using operator< on iterator.\n"
@@ -1525,10 +1527,10 @@ static bool if_findCompare(const Token * const tokBack, bool stdStringLike)
     return false;
 }
 
-void CheckStl::if_find()
+void CheckStlImpl::if_find()
 {
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    const bool printPerformance = mSettings->severity.isEnabled(Severity::performance);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
+    const bool printPerformance = mSettings.severity.isEnabled(Severity::performance);
     if (!printWarning && !printPerformance)
         return;
 
@@ -1552,7 +1554,7 @@ void CheckStl::if_find()
                 tok = tok->linkAt(1);
 
             else if (tok->variable() && Token::Match(tok, "%var% . %name% (")) {
-                container = mSettings->library.detectContainer(tok->variable()->typeStartToken());
+                container = mSettings.library.detectContainer(tok->variable()->typeStartToken());
                 funcTok = tok->tokAt(2);
             }
 
@@ -1566,16 +1568,16 @@ void CheckStl::if_find()
                 funcTok = tok2->astParent()->next();
 
                 if (tok->variable()->isArrayOrPointer())
-                    container = mSettings->library.detectContainer(tok->variable()->typeStartToken());
+                    container = mSettings.library.detectContainer(tok->variable()->typeStartToken());
                 else { // Container of container - find the inner container
-                    container = mSettings->library.detectContainer(tok->variable()->typeStartToken()); // outer container
+                    container = mSettings.library.detectContainer(tok->variable()->typeStartToken()); // outer container
                     tok2 = Token::findsimplematch(tok->variable()->typeStartToken(), "<", tok->variable()->typeEndToken());
                     if (container && container->type_templateArgNo >= 0 && tok2) {
                         tok2 = tok2->next();
                         for (int j = 0; j < container->type_templateArgNo; j++)
                             tok2 = tok2->nextTemplateArgument();
 
-                        container = mSettings->library.detectContainer(tok2); // inner container
+                        container = mSettings.library.detectContainer(tok2); // inner container
                     } else
                         container = nullptr;
                 }
@@ -1602,9 +1604,9 @@ void CheckStl::if_find()
 }
 
 
-void CheckStl::if_findError(const Token *tok, bool str)
+void CheckStlImpl::if_findError(const Token *tok, bool str)
 {
-    if (str && mSettings->standards.cpp >= Standards::CPP20)
+    if (str && mSettings.standards.cpp >= Standards::CPP20)
         reportError(tok, Severity::performance, "stlIfStrFind",
                     "Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n"
                     "Either inefficient or wrong usage of string::find(). string::starts_with() will be faster if "
@@ -1693,9 +1695,9 @@ static const Token *findInsertValue(const Token *tok, const Token *containerTok,
     return nullptr;
 }
 
-void CheckStl::checkFindInsert()
+void CheckStlImpl::checkFindInsert()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
     logChecker("CheckStl::checkFindInsert"); // performance
@@ -1716,20 +1718,20 @@ void CheckStl::checkFindInsert()
             if (!containerTok)
                 continue;
             // In < C++17 we only warn for small simple types
-            if (mSettings->standards.cpp < Standards::CPP17 && !(keyTok && keyTok->valueType() && (keyTok->valueType()->isIntegral() || keyTok->valueType()->pointer > 0)))
+            if (mSettings.standards.cpp < Standards::CPP17 && !(keyTok && keyTok->valueType() && (keyTok->valueType()->isIntegral() || keyTok->valueType()->pointer > 0)))
                 continue;
 
             const Token *thenTok = tok->linkAt(1)->next();
-            const Token *valueTok = findInsertValue(thenTok, containerTok, keyTok, *mSettings);
+            const Token *valueTok = findInsertValue(thenTok, containerTok, keyTok, mSettings);
             if (!valueTok)
                 continue;
 
             if (Token::simpleMatch(thenTok->link(), "} else {")) {
                 const Token *valueTok2 =
-                    findInsertValue(thenTok->link()->tokAt(2), containerTok, keyTok, *mSettings);
+                    findInsertValue(thenTok->link()->tokAt(2), containerTok, keyTok, mSettings);
                 if (!valueTok2)
                     continue;
-                if (isSameExpression(true, valueTok, valueTok2, *mSettings, true, true)) {
+                if (isSameExpression(true, valueTok, valueTok2, mSettings, true, true)) {
                     checkFindInsertError(valueTok);
                 }
             } else {
@@ -1739,14 +1741,14 @@ void CheckStl::checkFindInsert()
     }
 }
 
-void CheckStl::checkFindInsertError(const Token *tok)
+void CheckStlImpl::checkFindInsertError(const Token *tok)
 {
     std::string replaceExpr;
     if (tok && Token::simpleMatch(tok->astParent(), "=") && tok == tok->astParent()->astOperand2() && Token::simpleMatch(tok->astParent()->astOperand1(), "[")) {
-        if (mSettings->standards.cpp < Standards::CPP11)
+        if (mSettings.standards.cpp < Standards::CPP11)
             // We will recommend using emplace/try_emplace instead
             return;
-        const std::string f = (mSettings->standards.cpp < Standards::CPP17) ? "emplace" : "try_emplace";
+        const std::string f = (mSettings.standards.cpp < Standards::CPP17) ? "emplace" : "try_emplace";
         replaceExpr = " Instead of '" + tok->astParent()->expressionString() + "' consider using '" +
                       tok->astParent()->astOperand1()->astOperand1()->expressionString() +
                       "." + f + "(" +
@@ -1771,12 +1773,12 @@ static bool isCpp03ContainerSizeSlow(const Token *tok)
     return var && var->isStlType("list");
 }
 
-void CheckStl::size()
+void CheckStlImpl::size()
 {
-    if (!mSettings->severity.isEnabled(Severity::performance))
+    if (!mSettings.severity.isEnabled(Severity::performance))
         return;
 
-    if (mSettings->standards.cpp >= Standards::CPP11)
+    if (mSettings.standards.cpp >= Standards::CPP11)
         return;
 
     logChecker("CheckStl::size"); // performance,c++03
@@ -1820,7 +1822,7 @@ void CheckStl::size()
     }
 }
 
-void CheckStl::sizeError(const Token *tok)
+void CheckStlImpl::sizeError(const Token *tok)
 {
     const std::string varname = tok ? tok->str() : std::string("list");
     reportError(tok, Severity::performance, "stlSize",
@@ -1832,9 +1834,9 @@ void CheckStl::sizeError(const Token *tok)
                 "guaranteed to take constant time.", CWE398, Certainty::normal);
 }
 
-void CheckStl::redundantCondition()
+void CheckStlImpl::redundantCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantIfRemove"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("redundantIfRemove"))
         return;
 
     logChecker("CheckStl::redundantCondition"); // style
@@ -1856,6 +1858,9 @@ void CheckStl::redundantCondition()
         const Token *var3 = var2->tokAt(7);
         const Token *any2 = var3->tokAt(4);
 
+        if (any2->tokAt(3) != scope.bodyEnd)
+            continue;
+
         // Check if all the "%name%" fields are the same and if all the "%any%" are the same..
         if (var1->str() == var2->str() &&
             var2->str() == var3->str() &&
@@ -1865,7 +1870,7 @@ void CheckStl::redundantCondition()
     }
 }
 
-void CheckStl::redundantIfRemoveError(const Token *tok)
+void CheckStlImpl::redundantIfRemoveError(const Token *tok)
 {
     reportError(tok, Severity::style, "redundantIfRemove",
                 "Redundant checking of STL container element existence before removing it.\n"
@@ -1873,9 +1878,9 @@ void CheckStl::redundantIfRemoveError(const Token *tok)
                 "It is safe to call the remove method on a non-existing element.", CWE398, Certainty::normal);
 }
 
-void CheckStl::missingComparison()
+void CheckStlImpl::missingComparison()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckStl::missingComparison"); // warning
@@ -1937,7 +1942,7 @@ void CheckStl::missingComparison()
     }
 }
 
-void CheckStl::missingComparisonError(const Token *incrementToken1, const Token *incrementToken2)
+void CheckStlImpl::missingComparisonError(const Token *incrementToken1, const Token *incrementToken2)
 {
     std::list<const Token*> callstack = { incrementToken1,incrementToken2 };
 
@@ -1963,16 +1968,80 @@ static bool isLocal(const Token *tok)
     return var && !var->isStatic() && var->isLocal();
 }
 
+static bool isc_strCall(const Token* tok, const Library::Container* container)
+{
+    if (!Token::simpleMatch(tok, "("))
+        return false;
+    const Token* dot = tok->astOperand1();
+    if (!Token::simpleMatch(dot, "."))
+        return false;
+    const Token* obj = dot->astOperand1();
+    if (!obj || !obj->valueType())
+        return false;
+    const Library::Container* objContainer = obj->valueType()->container;
+    if (!objContainer || !container || !objContainer->stdStringLike || (objContainer != container && !container->view))
+        return false;
+    return Token::Match(dot->astOperand2(), "c_str|data ( )");
+}
+
+static bool isc_strConcat(const Token* tok)
+{
+    if (!tok->isBinaryOp() || !Token::simpleMatch(tok, "+"))
+        return false;
+    for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) { // NOLINT(readability-use-anyofallof)
+        const Token* sibling = op->astSibling();
+        if (!sibling->valueType())
+            continue;
+        if (isc_strCall(op, sibling->valueType()->container))
+            return true;
+    }
+    return false;
+}
+
+static bool isc_strInPlusChain(const Token* tok, const Library::Container* container)
+{
+    if (!tok || !tok->valueType() || !tok->valueType()->pointer)
+        return false;
+    bool result = false;
+    visitAstNodes(tok, [&](const Token* tok2) {
+        if (Token::simpleMatch(tok2, "+"))
+            return ChildrenToVisit::op1_and_op2;
+        if (isc_strCall(tok2, container)) {
+            result = true;
+            return ChildrenToVisit::done;
+        }
+        return ChildrenToVisit::none;
+    });
+    return result;
+}
+
+static bool isc_strAssignment(const Token* tok)
+{
+    if (!Token::simpleMatch(tok, "="))
+        return false;
+    const Token* strTok = tok->astOperand1();
+    if (!strTok || !strTok->valueType())
+        return false;
+    return isc_strCall(tok->astOperand2(), strTok->valueType()->container);
+}
+
+static bool isc_strConstructor(const Token* tok)
+{
+    if (!tok->valueType() || !Token::Match(tok, "%var% (|{"))
+        return false;
+    return isc_strInPlusChain(tok->tokAt(1)->astOperand2(), tok->valueType()->container);
+}
+
 namespace {
     const std::set<std::string> stl_string_stream = {
         "istringstream", "ostringstream", "stringstream", "wstringstream"
     };
 }
 
-void CheckStl::string_c_str()
+void CheckStlImpl::string_c_str()
 {
-    const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
-    const bool printPerformance = mSettings->severity.isEnabled(Severity::performance);
+    const bool printInconclusive = mSettings.certainty.isEnabled(Certainty::inconclusive);
+    const bool printPerformance = mSettings.severity.isEnabled(Severity::performance);
 
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
 
@@ -2031,16 +2100,14 @@ void CheckStl::string_c_str()
                     const Variable* var2 = tok->tokAt(2)->variable();
                     if (var->isPointer() && var2 && var2->isStlType(stl_string_stream))
                         string_c_strError(tok);
+                } else if (printPerformance && isc_strAssignment(tok->tokAt(1))) {
+                    string_c_strAssignment(tok, tok->variable()->getTypeName());
                 } else if (Token::Match(tok->tokAt(2), "%name% (") &&
                            Token::Match(tok->linkAt(3), ") . c_str|data ( ) ;") &&
                            tok->tokAt(2)->function() && Token::Match(tok->tokAt(2)->function()->retDef, "std :: string|wstring %name%")) {
                     const Variable* var = tok->variable();
                     if (var->isPointer())
                         string_c_strError(tok);
-                } else if (printPerformance && tok->tokAt(1)->astOperand2() && Token::Match(tok->tokAt(1)->astOperand2()->tokAt(-3), "%var% . c_str|data ( ) ;")) {
-                    const Token* vartok = tok->tokAt(1)->astOperand2()->tokAt(-3);
-                    if ((tok->variable()->isStlStringType() || tok->variable()->isStlStringViewType()) && vartok->variable() && vartok->variable()->isStlStringType())
-                        string_c_strAssignment(tok, tok->variable()->getTypeName());
                 }
             } else if (printPerformance && tok->function() && Token::Match(tok, "%name% ( !!)") && tok->str() != scope.className) {
                 const auto range = c_strFuncParam.equal_range(tok->function());
@@ -2072,13 +2139,9 @@ void CheckStl::string_c_str()
                         }
                     }
                 }
-            } else if (printPerformance && Token::Match(tok, "%var% (|{ %var% . c_str|data ( ) !!,") &&
-                       tok->variable() && (tok->variable()->isStlStringType() || tok->variable()->isStlStringViewType()) &&
-                       tok->tokAt(2)->variable() && tok->tokAt(2)->variable()->isStlStringType()) {
+            } else if (printPerformance && isc_strConstructor(tok)) {
                 string_c_strConstructor(tok, tok->variable()->getTypeName());
-            } else if (printPerformance && tok->next() && tok->next()->variable() && tok->next()->variable()->isStlStringType() && tok->valueType() && tok->valueType()->type == ValueType::CONTAINER &&
-                       ((Token::Match(tok->previous(), "%var% + %var% . c_str|data ( )") && tok->previous()->variable() && tok->previous()->variable()->isStlStringType()) ||
-                        (Token::Match(tok->tokAt(-5), "%var% . c_str|data ( ) + %var%") && tok->tokAt(-5)->variable() && tok->tokAt(-5)->variable()->isStlStringType()))) {
+            } else if (printPerformance && isc_strConcat(tok)) {
                 string_c_strConcat(tok);
             } else if (printPerformance && Token::simpleMatch(tok, "<<") && tok->astOperand2() && Token::Match(tok->astOperand2()->astOperand1(), ". c_str|data ( )")) {
                 const Token* str = tok->astOperand2()->astOperand1()->astOperand1();
@@ -2086,7 +2149,7 @@ void CheckStl::string_c_str()
                     const Token* strm = tok;
                     while (Token::simpleMatch(strm, "<<"))
                         strm = strm->astOperand1();
-                    if (strm && strm->variable() && strm->variable()->isStlType())
+                    if (strm && ((strm->variable() && strm->variable()->isStlType()) || Token::Match(strm->tokAt(-1), "std :: cout|cerr")))
                         string_c_strStream(tok);
                 }
             }
@@ -2171,25 +2234,25 @@ void CheckStl::string_c_str()
     }
 }
 
-void CheckStl::string_c_strThrowError(const Token* tok)
+void CheckStlImpl::string_c_strThrowError(const Token* tok)
 {
     reportError(tok, Severity::error, "stlcstrthrow", "Dangerous usage of c_str(). The value returned by c_str() is invalid after throwing exception.\n"
                 "Dangerous usage of c_str(). The string is destroyed after the c_str() call so the thrown pointer is invalid.");
 }
 
-void CheckStl::string_c_strError(const Token* tok)
+void CheckStlImpl::string_c_strError(const Token* tok)
 {
     reportError(tok, Severity::error, "stlcstr", "Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n"
                 "Dangerous usage of c_str(). The c_str() return value is only valid until its string is deleted.", CWE664, Certainty::normal);
 }
 
-void CheckStl::string_c_strReturn(const Token* tok)
+void CheckStlImpl::string_c_strReturn(const Token* tok)
 {
     reportError(tok, Severity::performance, "stlcstrReturn", "Returning the result of c_str() in a function that returns std::string is slow and redundant.\n"
                 "The conversion from const char* as returned by c_str() to std::string creates an unnecessary string copy. Solve that by directly returning the string.", CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strParam(const Token* tok, nonneg int number, const std::string& argtype)
+void CheckStlImpl::string_c_strParam(const Token* tok, nonneg int number, const std::string& argtype)
 {
     std::ostringstream oss;
     oss << "Passing the result of c_str() to a function that takes " << argtype << " as argument no. " << number << " is slow and redundant.\n"
@@ -2197,28 +2260,28 @@ void CheckStl::string_c_strParam(const Token* tok, nonneg int number, const std:
     reportError(tok, Severity::performance, "stlcstrParam", oss.str(), CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strConstructor(const Token* tok, const std::string& argtype)
+void CheckStlImpl::string_c_strConstructor(const Token* tok, const std::string& argtype)
 {
     std::string msg = "Constructing a " + argtype + " from the result of c_str() is slow and redundant.\n"
                       "Constructing a " + argtype + " from const char* requires a call to strlen(). Solve that by directly passing the string.";
     reportError(tok, Severity::performance, "stlcstrConstructor", msg, CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strAssignment(const Token* tok, const std::string& argtype)
+void CheckStlImpl::string_c_strAssignment(const Token* tok, const std::string& argtype)
 {
     std::string msg = "Assigning the result of c_str() to a " + argtype + " is slow and redundant.\n"
                       "Assigning a const char* to a " + argtype + " requires a call to strlen(). Solve that by directly assigning the string.";
     reportError(tok, Severity::performance, "stlcstrAssignment", msg, CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strConcat(const Token* tok)
+void CheckStlImpl::string_c_strConcat(const Token* tok)
 {
     std::string msg = "Concatenating the result of c_str() and a std::string is slow and redundant.\n"
                       "Concatenating a const char* with a std::string requires a call to strlen(). Solve that by directly concatenating the strings.";
     reportError(tok, Severity::performance, "stlcstrConcat", msg, CWE704, Certainty::normal);
 }
 
-void CheckStl::string_c_strStream(const Token* tok)
+void CheckStlImpl::string_c_strStream(const Token* tok)
 {
     std::string msg = "Passing the result of c_str() to a stream is slow and redundant.\n"
                       "Passing a const char* to a stream requires a call to strlen(). Solve that by directly passing the string.";
@@ -2239,10 +2302,10 @@ namespace {
 
 }
 
-void CheckStl::uselessCalls()
+void CheckStlImpl::uselessCalls()
 {
-    const bool printPerformance = mSettings->severity.isEnabled(Severity::performance);
-    const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
+    const bool printPerformance = mSettings.severity.isEnabled(Severity::performance);
+    const bool printWarning = mSettings.severity.isEnabled(Severity::warning);
     if (!printPerformance && !printWarning)
         return;
 
@@ -2279,7 +2342,7 @@ void CheckStl::uselessCalls()
                        !tok->tokAt(4)->astParent() &&
                        tok->next()->variable() && tok->next()->variable()->isStlType(stl_containers_with_empty_and_clear))
                 uselessCallsEmptyError(tok->next());
-            else if (Token::Match(tok, "[{};] std :: remove|remove_if|unique (") && tok->tokAt(5)->nextArgument())
+            else if (Token::Match(tok, "[{};] std :: remove|remove_if|unique (") && tok->tokAt(5)->nextArgument() && !tok->tokAt(4)->astParent())
                 uselessCallsRemoveError(tok->next(), tok->strAt(3));
             else if (printPerformance && tok->valueType() && tok->valueType()->type == ValueType::CONTAINER) {
                 if (Token::Match(tok, "%var% = { %var% . begin ( ) ,") && tok->varId() == tok->tokAt(3)->varId())
@@ -2300,7 +2363,7 @@ void CheckStl::uselessCalls()
 }
 
 
-void CheckStl::uselessCallsReturnValueError(const Token *tok, const std::string &varname, const std::string &function)
+void CheckStlImpl::uselessCallsReturnValueError(const Token *tok, const std::string &varname, const std::string &function)
 {
     std::ostringstream errmsg;
     errmsg << "$symbol:" << varname << '\n';
@@ -2313,7 +2376,7 @@ void CheckStl::uselessCallsReturnValueError(const Token *tok, const std::string
     reportError(tok, Severity::warning, "uselessCallsCompare", errmsg.str(), CWE628, Certainty::normal);
 }
 
-void CheckStl::uselessCallsSwapError(const Token *tok, const std::string &varname)
+void CheckStlImpl::uselessCallsSwapError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::performance, "uselessCallsSwap",
                 "$symbol:" + varname + "\n"
@@ -2323,7 +2386,7 @@ void CheckStl::uselessCallsSwapError(const Token *tok, const std::string &varnam
                 "code is inefficient. Is the object or the parameter wrong here?", CWE628, Certainty::normal);
 }
 
-void CheckStl::uselessCallsSubstrError(const Token *tok, SubstrErrorType type)
+void CheckStlImpl::uselessCallsSubstrError(const Token *tok, SubstrErrorType type)
 {
     std::string msg = "Ineffective call of function 'substr' because ";
     switch (type) {
@@ -2343,18 +2406,19 @@ void CheckStl::uselessCallsSubstrError(const Token *tok, SubstrErrorType type)
     reportError(tok, Severity::performance, "uselessCallsSubstr", msg, CWE398, Certainty::normal);
 }
 
-void CheckStl::uselessCallsConstructorError(const Token *tok)
+void CheckStlImpl::uselessCallsConstructorError(const Token *tok)
 {
-    const std::string msg = "Inefficient constructor call: container '" + tok->str() + "' is assigned a partial copy of itself. Use erase() or resize() instead.";
+    const std::string container = tok ? tok->str() : "";
+    const std::string msg = "Inefficient constructor call: container '" + container + "' is assigned a partial copy of itself. Use erase() or resize() instead.";
     reportError(tok, Severity::performance, "uselessCallsConstructor", msg, CWE398, Certainty::normal);
 }
 
-void CheckStl::uselessCallsEmptyError(const Token *tok)
+void CheckStlImpl::uselessCallsEmptyError(const Token *tok)
 {
     reportError(tok, Severity::warning, "uselessCallsEmpty", "Ineffective call of function 'empty()'. Did you intend to call 'clear()' instead?", CWE398, Certainty::normal);
 }
 
-void CheckStl::uselessCallsRemoveError(const Token *tok, const std::string& function)
+void CheckStlImpl::uselessCallsRemoveError(const Token *tok, const std::string& function)
 {
     reportError(tok, Severity::warning, "uselessCallsRemove",
                 "$symbol:" + function + "\n"
@@ -2365,9 +2429,9 @@ void CheckStl::uselessCallsRemoveError(const Token *tok, const std::string& func
 
 // Check for iterators being dereferenced before being checked for validity.
 // E.g.  if (*i && i != str.end()) { }
-void CheckStl::checkDereferenceInvalidIterator()
+void CheckStlImpl::checkDereferenceInvalidIterator()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckStl::checkDereferenceInvalidIterator"); // warning
@@ -2429,10 +2493,8 @@ void CheckStl::checkDereferenceInvalidIterator()
 }
 
 
-void CheckStl::checkDereferenceInvalidIterator2()
+void CheckStlImpl::checkDereferenceInvalidIterator2()
 {
-    const bool printInconclusive = (mSettings->certainty.isEnabled(Certainty::inconclusive));
-
     logChecker("CheckStl::checkDereferenceInvalidIterator2");
 
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -2445,20 +2507,16 @@ void CheckStl::checkDereferenceInvalidIterator2()
             continue;
 
         std::vector<ValueFlow::Value> contValues;
-        std::copy_if(tok->values().cbegin(), tok->values().cend(), std::back_inserter(contValues), [&](const ValueFlow::Value& value) {
-            if (value.isImpossible())
-                return false;
-            if (!printInconclusive && value.isInconclusive())
-                return false;
-            return value.isContainerSizeValue();
+        std::copy_if(tok->values().cbegin(),
+                     tok->values().cend(),
+                     std::back_inserter(contValues),
+                     [&](const ValueFlow::Value& value) {
+            return isUsableValue(value, mSettings) && value.isContainerSizeValue();
         });
 
-
         // Can iterator point to END or before START?
         for (const ValueFlow::Value& value:tok->values()) {
-            if (value.isImpossible())
-                continue;
-            if (!printInconclusive && value.isInconclusive())
+            if (!isUsableValue(value, mSettings))
                 continue;
             if (!value.isIteratorValue())
                 continue;
@@ -2472,6 +2530,8 @@ void CheckStl::checkDereferenceInvalidIterator2()
                 auto it = std::find_if(contValues.cbegin(), contValues.cend(), [&](const ValueFlow::Value& c) {
                     if (value.path != c.path)
                         return false;
+                    if (!sizeValueAppliesToIterator(c, value))
+                        return false;
                     if (value.isIteratorStartValue() && value.intvalue >= c.intvalue)
                         return true;
                     if (value.isIteratorEndValue() && -value.intvalue > c.intvalue)
@@ -2501,7 +2561,7 @@ void CheckStl::checkDereferenceInvalidIterator2()
                     emptyAdvance = tok->astParent();
                 }
             }
-            if (!CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings) && !isInvalidIterator && !emptyAdvance) {
+            if (!CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library) && !isInvalidIterator && !emptyAdvance) {
                 if (!unknown)
                     continue;
                 inconclusive = true;
@@ -2525,7 +2585,7 @@ void CheckStl::checkDereferenceInvalidIterator2()
     }
 }
 
-void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
+void CheckStlImpl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
 {
     const std::string& varname = tok ? tok->expressionString() : "var";
     const std::string errmsgcond("$symbol:" + varname + '\n' + ValueFlow::eitherTheConditionIsRedundant(value ? value->condition : nullptr) + " or there is possible dereference of an invalid iterator: $symbol.");
@@ -2534,19 +2594,19 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow
         reportError(tok, Severity::warning, "derefInvalidIteratorRedundantCheck", errmsgcond, CWE825, Certainty::normal);
         return;
     }
-    if (!mSettings->isEnabled(value, inconclusive))
+    if (!mSettings.isEnabled(value, inconclusive))
         return;
 
-    const ErrorPath errorPath = getErrorPath(tok, value, "Dereference of an invalid iterator");
+    ErrorPath errorPath = getErrorPath(tok, value, "Dereference of an invalid iterator");
 
     if (value->condition) {
-        reportError(errorPath, Severity::warning, "derefInvalidIteratorRedundantCheck", errmsgcond, CWE825, (inconclusive || value->isInconclusive()) ? Certainty::inconclusive : Certainty::normal);
+        reportError(std::move(errorPath), Severity::warning, "derefInvalidIteratorRedundantCheck", errmsgcond, CWE825, (inconclusive || value->isInconclusive()) ? Certainty::inconclusive : Certainty::normal);
     } else {
         std::string errmsg = std::string(value->isKnown() ? "Dereference" : "Possible dereference") + " of an invalid iterator";
         if (!varname.empty())
             errmsg = "$symbol:" + varname + '\n' + errmsg + ": $symbol";
 
-        reportError(errorPath,
+        reportError(std::move(errorPath),
                     value->isKnown() ? Severity::error : Severity::warning,
                     "derefInvalidIterator",
                     errmsg,
@@ -2554,7 +2614,7 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow
     }
 }
 
-void CheckStl::dereferenceInvalidIteratorError(const Token* deref, const std::string &iterName)
+void CheckStlImpl::dereferenceInvalidIteratorError(const Token* deref, const std::string &iterName)
 {
     reportError(deref, Severity::warning,
                 "derefInvalidIterator",
@@ -2563,7 +2623,7 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* deref, const std::st
                 "Possible dereference of an invalid iterator: $symbol. Make sure to check that the iterator is valid before dereferencing it - not after.", CWE825, Certainty::normal);
 }
 
-void CheckStl::useStlAlgorithmError(const Token *tok, const std::string &algoName)
+void CheckStlImpl::useStlAlgorithmError(const Token *tok, const std::string &algoName)
 {
     reportError(tok, Severity::style, "useStlAlgorithm",
                 "Consider using " + algoName + " algorithm instead of a raw loop.", CWE398, Certainty::normal);
@@ -2574,8 +2634,8 @@ static bool isEarlyExit(const Token *start)
     if (start->str() != "{")
         return false;
     const Token *endToken = start->link();
-    const Token *tok = Token::findmatch(start, "return|throw|break", endToken);
-    if (!tok)
+    const Token *tok = Token::findmatch(start, "return|throw|break|continue", endToken);
+    if (!tok || tok->scope() != start->scope() || tok->str() == "continue")
         return false;
     const Token *endStatement = Token::findsimplematch(tok, "; }", endToken);
     if (!endStatement)
@@ -2818,26 +2878,25 @@ static bool isTernaryAssignment(const Token* assignTok, nonneg int loopVarId, no
 
 namespace {
     struct LoopAnalyzer {
-        const Token* bodyTok = nullptr;
-        const Token* loopVar = nullptr;
-        const Settings* settings = nullptr;
-        std::set<nonneg int> varsChanged;
-
-        explicit LoopAnalyzer(const Token* tok, const Settings* psettings)
-            : bodyTok(tok->linkAt(1)->next()), settings(psettings)
+    private:
+        const Token* mBodyTok;
+        const Token* mLoopVar{};
+        const Settings& mSettings;
+        std::set<nonneg int> mVarsChanged;
+
+    public:
+        explicit LoopAnalyzer(const Token* tok, const Settings& settings)
+            : mBodyTok(tok->linkAt(1)->next()), mSettings(settings)
         {
             const Token* splitTok = tok->next()->astOperand2();
             if (Token::simpleMatch(splitTok, ":") && splitTok->previous()->varId() != 0) {
-                loopVar = splitTok->previous();
+                mLoopVar = splitTok->previous();
             }
             if (valid()) {
                 findChangedVariables();
             }
         }
-        bool isLoopVarChanged() const {
-            return varsChanged.count(loopVar->varId()) > 0;
-        }
-
+    private:
         bool isModified(const Token* tok) const
         {
             if (tok->variable() && tok->variable()->isConst())
@@ -2845,11 +2904,11 @@ namespace {
             int n = 1 + (astIsPointer(tok) ? 1 : 0);
             for (int i = 0; i < n; i++) {
                 bool inconclusive = false;
-                if (isVariableChangedByFunctionCall(tok, i, *settings, &inconclusive))
+                if (isVariableChangedByFunctionCall(tok, i, mSettings.library, &inconclusive))
                     return true;
                 if (inconclusive)
                     return true;
-                if (isVariableChanged(tok, i, *settings))
+                if (isVariableChanged(tok, i, mSettings))
                     return true;
             }
             return false;
@@ -2858,7 +2917,7 @@ namespace {
         template<class Predicate, class F>
         void findTokens(Predicate pred, F f) const
         {
-            for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
+            for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
                 if (pred(tok))
                     f(tok);
             }
@@ -2867,7 +2926,7 @@ namespace {
         template<class Predicate>
         const Token* findToken(Predicate pred) const
         {
-            for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
+            for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
                 if (pred(tok))
                     return tok;
             }
@@ -2882,58 +2941,56 @@ namespace {
         }
 
         bool valid() const {
-            return bodyTok && loopVar;
+            return mBodyTok && mLoopVar;
         }
 
+    public:
         std::string findAlgo() const
         {
             if (!valid())
                 return "";
-            bool loopVarChanged = isLoopVarChanged();
-            if (!loopVarChanged && varsChanged.empty()) {
-                if (hasGotoOrBreak())
-                    return "";
-                bool alwaysTrue = true;
-                bool alwaysFalse = true;
-                auto hasReturn = [](const Token* tok) {
-                    return Token::simpleMatch(tok, "return");
-                };
-                findTokens(hasReturn, [&](const Token* tok) {
-                    const Token* returnTok = tok->astOperand1();
-                    if (!returnTok || !returnTok->hasKnownIntValue() || !astIsBool(returnTok)) {
-                        alwaysTrue = false;
-                        alwaysFalse = false;
-                        return;
-                    }
-                    (returnTok->getKnownIntValue() ? alwaysTrue : alwaysFalse) &= true;
-                    (returnTok->getKnownIntValue() ? alwaysFalse : alwaysTrue) &= false;
-                });
-                if (alwaysTrue == alwaysFalse)
-                    return "";
-                if (alwaysTrue)
-                    return "std::any_of";
-                return "std::all_of or std::none_of";
-            }
-            return "";
+            if (!mVarsChanged.empty())
+                return "";
+            if (hasGotoOrBreak())
+                return "";
+            bool alwaysTrue = true;
+            bool alwaysFalse = true;
+            const auto hasReturn = [](const Token* tok) {
+                return Token::simpleMatch(tok, "return");
+            };
+            findTokens(hasReturn, [&](const Token* tok) {
+                const Token* returnTok = tok->astOperand1();
+                if (!returnTok || !returnTok->hasKnownIntValue() || !astIsBool(returnTok)) {
+                    alwaysTrue = false;
+                    alwaysFalse = false;
+                    return;
+                }
+                (returnTok->getKnownIntValue() ? alwaysTrue : alwaysFalse) &= true;
+                (returnTok->getKnownIntValue() ? alwaysFalse : alwaysTrue) &= false;
+            });
+            if (alwaysTrue == alwaysFalse)
+                return "";
+            if (alwaysTrue)
+                return "std::any_of";
+            return "std::all_of or std::none_of";
         }
-
+    private:
         bool isLocalVar(const Variable* var) const
         {
             if (!var)
                 return false;
             if (var->isPointer() || var->isReference())
                 return false;
-            if (var->declarationId() == loopVar->varId())
+            if (var->declarationId() == mLoopVar->varId())
                 return false;
             const Scope* scope = var->scope();
-            return scope && scope->isNestedIn(bodyTok->scope());
+            return scope && scope->isNestedIn(mBodyTok->scope());
         }
 
-    private:
         void findChangedVariables()
         {
             std::set<nonneg int> vars;
-            for (const Token* tok = bodyTok; precedes(tok, bodyTok->link()); tok = tok->next()) {
+            for (const Token* tok = mBodyTok; precedes(tok, mBodyTok->link()); tok = tok->next()) {
                 if (tok->varId() == 0)
                     continue;
                 if (vars.count(tok->varId()) > 0)
@@ -2944,16 +3001,16 @@ namespace {
                 }
                 if (!isModified(tok))
                     continue;
-                varsChanged.insert(tok->varId());
+                mVarsChanged.insert(tok->varId());
                 vars.insert(tok->varId());
             }
         }
     };
 } // namespace
 
-void CheckStl::useStlAlgorithm()
+void CheckStlImpl::useStlAlgorithm()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("useStlAlgorithm"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("useStlAlgorithm"))
         return;
 
     logChecker("CheckStl::useStlAlgorithm"); // style
@@ -2969,7 +3026,7 @@ void CheckStl::useStlAlgorithm()
         if (!Token::simpleMatch(tok, "{") || !Token::simpleMatch(tok->previous(), ")"))
             return false;
         const Token* condTok = tok->linkAt(-1)->astOperand2();
-        if (isConstExpression(condTok, mSettings->library)) {
+        if (isConstExpression(condTok, mSettings.library)) {
             if (condTok->str() == "<")
                 type = ConditionOpType::MIN;
             else if (condTok->str() == ">")
@@ -3033,7 +3090,7 @@ void CheckStl::useStlAlgorithm()
 
             // Check for single assignment
             bool useLoopVarInAssign{}, hasBreak{};
-            const Token *assignTok = singleAssignInScope(bodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, *mSettings);
+            const Token *assignTok = singleAssignInScope(bodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, mSettings);
             if (assignTok) {
                 if (!checkAssignee(assignTok->astOperand1()))
                     continue;
@@ -3065,21 +3122,20 @@ void CheckStl::useStlAlgorithm()
             }
             // Check for container calls
             bool useLoopVarInMemCall;
-            const Token *memberAccessTok = singleMemberCallInScope(bodyTok, loopVar->varId(), useLoopVarInMemCall, *mSettings);
+            const Token *memberAccessTok = singleMemberCallInScope(bodyTok, loopVar->varId(), useLoopVarInMemCall, mSettings);
             if (memberAccessTok && loopType == LoopType::RANGE) {
-                const Token *memberCallTok = memberAccessTok->astOperand2();
                 const int contVarId = memberAccessTok->astOperand1()->varId();
                 if (contVarId == loopVar->varId())
                     continue;
-                if (memberCallTok->str() == "push_back" ||
-                    memberCallTok->str() == "push_front" ||
-                    memberCallTok->str() == "emplace_back") {
+                using Action = Library::Container::Action;
+                const auto action = astContainerAction(memberAccessTok->astOperand1(), mSettings.library);
+                if (contains({Action::PUSH, Action::INSERT}, action)) {
                     std::string algo;
                     if (useLoopVarInMemCall)
                         algo = "std::copy";
                     else
                         algo = "std::transform";
-                    useStlAlgorithmError(memberCallTok, algo);
+                    useStlAlgorithmError(memberAccessTok->astOperand2(), algo);
                 }
                 continue;
             }
@@ -3098,10 +3154,10 @@ void CheckStl::useStlAlgorithm()
             }
 
             // Check for conditionals
-            const Token *condBodyTok = singleConditionalInScope(bodyTok, loopVar->varId(), loopType, *mSettings);
+            const Token *condBodyTok = singleConditionalInScope(bodyTok, loopVar->varId(), loopType, mSettings);
             if (condBodyTok) {
                 // Check for single assign
-                assignTok = singleAssignInScope(condBodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, *mSettings);
+                assignTok = singleAssignInScope(condBodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, mSettings);
                 if (assignTok) {
                     if (!checkAssignee(assignTok->astOperand1()))
                         continue;
@@ -3142,7 +3198,7 @@ void CheckStl::useStlAlgorithm()
                 }
 
                 // Check for container call
-                memberAccessTok = singleMemberCallInScope(condBodyTok, loopVar->varId(), useLoopVarInMemCall, *mSettings);
+                memberAccessTok = singleMemberCallInScope(condBodyTok, loopVar->varId(), useLoopVarInMemCall, mSettings);
                 if (memberAccessTok) {
                     const Token *memberCallTok = memberAccessTok->astOperand2();
                     const int contVarId = memberAccessTok->astOperand1()->varId();
@@ -3187,7 +3243,7 @@ void CheckStl::useStlAlgorithm()
     }
 }
 
-void CheckStl::knownEmptyContainerError(const Token *tok, const std::string& algo)
+void CheckStlImpl::knownEmptyContainerError(const Token *tok, const std::string& algo)
 {
     const std::string var = tok ? tok->expressionString() : std::string("var");
 
@@ -3218,9 +3274,9 @@ static bool isKnownEmptyContainer(const Token* tok)
     });
 }
 
-void CheckStl::knownEmptyContainer()
+void CheckStlImpl::knownEmptyContainer()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownEmptyContainer"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("knownEmptyContainer"))
         return;
     logChecker("CheckStl::knownEmptyContainer"); // style
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -3245,8 +3301,8 @@ void CheckStl::knownEmptyContainer()
                 if (args.empty())
                     continue;
 
-                for (int argnr = 1; argnr <= args.size(); ++argnr) {
-                    const Library::ArgumentChecks::IteratorInfo *i = mSettings->library.getArgIteratorInfo(tok, argnr);
+                for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
+                    const Library::ArgumentChecks::IteratorInfo *i = mSettings.library.getArgIteratorInfo(tok, argnr);
                     if (!i)
                         continue;
                     const Token * const argTok = args[argnr - 1];
@@ -3261,7 +3317,7 @@ void CheckStl::knownEmptyContainer()
     }
 }
 
-void CheckStl::eraseIteratorOutOfBoundsError(const Token *ftok, const Token* itertok, const ValueFlow::Value* val)
+void CheckStlImpl::eraseIteratorOutOfBoundsError(const Token *ftok, const Token* itertok, const ValueFlow::Value* val)
 {
     if (!ftok || !itertok || !val) {
         reportError(ftok, Severity::error, "eraseIteratorOutOfBounds",
@@ -3306,7 +3362,7 @@ static const ValueFlow::Value* getOOBIterValue(const Token* tok, const ValueFlow
     return it != tok->values().end() ? &*it : nullptr;
 }
 
-void CheckStl::eraseIteratorOutOfBounds()
+void CheckStlImpl::eraseIteratorOutOfBounds()
 {
     logChecker("CheckStl::eraseIteratorOutOfBounds");
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -3332,6 +3388,383 @@ void CheckStl::eraseIteratorOutOfBounds()
     }
 }
 
+namespace {
+// An iterator position described by the ValueFlow values attached to the iterator expression
+    struct IteratorPosition {
+        const ValueFlow::Value* value = nullptr; // ITERATOR_START or ITERATOR_END value
+        const ValueFlow::Value* sizeValue = nullptr; // container size value with the same path, if available
+        bool fromEnd() const {
+            return value->isIteratorEndValue();
+        }
+        explicit operator bool() const {
+            return value != nullptr;
+        }
+    };
+
+// A number of elements together with the ValueFlow values it was derived from
+    struct ElementCount {
+        MathLib::bigint count = 0;
+        std::vector<const ValueFlow::Value*> values;
+        explicit operator bool() const {
+            return !values.empty();
+        }
+    };
+
+// The best candidate proving an out of bounds access, preferring proofs without possible values
+    struct BestCandidate {
+        ElementCount best;
+        bool certain = false;
+        void consider(const ElementCount& candidate)
+        {
+            const bool candidateCertain =
+                std::none_of(candidate.values.cbegin(), candidate.values.cend(), std::mem_fn(&ValueFlow::Value::isPossible));
+            if (best && (certain || !candidateCertain))
+                return;
+            best = candidate;
+            certain = candidateCertain;
+        }
+    };
+} // namespace
+
+// Get the first ValueFlow value of a token matching the predicate, preferring known values
+template<class Predicate>
+static const ValueFlow::Value* selectPreferredValue(const Token* tok, const Predicate& pred)
+{
+    const ValueFlow::Value* result = nullptr;
+    for (const ValueFlow::Value& value : tok->values()) {
+        if (!pred(value))
+            continue;
+        if (result && !(value.isKnown() && !result->isKnown()))
+            continue;
+        result = &value;
+    }
+    return result;
+}
+
+// Get the iterator value of an iterator expression together with the container size value that
+// ValueFlow has added to the iterator
+static IteratorPosition getIteratorPosition(const Token* tok, const Settings& settings)
+{
+    IteratorPosition position;
+    if (!tok)
+        return position;
+    position.value = selectPreferredValue(tok, [&](const ValueFlow::Value& value) {
+        return isUsableValue(value, settings) && value.isIteratorValue();
+    });
+    if (!position.value)
+        return position;
+    position.sizeValue = selectPreferredValue(tok, [&](const ValueFlow::Value& value) {
+        return isUsableValue(value, settings) && value.isContainerSizeValue() && value.path == position.value->path &&
+               sizeValueAppliesToIterator(value, *position.value);
+    });
+    return position;
+}
+
+// Compute the distance last-first between two iterators into the same container
+static ElementCount getIteratorDistance(const IteratorPosition& first, const IteratorPosition& last)
+{
+    ElementCount distance;
+    if (first.value->path != last.value->path)
+        return distance;
+    // bounded values could make the distance an overestimate
+    if (first.value->bound != ValueFlow::Value::Bound::Point || last.value->bound != ValueFlow::Value::Bound::Point)
+        return distance;
+    if (first.fromEnd() == last.fromEnd()) { // the container size cancels out
+        distance.count = last.value->intvalue - first.value->intvalue;
+        distance.values = {first.value, last.value};
+        return distance;
+    }
+    const IteratorPosition& endPosition = first.fromEnd() ? first : last;
+    if (!endPosition.sizeValue || endPosition.sizeValue->bound != ValueFlow::Value::Bound::Point)
+        return distance;
+    const MathLib::bigint endIndex = endPosition.sizeValue->intvalue + endPosition.value->intvalue;
+    distance.count = last.fromEnd() ? endIndex - first.value->intvalue : last.value->intvalue - endIndex;
+    distance.values = {first.value, last.value, endPosition.sizeValue};
+    return distance;
+}
+
+// Compute the number of elements available in the container behind the iterator position
+static ElementCount getAvailableSpace(const IteratorPosition& position)
+{
+    ElementCount available;
+    // the position could be smaller, which would make more elements available
+    if (position.value->bound == ValueFlow::Value::Bound::Upper)
+        return available;
+    if (position.fromEnd()) { // the container size cancels out
+        available.count = -position.value->intvalue;
+        available.values = {position.value};
+        return available;
+    }
+    // the container size could be larger, which would make more elements available
+    if (!position.sizeValue || position.sizeValue->bound == ValueFlow::Value::Bound::Lower)
+        return available;
+    available.count = position.sizeValue->intvalue - position.value->intvalue;
+    available.values = {position.value, position.sizeValue};
+    return available;
+}
+
+// Find iterator values and paired container sizes of the iterator that prove accessing <accessed>
+// elements to be out of bounds, preferring a proof that does not rely on possible values
+static ElementCount findInsufficientSpace(const Token* tok,
+                                          MathLib::bigint accessed,
+                                          MathLib::bigint sourcePath,
+                                          const Settings& settings)
+{
+    BestCandidate insufficient;
+    if (!tok)
+        return insufficient.best;
+    const auto consider = [&](const ElementCount& candidate) {
+        if (!candidate)
+            return;
+        if (candidate.count < 0 || accessed <= candidate.count)
+            return; // the space is sufficient
+        insufficient.consider(candidate);
+    };
+    for (const ValueFlow::Value& value : tok->values()) {
+        if (!isUsableValue(value, settings) || !value.isIteratorValue())
+            continue;
+        if (value.path != 0 && sourcePath != 0 && value.path != sourcePath)
+            continue;
+        IteratorPosition position;
+        position.value = &value;
+        if (position.fromEnd()) { // the available space does not depend on the container size
+            consider(getAvailableSpace(position));
+            continue;
+        }
+        for (const ValueFlow::Value& sizeValue : tok->values()) {
+            if (!isUsableValue(sizeValue, settings) || !sizeValue.isContainerSizeValue() || sizeValue.path != value.path)
+                continue;
+            if (!sizeValueAppliesToIterator(sizeValue, value))
+                continue;
+            position.sizeValue = &sizeValue;
+            consider(getAvailableSpace(position));
+        }
+    }
+    return insufficient.best;
+}
+
+// Find iterator values and paired container sizes of the source range that prove more than
+// <available> elements to be accessed, preferring a proof that does not rely on possible values
+static ElementCount findExcessiveDistance(const Token* firstTok,
+                                          const Token* lastTok,
+                                          MathLib::bigint available,
+                                          MathLib::bigint destPath,
+                                          const Settings& settings)
+{
+    BestCandidate excessive;
+    const auto consider = [&](const ElementCount& candidate) {
+        if (!candidate)
+            return;
+        if (candidate.count <= available)
+            return; // the access is within bounds
+        excessive.consider(candidate);
+    };
+    for (const ValueFlow::Value& firstValue : firstTok->values()) {
+        if (!isUsableValue(firstValue, settings) || !firstValue.isIteratorValue())
+            continue;
+        if (firstValue.path != 0 && destPath != 0 && firstValue.path != destPath)
+            continue;
+        for (const ValueFlow::Value& lastValue : lastTok->values()) {
+            if (!isUsableValue(lastValue, settings) || !lastValue.isIteratorValue())
+                continue;
+            IteratorPosition first, last;
+            first.value = &firstValue;
+            last.value = &lastValue;
+            if (first.fromEnd() == last.fromEnd()) { // the distance does not depend on the container size
+                consider(getIteratorDistance(first, last));
+                continue;
+            }
+            IteratorPosition& endPosition = first.fromEnd() ? first : last;
+            const Token* const endTok = first.fromEnd() ? firstTok : lastTok;
+            for (const ValueFlow::Value& sizeValue : endTok->values()) {
+                if (!isUsableValue(sizeValue, settings) || !sizeValue.isContainerSizeValue() ||
+                    sizeValue.path != endPosition.value->path)
+                    continue;
+                if (!sizeValueAppliesToIterator(sizeValue, *endPosition.value))
+                    continue;
+                endPosition.sizeValue = &sizeValue;
+                consider(getIteratorDistance(first, last));
+            }
+        }
+    }
+    return excessive.best;
+}
+
+// Find count values of a count-based algorithm that prove more than <available> elements to be accessed
+static ElementCount findExcessiveCount(const Token* tok,
+                                       MathLib::bigint available,
+                                       MathLib::bigint destPath,
+                                       const Settings& settings)
+{
+    BestCandidate excessive;
+    if (!tok)
+        return excessive.best;
+    for (const ValueFlow::Value& value : tok->values()) {
+        if (!isUsableValue(value, settings) || !value.isIntValue())
+            continue;
+        // a count with an upper bound could be smaller, which would make fewer elements accessed
+        if (value.bound == ValueFlow::Value::Bound::Upper)
+            continue;
+        if (value.path != 0 && destPath != 0 && value.path != destPath)
+            continue;
+        if (value.intvalue <= available)
+            continue; // the access is within bounds
+        ElementCount candidate;
+        candidate.count = value.intvalue;
+        candidate.values.push_back(&value);
+        excessive.consider(candidate);
+    }
+    return excessive.best;
+}
+
+// Do not warn when the proof relies on possible values on both sides
+static bool bothSidesPossible(const ElementCount& accessed, const ElementCount& available)
+{
+    const auto isPossible = std::mem_fn(&ValueFlow::Value::isPossible);
+    return std::any_of(accessed.values.cbegin(), accessed.values.cend(), isPossible) &&
+           std::any_of(available.values.cbegin(), available.values.cend(), isPossible);
+}
+
+// Get the number of accessed elements of a count-based algorithm such as std::fill_n
+static const ValueFlow::Value* getCountValue(const Token* tok, const Settings& settings)
+{
+    if (!tok)
+        return nullptr;
+    return selectPreferredValue(tok, [&](const ValueFlow::Value& value) {
+        // a count with an upper bound could be smaller, which would make fewer elements accessed
+        return isUsableValue(value, settings) && value.isIntValue() && value.bound != ValueFlow::Value::Bound::Upper;
+    });
+}
+
+void CheckStlImpl::algorithmOutOfBounds()
+{
+    logChecker("CheckStl::algorithmOutOfBounds");
+    for (const Scope* function : mTokenizer->getSymbolDatabase()->functionScopes) {
+        for (const Token* tok = function->bodyStart; tok != function->bodyEnd; tok = tok->next()) {
+            if (!Token::Match(tok, "std :: %name% ("))
+                continue;
+            const Token* const nameTok = tok->tokAt(2);
+            // algorithms accessing the range denoted by the third argument exactly last1-first1 times..
+            const bool exact = Token::Match(
+                nameTok,
+                "copy|move|swap_ranges|transform|replace_copy|replace_copy_if|reverse_copy|equal|mismatch|is_permutation|partial_sum|adjacent_difference|inner_product (");
+            // ..or at most last1-first1 times, depending on the values in the input range..
+            const bool atMost = !exact && Token::Match(nameTok, "copy_if|remove_copy|remove_copy_if|unique_copy (");
+            // ..or accessing their iterator arguments as many times as the count argument says
+            const bool countBased = !exact && !atMost && Token::Match(nameTok, "copy_n|fill_n|generate_n (");
+            if (!exact && !atMost && !countBased)
+                continue;
+            if (atMost && !mSettings.certainty.isEnabled(Certainty::inconclusive))
+                continue;
+            const std::vector<const Token*> args = getArguments(nameTok);
+            if (args.size() < 3)
+                continue;
+            ElementCount accessed; // source access count using the preferred values
+            std::vector<const Token*> iterArgs;
+            if (countBased) {
+                if (const ValueFlow::Value* countValue = getCountValue(args[1], mSettings)) {
+                    accessed.count = countValue->intvalue;
+                    accessed.values.push_back(countValue);
+                }
+                iterArgs.push_back(args[0]);
+                if (Token::simpleMatch(nameTok, "copy_n"))
+                    iterArgs.push_back(args[2]); // copy_n also writes through the third argument
+            } else {
+                // two-range overloads taking a last2 iterator do not access the second range out of bounds
+                if (Token::Match(nameTok, "equal|mismatch|is_permutation") && args.size() >= 4 && astIsIterator(args[3]))
+                    continue;
+                // both iterators must refer to the same container
+                const ValueFlow::Value firstLifetime = getLifetimeIteratorValue(args[0]);
+                const ValueFlow::Value lastLifetime = getLifetimeIteratorValue(args[1]);
+                if (!firstLifetime.tokvalue || !lastLifetime.tokvalue)
+                    continue;
+                if (!isSameIteratorContainerExpression(firstLifetime.tokvalue,
+                                                       lastLifetime.tokvalue,
+                                                       mSettings,
+                                                       firstLifetime.lifetimeKind))
+                    continue;
+                const IteratorPosition first = getIteratorPosition(args[0], mSettings);
+                const IteratorPosition last = getIteratorPosition(args[1], mSettings);
+                if (first && last)
+                    accessed = getIteratorDistance(first, last);
+                iterArgs.push_back(args[2]);
+                if (Token::simpleMatch(nameTok, "transform") && args.size() == 5)
+                    iterArgs.push_back(args[3]); // binary transform also writes through the fourth argument
+            }
+            if (accessed.count <= 0)
+                accessed = ElementCount();       // there is no preferred source access count
+            for (const Token* const iterArg : iterArgs) {
+                // check the preferred source access count against all destination values..
+                ElementCount sourceCount = accessed;
+                ElementCount available;
+                if (sourceCount)
+                    available =
+                        findInsufficientSpace(iterArg, sourceCount.count, sourceCount.values.front()->path, mSettings);
+                if (!available || bothSidesPossible(sourceCount, available)) {
+                    // ..or all source access counts against the preferred destination values
+                    const IteratorPosition dest = getIteratorPosition(iterArg, mSettings);
+                    if (!dest)
+                        continue;
+                    available = getAvailableSpace(dest);
+                    if (!available || available.count < 0)
+                        continue;
+                    sourceCount =
+                        countBased
+                            ? findExcessiveCount(args[1], available.count, dest.value->path, mSettings)
+                            : findExcessiveDistance(args[0], args[1], available.count, dest.value->path, mSettings);
+                    if (!sourceCount || bothSidesPossible(sourceCount, available))
+                        continue;
+                }
+                const ValueFlow::Value* conditionValue = nullptr;
+                bool inconclusiveValues = false;
+                std::vector<const ValueFlow::Value*> usedValues = sourceCount.values;
+                usedValues.insert(usedValues.end(), available.values.cbegin(), available.values.cend());
+                for (const ValueFlow::Value* value : usedValues) {
+                    if (!conditionValue && value->condition)
+                        conditionValue = value;
+                    inconclusiveValues |= value->isInconclusive();
+                }
+                if (conditionValue && !mSettings.severity.isEnabled(Severity::warning))
+                    continue;
+                const ValueFlow::Value* pathValue = conditionValue ? conditionValue : available.values.back();
+                algorithmOutOfBoundsError(iterArg,
+                                          "std::" + nameTok->str(),
+                                          sourceCount.count,
+                                          available.count,
+                                          pathValue,
+                                          atMost,
+                                          atMost || inconclusiveValues);
+            }
+        }
+    }
+}
+
+void CheckStlImpl::algorithmOutOfBoundsError(const Token* tok,
+                                             const std::string& algoName,
+                                             MathLib::bigint accessed,
+                                             MathLib::bigint available,
+                                             const ValueFlow::Value* value,
+                                             bool mayAccessFewer,
+                                             bool inconclusive)
+{
+    const Token* const condition = value ? value->condition : nullptr;
+    const std::string iterExpr = tok ? tok->expressionString() : "it";
+    const std::string accessedStr = MathLib::toString(accessed) + (accessed == 1 ? " element" : " elements");
+    const std::string availableStr = MathLib::toString(available) + (available == 1 ? " element is" : " elements are");
+    const std::string body = "algorithm '" + algoName + "' " + (mayAccessFewer ? "may access up to " : "accesses ") +
+                             accessedStr + " through the iterator '" + iterExpr + "' but only " + availableStr +
+                             " available.";
+    const std::string msg =
+        condition ? (ValueFlow::eitherTheConditionIsRedundant(condition) + " or the " + body) : ("The " + body);
+    ErrorPath errorPath = getErrorPath(tok, value, "Access out of bounds");
+    reportError(std::move(errorPath),
+                (condition || mayAccessFewer) ? Severity::warning : Severity::error,
+                "algorithmOutOfBounds",
+                msg,
+                CWE788,
+                inconclusive ? Certainty::inconclusive : Certainty::normal);
+}
+
 static bool isMutex(const Variable* var)
 {
     const Token* tok = Token::typeDecl(var->nameToken()).first;
@@ -3353,23 +3786,23 @@ static bool isLocalMutex(const Variable* var, const Scope* scope)
     return !var->isReference() && !var->isRValueReference() && !var->isStatic() && var->scope() == scope;
 }
 
-void CheckStl::globalLockGuardError(const Token* tok)
+void CheckStlImpl::globalLockGuardError(const Token* tok)
 {
     reportError(tok, Severity::warning,
                 "globalLockGuard",
                 "Lock guard is defined globally. Lock guards are intended to be local. A global lock guard could lead to a deadlock since it won't unlock until the end of the program.", CWE833, Certainty::normal);
 }
 
-void CheckStl::localMutexError(const Token* tok)
+void CheckStlImpl::localMutexError(const Token* tok)
 {
     reportError(tok, Severity::warning,
                 "localMutex",
                 "The lock is ineffective because the mutex is locked at the same scope as the mutex itself.", CWE667, Certainty::normal);
 }
 
-void CheckStl::checkMutexes()
+void CheckStlImpl::checkMutexes()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
     logChecker("CheckStl::checkMutexes"); // warning
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -3404,13 +3837,13 @@ void CheckStl::checkMutexes()
     }
 }
 
-void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     if (!tokenizer.isCPP()) {
         return;
     }
 
-    CheckStl checkStl(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckStlImpl checkStl(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkStl.erase();
     checkStl.if_find();
     checkStl.checkFindInsert();
@@ -3431,6 +3864,7 @@ void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkStl.mismatchingContainerIterator();
     checkStl.knownEmptyContainer();
     checkStl.eraseIteratorOutOfBounds();
+    checkStl.algorithmOutOfBounds();
 
     checkStl.stlBoundaries();
     checkStl.checkDereferenceInvalidIterator();
@@ -3441,16 +3875,16 @@ void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkStl.size();
 }
 
-void CheckStl::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+void CheckStl::getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const
 {
-    CheckStl c(nullptr, settings, errorLogger);
+    CheckStlImpl c(nullptr, settings, errorLogger);
     c.outOfBoundsError(nullptr, "container", nullptr, "x", nullptr);
     c.invalidIteratorError(nullptr, "iterator");
     c.iteratorsError(nullptr, "container1", "container2");
-    c.iteratorsError(nullptr, nullptr, "container0", "container1");
     c.iteratorsError(nullptr, nullptr, "container");
     c.invalidContainerLoopError(nullptr, nullptr, ErrorPath{});
-    c.invalidContainerError(nullptr, nullptr, nullptr, ErrorPath{});
+    c.invalidContainerError(nullptr, nullptr, ErrorPath{});
+    c.invalidContainerReferenceError(nullptr, nullptr, ErrorPath{});
     c.mismatchingContainerIteratorError(nullptr, nullptr, nullptr);
     c.mismatchingContainersError(nullptr, nullptr);
     c.mismatchingContainerExpressionError(nullptr, nullptr);
@@ -3465,19 +3899,27 @@ void CheckStl::getErrorMessages(ErrorLogger* errorLogger, const Settings* settin
     c.string_c_strError(nullptr);
     c.string_c_strReturn(nullptr);
     c.string_c_strParam(nullptr, 0);
+    c.string_c_strConstructor(nullptr);
+    c.string_c_strAssignment(nullptr);
+    c.string_c_strConcat(nullptr);
+    c.string_c_strStream(nullptr);
     c.string_c_strThrowError(nullptr);
     c.sizeError(nullptr);
     c.missingComparisonError(nullptr, nullptr);
     c.redundantIfRemoveError(nullptr);
     c.uselessCallsReturnValueError(nullptr, "str", "find");
     c.uselessCallsSwapError(nullptr, "str");
-    c.uselessCallsSubstrError(nullptr, SubstrErrorType::COPY);
+    c.uselessCallsSubstrError(nullptr, CheckStlImpl::SubstrErrorType::COPY);
+    c.uselessCallsConstructorError(nullptr);
     c.uselessCallsEmptyError(nullptr);
     c.uselessCallsRemoveError(nullptr, "remove");
     c.dereferenceInvalidIteratorError(nullptr, "i");
+    // TODO: derefInvalidIteratorRedundantCheck
     c.eraseIteratorOutOfBoundsError(nullptr, nullptr);
+    c.algorithmOutOfBoundsError(nullptr, "std::copy", 10, 6, nullptr, false, false);
     c.useStlAlgorithmError(nullptr, "");
     c.knownEmptyContainerError(nullptr, "");
     c.globalLockGuardError(nullptr);
     c.localMutexError(nullptr);
+    c.outOfBoundsIndexExpressionError(nullptr, nullptr);
 }
diff --git a/lib/checkstl.h b/lib/checkstl.h
index 9e56ee1b1d3..0f9a70a7a15 100644
--- a/lib/checkstl.h
+++ b/lib/checkstl.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,8 +23,10 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "errortypes.h"
+#include "mathlib.h"
 
 #include <cstdint>
 #include <string>
@@ -48,15 +50,43 @@ namespace ValueFlow
 class CPPCHECKLIB CheckStl : public Check {
 public:
     /** This constructor is used when registering the CheckClass */
-    CheckStl() : Check(myName()) {}
+    CheckStl() : Check("STL usage") {}
 
 private:
-    /** This constructor is used when running checks. */
-    CheckStl(const Tokenizer* tokenizer, const Settings* settings, ErrorLogger* errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** run checks, the token list is not simplified */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const override;
+
+    std::string classInfo() const override {
+        return "Check for invalid usage of STL:\n"
+               "- out of bounds errors\n"
+               "- misuse of iterators when iterating through a container\n"
+               "- mismatching containers in calls\n"
+               "- same iterators in calls\n"
+               "- dereferencing an erased iterator\n"
+               "- for vectors: using iterator/pointer after push_back has been used\n"
+               "- optimisation: use empty() instead of size() to guarantee fast code\n"
+               "- suspicious condition when using find\n"
+               "- unnecessary searching in associative containers\n"
+               "- redundant condition\n"
+               "- common mistakes when using string::c_str()\n"
+               "- useless calls of string and STL functions\n"
+               "- dereferencing an invalid iterator\n"
+               "- erasing an iterator that is out of bounds\n"
+               "- out of bounds access of an iterator passed to an STL algorithm\n"
+               "- reading from empty STL container\n"
+               "- iterating over an empty STL container\n"
+               "- consider using an STL algorithm instead of raw loop\n"
+               "- incorrect locking with mutex\n";
+    }
+};
+
+class CPPCHECKLIB CheckStlImpl : public CheckImpl {
+public:
+    /** This constructor is used when running checks. */
+    CheckStlImpl(const Tokenizer* tokenizer, const Settings& settings, ErrorLogger& errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** Accessing container out of bounds using ValueFlow */
     void outOfBounds();
@@ -155,6 +185,12 @@ class CPPCHECKLIB CheckStl : public Check {
 
     void eraseIteratorOutOfBounds();
 
+    /**
+     * Check that the iterator given to an STL algorithm is not accessed
+     * out of bounds: std::equal(in.begin(), in.end(), out.begin())
+     */
+    void algorithmOutOfBounds();
+
     void checkMutexes();
 
     bool isContainerSize(const Token *containerToken, const Token *expr) const;
@@ -176,7 +212,6 @@ class CPPCHECKLIB CheckStl : public Check {
     void negativeIndexError(const Token* tok, const ValueFlow::Value& index);
     void invalidIteratorError(const Token* tok, const std::string& iteratorName);
     void iteratorsError(const Token* tok, const std::string& containerName1, const std::string& containerName2);
-    void iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName1, const std::string& containerName2);
     void iteratorsError(const Token* tok, const Token* containerTok, const std::string& containerName);
     void mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2);
     void mismatchingContainersError(const Token* tok1, const Token* tok2);
@@ -188,7 +223,7 @@ class CPPCHECKLIB CheckStl : public Check {
     void sizeError(const Token* tok);
     void redundantIfRemoveError(const Token* tok);
     void invalidContainerLoopError(const Token* tok, const Token* loopTok, ErrorPath errorPath);
-    void invalidContainerError(const Token *tok, const Token * contTok, const ValueFlow::Value *val, ErrorPath errorPath);
+    void invalidContainerError(const Token *tok, const ValueFlow::Value *val, ErrorPath errorPath);
     void invalidContainerReferenceError(const Token* tok, const Token* contTok, ErrorPath errorPath);
 
     void uselessCallsReturnValueError(const Token* tok, const std::string& varname, const std::string& function);
@@ -208,36 +243,16 @@ class CPPCHECKLIB CheckStl : public Check {
 
     void eraseIteratorOutOfBoundsError(const Token* ftok, const Token* itertok, const ValueFlow::Value* val = nullptr);
 
+    void algorithmOutOfBoundsError(const Token* tok,
+                                   const std::string& algoName,
+                                   MathLib::bigint accessed,
+                                   MathLib::bigint available,
+                                   const ValueFlow::Value* value,
+                                   bool mayAccessFewer,
+                                   bool inconclusive);
+
     void globalLockGuardError(const Token *tok);
     void localMutexError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
-
-    static std::string myName() {
-        return "STL usage";
-    }
-
-    std::string classInfo() const override {
-        return "Check for invalid usage of STL:\n"
-               "- out of bounds errors\n"
-               "- misuse of iterators when iterating through a container\n"
-               "- mismatching containers in calls\n"
-               "- same iterators in calls\n"
-               "- dereferencing an erased iterator\n"
-               "- for vectors: using iterator/pointer after push_back has been used\n"
-               "- optimisation: use empty() instead of size() to guarantee fast code\n"
-               "- suspicious condition when using find\n"
-               "- unnecessary searching in associative containers\n"
-               "- redundant condition\n"
-               "- common mistakes when using string::c_str()\n"
-               "- useless calls of string and STL functions\n"
-               "- dereferencing an invalid iterator\n"
-               "- erasing an iterator that is out of bounds\n"
-               "- reading from empty STL container\n"
-               "- iterating over an empty STL container\n"
-               "- consider using an STL algorithm instead of raw loop\n"
-               "- incorrect locking with mutex\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp
index c6d4cb88cab..1d391895c3e 100644
--- a/lib/checkstring.cpp
+++ b/lib/checkstring.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -36,11 +36,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckString instance;
-}
-
 // CWE ids used:
 static const CWE CWE570(570U);   // Expression is Always False
 static const CWE CWE571(571U);   // Expression is Always True
@@ -52,7 +47,7 @@ static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Imple
 //---------------------------------------------------------------------------
 // Writing string literal is UB
 //---------------------------------------------------------------------------
-void CheckString::stringLiteralWrite()
+void CheckStringImpl::stringLiteralWrite()
 {
     logChecker("CheckString::stringLiteralWrite");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -60,7 +55,7 @@ void CheckString::stringLiteralWrite()
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             if (!tok->variable() || !tok->variable()->isPointer())
                 continue;
-            const Token *str = tok->getValueTokenMinStrSize(*mSettings);
+            const Token *str = tok->getValueTokenMinStrSize(mSettings);
             if (!str)
                 continue;
             if (Token::Match(tok, "%var% [") && Token::simpleMatch(tok->linkAt(1), "] ="))
@@ -71,7 +66,7 @@ void CheckString::stringLiteralWrite()
     }
 }
 
-void CheckString::stringLiteralWriteError(const Token *tok, const Token *strValue)
+void CheckStringImpl::stringLiteralWriteError(const Token *tok, const Token *strValue)
 {
     std::list<const Token*> callstack{ tok };
     if (strValue)
@@ -94,9 +89,9 @@ void CheckString::stringLiteralWriteError(const Token *tok, const Token *strValu
 // Check for string comparison involving two static strings.
 // if(strcmp("00FF00","00FF00")==0) // <- statement is always true
 //---------------------------------------------------------------------------
-void CheckString::checkAlwaysTrueOrFalseStringCompare()
+void CheckStringImpl::checkAlwaysTrueOrFalseStringCompare()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::checkAlwaysTrueOrFalseStringCompare"); // warning
@@ -138,7 +133,7 @@ void CheckString::checkAlwaysTrueOrFalseStringCompare()
     }
 }
 
-void CheckString::alwaysTrueFalseStringCompareError(const Token *tok, const std::string& str1, const std::string& str2)
+void CheckStringImpl::alwaysTrueFalseStringCompareError(const Token *tok, const std::string& str1, const std::string& str2)
 {
     constexpr std::size_t stringLen = 10;
     const std::string string1 = (str1.size() < stringLen) ? str1 : (str1.substr(0, stringLen-2) + "..");
@@ -150,7 +145,7 @@ void CheckString::alwaysTrueFalseStringCompareError(const Token *tok, const std:
                 "Therefore the comparison is unnecessary and looks suspicious.", (str1==str2)?CWE571:CWE570, Certainty::normal);
 }
 
-void CheckString::alwaysTrueStringVariableCompareError(const Token *tok, const std::string& str1, const std::string& str2)
+void CheckStringImpl::alwaysTrueStringVariableCompareError(const Token *tok, const std::string& str1, const std::string& str2)
 {
     reportError(tok, Severity::warning, "stringCompare",
                 "Comparison of identical string variables.\n"
@@ -163,9 +158,9 @@ void CheckString::alwaysTrueStringVariableCompareError(const Token *tok, const s
 // Detect "str == '\0'" where "*str == '\0'" is correct.
 // Comparing char* with each other instead of using strcmp()
 //-----------------------------------------------------------------------------
-void CheckString::checkSuspiciousStringCompare()
+void CheckStringImpl::checkSuspiciousStringCompare()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::checkSuspiciousStringCompare"); // warning
@@ -202,14 +197,14 @@ void CheckString::checkSuspiciousStringCompare()
     }
 }
 
-void CheckString::suspiciousStringCompareError(const Token* tok, const std::string& var, bool isLong)
+void CheckStringImpl::suspiciousStringCompareError(const Token* tok, const std::string& var, bool isLong)
 {
     const std::string cmpFunc = isLong ? "wcscmp" : "strcmp";
     reportError(tok, Severity::warning, "literalWithCharPtrCompare",
                 "$symbol:" + var + "\nString literal compared with variable '$symbol'. Did you intend to use " + cmpFunc + "() instead?", CWE595, Certainty::normal);
 }
 
-void CheckString::suspiciousStringCompareError_char(const Token* tok, const std::string& var)
+void CheckStringImpl::suspiciousStringCompareError_char(const Token* tok, const std::string& var)
 {
     reportError(tok, Severity::warning, "charLiteralWithCharPtrCompare",
                 "$symbol:" + var + "\nChar literal compared with pointer '$symbol'. Did you intend to dereference it?", CWE595, Certainty::normal);
@@ -225,7 +220,7 @@ static bool isChar(const Variable* var)
     return (var && !var->isPointer() && !var->isArray() && (var->typeStartToken()->str() == "char" || var->typeStartToken()->str() == "wchar_t"));
 }
 
-void CheckString::strPlusChar()
+void CheckStringImpl::strPlusChar()
 {
     logChecker("CheckString::strPlusChar");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -241,7 +236,7 @@ void CheckString::strPlusChar()
     }
 }
 
-void CheckString::strPlusCharError(const Token *tok)
+void CheckStringImpl::strPlusCharError(const Token *tok)
 {
     std::string charType = "char";
     if (tok && tok->astOperand2() && tok->astOperand2()->variable())
@@ -277,9 +272,9 @@ static bool isMacroUsage(const Token* tok)
 // Implicit casts of string literals to bool
 // Comparing string literal with strlen() with wrong length
 //---------------------------------------------------------------------------
-void CheckString::checkIncorrectStringCompare()
+void CheckStringImpl::checkIncorrectStringCompare()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::checkIncorrectStringCompare"); // warning
@@ -318,19 +313,20 @@ void CheckString::checkIncorrectStringCompare()
                     }
                 }
             } else if (Token::Match(tok, "%str%|%char%") &&
-                       isUsedAsBool(tok, *mSettings) &&
+                       !Token::Match(tok->next(), "%name%") &&
+                       isUsedAsBool(tok, mSettings) &&
                        !isMacroUsage(tok))
                 incorrectStringBooleanError(tok, tok->str());
         }
     }
 }
 
-void CheckString::incorrectStringCompareError(const Token *tok, const std::string& func, const std::string &string)
+void CheckStringImpl::incorrectStringCompareError(const Token *tok, const std::string& func, const std::string &string)
 {
     reportError(tok, Severity::warning, "incorrectStringCompare", "$symbol:" + func + "\nString literal " + string + " doesn't match length argument for $symbol().", CWE570, Certainty::normal);
 }
 
-void CheckString::incorrectStringBooleanError(const Token *tok, const std::string& string)
+void CheckStringImpl::incorrectStringBooleanError(const Token *tok, const std::string& string)
 {
     const bool charLiteral = isCharLiteral(string);
     const std::string literalType = charLiteral ? "char" : "string";
@@ -345,9 +341,9 @@ void CheckString::incorrectStringBooleanError(const Token *tok, const std::strin
 // always true: strcmp(str,"a")==0 || strcmp(str,"b")
 // TODO: Library configuration for string comparison functions
 //---------------------------------------------------------------------------
-void CheckString::overlappingStrcmp()
+void CheckStringImpl::overlappingStrcmp()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckString::overlappingStrcmp"); // warning
@@ -399,7 +395,7 @@ void CheckString::overlappingStrcmp()
                     if (args1[1]->isLiteral() &&
                         args2[1]->isLiteral() &&
                         args1[1]->str() != args2[1]->str() &&
-                        isSameExpression(true, args1[0], args2[0], *mSettings, true, false))
+                        isSameExpression(true, args1[0], args2[0], mSettings, true, false))
                         overlappingStrcmpError(eq0, ne0);
                 }
             }
@@ -407,7 +403,7 @@ void CheckString::overlappingStrcmp()
     }
 }
 
-void CheckString::overlappingStrcmpError(const Token *eq0, const Token *ne0)
+void CheckStringImpl::overlappingStrcmpError(const Token *eq0, const Token *ne0)
 {
     std::string eq0Expr(eq0 ? eq0->expressionString() : std::string("strcmp(x,\"abc\")"));
     if (eq0 && eq0->astParent()->str() == "!")
@@ -424,7 +420,7 @@ void CheckString::overlappingStrcmpError(const Token *eq0, const Token *ne0)
 // Overlapping source and destination passed to sprintf().
 // TODO: Library configuration for overlapping arguments
 //---------------------------------------------------------------------------
-void CheckString::sprintfOverlappingData()
+void CheckStringImpl::sprintfOverlappingData()
 {
     logChecker("CheckString::sprintfOverlappingData");
 
@@ -450,7 +446,7 @@ void CheckString::sprintfOverlappingData()
                 const bool same = isSameExpression(false,
                                                    dest,
                                                    arg,
-                                                   *mSettings,
+                                                   mSettings,
                                                    true,
                                                    false);
                 if (same) {
@@ -461,7 +457,7 @@ void CheckString::sprintfOverlappingData()
     }
 }
 
-void CheckString::sprintfOverlappingDataError(const Token *funcTok, const Token *tok, const std::string &varname)
+void CheckStringImpl::sprintfOverlappingDataError(const Token *funcTok, const Token *tok, const std::string &varname)
 {
     const std::string func = funcTok ? funcTok->str() : "s[n]printf";
 
@@ -475,9 +471,9 @@ void CheckString::sprintfOverlappingDataError(const Token *funcTok, const Token
                 "to sprintf() or snprintf(), the results are undefined.\"", CWE628, Certainty::normal);
 }
 
-void CheckString::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckString::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckString checkString(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckStringImpl checkString(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Checks
     checkString.strPlusChar();
@@ -489,9 +485,9 @@ void CheckString::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger
     checkString.checkAlwaysTrueOrFalseStringCompare();
 }
 
-void CheckString::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckString::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckString c(nullptr, settings, errorLogger);
+    CheckStringImpl c(nullptr, settings, errorLogger);
     c.stringLiteralWriteError(nullptr, nullptr);
     c.sprintfOverlappingDataError(nullptr, nullptr, "varname");
     c.strPlusCharError(nullptr);
diff --git a/lib/checkstring.h b/lib/checkstring.h
index 76002f8ed3d..1614e4dc7d3 100644
--- a/lib/checkstring.h
+++ b/lib/checkstring.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,15 +42,31 @@ class Tokenizer;
 class CPPCHECKLIB CheckString : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckString() : Check(myName()) {}
+    CheckString() : Check("String") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckString(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Detect misusage of C-style strings:\n"
+               "- overlapping buffers passed to sprintf as source and destination\n"
+               "- incorrect length arguments for 'substr' and 'strncmp'\n"
+               "- suspicious condition (runtime comparison of string literals)\n"
+               "- suspicious condition (string/char literals as boolean)\n"
+               "- suspicious comparison of a string literal with a char\\* variable\n"
+               "- suspicious comparison of '\\0' with a char\\* variable\n"
+               "- overlapping strcmp() expression\n";
+    }
+};
+
+class CPPCHECKLIB CheckStringImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckStringImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief undefined behaviour, writing string literal */
     void stringLiteralWrite();
@@ -82,23 +99,6 @@ class CPPCHECKLIB CheckString : public Check {
     void suspiciousStringCompareError(const Token* tok, const std::string& var, bool isLong);
     void suspiciousStringCompareError_char(const Token* tok, const std::string& var);
     void overlappingStrcmpError(const Token* eq0, const Token *ne0);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "String";
-    }
-
-    std::string classInfo() const override {
-        return "Detect misusage of C-style strings:\n"
-               "- overlapping buffers passed to sprintf as source and destination\n"
-               "- incorrect length arguments for 'substr' and 'strncmp'\n"
-               "- suspicious condition (runtime comparison of string literals)\n"
-               "- suspicious condition (string/char literals as boolean)\n"
-               "- suspicious comparison of a string literal with a char\\* variable\n"
-               "- suspicious comparison of '\\0' with a char\\* variable\n"
-               "- overlapping strcmp() expression\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
index 3498e161aae..447a8924360 100644
--- a/lib/checktype.cpp
+++ b/lib/checktype.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -44,11 +44,6 @@
 
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckType instance;
-}
-
 //---------------------------------------------------------------------------
 // Checking for shift by too many bits
 //---------------------------------------------------------------------------
@@ -61,10 +56,10 @@ static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Imple
 static const CWE CWE190(190U);   // Integer Overflow or Wraparound
 
 
-void CheckType::checkTooBigBitwiseShift()
+void CheckTypeImpl::checkTooBigBitwiseShift()
 {
     // unknown sizeof(int) => can't run this checker
-    if (mSettings->platform.type == Platform::Type::Unspecified)
+    if (mSettings.platform.type == Platform::Type::Unspecified)
         return;
 
     logChecker("CheckType::checkTooBigBitwiseShift"); // platform
@@ -95,27 +90,27 @@ void CheckType::checkTooBigBitwiseShift()
             (lhstype->type == ValueType::Type::WCHAR_T) ||
             (lhstype->type == ValueType::Type::BOOL) ||
             (lhstype->type == ValueType::Type::INT))
-            lhsbits = mSettings->platform.int_bit;
+            lhsbits = mSettings.platform.int_bit;
         else if (lhstype->type == ValueType::Type::LONG)
-            lhsbits = mSettings->platform.long_bit;
+            lhsbits = mSettings.platform.long_bit;
         else if (lhstype->type == ValueType::Type::LONGLONG)
-            lhsbits = mSettings->platform.long_long_bit;
+            lhsbits = mSettings.platform.long_long_bit;
         else
             continue;
 
         // Get biggest rhs value. preferably a value which doesn't have 'condition'.
-        const ValueFlow::Value * value = tok->astOperand2()->getValueGE(lhsbits, *mSettings);
-        if (value && mSettings->isEnabled(value, false))
+        const ValueFlow::Value * value = tok->astOperand2()->getValueGE(lhsbits, mSettings);
+        if (value && mSettings.isEnabled(value, false))
             tooBigBitwiseShiftError(tok, lhsbits, *value);
         else if (lhstype->sign == ValueType::Sign::SIGNED) {
-            value = tok->astOperand2()->getValueGE(lhsbits-1, *mSettings);
-            if (value && mSettings->isEnabled(value, false))
+            value = tok->astOperand2()->getValueGE(lhsbits-1, mSettings);
+            if (value && mSettings.isEnabled(value, false))
                 tooBigSignedBitwiseShiftError(tok, lhsbits, *value);
         }
     }
 }
 
-void CheckType::tooBigBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
+void CheckTypeImpl::tooBigBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
 {
     constexpr char id[] = "shiftTooManyBits";
 
@@ -124,21 +119,21 @@ void CheckType::tooBigBitwiseShiftError(const Token *tok, int lhsbits, const Val
         return;
     }
 
-    const ErrorPath errorPath = getErrorPath(tok, &rhsbits, "Shift");
+    ErrorPath errorPath = getErrorPath(tok, &rhsbits, "Shift");
 
     std::ostringstream errmsg;
     errmsg << "Shifting " << lhsbits << "-bit value by " << rhsbits.intvalue << " bits is undefined behaviour";
     if (rhsbits.condition)
         errmsg << ". See condition at line " << rhsbits.condition->linenr() << ".";
 
-    reportError(errorPath, rhsbits.errorSeverity() ? Severity::error : Severity::warning, id, errmsg.str(), CWE758, rhsbits.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
+    reportError(std::move(errorPath), rhsbits.errorSeverity() ? Severity::error : Severity::warning, id, errmsg.str(), CWE758, rhsbits.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckType::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
+void CheckTypeImpl::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
 {
     constexpr char id[] = "shiftTooManyBitsSigned";
 
-    const bool cpp14 = ((tok && tok->isCpp()) || (mTokenizer && mTokenizer->isCPP())) && (mSettings->standards.cpp >= Standards::CPP14);
+    const bool cpp14 = ((tok && tok->isCpp()) || (mTokenizer && mTokenizer->isCPP())) && (mSettings.standards.cpp >= Standards::CPP14);
 
     std::string behaviour = "undefined";
     if (cpp14)
@@ -153,26 +148,26 @@ void CheckType::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, con
     if (cpp14)
         severity = Severity::portability;
 
-    if ((severity == Severity::portability) && !mSettings->severity.isEnabled(Severity::portability))
+    if ((severity == Severity::portability) && !mSettings.severity.isEnabled(Severity::portability))
         return;
-    const ErrorPath errorPath = getErrorPath(tok, &rhsbits, "Shift");
+    ErrorPath errorPath = getErrorPath(tok, &rhsbits, "Shift");
 
     std::ostringstream errmsg;
     errmsg << "Shifting signed " << lhsbits << "-bit value by " << rhsbits.intvalue << " bits is " + behaviour + " behaviour";
     if (rhsbits.condition)
         errmsg << ". See condition at line " << rhsbits.condition->linenr() << ".";
 
-    reportError(errorPath, severity, id, errmsg.str(), CWE758, rhsbits.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
+    reportError(std::move(errorPath), severity, id, errmsg.str(), CWE758, rhsbits.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
 //---------------------------------------------------------------------------
 // Checking for integer overflow
 //---------------------------------------------------------------------------
 
-void CheckType::checkIntegerOverflow()
+void CheckTypeImpl::checkIntegerOverflow()
 {
     // unknown sizeof(int) => can't run this checker
-    if (mSettings->platform.type == Platform::Type::Unspecified || mSettings->platform.int_bit >= MathLib::bigint_bits)
+    if (mSettings.platform.type == Platform::Type::Unspecified || mSettings.platform.int_bit >= MathLib::bigint_bits)
         return;
 
     logChecker("CheckType::checkIntegerOverflow"); // platform
@@ -188,11 +183,11 @@ void CheckType::checkIntegerOverflow()
 
         unsigned int bits;
         if (vt->type == ValueType::Type::INT)
-            bits = mSettings->platform.int_bit;
+            bits = mSettings.platform.int_bit;
         else if (vt->type == ValueType::Type::LONG)
-            bits = mSettings->platform.long_bit;
+            bits = mSettings.platform.long_bit;
         else if (vt->type == ValueType::Type::LONGLONG)
-            bits = mSettings->platform.long_long_bit;
+            bits = mSettings.platform.long_long_bit;
         else
             continue;
 
@@ -204,12 +199,12 @@ void CheckType::checkIntegerOverflow()
 
         // is there a overflow result value
         bool isOverflow = true;
-        const ValueFlow::Value *value = tok->getValueGE(maxvalue + 1, *mSettings);
+        const ValueFlow::Value *value = tok->getValueGE(maxvalue + 1, mSettings);
         if (!value) {
-            value = tok->getValueLE(-maxvalue - 2, *mSettings);
+            value = tok->getValueLE(-maxvalue - 2, mSettings);
             isOverflow = false;
         }
-        if (!value || !mSettings->isEnabled(value,false))
+        if (!value || !mSettings.isEnabled(value,false))
             continue;
 
         // For left shift, it's common practice to shift into the sign bit
@@ -220,7 +215,16 @@ void CheckType::checkIntegerOverflow()
     }
 }
 
-void CheckType::integerOverflowError(const Token *tok, const ValueFlow::Value &value, bool isOverflow)
+static std::string getMessageId(const ValueFlow::Value &value, const char id[])
+{
+    if (value.condition != nullptr)
+        return id + std::string("Cond");
+    if (value.safe)
+        return std::string("safe") + static_cast<char>(std::toupper(id[0])) + (id + 1);
+    return id;
+}
+
+void CheckTypeImpl::integerOverflowError(const Token *tok, const ValueFlow::Value &value, bool isOverflow)
 {
     const std::string expr(tok ? tok->expressionString() : "");
     const std::string type = isOverflow ? "overflow" : "underflow";
@@ -247,9 +251,9 @@ void CheckType::integerOverflowError(const Token *tok, const ValueFlow::Value &v
 // Checking for sign conversion when operand can be negative
 //---------------------------------------------------------------------------
 
-void CheckType::checkSignConversion()
+void CheckTypeImpl::checkSignConversion()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings.severity.isEnabled(Severity::warning))
         return;
 
     logChecker("CheckType::checkSignConversion"); // warning
@@ -268,7 +272,7 @@ void CheckType::checkSignConversion()
             if (!tok1)
                 continue;
             const ValueFlow::Value* negativeValue =
-                ValueFlow::findValue(tok1->values(), *mSettings, [&](const ValueFlow::Value& v) {
+                ValueFlow::findValue(tok1->values(), mSettings, [&](const ValueFlow::Value& v) {
                 return !v.isImpossible() && v.isIntValue() && (v.intvalue <= -1 || v.wideintvalue <= -1);
             });
             if (!negativeValue)
@@ -279,7 +283,7 @@ void CheckType::checkSignConversion()
     }
 }
 
-void CheckType::signConversionError(const Token *tok, const ValueFlow::Value *negativeValue, const bool constvalue)
+void CheckTypeImpl::signConversionError(const Token *tok, const ValueFlow::Value *negativeValue, const bool constvalue)
 {
     const std::string expr(tok ? tok->expressionString() : "var");
 
@@ -294,10 +298,10 @@ void CheckType::signConversionError(const Token *tok, const ValueFlow::Value *ne
     if (!negativeValue)
         reportError(tok, Severity::warning, "signConversion", msg.str(), CWE195, Certainty::normal);
     else {
-        const ErrorPath &errorPath = getErrorPath(tok,negativeValue,"Negative value is converted to an unsigned value");
-        reportError(errorPath,
+        ErrorPath errorPath = getErrorPath(tok,negativeValue,"Negative value is converted to an unsigned value");
+        reportError(std::move(errorPath),
                     Severity::warning,
-                    Check::getMessageId(*negativeValue, "signConversion").c_str(),
+                    getMessageId(*negativeValue, "signConversion").c_str(),
                     msg.str(),
                     CWE195,
                     negativeValue->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
@@ -322,8 +326,8 @@ static bool checkTypeCombination(ValueType src, ValueType tgt, const Settings& s
     src.reference = Reference::None;
     tgt.reference = Reference::None;
 
-    const std::size_t sizeSrc = ValueFlow::getSizeOf(src, settings);
-    const std::size_t sizeTgt = ValueFlow::getSizeOf(tgt, settings);
+    const std::size_t sizeSrc = src.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+    const std::size_t sizeTgt = tgt.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
     if (!(sizeSrc > 0 && sizeTgt > 0 && sizeSrc < sizeTgt))
         return false;
 
@@ -332,9 +336,9 @@ static bool checkTypeCombination(ValueType src, ValueType tgt, const Settings& s
     });
 }
 
-void CheckType::checkLongCast()
+void CheckTypeImpl::checkLongCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("truncLongCastAssignment"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("truncLongCastAssignment"))
         return;
 
     logChecker("CheckType::checkLongCast"); // style
@@ -345,7 +349,7 @@ void CheckType::checkLongCast()
             continue;
 
         if (const ValueFlow::Value* v = tok->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT)) {
-            if (mSettings->platform.isIntValue(v->intvalue))
+            if (mSettings.platform.isIntValue(v->intvalue))
                 continue;
         }
 
@@ -354,7 +358,7 @@ void CheckType::checkLongCast()
 
         if (!lhstype || !rhstype)
             continue;
-        if (!checkTypeCombination(*rhstype, *lhstype, *mSettings))
+        if (!checkTypeCombination(*rhstype, *lhstype, mSettings))
             continue;
 
         // assign int result to long/longlong const nonpointer?
@@ -381,10 +385,14 @@ void CheckType::checkLongCast()
             if (tok->str() == "return") {
                 if (Token::Match(tok->astOperand1(), "<<|*")) {
                     const ValueType *type = tok->astOperand1()->valueType();
-                    if (type && checkTypeCombination(*type, *retVt, *mSettings) &&
+                    if (type && checkTypeCombination(*type, *retVt, mSettings) &&
                         type->pointer == 0U &&
-                        type->originalTypeName.empty())
-                        ret = tok;
+                        type->originalTypeName.empty()) {
+                        if (!tok->astOperand1()->hasKnownIntValue()) {
+                            ret = tok;
+                        } else if (!mSettings.platform.isIntValue(tok->astOperand1()->getKnownIntValue()))
+                            ret = tok;
+                    }
                 }
                 // All return statements must have problem otherwise no warning
                 if (ret != tok) {
@@ -406,7 +414,7 @@ static void makeBaseTypeString(std::string& typeStr)
         typeStr.erase(typeStr.begin(), typeStr.begin() + pos + 6 + 1);
 }
 
-void CheckType::longCastAssignError(const Token *tok, const ValueType* src, const ValueType* tgt)
+void CheckTypeImpl::longCastAssignError(const Token *tok, const ValueType* src, const ValueType* tgt)
 {
     std::string srcStr = src ? src->str() : "int";
     makeBaseTypeString(srcStr);
@@ -419,7 +427,7 @@ void CheckType::longCastAssignError(const Token *tok, const ValueType* src, cons
                 srcStr + " result is assigned to " + tgtStr + " variable. If the variable is " + tgtStr + " to avoid loss of information, then there is loss of information. To avoid loss of information you must cast a calculation operand to " + tgtStr + ", for example 'l = a * b;' => 'l = (" + tgtStr + ")a * b;'.", CWE197, Certainty::normal);
 }
 
-void CheckType::longCastReturnError(const Token *tok, const ValueType* src, const ValueType* tgt)
+void CheckTypeImpl::longCastReturnError(const Token *tok, const ValueType* src, const ValueType* tgt)
 {
     std::string srcStr = src ? src->str() : "int";
     makeBaseTypeString(srcStr);
@@ -436,7 +444,7 @@ void CheckType::longCastReturnError(const Token *tok, const ValueType* src, cons
 // Checking for float to integer overflow
 //---------------------------------------------------------------------------
 
-void CheckType::checkFloatToIntegerOverflow()
+void CheckTypeImpl::checkFloatToIntegerOverflow()
 {
     logChecker("CheckType::checkFloatToIntegerOverflow");
 
@@ -468,7 +476,7 @@ void CheckType::checkFloatToIntegerOverflow()
             while (scope && scope->type != ScopeType::eLambda && scope->type != ScopeType::eFunction)
                 scope = scope->nestedIn;
             if (scope && scope->type == ScopeType::eFunction && scope->function && scope->function->retDef) {
-                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, *mSettings);
+                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, mSettings);
                 vtfloat = tok->astOperand1()->valueType();
                 checkFloatToIntegerOverflow(tok, &valueType, vtfloat, tok->astOperand1()->values());
             }
@@ -476,7 +484,7 @@ void CheckType::checkFloatToIntegerOverflow()
     }
 }
 
-void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *vtint, const ValueType *vtfloat, const std::list<ValueFlow::Value> &floatValues)
+void CheckTypeImpl::checkFloatToIntegerOverflow(const Token *tok, const ValueType *vtint, const ValueType *vtfloat, const std::list<ValueFlow::Value> &floatValues)
 {
     // Conversion of float to integer?
     if (!vtint || !vtint->isIntegral())
@@ -487,33 +495,33 @@ void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *v
     for (const ValueFlow::Value &f : floatValues) {
         if (f.valueType != ValueFlow::Value::ValueType::FLOAT)
             continue;
-        if (!mSettings->isEnabled(&f, false))
+        if (!mSettings.isEnabled(&f, false))
             continue;
-        if (f.floatValue >= std::exp2(mSettings->platform.long_long_bit))
+        if (f.floatValue >= std::exp2(mSettings.platform.long_long_bit))
             floatToIntegerOverflowError(tok, f);
-        else if ((-f.floatValue) > std::exp2(mSettings->platform.long_long_bit - 1))
+        else if ((-f.floatValue) > std::exp2(mSettings.platform.long_long_bit - 1))
             floatToIntegerOverflowError(tok, f);
-        else if (mSettings->platform.type != Platform::Type::Unspecified) {
+        else if (mSettings.platform.type != Platform::Type::Unspecified) {
             int bits = 0;
             if (vtint->type == ValueType::Type::CHAR)
-                bits = mSettings->platform.char_bit;
+                bits = mSettings.platform.char_bit;
             else if (vtint->type == ValueType::Type::SHORT)
-                bits = mSettings->platform.short_bit;
+                bits = mSettings.platform.short_bit;
             else if (vtint->type == ValueType::Type::INT)
-                bits = mSettings->platform.int_bit;
+                bits = mSettings.platform.int_bit;
             else if (vtint->type == ValueType::Type::LONG)
-                bits = mSettings->platform.long_bit;
+                bits = mSettings.platform.long_bit;
             else if (vtint->type == ValueType::Type::LONGLONG)
-                bits = mSettings->platform.long_long_bit;
+                bits = mSettings.platform.long_long_bit;
             else
                 continue;
-            if (bits < MathLib::bigint_bits && f.floatValue >= (static_cast<MathLib::biguint>(1) << bits))
+            if (bits < MathLib::bigint_bits && f.floatValue >= (1ULL << bits))
                 floatToIntegerOverflowError(tok, f);
         }
     }
 }
 
-void CheckType::floatToIntegerOverflowError(const Token *tok, const ValueFlow::Value &value)
+void CheckTypeImpl::floatToIntegerOverflowError(const Token *tok, const ValueFlow::Value &value)
 {
     std::ostringstream errmsg;
     errmsg << "Undefined behaviour: float (" << value.floatValue << ") to integer conversion overflow.";
@@ -523,10 +531,10 @@ void CheckType::floatToIntegerOverflowError(const Token *tok, const ValueFlow::V
                 errmsg.str(), CWE190, value.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckType::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckType::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
     // These are not "simplified" because casts can't be ignored
-    CheckType checkType(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckTypeImpl checkType(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkType.checkTooBigBitwiseShift();
     checkType.checkIntegerOverflow();
     checkType.checkSignConversion();
@@ -534,13 +542,15 @@ void CheckType::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     checkType.checkFloatToIntegerOverflow();
 }
 
-void CheckType::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckType::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckType c(nullptr, settings, errorLogger);
+    CheckTypeImpl c(nullptr, settings, errorLogger);
     c.tooBigBitwiseShiftError(nullptr, 32, ValueFlow::Value(64));
     c.tooBigSignedBitwiseShiftError(nullptr, 31, ValueFlow::Value(31));
     c.integerOverflowError(nullptr, ValueFlow::Value(1LL<<32));
+    // TODO: integerOverflowCond
     c.signConversionError(nullptr, nullptr, false);
+    // TODO: signConversionCond
     c.longCastAssignError(nullptr);
     c.longCastReturnError(nullptr);
     ValueFlow::Value f;
diff --git a/lib/checktype.h b/lib/checktype.h
index d90e11f6fd1..83eedda5583 100644
--- a/lib/checktype.h
+++ b/lib/checktype.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <list>
@@ -47,15 +48,30 @@ namespace ValueFlow
 class CPPCHECKLIB CheckType : public Check {
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckType() : Check(myName()) {}
+    CheckType() : Check("Type") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckType(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Type checks\n"
+               "- bitwise shift by too many bits (only enabled when --platform is used)\n"
+               "- signed integer overflow (only enabled when --platform is used)\n"
+               "- dangerous sign conversion, when signed value can be negative\n"
+               "- possible loss of information when assigning int result to long variable\n"
+               "- possible loss of information when returning int result as long return value\n"
+               "- float conversion overflow\n";
+    }
+};
+
+class CPPCHECKLIB CheckTypeImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckTypeImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for bitwise shift with too big right operand */
     void checkTooBigBitwiseShift();
@@ -81,22 +97,6 @@ class CPPCHECKLIB CheckType : public Check {
     void longCastAssignError(const Token *tok, const ValueType* src = nullptr, const ValueType* tgt = nullptr);
     void longCastReturnError(const Token *tok, const ValueType* src = nullptr, const ValueType* tgt = nullptr);
     void floatToIntegerOverflowError(const Token *tok, const ValueFlow::Value &value);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Type";
-    }
-
-    std::string classInfo() const override {
-        return "Type checks\n"
-               "- bitwise shift by too many bits (only enabled when --platform is used)\n"
-               "- signed integer overflow (only enabled when --platform is used)\n"
-               "- dangerous sign conversion, when signed value can be negative\n"
-               "- possible loss of information when assigning int result to long variable\n"
-               "- possible loss of information when returning int result as long return value\n"
-               "- float conversion overflow\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 6a1e5416603..d05ea3fbd28 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,6 +21,7 @@
 #include "checkuninitvar.h"
 
 #include "astutils.h"
+#include "checkimpl.h"
 #include "ctu.h"
 #include "errorlogger.h"
 #include "library.h"
@@ -42,6 +43,7 @@
 #include <list>
 #include <map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
@@ -49,11 +51,6 @@
 // CWE ids used:
 static const CWE CWE_USE_OF_UNINITIALIZED_VARIABLE(457U);
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckUninitVar instance;
-}
-
 //---------------------------------------------------------------------------
 
 // get ast parent, skip possible address-of and casts
@@ -101,7 +98,7 @@ static std::map<nonneg int, VariableValue> getVariableValues(const Token* tok) {
     return ret;
 }
 
-bool CheckUninitVar::diag(const Token* tok)
+bool CheckUninitVarImpl::diag(const Token* tok)
 {
     if (!tok)
         return true;
@@ -110,7 +107,7 @@ bool CheckUninitVar::diag(const Token* tok)
     return !mUninitDiags.insert(tok).second;
 }
 
-void CheckUninitVar::check()
+void CheckUninitVarImpl::check()
 {
     logChecker("CheckUninitVar::check");
 
@@ -130,7 +127,7 @@ void CheckUninitVar::check()
     }
 }
 
-void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string> &arrayTypeDefs)
+void CheckUninitVarImpl::checkScope(const Scope* scope, const std::set<std::string> &arrayTypeDefs)
 {
     for (const Variable &var : scope->varlist) {
         if ((mTokenizer->isCPP() && var.type() && !var.isPointer() && var.type()->needInitialization != Type::NeedInitialization::True) ||
@@ -145,11 +142,11 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
             continue;
 
         if (Token::Match(var.nameToken(), "%name% =")) { // Variable is initialized, but Rhs might be not
-            checkRhs(var.nameToken(), var, NO_ALLOC, 0U, emptyString);
+            checkRhs(var.nameToken(), var, NO_ALLOC, 0U, "");
             continue;
         }
         if (Token::Match(var.nameToken(), "%name% ) (") && Token::simpleMatch(var.nameToken()->linkAt(2), ") =")) { // Function pointer is initialized, but Rhs might be not
-            checkRhs(var.nameToken()->linkAt(2)->next(), var, NO_ALLOC, 0U, emptyString);
+            checkRhs(var.nameToken()->linkAt(2)->next(), var, NO_ALLOC, 0U, "");
             continue;
         }
 
@@ -181,7 +178,7 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
             continue;
 
         if (tok->astParent() && Token::simpleMatch(tok->astParent()->previous(), "for (") && Token::simpleMatch(tok->astParent()->link()->next(), "{") &&
-            checkLoopBody(tok->astParent()->link()->next(), var, var.isArray() ? ARRAY : NO_ALLOC, emptyString, true))
+            checkLoopBody(tok->astParent()->link()->next(), var, var.isArray() ? ARRAY : NO_ALLOC, "", true))
             continue;
 
         if (var.isArray()) {
@@ -195,14 +192,14 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
             if (!init) {
                 Alloc alloc = ARRAY;
                 std::map<nonneg int, VariableValue> variableValue = getVariableValues(var.typeStartToken());
-                checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, emptyString, variableValue);
+                checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, "", variableValue);
             }
             continue;
         }
         if (stdtype || var.isPointer()) {
             Alloc alloc = NO_ALLOC;
             std::map<nonneg int, VariableValue> variableValue = getVariableValues(var.typeStartToken());
-            checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, emptyString, variableValue);
+            checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, "", variableValue);
         }
         if (var.type())
             checkStruct(tok, var);
@@ -215,10 +212,10 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
                 for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
                     if (!Token::Match(tok, "[;{}] %varid% =", arg.declarationId()))
                         continue;
-                    const Token *allocFuncCallToken = findAllocFuncCallToken(tok->tokAt(2)->astOperand2(), mSettings->library);
+                    const Token *allocFuncCallToken = findAllocFuncCallToken(tok->tokAt(2)->astOperand2(), mSettings.library);
                     if (!allocFuncCallToken)
                         continue;
-                    const Library::AllocFunc *allocFunc = mSettings->library.getAllocFuncInfo(allocFuncCallToken);
+                    const Library::AllocFunc *allocFunc = mSettings.library.getAllocFuncInfo(allocFuncCallToken);
                     if (!allocFunc || allocFunc->initData)
                         continue;
 
@@ -227,7 +224,7 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
                     else if (arg.typeStartToken()->isStandardType() || arg.typeStartToken()->isEnumType()) {
                         Alloc alloc = NO_ALLOC;
                         std::map<nonneg int, VariableValue> variableValue;
-                        checkScopeForVariable(tok->next(), arg, nullptr, nullptr, &alloc, emptyString, variableValue);
+                        checkScopeForVariable(tok->next(), arg, nullptr, nullptr, &alloc, "", variableValue);
                     }
                 }
             }
@@ -235,7 +232,7 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
     }
 }
 
-void CheckUninitVar::checkStruct(const Token *tok, const Variable &structvar)
+void CheckUninitVarImpl::checkStruct(const Token *tok, const Variable &structvar)
 {
     const Token *typeToken = structvar.typeStartToken();
     while (Token::Match(typeToken, "%name% ::"))
@@ -303,7 +300,7 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<nonneg i
     if (tok->isName() || tok->str() == ".") {
         while (tok && tok->str() == ".")
             tok = tok->astOperand2();
-        const auto it = utils::as_const(variableValue).find(tok ? tok->varId() : ~0U);
+        const auto it = tok ? variableValue.find(tok->varId()) : variableValue.end();
         if (it != variableValue.end()) {
             *alwaysTrue = (it->second != 0LL);
             *alwaysFalse = (it->second == 0LL);
@@ -329,7 +326,7 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<nonneg i
         while (vartok && vartok->str() == ".")
             vartok = vartok->astOperand2();
 
-        const auto it = utils::as_const(variableValue).find(vartok ? vartok->varId() : ~0U);
+        const auto it = vartok ? variableValue.find(vartok->varId()) : variableValue.end();
         if (it == variableValue.end())
             return;
 
@@ -382,7 +379,7 @@ static bool isVariableUsed(const Token *tok, const Variable& var)
         return isVariableUsed(tok->astOperand1(),var) || isVariableUsed(tok->astOperand2(),var);
     if (tok->varId() != var.declarationId())
         return false;
-    if (!var.isArray())
+    if (!var.isArray() && !var.isPointer())
         return true;
 
     const Token *parent = tok->astParent();
@@ -396,10 +393,10 @@ static bool isVariableUsed(const Token *tok, const Variable& var)
     return !parent2 || parent2->isConstOp() || (parent2->str() == "=" && parent2->astOperand2() == parent);
 }
 
-bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var, bool * const possibleInit, bool * const noreturn, Alloc* const alloc, const std::string &membervar, std::map<nonneg int, VariableValue>& variableValue)
+bool CheckUninitVarImpl::checkScopeForVariable(const Token *tok, const Variable& var, bool * const possibleInit, bool * const noreturn, Alloc* const alloc, const std::string &membervar, std::map<nonneg int, VariableValue>& variableValue)
 {
     const bool suppressErrors(possibleInit && *possibleInit);  // Assume that this is a variable declaration, rather than a fundef
-    const bool printDebug = mSettings->debugwarnings;
+    const bool printDebug = mSettings.debugwarnings;
 
     if (possibleInit)
         *possibleInit = false;
@@ -766,7 +763,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 while (rhs && rhs->isCast())
                     rhs = rhs->astOperand2() ? rhs->astOperand2() : rhs->astOperand1();
                 if (rhs && Token::Match(rhs->previous(), "%name% (")) {
-                    const Library::AllocFunc *allocFunc = mSettings->library.getAllocFuncInfo(rhs->astOperand1());
+                    const Library::AllocFunc *allocFunc = mSettings.library.getAllocFuncInfo(rhs->astOperand1());
                     if (allocFunc && !allocFunc->initData) {
                         *alloc = NO_CTOR_CALL;
                         continue;
@@ -783,12 +780,16 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 // standard or enum type: check if new initializes the allocated memory
                 if (var.typeStartToken()->isStandardType() || var.typeStartToken()->isEnumType()) {
                     // scalar new with initialization
-                    if (Token::Match(tok->next(), "= new %type% ("))
-                        return true;
-
                     // array new
-                    if (Token::Match(tok->next(), "= new %type% [") && Token::simpleMatch(tok->linkAt(4), "] ("))
-                        return true;
+                    if (Token::Match(tok->next(), "= new ::|%type%")) {
+                        const Token* initTok = tok->tokAt(4);
+                        while (Token::Match(initTok, "::|%type%"))
+                            initTok = initTok->next();
+                        if (Token::simpleMatch(initTok, "["))
+                            initTok = initTok->link()->next();
+                        if (Token::Match(initTok, "[({]"))
+                            return true;
+                    }
                 }
 
                 continue;
@@ -796,6 +797,9 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
 
 
             if (!membervar.empty()) {
+                if (mTokenizer->isCPP() && Token::simpleMatch(tok->astParent(), ">>"))
+                    return true;
+
                 if (isMemberVariableAssignment(tok, membervar)) {
                     checkRhs(tok, var, *alloc, number_of_if, membervar);
                     return true;
@@ -840,7 +844,8 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 }
 
                 // assume that variable is assigned
-                return true;
+                if (!Token::simpleMatch(tok->astParent(), "<<"))
+                    return true;
             }
         }
     }
@@ -848,7 +853,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
     return false;
 }
 
-const Token* CheckUninitVar::checkExpr(const Token* tok, const Variable& var, const Alloc alloc, bool known, bool* bailout) const
+const Token* CheckUninitVarImpl::checkExpr(const Token* tok, const Variable& var, const Alloc alloc, bool known, bool* bailout) const
 {
     if (!tok)
         return nullptr;
@@ -877,7 +882,7 @@ const Token* CheckUninitVar::checkExpr(const Token* tok, const Variable& var, co
     return nullptr;
 }
 
-bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Variable& var, bool suppressErrors, bool isuninit, Alloc alloc, const std::string &membervar)
+bool CheckUninitVarImpl::checkIfForWhileHead(const Token *startparentheses, const Variable& var, bool suppressErrors, bool isuninit, Alloc alloc, const std::string &membervar)
 {
     const Token * const endpar = startparentheses->link();
     if (Token::Match(startparentheses, "( ! %name% %oror%") && startparentheses->tokAt(2)->getValue(0))
@@ -902,7 +907,7 @@ bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Va
                     continue;
                 uninitvarError(errorToken, errorToken->expressionString(), alloc);
             }
-            return true;
+            return !Token::Match(tok->astParent(), "!|%comp%");
         }
         // skip sizeof / offsetof
         if (isUnevaluated(tok))
@@ -914,7 +919,7 @@ bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Va
 }
 
 /** recursively check loop, return error token */
-const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Variable& var, const Alloc alloc, const std::string &membervar, bool &bailout, bool &alwaysReturns) const
+const Token* CheckUninitVarImpl::checkLoopBodyRecursive(const Token *start, const Variable& var, const Alloc alloc, const std::string &membervar, bool &bailout, bool &alwaysReturns) const
 {
     assert(start->str() == "{");
 
@@ -961,7 +966,7 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
                 return nullptr;
             }
 
-            bool alwaysReturnsUnused;
+            bool alwaysReturnsUnused = false;
             const Token *errorToken1 = checkLoopBodyRecursive(tok, var, alloc, membervar, bailout, alwaysReturnsUnused);
             tok = tok->link();
             if (Token::simpleMatch(tok, "} else {")) {
@@ -1082,7 +1087,7 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
     return errorToken;
 }
 
-bool CheckUninitVar::checkLoopBody(const Token *tok, const Variable& var, const Alloc alloc, const std::string &membervar, const bool suppressErrors)
+bool CheckUninitVarImpl::checkLoopBody(const Token *tok, const Variable& var, const Alloc alloc, const std::string &membervar, const bool suppressErrors)
 {
     bool bailout = false;
     bool alwaysReturns = false;
@@ -1099,7 +1104,7 @@ bool CheckUninitVar::checkLoopBody(const Token *tok, const Variable& var, const
     return bailout || alwaysReturns;
 }
 
-void CheckUninitVar::checkRhs(const Token *tok, const Variable &var, Alloc alloc, nonneg int number_of_if, const std::string &membervar)
+void CheckUninitVarImpl::checkRhs(const Token *tok, const Variable &var, Alloc alloc, nonneg int number_of_if, const std::string &membervar)
 {
     bool rhs = false;
     int indent = 0;
@@ -1146,12 +1151,7 @@ static bool astIsRhs(const Token *tok)
     return tok && tok->astParent() && tok == tok->astParent()->astOperand2();
 }
 
-static bool isVoidCast(const Token *tok)
-{
-    return Token::simpleMatch(tok, "(") && tok->isCast() && tok->valueType() && tok->valueType()->type == ValueType::Type::VOID && tok->valueType()->pointer == 0;
-}
-
-const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
+const Token* CheckUninitVarImpl::isVariableUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
 {
     const bool cpp = vartok->isCpp();
     const Token *valueExpr = vartok;   // non-dereferenced , no address of value as variable
@@ -1243,7 +1243,7 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library&
             return nullptr;
     }
     if (alloc != NO_ALLOC) {
-        if (Token::Match(valueExpr->astParent(), "%comp%|%oror%|&&|?|!"))
+        if (Token::Match(valueExpr->astParent(), "%comp%|%oror%|&&|?|!|%"))
             return nullptr;
         if (Token::Match(valueExpr->astParent(), "%or%|&") && valueExpr->astParent()->isBinaryOp())
             return nullptr;
@@ -1258,8 +1258,6 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library&
         const Token *parent = valueExpr->astParent();
         while (Token::simpleMatch(parent, ","))
             parent = parent->astParent();
-        if (Token::simpleMatch(parent, "{"))
-            return valueExpr;
         const int use = isFunctionParUsage(valueExpr, library, pointer, alloc, indirect);
         return (use>0) ? valueExpr : nullptr;
     }
@@ -1355,9 +1353,9 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, const Library&
     return derefValue ? derefValue : valueExpr;
 }
 
-const Token* CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
+const Token* CheckUninitVarImpl::isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
 {
-    return isVariableUsage(vartok, mSettings->library, pointer, alloc, indirect);
+    return isVariableUsage(vartok, mSettings.library, pointer, alloc, indirect);
 }
 
 /***
@@ -1366,7 +1364,7 @@ const Token* CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer,
  * is passed "by reference" then it is not necessarily "used".
  * @return  -1 => unknown   0 => not used   1 => used
  */
-int CheckUninitVar::isFunctionParUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
+int CheckUninitVarImpl::isFunctionParUsage(const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
 {
     bool unknown = false;
     const Token *parent = getAstParentSkipPossibleCastAndAddressOf(vartok, &unknown);
@@ -1422,6 +1420,8 @@ int CheckUninitVar::isFunctionParUsage(const Token *vartok, const Library& libra
             const bool isnullbad = library.isnullargbad(start->previous(), argumentNumber + 1);
             if (indirect == 0 && pointer && !address && isnullbad && alloc == NO_ALLOC)
                 return 1;
+            if (vartok->varId() == 0 && vartok->valueType())
+                indirect = vartok->valueType()->pointer;
             bool hasIndirect = false;
             const bool isuninitbad = library.isuninitargbad(start->previous(), argumentNumber + 1, indirect, &hasIndirect);
             if (alloc != NO_ALLOC)
@@ -1434,12 +1434,12 @@ int CheckUninitVar::isFunctionParUsage(const Token *vartok, const Library& libra
     return -1;
 }
 
-int CheckUninitVar::isFunctionParUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
+int CheckUninitVarImpl::isFunctionParUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
 {
-    return CheckUninitVar::isFunctionParUsage(vartok, mSettings->library, pointer, alloc, indirect);
+    return isFunctionParUsage(vartok, mSettings.library, pointer, alloc, indirect);
 }
 
-bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::string &membervar) const
+bool CheckUninitVarImpl::isMemberVariableAssignment(const Token *tok, const std::string &membervar) const
 {
     if (Token::Match(tok, "%name% . %name%") && tok->strAt(2) == membervar) {
         if (Token::Match(tok->tokAt(3), "[=.[]"))
@@ -1483,9 +1483,9 @@ bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::str
                 // check how function handle uninitialized data arguments..
                 const Function *function = ftok->function();
 
-                if (!function && mSettings) {
+                if (!function) {
                     // Function definition not seen, check if direction is specified in the library configuration
-                    const Library::ArgumentChecks::Direction argDirection = mSettings->library.getArgDirection(ftok, 1 + argumentNumber);
+                    const Library::ArgumentChecks::Direction argDirection = mSettings.library.getArgDirection(ftok, 1 + argumentNumber);
                     if (argDirection == Library::ArgumentChecks::Direction::DIR_IN)
                         return false;
                     if (argDirection == Library::ArgumentChecks::Direction::DIR_OUT)
@@ -1508,7 +1508,7 @@ bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::str
     return false;
 }
 
-bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, Alloc alloc, const std::string &membervar) const
+bool CheckUninitVarImpl::isMemberVariableUsage(const Token *tok, bool isPointer, Alloc alloc, const std::string &membervar) const
 {
     if (Token::Match(tok->previous(), "[(,] %name% . %name% [,)]") &&
         tok->strAt(2) == membervar) {
@@ -1541,7 +1541,7 @@ bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, All
         return true;
 
     // TODO: this used to be experimental - enable or remove see #5586
-    if ((false) && // NOLINT(readability-simplify-boolean-expr)
+    if ((false) && // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         !isPointer &&
         Token::Match(tok->tokAt(-2), "[(,] & %name% [,)]") &&
         isVariableUsage(tok, isPointer, alloc))
@@ -1550,17 +1550,17 @@ bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, All
     return false;
 }
 
-void CheckUninitVar::uninitdataError(const Token *tok, const std::string &varname)
+void CheckUninitVarImpl::uninitdataError(const Token *tok, const std::string &varname)
 {
     reportError(tok, Severity::error, "uninitdata", "$symbol:" + varname + "\nMemory is allocated but not initialized: $symbol", CWE_USE_OF_UNINITIALIZED_VARIABLE, Certainty::normal);
 }
 
-void CheckUninitVar::uninitvarError(const Token *tok, const std::string &varname, ErrorPath errorPath)
+void CheckUninitVarImpl::uninitvarError(const Token *tok, const std::string &varname, ErrorPath errorPath)
 {
     if (diag(tok))
         return;
     errorPath.emplace_back(tok, "");
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 Severity::error,
                 "legacyUninitvar",
                 "$symbol:" + varname + "\nUninitialized variable: $symbol",
@@ -1568,9 +1568,9 @@ void CheckUninitVar::uninitvarError(const Token *tok, const std::string &varname
                 Certainty::normal);
 }
 
-void CheckUninitVar::uninitvarError(const Token* tok, const ValueFlow::Value& v)
+void CheckUninitVarImpl::uninitvarError(const Token* tok, const ValueFlow::Value& v)
 {
-    if (!mSettings->isEnabled(&v))
+    if (!mSettings.isEnabled(&v))
         return;
     if (diag(tok))
         return;
@@ -1583,7 +1583,7 @@ void CheckUninitVar::uninitvarError(const Token* tok, const ValueFlow::Value& v)
     auto severity = v.isKnown() ? Severity::error : Severity::warning;
     auto certainty = v.isInconclusive() ? Certainty::inconclusive : Certainty::normal;
     if (v.subexpressions.empty()) {
-        reportError(errorPath,
+        reportError(std::move(errorPath),
                     severity,
                     "uninitvar",
                     "$symbol:" + varname + "\nUninitialized variable: $symbol",
@@ -1597,7 +1597,7 @@ void CheckUninitVar::uninitvarError(const Token* tok, const ValueFlow::Value& v)
         vars += prefix + varname + "." + var;
         prefix = ", ";
     }
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 severity,
                 "uninitvar",
                 "$symbol:" + varname + "\nUninitialized " + vars,
@@ -1605,7 +1605,7 @@ void CheckUninitVar::uninitvarError(const Token* tok, const ValueFlow::Value& v)
                 certainty);
 }
 
-void CheckUninitVar::uninitStructMemberError(const Token *tok, const std::string &membername)
+void CheckUninitVarImpl::uninitStructMemberError(const Token *tok, const std::string &membername)
 {
     reportError(tok,
                 Severity::error,
@@ -1613,7 +1613,7 @@ void CheckUninitVar::uninitStructMemberError(const Token *tok, const std::string
                 "$symbol:" + membername + "\nUninitialized struct member: $symbol", CWE_USE_OF_UNINITIALIZED_VARIABLE, Certainty::normal);
 }
 
-void CheckUninitVar::valueFlowUninit()
+void CheckUninitVarImpl::valueFlowUninit()
 {
     logChecker("CheckUninitVar::valueFlowUninit");
 
@@ -1660,28 +1660,28 @@ void CheckUninitVar::valueFlowUninit()
                     if (isarray && tok->variable()->isMember())
                         continue; // Todo: this is a bailout
                     if (isarray && tok->variable()->isStlType() && Token::simpleMatch(tok->astParent(), ".")) {
-                        const auto yield = astContainerYield(tok, mSettings->library);
+                        const auto yield = astContainerYield(tok, mSettings.library);
                         if (yield != Library::Container::Yield::AT_INDEX && yield != Library::Container::Yield::ITEM)
                             continue;
                     }
-                    const bool deref = CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings);
+                    const bool deref = CheckNullPointerImpl::isPointerDeRef(tok, unknown, mSettings.library);
                     uninitderef = deref && v->indirect == 0;
                     const bool isleaf = isLeafDot(tok) || uninitderef;
                     if (!isleaf && Token::Match(tok->astParent(), ". %name%") &&
                         (tok->astParent()->next()->variable() || tok->astParent()->next()->isEnumerator()))
                         continue;
                 }
-                const ExprUsage usage = getExprUsage(tok, v->indirect, *mSettings);
+                const ExprUsage usage = getExprUsage(tok, v->indirect, mSettings);
                 if (usage == ExprUsage::NotUsed || usage == ExprUsage::Inconclusive)
                     continue;
                 if (!v->subexpressions.empty() && usage == ExprUsage::PassedByReference)
                     continue;
                 if (usage != ExprUsage::Used) {
                     if (!(Token::Match(tok->astParent(), ". %name% (|[") && uninitderef) &&
-                        isVariableChanged(tok, v->indirect, *mSettings))
+                        isVariableChanged(tok, v->indirect, mSettings))
                         continue;
                     bool inconclusive = false;
-                    if (isVariableChangedByFunctionCall(tok, v->indirect, *mSettings, &inconclusive) || inconclusive)
+                    if (isVariableChangedByFunctionCall(tok, v->indirect, mSettings.library, &inconclusive) || inconclusive)
                         continue;
                 }
                 uninitvarError(tok, *v);
@@ -1697,7 +1697,7 @@ void CheckUninitVar::valueFlowUninit()
 static bool isVariableUsage(const Settings &settings, const Token *vartok, MathLib::bigint *value)
 {
     (void)value;
-    return CheckUninitVar::isVariableUsage(vartok, settings.library, true, CheckUninitVar::Alloc::ARRAY);
+    return !!CheckUninitVarImpl::isVariableUsage(vartok, settings.library, true, CheckUninitVarImpl::Alloc::ARRAY);
 }
 
 // a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
@@ -1727,7 +1727,7 @@ static bool isVariableUsage(const Settings &settings, const Token *argtok, CTU::
     return isVariableUsage(settings, argtok, &value->value);
 }
 
-Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer &tokenizer, const Settings &settings) const
+const Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
 {
     const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, ::isVariableUsage);
     if (unsafeUsage.empty())
@@ -1738,22 +1738,22 @@ Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer &tokenizer, const S
     return fileInfo;
 }
 
-Check::FileInfo * CheckUninitVar::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
+const Check::FileInfo * CheckUninitVar::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const
 {
     const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::loadUnsafeUsageListFromXml(xmlElement);
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(file0);
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
 
-bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
+bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
     (void)settings;
 
-    CheckUninitVar dummy(nullptr, &settings, &errorLogger);
+    CheckUninitVarImpl dummy(nullptr, settings, errorLogger);
     dummy.
     logChecker("CheckUninitVar::analyseWholeProgram");
 
@@ -1771,7 +1771,7 @@ bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::li
         for (const CTU::FileInfo::UnsafeUsage &unsafeUsage : fi->unsafeUsage) {
             const CTU::FileInfo::FunctionCall *functionCall = nullptr;
 
-            const std::list<ErrorMessage::FileLocation> &locationList =
+            std::list<ErrorMessage::FileLocation> locationList =
                 CTU::FileInfo::getErrorPath(CTU::FileInfo::InvalidValueType::uninit,
                                             unsafeUsage,
                                             callsMap,
@@ -1782,7 +1782,7 @@ bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::li
             if (locationList.empty())
                 continue;
 
-            const ErrorMessage errmsg(locationList,
+            const ErrorMessage errmsg(std::move(locationList),
                                       fi->file0,
                                       Severity::error,
                                       "Using argument " + unsafeUsage.myArgumentName + " that points at uninitialized variable " + functionCall->callArgumentExpression,
@@ -1797,20 +1797,20 @@ bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo &ctu, const std::li
     return foundErrors;
 }
 
-void CheckUninitVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckUninitVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckUninitVar checkUninitVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckUninitVarImpl checkUninitVar(&tokenizer, tokenizer.getSettings(), errorLogger);
     checkUninitVar.valueFlowUninit();
     checkUninitVar.check();
 }
 
-void CheckUninitVar::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+void CheckUninitVar::getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const
 {
-    CheckUninitVar c(nullptr, settings, errorLogger);
+    CheckUninitVarImpl c(nullptr, settings, errorLogger);
 
     ValueFlow::Value v{};
 
-    c.uninitvarError(nullptr, v);
+    c.uninitvarError(nullptr, v); // TODO: does not produce any output
     c.uninitdataError(nullptr, "varname");
     c.uninitStructMemberError(nullptr, "a.b");
 }
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
index 6c1b4c67b14..a9156adfe36 100644
--- a/lib/checkuninitvar.h
+++ b/lib/checkuninitvar.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 #include "mathlib.h"
 #include "errortypes.h"
@@ -57,24 +58,38 @@ struct VariableValue {
 /** @brief Checking for uninitialized variables */
 
 class CPPCHECKLIB CheckUninitVar : public Check {
-    friend class TestUninitVar;
-
 public:
     /** @brief This constructor is used when registering the CheckUninitVar */
-    CheckUninitVar() : Check(myName()) {}
+    CheckUninitVar() : Check("Uninitialized variables") {}
 
-    enum Alloc : std::uint8_t { NO_ALLOC, NO_CTOR_CALL, CTOR_CALL, ARRAY };
+private:
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
-    static const Token *isVariableUsage(const Token *vartok, const Library &library, bool pointer, Alloc alloc, int indirect = 0);
-    const Token *isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect = 0) const;
+    /** @brief Parse current TU and extract file info */
+    const Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const override;
 
-private:
+    const Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement, const std::string& file0) const override;
+
+    /** @brief Analyse all file infos for all TU */
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<const Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings& settings) const override;
+
+    std::string classInfo() const override {
+        return "Uninitialized variables\n"
+               "- using uninitialized local variables\n"
+               "- using allocated data before it has been initialized\n";
+    }
+};
+
+class CPPCHECKLIB CheckUninitVarImpl : public CheckImpl {
+public:
     /** @brief This constructor is used when running checks. */
-    CheckUninitVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    CheckUninitVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
-    /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    enum Alloc : std::uint8_t { NO_ALLOC, NO_CTOR_CALL, CTOR_CALL, ARRAY };
 
     bool diag(const Token* tok);
     /** Check for uninitialized variables */
@@ -92,17 +107,12 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     bool isMemberVariableAssignment(const Token *tok, const std::string &membervar) const;
     bool isMemberVariableUsage(const Token *tok, bool isPointer, Alloc alloc, const std::string &membervar) const;
 
+    static const Token *isVariableUsage(const Token *vartok, const Library &library, bool pointer, Alloc alloc, int indirect = 0);
+    const Token *isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect = 0) const;
+
     /** ValueFlow-based checking for uninitialized variables */
     void valueFlowUninit();
 
-    /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings) const override;
-
-    Check::FileInfo * loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const override;
-
-    /** @brief Analyse all file infos for all TU */
-    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
-
     void uninitvarError(const Token* tok, const ValueFlow::Value& v);
     void uninitdataError(const Token *tok, const std::string &varname);
     void uninitvarError(const Token *tok, const std::string &varname, ErrorPath errorPath);
@@ -118,18 +128,6 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     void uninitStructMemberError(const Token *tok, const std::string &membername);
 
     std::set<const Token*> mUninitDiags;
-
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
-
-    static std::string myName() {
-        return "Uninitialized variables";
-    }
-
-    std::string classInfo() const override {
-        return "Uninitialized variables\n"
-               "- using uninitialized local variables\n"
-               "- using allocated data before it has been initialized\n";
-    }
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
index f6a07b8e01f..4177a13a013 100644
--- a/lib/checkunusedfunctions.cpp
+++ b/lib/checkunusedfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,6 +20,7 @@
 //---------------------------------------------------------------------------
 #include "checkunusedfunctions.h"
 
+#include "analyzerinfo.h"
 #include "astutils.h"
 #include "errorlogger.h"
 #include "errortypes.h"
@@ -34,7 +35,7 @@
 #include <algorithm>
 #include <cctype>
 #include <cstring>
-#include <fstream>
+#include <functional>
 #include <map>
 #include <sstream>
 #include <tuple>
@@ -64,11 +65,11 @@ static bool isRecursiveCall(const Token* ftok)
     return ftok->function() && ftok->function() == Scope::nestedInFunction(ftok->scope());
 }
 
-void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Settings &settings)
+void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Library &library)
 {
     const char * const FileName = tokenizer.list.getFiles().front().c_str();
 
-    const bool doMarkup = settings.library.markupFile(FileName);
+    const bool doMarkup = library.markupFile(FileName);
 
     // Function declarations..
     if (!doMarkup) {
@@ -105,8 +106,10 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
                 usage.usedOtherFile = true;
             }
 
-            if (!usage.lineNumber)
+            if (!usage.lineNumber) {
                 usage.lineNumber = func->token->linenr();
+                usage.column = func->token->column();
+            }
             usage.isC = func->token->isC();
             usage.isStatic = func->isStatic();
 
@@ -136,8 +139,8 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             lambdaEndToken = findLambdaEndToken(tok);
 
         // parsing of library code to find called functions
-        if (settings.library.isexecutableblock(FileName, tok->str())) {
-            const Token * markupVarToken = tok->tokAt(settings.library.blockstartoffset(FileName));
+        if (library.isexecutableblock(FileName, tok->str())) {
+            const Token * markupVarToken = tok->tokAt(library.blockstartoffset(FileName));
             // not found
             if (!markupVarToken)
                 continue;
@@ -145,12 +148,12 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             bool start = true;
             // find all function calls in library code (starts with '(', not if or while etc)
             while ((scope || start) && markupVarToken) {
-                if (markupVarToken->str() == settings.library.blockstart(FileName)) {
+                if (markupVarToken->str() == library.blockstart(FileName)) {
                     scope++;
                     start = false;
-                } else if (markupVarToken->str() == settings.library.blockend(FileName))
+                } else if (markupVarToken->str() == library.blockend(FileName))
                     scope--;
-                else if (!settings.library.iskeyword(FileName, markupVarToken->str())) {
+                else if (!library.iskeyword(FileName, markupVarToken->str())) {
                     mFunctionCalls.insert(markupVarToken->str());
                     if (mFunctions.find(markupVarToken->str()) != mFunctions.end())
                         mFunctions[markupVarToken->str()].usedOtherFile = true;
@@ -168,10 +171,10 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
         }
 
         if (!doMarkup // only check source files
-            && settings.library.isexporter(tok->str()) && tok->next() != nullptr) {
+            && library.isexporter(tok->str()) && tok->next() != nullptr) {
             const Token * propToken = tok->next();
             while (propToken && propToken->str() != ")") {
-                if (settings.library.isexportedprefix(tok->str(), propToken->str())) {
+                if (library.isexportedprefix(tok->str(), propToken->str())) {
                     const Token* nextPropToken = propToken->next();
                     const std::string& value = nextPropToken->str();
                     if (mFunctions.find(value) != mFunctions.end()) {
@@ -179,7 +182,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
                     }
                     mFunctionCalls.insert(value);
                 }
-                if (settings.library.isexportedsuffix(tok->str(), propToken->str())) {
+                if (library.isexportedsuffix(tok->str(), propToken->str())) {
                     const Token* prevPropToken = propToken->previous();
                     const std::string& value = prevPropToken->str();
                     if (value != ")" && mFunctions.find(value) != mFunctions.end()) {
@@ -191,7 +194,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             }
         }
 
-        if (doMarkup && settings.library.isimporter(FileName, tok->str()) && tok->next()) {
+        if (doMarkup && library.isimporter(FileName, tok->str()) && tok->next()) {
             const Token * propToken = tok->next();
             if (propToken->next()) {
                 propToken = propToken->next();
@@ -207,8 +210,8 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             }
         }
 
-        if (settings.library.isreflection(tok->str())) {
-            const int argIndex = settings.library.reflectionArgument(tok->str());
+        if (library.isreflection(tok->str())) {
+            const int argIndex = library.reflectionArgument(tok->str());
             if (argIndex >= 0) {
                 const Token * funcToken = tok->next();
                 int index = 0;
@@ -258,11 +261,14 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Setting
             while (Token::Match(funcname, "%name% :: %name%"))
                 funcname = funcname->tokAt(2);
 
+            if (funcname && funcname->isName() && !funcname->function() && !tok->astParent() && Token::Match(tok, "[(,]")) // unknown type in parameter list
+                continue;
+
             if (!Token::Match(funcname, "%name% [(),;]:}<>]"))
                 continue;
         }
 
-        if (!funcname || funcname->isKeyword() || funcname->isStandardType() || funcname->varId() || funcname->enumerator() || funcname->type())
+        if (!funcname || funcname->isKeyword() || funcname->isStandardType() || funcname->varId() || funcname->enumerator() || funcname->type() || funcname->isLiteral())
             continue;
 
         // funcname ( => Assert that the end parentheses isn't followed by {
@@ -339,15 +345,13 @@ static bool isOperatorFunction(const std::string & funcName)
     return std::find(additionalOperators.cbegin(), additionalOperators.cend(), funcName.substr(operatorPrefix.length())) != additionalOperators.cend();
 }
 
-static void staticFunctionError(ErrorLogger& errorLogger,
-                                const std::string &filename,
-                                unsigned int fileIndex,
-                                unsigned int lineNumber,
-                                const std::string &funcname)
+void CheckUnusedFunctions::staticFunctionError(ErrorLogger& errorLogger,
+                                               const std::string &filename, nonneg int fileIndex, nonneg int lineNumber, nonneg int column,
+                                               const std::string &funcname)
 {
     std::list<ErrorMessage::FileLocation> locationList;
     if (!filename.empty()) {
-        locationList.emplace_back(filename, lineNumber, 0);
+        locationList.emplace_back(filename, lineNumber, column);
         locationList.back().fileIndex = fileIndex;
     }
 
@@ -362,11 +366,12 @@ static void staticFunctionError(ErrorLogger& errorLogger,
         errorLogger.reportErr(errmsg); \
     } while (false)
 
-bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger& errorLogger) const
+bool CheckUnusedFunctions::check(const Library& library, ErrorLogger& errorLogger) const
 {
     logChecker("CheckUnusedFunctions::check"); // unusedFunction
 
-    using ErrorParams = std::tuple<std::string, unsigned int, unsigned int, std::string>;
+    // filename, fileindex, line, column
+    using ErrorParams = std::tuple<std::string, nonneg int, nonneg int, nonneg int, std::string>;
     std::vector<ErrorParams> errors; // ensure well-defined order
     std::vector<ErrorParams> staticFunctionErrors;
 
@@ -374,7 +379,7 @@ bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger& errorLog
         const FunctionUsage &func = it->second;
         if (func.usedOtherFile || func.filename.empty())
             continue;
-        if (settings.library.isentrypoint(it->first))
+        if (library.isentrypoint(it->first))
             continue;
         if (!func.usedSameFile) {
             if (isOperatorFunction(it->first))
@@ -382,33 +387,33 @@ bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger& errorLog
             std::string filename;
             if (func.filename != "+")
                 filename = func.filename;
-            errors.emplace_back(filename, func.fileIndex, func.lineNumber, it->first);
-        } else if (func.isC && !func.isStatic && !func.usedOtherFile) {
+            errors.emplace_back(filename, func.fileIndex, func.lineNumber, func.column, it->first);
+        } else if (func.isC && !func.isStatic) {
             std::string filename;
             if (func.filename != "+")
                 filename = func.filename;
-            staticFunctionErrors.emplace_back(filename, func.fileIndex, func.lineNumber, it->first);
+            staticFunctionErrors.emplace_back(filename, func.fileIndex, func.lineNumber, func.column, it->first);
         }
     }
 
     std::sort(errors.begin(), errors.end());
     for (const auto& e : errors)
-        unusedFunctionError(errorLogger, std::get<0>(e), std::get<1>(e), std::get<2>(e), std::get<3>(e));
+        unusedFunctionError(errorLogger, std::get<0>(e), std::get<1>(e), std::get<2>(e), std::get<3>(e), std::get<4>(e));
 
     std::sort(staticFunctionErrors.begin(), staticFunctionErrors.end());
     for (const auto& e : staticFunctionErrors)
-        staticFunctionError(errorLogger, std::get<0>(e), std::get<1>(e), std::get<2>(e), std::get<3>(e));
+        staticFunctionError(errorLogger, std::get<0>(e), std::get<1>(e), std::get<2>(e), std::get<3>(e), std::get<4>(e));
 
     return !errors.empty();
 }
 
 void CheckUnusedFunctions::unusedFunctionError(ErrorLogger& errorLogger,
-                                               const std::string &filename, unsigned int fileIndex, unsigned int lineNumber,
+                                               const std::string &filename, nonneg int fileIndex, nonneg int lineNumber, nonneg int column,
                                                const std::string &funcname)
 {
     std::list<ErrorMessage::FileLocation> locationList;
     if (!filename.empty()) {
-        locationList.emplace_back(filename, lineNumber, 0);
+        locationList.emplace_back(filename, lineNumber, column);
         locationList.back().fileIndex = fileIndex;
     }
 
@@ -417,7 +422,10 @@ void CheckUnusedFunctions::unusedFunctionError(ErrorLogger& errorLogger,
 }
 
 CheckUnusedFunctions::FunctionDecl::FunctionDecl(const Function *f)
-    : functionName(f->name()), fileIndex(f->token->fileIndex()), lineNumber(f->token->linenr())
+    : functionName(f->name())
+    , fileIndex(f->token->fileIndex())
+    , lineNumber(f->token->linenr())
+    , column(f->token->column())
 {}
 
 std::string CheckUnusedFunctions::analyzerInfo(const Tokenizer &tokenizer) const
@@ -427,7 +435,9 @@ std::string CheckUnusedFunctions::analyzerInfo(const Tokenizer &tokenizer) const
         ret << "    <functiondecl"
             << " file=\"" << ErrorLogger::toxml(tokenizer.list.getFiles()[functionDecl.fileIndex]) << '\"'
             << " functionName=\"" << ErrorLogger::toxml(functionDecl.functionName) << '\"'
-            << " lineNumber=\"" << functionDecl.lineNumber << "\"/>\n";
+            << " lineNumber=\"" << functionDecl.lineNumber << '\"'
+            << " column=\"" << functionDecl.column << '\"'
+            << "/>\n";
     }
     for (const std::string &fc : mFunctionCalls) {
         ret << "    <functioncall functionName=\"" << ErrorLogger::toxml(fc) << "\"/>\n";
@@ -437,65 +447,49 @@ std::string CheckUnusedFunctions::analyzerInfo(const Tokenizer &tokenizer) const
 
 namespace {
     struct Location {
-        Location() : lineNumber(0) {}
-        Location(std::string f, const int l) : fileName(std::move(f)), lineNumber(l) {}
+        Location() : lineNumber(0), column(0) {}
+        Location(std::string f, nonneg int l, nonneg int c) : fileName(std::move(f)), lineNumber(l), column(c) {}
         std::string fileName;
-        int lineNumber;
+        nonneg int lineNumber;
+        nonneg int column;
     };
 }
 
+// TODO: bail out on unexpected data
 void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLogger &errorLogger, const std::string &buildDir)
 {
     std::map<std::string, Location> decls;
     std::set<std::string> calls;
 
-    const std::string filesTxt(buildDir + "/files.txt");
-    std::ifstream fin(filesTxt.c_str());
-    std::string filesTxtLine;
-    while (std::getline(fin, filesTxtLine)) {
-        const std::string::size_type firstColon = filesTxtLine.find(':');
-        if (firstColon == std::string::npos)
-            continue;
-        const std::string::size_type secondColon = filesTxtLine.find(':', firstColon+1);
-        if (secondColon == std::string::npos)
-            continue;
-        const std::string xmlfile = buildDir + '/' + filesTxtLine.substr(0,firstColon);
-        const std::string sourcefile = filesTxtLine.substr(secondColon+1);
-
-        tinyxml2::XMLDocument doc;
-        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
-        if (error != tinyxml2::XML_SUCCESS)
-            continue;
-
-        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
-        if (rootNode == nullptr)
-            continue;
-
-        for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
-            if (std::strcmp(e->Name(), "FileInfo") != 0)
+    const auto handler = [&decls, &calls](const char* checkattr, const tinyxml2::XMLElement* e, const AnalyzerInformation::Info& filesTxtInfo) {
+        if (std::strcmp(checkattr,"CheckUnusedFunctions") != 0)
+            return;
+        for (const tinyxml2::XMLElement *e2 = e->FirstChildElement(); e2; e2 = e2->NextSiblingElement()) {
+            const char* functionName = e2->Attribute("functionName");
+            if (functionName == nullptr)
                 continue;
-            const char *checkattr = e->Attribute("check");
-            if (checkattr == nullptr || std::strcmp(checkattr,"CheckUnusedFunctions") != 0)
+            const char* name = e2->Name();
+            if (std::strcmp(name,"functioncall") == 0) {
+                calls.insert(functionName);
                 continue;
-            for (const tinyxml2::XMLElement *e2 = e->FirstChildElement(); e2; e2 = e2->NextSiblingElement()) {
-                const char* functionName = e2->Attribute("functionName");
-                if (functionName == nullptr)
-                    continue;
-                const char* name = e2->Name();
-                if (std::strcmp(name,"functioncall") == 0) {
-                    calls.insert(functionName);
-                    continue;
-                }
-                if (std::strcmp(name,"functiondecl") == 0) {
-                    const char* lineNumber = e2->Attribute("lineNumber");
-                    if (lineNumber) {
-                        const char* file = e2->Attribute("file");
-                        // cppcheck-suppress templateInstantiation - TODO: fix this - see #11631
-                        decls[functionName] = Location(file ? file : sourcefile, strToInt<int>(lineNumber));
-                    }
+            }
+            if (std::strcmp(name,"functiondecl") == 0) {
+                const char* lineNumber = e2->Attribute("lineNumber");
+                if (lineNumber) {
+                    const char* file = e2->Attribute("file");
+                    const char* column = default_if_null(e2->Attribute("column"), "0");
+                    // cppcheck-suppress templateInstantiation - TODO: fix this - see #11631
+                    decls[functionName] = Location(file ? file : filesTxtInfo.sourceFile, strToInt<int>(lineNumber), strToInt<int>(column));
                 }
             }
         }
+    };
+
+    const std::string err = AnalyzerInformation::processFilesTxt(buildDir, handler, settings.debugainfo);
+    if (!err.empty()) {
+        const ErrorMessage errmsg({}, "", Severity::error, err, "internalError", Certainty::normal);
+        errorLogger.reportErr(errmsg);
+        return;
     }
 
     for (auto decl = decls.cbegin(); decl != decls.cend(); ++decl) {
@@ -506,27 +500,27 @@ void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLo
 
         if (calls.find(functionName) == calls.end() && !isOperatorFunction(functionName)) {
             const Location &loc = decl->second;
-            unusedFunctionError(errorLogger, loc.fileName, /*fileIndex*/ 0, loc.lineNumber, functionName);
+            unusedFunctionError(errorLogger, loc.fileName, /*fileIndex*/ 0, loc.lineNumber, loc.column, functionName);
         }
     }
 }
 
-void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)
+void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& checkUnusedFunctions)
 {
-    for (const auto& entry : check.mFunctions)
+    for (const auto& entry : checkUnusedFunctions.mFunctions)
     {
         FunctionUsage &usage = mFunctions[entry.first];
-        if (!usage.lineNumber)
+        if (!usage.lineNumber) {
             usage.lineNumber = entry.second.lineNumber;
+            usage.column = entry.second.column;
+        }
         // TODO: why always overwrite this but not the filename and line?
         usage.fileIndex = entry.second.fileIndex;
         if (usage.filename.empty())
             usage.filename = entry.second.filename;
-        // cppcheck-suppress bitwiseOnBoolean - TODO: FP
         usage.usedOtherFile |= entry.second.usedOtherFile;
-        // cppcheck-suppress bitwiseOnBoolean - TODO: FP
         usage.usedSameFile |= entry.second.usedSameFile;
     }
-    mFunctionDecl.insert(mFunctionDecl.cend(), check.mFunctionDecl.cbegin(), check.mFunctionDecl.cend());
-    mFunctionCalls.insert(check.mFunctionCalls.cbegin(), check.mFunctionCalls.cend());
+    mFunctionDecl.insert(mFunctionDecl.cend(), checkUnusedFunctions.mFunctionDecl.cbegin(), checkUnusedFunctions.mFunctionDecl.cend());
+    mFunctionCalls.insert(checkUnusedFunctions.mFunctionCalls.cbegin(), checkUnusedFunctions.mFunctionCalls.cend());
 }
diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
index 69b7cf2fc88..1b560cfb7cb 100644
--- a/lib/checkunusedfunctions.h
+++ b/lib/checkunusedfunctions.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -33,47 +33,48 @@ class ErrorLogger;
 class Function;
 class Settings;
 class Tokenizer;
+class Library;
 
 /** @brief Check for functions never called */
 /// @{
 
 class CPPCHECKLIB CheckUnusedFunctions {
-    friend class TestSuppressions;
-    friend class TestSingleExecutorBase;
-    friend class TestProcessExecutorBase;
-    friend class TestThreadExecutorBase;
-    friend class TestUnusedFunctions;
-
 public:
     CheckUnusedFunctions() = default;
 
     // Parse current tokens and determine..
     // * Check what functions are used
     // * What functions are declared
-    void parseTokens(const Tokenizer &tokenizer, const Settings &settings);
+    void parseTokens(const Tokenizer &tokenizer, const Library &library);
 
     std::string analyzerInfo(const Tokenizer &tokenizer) const;
 
     static void analyseWholeProgram(const Settings &settings, ErrorLogger& errorLogger, const std::string &buildDir);
 
     static void getErrorMessages(ErrorLogger &errorLogger) {
-        unusedFunctionError(errorLogger, "", 0, 0, "funcName");
+        unusedFunctionError(errorLogger, "", 0, 0, 0, "funcName");
+        staticFunctionError(errorLogger, "", 0, 0, 0, "funcName");
     }
 
     // Return true if an error is reported.
-    bool check(const Settings& settings, ErrorLogger& errorLogger) const;
+    bool check(const Library& library, ErrorLogger& errorLogger) const;
 
-    void updateFunctionData(const CheckUnusedFunctions& check);
+    void updateFunctionData(const CheckUnusedFunctions& checkUnusedFunctions);
 
 private:
     static void unusedFunctionError(ErrorLogger& errorLogger,
-                                    const std::string &filename, unsigned int fileIndex, unsigned int lineNumber,
+                                    const std::string &filename, nonneg int fileIndex, nonneg int lineNumber, nonneg int column,
+                                    const std::string &funcname);
+
+    static void staticFunctionError(ErrorLogger& errorLogger,
+                                    const std::string &filename, nonneg int fileIndex, nonneg int lineNumber, nonneg int column,
                                     const std::string &funcname);
 
     struct CPPCHECKLIB FunctionUsage {
         std::string filename;
-        unsigned int lineNumber{};
-        unsigned int fileIndex{};
+        nonneg int lineNumber{};
+        nonneg int column{};
+        nonneg int fileIndex{};
         bool usedSameFile{};
         bool usedOtherFile{};
         bool isC{};
@@ -87,7 +88,8 @@ class CPPCHECKLIB CheckUnusedFunctions {
         explicit FunctionDecl(const Function *f);
         std::string functionName;
         nonneg int fileIndex;
-        unsigned int lineNumber;
+        nonneg int lineNumber;
+        nonneg int column;
     };
     std::list<FunctionDecl> mFunctionDecl;
     std::set<std::string> mFunctionCalls;
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
index 2fbe6ac3d87..f4ced7f158d 100644
--- a/lib/checkunusedvar.cpp
+++ b/lib/checkunusedvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -32,6 +32,7 @@
 #include "valueflow.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <list>
 #include <set>
@@ -39,11 +40,6 @@
 #include <vector>
 //---------------------------------------------------------------------------
 
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckUnusedVar instance;
-}
-
 static const CWE CWE563(563U);   // Assignment to Variable without Use ('Unused Variable')
 static const CWE CWE665(665U);   // Improper Initialization
 
@@ -147,6 +143,15 @@ class Variables {
     void clear() {
         mVarUsage.clear();
     }
+    void clearConst() {
+        std::set<int> keys;
+        for (const std::pair<const nonneg int, Variables::VariableUsage>& var : mVarUsage) {
+            if (var.second._var && var.second._var->isConst())
+                keys.emplace(var.first);
+        }
+        for (const int key : keys)
+            mVarUsage.erase(key);
+    }
     const std::map<nonneg int, VariableUsage> &varUsage() const {
         return mVarUsage;
     }
@@ -244,7 +249,7 @@ void Variables::clearAliases(nonneg int varid)
 
 void Variables::eraseAliases(nonneg int varid)
 {
-    VariableUsage *usage = find(varid);
+    const VariableUsage *usage = find(varid);
 
     if (usage) {
         for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases)
@@ -324,7 +329,7 @@ void Variables::write(nonneg int varid, const Token* tok)
 
 void Variables::writeAliases(nonneg int varid, const Token* tok)
 {
-    VariableUsage *usage = find(varid);
+    const VariableUsage *usage = find(varid);
 
     if (usage) {
         for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
@@ -414,6 +419,9 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
     Variables::VariableUsage *var1 = variables.find(varid1);
 
     if (var1) {
+        if (var1->mType == Variables::pointerArray)
+            variables.use(varid1, tok);
+
         // jump behind '='
         tok = tok->next();
         while (!tok->isAssignmentOp()) {
@@ -552,13 +560,15 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
                             variables.readAll(varid2, tok);
                         }
                     }
-                } else if (var1->mType == Variables::reference) {
+                } else if (var1->mType == Variables::reference || var1->mType == Variables::referenceArray) {
                     variables.alias(varid1, varid2, true);
                 } else if (var1->mType == Variables::standard && addressOf) {
                     variables.alias(varid1, varid2, true);
                 } else {
-                    if ((var2->mType == Variables::pointer || var2->mType == Variables::pointerArray) && tok->strAt(1) == "[")
+                    if (var2->mType == Variables::pointer || var2->mType == Variables::pointerArray) {
+                        variables.alias(varid1, varid2, true);
                         variables.readAliases(varid2, tok);
+                    }
 
                     variables.read(varid2, tok);
                 }
@@ -689,7 +699,7 @@ static void useFunctionArgs(const Token *tok, Variables& variables)
 //---------------------------------------------------------------------------
 // Usage of function variables
 //---------------------------------------------------------------------------
-void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const scope, Variables& variables)
+void CheckUnusedVarImpl::checkFunctionVariableUsage_iterateScopes(const Scope* const scope, Variables& variables) const
 {
     // Find declarations if the scope is executable..
     if (scope->isExecutable()) {
@@ -715,15 +725,19 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             else if (mTokenizer->isC() ||
                      i->typeEndToken()->isStandardType() ||
                      i->isStlType() ||
-                     isRecordTypeWithoutSideEffects(i->type()) ||
-                     mSettings->library.detectContainer(i->typeStartToken()) ||
-                     mSettings->library.getTypeCheck("unusedvar", i->typeStartToken()->str()) == Library::TypeCheck::check)
+                     mTokenizer->getSymbolDatabase()->isRecordTypeWithoutSideEffects(i->type()) ||
+                     mSettings.library.detectContainer(i->typeStartToken()) ||
+                     mSettings.library.getTypeCheck("unusedvar", i->typeStartToken()->str()) == Library::TypeCheck::check)
                 type = Variables::standard;
 
             if (type == Variables::none || isPartOfClassStructUnion(i->typeStartToken()))
                 continue;
             const Token* defValTok = i->nameToken()->next();
-            if (Token::Match(i->nameToken()->previous(), "* %var% ) (")) // function pointer. Jump behind parameter list.
+            if (Token::Match(i->nameToken()->previous(), "& %var% )"))
+                defValTok = defValTok->next();
+            while (defValTok && defValTok->str() == "[")
+                defValTok = defValTok->link()->next();
+            if (Token::simpleMatch(defValTok, ") ("))
                 defValTok = defValTok->linkAt(1)->next();
             for (; defValTok; defValTok = defValTok->next()) {
                 if (defValTok->str() == "[")
@@ -795,9 +809,8 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
         // templates
         if (tok->isName() && endsWith(tok->str(), '>')) {
             // TODO: This is a quick fix to handle when constants are used
-            // as template parameters. Try to handle this better, perhaps
-            // only remove constants.
-            variables.clear();
+            // as template parameters.
+            variables.clearConst();
         }
 
         else if (Token::Match(tok->previous(), "[;{}]")) {
@@ -839,7 +852,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             }
         }
         // Freeing memory (not considered "using" the pointer if it was also allocated in this function)
-        if ((Token::Match(tok, "%name% ( %var% )") && mSettings->library.getDeallocFuncInfo(tok)) ||
+        if ((Token::Match(tok, "%name% ( %var% )") && mSettings.library.getDeallocFuncInfo(tok)) ||
             (tok->isCpp() && (Token::Match(tok, "delete %var% ;") || Token::Match(tok, "delete [ ] %var% ;")))) {
             nonneg int varid = 0;
             if (tok->str() != "delete") {
@@ -945,10 +958,10 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                 // Consider allocating memory separately because allocating/freeing alone does not constitute using the variable
                 else if (var && var->mType == Variables::pointer &&
                          Token::Match(start, "%name% =") &&
-                         findAllocFuncCallToken(start->next()->astOperand2(), mSettings->library)) {
+                         findAllocFuncCallToken(start->next()->astOperand2(), mSettings.library)) {
 
-                    const Token *allocFuncCallToken = findAllocFuncCallToken(start->next()->astOperand2(), mSettings->library);
-                    const Library::AllocFunc *allocFunc = mSettings->library.getAllocFuncInfo(allocFuncCallToken);
+                    const Token *allocFuncCallToken = findAllocFuncCallToken(start->next()->astOperand2(), mSettings.library);
+                    const Library::AllocFunc *allocFunc = mSettings.library.getAllocFuncInfo(allocFuncCallToken);
 
                     bool allocateMemory = !allocFunc || Library::ismemory(allocFunc->groupId);
 
@@ -963,7 +976,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                         // is it a user defined type?
                         if (!type->isStandardType()) {
                             const Variable *variable = start->variable();
-                            if (!variable || !isRecordTypeWithoutSideEffects(variable->type()))
+                            if (!variable || !mTokenizer->getSymbolDatabase()->isRecordTypeWithoutSideEffects(variable->type()))
                                 allocateMemory = false;
                         }
                     }
@@ -1030,7 +1043,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                 // Consider allocating memory separately because allocating/freeing alone does not constitute using the variable
                 if (var->mType == Variables::pointer &&
                     ((tok->isCpp() && Token::simpleMatch(skipBrackets(tok->next()), "= new")) ||
-                     (Token::Match(skipBrackets(tok->next()), "= %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2))))) {
+                     (Token::Match(skipBrackets(tok->next()), "= %name% (") && mSettings.library.getAllocFuncInfo(tok->tokAt(2))))) {
                     variables.allocateMemory(varid, tok);
                 } else if (var->mType == Variables::pointer || var->mType == Variables::reference) {
                     variables.read(varid, tok);
@@ -1142,10 +1155,6 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                         variables.read(tok2->varId(), tok);
                 }
             }
-        } else if (tok->variable() && tok->variable()->isClass() && tok->variable()->type() &&
-                   (tok->variable()->type()->needInitialization == Type::NeedInitialization::False) &&
-                   tok->strAt(1) == ";") {
-            variables.write(tok->varId(), tok);
         }
     }
 }
@@ -1160,9 +1169,9 @@ static bool isReturnedByRef(const Variable* var, const Function* func)
     });
 }
 
-void CheckUnusedVar::checkFunctionVariableUsage()
+void CheckUnusedVarImpl::checkFunctionVariableUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->checkLibrary && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.checkLibrary && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     logChecker("CheckUnusedVar::checkFunctionVariableUsage"); // style
@@ -1171,7 +1180,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     auto reportLibraryCfgError = [this](const Token* tok, const std::string& typeName) {
-        if (mSettings->checkLibrary) {
+        if (mSettings.checkLibrary) {
             reportError(tok,
                         Severity::information,
                         "checkLibraryCheckType",
@@ -1186,7 +1195,25 @@ void CheckUnusedVar::checkFunctionVariableUsage()
         const Token* lambdaOrInlineStart{};
         const bool hasLambdaOrInline = scope->hasInlineOrLambdaFunction(&lambdaOrInlineStart);
 
+        const Token *nextStructuredBindingTok = nullptr;
+        std::vector<std::pair<const Token*, const Token*>> unusedStructuredBindingTokens;
+        size_t structuredBindingTokCount = 0;
+        std::set<const Variable*> diagUnreadVariable; // prevent duplicate warnings
+
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
+            if (nextStructuredBindingTok) {
+                tok = nextStructuredBindingTok;
+            } else {
+                if (structuredBindingTokCount > 0 && structuredBindingTokCount == unusedStructuredBindingTokens.size()) {
+                    for (const auto &pair : unusedStructuredBindingTokens) {
+                        unreadVariableError(pair.first, pair.second->expressionString(), false);
+                    }
+                }
+                structuredBindingTokCount = 0;
+                unusedStructuredBindingTokens.clear();
+            }
+            nextStructuredBindingTok = nullptr;
+
             if (findLambdaEndToken(tok))
                 // todo: handle lambdas
                 break;
@@ -1196,6 +1223,16 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             const Token *varDecl = nullptr;
             if (tok->variable() && tok->variable()->nameToken() == tok) {
                 const Token * eq = tok->next();
+                if (isStructuredBindingVariable(tok->variable())) {
+                    structuredBindingTokCount++;
+                    while (!Token::simpleMatch(eq, "]")) {
+                        eq = eq->next();
+                        if (eq->variable() && !nextStructuredBindingTok)
+                            nextStructuredBindingTok = eq;
+                    }
+                    if (eq)
+                        eq = eq->next();
+                }
                 while (Token::simpleMatch(eq, "["))
                     eq = eq->link()->next();
                 if (Token::simpleMatch(eq, ") (") && Token::simpleMatch(eq->linkAt(1), ") ="))
@@ -1227,7 +1264,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             if (tok->isName()) {
                 if (isRaiiClass(tok->valueType(), tok->isCpp(), false) ||
                     (tok->valueType() && tok->valueType()->type == ValueType::RECORD &&
-                     (!tok->valueType()->typeScope || !isRecordTypeWithoutSideEffects(tok->valueType()->typeScope->definedType))))
+                     (!tok->valueType()->typeScope || !symbolDatabase->isRecordTypeWithoutSideEffects(tok->valueType()->typeScope->definedType))))
                     continue;
                 tok = tok->next();
             }
@@ -1247,12 +1284,6 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             if (!tok->astOperand1())
                 continue;
 
-            const Token *iteratorToken = tok->astOperand1();
-            while (Token::Match(iteratorToken, "[.*]"))
-                iteratorToken = iteratorToken->astOperand1();
-            if (iteratorToken && iteratorToken->variable() && iteratorToken->variable()->typeEndToken()->str().find("iterator") != std::string::npos)
-                continue;
-
             const Token *op1tok = tok->astOperand1();
             while (Token::Match(op1tok, ".|[|*"))
                 op1tok = op1tok->astOperand1();
@@ -1296,7 +1327,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                     std::string typeName = op1Var->getTypeName();
                     if (startsWith(typeName, "::"))
                         typeName.erase(typeName.begin(), typeName.begin() + 2);
-                    switch (mSettings->library.getTypeCheck("unusedvar", typeName)) {
+                    switch (mSettings.library.getTypeCheck("unusedvar", typeName)) {
                     case Library::TypeCheck::def:
                         bailoutTypeName = std::move(typeName);
                         break;
@@ -1321,7 +1352,21 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             if (tok->previous() && tok->previous()->variable() && tok->previous()->variable()->nameToken()->scope()->type == ScopeType::eUnion)
                 continue;
 
-            FwdAnalysis fwdAnalysis(*mSettings);
+            if (const ValueType *vt = expr->valueType()) {
+                if (vt->type == ValueType::RECORD &&
+                    !vt->pointer &&
+                    vt->typeScope &&
+                    vt->typeScope->definedType &&
+                    !symbolDatabase->isRecordTypeWithoutSideEffects(vt->typeScope->definedType))
+                    continue;
+
+                if (vt->type == ValueType::SMART_POINTER &&
+                    vt->smartPointerType &&
+                    !symbolDatabase->isRecordTypeWithoutSideEffects(vt->smartPointerType))
+                    continue;
+            }
+
+            FwdAnalysis fwdAnalysis(mSettings);
             const Token* scopeEnd = ValueFlow::getEndOfExprScope(expr, scope, /*smallest*/ false);
             if (fwdAnalysis.unusedValue(expr, start, scopeEnd)) {
                 if (!bailoutTypeName.empty()) {
@@ -1329,12 +1374,18 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                         reportLibraryCfgError(tok, bailoutTypeName);
                     continue;
                 }
-                if (isTrivialInit && findExpressionChanged(expr, start, scopeEnd, *mSettings))
+                if (isTrivialInit && findExpressionChanged(expr, start, scopeEnd, mSettings))
                     continue;
 
                 // warn
-                if (!expr->variable() || !expr->variable()->isMaybeUnused())
-                    unreadVariableError(tok, expr->expressionString(), false);
+                if (!expr->variable() || !expr->variable()->isMaybeUnused()) {
+                    if (structuredBindingTokCount > 0)
+                        unusedStructuredBindingTokens.emplace_back(tok, expr);
+                    else {
+                        unreadVariableError(tok, expr->expressionString(), false);
+                        diagUnreadVariable.emplace(expr->variable());
+                    }
+                }
             }
         }
 
@@ -1356,7 +1407,6 @@ void CheckUnusedVar::checkFunctionVariableUsage()
 
             // skip things that are only partially implemented to prevent false positives
             if (usage.mType == Variables::pointerPointer ||
-                usage.mType == Variables::pointerArray ||
                 usage.mType == Variables::referenceArray)
                 continue;
 
@@ -1386,7 +1436,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                      !(var->valueType() && var->valueType()->container) &&
                      !(var->isStatic() && isReturnedByRef(var, scope->function)))
                 unassignedVariableError(usage._var->nameToken(), varname);
-            else if (!usage._var->isMaybeUnused() && !usage._modified && !usage._read && var) {
+            else if (!usage._var->isMaybeUnused() && !usage._modified && !usage._read && var && diagUnreadVariable.count(usage._var) == 0) {
                 const Token* vnt = var->nameToken();
                 bool error = false;
                 if (vnt->next()->isSplittedVarDeclEq() || (!var->isReference() && vnt->strAt(1) == "=")) {
@@ -1406,7 +1456,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                     if (mTokenizer->isCPP() && var->isClass() &&
                         (!var->valueType() || var->valueType()->type == ValueType::Type::UNKNOWN_TYPE)) {
                         const std::string typeName = var->getTypeName();
-                        switch (mSettings->library.getTypeCheck("unusedvar", typeName)) {
+                        switch (mSettings.library.getTypeCheck("unusedvar", typeName)) {
                         case Library::TypeCheck::def:
                             reportLibraryCfgError(vnt, typeName);
                             break;
@@ -1425,25 +1475,25 @@ void CheckUnusedVar::checkFunctionVariableUsage()
     }
 }
 
-void CheckUnusedVar::unusedVariableError(const Token *tok, const std::string &varname)
+void CheckUnusedVarImpl::unusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unusedVariable", "$symbol:" + varname + "\nUnused variable: $symbol", CWE563, Certainty::normal);
 }
 
-void CheckUnusedVar::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)
+void CheckUnusedVarImpl::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unusedAllocatedMemory", "$symbol:" + varname + "\nVariable '$symbol' is allocated memory that is never used.", CWE563, Certainty::normal);
 }
 
-void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &varname, bool modified)
+void CheckUnusedVarImpl::unreadVariableError(const Token *tok, const std::string &varname, bool modified)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     if (modified)
@@ -1452,9 +1502,9 @@ void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &va
         reportError(tok, Severity::style, "unreadVariable", "$symbol:" + varname + "\nVariable '$symbol' is assigned a value that is never used.", CWE563, Certainty::normal);
 }
 
-void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string &varname)
+void CheckUnusedVarImpl::unassignedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unassignedVariable", "$symbol:" + varname + "\nVariable '$symbol' is not assigned a value.", CWE665, Certainty::normal);
@@ -1463,9 +1513,9 @@ void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string
 //---------------------------------------------------------------------------
 // Check that all struct members are used
 //---------------------------------------------------------------------------
-void CheckUnusedVar::checkStructMemberUsage()
+void CheckUnusedVarImpl::checkStructMemberUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedStructMember") && !mSettings->isPremiumEnabled("unusedVariable"))
+    if (!mSettings.severity.isEnabled(Severity::style) && !mSettings.isPremiumEnabled("unusedStructMember") && !mSettings.isPremiumEnabled("unusedVariable"))
         return;
 
     logChecker("CheckUnusedVar::checkStructMemberUsage"); // style
@@ -1568,13 +1618,37 @@ void CheckUnusedVar::checkStructMemberUsage()
         if (bailout)
             continue;
 
+        // #7458 - if struct is declared inside union and any struct member is used,
+        // then don't warn about other struct members
+        if (scope.type == ScopeType::eStruct && scope.nestedIn && scope.nestedIn->type == ScopeType::eUnion) {
+            bool structMemberUsed = false;
+
+            for (const Token *tok = scope.nestedIn->bodyStart; tok; tok = tok->next()) {
+                if (tok->variable() && tok != tok->variable()->nameToken() && tok->variable()->scope() == &scope) {
+                    structMemberUsed = true;
+                    break;
+                }
+            }
+
+            // Skip reporting unused members if this struct is in a union and any member is used
+            if (structMemberUsed)
+                continue;
+        }
+
         for (const Variable &var : scope.varlist) {
             // only warn for variables without side effects
-            if (!var.typeStartToken()->isStandardType() && !var.isPointer() && !astIsContainer(var.nameToken()) && !isRecordTypeWithoutSideEffects(var.type()))
+            if (!(var.valueType() && var.valueType()->type >= ValueType::VOID) && !var.isPointer() && !astIsContainer(var.nameToken()) &&
+                !astIsSmartPointer(var.nameToken()) && !mTokenizer->getSymbolDatabase()->isRecordTypeWithoutSideEffects(var.type()))
                 continue;
             if (isInherited && !var.isPrivate())
                 continue;
 
+            if (!var.nameToken() || var.nameToken()->isAttributeUnused() || var.nameToken()->isAttributeMaybeUnused() || var.nameToken()->isAnonymous())
+                continue;
+
+            if (mTokenizer->isVarUsedInTemplate(var.declarationId()))
+                continue;
+
             // Check if the struct member variable is used anywhere in the file
             bool use = false;
             for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -1591,6 +1665,38 @@ void CheckUnusedVar::checkStructMemberUsage()
                         break;
                     }
                 }
+                // Member referenced in alignas
+                if (tok->hasAttributeAlignas()) {
+                    const std::vector<std::string> alignasExpressions = tok->getAttributeAlignas();
+                    use = std::any_of(alignasExpressions.cbegin(),
+                                      alignasExpressions.cend(),
+                                      [&var](const std::string& alignasExpr){
+                        return alignasExpr == var.name();
+                    });
+                    if (use)
+                        break;
+                }
+                // Class used in template with unknown definition
+                if (Token::Match(tok, "%name% <") && tok->linkAt(1)) {
+                    if (tok->function())
+                        continue;
+                    if (tok->type() && tok->type()->classScope)
+                        continue;
+                    const Token *start = tok;
+                    while (Token::Match(start->tokAt(-2), "%name% ::"))
+                        start = start->tokAt(-2);
+                    if (mSettings.library.detectContainer(start))
+                        continue;
+                    const Token *end = tok->linkAt(1);
+                    for (; tok != end; tok = tok->next()) {
+                        if (tok->type() && tok->type()->classScope == &scope) {
+                            use = true;
+                            break;
+                        }
+                    }
+                    if (use)
+                        break;
+                }
                 if (tok->variable() != &var)
                     continue;
                 if (tok != var.nameToken()) {
@@ -1610,105 +1716,12 @@ void CheckUnusedVar::checkStructMemberUsage()
     }
 }
 
-void CheckUnusedVar::unusedStructMemberError(const Token* tok, const std::string& structname, const std::string& varname, const std::string& prefix)
+void CheckUnusedVarImpl::unusedStructMemberError(const Token* tok, const std::string& structname, const std::string& varname, const std::string& prefix)
 {
     reportError(tok, Severity::style, "unusedStructMember", "$symbol:" + structname + "::" + varname + '\n' + prefix + " member '$symbol' is never used.", CWE563, Certainty::normal);
 }
 
-bool CheckUnusedVar::isRecordTypeWithoutSideEffects(const Type* type)
-{
-    // a type that has no side effects (no constructors and no members with constructors)
-    /** @todo false negative: check constructors for side effects */
-    const std::pair<std::map<const Type *,bool>::iterator,bool> found=mIsRecordTypeWithoutSideEffectsMap.insert(
-        std::pair<const Type *,bool>(type,false));         //Initialize with side effects for possible recursions
-    bool & withoutSideEffects = found.first->second;
-    if (!found.second)
-        return withoutSideEffects;
-
-    // unknown types are assumed to have side effects
-    if (!type || !type->classScope)
-        return (withoutSideEffects = false);
-
-    // Non-empty constructors => possible side effects
-    for (const Function& f : type->classScope->functionList) {
-        if (!f.isConstructor() && !f.isDestructor())
-            continue;
-        if (f.argDef && Token::simpleMatch(f.argDef->link(), ") ="))
-            continue; // ignore default/deleted constructors
-        const bool emptyBody = (f.functionScope && Token::simpleMatch(f.functionScope->bodyStart, "{ }"));
-
-        const Token* nextToken = f.argDef ? f.argDef->link() : nullptr;
-        if (Token::simpleMatch(nextToken, ") :")) {
-            // validating initialization list
-            nextToken = nextToken->next(); // goto ":"
-
-            for (const Token *initListToken = nextToken; Token::Match(initListToken, "[:,] %var% [({]"); initListToken = initListToken->linkAt(2)->next()) {
-                const Token* varToken = initListToken->next();
-                const Variable* variable = varToken->variable();
-                if (variable && !isVariableWithoutSideEffects(*variable)) {
-                    return withoutSideEffects = false;
-                }
-
-                const Token* valueEnd = initListToken->linkAt(2);
-                for (const Token* valueToken = initListToken->tokAt(3); valueToken != valueEnd; valueToken = valueToken->next()) {
-                    const Variable* initValueVar = valueToken->variable();
-                    if (initValueVar && !isVariableWithoutSideEffects(*initValueVar)) {
-                        return withoutSideEffects = false;
-                    }
-                    if ((valueToken->tokType() == Token::Type::eName) ||
-                        (valueToken->tokType() == Token::Type::eLambda) ||
-                        (valueToken->tokType() == Token::Type::eOther)) {
-                        return withoutSideEffects = false;
-                    }
-                    const Function* initValueFunc = valueToken->function();
-                    if (initValueFunc && !isFunctionWithoutSideEffects(*initValueFunc, valueToken,
-                                                                       std::list<const Function*> {})) {
-                        return withoutSideEffects = false;
-                    }
-                }
-            }
-        }
-
-        if (!emptyBody)
-            return (withoutSideEffects = false);
-    }
-
-    // Derived from type that has side effects?
-    if (std::any_of(type->derivedFrom.cbegin(), type->derivedFrom.cend(), [this](const Type::BaseInfo& derivedFrom) {
-        return !isRecordTypeWithoutSideEffects(derivedFrom.type);
-    }))
-        return (withoutSideEffects = false);
-
-    // Is there a member variable with possible side effects
-    for (const Variable& var : type->classScope->varlist) {
-        withoutSideEffects = isVariableWithoutSideEffects(var, type);
-        if (!withoutSideEffects) {
-            return withoutSideEffects;
-        }
-    }
-
-
-    return (withoutSideEffects = true);
-}
-
-bool CheckUnusedVar::isVariableWithoutSideEffects(const Variable& var, const Type* type)
-{
-    const Type* variableType = var.type();
-    if (variableType && variableType != type) {
-        if (!isRecordTypeWithoutSideEffects(variableType))
-            return false;
-    } else {
-        if (WRONG_DATA(!var.valueType(), var.typeStartToken()))
-            return false;
-        const ValueType::Type valueType = var.valueType()->type;
-        if ((valueType == ValueType::Type::UNKNOWN_TYPE) || (valueType == ValueType::Type::NONSTD))
-            return false;
-    }
-
-    return true;
-}
-
-bool CheckUnusedVar::isEmptyType(const Type* type)
+bool CheckUnusedVarImpl::isEmptyType(const Type* type)
 {
     // a type that has no variables and no constructor
 
@@ -1729,100 +1742,22 @@ bool CheckUnusedVar::isEmptyType(const Type* type)
     return (emptyType = false);
 }
 
-bool CheckUnusedVar::isFunctionWithoutSideEffects(const Function& func, const Token* functionUsageToken,
-                                                  std::list<const Function*> checkedFuncs)
-{
-    // no body to analyze
-    if (!func.hasBody()) {
-        return false;
-    }
-
-    for (const Token* argsToken = functionUsageToken->next(); !Token::simpleMatch(argsToken, ")"); argsToken = argsToken->next()) {
-        const Variable* argVar = argsToken->variable();
-        if (argVar && argVar->isGlobal()) {
-            return false; // TODO: analyze global variable usage
-        }
-    }
-
-    bool sideEffectReturnFound = false;
-    std::set<const Variable*> pointersToGlobals;
-    for (const Token* bodyToken = func.functionScope->bodyStart->next(); bodyToken != func.functionScope->bodyEnd;
-         bodyToken = bodyToken->next()) {
-        // check variable inside function body
-        const Variable* bodyVariable = bodyToken->variable();
-        if (bodyVariable) {
-            if (!isVariableWithoutSideEffects(*bodyVariable)) {
-                return false;
-            }
-            // check if global variable is changed
-            if (bodyVariable->isGlobal() || (pointersToGlobals.find(bodyVariable) != pointersToGlobals.end())) {
-                const int indirect = bodyVariable->isArray() ? bodyVariable->dimensions().size() : bodyVariable->isPointer();
-                if (isVariableChanged(bodyToken, indirect, *mSettings)) {
-                    return false;
-                }
-                // check if pointer to global variable assigned to another variable (another_var = &global_var)
-                if (Token::simpleMatch(bodyToken->tokAt(-1), "&") && Token::simpleMatch(bodyToken->tokAt(-2), "=")) {
-                    const Token* assigned_var_token = bodyToken->tokAt(-3);
-                    if (assigned_var_token && assigned_var_token->variable()) {
-                        pointersToGlobals.insert(assigned_var_token->variable());
-                    }
-                }
-            }
-        }
-
-        // check nested function
-        const Function* bodyFunction = bodyToken->function();
-        if (bodyFunction) {
-            if (std::find(checkedFuncs.cbegin(), checkedFuncs.cend(), bodyFunction) != checkedFuncs.cend()) { // recursion found
-                continue;
-            }
-            checkedFuncs.push_back(bodyFunction);
-            if (!isFunctionWithoutSideEffects(*bodyFunction, bodyToken, checkedFuncs)) {
-                return false;
-            }
-        }
-
-        // check returned value
-        if (Token::simpleMatch(bodyToken, "return")) {
-            const Token* returnValueToken = bodyToken->next();
-            // TODO: handle complex return expressions
-            if (!Token::simpleMatch(returnValueToken->next(), ";")) {
-                sideEffectReturnFound = true;
-                continue;
-            }
-            // simple one-token return
-            const Variable* returnVariable = returnValueToken->variable();
-            if (returnValueToken->isLiteral() ||
-                (returnVariable && isVariableWithoutSideEffects(*returnVariable))) {
-                continue;
-            }
-            sideEffectReturnFound = true;
-        }
-
-        // unknown name
-        if (bodyToken->isNameOnly()) {
-            return false;
-        }
-    }
-
-    return !sideEffectReturnFound;
-}
-
-void CheckUnusedVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckUnusedVar::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckUnusedVar checkUnusedVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckUnusedVarImpl checkUnusedVar(&tokenizer, tokenizer.getSettings(), errorLogger);
 
     // Coding style checks
     checkUnusedVar.checkStructMemberUsage();
     checkUnusedVar.checkFunctionVariableUsage();
 }
 
-void CheckUnusedVar::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckUnusedVar::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckUnusedVar c(nullptr, settings, errorLogger);
+    CheckUnusedVarImpl c(nullptr, settings, errorLogger);
     c.unusedVariableError(nullptr, "varname");
     c.allocatedButUnusedVariableError(nullptr, "varname");
     c.unreadVariableError(nullptr, "varname", false);
     c.unassignedVariableError(nullptr, "varname");
     c.unusedStructMemberError(nullptr, "structname", "variable");
 }
+
diff --git a/lib/checkunusedvar.h b/lib/checkunusedvar.h
index 8e8e9e8248e..2239b4a60d8 100644
--- a/lib/checkunusedvar.h
+++ b/lib/checkunusedvar.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,9 +22,9 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
-#include <list>
 #include <map>
 #include <string>
 
@@ -34,8 +34,6 @@ class Settings;
 class Token;
 class Type;
 class Variables;
-class Variable;
-class Function;
 class Tokenizer;
 
 /// @addtogroup Checks
@@ -45,32 +43,42 @@ class Tokenizer;
 /** @brief Various small checks */
 
 class CPPCHECKLIB CheckUnusedVar : public Check {
-    friend class TestUnusedVar;
-
 public:
     /** @brief This constructor is used when registering the CheckClass */
-    CheckUnusedVar() : Check(myName()) {}
+    CheckUnusedVar() : Check("UnusedVar") {}
 
 private:
-    /** @brief This constructor is used when running checks. */
-    CheckUnusedVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
+
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "UnusedVar checks\n"
+
+               // style
+               "- unused variable\n"
+               "- allocated but unused variable\n"
+               "- unread variable\n"
+               "- unassigned variable\n"
+               "- unused struct member\n";
+    }
+};
+
+class CPPCHECKLIB CheckUnusedVarImpl : public CheckImpl {
+public:
+    /** @brief This constructor is used when running checks. */
+    CheckUnusedVarImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     /** @brief %Check for unused function variables */
-    void checkFunctionVariableUsage_iterateScopes(const Scope* scope, Variables& variables);
+    void checkFunctionVariableUsage_iterateScopes(const Scope* scope, Variables& variables) const;
     void checkFunctionVariableUsage();
 
     /** @brief %Check that all struct members are used */
     void checkStructMemberUsage();
 
-    bool isRecordTypeWithoutSideEffects(const Type* type);
-    bool isVariableWithoutSideEffects(const Variable& var, const Type* type = nullptr);
     bool isEmptyType(const Type* type);
-    bool isFunctionWithoutSideEffects(const Function& func, const Token* functionUsageToken,
-                                      std::list<const Function*> checkedFuncs);
 
     // Error messages..
     void unusedStructMemberError(const Token *tok, const std::string &structname, const std::string &varname, const std::string& prefix = "struct");
@@ -79,27 +87,7 @@ class CPPCHECKLIB CheckUnusedVar : public Check {
     void unreadVariableError(const Token *tok, const std::string &varname, bool modified);
     void unassignedVariableError(const Token *tok, const std::string &varname);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "UnusedVar";
-    }
-
-    std::string classInfo() const override {
-        return "UnusedVar checks\n"
-
-               // style
-               "- unused variable\n"
-               "- allocated but unused variable\n"
-               "- unread variable\n"
-               "- unassigned variable\n"
-               "- unused struct member\n";
-    }
-
-    std::map<const Type *,bool> mIsRecordTypeWithoutSideEffectsMap;
-
     std::map<const Type *,bool> mIsEmptyTypeMap;
-
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
index 96c65ea41a2..ae8b1626ba6 100644
--- a/lib/checkvaarg.cpp
+++ b/lib/checkvaarg.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -30,14 +30,6 @@
 #include <list>
 #include <vector>
 
-//---------------------------------------------------------------------------
-
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckVaarg instance;
-}
-
-
 //---------------------------------------------------------------------------
 // Ensure that correct parameter is passed to va_start()
 //---------------------------------------------------------------------------
@@ -47,11 +39,11 @@ static const CWE CWE664(664U);   // Improper Control of a Resource Through its L
 static const CWE CWE688(688U);   // Function Call With Incorrect Variable or Reference as Argument
 static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
 
-void CheckVaarg::va_start_argument()
+void CheckVaargImpl::va_start_argument()
 {
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     const std::size_t functions = symbolDatabase->functionScopes.size();
-    const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
+    const bool printWarnings = mSettings.severity.isEnabled(Severity::warning);
 
     logChecker("CheckVaarg::va_start_argument");
 
@@ -73,7 +65,7 @@ void CheckVaarg::va_start_argument()
                 if (var && var->index() + 2 < function->argCount() && printWarnings) {
                     auto it = function->argumentList.end();
                     std::advance(it, -2);
-                    wrongParameterTo_va_start_error(tok, var->name(), it->name()); // cppcheck-suppress derefInvalidIterator // FP due to isVariableChangedByFunctionCall()
+                    wrongParameterTo_va_start_error(tok, var->name(), it->name());
                 }
                 tok = tok->linkAt(1);
             }
@@ -81,13 +73,13 @@ void CheckVaarg::va_start_argument()
     }
 }
 
-void CheckVaarg::wrongParameterTo_va_start_error(const Token *tok, const std::string& paramIsName, const std::string& paramShouldName)
+void CheckVaargImpl::wrongParameterTo_va_start_error(const Token *tok, const std::string& paramIsName, const std::string& paramShouldName)
 {
     reportError(tok, Severity::warning,
                 "va_start_wrongParameter", "'" + paramIsName + "' given to va_start() is not last named argument of the function. Did you intend to pass '" + paramShouldName + "'?", CWE688, Certainty::normal);
 }
 
-void CheckVaarg::referenceAs_va_start_error(const Token *tok, const std::string& paramName)
+void CheckVaargImpl::referenceAs_va_start_error(const Token *tok, const std::string& paramName)
 {
     reportError(tok, Severity::error,
                 "va_start_referencePassed", "Using reference '" + paramName + "' as parameter for va_start() results in undefined behaviour.", CWE758, Certainty::normal);
@@ -98,9 +90,9 @@ void CheckVaarg::referenceAs_va_start_error(const Token *tok, const std::string&
 // Detect va_list usage after va_end()
 //---------------------------------------------------------------------------
 
-void CheckVaarg::va_list_usage()
+void CheckVaargImpl::va_list_usage()
 {
-    if (mSettings->clang)
+    if (mSettings.clang)
         return;
 
     logChecker("CheckVaarg::va_list_usage"); // notclang
@@ -163,34 +155,34 @@ void CheckVaarg::va_list_usage()
     }
 }
 
-void CheckVaarg::va_end_missingError(const Token *tok, const std::string& varname)
+void CheckVaargImpl::va_end_missingError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::error,
                 "va_end_missing", "va_list '" + varname + "' was opened but not closed by va_end().", CWE664, Certainty::normal);
 }
 
-void CheckVaarg::va_list_usedBeforeStartedError(const Token *tok, const std::string& varname)
+void CheckVaargImpl::va_list_usedBeforeStartedError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::error,
                 "va_list_usedBeforeStarted", "va_list '" + varname + "' used before va_start() was called.", CWE664, Certainty::normal);
 }
 
-void CheckVaarg::va_start_subsequentCallsError(const Token *tok, const std::string& varname)
+void CheckVaargImpl::va_start_subsequentCallsError(const Token *tok, const std::string& varname)
 {
     reportError(tok, Severity::error,
                 "va_start_subsequentCalls", "va_start() or va_copy() called subsequently on '" + varname + "' without va_end() in between.", CWE664, Certainty::normal);
 }
 
-void CheckVaarg::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+void CheckVaarg::runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger)
 {
-    CheckVaarg check(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    CheckVaargImpl check(&tokenizer, tokenizer.getSettings(), errorLogger);
     check.va_start_argument();
     check.va_list_usage();
 }
 
-void CheckVaarg::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+void CheckVaarg::getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const
 {
-    CheckVaarg c(nullptr, settings, errorLogger);
+    CheckVaargImpl c(nullptr, settings, errorLogger);
     c.wrongParameterTo_va_start_error(nullptr, "arg1", "arg2");
     c.referenceAs_va_start_error(nullptr, "arg1");
     c.va_end_missingError(nullptr, "vl");
diff --git a/lib/checkvaarg.h b/lib/checkvaarg.h
index 7af5d98d66f..eea3f345bcc 100644
--- a/lib/checkvaarg.h
+++ b/lib/checkvaarg.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include "check.h"
+#include "checkimpl.h"
 #include "config.h"
 
 #include <string>
@@ -41,13 +42,28 @@ class Tokenizer;
 
 class CPPCHECKLIB CheckVaarg : public Check {
 public:
-    CheckVaarg() : Check(myName()) {}
+    CheckVaarg() : Check("Vaarg") {}
+
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger& errorLogger) override;
 
 private:
-    CheckVaarg(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    void getErrorMessages(ErrorLogger& errorLogger, const Settings &settings) const override;
+
+    std::string classInfo() const override {
+        return "Check for misusage of variable argument lists:\n"
+               "- Wrong parameter passed to va_start()\n"
+               "- Reference passed to va_start()\n"
+               "- Missing va_end()\n"
+               "- Using va_list before it is opened\n"
+               "- Subsequent calls to va_start/va_copy()\n";
+    }
+};
 
-    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
+class CPPCHECKLIB CheckVaargImpl : public CheckImpl
+{
+public:
+    CheckVaargImpl(const Tokenizer *tokenizer, const Settings &settings, ErrorLogger &errorLogger)
+        : CheckImpl(tokenizer, settings, errorLogger) {}
 
     void va_start_argument();
     void va_list_usage();
@@ -57,21 +73,6 @@ class CPPCHECKLIB CheckVaarg : public Check {
     void va_end_missingError(const Token *tok, const std::string& varname);
     void va_list_usedBeforeStartedError(const Token *tok, const std::string& varname);
     void va_start_subsequentCallsError(const Token *tok, const std::string& varname);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
-
-    static std::string myName() {
-        return "Vaarg";
-    }
-
-    std::string classInfo() const override {
-        return "Check for misusage of variable argument lists:\n"
-               "- Wrong parameter passed to va_start()\n"
-               "- Reference passed to va_start()\n"
-               "- Missing va_end()\n"
-               "- Using va_list before it is opened\n"
-               "- Subsequent calls to va_start/va_copy()\n";
-    }
 };
 
 /// @}
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index a5af89bfb46..98c0e700d83 100644
--- a/lib/clangimport.cpp
+++ b/lib/clangimport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,7 +20,6 @@
 
 #include "errortypes.h"
 #include "mathlib.h"
-#include "settings.h"
 #include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -45,6 +44,8 @@
 #include <vector>
 #include <numeric>
 
+class Settings;
+
 static const std::string AccessSpecDecl = "AccessSpecDecl";
 static const std::string ArraySubscriptExpr = "ArraySubscriptExpr";
 static const std::string BinaryOperator = "BinaryOperator";
@@ -139,7 +140,7 @@ static std::vector<std::string> splitString(const std::string &line)
             pos2 = line.find('\"', pos1+1);
         else if (line[pos1] == '\'') {
             pos2 = line.find('\'', pos1+1);
-            if (pos2 < static_cast<int>(line.size()) - 3 && line.compare(pos2, 3, "\':\'", 0, 3) == 0)
+            if (pos2 < line.size() - 3 && line.compare(pos2, 3, "\':\'", 0, 3) == 0)
                 pos2 = line.find('\'', pos2 + 3);
         } else {
             pos2 = pos1;
@@ -302,7 +303,7 @@ namespace clangimport {
         }
 
         // "}" tokens that are not end-of-scope
-        std::set<Token *> mNotScope;
+        std::set<const Token *> mNotScope;
 
         std::map<const Scope *, AccessControl> scopeAccessControl;
     private:
@@ -332,6 +333,9 @@ namespace clangimport {
         std::vector<AstNodePtr> children;
 
         bool isPrologueTypedefDecl() const;
+        /**
+         * @throws InternalError thrown if AST location is invalid
+         */
         void setLocations(TokenList &tokenList, int file, int line, int col);
 
         void dumpAst(int num = 0, int indent = 0) const;
@@ -350,7 +354,10 @@ namespace clangimport {
             mData->mNotScope.clear();
         }
 
-        AstNodePtr getChild(int c) {
+        /**
+         * @throws InternalError thrown if index is out of bounds
+         */
+        AstNodePtr getChild(size_t c) {
             if (c >= children.size()) {
                 std::ostringstream err;
                 err << "ClangImport: AstNodePtr::getChild(" << c << ") out of bounds. children.size=" << children.size() << " " << nodeType;
@@ -361,6 +368,9 @@ namespace clangimport {
             return children[c];
         }
     private:
+        /**
+         * @throws InternalError thrown if CXXForRangeStmt cannot be imported
+         */
         Token *createTokens(TokenList &tokenList);
         Token *addtoken(TokenList &tokenList, const std::string &str, bool valueType=true);
         const ::Type *addTypeTokens(TokenList &tokenList, const std::string &str, const Scope *scope = nullptr);
@@ -499,7 +509,7 @@ void clangimport::AstNode::dumpAst(int num, int indent) const
     for (const auto& tok: mExtTokens)
         std::cout << " " << tok;
     std::cout << std::endl;
-    for (int c = 0; c < children.size(); ++c) {
+    for (size_t c = 0; c < children.size(); ++c) {
         if (children[c])
             children[c]->dumpAst(c, indent + 2);
         else
@@ -633,7 +643,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->check->findVariableType(scope, typeToken);
+        const ::Type *recordType = scope->symdb.findVariableType(scope, typeToken);
         if (recordType) {
             const_cast<Token*>(typeToken)->type(recordType);
             return recordType;
@@ -702,14 +712,13 @@ Scope *clangimport::AstNode::createScope(TokenList &tokenList, ScopeType scopeTy
 
     auto *nestedIn = const_cast<Scope *>(getNestedInScope(tokenList));
 
-    symbolDatabase.scopeList.emplace_back(nullptr, nullptr, nestedIn);
+    symbolDatabase.scopeList.emplace_back(nestedIn->symdb, nullptr, nestedIn);
     Scope *scope = &symbolDatabase.scopeList.back();
     if (scopeType == ScopeType::eEnum)
         scope->enumeratorList.reserve(children2.size());
     nestedIn->nestedList.push_back(scope);
     scope->type = scopeType;
-    scope->classDef = def;
-    scope->check = nestedIn->check;
+    scope->classDef = def; // TODO: pass into ctor
     if (Token::Match(def, "if|for|while (")) {
         std::map<const Variable *, const Variable *> replaceVar;
         for (const Token *vartok = def->tokAt(2); vartok; vartok = vartok->next()) {
@@ -786,7 +795,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
     if (nodeType == BreakStmt)
         return addtoken(tokenList, "break");
     if (nodeType == CharacterLiteral) {
-        const int c = MathLib::toBigNumber(mExtTokens.back());
+        const int c = static_cast<int>(MathLib::toBigNumber(mExtTokens.back()));
         if (c == 0)
             return addtoken(tokenList, "\'\\0\'");
         if (c == '\r')
@@ -998,7 +1007,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
             --addrIndex;
         const std::string addr = mExtTokens[addrIndex];
         std::string name = unquote(getSpelling());
-        Token *reftok = addtoken(tokenList, name.empty() ? "<NoName>" : std::move(name));
+        Token *reftok = addtoken(tokenList, name.empty() ? "<NoName>" : name);
         mData->ref(addr, reftok);
         return reftok;
     }
@@ -1404,11 +1413,10 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
 
     Scope *scope = nullptr;
     if (hasBody) {
-        symbolDatabase.scopeList.emplace_back(nullptr, nullptr, nestedIn);
+        symbolDatabase.scopeList.emplace_back(symbolDatabase, nullptr, nestedIn);
         scope = &symbolDatabase.scopeList.back();
-        scope->check = &symbolDatabase;
         scope->function = function;
-        scope->classDef = nameToken;
+        scope->classDef = nameToken; // TODO: pass into ctor
         scope->type = ScopeType::eFunction;
         scope->className = nameToken->str();
         nestedIn->nestedList.push_back(scope);
@@ -1424,7 +1432,7 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
         function->nestedIn = nestedIn;
     function->argDef = par1;
     // Function arguments
-    for (int i = 0; i < children.size(); ++i) {
+    for (size_t i = 0; i < children.size(); ++i) {
         AstNodePtr child = children[i];
         if (child->nodeType != ParmVarDecl)
             continue;
@@ -1584,11 +1592,11 @@ static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDa
 
         MathLib::bigint typeSize = 0;
         for (const Variable &var: scope.varlist) {
-            const int mul = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), 1, [](int v, const Dimension& dim) {
+            const MathLib::bigint mul = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint v, const Dimension& dim) {
                 return v * dim.num;
             });
             if (var.valueType())
-                typeSize += mul * var.valueType()->typeSize(settings.platform, true);
+                typeSize += mul * var.valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
         }
         scope.definedType->sizeOf = typeSize;
     }
@@ -1596,8 +1604,8 @@ static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDa
     for (auto *tok = const_cast<Token*>(tokenizer.tokens()); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
             ValueType vt = ValueType::parseDecl(tok->tokAt(2), settings);
-            const MathLib::bigint sz = vt.typeSize(settings.platform, true);
-            if (sz <= 0)
+            const size_t sz = vt.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+            if (sz == 0)
                 continue;
             long long mul = 1;
             for (const Token *arrtok = tok->linkAt(1)->previous(); arrtok; arrtok = arrtok->previous()) {
@@ -1620,9 +1628,8 @@ void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
 
     tokenizer.createSymbolDatabase();
     auto *symbolDatabase = const_cast<SymbolDatabase *>(tokenizer.getSymbolDatabase());
-    symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nullptr);
+    symbolDatabase->scopeList.emplace_back(*symbolDatabase, nullptr, nullptr);
     symbolDatabase->scopeList.back().type = ScopeType::eGlobal;
-    symbolDatabase->scopeList.back().check = symbolDatabase;
 
     clangimport::Data data(tokenizer.getSettings(), *symbolDatabase);
     std::string line;
@@ -1650,7 +1657,7 @@ void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
             continue;
         }
 
-        const int level = (pos1 - 1) / 2;
+        const size_t level = (pos1 - 1) / 2;
         if (level == 0 || level > tree.size())
             continue;
 
diff --git a/lib/clangimport.h b/lib/clangimport.h
index 0475491d9af..f0a35e7a3b6 100644
--- a/lib/clangimport.h
+++ b/lib/clangimport.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -29,6 +29,9 @@
 class Tokenizer;
 
 namespace clangimport {
+    /**
+     * @throws InternalError thrown on incorrectly linked tokens
+     */
     void CPPCHECKLIB parseClangAstDump(Tokenizer &tokenizer, std::istream &f);
 }
 
diff --git a/lib/config.h b/lib/config.h
index b9d34770be7..c88c431288c 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -35,12 +35,6 @@
 #  define CPPCHECKLIB
 #endif
 
-// MS Visual C++ memory leak debug tracing
-#if !defined(DISABLE_CRTDBG_MAP_ALLOC) && defined(_MSC_VER) && defined(_DEBUG)
-#  define _CRTDBG_MAP_ALLOC
-#  include <crtdbg.h>
-#endif
-
 // compatibility macros
 #ifndef __has_builtin
 #define __has_builtin(x) 0
@@ -58,16 +52,6 @@
 #define __has_feature(x) 0
 #endif
 
-// C++11 noexcept
-#if defined(__cpp_noexcept_function_type) || \
-    (defined(__GNUC__) && (__GNUC__ >= 5)) \
-    || defined(__clang__) \
-    || defined(__CPPCHECK__)
-#  define NOEXCEPT noexcept
-#else
-#  define NOEXCEPT
-#endif
-
 // C++11 noreturn
 #if __has_cpp_attribute (noreturn) \
     || (defined(__GNUC__) && (__GNUC__ >= 5)) \
@@ -102,6 +86,7 @@
 #  define UNUSED
 #endif
 
+// TODO: AppleClang versions do not align with Clang versions - add check for proper version
 // warn_unused
 #if __has_cpp_attribute (gnu::warn_unused) || \
     (defined(__clang__) && (__clang_major__ >= 15))
@@ -121,6 +106,7 @@
 #  define DEPRECATED
 #endif
 
+// TODO: AppleClang versions do not align with Clang versions - add check for proper version
 // returns_nonnull
 #if __has_cpp_attribute (gnu::returns_nonnull)
 #  define RET_NONNULL [[gnu::returns_nonnull]]
@@ -133,9 +119,6 @@
 
 #define REQUIRES(msg, ...) class=typename std::enable_if<__VA_ARGS__::value>::type
 
-#include <string>
-static const std::string emptyString;
-
 // Use the nonneg macro when you want to assert that a variable/argument is not negative
 #ifdef __CPPCHECK__
 #define nonneg   __cppcheck_low__(0)
@@ -164,12 +147,16 @@ static const std::string emptyString;
 #define HAS_THREADING_MODEL_THREAD
 #define STDCALL __stdcall
 #elif ((defined(__GNUC__) || defined(__sun)) && !defined(__MINGW32__)) || defined(__CPPCHECK__)
+#if !defined(DISALLOW_PROCESS_EXECUTOR)
 #define HAS_THREADING_MODEL_FORK
+#endif
 #if !defined(DISALLOW_THREAD_EXECUTOR)
 #define HAS_THREADING_MODEL_THREAD
 #endif
 #define STDCALL
-#else
+#endif
+
+#if !defined(HAS_THREADING_MODEL_FORK) && !defined(HAS_THREADING_MODEL_THREAD)
 #error "No threading model defined"
 #endif
 
@@ -211,10 +198,15 @@ static const std::string emptyString;
 #define USE_WINDOWS_SEH
 #endif
 
-// TODO: __GLIBC__ is dependent on the features.h include and not a built-in compiler define, so it might be problematic to depend on it
-#if !defined(NO_UNIX_BACKTRACE_SUPPORT) && defined(__GNUC__) && defined(__GLIBC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__NetBSD__) && !defined(__SVR4) && !defined(__QNX__)
+#if !defined(NO_UNIX_BACKTRACE_SUPPORT)
+#if defined(HAVE_EXECINFO_H)
+#if HAVE_EXECINFO_H
 #define USE_UNIX_BACKTRACE_SUPPORT
 #endif
+#elif __has_include(<execinfo.h>)
+#define USE_UNIX_BACKTRACE_SUPPORT
+#endif
+#endif
 
 #if !defined(NO_UNIX_SIGNAL_HANDLING) && defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OS2__)
 #define USE_UNIX_SIGNAL_HANDLING
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index baecb950e60..42af3627f02 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,6 +21,7 @@
 #include "addoninfo.h"
 #include "analyzerinfo.h"
 #include "check.h"
+#include "checks.h"
 #include "checkunusedfunctions.h"
 #include "clangimport.h"
 #include "color.h"
@@ -35,6 +36,7 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
+#include "symboldatabase.h"
 #include "timer.h"
 #include "token.h"
 #include "tokenize.h"
@@ -43,6 +45,11 @@
 #include "valueflow.h"
 #include "version.h"
 
+#ifdef HAVE_RULES
+#include "regex.h"
+#include "rule.h"
+#endif
+
 #include <algorithm>
 #include <cassert>
 #include <cstdio>
@@ -54,6 +61,7 @@
 #include <exception> // IWYU pragma: keep
 #include <fstream>
 #include <iostream>
+#include <iterator>
 #include <map>
 #include <new>
 #include <set>
@@ -68,24 +76,13 @@
 
 #include <simplecpp.h>
 
-#include "xml.h"
-
-#ifdef HAVE_RULES
-#ifdef _WIN32
-#define PCRE_STATIC
-#endif
-#include <pcre.h>
-#endif
-
-class SymbolDatabase;
+namespace tinyxml2 { class XMLElement; }
 
 static constexpr char Version[] = CPPCHECK_VERSION_STRING;
 static constexpr char ExtraVersion[] = "";
 
 static constexpr char FILELIST[] = "cppcheck-addon-ctu-file-list";
 
-static TimerResults s_timerResults;
-
 // CWE ids used
 static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 
@@ -104,9 +101,9 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         closePlist();
     }
 
-    void setRemarkComments(std::vector<RemarkComment> remarkComments)
+    void addRemarkComments(const std::vector<RemarkComment> &remarkComments)
     {
-        mRemarkComments = std::move(remarkComments);
+        mRemarkComments.insert(mRemarkComments.end(), remarkComments.begin(), remarkComments.end());
     }
 
     void setLocationMacros(const Token* startTok, const std::vector<std::string>& files)
@@ -128,17 +125,25 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         mErrorList.clear();
     }
 
-    void openPlist(const std::string& filename, const std::vector<std::string>& files)
+    void openPlist(const std::string& filename)
     {
         mPlistFile.open(filename);
-        mPlistFile << ErrorLogger::plistHeader(version(), files);
+        mPlistFile << ErrorLogger::plistHeader(version());
+    }
+
+    void setPlistFilenames(std::vector<std::string> files)
+    {
+        if (mPlistFile.is_open()) {
+            mPlistFilenames = std::move(files);
+        }
     }
 
     void closePlist()
     {
         if (mPlistFile.is_open()) {
-            mPlistFile << ErrorLogger::plistFooter();
+            mPlistFile << ErrorLogger::plistFooter(mPlistFilenames);
             mPlistFile.close();
+            mPlistFilenames.clear();
         }
     }
 
@@ -183,6 +188,8 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         // TODO: only convert if necessary
         const auto errorMessage = SuppressionList::ErrorMessage::fromErrorMessage(msg, macroNames);
 
+        bool suppressed = false;
+
         if (mSuppressions.nomsg.isSuppressed(errorMessage, mUseGlobalSuppressions)) {
             // Safety: Report critical errors to ErrorLogger
             if (mSettings.safety && ErrorLogger::isCriticalErrorId(msg.id)) {
@@ -199,7 +206,7 @@ class CppCheck::CppCheckLogger : public ErrorLogger
                     mErrorLogger.reportErr(msg);
                 }
             }
-            return;
+            suppressed = true;
         }
 
         // TODO: there should be no need for the verbose and default messages here
@@ -216,6 +223,9 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         if (mAnalyzerInformation)
             mAnalyzerInformation->reportErr(msg);
 
+        if (suppressed)
+            return;
+
         if (!mSuppressions.nofail.isSuppressed(errorMessage) && !mSuppressions.nomsg.isSuppressed(errorMessage)) {
             mExitCode = 1;
         }
@@ -257,6 +267,11 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         mErrorLogger.reportOut(outmsg, c);
     }
 
+    void reportMetric(const std::string &metric) override
+    {
+        mErrorLogger.reportMetric(metric);
+    }
+
     void reportProgress(const std::string &filename, const char stage[], const std::size_t value) override
     {
         mErrorLogger.reportProgress(filename, stage, value);
@@ -276,6 +291,7 @@ class CppCheck::CppCheckLogger : public ErrorLogger
     std::map<Location, std::set<std::string>> mLocationMacros; // What macros are used on a location?
 
     std::ofstream mPlistFile;
+    std::vector<std::string> mPlistFilenames;
 
     unsigned int mExitCode{};
 
@@ -331,17 +347,17 @@ static std::vector<std::string> split(const std::string &str, const std::string
     return ret;
 }
 
-static std::string getDumpFileName(const Settings& settings, const std::string& filename, int fileIndex)
+static std::string getDumpFileName(const Settings& settings, const FileWithDetails& file)
 {
     std::string extension = ".dump";
-    if (fileIndex > 0)
-        extension = "." + std::to_string(fileIndex) + extension;
+    if (file.fsFileId() > 0)
+        extension = "." + std::to_string(file.fsFileId()) + extension;
     if (!settings.dump && settings.buildDir.empty())
         extension = "." + std::to_string(settings.pid) + extension;
 
     if (!settings.dump && !settings.buildDir.empty())
-        return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, filename, "", fileIndex) + extension;
-    return filename + extension;
+        return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, file.spath(), "", file.fsFileId()) + extension;
+    return file.spath() + extension;
 }
 
 static std::string getCtuInfoFileName(const std::string &dumpFile)
@@ -351,13 +367,12 @@ static std::string getCtuInfoFileName(const std::string &dumpFile)
 
 static void createDumpFile(const Settings& settings,
                            const FileWithDetails& file,
-                           int fileIndex,
                            std::ofstream& fdump,
                            std::string& dumpFile)
 {
     if (!settings.dump && settings.addons.empty())
         return;
-    dumpFile = getDumpFileName(settings, file.spath(), fileIndex);
+    dumpFile = getDumpFileName(settings, file);
 
     fdump.open(dumpFile);
     if (!fdump.is_open())
@@ -391,6 +406,9 @@ static void createDumpFile(const Settings& settings,
           << " int_bit=\"" << static_cast<unsigned>(settings.platform.int_bit) << '\"'
           << " long_bit=\"" << static_cast<unsigned>(settings.platform.long_bit) << '\"'
           << " long_long_bit=\"" << static_cast<unsigned>(settings.platform.long_long_bit) << '\"'
+          << " float_bit=\"" << static_cast<unsigned>(settings.platform.float_bit) << '\"'
+          << " double_bit=\"" << static_cast<unsigned>(settings.platform.double_bit) << '\"'
+          << " long_double_bit=\"" << static_cast<unsigned>(settings.platform.long_double_bit) << '\"'
           << " pointer_bit=\"" << (settings.platform.sizeof_pointer * settings.platform.char_bit) << '\"'
           << " wchar_t_bit=\"" << (settings.platform.sizeof_wchar_t * settings.platform.char_bit) << '\"'
           << " size_t_bit=\"" << (settings.platform.sizeof_size_t * settings.platform.char_bit) << '\"'
@@ -421,12 +439,18 @@ static std::string detectPython(const CppCheck::ExecuteCmdFn &executeCommand)
     return "";
 }
 
+/**
+ * @throws InternalError thrown when execution fails
+ */
 static std::vector<picojson::value> executeAddon(const AddonInfo &addonInfo,
                                                  const std::string &defaultPythonExe,
                                                  const std::string &file,
                                                  const std::string &premiumArgs,
                                                  const CppCheck::ExecuteCmdFn &executeCommand)
 {
+    if (!executeCommand)
+        throw InternalError(nullptr, "Failed to execute addon - no command callback provided");
+
     std::string pythonExe;
 
     if (!addonInfo.executable.empty())
@@ -436,7 +460,7 @@ static std::vector<picojson::value> executeAddon(const AddonInfo &addonInfo,
     else if (!defaultPythonExe.empty())
         pythonExe = cmdFileName(defaultPythonExe);
     else {
-        // store in static variable so we only look this up once
+        // store in static variable so we only look this up once - TODO: do not cache globally
         static const std::string detectedPythonExe = detectPython(executeCommand);
         if (detectedPythonExe.empty())
             throw InternalError(nullptr, "Failed to auto detect python");
@@ -524,6 +548,7 @@ static std::string getDefinesFlags(const std::string &semicolonSeparatedString)
 CppCheck::CppCheck(const Settings& settings,
                    Suppressions& supprs,
                    ErrorLogger &errorLogger,
+                   TimerResults *timerResults,
                    bool useGlobalSuppressions,
                    ExecuteCmdFn executeCommand)
     : mSettings(settings)
@@ -531,6 +556,7 @@ CppCheck::CppCheck(const Settings& settings,
     , mLogger(new CppCheckLogger(errorLogger, mSettings, mSuppressions, useGlobalSuppressions))
     , mErrorLogger(*mLogger)
     , mErrorLoggerDirect(errorLogger)
+    , mTimerResults(timerResults)
     , mUseGlobalSuppressions(useGlobalSuppressions)
     , mExecuteCommand(std::move(executeCommand))
 {}
@@ -650,7 +676,7 @@ static std::string getClangFlags(const Settings& setting, Standards::Language la
 }
 
 // TODO: clear error list before returning
-unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
+unsigned int CppCheck::checkClang(const FileWithDetails &file)
 {
     // TODO: clear exitcode
 
@@ -663,7 +689,7 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
     // TODO: get language from FileWithDetails object
     std::string clangStderr;
     if (!mSettings.buildDir.empty())
-        clangStderr = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, file.spath(), "", fileIndex) + ".clang-stderr";
+        clangStderr = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, file.spath(), "", file.fsFileId()) + ".clang-stderr";
 
     std::string exe = mSettings.clangExecutable;
 #ifdef _WIN32
@@ -681,6 +707,11 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
         mErrorLogger.reportOut(exe + " " + args2, Color::Reset);
     }
 
+    if (!mExecuteCommand) {
+        std::cerr << "Failed to execute '" << exe << " " << args2 << " " << redirect2 << "' - (no command callback provided)" << std::endl;
+        return 0; // TODO: report as failure?
+    }
+
     std::string output2;
     const int exitcode = mExecuteCommand(exe,split(args2),redirect2,output2);
     if (mSettings.debugClangOutput) {
@@ -725,14 +756,14 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
                              const_cast<SymbolDatabase&>(*tokenizer.getSymbolDatabase()),
                              mErrorLogger,
                              mSettings,
-                             &s_timerResults);
+                             mTimerResults);
         tokenizer.printDebugOutput(std::cout);
-        checkNormalTokens(tokenizer, nullptr); // TODO: provide analyzer information
+        checkNormalTokens(tokenizer, nullptr, ""); // TODO: provide analyzer information
 
         // create dumpfile
         std::ofstream fdump;
         std::string dumpFile;
-        createDumpFile(mSettings, file, fileIndex, fdump, dumpFile);
+        createDumpFile(mSettings, file, fdump, dumpFile);
         if (fdump.is_open()) {
             fdump << getLibraryDumpData();
             // TODO: use tinyxml2 to create XML
@@ -776,19 +807,18 @@ unsigned int CppCheck::check(const FileWithDetails &file)
 
     unsigned int returnValue;
     if (mSettings.clang)
-        returnValue = checkClang(file, 0);
+        returnValue = checkClang(file);
     else
-        returnValue = checkFile(file, "", 0);
+        returnValue = checkFile(file, "");
 
     // TODO: call analyseClangTidy()
 
     return returnValue;
 }
 
-unsigned int CppCheck::check(const FileWithDetails &file, const std::string &content)
+unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const char* data, std::size_t size)
 {
-    std::istringstream iss(content);
-    return checkFile(file, "", 0, &iss);
+    return checkBuffer(file, "", data, size);
 }
 
 unsigned int CppCheck::check(const FileSettings &fs)
@@ -805,6 +835,7 @@ unsigned int CppCheck::check(const FileSettings &fs)
     else
         tempSettings.userDefines += fs.cppcheckDefines();
     tempSettings.includePaths = fs.includePaths;
+    tempSettings.userIncludes.insert(tempSettings.userIncludes.end(), fs.forcedIncludes.cbegin(), fs.forcedIncludes.cend());
     tempSettings.userUndefs.insert(fs.undefs.cbegin(), fs.undefs.cend());
     if (fs.standard.find("++") != std::string::npos)
         tempSettings.standards.setCPP(fs.standard);
@@ -815,7 +846,7 @@ unsigned int CppCheck::check(const FileSettings &fs)
     if (mSettings.clang) {
         tempSettings.includePaths.insert(tempSettings.includePaths.end(), fs.systemIncludePaths.cbegin(), fs.systemIncludePaths.cend());
         // need to pass the externally provided ErrorLogger instead of our internal wrapper
-        CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mUseGlobalSuppressions, mExecuteCommand);
+        CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mTimerResults, mUseGlobalSuppressions, mExecuteCommand);
         // TODO: propagate back mFileInfo
         const unsigned int returnValue = temp.check(fs.file);
         if (mUnusedFunctionsCheck)
@@ -823,8 +854,8 @@ unsigned int CppCheck::check(const FileSettings &fs)
         return returnValue;
     }
     // need to pass the externally provided ErrorLogger instead of our internal wrapper
-    CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mUseGlobalSuppressions, mExecuteCommand);
-    const unsigned int returnValue = temp.checkFile(fs.file, fs.cfg, fs.fileIndex);
+    CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mTimerResults, mUseGlobalSuppressions, mExecuteCommand);
+    const unsigned int returnValue = temp.checkFile(fs.file, fs.cfg);
     if (mUnusedFunctionsCheck)
         mUnusedFunctionsCheck->updateFunctionData(*temp.mUnusedFunctionsCheck);
     while (!temp.mFileInfo.empty()) {
@@ -837,42 +868,81 @@ unsigned int CppCheck::check(const FileSettings &fs)
     return returnValue;
 }
 
-static simplecpp::TokenList createTokenList(const std::string& filename, std::vector<std::string>& files, simplecpp::OutputList* outputList, std::istream* fileStream)
+std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const std::string& filePath) const
 {
-    if (fileStream)
-        return {*fileStream, files, filename, outputList};
+    std::ostringstream toolinfo;
+    toolinfo << (mSettings.cppcheckCfgProductName.empty() ? CPPCHECK_VERSION_STRING : mSettings.cppcheckCfgProductName);
+    toolinfo << (mSettings.severity.isEnabled(Severity::warning) ? 'w' : ' ');
+    toolinfo << (mSettings.severity.isEnabled(Severity::style) ? 's' : ' ');
+    toolinfo << (mSettings.severity.isEnabled(Severity::performance) ? 'p' : ' ');
+    toolinfo << (mSettings.severity.isEnabled(Severity::portability) ? 'p' : ' ');
+    toolinfo << (mSettings.severity.isEnabled(Severity::information) ? 'i' : ' ');
+    toolinfo << mSettings.userDefines;
+    toolinfo << (mSettings.checkConfiguration ? 'c' : ' '); // --check-config
+    toolinfo << (mSettings.force ? 'f' : ' ');
+    toolinfo << mSettings.maxConfigsOption;
+    toolinfo << std::to_string(static_cast<std::uint8_t>(mSettings.checkLevel));
+    for (const auto &a : mSettings.addonInfos) {
+        toolinfo << a.name;
+        toolinfo << a.args;
+    }
+    toolinfo << mSettings.premiumArgs;
+    // TODO: do we need to add more options?
+    mSuppressions.nomsg.dump(toolinfo, filePath);
+    return preprocessor.calculateHash(toolinfo.str());
+}
 
-    return {filename, files, outputList};
+unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const std::string &cfgname, const char* data, std::size_t size)
+{
+    const auto f = [&file, data, size, this](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
+        simplecpp::DUI dui;
+        dui.std = mSettings.standards.getStdForLanguage(file.lang());
+        return simplecpp::TokenList{{data, size}, files, file.spath(), dui, outputList};
+    };
+    return checkInternal(file, cfgname, f);
 }
 
-static std::size_t calculateHash(const Preprocessor& preprocessor, const simplecpp::TokenList& tokens, const Settings& settings, const Suppressions& supprs)
+unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string &cfgname)
 {
-    std::ostringstream toolinfo;
-    toolinfo << (settings.cppcheckCfgProductName.empty() ? CPPCHECK_VERSION_STRING : settings.cppcheckCfgProductName);
-    toolinfo << (settings.severity.isEnabled(Severity::warning) ? 'w' : ' ');
-    toolinfo << (settings.severity.isEnabled(Severity::style) ? 's' : ' ');
-    toolinfo << (settings.severity.isEnabled(Severity::performance) ? 'p' : ' ');
-    toolinfo << (settings.severity.isEnabled(Severity::portability) ? 'p' : ' ');
-    toolinfo << (settings.severity.isEnabled(Severity::information) ? 'i' : ' ');
-    toolinfo << settings.userDefines;
-    toolinfo << std::to_string(static_cast<std::uint8_t>(settings.checkLevel));
-    // TODO: do we need to add more options?
-    supprs.nomsg.dump(toolinfo);
-    return preprocessor.calculateHash(tokens, toolinfo.str());
+    const auto f = [&file, this](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
+        simplecpp::DUI dui;
+        dui.std = mSettings.standards.getStdForLanguage(file.lang());
+        return simplecpp::TokenList{file.spath(), files, dui, outputList};
+    };
+    return checkInternal(file, cfgname, f);
 }
 
-unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string &cfgname, int fileIndex, std::istream* fileStream)
+void CppCheck::checkPlistOutput(const FileWithDetails& file)
+{
+    if (!mSettings.plistOutput.empty()) {
+        const bool slashFound = file.spath().find('/') != std::string::npos;
+        std::string filename = slashFound ? file.spath().substr(file.spath().rfind('/') + 1) : file.spath();
+        // removes suffix from filename when it exists
+        const std::string noSuffixFilename = filename.substr(0, filename.find('.'));
+
+        // the hash is added to handle when files in different folders have the same name
+        const std::size_t fileNameHash = std::hash<std::string> {}(file.spath());
+        filename = mSettings.plistOutput + noSuffixFilename + "_" + std::to_string(fileNameHash) + ".plist";
+        mLogger->openPlist(filename);
+    }
+}
+
+unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::string &cfgname, const CreateTokenListFn& createTokenList)
 {
     // TODO: move to constructor when CppCheck no longer owns the settings
     if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mUnusedFunctionsCheck)
         mUnusedFunctionsCheck.reset(new CheckUnusedFunctions());
 
+    const int maxConfigs = mSettings.getMaxConfigs();
+
     mLogger->resetExitCode();
 
     if (Settings::terminated())
         return mLogger->exitcode();
 
-    const Timer fileTotalTimer(mSettings.showtime == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL, file.spath());
+    std::unique_ptr<OneShotTimer> checkTimeTimer;
+    if (mSettings.showtime == Settings::ShowTime::FILE || mSettings.showtime == Settings::ShowTime::FILE_TOTAL || mSettings.showtime == Settings::ShowTime::TOP5_FILE)
+        checkTimeTimer.reset(new OneShotTimer("Check time: " + file.spath()));
 
     if (!mSettings.quiet) {
         std::string fixedpath = Path::toNativeSeparators(file.spath());
@@ -912,33 +982,22 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
                 std::size_t hash = 0;
                 // markup files are special and do not adhere to the enforced language
                 TokenList tokenlist{mSettings, Standards::Language::C};
-                if (fileStream) {
-                    std::vector<std::string> files;
-                    simplecpp::TokenList tokens(*fileStream, files, file.spath());
-                    if (analyzerInformation) {
-                        const Preprocessor preprocessor(mSettings, mErrorLogger, Standards::Language::C);
-                        hash = calculateHash(preprocessor, tokens, mSettings, mSuppressions);
-                    }
-                    tokenlist.createTokens(std::move(tokens));
-                }
-                else {
-                    std::vector<std::string> files;
-                    simplecpp::TokenList tokens(file.spath(), files);
-                    if (analyzerInformation) {
-                        const Preprocessor preprocessor(mSettings, mErrorLogger, file.lang());
-                        hash = calculateHash(preprocessor, tokens, mSettings, mSuppressions);
-                    }
-                    tokenlist.createTokens(std::move(tokens));
+                std::vector<std::string> files;
+                simplecpp::TokenList tokens = createTokenList(files, nullptr);
+                if (analyzerInformation) {
+                    const Preprocessor preprocessor(tokens, mSettings, mErrorLogger, file.lang());
+                    hash = calculateHash(preprocessor);
                 }
+                tokenlist.createTokens(std::move(tokens));
                 // this is not a real source file - we just want to tokenize it. treat it as C anyways as the language needs to be determined.
                 Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
-                mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings);
+                mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings.library);
 
                 if (analyzerInformation) {
                     mLogger->setAnalyzerInfo(nullptr);
 
                     std::list<ErrorMessage> errors;
-                    analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors);
+                    analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, file.fsFileId(), hash, errors, mSettings.debugainfo);
                     analyzerInformation->setFileInfo("CheckUnusedFunctions", mUnusedFunctionsCheck->analyzerInfo(tokenizer));
                     analyzerInformation->close();
                 }
@@ -948,60 +1007,63 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
 
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
-        simplecpp::TokenList tokens1 = createTokenList(file.spath(), files, &outputList, fileStream);
-
-        // If there is a syntax error, report it and stop
-        const auto output_it = std::find_if(outputList.cbegin(), outputList.cend(), [](const simplecpp::Output &output){
-            return Preprocessor::hasErrors(output);
-        });
-        if (output_it != outputList.cend()) {
-            const simplecpp::Output &output = *output_it;
-            std::string locfile = Path::fromNativeSeparators(output.location.file());
-            if (mSettings.relativePaths)
-                locfile = Path::getRelativePath(locfile, mSettings.basePaths);
-
-            ErrorMessage::FileLocation loc1(locfile, output.location.line, output.location.col);
-
-            ErrorMessage errmsg({std::move(loc1)},
-                                "", // TODO: is this correct?
-                                Severity::error,
-                                output.msg,
-                                "syntaxError",
-                                Certainty::normal);
-            mErrorLogger.reportErr(errmsg);
-            return mLogger->exitcode();
-        }
+        simplecpp::TokenList tokens1 = createTokenList(files, &outputList);
 
-        Preprocessor preprocessor(mSettings, mErrorLogger, file.lang());
+        Preprocessor preprocessor(tokens1, mSettings, mErrorLogger, file.lang());
 
-        if (!preprocessor.loadFiles(tokens1, files))
+        if (preprocessor.reportOutput(outputList, true))
             return mLogger->exitcode();
 
-        if (!mSettings.plistOutput.empty()) {
-            std::string filename2;
-            if (file.spath().find('/') != std::string::npos)
-                filename2 = file.spath().substr(file.spath().rfind('/') + 1);
-            else
-                filename2 = file.spath();
-            const std::size_t fileNameHash = std::hash<std::string> {}(file.spath());
-            filename2 = mSettings.plistOutput + filename2.substr(0, filename2.find('.')) + "_" + std::to_string(fileNameHash) + ".plist";
-            mLogger->openPlist(filename2, files);
-        }
+        checkPlistOutput(file);
 
-        std::string dumpProlog;
+        std::string dumpFooter;
         if (mSettings.dump || !mSettings.addons.empty()) {
-            dumpProlog += getDumpFileContentsRawTokens(files, tokens1);
+            dumpFooter += getDumpFileContentsRawTokensFooter(tokens1);
         }
 
         // Parse comments and then remove them
-        mLogger->setRemarkComments(preprocessor.getRemarkComments(tokens1));
-        preprocessor.inlineSuppressions(tokens1, mSuppressions.nomsg);
-        if (mSettings.dump || !mSettings.addons.empty()) {
-            std::ostringstream oss;
-            mSuppressions.nomsg.dump(oss);
-            dumpProlog += oss.str();
-        }
-        preprocessor.removeComments(tokens1);
+        mLogger->addRemarkComments(preprocessor.getRemarkComments());
+        preprocessor.inlineSuppressions(mSuppressions.nomsg);
+        preprocessor.removeComments();
+
+        // Get directives
+        std::list<Directive> directives;
+        preprocessor.createDirectives(directives);
+        preprocessor.simplifyPragmaAsm();
+
+        std::set<std::string> configurations;
+        std::set<std::string> configDefines = { "__cplusplus" };
+
+        // Insert library defines
+        const auto getDefineName = [](const std::string &defineString) {
+            return defineString.substr(0, defineString.find_first_of("( "));
+        };
+        std::transform(mSettings.library.defines().begin(),
+                       mSettings.library.defines().end(),
+                       std::inserter(configDefines, configDefines.end()),
+                       getDefineName);
+
+        // Keep track of all included files when using build dir
+        std::set<std::string> includedFiles;
+
+        preprocessor.setLoadCallback([&](simplecpp::FileData &data, bool loaded) {
+            if (analyzerInformation) {
+                includedFiles.insert(data.filename);
+            }
+            if (loaded) {
+                // Do preprocessing on included file
+                mLogger->addRemarkComments(preprocessor.getRemarkComments(data.tokens));
+                preprocessor.inlineSuppressions(data.tokens, mSuppressions.nomsg);
+                Preprocessor::removeComments(data.tokens);
+                Preprocessor::createDirectives(data.tokens, directives);
+                Preprocessor::simplifyPragmaAsm(data.tokens);
+                // Discover new configurations from included file
+                if (configurations.size() < maxConfigs)
+                    preprocessor.getConfigs(data.filename, data.tokens, configDefines, configurations);
+            }
+        });
+
+        preprocessor.setPlatformInfo();
 
         if (!mSettings.buildDir.empty()) {
             analyzerInformation.reset(new AnalyzerInformation);
@@ -1009,10 +1071,13 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
         }
 
         if (analyzerInformation) {
+            // Load all included files to get correct hashes and suppressions
+            for (const std::string &filename : analyzerInformation->getIncludes(mSettings.buildDir, file.spath(), cfgname, file.fsFileId()))
+                preprocessor.loadFile(files, filename);
             // Calculate hash so it can be compared with old hash / future hashes
-            const std::size_t hash = calculateHash(preprocessor, tokens1, mSettings, mSuppressions);
+            const std::size_t hash = calculateHash(preprocessor, file.spath());
             std::list<ErrorMessage> errors;
-            if (!analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors)) {
+            if (!analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, file.fsFileId(), hash, errors, mSettings.debugainfo)) {
                 while (!errors.empty()) {
                     mErrorLogger.reportErr(errors.front());
                     errors.pop_front();
@@ -1020,27 +1085,28 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
                 mLogger->setAnalyzerInfo(nullptr);
                 return mLogger->exitcode();  // known results => no need to reanalyze file
             }
+            // Clear included file list; we don't want to keep includes that have been removed from the source
+            // Any includes that are still present will be readded
+            includedFiles.clear();
         }
 
-        // Get directives
-        std::list<Directive> directives = preprocessor.createDirectives(tokens1);
-        preprocessor.simplifyPragmaAsm(tokens1);
-
-        Preprocessor::setPlatformInfo(tokens1, mSettings);
-
         // Get configurations..
-        std::set<std::string> configurations;
-        if ((mSettings.checkAllConfigurations && mSettings.userDefines.empty()) || mSettings.force) {
-            Timer::run("Preprocessor::getConfigs", mSettings.showtime, &s_timerResults, [&]() {
-                configurations = preprocessor.getConfigs(tokens1);
+        if (maxConfigs > 1) {
+            Timer::run("Preprocessor::getConfigs", mTimerResults, [&]() {
+                configurations = { "" };
+                preprocessor.getConfigs(configDefines, configurations);
+                preprocessor.loadAllIncludes(files);
             });
         } else {
-            configurations.insert(mSettings.userDefines);
+            configurations = { mSettings.userDefines };
         }
 
         if (mSettings.checkConfiguration) {
             for (const std::string &config : configurations)
-                (void)preprocessor.getcode(tokens1, config, files, true);
+                (void)preprocessor.getcode(config, files, false);
+
+            if (configurations.size() > maxConfigs)
+                tooManyConfigsError(Path::toNativeSeparators(file.spath()), configurations.size());
 
             if (analyzerInformation)
                 mLogger->setAnalyzerInfo(nullptr);
@@ -1056,29 +1122,19 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
                     code += "#line " + std::to_string(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';
             }
             TokenList tokenlist(mSettings, file.lang());
-            std::istringstream istr2(code);
-            tokenlist.createTokens(istr2); // TODO: check result?
+            tokenlist.createTokensFromBuffer(code.data(), code.size()); // TODO: check result?
             executeRules("define", tokenlist);
         }
 #endif
 
-        if (!mSettings.force && configurations.size() > mSettings.maxConfigs) {
-            if (mSettings.severity.isEnabled(Severity::information)) {
-                tooManyConfigsError(Path::toNativeSeparators(file.spath()),configurations.size());
-            } else {
-                mTooManyConfigs = true;
-            }
-        }
-
         FilesDeleter filesDeleter;
 
         // write dump file xml prolog
         std::ofstream fdump;
         std::string dumpFile;
-        createDumpFile(mSettings, file, fileIndex, fdump, dumpFile);
+        createDumpFile(mSettings, file, fdump, dumpFile);
         if (fdump.is_open()) {
             fdump << getLibraryDumpData();
-            fdump << dumpProlog;
             if (!mSettings.dump)
                 filesDeleter.addFile(dumpFile);
         }
@@ -1094,8 +1150,17 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
 
             // Check only a few configurations (default 12), after that bail out, unless --force
             // was used.
-            if (!mSettings.force && ++checkCount > mSettings.maxConfigs)
+            if (!mSettings.force && ++checkCount > maxConfigs) {
+                // If maxConfigs is not assigned then report information message that configurations are skipped.
+                // If maxConfigs is assigned then the user is explicitly skipping configurations so
+                // the information message is not reported, the whole purpose of setting i.e. --max-configs=1 is to
+                // skip configurations. When --check-config is used then tooManyConfigs will be reported even if the
+                // value is non-default.
+                if (!mSettings.isMaxConfigsAssigned() && mSettings.severity.isEnabled(Severity::information))
+                    tooManyConfigsError(Path::toNativeSeparators(file.spath()), configurations.size());
+
                 break;
+            }
 
             std::string currentConfig;
 
@@ -1113,139 +1178,117 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
 
             if (mSettings.preprocessOnly) {
                 std::string codeWithoutCfg;
-                Timer::run("Preprocessor::getcode", mSettings.showtime, &s_timerResults, [&]() {
-                    codeWithoutCfg = preprocessor.getcode(tokens1, currentConfig, files, true);
+                Timer::run("Preprocessor::getcode", mTimerResults, [&]() {
+                    codeWithoutCfg = preprocessor.getcode(currentConfig, files, true);
                 });
 
-                if (startsWith(codeWithoutCfg,"#file"))
-                    codeWithoutCfg.insert(0U, "//");
                 std::string::size_type pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#file",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#endfile",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
                 while ((pos = codeWithoutCfg.find(Preprocessor::macroChar,pos)) != std::string::npos)
                     codeWithoutCfg[pos] = ' ';
                 mErrorLogger.reportOut(codeWithoutCfg, Color::Reset);
                 continue;
             }
 
-            try {
-                TokenList tokenlist{mSettings, file.lang()};
+            TokenList tokenlist{mSettings, file.lang()};
 
+            {
+                bool skipCfg = false;
                 // Create tokens, skip rest of iteration if failed
-                Timer::run("Tokenizer::createTokens", mSettings.showtime, &s_timerResults, [&]() {
-                    simplecpp::TokenList tokensP = preprocessor.preprocess(tokens1, currentConfig, files, true);
-                    tokenlist.createTokens(std::move(tokensP));
+                Timer::run("Tokenizer::createTokens", mTimerResults, [&]() {
+                    simplecpp::OutputList outputList_cfg;
+                    simplecpp::TokenList tokensP = preprocessor.preprocess(currentConfig, files, outputList_cfg);
+                    const simplecpp::Output* o = preprocessor.handleErrors(outputList_cfg);
+                    if (!o) {
+                        tokenlist.createTokens(std::move(tokensP));
+                    }
+                    else {
+                        // #error etc during preprocessing
+                        configurationError.push_back((currentConfig.empty() ? "\'\'" : currentConfig) + " : [" + tokensP.file(o->location) + ':' + std::to_string(o->location.line) + "] " + o->msg);
+                        --checkCount; // don't count invalid configurations
+
+                        if (!hasValidConfig && currCfg == *configurations.rbegin()) {
+                            // If there is no valid configuration then report error..
+                            preprocessor.error(o->location, o->msg, o->type);
+                        }
+                        skipCfg = true;
+                    }
                 });
-                hasValidConfig = true;
+                if (skipCfg)
+                    continue;
+            }
+            hasValidConfig = true;
 
-                Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
-                try {
-                    if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_NONE)
-                        tokenizer.setTimerResults(&s_timerResults);
-                    tokenizer.setDirectives(directives); // TODO: how to avoid repeated copies?
-
-                    // locations macros
-                    mLogger->setLocationMacros(tokenizer.tokens(), files);
-
-                    // If only errors are printed, print filename after the check
-                    if (!mSettings.quiet && (!currentConfig.empty() || checkCount > 1)) {
-                        std::string fixedpath = Path::toNativeSeparators(file.spath());
-                        mErrorLogger.reportOut("Checking " + fixedpath + ": " + currentConfig + "...", Color::FgGreen);
-                    }
+            Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
+            try {
+                tokenizer.setTimerResults(mTimerResults);
+                tokenizer.setDirectives(directives); // TODO: how to avoid repeated copies?
 
-                    if (!tokenizer.tokens())
-                        continue;
+                // locations macros
+                mLogger->setLocationMacros(tokenizer.tokens(), files);
 
-                    // skip rest of iteration if just checking configuration
-                    if (mSettings.checkConfiguration)
-                        continue;
+                // If only errors are printed, print filename after the check
+                if (!mSettings.quiet && (!currentConfig.empty() || checkCount > 1)) {
+                    std::string fixedpath = Path::toNativeSeparators(file.spath());
+                    mErrorLogger.reportOut("Checking " + fixedpath + ": " + currentConfig + "...", Color::FgGreen);
+                }
+
+                if (!tokenizer.tokens())
+                    continue;
+
+                // skip rest of iteration if just checking configuration
+                if (mSettings.checkConfiguration)
+                    continue;
 
 #ifdef HAVE_RULES
-                    // Execute rules for "raw" code
-                    executeRules("raw", tokenizer.list);
+                // Execute rules for "raw" code
+                executeRules("raw", tokenizer.list);
 #endif
 
-                    // Simplify tokens into normal form, skip rest of iteration if failed
-                    if (!tokenizer.simplifyTokens1(currentConfig, fileIndex))
-                        continue;
+                // Simplify tokens into normal form, skip rest of iteration if failed
+                if (!tokenizer.simplifyTokens1(currentConfig, file.fsFileId()))
+                    continue;
 
-                    // dump xml if --dump
-                    if ((mSettings.dump || !mSettings.addons.empty()) && fdump.is_open()) {
-                        fdump << "<dump cfg=\"" << ErrorLogger::toxml(currentConfig) << "\">" << std::endl;
-                        fdump << "  <standards>" << std::endl;
-                        fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
-                        fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
-                        fdump << "  </standards>" << std::endl;
-                        fdump << getLibraryDumpData();
-                        preprocessor.dump(fdump);
-                        tokenizer.dump(fdump);
-                        fdump << "</dump>" << std::endl;
-                    }
+                // dump xml if --dump
+                if ((mSettings.dump || !mSettings.addons.empty()) && fdump.is_open()) {
+                    fdump << "<dump cfg=\"" << ErrorLogger::toxml(currentConfig) << "\">" << std::endl;
+                    fdump << "  <standards>" << std::endl;
+                    fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
+                    fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
+                    fdump << "  </standards>" << std::endl;
+                    fdump << getLibraryDumpData();
+                    preprocessor.dump(fdump);
+                    tokenizer.dump(fdump);
+                    fdump << "</dump>" << std::endl;
+                }
 
-                    if (mSettings.inlineSuppressions) {
-                        // Need to call this even if the hash will skip this configuration
-                        mSuppressions.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer);
-                    }
+                if (mSettings.inlineSuppressions) {
+                    // Need to call this even if the hash will skip this configuration
+                    mSuppressions.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer.list);
+                }
 
-                    // Skip if we already met the same simplified token list
-                    if (mSettings.force || mSettings.maxConfigs > 1) {
-                        const std::size_t hash = tokenizer.list.calculateHash();
-                        if (hashes.find(hash) != hashes.end()) {
-                            if (mSettings.debugwarnings)
-                                purgedConfigurationMessage(file.spath(), currentConfig);
-                            continue;
-                        }
-                        hashes.insert(hash);
+                // Skip if we already met the same simplified token list
+                if (maxConfigs > 1) {
+                    const std::size_t hash = tokenizer.list.calculateHash();
+                    if (hashes.find(hash) != hashes.end()) {
+                        if (mSettings.debugwarnings)
+                            purgedConfigurationMessage(file.spath(), currentConfig);
+                        continue;
                     }
-
-                    // Check normal tokens
-                    checkNormalTokens(tokenizer, analyzerInformation.get());
-                } catch (const InternalError &e) {
-                    ErrorMessage errmsg = ErrorMessage::fromInternalError(e, &tokenizer.list, file.spath());
-                    mErrorLogger.reportErr(errmsg);
+                    hashes.insert(hash);
                 }
-            } catch (const simplecpp::Output &o) {
-                // #error etc during preprocessing
-                configurationError.push_back((currentConfig.empty() ? "\'\'" : currentConfig) + " : [" + o.location.file() + ':' + std::to_string(o.location.line) + "] " + o.msg);
-                --checkCount; // don't count invalid configurations
-
-                if (!hasValidConfig && currCfg == *configurations.rbegin()) {
-                    // If there is no valid configuration then report error..
-                    std::string locfile = Path::fromNativeSeparators(o.location.file());
-                    if (mSettings.relativePaths)
-                        locfile = Path::getRelativePath(locfile, mSettings.basePaths);
-
-                    ErrorMessage::FileLocation loc1(locfile, o.location.line, o.location.col);
-
-                    ErrorMessage errmsg({std::move(loc1)},
-                                        file.spath(),
-                                        Severity::error,
-                                        o.msg,
-                                        "preprocessorErrorDirective",
-                                        Certainty::normal);
-                    mErrorLogger.reportErr(errmsg);
-                }
-                continue;
 
-            } catch (const TerminateException &) {
-                // Analysis is terminated
-                if (analyzerInformation)
-                    mLogger->setAnalyzerInfo(nullptr);
-                return mLogger->exitcode();
+                // Check normal tokens
+                checkNormalTokens(tokenizer, analyzerInformation.get(), currentConfig);
             } catch (const InternalError &e) {
-                ErrorMessage errmsg = ErrorMessage::fromInternalError(e, nullptr, file.spath());
+                ErrorMessage errmsg = ErrorMessage::fromInternalError(e, &tokenizer.list, file.spath());
                 mErrorLogger.reportErr(errmsg);
             }
         }
 
         if (!hasValidConfig && configurations.size() > 1 && mSettings.severity.isEnabled(Severity::information)) {
             std::string msg;
-            msg = "This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details.";
-            msg += "\nThis file is not analyzed. Cppcheck failed to extract a valid configuration. The tested configurations have these preprocessor errors:";
+            msg = "This file is not analyzed. No working configuration could be extracted. Use -v for more details.";
+            msg += "\nThis file is not analyzed. No working configuration could be extracted. The tested configurations have these preprocessor errors:";
             for (const std::string &s : configurationError)
                 msg += '\n' + s;
 
@@ -1261,12 +1304,25 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
         }
 
         // TODO: will not be closed if we encountered an exception
-        // dumped all configs, close root </dumps> element now
         if (fdump.is_open()) {
+            // dump all filenames, raw tokens, suppressions
+            std::string dumpHeader = getDumpFileContentsRawTokensHeader(files);
+            fdump << getDumpFileContentsRawTokens(dumpHeader, dumpFooter);
+            mSuppressions.nomsg.dump(fdump);
+            // dumped all configs, close root </dumps> element now
             fdump << "</dumps>" << std::endl;
             fdump.close();
         }
 
+        if (!mSettings.plistOutput.empty()) {
+            mLogger->setPlistFilenames(std::move(files));
+        }
+
+        if (analyzerInformation) {
+            analyzerInformation->writeIncludes(includedFiles);
+            analyzerInformation->writeHash(calculateHash(preprocessor, file.spath()));
+        }
+
         executeAddons(dumpFile, file);
     } catch (const TerminateException &) {
         // Analysis is terminated
@@ -1282,16 +1338,6 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
         mErrorLogger.reportErr(errmsg);
     }
 
-    // TODO: this is done too early causing the whole program analysis suppressions to be reported as unmatched
-    if (mSettings.severity.isEnabled(Severity::information) || mSettings.checkConfiguration) {
-        // In jointSuppressionReport mode, unmatched suppressions are
-        // collected after all files are processed
-        if (!mSettings.useSingleJob()) {
-            // TODO: check result?
-            SuppressionList::reportUnmatchedSuppressions(mSuppressions.nomsg.getUnmatchedLocalSuppressions(file, static_cast<bool>(mUnusedFunctionsCheck)), mErrorLogger);
-        }
-    }
-
     if (analyzerInformation) {
         mLogger->setAnalyzerInfo(nullptr);
         analyzerInformation.reset();
@@ -1300,8 +1346,12 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
     // TODO: clear earlier?
     mLogger->clear();
 
-    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_FILE || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE)
-        printTimerResults(mSettings.showtime);
+    if (mTimerResults) {
+        if (mSettings.showtime == Settings::ShowTime::FILE)
+            mTimerResults->showResults();
+        else if (mSettings.showtime == Settings::ShowTime::TOP5_FILE)
+            mTimerResults->showResults(5);
+    }
 
     return mLogger->exitcode();
 }
@@ -1327,21 +1377,21 @@ void CppCheck::internalError(const std::string &filename, const std::string &msg
 // CppCheck - A function that checks a normal token list
 //---------------------------------------------------------------------------
 
-void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation)
+void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation, const std::string& currentConfig)
 {
+    const ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, tokenizer.list.getSourceFilePath(), "Run checkers");
+
     CheckUnusedFunctions unusedFunctionsChecker;
 
     // TODO: this should actually be the behavior if only "--enable=unusedFunction" is specified - see #10648
     // TODO: log message when this is active?
-    const char* unusedFunctionOnly = std::getenv("UNUSEDFUNCTION_ONLY");
-    const bool doUnusedFunctionOnly = unusedFunctionOnly && (std::strcmp(unusedFunctionOnly, "1") == 0);
+    const bool doUnusedFunctionOnly = Settings::unusedFunctionOnly();
 
     if (!doUnusedFunctionOnly) {
         const std::time_t maxTime = mSettings.checksMaxTime > 0 ? std::time(nullptr) + mSettings.checksMaxTime : 0;
 
         // call all "runChecks" in all registered Check classes
-        // cppcheck-suppress shadowFunction - TODO: fix this
-        for (Check *check : Check::instances()) {
+        for (Check * const c : CheckInstances::get()) {
             if (Settings::terminated())
                 return;
 
@@ -1359,17 +1409,17 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
                 return;
             }
 
-            Timer::run(check->name() + "::runChecks", mSettings.showtime, &s_timerResults, [&]() {
-                check->runChecks(tokenizer, &mErrorLogger);
+            Timer::run(c->name() + "::runChecks", mTimerResults, [&]() {
+                c->runChecks(tokenizer, mErrorLogger);
             });
         }
     }
 
     if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mSettings.buildDir.empty()) {
-        unusedFunctionsChecker.parseTokens(tokenizer, mSettings);
+        unusedFunctionsChecker.parseTokens(tokenizer, mSettings.library);
     }
     if (mUnusedFunctionsCheck && mSettings.useSingleJob() && mSettings.buildDir.empty()) {
-        mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings);
+        mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings.library);
     }
 
     if (mSettings.clang) {
@@ -1380,7 +1430,7 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
     if (mSettings.useSingleJob() || analyzerInformation) {
         // Analyse the tokens..
         {
-            CTU::FileInfo * const fi1 = CTU::getFileInfo(tokenizer);
+            const CTU::FileInfo * const fi1 = CTU::getFileInfo(tokenizer);
             if (analyzerInformation)
                 analyzerInformation->setFileInfo("ctu", fi1->toString());
             if (mSettings.useSingleJob())
@@ -1390,11 +1440,10 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
         }
 
         if (!doUnusedFunctionOnly) {
-            // cppcheck-suppress shadowFunction - TODO: fix this
-            for (const Check *check : Check::instances()) {
-                if (Check::FileInfo * const fi = check->getFileInfo(tokenizer, mSettings)) {
+            for (const Check * const c : CheckInstances::get()) {
+                if (const Check::FileInfo * const fi = c->getFileInfo(tokenizer, mSettings, currentConfig)) {
                     if (analyzerInformation)
-                        analyzerInformation->setFileInfo(check->name(), fi->toString());
+                        analyzerInformation->setFileInfo(c->name(), fi->toString());
                     if (mSettings.useSingleJob())
                         mFileInfo.push_back(fi);
                     else
@@ -1418,140 +1467,11 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation
 #ifdef HAVE_RULES
 bool CppCheck::hasRule(const std::string &tokenlist) const
 {
-    return std::any_of(mSettings.rules.cbegin(), mSettings.rules.cend(), [&](const Settings::Rule& rule) {
+    return std::any_of(mSettings.rules.cbegin(), mSettings.rules.cend(), [&](const Rule& rule) {
         return rule.tokenlist == tokenlist;
     });
 }
 
-static const char * pcreErrorCodeToString(const int pcreExecRet)
-{
-    switch (pcreExecRet) {
-    case PCRE_ERROR_NULL:
-        return "Either code or subject was passed as NULL, or ovector was NULL "
-               "and ovecsize was not zero (PCRE_ERROR_NULL)";
-    case PCRE_ERROR_BADOPTION:
-        return "An unrecognized bit was set in the options argument (PCRE_ERROR_BADOPTION)";
-    case PCRE_ERROR_BADMAGIC:
-        return "PCRE stores a 4-byte \"magic number\" at the start of the compiled code, "
-               "to catch the case when it is passed a junk pointer and to detect when a "
-               "pattern that was compiled in an environment of one endianness is run in "
-               "an environment with the other endianness. This is the error that PCRE "
-               "gives when the magic number is not present (PCRE_ERROR_BADMAGIC)";
-    case PCRE_ERROR_UNKNOWN_NODE:
-        return "While running the pattern match, an unknown item was encountered in the "
-               "compiled pattern. This error could be caused by a bug in PCRE or by "
-               "overwriting of the compiled pattern (PCRE_ERROR_UNKNOWN_NODE)";
-    case PCRE_ERROR_NOMEMORY:
-        return "If a pattern contains back references, but the ovector that is passed "
-               "to pcre_exec() is not big enough to remember the referenced substrings, "
-               "PCRE gets a block of memory at the start of matching to use for this purpose. "
-               "If the call via pcre_malloc() fails, this error is given. The memory is "
-               "automatically freed at the end of matching. This error is also given if "
-               "pcre_stack_malloc() fails in pcre_exec(). "
-               "This can happen only when PCRE has been compiled with "
-               "--disable-stack-for-recursion (PCRE_ERROR_NOMEMORY)";
-    case PCRE_ERROR_NOSUBSTRING:
-        return "This error is used by the pcre_copy_substring(), pcre_get_substring(), "
-               "and pcre_get_substring_list() functions (see below). "
-               "It is never returned by pcre_exec() (PCRE_ERROR_NOSUBSTRING)";
-    case PCRE_ERROR_MATCHLIMIT:
-        return "The backtracking limit, as specified by the match_limit field in a pcre_extra "
-               "structure (or defaulted) was reached. "
-               "See the description above (PCRE_ERROR_MATCHLIMIT)";
-    case PCRE_ERROR_CALLOUT:
-        return "This error is never generated by pcre_exec() itself. "
-               "It is provided for use by callout functions that want to yield a distinctive "
-               "error code. See the pcrecallout documentation for details (PCRE_ERROR_CALLOUT)";
-    case PCRE_ERROR_BADUTF8:
-        return "A string that contains an invalid UTF-8 byte sequence was passed as a subject, "
-               "and the PCRE_NO_UTF8_CHECK option was not set. If the size of the output vector "
-               "(ovecsize) is at least 2, the byte offset to the start of the the invalid UTF-8 "
-               "character is placed in the first element, and a reason code is placed in the "
-               "second element. The reason codes are listed in the following section. For "
-               "backward compatibility, if PCRE_PARTIAL_HARD is set and the problem is a truncated "
-               "UTF-8 character at the end of the subject (reason codes 1 to 5), "
-               "PCRE_ERROR_SHORTUTF8 is returned instead of PCRE_ERROR_BADUTF8";
-    case PCRE_ERROR_BADUTF8_OFFSET:
-        return "The UTF-8 byte sequence that was passed as a subject was checked and found to "
-               "be valid (the PCRE_NO_UTF8_CHECK option was not set), but the value of "
-               "startoffset did not point to the beginning of a UTF-8 character or the end of "
-               "the subject (PCRE_ERROR_BADUTF8_OFFSET)";
-    case PCRE_ERROR_PARTIAL:
-        return "The subject string did not match, but it did match partially. See the "
-               "pcrepartial documentation for details of partial matching (PCRE_ERROR_PARTIAL)";
-    case PCRE_ERROR_BADPARTIAL:
-        return "This code is no longer in use. It was formerly returned when the PCRE_PARTIAL "
-               "option was used with a compiled pattern containing items that were not supported "
-               "for partial matching. From release 8.00 onwards, there are no restrictions on "
-               "partial matching (PCRE_ERROR_BADPARTIAL)";
-    case PCRE_ERROR_INTERNAL:
-        return "An unexpected internal error has occurred. This error could be caused by a bug "
-               "in PCRE or by overwriting of the compiled pattern (PCRE_ERROR_INTERNAL)";
-    case PCRE_ERROR_BADCOUNT:
-        return "This error is given if the value of the ovecsize argument is negative "
-               "(PCRE_ERROR_BADCOUNT)";
-    case PCRE_ERROR_RECURSIONLIMIT:
-        return "The internal recursion limit, as specified by the match_limit_recursion "
-               "field in a pcre_extra structure (or defaulted) was reached. "
-               "See the description above (PCRE_ERROR_RECURSIONLIMIT)";
-    case PCRE_ERROR_DFA_UITEM:
-        return "PCRE_ERROR_DFA_UITEM";
-    case PCRE_ERROR_DFA_UCOND:
-        return "PCRE_ERROR_DFA_UCOND";
-    case PCRE_ERROR_DFA_WSSIZE:
-        return "PCRE_ERROR_DFA_WSSIZE";
-    case PCRE_ERROR_DFA_RECURSE:
-        return "PCRE_ERROR_DFA_RECURSE";
-    case PCRE_ERROR_NULLWSLIMIT:
-        return "PCRE_ERROR_NULLWSLIMIT";
-    case PCRE_ERROR_BADNEWLINE:
-        return "An invalid combination of PCRE_NEWLINE_xxx options was "
-               "given (PCRE_ERROR_BADNEWLINE)";
-    case PCRE_ERROR_BADOFFSET:
-        return "The value of startoffset was negative or greater than the length "
-               "of the subject, that is, the value in length (PCRE_ERROR_BADOFFSET)";
-    case PCRE_ERROR_SHORTUTF8:
-        return "This error is returned instead of PCRE_ERROR_BADUTF8 when the subject "
-               "string ends with a truncated UTF-8 character and the PCRE_PARTIAL_HARD option is set. "
-               "Information about the failure is returned as for PCRE_ERROR_BADUTF8. "
-               "It is in fact sufficient to detect this case, but this special error code for "
-               "PCRE_PARTIAL_HARD precedes the implementation of returned information; "
-               "it is retained for backwards compatibility (PCRE_ERROR_SHORTUTF8)";
-    case PCRE_ERROR_RECURSELOOP:
-        return "This error is returned when pcre_exec() detects a recursion loop "
-               "within the pattern. Specifically, it means that either the whole pattern "
-               "or a subpattern has been called recursively for the second time at the same "
-               "position in the subject string. Some simple patterns that might do this "
-               "are detected and faulted at compile time, but more complicated cases, "
-               "in particular mutual recursions between two different subpatterns, "
-               "cannot be detected until run time (PCRE_ERROR_RECURSELOOP)";
-    case PCRE_ERROR_JIT_STACKLIMIT:
-        return "This error is returned when a pattern that was successfully studied "
-               "using a JIT compile option is being matched, but the memory available "
-               "for the just-in-time processing stack is not large enough. See the pcrejit "
-               "documentation for more details (PCRE_ERROR_JIT_STACKLIMIT)";
-    case PCRE_ERROR_BADMODE:
-        return "This error is given if a pattern that was compiled by the 8-bit library "
-               "is passed to a 16-bit or 32-bit library function, or vice versa (PCRE_ERROR_BADMODE)";
-    case PCRE_ERROR_BADENDIANNESS:
-        return "This error is given if a pattern that was compiled and saved is reloaded on a "
-               "host with different endianness. The utility function pcre_pattern_to_host_byte_order() "
-               "can be used to convert such a pattern so that it runs on the new host (PCRE_ERROR_BADENDIANNESS)";
-    case PCRE_ERROR_DFA_BADRESTART:
-        return "PCRE_ERROR_DFA_BADRESTART";
-#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
-    case PCRE_ERROR_BADLENGTH:
-        return "This error is given if pcre_exec() is called with a negative value for the length argument (PCRE_ERROR_BADLENGTH)";
-    case PCRE_ERROR_JIT_BADOPTION:
-        return "This error is returned when a pattern that was successfully studied using a JIT compile "
-               "option is being matched, but the matching mode (partial or complete match) does not correspond "
-               "to any JIT compilation mode. When the JIT fast path function is used, this error may be "
-               "also given for invalid options. See the pcrejit documentation for more details (PCRE_ERROR_JIT_BADOPTION)";
-#endif
-    }
-    return "";
-}
-
 void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
 {
     // There is no rule to execute
@@ -1565,7 +1485,7 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
         str += tok->str();
     }
 
-    for (const Settings::Rule &rule : mSettings.rules) {
+    for (const Rule &rule : mSettings.rules) {
         if (rule.tokenlist != tokenlist)
             continue;
 
@@ -1573,73 +1493,7 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
             mErrorLogger.reportOut("Processing rule: " + rule.pattern, Color::FgGreen);
         }
 
-        const char *pcreCompileErrorStr = nullptr;
-        int erroffset = 0;
-        pcre * const re = pcre_compile(rule.pattern.c_str(),0,&pcreCompileErrorStr,&erroffset,nullptr);
-        if (!re) {
-            if (pcreCompileErrorStr) {
-                const std::string msg = "pcre_compile failed: " + std::string(pcreCompileErrorStr);
-                const ErrorMessage errmsg(std::list<ErrorMessage::FileLocation>(),
-                                          "",
-                                          Severity::error,
-                                          msg,
-                                          "pcre_compile",
-                                          Certainty::normal);
-
-                mErrorLogger.reportErr(errmsg);
-            }
-            continue;
-        }
-
-        // Optimize the regex, but only if PCRE_CONFIG_JIT is available
-#ifdef PCRE_CONFIG_JIT
-        const char *pcreStudyErrorStr = nullptr;
-        pcre_extra * const pcreExtra = pcre_study(re, PCRE_STUDY_JIT_COMPILE, &pcreStudyErrorStr);
-        // pcre_study() returns NULL for both errors and when it can not optimize the regex.
-        // The last argument is how one checks for errors.
-        // It is NULL if everything works, and points to an error string otherwise.
-        if (pcreStudyErrorStr) {
-            const std::string msg = "pcre_study failed: " + std::string(pcreStudyErrorStr);
-            const ErrorMessage errmsg(std::list<ErrorMessage::FileLocation>(),
-                                      "",
-                                      Severity::error,
-                                      msg,
-                                      "pcre_study",
-                                      Certainty::normal);
-
-            mErrorLogger.reportErr(errmsg);
-            // pcre_compile() worked, but pcre_study() returned an error. Free the resources allocated by pcre_compile().
-            pcre_free(re);
-            continue;
-        }
-#else
-        const pcre_extra * const pcreExtra = nullptr;
-#endif
-
-        int pos = 0;
-        int ovector[30]= {0};
-        while (pos < static_cast<int>(str.size())) {
-            const int pcreExecRet = pcre_exec(re, pcreExtra, str.c_str(), static_cast<int>(str.size()), pos, 0, ovector, 30);
-            if (pcreExecRet < 0) {
-                const std::string errorMessage = pcreErrorCodeToString(pcreExecRet);
-                if (!errorMessage.empty()) {
-                    const ErrorMessage errmsg(std::list<ErrorMessage::FileLocation>(),
-                                              "",
-                                              Severity::error,
-                                              std::string("pcre_exec failed: ") + errorMessage,
-                                              "pcre_exec",
-                                              Certainty::normal);
-
-                    mErrorLogger.reportErr(errmsg);
-                }
-                break;
-            }
-            const auto pos1 = static_cast<unsigned int>(ovector[0]);
-            const auto pos2 = static_cast<unsigned int>(ovector[1]);
-
-            // jump to the end of the match for the next pcre_exec
-            pos = static_cast<int>(pos2);
-
+        auto f = [&](int pos1, int pos2) {
             // determine location..
             int fileIndex = 0;
             int line = 0;
@@ -1668,15 +1522,19 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
 
             // Report error
             mErrorLogger.reportErr(errmsg);
-        }
+        };
+
+        const std::string err = rule.regex->match(str, f);
+        if (!err.empty()) {
+            const ErrorMessage errmsg(std::list<ErrorMessage::FileLocation>(),
+                                      "",
+                                      Severity::error,
+                                      err,
+                                      "pcre_exec",
+                                      Certainty::normal);
 
-        pcre_free(re);
-#ifdef PCRE_CONFIG_JIT
-        // Free up the EXTRA PCRE value (may be NULL at this point)
-        if (pcreExtra) {
-            pcre_free_study(pcreExtra);
+            mErrorLogger.reportErr(errmsg);
         }
-#endif
     }
 }
 #endif
@@ -1685,13 +1543,15 @@ void CppCheck::executeAddons(const std::string& dumpFile, const FileWithDetails&
 {
     if (!dumpFile.empty()) {
         std::vector<std::string> f{dumpFile};
-        executeAddons(f, file.spath());
+        Timer::run("CppCheck::executeAddons", mTimerResults, [&]() {
+            executeAddons(f, file.spath());
+        });
     }
 }
 
 void CppCheck::executeAddons(const std::vector<std::string>& files, const std::string& file0)
 {
-    if (mSettings.addons.empty() || files.empty())
+    if (mSettings.addons.empty() || files.empty() || Settings::unusedFunctionOnly())
         return;
 
     const bool isCtuInfo = endsWith(files[0], ".ctu-info");
@@ -1717,6 +1577,8 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
         if (isCtuInfo && addonInfo.name != "misra" && !addonInfo.ctu)
             continue;
 
+        ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, files.front(), "addon:" + addonInfo.name + (isCtuInfo ? " (ctu)" : ""));
+
         std::vector<picojson::value> results;
 
         try {
@@ -1727,8 +1589,6 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
             mErrorLogger.reportErr(errmsg);
         }
 
-        const bool misraC2023 = mSettings.premiumArgs.find("--misra-c-2023") != std::string::npos;
-
         for (const picojson::value& res : results) {
             // TODO: get rid of copy?
             // this is a copy so we can access missing fields and get a default value
@@ -1764,10 +1624,27 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
                 }
             }
 
+            if (obj.count("metric") > 0) {
+                picojson::object metric_json = obj["metric"].get<picojson::object>();
+
+                std::string metric = "<metric";
+
+                for (auto pair : metric_json) {
+                    const std::string id = pair.first;
+                    if (pair.second.is<std::int64_t>())
+                        metric += " " + id + "=\"" + std::to_string(pair.second.get<std::int64_t>()) + "\"";
+                    else if (pair.second.is<std::string>())
+                        metric += " " + id + "=\"" + ErrorLogger::toxml(pair.second.get<std::string>()) + "\"";
+                }
+
+                metric += "/>";
+                mErrorLogger.reportMetric(metric);
+
+                continue;
+            }
+
             errmsg.id = obj["addon"].get<std::string>() + "-" + obj["errorId"].get<std::string>();
-            if (misraC2023 && startsWith(errmsg.id, "misra-c2012-"))
-                errmsg.id = "misra-c2023-" + errmsg.id.substr(12);
-            errmsg.setmsg(mSettings.getMisraRuleText(errmsg.id, obj["message"].get<std::string>()));
+            errmsg.setmsg(obj["message"].get<std::string>());
             const std::string severity = obj["severity"].get<std::string>();
             errmsg.severity = severityFromString(severity);
             if (errmsg.severity == Severity::none || errmsg.severity == Severity::internal) {
@@ -1783,6 +1660,12 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
             }
             errmsg.file0 = file0;
 
+            if (obj.count("cwe")>0)
+                errmsg.cwe = CWE(obj["cwe"].get<std::int64_t>());
+
+            if (obj.count("hash")>0)
+                errmsg.hash = obj["hash"].get<std::int64_t>();
+
             mErrorLogger.reportErr(errmsg);
         }
     }
@@ -1812,12 +1695,12 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files
 
     std::vector<std::string> ctuInfoFiles;
     for (const auto &f: files) {
-        const std::string &dumpFileName = getDumpFileName(mSettings, f.path(), 0);
+        const std::string &dumpFileName = getDumpFileName(mSettings, f);
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
-    for (const auto &f: fileSettings) {
-        const std::string &dumpFileName = getDumpFileName(mSettings, f.filename(), f.fileIndex);
+    for (const auto &fs: fileSettings) {
+        const std::string &dumpFileName = getDumpFileName(mSettings, fs.file);
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
@@ -1826,32 +1709,14 @@ void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files
 
 void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfConfigurations)
 {
-    if (!mSettings.severity.isEnabled(Severity::information) && !mTooManyConfigs)
-        return;
-
-    mTooManyConfigs = false;
-
-    if (mSettings.severity.isEnabled(Severity::information) && file.empty())
-        return;
-
     std::list<ErrorMessage::FileLocation> loclist;
     if (!file.empty()) {
         loclist.emplace_back(file, 0, 0);
     }
 
     std::ostringstream msg;
-    msg << "Too many #ifdef configurations - cppcheck only checks " << mSettings.maxConfigs;
-    if (numberOfConfigurations > mSettings.maxConfigs)
-        msg << " of " << numberOfConfigurations << " configurations. Use --force to check all configurations.\n";
-    if (file.empty())
-        msg << " configurations. Use --force to check all configurations. For more details, use --enable=information.\n";
-    msg << "The checking of the file will be interrupted because there are too many "
-        "#ifdef configurations. Checking of all #ifdef configurations can be forced "
-        "by --force command line option or from GUI preferences. However that may "
-        "increase the checking time.";
-    if (file.empty())
-        msg << " For more details, use --enable=information.";
-
+    msg << "Too many #ifdef configurations - cppcheck only checks " << mSettings.getMaxConfigs()
+        << " of " << numberOfConfigurations << " configurations. Use --force to check all configurations.";
 
     ErrorMessage errmsg(std::move(loclist),
                         "",
@@ -1865,8 +1730,6 @@ void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfCo
 
 void CppCheck::purgedConfigurationMessage(const std::string &file, const std::string& configuration)
 {
-    mTooManyConfigs = false;
-
     if (mSettings.severity.isEnabled(Severity::information) && file.empty())
         return;
 
@@ -1893,9 +1756,8 @@ void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
     settings.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: get rid of this
     Suppressions supprs;
 
-    CppCheck cppcheck(settings, supprs, errorlogger, true, nullptr);
+    CppCheck cppcheck(settings, supprs, errorlogger, nullptr, true, nullptr);
     cppcheck.purgedConfigurationMessage("","");
-    cppcheck.mTooManyConfigs = true;
     cppcheck.tooManyConfigsError("",0U);
     // TODO: add functions to get remaining error messages
 
@@ -1903,12 +1765,13 @@ void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
     s.addEnabled("all");
 
     // call all "getErrorMessages" in all registered Check classes
-    for (auto it = Check::instances().cbegin(); it != Check::instances().cend(); ++it)
-        (*it)->getErrorMessages(&errorlogger, &s);
+    for (const Check * const c : CheckInstances::get())
+        c->getErrorMessages(errorlogger, s);
 
     CheckUnusedFunctions::getErrorMessages(errorlogger);
     Preprocessor::getErrorMessages(errorlogger, s);
     Tokenizer::getErrorMessages(errorlogger, s);
+    SymbolDatabase::getErrorMessages(errorlogger);
 }
 
 void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
@@ -1929,6 +1792,11 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
     }
 #endif
 
+    if (!mExecuteCommand) {
+        std::cerr << "Failed to execute '" << exe << "' (no command callback provided)" << std::endl;
+        return;
+    }
+
     // TODO: log this call
     // TODO: get rid of hard-coded checks
     const std::string args = "-quiet -checks=*,-clang-analyzer-*,-llvm* \"" + fileSettings.filename() + "\" -- " + allIncludes + allDefines;
@@ -1944,7 +1812,7 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
     std::string line;
 
     if (!mSettings.buildDir.empty()) {
-        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename(), "", fileSettings.fileIndex);
+        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.sfilename(), "", fileSettings.file.fsFileId());
         std::ofstream fcmd(analyzerInfoFile + ".clang-tidy-cmd");
         fcmd << istr.str();
     }
@@ -2000,108 +1868,81 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
 bool CppCheck::analyseWholeProgram()
 {
     bool errors = false;
-    // Analyse the tokens
-    CTU::FileInfo ctu;
-    if (mSettings.useSingleJob() || !mSettings.buildDir.empty())
-    {
-        for (const Check::FileInfo *fi : mFileInfo) {
-            const auto *fi2 = dynamic_cast<const CTU::FileInfo *>(fi);
-            if (fi2) {
-                ctu.functionCalls.insert(ctu.functionCalls.end(), fi2->functionCalls.cbegin(), fi2->functionCalls.cend());
-                ctu.nestedCalls.insert(ctu.nestedCalls.end(), fi2->nestedCalls.cbegin(), fi2->nestedCalls.cend());
+
+    if (!Settings::unusedFunctionOnly()) {
+        // Analyse the tokens
+        CTU::FileInfo ctu;
+        if (mSettings.useSingleJob() || !mSettings.buildDir.empty())
+        {
+            for (const Check::FileInfo *fi : mFileInfo) {
+                const auto *fi2 = dynamic_cast<const CTU::FileInfo *>(fi);
+                if (fi2) {
+                    ctu.functionCalls.insert(ctu.functionCalls.end(), fi2->functionCalls.cbegin(), fi2->functionCalls.cend());
+                    ctu.nestedCalls.insert(ctu.nestedCalls.end(), fi2->nestedCalls.cbegin(), fi2->nestedCalls.cend());
+                }
             }
         }
-    }
 
-    // cppcheck-suppress shadowFunction - TODO: fix this
-    for (Check *check : Check::instances())
-        errors |= check->analyseWholeProgram(ctu, mFileInfo, mSettings, mErrorLogger);  // TODO: ctu
+        for (Check * const c : CheckInstances::get())
+            errors |= c->analyseWholeProgram(ctu, mFileInfo, mSettings, mErrorLogger);  // TODO: ctu
+    }
 
     if (mUnusedFunctionsCheck)
-        errors |= mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
+        errors |= mUnusedFunctionsCheck->check(mSettings.library, mErrorLogger);
 
     return errors && (mLogger->exitcode() > 0);
 }
 
 unsigned int CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo)
 {
-    executeAddonsWholeProgram(files, fileSettings, ctuInfo);
     if (mSettings.checks.isEnabled(Checks::unusedFunction))
         CheckUnusedFunctions::analyseWholeProgram(mSettings, mErrorLogger, buildDir);
-    std::list<Check::FileInfo*> fileInfoList;
-    CTU::FileInfo ctuFileInfo;
 
-    // Load all analyzer info data..
-    const std::string filesTxt(buildDir + "/files.txt");
-    std::ifstream fin(filesTxt);
-    std::string filesTxtLine;
-    while (std::getline(fin, filesTxtLine)) {
-        AnalyzerInformation::Info filesTxtInfo;
-        if (!filesTxtInfo.parse(filesTxtLine))
-            continue;
+    if (mUnusedFunctionsCheck)
+        mUnusedFunctionsCheck->check(mSettings.library, mErrorLogger);
 
-        const std::string xmlfile = buildDir + '/' + filesTxtInfo.afile;
+    if (Settings::unusedFunctionOnly())
+        return mLogger->exitcode();
 
-        tinyxml2::XMLDocument doc;
-        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
-        if (error != tinyxml2::XML_SUCCESS)
-            continue;
+    executeAddonsWholeProgram(files, fileSettings, ctuInfo);
 
-        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
-        if (rootNode == nullptr)
-            continue;
+    std::list<const Check::FileInfo*> fileInfoList;
+    CTU::FileInfo ctuFileInfo;
 
-        for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
-            if (std::strcmp(e->Name(), "FileInfo") != 0)
-                continue;
-            const char *checkClassAttr = e->Attribute("check");
-            if (!checkClassAttr)
-                continue;
-            if (std::strcmp(checkClassAttr, "ctu") == 0) {
-                ctuFileInfo.loadFromXml(e);
-                continue;
-            }
-            // cppcheck-suppress shadowFunction - TODO: fix this
-            for (const Check *check : Check::instances()) {
-                if (checkClassAttr == check->name()) {
-                    Check::FileInfo* fi = check->loadFileInfoFromXml(e);
-                    fi->file0 = filesTxtInfo.sourceFile;
+    const auto handler = [&fileInfoList, &ctuFileInfo](const char* checkattr, const tinyxml2::XMLElement* e, const AnalyzerInformation::Info& filesTxtInfo) {
+        if (std::strcmp(checkattr, "ctu") == 0) {
+            ctuFileInfo.loadFromXml(e);
+            return;
+        }
+        for (const Check *check : CheckInstances::get()) {
+            if (checkattr == check->name()) {
+                if (const Check::FileInfo* fi = check->loadFileInfoFromXml(e, filesTxtInfo.sourceFile)) {
                     fileInfoList.push_back(fi);
                 }
             }
         }
-    }
-
-    // Analyse the tokens
-    // cppcheck-suppress shadowFunction - TODO: fix this
-    for (Check *check : Check::instances())
-        check->analyseWholeProgram(ctuFileInfo, fileInfoList, mSettings, mErrorLogger);
+    };
 
-    if (mUnusedFunctionsCheck)
-        mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
+    const std::string err = AnalyzerInformation::processFilesTxt(buildDir, handler, mSettings.debugainfo);
+    if (!err.empty()) {
+        const ErrorMessage errmsg({}, "", Severity::error, err, "internalError", Certainty::normal);
+        mErrorLogger.reportErr(errmsg);
+    }
+    else {
+        // Analyse the tokens
+        for (Check * const c : CheckInstances::get())
+            c->analyseWholeProgram(ctuFileInfo, fileInfoList, mSettings, mErrorLogger);
+    }
 
-    for (Check::FileInfo *fi : fileInfoList)
+    for (const Check::FileInfo *fi : fileInfoList)
         delete fi;
 
     return mLogger->exitcode();
 }
 
-// cppcheck-suppress unusedFunction - only used in tests
-void CppCheck::resetTimerResults()
-{
-    s_timerResults.reset();
-}
-
-void CppCheck::printTimerResults(SHOWTIME_MODES mode)
-{
-    s_timerResults.showResults(mode);
-}
-
 bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
-    if (mSettings.premiumArgs.find("--misra") != std::string::npos) {
-        if (startsWith(id, "misra-") || startsWith(id, "premium-misra-"))
-            return true;
-    }
+    if (mSettings.premiumArgs.find("--misra") != std::string::npos && startsWith(id, "premium-misra-"))
+        return true;
     if (mSettings.premiumArgs.find("--cert") != std::string::npos && startsWith(id, "premium-cert-"))
         return true;
     if (mSettings.premiumArgs.find("--autosar") != std::string::npos && startsWith(id, "premium-autosar-"))
@@ -2109,9 +1950,26 @@ bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
     return false;
 }
 
-std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string>& files, const simplecpp::TokenList& tokens1) const {
+std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string>& files, const simplecpp::TokenList& tokens1) const
+{
+    std::string header = getDumpFileContentsRawTokensHeader(files);
+    std::string footer = getDumpFileContentsRawTokensFooter(tokens1);
+    return getDumpFileContentsRawTokens(header, footer);
+}
+
+std::string CppCheck::getDumpFileContentsRawTokens(const std::string& header, const std::string& footer)
+{
     std::string dumpProlog;
     dumpProlog += "  <rawtokens>\n";
+    dumpProlog += header;
+    dumpProlog += footer;
+    dumpProlog += "  </rawtokens>\n";
+    return dumpProlog;
+}
+
+std::string CppCheck::getDumpFileContentsRawTokensHeader(const std::vector<std::string>& files) const
+{
+    std::string dumpProlog;
     for (unsigned int i = 0; i < files.size(); ++i) {
         dumpProlog += "    <file index=\"";
         dumpProlog += std::to_string(i);
@@ -2119,6 +1977,12 @@ std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string
         dumpProlog += ErrorLogger::toxml(Path::getRelativePath(files[i], mSettings.basePaths));
         dumpProlog += "\"/>\n";
     }
+    return dumpProlog;
+}
+
+std::string CppCheck::getDumpFileContentsRawTokensFooter(const simplecpp::TokenList& tokens1)
+{
+    std::string dumpProlog;
     for (const simplecpp::Token *tok = tokens1.cfront(); tok; tok = tok->next) {
         dumpProlog += "    <tok ";
 
@@ -2130,7 +1994,7 @@ std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string
         dumpProlog += std::to_string(tok->location.line);
         dumpProlog += "\" ";
 
-        dumpProlog +="column=\"";
+        dumpProlog += "column=\"";
         dumpProlog += std::to_string(tok->location.col);
         dumpProlog += "\" ";
 
@@ -2140,6 +2004,5 @@ std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string
 
         dumpProlog += "/>\n";
     }
-    dumpProlog += "  </rawtokens>\n";
     return dumpProlog;
 }
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index d7c326704a1..4ccd68193ea 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,16 +24,16 @@
 #include "check.h"
 #include "config.h"
 
-#include <cstdint>
-#include <fstream>
+#include <cstddef>
 #include <functional>
 #include <list>
 #include <memory>
 #include <string>
 #include <vector>
 
+#ifdef HAVE_RULES
 class TokenList;
-enum class SHOWTIME_MODES : std::uint8_t;
+#endif
 struct FileSettings;
 class CheckUnusedFunctions;
 class Tokenizer;
@@ -42,8 +42,13 @@ class AnalyzerInformation;
 class ErrorLogger;
 class Settings;
 struct Suppressions;
+class Preprocessor;
+class TimerResults;
 
-namespace simplecpp { class TokenList; }
+namespace simplecpp {
+    class TokenList;
+    struct Output;
+}
 
 /// @addtogroup Core
 /// @{
@@ -58,6 +63,7 @@ class CPPCHECKLIB CppCheck {
     friend class TestCppcheck;
 
 public:
+    // exe, args, redirect, output
     using ExecuteCmdFn = std::function<int (std::string,std::vector<std::string>,std::string,std::string&)>;
 
     /**
@@ -66,6 +72,7 @@ class CPPCHECKLIB CppCheck {
     CppCheck(const Settings& settings,
              Suppressions& supprs,
              ErrorLogger &errorLogger,
+             TimerResults* timerResults,
              bool useGlobalSuppressions,
              ExecuteCmdFn executeCommand);
 
@@ -97,12 +104,13 @@ class CPPCHECKLIB CppCheck {
      * the disk but the content is given in @p content. In errors the @p path
      * is used as a filename.
      * @param file The file to check.
-     * @param content File content as a string.
+     * @param data File content as a buffer.
+     * @param size Size of buffer.
      * @return amount of errors found or 0 if none were found.
      * @note You must set settings before calling this function (by calling
      *  settings()).
      */
-    unsigned int check(const FileWithDetails &file, const std::string &content);
+    unsigned int checkBuffer(const FileWithDetails &file, const char* data, std::size_t size);
 
     /**
      * @brief Returns current version number as a string.
@@ -136,9 +144,6 @@ class CPPCHECKLIB CppCheck {
     /** analyse whole program use .analyzeinfo files or ctuinfo string */
     unsigned int analyseWholeProgram(const std::string &buildDir, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo);
 
-    static void resetTimerResults();
-    static void printTimerResults(SHOWTIME_MODES mode);
-
 private:
     void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
 
@@ -148,6 +153,9 @@ class CPPCHECKLIB CppCheck {
      * @brief Get dumpfile <rawtokens> contents, this is only public for testing purposes
      */
     std::string getDumpFileContentsRawTokens(const std::vector<std::string>& files, const simplecpp::TokenList& tokens1) const;
+    static std::string getDumpFileContentsRawTokens(const std::string& header, const std::string& footer);
+    std::string getDumpFileContentsRawTokensHeader(const std::vector<std::string>& files) const;
+    static std::string getDumpFileContentsRawTokensFooter(const simplecpp::TokenList& tokens1);
 
     std::string getLibraryDumpData() const;
 
@@ -162,21 +170,52 @@ class CPPCHECKLIB CppCheck {
     /** @brief There has been an internal error => Report information message */
     void internalError(const std::string &filename, const std::string &msg);
 
+    /**
+     * @brief Calculate hash used to detect when a file needs to be reanalyzed.
+     *
+     * @param preprocessor  Preprocessor used to calculate the hash.
+     * @return hash
+     */
+    std::size_t calculateHash(const Preprocessor &preprocessor, const std::string& filePath = {}) const;
+
+    /**
+     * @brief Check a file
+     * @param file the file
+     * @param cfgname  cfg name
+     * @return number of errors found
+     */
+    unsigned int checkFile(const FileWithDetails& file, const std::string &cfgname);
+
+    void checkPlistOutput(const FileWithDetails& file);
+
+    /**
+     * @brief Check a file using buffer
+     * @param file the file
+     * @param cfgname  cfg name
+     * @param data the data to be read
+     * @param size the size of the data to be read
+     * @return number of errors found
+     */
+    unsigned int checkBuffer(const FileWithDetails& file, const std::string &cfgname, const char* data, std::size_t size);
+
+    // TODO: should use simplecpp::OutputList
+    using CreateTokenListFn = std::function<simplecpp::TokenList (std::vector<std::string>&, std::list<simplecpp::Output>*)>;
+
     /**
      * @brief Check a file using stream
      * @param file the file
      * @param cfgname  cfg name
-     * @param fileStream stream the file content can be read from
+     * @param createTokenList a function to create the simplecpp::TokenList with
      * @return number of errors found
      */
-    unsigned int checkFile(const FileWithDetails& file, const std::string &cfgname, int fileIndex, std::istream* fileStream = nullptr);
+    unsigned int checkInternal(const FileWithDetails& file, const std::string &cfgname, const CreateTokenListFn& createTokenList);
 
     /**
      * @brief Check normal tokens
      * @param tokenizer tokenizer instance
-     * @param analyzerInformation the analyzer infomation
+     * @param analyzerInformation the analyzer information
      */
-    void checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation);
+    void checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation, const std::string& currentConfig);
 
     /**
      * Execute addons
@@ -198,7 +237,7 @@ class CPPCHECKLIB CppCheck {
     void executeRules(const std::string &tokenlist, const TokenList &list);
 #endif
 
-    unsigned int checkClang(const FileWithDetails &file, int fileIndex);
+    unsigned int checkClang(const FileWithDetails &file);
 
     const Settings& mSettings;
     Suppressions& mSuppressions;
@@ -209,14 +248,12 @@ class CPPCHECKLIB CppCheck {
     ErrorLogger& mErrorLogger;
     /** the ErrorLogger provided to this instance */
     ErrorLogger& mErrorLoggerDirect;
+    TimerResults* mTimerResults;
 
     bool mUseGlobalSuppressions;
 
-    /** Are there too many configs? */
-    bool mTooManyConfigs{};
-
     /** File info used for whole program analysis */
-    std::list<Check::FileInfo*> mFileInfo;
+    std::list<const Check::FileInfo*> mFileInfo;
 
     /** Callback for executing a shell command (exe, args, output) */
     ExecuteCmdFn mExecuteCommand;
diff --git a/lib/cppcheck.natvis b/lib/cppcheck.natvis
index 4b3b2d0aea6..6f5b6fd86a2 100644
--- a/lib/cppcheck.natvis
+++ b/lib/cppcheck.natvis
@@ -10,13 +10,13 @@
 
 
     <Type Name="TokenList">
-    <DisplayString>{mTokensFrontBack.front->mStr} - {mTokensFrontBack.back->mStr}</DisplayString>
+    <DisplayString>{mTokensFrontBack->front->mStr} - {mTokensFrontBack->back->mStr}</DisplayString>
     <Expand>
       <Item Name="[files]">mFiles</Item>
       <CustomListItems Optional="true" MaxItemsPerView="5000">
-        <Variable Name="pCurr" InitialValue="mTokensFrontBack.front" />
+        <Variable Name="pCurr" InitialValue="mTokensFrontBack->front" />
         <Loop>
-          <If Condition="pCurr == mTokensFrontBack.back">
+          <If Condition="pCurr == mTokensFrontBack->back">
             <Break Condition="1"/>
           </If>
           <Item>pCurr</Item>
@@ -68,4 +68,4 @@
   </Type>
   
   
-</AutoVisualizer>
\ No newline at end of file
+</AutoVisualizer>
diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index 3d830e2894c..553392c53c2 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -18,20 +18,20 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup Label="SourceFiles">
-    <ClCompile Include="..\externals\simplecpp\simplecpp.cpp" />
-    <ClCompile Include="..\externals\tinyxml2\tinyxml2.cpp" />
+    <ClCompile Include="..\externals\simplecpp\simplecpp.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <ForcedIncludeFiles></ForcedIncludeFiles>
+    </ClCompile>
+    <ClCompile Include="..\externals\tinyxml2\tinyxml2.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <ForcedIncludeFiles></ForcedIncludeFiles>
+    </ClCompile>
     <ClCompile Include="valueflow.cpp" />
     <ClCompile Include="tokenize.cpp" />
     <ClCompile Include="symboldatabase.cpp" />
     <ClCompile Include="addoninfo.cpp" />
     <ClCompile Include="analyzerinfo.cpp" />
     <ClCompile Include="astutils.cpp" />
-    <ClCompile Include="check.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">Create</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="check64bit.cpp" />
     <ClCompile Include="checkassert.cpp" />
     <ClCompile Include="checkautovariables.cpp" />
@@ -44,6 +44,12 @@
     <ClCompile Include="checkersreport.cpp" />
     <ClCompile Include="checkexceptionsafety.cpp" />
     <ClCompile Include="checkfunctions.cpp" />
+    <ClCompile Include="checkimpl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="checkinternal.cpp" />
     <ClCompile Include="checkio.cpp" />
     <ClCompile Include="checkleakautovar.cpp" />
@@ -51,6 +57,7 @@
     <ClCompile Include="checknullpointer.cpp" />
     <ClCompile Include="checkother.cpp" />
     <ClCompile Include="checkpostfixoperator.cpp" />
+    <ClCompile Include="checks.cpp" />
     <ClCompile Include="checksizeof.cpp" />
     <ClCompile Include="checkstl.cpp" />
     <ClCompile Include="checkstring.cpp" />
@@ -79,7 +86,9 @@
     <ClCompile Include="platform.cpp" />
     <ClCompile Include="preprocessor.cpp" />
     <ClCompile Include="programmemory.cpp" />
+    <ClCompile Include="regex.cpp" />
     <ClCompile Include="reverseanalyzer.cpp" />
+    <ClCompile Include="sarifreport.cpp" />
     <ClCompile Include="settings.cpp" />
     <ClCompile Include="standards.cpp" />
     <ClCompile Include="summaries.cpp" />
@@ -115,6 +124,7 @@
     <ClInclude Include="checkersreport.h" />
     <ClInclude Include="checkexceptionsafety.h" />
     <ClInclude Include="checkfunctions.h" />
+    <ClInclude Include="checkimpl.h" />
     <ClInclude Include="checkinternal.h" />
     <ClInclude Include="checkio.h" />
     <ClInclude Include="checkleakautovar.h" />
@@ -122,6 +132,7 @@
     <ClInclude Include="checknullpointer.h" />
     <ClInclude Include="checkother.h" />
     <ClInclude Include="checkpostfixoperator.h" />
+    <ClInclude Include="checks.h" />
     <ClInclude Include="checksizeof.h" />
     <ClInclude Include="checkstl.h" />
     <ClInclude Include="checkstring.h" />
@@ -155,7 +166,10 @@
     <ClInclude Include="precompiled.h" />
     <ClInclude Include="preprocessor.h" />
     <ClInclude Include="programmemory.h" />
+    <ClInclude Include="regex.h" />
     <ClInclude Include="reverseanalyzer.h" />
+    <ClInclude Include="rule.h" />
+    <ClInclude Include="sarifreport.h" />
     <ClInclude Include="settings.h" />
     <ClInclude Include="smallvector.h" />
     <ClInclude Include="sourcelocation.h" />
@@ -256,9 +270,9 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;$(HaveBoost);_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -280,7 +294,9 @@
       <Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+if exist "$(OutDir)platforms\unix32-unsigned.xml" del /q "$(OutDir)platforms\unix32-unsigned.xml"
+if exist "$(OutDir)platforms\unix64-unsigned.xml" del /q "$(OutDir)platforms\unix64-unsigned.xml"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">
@@ -288,9 +304,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;$(HaveBoost);HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -313,7 +329,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+if exist "$(OutDir)platforms\unix32-unsigned.xml" del /q "$(OutDir)platforms\unix32-unsigned.xml"
+if exist "$(OutDir)platforms\unix64-unsigned.xml" del /q "$(OutDir)platforms\unix64-unsigned.xml"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -326,9 +344,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
-      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;$(HaveBoost);NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -354,7 +372,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+if exist "$(OutDir)platforms\unix32-unsigned.xml" del /q "$(OutDir)platforms\unix32-unsigned.xml"
+if exist "$(OutDir)platforms\unix64-unsigned.xml" del /q "$(OutDir)platforms\unix64-unsigned.xml"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">
@@ -367,9 +387,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
-      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;$(HaveBoost);NDEBUG;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -396,7 +416,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <Command>xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
 xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+if exist "$(OutDir)platforms\unix32-unsigned.xml" del /q "$(OutDir)platforms\unix32-unsigned.xml"
+if exist "$(OutDir)platforms\unix64-unsigned.xml" del /q "$(OutDir)platforms\unix64-unsigned.xml"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters
index a4c000fd9a6..249d724fae9 100644
--- a/lib/cppcheck.vcxproj.filters
+++ b/lib/cppcheck.vcxproj.filters
@@ -9,6 +9,9 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{00a07a33-9811-481c-91aa-46bfba1cda93}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup Label="SourceFiles">
     <ClCompile Include="tokenize.cpp">
@@ -212,88 +215,16 @@
     <ClCompile Include="vf_analyzers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vf_array.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_arraybool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_arrayelement.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_bailout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_bitand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="vf_common.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vf_conditionexpressions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_debug.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_enumvalue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_functionreturn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_globalconstvar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_globalstaticvar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_impossiblevalues.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_infercondition.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_iteratorinfer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_iterators.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_number.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_pointeralias.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_reverse.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_rightshift.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_sameexpressions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="vf_settokenvalue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vf_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_subfunction.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_switchvariable.cpp">
+    <ClCompile Include="findtoken.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="vf_symbolicinfer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_symbolicoperators.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vf_unknownfunctionreturn.cpp">
+    <ClCompile Include="regex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -541,98 +472,27 @@
     <ClInclude Include="vf_analyzers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vf_array.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_arraybool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_arrayelement.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_bailout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_bitand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="vf_common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vf_conditionexpressions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_debug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_enumvalue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_functionreturn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_globalconstvar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_globalstaticvar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_impossiblevalues.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_infercondition.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_iteratorinfer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_iterators.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_number.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_pointeralias.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_reverse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_rightshift.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_sameexpressions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="vf_settokenvalue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vf_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_subfunction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_switchvariable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_symbolicinfer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_symbolicoperators.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vf_unknownfunctionreturn.h">
+    <ClInclude Include="xml.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="xml.h">
+    <ClInclude Include="regex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="version.rc" />
+    <Natvis Include="cppcheck.natvis">
+      <Filter>Resource Files</Filter>
+    </Natvis>
   </ItemGroup>
   <ItemGroup>
-    <Natvis Include="cppcheck.natvis" />
+    <ResourceCompile Include="version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/lib/ctu.cpp b/lib/ctu.cpp
index 833a4dfda4b..feef065d3ac 100644
--- a/lib/ctu.cpp
+++ b/lib/ctu.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,7 +22,6 @@
 
 #include "astutils.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
@@ -113,7 +112,7 @@ std::string CTU::FileInfo::FunctionCall::toXmlString() const
         out << ">\n";
         for (const ErrorMessage::FileLocation &loc : callValuePath)
             out << "  <path"
-                << " " << ATTR_LOC_FILENAME << "=\"" << ErrorLogger::toxml(loc.getfile()) << "\""
+                << " " << ATTR_LOC_FILENAME << "=\"" << ErrorLogger::toxml(loc.getfile(false)) << "\""
                 << " " << ATTR_LOC_LINENR << "=\"" << loc.line << "\""
                 << " " << ATTR_LOC_COLUMN << "=\"" << loc.column << "\""
                 << " " << ATTR_INFO << "=\"" << ErrorLogger::toxml(loc.getinfo()) << "\"/>\n";
@@ -232,6 +231,7 @@ bool CTU::FileInfo::NestedCall::loadFromXml(const tinyxml2::XMLElement *xmlEleme
     return !error;
 }
 
+// TODO: bail out on unexpected data
 void CTU::FileInfo::loadFromXml(const tinyxml2::XMLElement *xmlElement)
 {
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
@@ -280,11 +280,11 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::loadUnsafeUsageListFromXml(const tiny
     return ret;
 }
 
-static int isCallFunction(const Scope *scope, int argnr, const Token *&tok)
+static size_t isCallFunction(const Scope *scope, size_t argnr, const Token *&tok)
 {
     const Variable * const argvar = scope->function->getArgumentVar(argnr);
     if (!argvar->isPointer())
-        return -1;
+        return 0;
     for (const Token *tok2 = scope->bodyStart; tok2 != scope->bodyEnd; tok2 = tok2->next()) {
         if (tok2->variable() != argvar)
             continue;
@@ -306,11 +306,11 @@ static int isCallFunction(const Scope *scope, int argnr, const Token *&tok)
         tok = prev->previous();
         return argnr2;
     }
-    return -1;
+    return 0;
 }
 
 
-CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
+const CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
 {
     const SymbolDatabase * const symbolDatabase = tokenizer.getSymbolDatabase();
 
@@ -330,7 +330,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
             if (!tokFunction)
                 continue;
             const std::vector<const Token *> args(getArguments(tok->previous()));
-            for (int argnr = 0; argnr < args.size(); ++argnr) {
+            for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                 const Token *argtok = args[argnr];
                 if (!argtok)
                     continue;
@@ -368,7 +368,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
                     functionCall.location = FileInfo::Location(tokenizer, tok);
                     functionCall.callArgNr = argnr + 1;
                     functionCall.callArgumentExpression = argtok->expressionString();
-                    const auto typeSize = argtok->valueType()->typeSize(tokenizer.getSettings().platform);
+                    const auto typeSize = argtok->valueType()->getSizeOf(tokenizer.getSettings(), ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
                     functionCall.callArgValue.value = typeSize > 0 ? argtok->variable()->dimension(0) * typeSize : -1;
                     functionCall.warning = false;
                     fileInfo->functionCalls.push_back(std::move(functionCall));
@@ -382,7 +382,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
                     functionCall.location = FileInfo::Location(tokenizer, tok);
                     functionCall.callArgNr = argnr + 1;
                     functionCall.callArgumentExpression = argtok->expressionString();
-                    functionCall.callArgValue.value = argtok->astOperand1()->valueType()->typeSize(tokenizer.getSettings().platform);
+                    functionCall.callArgValue.value = argtok->astOperand1()->valueType()->getSizeOf(tokenizer.getSettings(), ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
                     functionCall.warning = false;
                     fileInfo->functionCalls.push_back(std::move(functionCall));
                 }
@@ -427,9 +427,9 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
         }
 
         // Nested function calls
-        for (int argnr = 0; argnr < scopeFunction->argCount(); ++argnr) {
+        for (size_t argnr = 0; argnr < scopeFunction->argCount(); ++argnr) {
             const Token *tok;
-            const int argnr2 = isCallFunction(&scope, argnr, tok);
+            const size_t argnr2 = isCallFunction(&scope, argnr, tok);
             if (argnr2 > 0) {
                 FileInfo::NestedCall nestedCall(tokenizer, scopeFunction, tok);
                 nestedCall.myArgNr = argnr + 1;
@@ -442,7 +442,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
     return fileInfo;
 }
 
-static std::vector<std::pair<const Token *, CTU::FileInfo::Value>> getUnsafeFunction(const Settings &settings, const Scope *scope, int argnr, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *value))
+static std::vector<std::pair<const Token *, CTU::FileInfo::Value>> getUnsafeFunction(const Settings &settings, const Scope *scope, size_t argnr, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *value))
 {
     std::vector<std::pair<const Token *, CTU::FileInfo::Value>> ret;
     const Variable * const argvar = scope->function->getArgumentVar(argnr);
@@ -487,7 +487,7 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer &token
         const Function *const function = scope.function;
 
         // "Unsafe" functions unconditionally reads data before it is written..
-        for (int argnr = 0; argnr < function->argCount(); ++argnr) {
+        for (size_t argnr = 0; argnr < function->argCount(); ++argnr) {
             for (const std::pair<const Token *, CTU::FileInfo::Value> &v : getUnsafeFunction(settings, &scope, argnr, isUnsafeUsage)) {
                 const Token *tok = v.first;
                 const MathLib::bigint val = v.second.value;
@@ -500,7 +500,7 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer &token
 }
 
 static bool findPath(const std::string &callId,
-                     nonneg int callArgNr,
+                     size_t callArgNr,
                      MathLib::bigint unsafeValue,
                      CTU::FileInfo::InvalidValueType invalidValue,
                      const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap,
@@ -512,7 +512,7 @@ static bool findPath(const std::string &callId,
     if (index >= maxCtuDepth)
         return false; // TODO: add bailout message?
 
-    const auto it = utils::as_const(callsMap).find(callId);
+    const auto it = callsMap.find(callId);
     if (it == callsMap.end())
         return false;
 
@@ -559,6 +559,20 @@ static bool findPath(const std::string &callId,
     return false;
 }
 
+static std::string getInvalidValueString(CTU::FileInfo::InvalidValueType invalidValue)
+{
+    using InvalidValueType = CTU::FileInfo::InvalidValueType;
+    switch (invalidValue) {
+    case InvalidValueType::null:
+        return "null";
+    case InvalidValueType::uninit:
+        return "uninitialized";
+    case InvalidValueType::bufferOverflow:
+        return "accessed out of bounds";
+    }
+    cppcheck::unreachable();
+}
+
 std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueType invalidValue,
                                                                   const CTU::FileInfo::UnsafeUsage &unsafeUsage,
                                                                   const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap,
@@ -581,7 +595,7 @@ std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueTy
 
     std::list<ErrorMessage::FileLocation> locationList;
 
-    const std::string value1 = (invalidValue == InvalidValueType::null) ? "null" : "uninitialized";
+    const std::string value1 = getInvalidValueString(invalidValue);
 
     for (int index = 9; index >= 0; index--) {
         if (!path[index])
diff --git a/lib/ctu.h b/lib/ctu.h
index 4f5e0b0294c..76baff21b9f 100644
--- a/lib/ctu.h
+++ b/lib/ctu.h
@@ -52,6 +52,8 @@ namespace tinyxml2 {
 namespace CTU {
     class CPPCHECKLIB FileInfo : public Check::FileInfo {
     public:
+        FileInfo() : Check::FileInfo("") {}
+
         enum class InvalidValueType : std::uint8_t { null, uninit, bufferOverflow };
 
         std::string toString() const override;
@@ -77,14 +79,14 @@ namespace CTU {
 
         struct UnsafeUsage {
             UnsafeUsage() = default;
-            UnsafeUsage(std::string myId, nonneg int myArgNr, std::string myArgumentName, Location location, MathLib::bigint value)
+            UnsafeUsage(std::string myId, size_t myArgNr, std::string myArgumentName, Location location, MathLib::bigint value)
                 : myId(std::move(myId))
                 , myArgNr(myArgNr)
                 , myArgumentName(std::move(myArgumentName))
                 , location(std::move(location))
                 , value(value) {}
             std::string myId;
-            nonneg int myArgNr{};
+            size_t myArgNr{};
             std::string myArgumentName;
             Location location;
             MathLib::bigint value{};
@@ -94,14 +96,14 @@ namespace CTU {
         class CallBase {
         public:
             CallBase() = default;
-            CallBase(std::string callId, int callArgNr, std::string callFunctionName, Location loc)
+            CallBase(std::string callId, size_t callArgNr, std::string callFunctionName, Location loc)
                 : callId(std::move(callId)), callArgNr(callArgNr), callFunctionName(std::move(callFunctionName)), location(std::move(loc))
             {}
             CallBase(const Tokenizer &tokenizer, const Token *callToken);
             virtual ~CallBase() = default;
             CallBase(const CallBase&) = default;
             std::string callId;
-            int callArgNr{};
+            size_t callArgNr{};
             std::string callFunctionName;
             Location location;
         protected:
@@ -136,7 +138,7 @@ namespace CTU {
             bool loadFromXml(const tinyxml2::XMLElement *xmlElement);
 
             std::string myId;
-            nonneg int myArgNr{};
+            size_t myArgNr{};
         };
 
         std::list<FunctionCall> functionCalls;
@@ -160,7 +162,7 @@ namespace CTU {
     CPPCHECKLIB std::string getFunctionId(const Tokenizer &tokenizer, const Function *function);
 
     /** @brief Parse current TU and extract file info */
-    CPPCHECKLIB RET_NONNULL FileInfo *getFileInfo(const Tokenizer &tokenizer);
+    CPPCHECKLIB RET_NONNULL const FileInfo *getFileInfo(const Tokenizer &tokenizer);
 
     CPPCHECKLIB std::list<FileInfo::UnsafeUsage> getUnsafeUsage(const Tokenizer &tokenizer, const Settings &settings, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, FileInfo::Value *value));
 
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 4a872a6c211..d57ad999734 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 #include "path.h"
 #include "settings.h"
 #include "suppressions.h"
+#include "symboldatabase.h"
 #include "token.h"
 #include "tokenlist.h"
 #include "utils.h"
@@ -35,6 +36,7 @@
 #include <cstring>
 #include <fstream>
 #include <iomanip>
+#include <numeric>
 #include <sstream>
 #include <string>
 #include <unordered_map>
@@ -45,19 +47,22 @@
 const std::set<std::string> ErrorLogger::mCriticalErrorIds{
     "cppcheckError",
     "cppcheckLimit",
+    "includeNestedTooDeeply",
     "internalAstError",
     "instantiationError",
     "internalError",
+    "missingFile",
     "premium-internalError",
     "premium-invalidArgument",
     "premium-invalidLicense",
     "preprocessorErrorDirective",
     "syntaxError",
+    "unhandledChar",
     "unknownMacro"
 };
 
 ErrorMessage::ErrorMessage()
-    : severity(Severity::none), cwe(0U), certainty(Certainty::normal), hash(0)
+    : severity(Severity::none), cwe(0U), certainty(Certainty::normal)
 {}
 
 // TODO: id and msg are swapped compared to other calls
@@ -67,8 +72,7 @@ ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1,
     file0(std::move(file1)),
     severity(severity),   // severity for this error message
     cwe(0U),
-    certainty(certainty),
-    hash(0)
+    certainty(certainty)
 {
     // set the summary and verbose messages
     setmsg(msg);
@@ -82,15 +86,14 @@ ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1,
     file0(std::move(file1)),
     severity(severity),   // severity for this error message
     cwe(cwe.id),
-    certainty(certainty),
-    hash(0)
+    certainty(certainty)
 {
     // set the summary and verbose messages
     setmsg(msg);
 }
 
 ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const TokenList* list, Severity severity, std::string id, const std::string& msg, Certainty certainty)
-    : id(std::move(id)), severity(severity), cwe(0U), certainty(certainty), hash(0)
+    : id(std::move(id)), severity(severity), cwe(0U), certainty(certainty)
 {
     // Format callstack
     for (auto it = callstack.cbegin(); it != callstack.cend(); ++it) {
@@ -105,6 +108,8 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
         file0 = list->getFiles()[0];
 
     setmsg(msg);
+
+    calculateWarningHash(callstack);
 }
 
 
@@ -125,20 +130,20 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
 
     setmsg(msg);
 
-    hash = 0; // calculateWarningHash(list, hashWarning.str());
+    calculateWarningHash(callstack);
 }
 
-ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenList *tokenList, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
+ErrorMessage::ErrorMessage(ErrorPath errorPath, const TokenList *tokenList, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
     : id(id), severity(severity), cwe(cwe.id), certainty(certainty)
 {
     // Format callstack
-    for (const ErrorPathItem& e: errorPath) {
+    for (ErrorPathItem& e: errorPath) {
         const Token *tok = e.first;
         // --errorlist can provide null values here
         if (!tok)
             continue;
 
-        const std::string& path_info = e.second;
+        std::string& path_info = e.second;
 
         std::string info;
         if (startsWith(path_info,"$symbol:") && path_info.find('\n') < path_info.size()) {
@@ -147,7 +152,7 @@ ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenList *tokenLis
             info = replaceStr(path_info.substr(pos+1), "$symbol", symbolName);
         }
         else {
-            info = path_info;
+            info = std::move(path_info);
         }
 
         callStack.emplace_back(tok, std::move(info), tokenList);
@@ -158,9 +163,15 @@ ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenList *tokenLis
 
     setmsg(msg);
 
-    hash = 0; // calculateWarningHash(tokenList, hashWarning.str());
+    std::list<const Token*> tokens;
+    std::transform(errorPath.cbegin(), errorPath.cend(), std::back_inserter(tokens),
+                   [](const ErrorPathItem& e) {
+        return e.first;
+    });
+    calculateWarningHash(tokens);
 }
 
+// TODO: improve errorhandling?
 ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     : severity(Severity::none),
     cwe(0U),
@@ -196,16 +207,20 @@ ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     for (const tinyxml2::XMLElement *e = errmsg->FirstChildElement(); e; e = e->NextSiblingElement()) {
         const char* name = e->Name();
         if (std::strcmp(name,"location")==0) {
+            const char *strorigfile = e->Attribute("origfile");
             const char *strfile = e->Attribute("file");
             const char *strinfo = e->Attribute("info");
             const char *strline = e->Attribute("line");
             const char *strcolumn = e->Attribute("column");
 
             const char *file = strfile ? strfile : unknown;
+            const char *origfile = strorigfile ? strorigfile : file;
             const char *info = strinfo ? strinfo : "";
             const int line = strline ? strToInt<int>(strline) : 0;
             const int column = strcolumn ? strToInt<int>(strcolumn) : 0;
-            callStack.emplace_front(file, info, line, column);
+            callStack.emplace_front(origfile, info, line, column);
+            if (strorigfile)
+                callStack.front().setfile(file);
         } else if (std::strcmp(name,"symbol")==0) {
             mSymbolNames += e->GetText();
         }
@@ -238,6 +253,58 @@ void ErrorMessage::setmsg(const std::string &msg)
     }
 }
 
+void ErrorMessage::calculateWarningHash(const std::list<const Token*>& callstack)
+{
+    if (callstack.empty())
+        return;
+    // Calculate a hash for this warning message
+    std::string hashString;
+    for (const Token* tok: callstack) {
+        if (!tok)
+            continue;
+        if (!tok->scope())
+            return; // might be a syntax error before scope info has been set
+        if (tok->scope()->isExecutable()) {
+            // Executable scope => include all tokens in the function => if the
+            // function is changed the hash is changed
+            for (const Token* t = tok; t; t = t->previous()) {
+                if (!t->scope()->isExecutable())
+                    break;
+                hashString += " " + t->str();
+            }
+            for (const Token* t = tok->next(); t; t = t->next()) {
+                if (!t->scope()->isExecutable())
+                    break;
+                hashString += " " + t->str();
+            }
+        } else {
+            // Non executable scope => include tokens in current statement => if the current statement is changed the hash is changed
+            for (const Token* t = tok; t; t = t->previous()) {
+                if (t->str() == ";")
+                    break;
+                if (t->scope() != tok->scope()) // stop on {} unless its an initializer
+                    break;
+                hashString += " " + t->str();
+            }
+            for (const Token* t = tok->next(); t; t = t->next()) {
+                hashString += " " + t->str();
+                if (t->str() == ";")
+                    break;
+                if (t->scope() != tok->scope()) // stop on {} unless its an initializer
+                    break;
+            }
+        }
+    }
+
+    hashString = id + '\n' + mShortMessage + '\n' + hashString;
+
+    // hash algorithm: sdbm
+    // any hash algorithm can be used but it has to be the same hash on different platforms and compilers
+    hash = std::accumulate(hashString.cbegin(), hashString.cend(), std::size_t{0}, [](std::size_t h, unsigned char c) {
+        return static_cast<std::size_t>(c) + (h << 6) + (h << 16) - h;
+    });
+}
+
 static void serializeString(std::string &oss, const std::string & str)
 {
     oss += std::to_string(str.length());
@@ -433,6 +500,7 @@ std::string ErrorMessage::getXMLHeader(std::string productName, int xmlVersion)
 {
     const auto nameAndVersion = Settings::getNameAndVersion(productName);
     productName = nameAndVersion.first;
+    // TODO: lacks extra version
     const std::string version = nameAndVersion.first.empty() ? CppCheck::version() : nameAndVersion.second;
 
     tinyxml2::XMLPrinter printer;
@@ -508,7 +576,11 @@ std::string ErrorMessage::toXML() const
 
     for (auto it = callStack.crbegin(); it != callStack.crend(); ++it) {
         printer.OpenElement("location", false);
-        printer.PushAttribute("file", it->getfile().c_str());
+        const std::string origfile = it->getOrigFile(false);
+        const std::string file = it->getfile(false);
+        if (origfile != file)
+            printer.PushAttribute("origfile", origfile.c_str());
+        printer.PushAttribute("file", file.c_str());
         printer.PushAttribute("line", std::max(it->line,0));
         printer.PushAttribute("column", it->column);
         if (!it->getinfo().empty())
@@ -594,9 +666,9 @@ static void replace(std::string& source, const std::unordered_map<std::string, s
     }
 }
 
-static void replaceColors(std::string& source) {
+static void replaceColors(std::string& source, bool erase) {
     // TODO: colors are not applied when either stdout or stderr is not a TTY because we resolve them before the stream usage
-    static const std::unordered_map<std::string, std::string> substitutionMap =
+    static const std::unordered_map<std::string, std::string> substitutionMapReplace =
     {
         {"{reset}",   ::toString(Color::Reset)},
         {"{bold}",    ::toString(Color::Bold)},
@@ -607,7 +679,21 @@ static void replaceColors(std::string& source) {
         {"{magenta}", ::toString(Color::FgMagenta)},
         {"{default}", ::toString(Color::FgDefault)},
     };
-    replace(source, substitutionMap);
+    static const std::unordered_map<std::string, std::string> substitutionMapErase =
+    {
+        {"{reset}",   ""},
+        {"{bold}",    ""},
+        {"{dim}",     ""},
+        {"{red}",     ""},
+        {"{green}",   ""},
+        {"{blue}",    ""},
+        {"{magenta}", ""},
+        {"{default}", ""},
+    };
+    if (!erase)
+        replace(source, substitutionMapReplace);
+    else
+        replace(source, substitutionMapErase);
 }
 
 std::string ErrorMessage::toString(bool verbose, const std::string &templateFormat, const std::string &templateLocation) const
@@ -701,13 +787,20 @@ std::string ErrorLogger::callStackToString(const std::list<ErrorMessage::FileLoc
     return str;
 }
 
+ErrorMessage::FileLocation::FileLocation(const std::string &file, int line, unsigned int column)
+    : fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(Path::simplifyPath(file))
+{}
+
+ErrorMessage::FileLocation::FileLocation(const std::string &file, std::string info, int line, unsigned int column)
+    : fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(Path::simplifyPath(file)), mInfo(std::move(info))
+{}
 
 ErrorMessage::FileLocation::FileLocation(const Token* tok, const TokenList* tokenList)
-    : fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(tokenList->file(tok))
+    : fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(Path::simplifyPath(tokenList->file(tok)))
 {}
 
 ErrorMessage::FileLocation::FileLocation(const Token* tok, std::string info, const TokenList* tokenList)
-    : fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(tokenList->file(tok)), mInfo(std::move(info))
+    : fileIndex(tok->fileIndex()), line(tok->linenr()), column(tok->column()), mOrigFileName(tokenList->getOrigFile(tok)), mFileName(Path::simplifyPath(tokenList->file(tok))), mInfo(std::move(info))
 {}
 
 std::string ErrorMessage::FileLocation::getfile(bool convert) const
@@ -769,6 +862,15 @@ std::string ErrorLogger::toxml(const std::string &str)
         case '\0':
             xml += "\\0";
             break;
+        case '\n':
+            xml += "&#10;";
+            break;
+        case '\t':
+            xml += "&#09;";
+            break;
+        case '\r':
+            xml += "&#13;";
+            break;
         default:
             if (c >= ' ' && c <= 0x7f)
                 xml += c;
@@ -780,7 +882,7 @@ std::string ErrorLogger::toxml(const std::string &str)
     return xml;
 }
 
-std::string ErrorLogger::plistHeader(const std::string &version, const std::vector<std::string> &files)
+std::string ErrorLogger::plistHeader(const std::string &version)
 {
     std::ostringstream ostr;
     ostr << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
@@ -788,12 +890,7 @@ std::string ErrorLogger::plistHeader(const std::string &version, const std::vect
          << "<plist version=\"1.0\">\r\n"
          << "<dict>\r\n"
          << " <key>clang_version</key>\r\n"
-         << "<string>cppcheck version " << version << "</string>\r\n"
-         << " <key>files</key>\r\n"
-         << " <array>\r\n";
-    for (const std::string & file : files)
-        ostr << "  <string>" << ErrorLogger::toxml(file) << "</string>\r\n";
-    ostr << " </array>\r\n"
+         << " <string>cppcheck version " << version << "</string>\r\n"
          << " <key>diagnostics</key>\r\n"
          << " <array>\r\n";
     return ostr.str();
@@ -906,16 +1003,16 @@ std::string replaceStr(std::string s, const std::string &from, const std::string
     return s;
 }
 
-void substituteTemplateFormatStatic(std::string& templateFormat)
+void substituteTemplateFormatStatic(std::string& templateFormat, bool eraseColors)
 {
     replaceSpecialChars(templateFormat);
-    replaceColors(templateFormat);
+    replaceColors(templateFormat, eraseColors);
 }
 
-void substituteTemplateLocationStatic(std::string& templateLocation)
+void substituteTemplateLocationStatic(std::string& templateLocation, bool eraseColors)
 {
     replaceSpecialChars(templateLocation);
-    replaceColors(templateLocation);
+    replaceColors(templateLocation, eraseColors);
 }
 
 std::string getClassification(const std::string &guideline, ReportType reportType) {
@@ -938,39 +1035,60 @@ std::string getClassification(const std::string &guideline, ReportType reportTyp
         return getClassification(checkers::certCInfo, guideline);
     case ReportType::certCpp:
         return getClassification(checkers::certCppInfo, guideline);
-    case ReportType::misraC:
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
     {
-        auto components = splitString(guideline, '.');
+        const bool isDirective = guideline.rfind("Dir ", 0) == 0;
+
+        const std::size_t offset = isDirective ? 4 : 0;
+        auto components = splitString(guideline.substr(offset), '.');
         if (components.size() != 2)
             return "";
 
         const int a = std::stoi(components[0]);
         const int b = std::stoi(components[1]);
 
-        const std::vector<checkers::MisraInfo> &info = checkers::misraC2012Rules;
-        const auto it = std::find_if(info.cbegin(), info.cend(), [&](const checkers::MisraInfo &i) {
+        const std::vector<checkers::MisraInfo> *info = nullptr;
+        switch (reportType) {
+        case ReportType::misraC2012:
+            info = isDirective ? &checkers::misraC2012Directives : &checkers::misraC2012Rules;
+            break;
+        case ReportType::misraC2023:
+            info = isDirective ? &checkers::misraC2023Directives : &checkers::misraC2023Rules;
+            break;
+        case ReportType::misraC2025:
+            info = isDirective ? &checkers::misraC2025Directives : &checkers::misraC2025Rules;
+            break;
+        default:
+            cppcheck::unreachable();
+        }
+
+        const auto it = std::find_if(info->cbegin(), info->cend(), [&](const checkers::MisraInfo &i) {
                 return i.a == a && i.b == b;
             });
 
-        if (it == info.cend())
-            return "";
-
-        return it->str;
+        return it == info->cend() ? "" : it->str;
     }
     case ReportType::misraCpp2008:
     case ReportType::misraCpp2023:
     {
-        char delim;
         const std::vector<checkers::MisraCppInfo> *info;
+        std::vector<std::string> components;
+
         if (reportType == ReportType::misraCpp2008) {
-            delim = '-';
             info = &checkers::misraCpp2008Rules;
+            components = splitString(guideline, '-');
         } else {
-            delim = '.';
-            info = &checkers::misraCpp2023Rules;
+            if (guideline.rfind("Dir ", 0) == 0) {
+                components = splitString(guideline.substr(4), '.');
+                info = &checkers::misraCpp2023Directives;
+            } else {
+                components = splitString(guideline, '.');
+                info = &checkers::misraCpp2023Rules;
+            }
         }
 
-        auto components = splitString(guideline, delim);
         if (components.size() != 3)
             return "";
 
@@ -1015,24 +1133,36 @@ std::string getGuideline(const std::string &errId, ReportType reportType,
                            guideline.begin(), static_cast<int (*)(int)>(std::toupper));
         }
         break;
-    case ReportType::misraC:
-        if (errId.rfind("misra-c20", 0) == 0 || errId.rfind("premium-misra-c-20", 0) == 0)
-            guideline = errId.substr(errId.rfind('-') + 1);
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
+        if (errId.rfind("misra-c20", 0) == 0 || errId.rfind("premium-misra-c-20", 0) == 0) {
+            auto pos1 = errId.find("20") + 5;
+            if (pos1 >= errId.size())
+                break;
+            if (errId.compare(pos1,4,"dir-",0,4) == 0)
+                pos1 += 4;
+            const auto endpos = errId.find('-', pos1);
+            guideline = errId.substr(pos1, endpos-pos1);
+        }
         break;
     case ReportType::misraCpp2008:
-        if (errId.rfind("misra-cpp-2008-", 0) == 0)
-            guideline = errId.substr(15);
+        if (errId.rfind("premium-misra-cpp-2008", 0) == 0)
+            guideline = errId.substr(23);
         break;
     case ReportType::misraCpp2023:
-        if (errId.rfind("misra-cpp-2023-", 0) == 0)
-            guideline = errId.substr(15);
+        if (errId.rfind("premium-misra-cpp-2023", 0) == 0)
+            guideline = errId.substr(errId.rfind('-') + 1);
         break;
     default:
         break;
     }
 
-    if (!guideline.empty())
+    if (!guideline.empty()) {
+        if (errId.find("-dir-") != std::string::npos)
+            guideline = "Dir " + guideline;
         return guideline;
+    }
 
     auto it = guidelineMapping.find(errId);
 
@@ -1067,7 +1197,9 @@ std::map<std::string, std::string> createGuidelineMapping(ReportType reportType)
         idMapping1 = &checkers::idMappingCertC;
         ext1 = "-C";
         break;
-    case ReportType::misraC:
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
         idMapping1 = &checkers::idMappingMisraC;
         break;
     case ReportType::misraCpp2008:
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index 2a10d93fea2..b28fdba244e 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,10 +24,11 @@
 #include "config.h"
 #include "errortypes.h"
 
-#include <cstddef>
 #include <cstdint>
+#include <ctime>
 #include <list>
 #include <set>
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
@@ -57,12 +58,8 @@ class CPPCHECKLIB ErrorMessage {
      */
     class CPPCHECKLIB WARN_UNUSED FileLocation {
     public:
-        FileLocation(const std::string &file, int line, unsigned int column)
-            : fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(file) {}
-
-        FileLocation(const std::string &file, std::string info, int line, unsigned int column)
-            : fileIndex(0), line(line), column(column), mOrigFileName(file), mFileName(file), mInfo(std::move(info)) {}
-
+        FileLocation(const std::string &file, int line, unsigned int column);
+        FileLocation(const std::string &file, std::string info, int line, unsigned int column);
         FileLocation(const Token* tok, const TokenList* tokenList);
         FileLocation(const Token* tok, std::string info, const TokenList* tokenList);
 
@@ -92,7 +89,7 @@ class CPPCHECKLIB ErrorMessage {
         std::string stringify(bool addcolumn = false) const;
 
         unsigned int fileIndex;
-        int line; // negative value means "no line"
+        int line; // negative value means "no line" - TODO: actually 0 means no line - lines from simplecpp are unsigned
         unsigned int column;
 
         const std::string& getinfo() const {
@@ -130,7 +127,7 @@ class CPPCHECKLIB ErrorMessage {
                  const std::string& msg,
                  const CWE &cwe,
                  Certainty certainty);
-    ErrorMessage(const ErrorPath &errorPath,
+    ErrorMessage(ErrorPath errorPath,
                  const TokenList *tokenList,
                  Severity severity,
                  const char id[],
@@ -162,6 +159,9 @@ class CPPCHECKLIB ErrorMessage {
                          const std::string &templateLocation) const;
 
     std::string serialize() const;
+    /**
+     * @throws InternalError thrown if deserialization failed
+     */
     void deserialize(const std::string &data);
 
     std::list<FileLocation> callStack;
@@ -184,7 +184,7 @@ class CPPCHECKLIB ErrorMessage {
     std::string guideline;
 
     /** Warning hash */
-    std::size_t hash;
+    std::size_t hash{};
 
     /** set short and verbose messages */
     void setmsg(const std::string &msg);
@@ -195,7 +195,6 @@ class CPPCHECKLIB ErrorMessage {
     }
 
     /** Verbose message (may be the same as the short message) */
-    // cppcheck-suppress unusedFunction - used by GUI only
     const std::string &verboseMessage() const {
         return mVerboseMessage;
     }
@@ -210,6 +209,8 @@ class CPPCHECKLIB ErrorMessage {
 private:
     static std::string fixInvalidChars(const std::string& raw);
 
+    void calculateWarningHash(const std::list<const Token*>& callstack);
+
     /** Short message */
     std::string mShortMessage;
 
@@ -245,6 +246,13 @@ class CPPCHECKLIB ErrorLogger {
      */
     virtual void reportErr(const ErrorMessage &msg) = 0;
 
+    /**
+     * Information about file metrics reported by addons.
+     *
+     * @param metric The file metric to report, as an XML object.
+     */
+    virtual void reportMetric(const std::string &metric) = 0;
+
     /**
      * Report progress to client
      * @param filename main file that is checked
@@ -266,12 +274,19 @@ class CPPCHECKLIB ErrorLogger {
      */
     static std::string toxml(const std::string &str);
 
-    static std::string plistHeader(const std::string &version, const std::vector<std::string> &files);
+    static std::string plistHeader(const std::string &version);
     static std::string plistData(const ErrorMessage &msg);
-    static const char *plistFooter() {
-        return " </array>\r\n"
-               "</dict>\r\n"
-               "</plist>";
+    static std::string plistFooter(const std::vector<std::string>& files) {
+        std::ostringstream ostr;
+        ostr << " </array>\r\n"
+             << " <key>files</key>\r\n"
+             << " <array>\r\n";
+        for (const std::string& file : files)
+            ostr << "  <string>" << ErrorLogger::toxml(file) << "</string>\r\n";
+        ostr << " </array>\r\n"
+             << "</dict>\r\n"
+             << "</plist>";
+        return ostr.str();
     }
 
     static bool isCriticalErrorId(const std::string& id) {
@@ -282,24 +297,61 @@ class CPPCHECKLIB ErrorLogger {
     static const std::set<std::string> mCriticalErrorIds;
 };
 
+/// RAII class for reporting progress messages
+class CPPCHECKLIB ProgressReporter {
+public:
+    ProgressReporter(ErrorLogger& e, int reportProgressInterval, std::string filename, std::string stage) :
+        mErrorLogger(e),
+        mReportProgressInterval(reportProgressInterval),
+        mFilename(std::move(filename)),
+        mStage(std::move(stage)) {
+        report(0);
+    }
+
+    ~ProgressReporter() {
+        if (mReportProgressInterval < 0)
+            return;
+        mErrorLogger.reportProgress(mFilename, mStage.c_str(), 100);
+    }
+
+    void report(int value) {
+        if (mReportProgressInterval < 0 || value == mLastValue)
+            return;
+        const std::time_t t = std::time(nullptr);
+        if (t >= mLastTime + mReportProgressInterval) {
+            mErrorLogger.reportProgress(mFilename, mStage.c_str(), value);
+            mLastTime = t;
+            mLastValue = value;
+        }
+    }
+
+private:
+    ErrorLogger& mErrorLogger;
+    const int mReportProgressInterval;
+    const std::string mFilename;
+    const std::string mStage;
+    std::time_t mLastTime{0};
+    int mLastValue{-1};
+};
+
 /** Replace substring. Example replaceStr("1,NR,3", "NR", "2") => "1,2,3" */
 std::string replaceStr(std::string s, const std::string &from, const std::string &to);
 
 /** replaces the static parts of the location template **/
-CPPCHECKLIB void substituteTemplateFormatStatic(std::string& templateFormat);
+CPPCHECKLIB void substituteTemplateFormatStatic(std::string& templateFormat, bool eraseColors = false);
 
 /** replaces the static parts of the location template **/
-CPPCHECKLIB void substituteTemplateLocationStatic(std::string& templateLocation);
+CPPCHECKLIB void substituteTemplateLocationStatic(std::string& templateLocation, bool eraseColors = false);
 
 /** Get a classification string from the given guideline and reporttype */
 CPPCHECKLIB std::string getClassification(const std::string &guideline, ReportType reportType);
 
-/** Get a guidline string froM the given error id, reporttype, mapping and severity */
+/** Get a guideline string froM the given error id, reporttype, mapping and severity */
 CPPCHECKLIB std::string getGuideline(const std::string &errId, ReportType reportType,
                                      const std::map<std::string, std::string> &guidelineMapping,
                                      Severity severity);
 
-/** Get a map from cppcheck error ids to guidlines matching the given report type */
+/** Get a map from cppcheck error ids to guidelines matching the given report type */
 CPPCHECKLIB std::map<std::string, std::string> createGuidelineMapping(ReportType reportType);
 
 /// @}
diff --git a/lib/errortypes.cpp b/lib/errortypes.cpp
index 2c8824c95a6..0741ea36796 100644
--- a/lib/errortypes.cpp
+++ b/lib/errortypes.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -69,7 +69,7 @@ std::string severityToString(Severity severity)
     case Severity::internal:
         return "internal";
     }
-    throw InternalError(nullptr, "Unknown severity");
+    cppcheck::unreachable();
 }
 
 // TODO: bail out on invalid severity
diff --git a/lib/filesettings.h b/lib/filesettings.h
index 2c125264bbc..0ef53db85c5 100644
--- a/lib/filesettings.h
+++ b/lib/filesettings.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -26,6 +26,7 @@
 
 #include <list>
 #include <set>
+#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <utility>
@@ -33,16 +34,25 @@
 class FileWithDetails
 {
 public:
+    /**
+     * @throws std::runtime_error thrown if given path is empty
+     */
     FileWithDetails(std::string path, Standards::Language lang, std::size_t size)
-        : mPath(std::move(path))
-        , mPathSimplified(Path::simplifyPath(mPath))
-        , mLang(lang)
+        : mLang(lang)
         , mSize(size)
     {
+        setPath(std::move(path));
         if (mPath.empty())
             throw std::runtime_error("empty path specified");
     }
 
+    void setPath(std::string p)
+    {
+        mPath = std::move(p);
+        mPathSimplified = Path::simplifyPath(mPath);
+        mPathAbsolute.clear();
+    }
+
     const std::string& path() const
     {
         return mPath;
@@ -53,25 +63,45 @@ class FileWithDetails
         return mPathSimplified;
     }
 
+    const std::string& abspath() const
+    {
+        // use delayed resolution as it will fail for files which do not exist
+        if (mPathAbsolute.empty())
+            mPathAbsolute = Path::getAbsoluteFilePath(mPath);
+        return mPathAbsolute;
+    }
+
     std::size_t size() const
     {
         return mSize;
     }
 
-    void setLang(Standards::Language lang)
+    void setLang(Standards::Language language)
     {
-        mLang = lang;
+        mLang = language;
     }
 
     Standards::Language lang() const
     {
         return mLang;
     }
+
+    std::size_t fsFileId() const
+    {
+        return mFsFileId;
+    }
+
+    void setFsFileId(std::size_t id)
+    {
+        mFsFileId = id;
+    }
 private:
     std::string mPath;
     std::string mPathSimplified;
+    mutable std::string mPathAbsolute;
     Standards::Language mLang = Standards::Language::None;
     std::size_t mSize;
+    std::size_t mFsFileId{0};
 };
 
 /** File settings. Multiple configurations for a file is allowed. */
@@ -80,14 +110,12 @@ struct CPPCHECKLIB FileSettings {
         : file(std::move(path), lang, size)
     {}
 
-    int fileIndex = 0;
     std::string cfg;
     FileWithDetails file;
     const std::string& filename() const
     {
         return file.path();
     }
-    // cppcheck-suppress unusedFunction
     const std::string& sfilename() const
     {
         return file.spath();
@@ -95,10 +123,32 @@ struct CPPCHECKLIB FileSettings {
     std::string defines;
     // TODO: handle differently
     std::string cppcheckDefines() const {
-        return defines + (msc ? ";_MSC_VER=1900" : "") + (useMfc ? ";__AFXWIN_H__=1" : "");
+        std::ostringstream oss;
+        oss << defines;
+
+        if (msc) {
+            oss << ";_MSC_VER=1900";
+        }
+        if (useMfc) {
+            oss << ";__AFXWIN_H__=1";
+        }
+
+        // Add Y2038 specific flags to configuration
+        if (timeBitsDefined) {
+            oss << ";_TIME_BITS=" << timeBitsValue;
+        }
+        if (fileOffsetBitsDefined) {
+            oss << ";_FILE_OFFSET_BITS=" << fileOffsetBitsValue;
+        }
+        if (useTimeBits64Defined) {
+            oss << ";_USE_TIME_BITS64";
+        }
+
+        return oss.str();
     }
     std::set<std::string> undefs;
     std::list<std::string> includePaths;
+    std::list<std::string> forcedIncludes;
     // only used by clang mode
     std::list<std::string> systemIncludePaths;
     std::string standard;
@@ -106,6 +156,13 @@ struct CPPCHECKLIB FileSettings {
     // TODO: get rid of these
     bool msc{};
     bool useMfc{};
+
+    // Y2038 specific configuration flags
+    bool timeBitsDefined{};
+    int timeBitsValue{};
+    bool useTimeBits64Defined{};
+    bool fileOffsetBitsDefined{};
+    int fileOffsetBitsValue{};
 };
 
 #endif // fileSettingsH
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index 7c07e50825d..3e227873b26 100644
--- a/lib/forwardanalyzer.cpp
+++ b/lib/forwardanalyzer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -59,6 +59,10 @@ namespace {
         Analyzer::Terminate terminate = Analyzer::Terminate::None;
         std::vector<Token*> loopEnds;
         int branchCount = 0;
+        // Nested condition-fork depth on this lineage (copied by fork()); bounds the fan-out.
+        int forkDepth = 0;
+        // Total forks of the traversal (shared via the fork() copy); backstop past the depth bound.
+        std::shared_ptr<int> forkBudget = std::make_shared<int>(0);
 
         Progress Break(Analyzer::Terminate t = Analyzer::Terminate::None) {
             if ((!analyzeOnly || analyzeTerminate) && t != Analyzer::Terminate::None)
@@ -73,7 +77,6 @@ namespace {
             bool check = false;
             bool escape = false;
             bool escapeUnknown = false;
-            bool active = false;
             bool isEscape() const {
                 return escape || escapeUnknown;
             }
@@ -89,6 +92,9 @@ namespace {
             bool isDead() const {
                 return action.isModified() || action.isInconclusive() || isEscape();
             }
+            bool hasGoto() const {
+                return endBlock ? ForwardTraversal::hasGoto(endBlock) : false;
+            }
         };
 
         bool stopUpdates() {
@@ -138,7 +144,7 @@ namespace {
                 // If we are in a loop then jump to the end
                 if (out)
                     *out = loopEnds.back();
-            } else if (Token::Match(tok, "return|throw")) {
+            } else if (isEscapeKeyword(tok, settings)) {
                 traverseRecursive(tok->astOperand2(), f, traverseUnknown);
                 traverseRecursive(tok->astOperand1(), f, traverseUnknown);
                 return Break(Analyzer::Terminate::Escape);
@@ -208,7 +214,7 @@ namespace {
                 bool checkThen, checkElse;
                 std::tie(checkThen, checkElse) = evalCond(condTok);
                 if (!checkThen && !checkElse) {
-                    if (!traverseUnknown && stopOnCondition(condTok) && stopUpdates()) {
+                    if (!traverseUnknown && stopOnCondition(condTok) && tok->str() != "?" && stopUpdates()) {
                         return Progress::Continue;
                     }
                     checkThen = true;
@@ -348,18 +354,6 @@ namespace {
             return Token::findmatch(endBlock->link(), "goto|break", endBlock);
         }
 
-        bool hasInnerReturnScope(const Token* start, const Token* end) const {
-            for (const Token* tok=start; tok != end; tok = tok->previous()) {
-                if (Token::simpleMatch(tok, "}")) {
-                    const Token* ftok = nullptr;
-                    const bool r = isReturnScope(tok, settings.library, &ftok);
-                    if (r)
-                        return true;
-                }
-            }
-            return false;
-        }
-
         bool isEscapeScope(const Token* endBlock, bool& unknown) const {
             const Token* ftok = nullptr;
             const bool r = isReturnScope(endBlock, settings.library, &ftok);
@@ -383,30 +377,60 @@ namespace {
             return a;
         }
 
-        bool checkBranch(Branch& branch) const {
-            Analyzer::Action a = analyzeScope(branch.endBlock);
-            branch.action = a;
-            std::vector<ForwardTraversal> ft1 = tryForkUpdateScope(branch.endBlock, a.isModified());
-            const bool bail = hasGoto(branch.endBlock);
-            if (!a.isModified() && !bail) {
-                if (ft1.empty()) {
-                    // Traverse into the branch to see if there is a conditional escape
-                    if (!branch.escape && hasInnerReturnScope(branch.endBlock->previous(), branch.endBlock->link())) {
-                        ForwardTraversal ft2 = fork(true);
-                        ft2.updateScope(branch.endBlock);
-                        if (ft2.terminate == Analyzer::Terminate::Escape) {
-                            branch.escape = true;
-                            branch.escapeUnknown = false;
-                        }
-                    }
-                } else {
-                    if (ft1.front().terminate == Analyzer::Terminate::Escape) {
-                        branch.escape = true;
-                        branch.escapeUnknown = false;
-                    }
+        Progress updateBranch(Branch& branch, int depth)
+        {
+            // Save and reset actions
+            Analyzer::Action prevActions = actions;
+            actions = Analyzer::Action::None;
+            Progress p = updateRange(branch.endBlock->link(), branch.endBlock, depth);
+            branch.action |= actions;
+            // Restore actions
+            actions |= prevActions;
+
+            if (terminate == Analyzer::Terminate::Escape) {
+                branch.escape = true;
+                // The traversal followed an escaping path, but if the scope does not structurally
+                // always escape then another path (e.g. a modified fork) falls through, so the escape
+                // is only conditional - keep isModified() meaningful by not treating it as conclusive.
+                bool structuralUnknown = false;
+                const bool structuralEscape = isEscapeScope(branch.endBlock, structuralUnknown);
+                branch.escapeUnknown = !structuralEscape || structuralUnknown;
+                // The traversal stopped at the escape, so the rest of the scope was not walked; a
+                // fall-through path could still modify the value there - include the whole scope's
+                // actions so isModified() sees it.
+                if (branch.escapeUnknown)
+                    branch.action |= analyzeScope(branch.endBlock);
+            } else {
+                // Detect an escape the traversal did not flag (e.g. an unknown noreturn call);
+                // escapeUnknown reports a possible (unknown) escape.
+                branch.escape = isEscapeScope(branch.endBlock, branch.escapeUnknown);
+                if (terminate != Analyzer::Terminate::None && terminate != Analyzer::Terminate::Modified) {
+                    branch.action |= analyzeScope(branch.endBlock);
                 }
             }
-            return bail;
+
+            return p;
+        }
+
+        // Update the branch that the evaluated condition takes
+        Progress updateTakenBranch(Branch& branch, const Token* skippedBlock, const Token* condTok, int depth)
+        {
+            // The condition is only "known" because of an earlier assumption, so the
+            // skipped block could still modify the value -> lower to possible
+            if (!condTok->hasKnownIntValue() && skippedBlock && analyzeScope(skippedBlock).isModified() &&
+                !analyzer->lowerToPossible())
+                return Break(Analyzer::Terminate::Bail);
+            if (!branch.endBlock)
+                return Progress::Continue;
+            updateScopeState(branch.endBlock);
+            if (updateBranch(branch, depth - 1) == Progress::Break)
+                return Progress::Break;
+            // The branch was entered because of the tracked value; if it might not
+            // return (it ends in a call to an unknown, possibly noreturn function)
+            // then the value might not flow past the branch.
+            if (!condTok->hasKnownIntValue() && !branch.escape && branch.escapeUnknown && !analyzer->lowerToInconclusive())
+                return Break(Analyzer::Terminate::Bail);
+            return Progress::Continue;
         }
 
         bool reentersLoop(Token* endBlock, const Token* condTok, const Token* stepTok) const {
@@ -529,14 +553,12 @@ namespace {
                         forkContinue = false;
                 }
 
-                if (allAnalysis.isModified() || !forkContinue) {
-                    // TODO: Don't bail on missing condition
-                    if (!condTok)
-                        return Break(Analyzer::Terminate::Bail);
-                    if (analyzer->isConditional() && stopUpdates())
-                        return Break(Analyzer::Terminate::Conditional);
-                    analyzer->assume(condTok, false);
-                }
+                // TODO: Don't bail on missing condition
+                if (!condTok)
+                    return Break(Analyzer::Terminate::Bail);
+                if (analyzer->isConditional() && stopUpdates())
+                    return Break(Analyzer::Terminate::Conditional);
+                analyzer->assume(condTok, false);
                 if (forkContinue) {
                     for (ForwardTraversal& ft : ftv) {
                         if (!ft.actions.isIncremental())
@@ -562,19 +584,27 @@ namespace {
             return updateLoop(endToken, endBlock, condTok, initTok, stepTok, true);
         }
 
-        Progress updateScope(Token* endBlock, int depth = 20)
+        void updateScopeState(const Token* endBlock)
         {
-            if (!endBlock)
-                return Break();
             assert(endBlock->link());
-            Token* ctx = endBlock->link()->previous();
+            const Token* ctx = endBlock->link()->previous();
             if (Token::simpleMatch(ctx, ")"))
                 ctx = ctx->link()->previous();
             if (ctx)
                 analyzer->updateState(ctx);
+        }
+
+        Progress updateScope(Token* endBlock, int depth = 20)
+        {
+            if (!endBlock)
+                return Break();
+            updateScopeState(endBlock);
             return updateRange(endBlock->link(), endBlock, depth);
         }
 
+        /**
+         * @throws InternalError thrown on cyclic analysis
+         */
         Progress updateRange(Token* start, const Token* end, int depth = 20) {
             if (depth < 0)
                 return Break(Analyzer::Terminate::Bail);
@@ -643,11 +673,20 @@ namespace {
                         const bool inElse = scope->type == ScopeType::eElse;
                         const bool inDoWhile = scope->type == ScopeType::eDo;
                         const bool inLoop = contains({ScopeType::eDo, ScopeType::eFor, ScopeType::eWhile}, scope->type);
+                        const bool hasElse = Token::simpleMatch(tok, "} else {");
                         Token* condTok = getCondTokFromEnd(tok);
                         if (!condTok)
                             return Break();
+                        // When the 'else' branch escapes (e.g. returns), control can only continue
+                        // here via the 'then' branch, so the value established there is still
+                        // definite - keep it known instead of lowering to possible.
+                        bool elseEscape = false;
+                        if (!inLoop && !inElse && hasElse) {
+                            bool unknownEscape = false;
+                            elseEscape = isEscapeScope(tok->linkAt(2), unknownEscape);
+                        }
                         if (!condTok->hasKnownIntValue() || inLoop) {
-                            if (!analyzer->lowerToPossible())
+                            if (!elseEscape && !analyzer->lowerToPossible())
                                 return Break(Analyzer::Terminate::Bail);
                         } else if (condTok->getKnownIntValue() == inElse) {
                             return Break();
@@ -672,7 +711,7 @@ namespace {
                         }
                         analyzer->assume(condTok, !inElse, Analyzer::Assume::Quiet);
                         assert(!inDoWhile || Token::simpleMatch(tok, "} while ("));
-                        if (Token::simpleMatch(tok, "} else {") || inDoWhile)
+                        if (hasElse || inDoWhile)
                             tok = tok->linkAt(2);
                     } else if (contains({ScopeType::eTry, ScopeType::eCatch}, scope->type)) {
                         if (!analyzer->lowerToPossible())
@@ -684,7 +723,9 @@ namespace {
                            Token::simpleMatch(tok->linkAt(1), ") {")) {
                     if ((settings.vfOptions.maxForwardBranches > 0) && (++branchCount > settings.vfOptions.maxForwardBranches)) {
                         // TODO: should be logged on function-level instead of file-level
-                        reportError(Severity::information, "normalCheckLevelMaxBranches", "Limiting analysis of branches. Use --check-level=exhaustive to analyze all branches.");
+                        if (settings.severity.isEnabled(Severity::information)) {
+                            reportError(Severity::information, "normalCheckLevelMaxBranches", "Limiting analysis of branches. Use --check-level=exhaustive to analyze all branches.");
+                        }
                         return Break(Analyzer::Terminate::Bail);
                     }
                     Token* endCond = tok->linkAt(1);
@@ -726,71 +767,80 @@ namespace {
                         if (!thenBranch.check && !elseBranch.check && stopOnCondition(condTok) && stopUpdates())
                             return Break(Analyzer::Terminate::Conditional);
                         const bool hasElse = Token::simpleMatch(endBlock, "} else {");
-                        bool bail = false;
-
-                        // Traverse then block
-                        thenBranch.escape = isEscapeScope(endBlock, thenBranch.escapeUnknown);
+                        tok = hasElse ? endBlock->linkAt(2) : endBlock;
                         if (thenBranch.check) {
-                            thenBranch.active = true;
-                            if (updateScope(endBlock, depth - 1) == Progress::Break)
+                            if (updateTakenBranch(thenBranch, hasElse ? elseBranch.endBlock : nullptr, condTok, depth) ==
+                                Progress::Break)
+                                return Break();
+                        } else if (elseBranch.check) {
+                            if (updateTakenBranch(elseBranch, thenBranch.endBlock, condTok, depth) == Progress::Break)
                                 return Break();
-                        } else if (!elseBranch.check) {
-                            thenBranch.active = true;
-                            if (checkBranch(thenBranch))
-                                bail = true;
-                        }
-                        // Traverse else block
-                        if (hasElse) {
-                            elseBranch.escape = isEscapeScope(endBlock->linkAt(2), elseBranch.escapeUnknown);
-                            if (elseBranch.check) {
-                                elseBranch.active = true;
-                                const Progress result = updateScope(endBlock->linkAt(2), depth - 1);
-                                if (result == Progress::Break)
-                                    return Break();
-                            } else if (!thenBranch.check) {
-                                elseBranch.active = true;
-                                if (checkBranch(elseBranch))
-                                    bail = true;
-                            }
-                            tok = endBlock->linkAt(2);
                         } else {
-                            tok = endBlock;
-                        }
-                        if (thenBranch.active)
+                            const bool conditional = stopOnCondition(condTok);
+                            // The value only flows into the then-branch when the condition can split
+                            // it; for an opaque or correlated condition (e.g. 'if (f(x))') it does
+                            // not, so fork in analyze-only mode: the branch's effect is still tracked
+                            // but nothing is reported in it.
+                            ForwardTraversal ft = fork(!analyzer->updateScope(thenBranch.endBlock, false));
+                            // The branch is traversed below, so don't record its boundary state here.
+                            ft.analyzer->assume(condTok, true, Analyzer::Assume::Pending);
+                            Progress pThen = ft.updateBranch(thenBranch, depth - 1);
+                            // Merge the fork's actions so a modification in the then-branch bubbles up
+                            // to the enclosing branch's isModified().
                             actions |= thenBranch.action;
-                        if (elseBranch.active)
-                            actions |= elseBranch.action;
-                        if (bail)
-                            return Break(Analyzer::Terminate::Bail);
-                        if (thenBranch.isDead() && elseBranch.isDead()) {
-                            if (thenBranch.isModified() && elseBranch.isModified())
-                                return Break(Analyzer::Terminate::Modified);
-                            if (thenBranch.isConclusiveEscape() && elseBranch.isConclusiveEscape())
-                                return Break(Analyzer::Terminate::Escape);
-                            return Break(Analyzer::Terminate::Bail);
-                        }
-                        // Conditional return
-                        if (thenBranch.active && thenBranch.isEscape() && !hasElse) {
-                            if (!thenBranch.isConclusiveEscape()) {
-                                if (!analyzer->lowerToInconclusive())
-                                    return Break(Analyzer::Terminate::Bail);
-                            } else if (thenBranch.check) {
-                                return Break();
-                            } else {
-                                if (analyzer->isConditional() && stopUpdates())
-                                    return Break(Analyzer::Terminate::Conditional);
-                                analyzer->assume(condTok, false);
+
+                            // Commit the condition as false on the main path only when the then-branch
+                            // is dead. The else block, if any, is traversed separately (Pending); with
+                            // no else the false path continues past the closing brace, so record the
+                            // assumed state there (None).
+                            if (thenBranch.isDead())
+                                analyzer->assume(condTok,
+                                                 false,
+                                                 hasElse ? Analyzer::Assume::Pending : Analyzer::Assume::None);
+                            // The else block is traversed on the main path. If it kills the value
+                            // (modified) the main path stops, but the then-fork may still carry the
+                            // value forward, so defer the break until after the fork continues.
+                            Progress pElse = Progress::Continue;
+                            if (hasElse)
+                                pElse = updateBranch(elseBranch, depth - 1);
+                            if (thenBranch.isDead() || elseBranch.isDead()) {
+                                if (conditional && stopUpdates())
+                                    pElse = Break(Analyzer::Terminate::Conditional);
                             }
-                        }
-                        if (thenBranch.isInconclusive() || elseBranch.isInconclusive()) {
-                            if (!analyzer->lowerToInconclusive())
-                                return Break(Analyzer::Terminate::Bail);
-                        } else if (thenBranch.isModified() || elseBranch.isModified()) {
-                            if (!hasElse && analyzer->isConditional() && stopUpdates())
-                                return Break(Analyzer::Terminate::Conditional);
-                            if (!analyzer->lowerToPossible())
+                            if (thenBranch.isModified() || elseBranch.isModified()) {
+                                if (!ft.analyzer->lowerToPossible())
+                                    pThen = Progress::Break;
+                                if (pElse != Progress::Break && !analyzer->lowerToPossible())
+                                    pElse = Break(Analyzer::Terminate::Bail);
+                            }
+                            if (thenBranch.isInconclusive() || elseBranch.isInconclusive()) {
+                                if (!ft.analyzer->lowerToInconclusive())
+                                    pThen = Progress::Break;
+                                if (pElse != Progress::Break && !analyzer->lowerToInconclusive())
+                                    pElse = Break(Analyzer::Terminate::Bail);
+                            }
+                            if (thenBranch.hasGoto() || elseBranch.hasGoto()) {
                                 return Break(Analyzer::Terminate::Bail);
-                            analyzer->assume(condTok, elseBranch.isModified());
+                            }
+                            // Carry the then-fork forward, unless a limit is hit - then only the linear main
+                            // path continues (no bail). forkDepth bounds nesting, forkBudget total. <0 = off.
+                            assert(forkBudget != nullptr);
+                            const int forkDepthLimit = settings.vfOptions.maxForwardConditionForkDepth;
+                            const int forkBudgetLimit = settings.vfOptions.maxForwardConditionForks;
+                            const bool depthOk = forkDepthLimit < 0 || forkDepth < forkDepthLimit;
+                            const bool budgetOk = forkBudgetLimit < 0 || *forkBudget < forkBudgetLimit;
+                            if (pThen != Progress::Break && !thenBranch.isEscape() && depthOk && budgetOk) {
+                                ++(*forkBudget);
+                                ++ft.forkDepth;
+                                ft.updateRange(thenBranch.endBlock, end, depth - 1);
+                            }
+                            if (pElse == Progress::Break) {
+                                // Only the else branch escaped; the then branch falls through, so
+                                // the scope as a whole does not always escape.
+                                if (terminate == Analyzer::Terminate::Escape && !thenBranch.isEscape())
+                                    terminate = Analyzer::Terminate::None;
+                                return Break();
+                            }
                         }
                     }
                 } else if (Token::simpleMatch(tok, "try {")) {
@@ -840,7 +890,7 @@ namespace {
                     return Break();
                 } else if (Token* callTok = callExpr(tok)) {
                     // TODO: Dont traverse tokens a second time
-                    if (start != callTok && tok != callTok && updateRecursive(callTok->astOperand1()) == Progress::Break)
+                    if (start != callTok && tok != callTok && (tok->str() != "." || tok != callTok->astOperand1()) && updateRecursive(callTok->astOperand1()) == Progress::Break)
                         return Break();
                     // Since the call could be an unknown macro, traverse the tokens as a range instead of recursively
                     if (!Token::simpleMatch(callTok, "( )") &&
diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
index a9da624e7c4..07ba7cc2e59 100644
--- a/lib/fwdanalysis.cpp
+++ b/lib/fwdanalysis.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -26,9 +26,11 @@
 #include "token.h"
 #include "vfvalue.h"
 
+#include <deque>
 #include <list>
 #include <string>
 #include <utility>
+#include <vector>
 
 static bool isUnchanged(const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local)
 {
@@ -76,7 +78,7 @@ static bool hasGccCompoundStatement(const Token *tok)
 
 static bool nonLocal(const Variable* var, bool deref)
 {
-    return !var || (!var->isLocal() && !var->isArgument()) || (deref && var->isArgument() && var->isPointer()) || var->isStatic() || var->isReference() || var->isExtern();
+    return !var || (!var->isLocal() && !var->isArgument()) || (deref && var->isArgument() && var->isPointer()) || var->isStatic() || var->isExtern();
 }
 
 static bool hasVolatileCastOrVar(const Token *expr)
@@ -93,7 +95,7 @@ static bool hasVolatileCastOrVar(const Token *expr)
     return ret;
 }
 
-FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth)
+FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth) const
 {
     // Parse the given tokens
     if (++depth > 1000)
@@ -154,10 +156,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
         }
 
         if (tok->str() == "}") {
-            // Known value => possible value
-            if (tok->scope() == expr->scope())
-                mValueFlowKnown = false;
-
             if (tok->scope()->isLoopScope()) {
                 // check condition
                 const Token *conditionStart = nullptr;
@@ -194,65 +192,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
         if (Token::simpleMatch(tok, "asm ("))
             return Result(Result::Type::BAILOUT);
 
-        if (mWhat == What::ValueFlow && (Token::Match(tok, "while|for (") || Token::simpleMatch(tok, "do {"))) {
-            const Token *bodyStart = nullptr;
-            const Token *conditionStart = nullptr;
-            if (Token::simpleMatch(tok, "do {")) {
-                bodyStart = tok->next();
-                if (Token::simpleMatch(bodyStart->link(), "} while ("))
-                    conditionStart = bodyStart->link()->tokAt(2);
-            } else {
-                conditionStart = tok->next();
-                if (Token::simpleMatch(conditionStart->link(), ") {"))
-                    bodyStart = conditionStart->link()->next();
-            }
-
-            if (!bodyStart || !conditionStart)
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in condition?
-            if (!isUnchanged(conditionStart, conditionStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in loop body?
-            if (!isUnchanged(bodyStart, bodyStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-        }
-
-        if (mWhat == What::ValueFlow && Token::simpleMatch(tok, "if (") && Token::simpleMatch(tok->linkAt(1), ") {")) {
-            const Token *bodyStart = tok->linkAt(1)->next();
-            const Token *conditionStart = tok->next();
-            const Token *condTok = conditionStart->astOperand2();
-            if (const ValueFlow::Value* v = condTok->getKnownValue(ValueFlow::Value::ValueType::INT)) {
-                const bool cond = !!v->intvalue;
-                if (cond) {
-                    FwdAnalysis::Result result = checkRecursive(expr, bodyStart, bodyStart->link(), exprVarIds, local, true, depth);
-                    if (result.type != Result::Type::NONE)
-                        return result;
-                } else if (Token::simpleMatch(bodyStart->link(), "} else {")) {
-                    bodyStart = bodyStart->link()->tokAt(2);
-                    FwdAnalysis::Result result = checkRecursive(expr, bodyStart, bodyStart->link(), exprVarIds, local, true, depth);
-                    if (result.type != Result::Type::NONE)
-                        return result;
-                }
-            }
-            tok = bodyStart->link();
-            if (isReturnScope(tok, mSettings.library))
-                return Result(Result::Type::BAILOUT);
-            if (Token::simpleMatch(tok, "} else {"))
-                tok = tok->linkAt(2);
-            if (!tok)
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in condition?
-            if (!isUnchanged(conditionStart, conditionStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-
-            // Is expr changed in condition body?
-            if (!isUnchanged(bodyStart, bodyStart->link(), exprVarIds, local))
-                return Result(Result::Type::BAILOUT);
-        }
-
         if (!local && Token::Match(tok, "%name% (") && !Token::simpleMatch(tok->linkAt(1), ") {")) {
             // TODO: this is a quick bailout
             return Result(Result::Type::BAILOUT);
@@ -278,22 +217,15 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
                 parent = parent->astParent();
                 if (parent->str() == "(" && !parent->isCast())
                     break;
-                if (isSameExpression(false, expr, parent, mSettings, true, false, nullptr)) {
+                if (isSameExpression(false, expr, parent, mSettings, true, false, nullptr))
                     same = true;
-                    if (mWhat == What::ValueFlow) {
-                        KnownAndToken v;
-                        v.known = mValueFlowKnown;
-                        v.token = parent;
-                        mValueFlow.push_back(v);
-                    }
-                }
                 if (Token::Match(parent, ". %var%") && parent->next()->varId() && exprVarIds.find(parent->next()->varId()) == exprVarIds.end() &&
                     isSameExpression(false, expr->astOperand1(), parent->astOperand1(), mSettings, true, false, nullptr)) {
                     other = true;
                     break;
                 }
             }
-            if (mWhat != What::ValueFlow && same && Token::simpleMatch(parent->astParent(), "[") && parent == parent->astParent()->astOperand2()) {
+            if (same && Token::simpleMatch(parent->astParent(), "[") && parent == parent->astParent()->astOperand2()) {
                 return Result(Result::Type::READ);
             }
             if (other)
@@ -357,11 +289,11 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
                     ftok = ftok->astParent();
                 if (ftok && Token::Match(ftok->previous(), "%name% (")) {
                     const std::vector<const Token *> args = getArguments(ftok);
-                    int argnr = 0;
+                    size_t argnr = 0;
                     while (argnr < args.size() && args[argnr] != parent)
                         argnr++;
                     if (argnr < args.size()) {
-                        if (mSettings.library.getArgDirection(ftok->astOperand1(), argnr + 1) == Library::ArgumentChecks::Direction::DIR_OUT)
+                        if (mSettings.library.getArgDirection(ftok->astOperand1(), argnr + 1, /*indirect*/ 1) == Library::ArgumentChecks::Direction::DIR_OUT)
                             continue;
                     }
                 }
@@ -380,8 +312,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
                 return result1;
             if (mWhat == What::UnusedValue && result1.type == Result::Type::WRITE && expr->variable() && expr->variable()->isReference())
                 return result1;
-            if (mWhat == What::ValueFlow && result1.type == Result::Type::WRITE)
-                mValueFlowKnown = false;
             if (mWhat == What::Reassign && result1.type == Result::Type::BREAK) {
                 const Token *scopeEndToken = findNextTokenFromBreak(result1.token);
                 if (scopeEndToken) {
@@ -393,8 +323,6 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
             if (Token::simpleMatch(tok->linkAt(1), "} else {")) {
                 const Token *elseStart = tok->linkAt(1)->tokAt(2);
                 const Result &result2 = checkRecursive(expr, elseStart, elseStart->link(), exprVarIds, local, inInnerClass, depth);
-                if (mWhat == What::ValueFlow && result2.type == Result::Type::WRITE)
-                    mValueFlowKnown = false;
                 if (result2.type == Result::Type::READ || result2.type == Result::Type::BAILOUT)
                     return result2;
                 if (result1.type == Result::Type::WRITE && result2.type == Result::Type::WRITE)
@@ -409,6 +337,16 @@ FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const Token *
     return Result(Result::Type::NONE);
 }
 
+static bool isSimpleIndexExpression(const Token* tok)
+{
+    const Token* idx = tok->astOperand2();
+    if (!idx)
+        return false;
+    if (idx->isIncDecOp())
+        idx = idx->astOperand1();
+    return idx->variable() && idx->variable()->scope() == tok->scope();
+}
+
 std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOut, bool* unknownVarIdOut) const
 {
     // all variable ids in expr.
@@ -417,7 +355,7 @@ std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOu
     bool unknownVarId = false;
     visitAstNodes(expr,
                   [&](const Token *tok) {
-        if (tok->str() == "[" && mWhat == What::UnusedValue)
+        if (tok->str() == "[" && mWhat == What::UnusedValue && isSimpleIndexExpression(tok))
             return ChildrenToVisit::op1;
         if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") {
             // unknown variable
@@ -443,7 +381,7 @@ std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOu
     return exprVarIds;
 }
 
-FwdAnalysis::Result FwdAnalysis::check(const Token* expr, const Token* startToken, const Token* endToken)
+FwdAnalysis::Result FwdAnalysis::check(const Token* expr, const Token* startToken, const Token* endToken) const
 {
     // all variable ids in expr.
     bool local = true;
@@ -464,7 +402,7 @@ FwdAnalysis::Result FwdAnalysis::check(const Token* expr, const Token* startToke
     Result result = checkRecursive(expr, startToken, endToken, exprVarIds, local, false);
 
     // Break => continue checking in outer scope
-    while (mWhat!=What::ValueFlow && result.type == FwdAnalysis::Result::Type::BREAK) {
+    while (result.type == FwdAnalysis::Result::Type::BREAK) {
         const Token *scopeEndToken = findNextTokenFromBreak(result.token);
         if (!scopeEndToken)
             break;
@@ -478,9 +416,18 @@ bool FwdAnalysis::hasOperand(const Token *tok, const Token *lhs) const
 {
     if (!tok)
         return false;
-    if (isSameExpression(false, tok, lhs, mSettings, false, false, nullptr))
-        return true;
-    return hasOperand(tok->astOperand1(), lhs) || hasOperand(tok->astOperand2(), lhs);
+    std::deque<const Token*> nodes{ tok };
+    while (!nodes.empty()) {
+        const Token* node = nodes.front();
+        if (isSameExpression(false, node, lhs, mSettings, false, false, nullptr))
+            return true;
+        if (node->astOperand1())
+            nodes.emplace_back(node->astOperand1());
+        if (node->astOperand2())
+            nodes.emplace_back(node->astOperand2());
+        nodes.pop_front();
+    }
+    return false;
 }
 
 const Token *FwdAnalysis::reassign(const Token *expr, const Token *startToken, const Token *endToken)
@@ -522,7 +469,7 @@ bool FwdAnalysis::possiblyAliased(const Token *expr, const Token *startToken) co
         if (Token::Match(tok, "%name% (") && !Token::Match(tok, "if|while|for")) {
             // Is argument passed by reference?
             const std::vector<const Token*> args = getArguments(tok);
-            for (int argnr = 0; argnr < args.size(); ++argnr) {
+            for (size_t argnr = 0; argnr < args.size(); ++argnr) {
                 if (!Token::Match(args[argnr], "%name%|.|::"))
                     continue;
                 if (tok->function() && tok->function()->getArgumentVar(argnr) && !tok->function()->getArgumentVar(argnr)->isReference() && !tok->function()->isConst())
diff --git a/lib/fwdanalysis.h b/lib/fwdanalysis.h
index 389ea195da2..34d0da24d4d 100644
--- a/lib/fwdanalysis.h
+++ b/lib/fwdanalysis.h
@@ -25,7 +25,6 @@
 
 #include <cstdint>
 #include <set>
-#include <vector>
 
 class Token;
 class Settings;
@@ -60,11 +59,6 @@ class FwdAnalysis {
      */
     bool unusedValue(const Token *expr, const Token *startToken, const Token *endToken);
 
-    struct KnownAndToken {
-        bool known{};
-        const Token* token{};
-    };
-
     /** Is there some possible alias for given expression */
     bool possiblyAliased(const Token *expr, const Token *startToken) const;
 
@@ -80,13 +74,11 @@ class FwdAnalysis {
         const Token* token{};
     };
 
-    Result check(const Token *expr, const Token *startToken, const Token *endToken);
-    Result checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth=0);
+    Result check(const Token *expr, const Token *startToken, const Token *endToken) const;
+    Result checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth=0) const;
 
     const Settings &mSettings;
-    enum class What : std::uint8_t { Reassign, UnusedValue, ValueFlow } mWhat = What::Reassign;
-    std::vector<KnownAndToken> mValueFlow;
-    bool mValueFlowKnown = true;
+    enum class What : std::uint8_t { Reassign, UnusedValue } mWhat = What::Reassign;
 };
 
 #endif // fwdanalysisH
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index 8092053d6a8..61ef7a2d38a 100644
--- a/lib/importproject.cpp
+++ b/lib/importproject.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,6 +19,7 @@
 #include "importproject.h"
 
 #include "path.h"
+#include "pathmatch.h"
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
@@ -30,41 +31,171 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
+#include <initializer_list>
 #include <iostream>
 #include <iterator>
-#include <sstream>
 #include <stack>
+#include <stdexcept>
 #include <unordered_set>
 #include <utility>
+#include <vector>
 
 #include "xml.h"
 
 #include "json.h"
 
-// TODO: align the exclusion logic with PathMatch
-// TODO: PathMatch lacks glob support
-void ImportProject::ignorePaths(const std::vector<std::string> &ipaths, bool debug)
+std::string ImportProject::collectArgs(const std::string &cmd, std::vector<std::string> &args)
 {
-    for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
-        bool ignore = false;
-        for (std::string i : ipaths) {
-            if (it->filename().size() > i.size() && it->filename().compare(0,i.size(),i)==0) {
-                ignore = true;
-                break;
+    args.clear();
+
+    std::string::size_type pos = 0;
+    const std::string::size_type end = cmd.size();
+    std::string arg;
+
+    bool inDoubleQuotes = false;
+    bool inSingleQuotes = false;
+
+    while (pos < end) {
+        char c = cmd[pos++];
+
+        if (c == ' ') {
+            if (inDoubleQuotes || inSingleQuotes) {
+                arg.push_back(c);
+                continue;
             }
-            if (isValidGlobPattern(i) && matchglob(i, it->filename())) {
-                ignore = true;
+
+            if (!arg.empty())
+                args.push_back(arg);
+            arg.clear();
+
+            pos = cmd.find_first_not_of(' ', pos);
+
+            continue;
+        }
+
+        if (c == '\"' && !inSingleQuotes) {
+            inDoubleQuotes = !inDoubleQuotes;
+            continue;
+        }
+
+        if (c == '\'' && !inDoubleQuotes) {
+            inSingleQuotes = !inSingleQuotes;
+            continue;
+        }
+
+        if (c == '\\' && !inSingleQuotes) {
+            if (pos == end) {
+                arg.push_back('\\');
                 break;
             }
-            if (!Path::isAbsolute(i)) {
-                i = mPath + i;
-                if (it->filename().size() > i.size() && it->filename().compare(0,i.size(),i)==0) {
-                    ignore = true;
-                    break;
-                }
-            }
+
+            c = cmd[pos++];
+
+            if (!std::strchr("\\\"\' ", c))
+                arg.push_back('\\');
+
+            arg.push_back(c);
+            continue;
+        }
+
+        arg.push_back(c);
+    }
+
+    if (inSingleQuotes || inDoubleQuotes)
+        return "Missing closing quote in command string";
+
+    if (!arg.empty())
+        args.push_back(std::move(arg));
+
+    return "";
+}
+
+void ImportProject::parseArgs(FileSettings &fs, const std::vector<std::string> &args)
+{
+    const auto getOptArg = [&args](std::initializer_list<std::string> optNames,
+                                   std::size_t &i) {
+        const auto &arg = args[i];
+        const auto *const it = std::find_if(optNames.begin(),
+                                            optNames.end(),
+                                            [&arg] (const std::string &optName) {
+            return startsWith(arg, optName);
+        });
+
+        if (it == optNames.end())
+            return std::string();
+
+        const std::size_t optLen = it->size();
+        if (arg.size() == optLen)
+            return ++i >= args.size() ? std::string() : args[i];
+
+        return arg.substr(optLen);
+    };
+
+    std::string defs;
+    for (std::size_t i = 0; i < args.size(); i++) {
+        std::string optArg;
+
+        if (!(optArg = getOptArg({ "-I", "/I" }, i)).empty()) {
+            if (std::none_of(fs.includePaths.cbegin(), fs.includePaths.cend(),
+                             [&](const std::string &path) {
+                return path == optArg;
+            }))
+                fs.includePaths.push_back(std::move(optArg));
+            continue;
+        }
+
+        if (!(optArg = getOptArg({ "-isystem" }, i)).empty()) {
+            fs.systemIncludePaths.push_back(std::move(optArg));
+            continue;
+        }
+
+        if (!(optArg = getOptArg({ "-include", "/FI", "-FI" }, i)).empty()) {
+            fs.forcedIncludes.push_back(std::move(optArg));
+            continue;
+        }
+
+        if (!(optArg = getOptArg({ "-D", "/D" }, i)).empty()) {
+            defs += optArg + ";";
+            continue;
         }
-        if (ignore) {
+
+        if (!(optArg = getOptArg({ "-U", "/U" }, i)).empty()) {
+            fs.undefs.insert(std::move(optArg));
+            continue;
+        }
+
+        if (!(optArg = getOptArg({ "-std=", "/std:" }, i)).empty()) {
+            fs.standard = std::move(optArg);
+            continue;
+        }
+
+        if (!(optArg = getOptArg({ "-f" }, i)).empty()) {
+            if (optArg == "pic")
+                defs += "__pic__;";
+            else if (optArg == "PIC")
+                defs += "__PIC__;";
+            else if (optArg == "pie")
+                defs += "__pie__;";
+            else if (optArg == "PIE")
+                defs += "__PIE__;";
+            continue;
+        }
+
+        if (!(optArg = getOptArg({ "-m" }, i)).empty()) {
+            if (optArg == "unicode")
+                defs += "UNICODE;";
+            continue;
+        }
+    }
+
+    fsSetDefines(fs, std::move(defs));
+}
+
+void ImportProject::ignorePaths(const std::vector<std::string> &ipaths, bool debug)
+{
+    PathMatch matcher(ipaths, Path::getCurrentPath());
+    for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
+        if (matcher.match(it->filename())) {
             if (debug)
                 std::cout << "ignored path: " << it->filename() << std::endl;
             it = fileSettings.erase(it);
@@ -96,7 +227,7 @@ void ImportProject::fsSetDefines(FileSettings& fs, std::string defs)
     while (!defs.empty() && defs[0] == ';')
         defs.erase(0, 1);
     while (!defs.empty() && endsWith(defs,';'))
-        defs.erase(defs.size() - 1U); // TODO: Use std::string::pop_back() as soon as travis supports it
+        defs.pop_back();
     bool eq = false;
     for (std::size_t pos = 0; pos < defs.size(); ++pos) {
         if (defs[pos] == '(' || defs[pos] == '=')
@@ -205,6 +336,11 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
             setRelativePaths(filename);
             return ImportProject::Type::VS_SLN;
         }
+    } else if (endsWith(filename, ".slnx")) {
+        if (importSlnx(filename, fileFilters)) {
+            setRelativePaths(filename);
+            return ImportProject::Type::VS_SLNX;
+        }
     } else if (endsWith(filename, ".vcxproj")) {
         std::map<std::string, std::string, cppcheck::stricmp> variables;
         std::vector<SharedItemsProject> sharedItemsProjects;
@@ -228,137 +364,30 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
     return ImportProject::Type::FAILURE;
 }
 
-static std::string readUntil(const std::string &command, std::string::size_type *pos, const char until[])
-{
-    std::string ret;
-    bool escapedString = false;
-    bool str = false;
-    bool escape = false;
-    for (; *pos < command.size() && (str || !std::strchr(until, command[*pos])); (*pos)++) {
-        if (escape)
-            escape = false;
-        else if (command[*pos] == '\\') {
-            if (str)
-                escape = true;
-            else if (command[*pos + 1] == '"') {
-                if (escapedString)
-                    return ret + "\\\"";
-                escapedString = true;
-                ret += "\\\"";
-                (*pos)++;
-                continue;
-            }
-        } else if (command[*pos] == '\"')
-            str = !str;
-        ret += command[*pos];
-    }
-    return ret;
-}
-
-static std::string unescape(const std::string &in)
-{
-    std::string out;
-    bool escape = false;
-    for (const char c: in) {
-        if (escape) {
-            escape = false;
-            if (!std::strchr("\\\"\'",c))
-                out += "\\";
-            out += c;
-        } else if (c == '\\')
-            escape = true;
-        else
-            out += c;
-    }
-    return out;
-}
-
-void ImportProject::fsParseCommand(FileSettings& fs, const std::string& command)
-{
-    std::string defs;
-
-    // Parse command..
-    std::string::size_type pos = 0;
-    while (std::string::npos != (pos = command.find(' ',pos))) {
-        while (pos < command.size() && command[pos] == ' ')
-            pos++;
-        if (pos >= command.size())
-            break;
-        if (command[pos] != '/' && command[pos] != '-')
-            continue;
-        pos++;
-        if (pos >= command.size())
-            break;
-        const char F = command[pos++];
-        if (std::strchr("DUI", F)) {
-            while (pos < command.size() && command[pos] == ' ')
-                ++pos;
-        }
-        std::string fval = readUntil(command, &pos, " =");
-        if (F=='D') {
-            std::string defval = readUntil(command, &pos, " ");
-            defs += fval;
-            if (defval.size() >= 3 && startsWith(defval,"=\"") && defval.back()=='\"')
-                defval = "=" + unescape(defval.substr(2, defval.size() - 3));
-            else if (defval.size() >= 5 && startsWith(defval, "=\\\"") && endsWith(defval, "\\\""))
-                defval = "=\"" + unescape(defval.substr(3, defval.size() - 5)) + "\"";
-            if (!defval.empty())
-                defs += defval;
-            defs += ';';
-        } else if (F=='U')
-            fs.undefs.insert(std::move(fval));
-        else if (F=='I') {
-            std::string i = std::move(fval);
-            if (i.size() > 1 && i[0] == '\"' && i.back() == '\"')
-                i = unescape(i.substr(1, i.size() - 2));
-            if (std::find(fs.includePaths.cbegin(), fs.includePaths.cend(), i) == fs.includePaths.cend())
-                fs.includePaths.push_back(std::move(i));
-        } else if (F=='s' && startsWith(fval,"td")) {
-            ++pos;
-            fs.standard = readUntil(command, &pos, " ");
-        } else if (F == 'i' && fval == "system") {
-            ++pos;
-            std::string isystem = readUntil(command, &pos, " ");
-            fs.systemIncludePaths.push_back(std::move(isystem));
-        } else if (F=='m') {
-            if (fval == "unicode") {
-                defs += "UNICODE";
-                defs += ";";
-            }
-        } else if (F=='f') {
-            if (fval == "pic") {
-                defs += "__pic__";
-                defs += ";";
-            } else if (fval == "PIC") {
-                defs += "__PIC__";
-                defs += ";";
-            } else if (fval == "pie") {
-                defs += "__pie__";
-                defs += ";";
-            } else if (fval == "PIE") {
-                defs += "__PIE__";
-                defs += ";";
-            }
-            // TODO: support -fsigned-char and -funsigned-char?
-            // we can only set it globally but in this context it needs to be treated per file
-        }
-    }
-    fsSetDefines(fs, std::move(defs));
-}
-
 bool ImportProject::importCompileCommands(std::istream &istr)
 {
     picojson::value compileCommands;
     istr >> compileCommands;
     if (!compileCommands.is<picojson::array>()) {
-        printError("compilation database is not a JSON array");
+        errors.emplace_back("compilation database is not a JSON array");
         return false;
     }
 
-    std::map<std::string, int> fileIndex;
+    std::map<std::string, std::size_t> fsFileIds;
 
     for (const picojson::value &fileInfo : compileCommands.get<picojson::array>()) {
         picojson::object obj = fileInfo.get<picojson::object>();
+
+        if (obj.count("directory") == 0) {
+            errors.emplace_back("'directory' field in compilation database entry missing");
+            return false;
+        }
+
+        if (!obj["directory"].is<std::string>()) {
+            errors.emplace_back("'directory' field in compilation database entry is not a string");
+            return false;
+        }
+
         std::string dirpath = Path::fromNativeSeparators(obj["directory"].get<std::string>());
 
         /* CMAKE produces the directory without trailing / so add it if not
@@ -368,35 +397,38 @@ bool ImportProject::importCompileCommands(std::istream &istr)
 
         const std::string directory = std::move(dirpath);
 
-        std::string command;
+        std::vector<std::string> arguments;
         if (obj.count("arguments")) {
             if (obj["arguments"].is<picojson::array>()) {
                 for (const picojson::value& arg : obj["arguments"].get<picojson::array>()) {
-                    if (arg.is<std::string>()) {
-                        std::string str = arg.get<std::string>();
-                        if (str.find(' ') != std::string::npos)
-                            str = "\"" + str + "\"";
-                        command += str + " ";
-                    }
+                    if (arg.is<std::string>())
+                        arguments.push_back(arg.get<std::string>());
                 }
             } else {
-                printError("'arguments' field in compilation database entry is not a JSON array");
+                errors.emplace_back("'arguments' field in compilation database entry is not a JSON array");
                 return false;
             }
         } else if (obj.count("command")) {
+            std::string command;
             if (obj["command"].is<std::string>()) {
                 command = obj["command"].get<std::string>();
             } else {
-                printError("'command' field in compilation database entry is not a string");
+                errors.emplace_back("'command' field in compilation database entry is not a string");
+                return false;
+            }
+
+            std::string error = collectArgs(command, arguments);
+            if (!error.empty()) {
+                errors.emplace_back(error);
                 return false;
             }
         } else {
-            printError("no 'arguments' or 'command' field found in compilation database entry");
+            errors.emplace_back("no 'arguments' or 'command' field found in compilation database entry");
             return false;
         }
 
         if (!obj.count("file") || !obj["file"].is<std::string>()) {
-            printError("skip compilation database entry because it does not have a proper 'file' field");
+            errors.emplace_back("skip compilation database entry because it does not have a proper 'file' field");
             continue;
         }
 
@@ -418,17 +450,13 @@ bool ImportProject::importCompileCommands(std::istream &istr)
 #endif
         else
             path = Path::simplifyPath(directory + file);
-        if (!sourceFileExists(path)) {
-            printError("'" + path + "' from compilation database does not exist");
-            return false;
-        }
         FileSettings fs{path, Standards::Language::None, 0}; // file will be identified later on
-        fsParseCommand(fs, command); // read settings; -D, -I, -U, -std, -m*, -f*
+        parseArgs(fs, arguments);
         std::map<std::string, std::string, cppcheck::stricmp> variables;
         fsSetIncludePaths(fs, directory, fs.includePaths, variables);
         // Assign a unique index to each file path. If the file path already exists in the map,
         // increment the index to handle duplicate file entries.
-        fs.fileIndex = fileIndex[path]++;
+        fs.file.setFsFileId(fsFileIds[path]++);
         fileSettings.push_back(std::move(fs));
     }
 
@@ -440,14 +468,14 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
     std::string line;
 
     if (!std::getline(istr,line)) {
-        printError("Visual Studio solution file is empty");
+        errors.emplace_back("Visual Studio solution file is empty");
         return false;
     }
 
     if (!startsWith(line, "Microsoft Visual Studio Solution File")) {
         // Skip BOM
         if (!std::getline(istr, line) || !startsWith(line, "Microsoft Visual Studio Solution File")) {
-            printError("Visual Studio solution file header not found");
+            errors.emplace_back("Visual Studio solution file header not found");
             return false;
         }
     }
@@ -472,14 +500,86 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
             vcxproj = path + vcxproj;
         vcxproj = Path::fromNativeSeparators(std::move(vcxproj));
         if (!importVcxproj(vcxproj, variables, "", fileFilters, sharedItemsProjects)) {
-            printError("failed to load '" + vcxproj + "' from Visual Studio solution");
+            errors.emplace_back("failed to load '" + vcxproj + "' from Visual Studio solution");
+            return false;
+        }
+        found = true;
+    }
+
+    if (!found) {
+        errors.emplace_back("no projects found in Visual Studio solution file");
+        return false;
+    }
+
+    return true;
+}
+
+bool ImportProject::importSlnx(const std::string& filename, const std::vector<std::string>& fileFilters)
+{
+    tinyxml2::XMLDocument doc;
+    const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());
+    if (error != tinyxml2::XML_SUCCESS) {
+        errors.emplace_back(std::string("Visual Studio solution file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
+        return false;
+    }
+
+    const tinyxml2::XMLElement* const rootnode = doc.FirstChildElement();
+    if (rootnode == nullptr) {
+        errors.emplace_back("Visual Studio solution file has no XML root node");
+        return false;
+    }
+
+    if (std::strcmp(rootnode->Name(), "Solution") != 0) {
+        errors.emplace_back("Invalid Visual Studio solution file format");
+        return false;
+    }
+
+    std::map<std::string, std::string, cppcheck::stricmp> variables;
+    variables["SolutionDir"] = Path::simplifyPath(Path::getPathFromFilename(filename));
+
+    bool found = false;
+    std::vector<SharedItemsProject> sharedItemsProjects;
+
+    auto processProject = [&](const tinyxml2::XMLElement* projectNode) {
+        const char* pathAttribute = projectNode->Attribute("Path");
+        if (pathAttribute == nullptr)
+            return true;
+
+        std::string vcxproj(pathAttribute);
+        vcxproj = Path::toNativeSeparators(std::move(vcxproj));
+
+        if (Path::getFilenameExtensionInLowerCase(vcxproj) != ".vcxproj")
+            return true; // skip other project types
+
+        if (!Path::isAbsolute(vcxproj))
+            vcxproj = variables["SolutionDir"] + vcxproj;
+
+        vcxproj = Path::fromNativeSeparators(std::move(vcxproj));
+        if (!importVcxproj(vcxproj, variables, "", fileFilters, sharedItemsProjects)) {
+            errors.emplace_back("failed to load '" + vcxproj + "' from Visual Studio solution");
             return false;
         }
         found = true;
+        return true;
+    };
+
+    for (const tinyxml2::XMLElement* node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
+        const char* name = node->Name();
+        if (std::strcmp(name, "Project") == 0) {
+            if (!processProject(node))
+                return false;
+        } else if (std::strcmp(name, "Folder") == 0) {
+            for (const tinyxml2::XMLElement* childNode = node->FirstChildElement(); childNode; childNode = childNode->NextSiblingElement()) {
+                if (std::strcmp(childNode->Name(), "Project") == 0) {
+                    if (!processProject(childNode))
+                        return false;
+                }
+            }
+        }
     }
 
     if (!found) {
-        printError("no projects found in Visual Studio solution file");
+        errors.emplace_back("no projects found in Visual Studio solution file");
         return false;
     }
 
@@ -488,6 +588,7 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
 
 namespace {
     struct ProjectConfiguration {
+        ProjectConfiguration() = default;
         explicit ProjectConfiguration(const tinyxml2::XMLElement *cfg) {
             const char *a = cfg->Attribute("Include");
             if (a)
@@ -516,11 +617,143 @@ namespace {
         std::string platformStr;
     };
 
-    struct ItemDefinitionGroup {
-        explicit ItemDefinitionGroup(const tinyxml2::XMLElement *idg, std::string includePaths) : additionalIncludePaths(std::move(includePaths)) {
+    struct Conditional {
+        explicit Conditional(const tinyxml2::XMLElement *idg){
             const char *condAttr = idg->Attribute("Condition");
             if (condAttr)
-                condition = condAttr;
+                mCondition = condAttr;
+        }
+        explicit Conditional(std::string condition) : mCondition(std::move(condition)) {}
+
+        static void replaceAll(std::string &c, const std::string &from, const std::string &to) {
+            std::string::size_type pos;
+            while ((pos = c.find(from)) != std::string::npos) {
+                c.erase(pos,from.size());
+                c.insert(pos,to);
+            }
+        }
+
+        // see https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-conditions
+        // properties are .NET String objects and you can call any of its members on them
+        bool conditionIsTrue(const ProjectConfiguration &p, const std::string &filename, std::vector<std::string> &errors) const {
+            if (mCondition.empty())
+                return true;
+            try {
+                return evalCondition(mCondition, p);
+            }
+            catch (const std::runtime_error& r)
+            {
+                errors.emplace_back(filename + ": Can not evaluate condition '" + mCondition + "': " + r.what());
+                return false;
+            }
+        }
+
+        static bool evalCondition(const std::string& condition, const ProjectConfiguration &p) {
+            std::string c = '(' + condition + ")\n";
+            replaceAll(c, "$(Configuration)", p.configuration);
+            replaceAll(c, "$(Platform)", p.platformStr);
+
+            const Settings s;
+            TokenList tokenlist(s, Standards::Language::C);
+            if (!tokenlist.createTokensFromBuffer(c.data(), c.size())) {
+                throw std::runtime_error("Can not tokenize condition");
+            }
+
+            // generate links
+            {
+                std::stack<Token*> lpar;
+                for (Token* tok2 = tokenlist.front(); tok2; tok2 = tok2->next()) {
+                    if (tok2->str() == "(")
+                        lpar.push(tok2);
+                    else if (tok2->str() == ")") {
+                        if (lpar.empty())
+                            throw std::runtime_error("unmatched ')' in condition " + condition);
+                        Token::createMutualLinks(lpar.top(), tok2);
+                        lpar.pop();
+                    }
+                }
+                if (!lpar.empty())
+                    throw std::runtime_error("'(' without closing ')'!");
+            }
+
+            // Replace "And" and "Or" with "&&" and "||"
+            for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
+                if (tok->str() == "And")
+                    tok->str("&&");
+                else if (tok->str() == "Or")
+                    tok->str("||");
+            }
+
+            tokenlist.createAst();
+
+            // Locate ast top and execute the condition
+            for (const Token *tok = tokenlist.front(); tok; tok = tok->next()) {
+                if (tok->astParent()) {
+                    return execute(tok->astTop(), p) == "True";
+                }
+            }
+            throw std::runtime_error("Invalid condition: '" + condition + "'");
+        }
+
+
+    private:
+
+        static std::string executeOp1(const Token* tok, const ProjectConfiguration &p) {
+            return execute(tok->astOperand1(), p);
+        }
+
+        static std::string executeOp2(const Token* tok, const ProjectConfiguration &p) {
+            return execute(tok->astOperand2(), p);
+        }
+
+        static std::string execute(const Token* tok, const ProjectConfiguration &p) {
+            if (!tok)
+                throw std::runtime_error("Missing operator");
+            auto boolResult = [](bool b) -> std::string {
+                return b ? "True" : "False";
+            };
+            if (tok->isUnaryOp("!"))
+                return boolResult(executeOp1(tok, p) == "False");
+            if (tok->str() == "==")
+                return boolResult(executeOp1(tok, p) == executeOp2(tok, p));
+            if (tok->str() == "!=")
+                return boolResult(executeOp1(tok, p) != executeOp2(tok, p));
+            if (tok->str() == "&&")
+                return boolResult(executeOp1(tok, p) == "True" && executeOp2(tok, p) == "True");
+            if (tok->str() == "||")
+                return boolResult(executeOp1(tok, p) == "True" || executeOp2(tok, p) == "True");
+            if (tok->str() == "(" && Token::Match(tok->previous(), "$ ( %name% . %name% (")) {
+                const std::string& propertyName = tok->strAt(1);
+                std::string propertyValue;
+                if (propertyName == "Configuration")
+                    propertyValue = p.configuration;
+                else if (propertyName == "Platform")
+                    propertyValue = p.platformStr;
+                else
+                    throw std::runtime_error("Unhandled property '" + propertyName + "'");
+                const std::string& method = tok->strAt(3);
+                std::string arg = executeOp2(tok->tokAt(4), p);
+                if (arg.size() >= 2 && arg[0] == '\'')
+                    arg = arg.substr(1, arg.size() - 2);
+                if (method == "Contains")
+                    return boolResult(propertyValue.find(arg) != std::string::npos);
+                if (method == "EndsWith")
+                    return boolResult(endsWith(propertyValue,arg.c_str(),arg.size()));
+                if (method == "StartsWith")
+                    return boolResult(startsWith(propertyValue,arg));
+                throw std::runtime_error("Unhandled method '" + method + "'");
+            }
+            if (tok->str().size() >= 2 && tok->str()[0] == '\'') // String Literal
+                return tok->str();
+
+            throw std::runtime_error("Unknown/unhandled operator/operand '" + tok->str() + "'");
+        }
+
+        std::string mCondition;
+    };
+
+    struct ItemDefinitionGroup : Conditional {
+        explicit ItemDefinitionGroup(const tinyxml2::XMLElement *idg, std::string includePaths) : Conditional(idg), additionalIncludePaths(std::move(includePaths)) {
             for (const tinyxml2::XMLElement *e1 = idg->FirstChildElement(); e1; e1 = e1->NextSiblingElement()) {
                 const char* name = e1->Name();
                 if (std::strcmp(name, "ClCompile") == 0) {
@@ -563,61 +796,57 @@ namespace {
             }
         }
 
-        static void replaceAll(std::string &c, const std::string &from, const std::string &to) {
-            std::string::size_type pos;
-            while ((pos = c.find(from)) != std::string::npos) {
-                c.erase(pos,from.size());
-                c.insert(pos,to);
+        std::string enhancedInstructionSet;
+        std::string preprocessorDefinitions;
+        std::string additionalIncludePaths;
+        std::string entryPointSymbol; // TODO: use this
+        Standards::cppstd_t cppstd = Standards::CPPLatest;
+    };
+
+    struct ConfigurationPropertyGroup : Conditional {
+        explicit ConfigurationPropertyGroup(const tinyxml2::XMLElement *idg) : Conditional(idg) {
+            for (const tinyxml2::XMLElement *e = idg->FirstChildElement(); e; e = e->NextSiblingElement()) {
+                if (std::strcmp(e->Name(), "UseOfMfc") == 0) {
+                    useOfMfc = true;
+                } else if (std::strcmp(e->Name(), "CharacterSet") == 0) {
+                    useUnicode = std::strcmp(e->GetText(), "Unicode") == 0;
+                }
             }
         }
 
-        // see https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-conditions
-        // properties are .NET String objects and you can call any of its members on them
-        bool conditionIsTrue(const ProjectConfiguration &p) const {
-            if (condition.empty())
-                return true;
-            std::string c = '(' + condition + ");";
-            replaceAll(c, "$(Configuration)", p.configuration);
-            replaceAll(c, "$(Platform)", p.platformStr);
+        bool useOfMfc = false;
+        bool useUnicode = false;
+    };
 
-            // TODO: improve evaluation
-            const Settings s;
-            TokenList tokenlist(s, Standards::Language::C);
-            std::istringstream istr(c);
-            tokenlist.createTokens(istr); // TODO: check result
-            // TODO: put in a helper
-            // generate links
-            {
-                std::stack<Token*> lpar;
-                for (Token* tok2 = tokenlist.front(); tok2; tok2 = tok2->next()) {
-                    if (tok2->str() == "(")
-                        lpar.push(tok2);
-                    else if (tok2->str() == ")") {
-                        if (lpar.empty())
-                            break;
-                        Token::createMutualLinks(lpar.top(), tok2);
-                        lpar.pop();
-                    }
+    struct ItemGroupClCompile {
+        explicit ItemGroupClCompile(std::string filename) : mFilename(std::move(filename)) {}
+        ItemGroupClCompile(const tinyxml2::XMLElement *element, std::string file) : mFilename(std::move(file)) {
+            for (const tinyxml2::XMLElement* childElement = element->FirstChildElement(); childElement; childElement = childElement->NextSiblingElement()) {
+                const char *name = childElement->Name();
+                if (!name)
+                    continue;
+                if (std::strcmp(name, "ExcludedFromBuild") == 0) {
+                    const char *condition = childElement->Attribute("Condition");
+                    const char *text = childElement->GetText();
+                    if (!condition || !text || std::strcmp(text, "true") != 0)
+                        continue;
+                    mConditions.emplace_back(condition);
                 }
+                // TODO: ForcedIncludeFiles and PrecompiledHeaderFile
             }
-            tokenlist.createAst();
-            for (const Token *tok = tokenlist.front(); tok; tok = tok->next()) {
-                if (tok->str() == "(" && tok->astOperand1() && tok->astOperand2()) {
-                    // TODO: this is wrong - it is Contains() not Equals()
-                    if (tok->astOperand1()->expressionString() == "Configuration.Contains")
-                        return ('\'' + p.configuration + '\'') == tok->astOperand2()->str();
-                }
-                if (tok->str() == "==" && tok->astOperand1() && tok->astOperand2() && tok->astOperand1()->str() == tok->astOperand2()->str())
+        }
+        bool exclude(const ProjectConfiguration& p, std::vector<std::string>& errors) const {
+            if (mConditions.empty())
+                return false;
+            for (const std::string& condition : mConditions) {
+                Conditional conditional(condition);
+                if (conditional.conditionIsTrue(p, mFilename, errors))
                     return true;
             }
             return false;
         }
-        std::string condition;
-        std::string enhancedInstructionSet;
-        std::string preprocessorDefinitions;
-        std::string additionalIncludePaths;
-        std::string entryPointSymbol; // TODO: use this
-        Standards::cppstd_t cppstd = Standards::CPPLatest;
+        std::string mFilename;
+        std::list<std::string> mConditions;
     };
 }
 
@@ -637,17 +866,8 @@ static std::list<std::string> toStringList(const std::string &s)
     return ret;
 }
 
-static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::string,std::string,cppcheck::stricmp> &variables, std::string &includePath, bool *useOfMfc)
+static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::string, std::string, cppcheck::stricmp> &variables, std::string &includePath)
 {
-    if (useOfMfc) {
-        for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
-            if (std::strcmp(e->Name(), "UseOfMfc") == 0) {
-                *useOfMfc = true;
-                break;
-            }
-        }
-    }
-
     const char* labelAttribute = node->Attribute("Label");
     if (labelAttribute && std::strcmp(labelAttribute, "UserMacros") == 0) {
         for (const tinyxml2::XMLElement *propertyGroup = node->FirstChildElement(); propertyGroup; propertyGroup = propertyGroup->NextSiblingElement()) {
@@ -708,34 +928,42 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s
                 }
             }
         } else if (std::strcmp(name,"PropertyGroup")==0) {
-            importPropertyGroup(node, variables, includePath, nullptr);
+            importPropertyGroup(node, variables, includePath);
         } else if (std::strcmp(name,"ItemDefinitionGroup")==0) {
             itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
         }
     }
 }
 
-bool ImportProject::importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache)
+bool ImportProject::importVcxproj(const std::string &filename,
+                                  std::map<std::string, std::string, cppcheck::stricmp> &variables,
+                                  const std::string &additionalIncludeDirectories,
+                                  const std::vector<std::string> &fileFilters,
+                                  std::vector<SharedItemsProject> &cache)
+{
+    tinyxml2::XMLDocument doc;
+    const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());
+    if (error != tinyxml2::XML_SUCCESS) {
+        errors.emplace_back(std::string("Visual Studio project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
+        return false;
+    }
+    return importVcxproj(filename, doc, variables, additionalIncludeDirectories, fileFilters, cache);
+}
+
+bool ImportProject::importVcxproj(const std::string &filename, const tinyxml2::XMLDocument &doc, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache)
 {
     variables["ProjectDir"] = Path::simplifyPath(Path::getPathFromFilename(filename));
 
     std::list<ProjectConfiguration> projectConfigurationList;
-    std::list<std::string> compileList;
+    std::list<ItemGroupClCompile> compileList;
     std::list<ItemDefinitionGroup> itemDefinitionGroupList;
+    std::vector<ConfigurationPropertyGroup> configurationPropertyGroups;
     std::string includePath;
     std::vector<SharedItemsProject> sharedItemsProjects;
 
-    bool useOfMfc = false;
-
-    tinyxml2::XMLDocument doc;
-    const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());
-    if (error != tinyxml2::XML_SUCCESS) {
-        printError(std::string("Visual Studio project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
-        return false;
-    }
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
     if (rootnode == nullptr) {
-        printError("Visual Studio project file has no XML root node");
+        errors.emplace_back("Visual Studio project file has no XML root node");
         return false;
     }
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
@@ -758,7 +986,8 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                         const char *include = e->Attribute("Include");
                         if (include && Path::acceptFile(include)) {
                             std::string toInclude = Path::simplifyPath(Path::isAbsolute(include) ? include : Path::getPathFromFilename(filename) + include);
-                            compileList.emplace_back(toInclude);
+                            findAndReplace(toInclude, "$(MSBuildThisFileDirectory)", "./");
+                            compileList.emplace_back(e, toInclude);
                         }
                     }
                 }
@@ -766,7 +995,12 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
         } else if (std::strcmp(name, "ItemDefinitionGroup") == 0) {
             itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
         } else if (std::strcmp(name, "PropertyGroup") == 0) {
-            importPropertyGroup(node, variables, includePath, &useOfMfc);
+            const char* labelAttribute = node->Attribute("Label");
+            if (labelAttribute && std::strcmp(labelAttribute, "Configuration") == 0) {
+                configurationPropertyGroups.emplace_back(node);
+            } else {
+                importPropertyGroup(node, variables, includePath);
+            }
         } else if (std::strcmp(name, "ImportGroup") == 0) {
             const char *labelAttribute = node->Attribute("Label");
             if (labelAttribute && std::strcmp(labelAttribute, "PropertySheets") == 0) {
@@ -791,13 +1025,13 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                                 pathToSharedItemsFile = variables["ProjectDir"] + projectAttribute;
                             }
                             if (!simplifyPathWithVariables(pathToSharedItemsFile, variables)) {
-                                printError("Could not simplify path to referenced shared items project");
+                                errors.emplace_back("Could not simplify path to referenced shared items project");
                                 return false;
                             }
 
                             SharedItemsProject toAdd = importVcxitems(pathToSharedItemsFile, fileFilters, cache);
                             if (!toAdd.successful) {
-                                printError("Could not load shared items project \"" + pathToSharedItemsFile + "\" from original path \"" + std::string(projectAttribute) + "\".");
+                                errors.emplace_back("Could not load shared items project \"" + pathToSharedItemsFile + "\" from original path \"" + std::string(projectAttribute) + "\".");
                                 return false;
                             }
                             sharedItemsProjects.emplace_back(toAdd);
@@ -815,7 +1049,7 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
     for (const auto& sharedProject : sharedItemsProjects) {
         for (const auto &file : sharedProject.sourceFiles) {
             std::string pathToFile = Path::simplifyPath(Path::getPathFromFilename(sharedProject.pathToProjectFile) + file);
-            compileList.emplace_back(std::move(pathToFile));
+            compileList.emplace_back(pathToFile);
         }
         for (const auto &p : sharedProject.includePaths) {
             std::string path = Path::simplifyPath(Path::getPathFromFilename(sharedProject.pathToProjectFile) + p);
@@ -824,8 +1058,9 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
     }
 
     // Project files
-    for (const std::string &cfilename : compileList) {
-        if (!fileFilters.empty() && !matchglobs(fileFilters, cfilename))
+    PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
+    for (const ItemGroupClCompile& compile : compileList) {
+        if (!fileFilters.empty() && !filtermatcher.match(compile.mFilename))
             continue;
 
         for (const ProjectConfiguration &p : projectConfigurationList) {
@@ -838,11 +1073,14 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                     continue;
             }
 
-            FileSettings fs{cfilename, Standards::Language::None, 0}; // file will be identified later on
+            // check if the file should be excluded for this configuration
+            if (compile.exclude(p, errors))
+                continue;
+
+            FileSettings fs{ compile.mFilename, Standards::Language::None, 0}; // file will be identified later on
             fs.cfg = p.name;
             // TODO: detect actual MSC version
             fs.msc = true;
-            fs.useMfc = useOfMfc;
             fs.defines = "_WIN32=1";
             if (p.platform == ProjectConfiguration::Win32)
                 fs.platformType = Platform::Type::Win32W;
@@ -852,7 +1090,7 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
             }
             std::string additionalIncludePaths;
             for (const ItemDefinitionGroup &i : itemDefinitionGroupList) {
-                if (!i.conditionIsTrue(p))
+                if (!i.conditionIsTrue(p, compile.mFilename, errors))
                     continue;
                 fs.standard = Standards::getCPP(i.cppstd);
                 fs.defines += ';' + i.preprocessorDefinitions;
@@ -868,8 +1106,19 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                     fs.defines += ";__AVX512__";
                 additionalIncludePaths += ';' + i.additionalIncludePaths;
             }
+            bool useUnicode = false;
+            for (const ConfigurationPropertyGroup &c : configurationPropertyGroups) {
+                if (!c.conditionIsTrue(p, compile.mFilename, errors))
+                    continue;
+                // in msbuild the last definition wins
+                useUnicode = c.useUnicode;
+                fs.useMfc = c.useOfMfc;
+            }
+            if (useUnicode) {
+                fs.defines += ";UNICODE=1;_UNICODE=1";
+            }
             fsSetDefines(fs, fs.defines);
-            fsSetIncludePaths(fs, Path::getPathFromFilename(filename), toStringList(includePath + ';' + additionalIncludePaths), variables);
+            fsSetIncludePaths(fs, Path::getPathFromFilename(compile.mFilename), toStringList(includePath + ';' + additionalIncludePaths), variables);
             for (const auto &path : sharedItemsIncludePaths) {
                 fs.includePaths.emplace_back(path);
             }
@@ -893,15 +1142,17 @@ ImportProject::SharedItemsProject ImportProject::importVcxitems(const std::strin
     SharedItemsProject result;
     result.pathToProjectFile = filename;
 
+    PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
+
     tinyxml2::XMLDocument doc;
     const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());
     if (error != tinyxml2::XML_SUCCESS) {
-        printError(std::string("Visual Studio project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
+        errors.emplace_back(std::string("Visual Studio project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
         return result;
     }
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
     if (rootnode == nullptr) {
-        printError("Visual Studio project file has no XML root node");
+        errors.emplace_back("Visual Studio project file has no XML root node");
         return result;
     }
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
@@ -913,13 +1164,13 @@ ImportProject::SharedItemsProject ImportProject::importVcxitems(const std::strin
                         std::string file(include);
                         findAndReplace(file, "$(MSBuildThisFileDirectory)", "./");
 
-                        // Don't include file if it matches the filter
-                        if (!fileFilters.empty() && !matchglobs(fileFilters, file))
+                        // Skip file if it doesn't match the filter
+                        if (!fileFilters.empty() && !filtermatcher.match(file))
                             continue;
 
                         result.sourceFiles.emplace_back(file);
                     } else {
-                        printError("Could not find shared items source file");
+                        errors.emplace_back("Could not find shared items source file");
                         return result;
                     }
                 }
@@ -947,12 +1198,12 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
     tinyxml2::XMLDocument doc;
     const tinyxml2::XMLError error = doc.LoadFile(projectFilename.c_str());
     if (error != tinyxml2::XML_SUCCESS) {
-        printError(std::string("Borland project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
+        errors.emplace_back(std::string("Borland project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
         return false;
     }
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
     if (rootnode == nullptr) {
-        printError("Borland project file has no XML root node");
+        errors.emplace_back("Borland project file has no XML root node");
         return false;
     }
 
@@ -1225,7 +1476,20 @@ static std::list<std::string> readXmlStringList(const tinyxml2::XMLElement *node
             continue;
         const char *attr = attribute ? child->Attribute(attribute) : child->GetText();
         if (attr)
-            ret.push_back(joinRelativePath(path, attr));
+            ret.emplace_back(joinRelativePath(path, attr));
+    }
+    return ret;
+}
+
+static std::list<std::string> readXmlPathMatchList(const tinyxml2::XMLElement *node, const std::string &path, const char name[], const char attribute[])
+{
+    std::list<std::string> ret;
+    for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) {
+        if (strcmp(child->Name(), name) != 0)
+            continue;
+        const char *attr = attribute ? child->Attribute(attribute) : child->GetText();
+        if (attr)
+            ret.emplace_back(PathMatch::joinRelativePattern(path, attr));
     }
     return ret;
 }
@@ -1251,12 +1515,12 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
     const std::string xmldata = istream_to_string(istr);
     const tinyxml2::XMLError error = doc.Parse(xmldata.data(), xmldata.size());
     if (error != tinyxml2::XML_SUCCESS) {
-        printError(std::string("Cppcheck GUI project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
+        errors.emplace_back(std::string("Cppcheck GUI project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error));
         return false;
     }
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
     if (rootnode == nullptr || strcmp(rootnode->Name(), CppcheckXml::ProjectElementName) != 0) {
-        printError("Cppcheck GUI project file has no XML root node");
+        errors.emplace_back("Cppcheck GUI project file has no XML root node");
         return false;
     }
 
@@ -1281,12 +1545,16 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         } else if (strcmp(name, CppcheckXml::BuildDirElementName) == 0)
             temp.buildDir = joinRelativePath(path, empty_if_null(node->GetText()));
         else if (strcmp(name, CppcheckXml::IncludeDirElementName) == 0)
-            temp.includePaths = readXmlStringList(node, path, CppcheckXml::DirElementName, CppcheckXml::DirNameAttrib);
+            temp.includePaths = readXmlStringList(node, path, CppcheckXml::DirElementName, CppcheckXml::DirNameAttrib); // TODO: append instead of overwrite
         else if (strcmp(name, CppcheckXml::DefinesElementName) == 0)
-            temp.userDefines = join(readXmlStringList(node, "", CppcheckXml::DefineName, CppcheckXml::DefineNameAttrib), ";");
+            temp.userDefines = join(readXmlStringList(node, "", CppcheckXml::DefineName, CppcheckXml::DefineNameAttrib), ";"); // TODO: append instead of overwrite
         else if (strcmp(name, CppcheckXml::UndefinesElementName) == 0) {
             for (const std::string &u : readXmlStringList(node, "", CppcheckXml::UndefineName, nullptr))
                 temp.userUndefs.insert(u);
+        } else if (strcmp(name, CppcheckXml::UserIncludeElementName) == 0) {
+            const char* i = node->GetText();
+            if (i)
+                temp.userIncludes.emplace_back(i);
         } else if (strcmp(name, CppcheckXml::ImportProjectElementName) == 0) {
             const std::string t_str = empty_if_null(node->GetText());
             if (!t_str.empty())
@@ -1295,15 +1563,15 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         else if (strcmp(name, CppcheckXml::PathsElementName) == 0)
             paths = readXmlStringList(node, path, CppcheckXml::PathName, CppcheckXml::PathNameAttrib);
         else if (strcmp(name, CppcheckXml::ExcludeElementName) == 0)
-            guiProject.excludedPaths = readXmlStringList(node, "", CppcheckXml::ExcludePathName, CppcheckXml::ExcludePathNameAttrib);
+            guiProject.excludedPaths = readXmlPathMatchList(node, path, CppcheckXml::ExcludePathName, CppcheckXml::ExcludePathNameAttrib); // TODO: append instead of overwrite
         else if (strcmp(name, CppcheckXml::FunctionContracts) == 0)
             ;
         else if (strcmp(name, CppcheckXml::VariableContractsElementName) == 0)
             ;
         else if (strcmp(name, CppcheckXml::IgnoreElementName) == 0)
-            guiProject.excludedPaths = readXmlStringList(node, "", CppcheckXml::IgnorePathName, CppcheckXml::IgnorePathNameAttrib);
+            guiProject.excludedPaths = readXmlPathMatchList(node, path, CppcheckXml::IgnorePathName, CppcheckXml::IgnorePathNameAttrib); // TODO: append instead of overwrite
         else if (strcmp(name, CppcheckXml::LibrariesElementName) == 0)
-            guiProject.libraries = readXmlStringList(node, "", CppcheckXml::LibraryElementName, nullptr);
+            guiProject.libraries = readXmlStringList(node, "", CppcheckXml::LibraryElementName, nullptr); // TODO: append instead of overwrite
         else if (strcmp(name, CppcheckXml::SuppressionsElementName) == 0) {
             for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) {
                 if (strcmp(child->Name(), CppcheckXml::SuppressionElementName) != 0)
@@ -1329,6 +1597,13 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         else if (strcmp(name, CppcheckXml::AddonsElementName) == 0) {
             const auto& addons = readXmlStringList(node, "", CppcheckXml::AddonElementName, nullptr);
             temp.addons.insert(addons.cbegin(), addons.cend());
+            if (settings.premium) {
+                auto it = temp.addons.find("misra");
+                if (it != temp.addons.end()) {
+                    temp.addons.erase(it);
+                    temp.premiumArgs += " --misra-c-2012";
+                }
+            }
         }
         else if (strcmp(name, CppcheckXml::TagsElementName) == 0)
             node->Attribute(CppcheckXml::TagElementName); // FIXME: Write some warning
@@ -1368,7 +1643,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
                 else if (strcmp(childname, Settings::SafeChecks::XmlExternalVariables) == 0)
                     temp.safeChecks.externalVariables = true;
                 else {
-                    printError("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck project file");
+                    errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck GUI project file");
                     return false;
                 }
             }
@@ -1391,17 +1666,19 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         else if (strcmp(name, CppcheckXml::ProjectNameElementName) == 0)
             ; // no-op
         else {
-            printError("Unknown element '" + std::string(name) + "' in Cppcheck project file");
+            errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck GUI project file");
             return false;
         }
     }
-    settings.basePaths = temp.basePaths;
+    settings.basePaths = temp.basePaths; // TODO: append instead of overwrite
     settings.relativePaths |= temp.relativePaths;
     settings.buildDir = temp.buildDir;
-    settings.includePaths = temp.includePaths;
-    settings.userDefines = temp.userDefines;
-    settings.userUndefs = temp.userUndefs;
-    settings.addons = temp.addons;
+    settings.includePaths = temp.includePaths; // TODO: append instead of overwrite
+    settings.userDefines = temp.userDefines; // TODO: append instead of overwrite
+    settings.userUndefs = temp.userUndefs; // TODO: append instead of overwrite
+    settings.userIncludes = temp.userIncludes; // TODO: append instead of overwrite
+    for (const std::string &addon : temp.addons)
+        settings.addons.emplace(addon);
     settings.clang = temp.clang;
     settings.clangTidy = temp.clangTidy;
     settings.analyzeAllVsConfigs = temp.analyzeAllVsConfigs;
@@ -1413,7 +1690,18 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
 
     for (const std::string &p : paths)
         guiProject.pathNames.push_back(Path::fromNativeSeparators(p));
-    supprs.nomsg.addSuppressions(std::move(suppressions)); // TODO: check result
+
+    bool ok = true;
+    for (const auto &suppression : suppressions) {
+        const std::string addError = supprs.nomsg.addSuppression(suppression);
+        if (!addError.empty()) {
+            errors.emplace_back(addError);
+            ok = false;
+        }
+    }
+    if (!ok)
+        return false;
+
     settings.checkHeaders = temp.checkHeaders;
     settings.checkUnusedTemplates = temp.checkUnusedTemplates;
     settings.maxCtuDepth = temp.maxCtuDepth;
@@ -1452,7 +1740,6 @@ void ImportProject::selectOneVsConfig(Platform::Type platform)
     }
 }
 
-// cppcheck-suppress unusedFunction - used by GUI only
 void ImportProject::selectVsConfigurations(Platform::Type platform, const std::vector<std::string> &configurations)
 {
     for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
@@ -1477,7 +1764,6 @@ void ImportProject::selectVsConfigurations(Platform::Type platform, const std::v
     }
 }
 
-// cppcheck-suppress unusedFunction - used by GUI only
 std::list<std::string> ImportProject::getVSConfigs()
 {
     return std::list<std::string>(mAllVSConfigs.cbegin(), mAllVSConfigs.cend());
@@ -1489,18 +1775,21 @@ void ImportProject::setRelativePaths(const std::string &filename)
         return;
     const std::vector<std::string> basePaths{Path::fromNativeSeparators(Path::getCurrentPath())};
     for (auto &fs: fileSettings) {
-        fs.file = FileWithDetails{Path::getRelativePath(fs.filename(), basePaths), Standards::Language::None, 0}; // file will be identified later on
-        for (auto &includePath: fs.includePaths)
-            includePath = Path::getRelativePath(includePath, basePaths);
+        fs.file.setPath(Path::getRelativePath(fs.filename(), basePaths));
+        for (auto &includePath: fs.includePaths) {
+            const std::string rel = Path::getRelativePath(includePath, basePaths);
+            includePath = rel.empty() ? "." : rel;
+        }
     }
 }
 
-void ImportProject::printError(const std::string &message)
-{
-    std::cout << "cppcheck: error: " << message << std::endl;
-}
-
-bool ImportProject::sourceFileExists(const std::string &file)
+// only used by tests (testimportproject.cpp::testVcxprojConditions):
+// cppcheck-suppress unusedFunction
+bool cppcheck::testing::evaluateVcxprojCondition(const std::string& condition, const std::string& configuration,
+                                                 const std::string& platform)
 {
-    return Path::isFile(file);
+    ProjectConfiguration p;
+    p.configuration = configuration;
+    p.platformStr = platform;
+    return Conditional::evalCondition(condition, p);
 }
diff --git a/lib/importproject.h b/lib/importproject.h
index 68ded1a7f6d..b8bbbed3fa3 100644
--- a/lib/importproject.h
+++ b/lib/importproject.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -36,6 +36,9 @@
 
 class Settings;
 struct Suppressions;
+namespace tinyxml2 {
+    class XMLDocument;
+}
 
 /// @addtogroup Core
 /// @{
@@ -46,6 +49,11 @@ namespace cppcheck {
             return caseInsensitiveStringCompare(lhs,rhs) < 0;
         }
     };
+
+    namespace testing
+    {
+        CPPCHECKLIB bool evaluateVcxprojCondition(const std::string& condition, const std::string& configuration, const std::string& platform);
+    }
 }
 
 /**
@@ -60,16 +68,19 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
         FAILURE,
         COMPILE_DB,
         VS_SLN,
+        VS_SLNX,
         VS_VCXPROJ,
         BORLAND,
         CPPCHECK_GUI
     };
 
-    static void fsParseCommand(FileSettings& fs, const std::string& command);
+protected:
     static void fsSetDefines(FileSettings& fs, std::string defs);
     static void fsSetIncludePaths(FileSettings& fs, const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables);
 
+public:
     std::list<FileSettings> fileSettings;
+    std::vector<std::string> errors;
 
     ImportProject() = default;
     virtual ~ImportProject() = default;
@@ -98,9 +109,9 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
 protected:
     bool importCompileCommands(std::istream &istr);
     bool importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs);
-    virtual bool sourceFileExists(const std::string &file);
+    static std::string collectArgs(const std::string &cmd, std::vector<std::string> &args);
+    void setRelativePaths(const std::string &filename);
 
-private:
     struct SharedItemsProject {
         bool successful = false;
         std::string pathToProjectFile;
@@ -108,14 +119,16 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
         std::vector<std::string> sourceFiles;
     };
 
-    bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
-    static SharedItemsProject importVcxitems(const std::string &filename, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
     bool importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
-    bool importBcb6Prj(const std::string &projectFilename);
+    bool importVcxproj(const std::string &filename, const tinyxml2::XMLDocument &doc, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
 
-    static void printError(const std::string &message);
+private:
+    static void parseArgs(FileSettings &fs, const std::vector<std::string> &args);
 
-    void setRelativePaths(const std::string &filename);
+    bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
+    bool importSlnx(const std::string& filename, const std::vector<std::string>& fileFilters);
+    SharedItemsProject importVcxitems(const std::string &filename, const std::vector<std::string> &fileFilters, std::vector<SharedItemsProject> &cache);
+    bool importBcb6Prj(const std::string &projectFilename);
 
     std::string mPath;
     std::set<std::string> mAllVSConfigs;
@@ -138,6 +151,7 @@ namespace CppcheckXml {
     static constexpr char DefineNameAttrib[] = "name";
     static constexpr char UndefinesElementName[] = "undefines";
     static constexpr char UndefineName[] = "undefine";
+    static constexpr char UserIncludeElementName[] = "user-include";
     static constexpr char PathsElementName[] = "paths";
     static constexpr char PathName[] = "dir";
     static constexpr char PathNameAttrib[] = "name";
@@ -184,10 +198,13 @@ namespace CppcheckXml {
     static constexpr char CodingStandardsElementName[] = "coding-standards";
     static constexpr char CodingStandardElementName[] = "coding-standard";
     static constexpr char CertIntPrecisionElementName[] = "cert-c-int-precision";
-    static constexpr char LicenseFileElementName[] = "license-file";
     static constexpr char ProjectNameElementName[] = "project-name";
 }
 
+namespace testing
+{
+    CPPCHECKLIB bool evaluateVcxprojCondition(const std::string& condition, const std::string& configuration, const std::string& platform);
+}
 /// @}
 //---------------------------------------------------------------------------
 #endif // importprojectH
diff --git a/lib/json.h b/lib/json.h
index 2bcfe102071..7f7107f7864 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -28,6 +28,7 @@ SUPPRESS_WARNING_CLANG_PUSH("-Wextra-semi-stmt")
 SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant")
 SUPPRESS_WARNING_CLANG_PUSH("-Wformat")
 SUPPRESS_WARNING_CLANG_PUSH("-Wfloat-conversion")
+SUPPRESS_WARNING_CLANG_PUSH("-Wimplicit-float-conversion")
 
 #define PICOJSON_USE_INT64
 #include <picojson.h> // IWYU pragma: export
@@ -37,6 +38,7 @@ SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_GCC_POP
 SUPPRESS_WARNING_POP
 
diff --git a/lib/keywords.cpp b/lib/keywords.cpp
index 7642c3811d4..678456d8c36 100644
--- a/lib/keywords.cpp
+++ b/lib/keywords.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -77,6 +77,13 @@ static const std::unordered_set<std::string> c23_keywords = {
     C23_KEYWORDS
 };
 
+static const std::unordered_set<std::string> c2y_keywords_all = {
+    C90_KEYWORDS, C99_KEYWORDS, C11_KEYWORDS, C23_KEYWORDS
+};
+
+static const std::unordered_set<std::string> c2y_keywords = {
+};
+
 // see https://en.cppreference.com/w/cpp/keyword
 
 #define CPP03_KEYWORDS \
@@ -166,10 +173,8 @@ static const std::unordered_set<std::string> cpp26_keywords_all = {
     CPP03_KEYWORDS, CPP11_KEYWORDS, CPP20_KEYWORDS
 };
 
-// cppcheck-suppress unusedFunction
 const std::unordered_set<std::string>& Keywords::getAll(Standards::cstd_t cStd)
 {
-    // cppcheck-suppress missingReturn
     switch (cStd) {
     case Standards::cstd_t::C89:
         return c89_keywords_all;
@@ -181,13 +186,13 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cstd_t cStd)
         return c17_keywords_all;
     case Standards::cstd_t::C23:
         return c23_keywords_all;
+    case Standards::cstd_t::C2Y:
+        return c2y_keywords_all;
     }
     cppcheck::unreachable();
 }
 
-// cppcheck-suppress unusedFunction
 const std::unordered_set<std::string>& Keywords::getAll(Standards::cppstd_t cppStd) {
-    // cppcheck-suppress missingReturn
     switch (cppStd) {
     case Standards::cppstd_t::CPP03:
         return cpp03_keywords_all;
@@ -210,7 +215,6 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cppstd_t cppS
 // cppcheck-suppress unusedFunction
 const std::unordered_set<std::string>& Keywords::getOnly(Standards::cstd_t cStd)
 {
-    // cppcheck-suppress missingReturn
     switch (cStd) {
     case Standards::cstd_t::C89:
         return c89_keywords;
@@ -222,14 +226,14 @@ const std::unordered_set<std::string>& Keywords::getOnly(Standards::cstd_t cStd)
         return c17_keywords;
     case Standards::cstd_t::C23:
         return c23_keywords;
+    case Standards::cstd_t::C2Y:
+        return c2y_keywords;
     }
     cppcheck::unreachable();
 }
 
-// cppcheck-suppress unusedFunction
 const std::unordered_set<std::string>& Keywords::getOnly(Standards::cppstd_t cppStd)
 {
-    // cppcheck-suppress missingReturn
     switch (cppStd) {
     case Standards::cppstd_t::CPP03:
         return cpp03_keywords;
diff --git a/lib/library.cpp b/lib/library.cpp
index e8b6c40ef9c..4e542bc55ef 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,7 +22,6 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "path.h"
-#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenlist.h"
@@ -36,10 +35,10 @@
 #include <iostream>
 #include <list>
 #include <memory>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <unordered_set>
+#include <utility>
 
 #include "xml.h"
 
@@ -47,10 +46,10 @@ struct Library::LibraryData
 {
     struct Platform {
         const PlatformType *platform_type(const std::string &name) const {
-            const auto it = utils::as_const(mPlatformTypes).find(name);
+            const auto it = mPlatformTypes.find(name);
             return (it != mPlatformTypes.end()) ? &(it->second) : nullptr;
         }
-        std::map<std::string, PlatformType> mPlatformTypes;
+        std::unordered_map<std::string, PlatformType> mPlatformTypes;
     };
 
     class ExportedFunctions {
@@ -124,9 +123,9 @@ struct Library::LibraryData
     std::map<std::string, AllocFunc> mDealloc; // deallocation functions
     std::map<std::string, AllocFunc> mRealloc; // reallocation functions
     std::unordered_map<std::string, FalseTrueMaybe> mNoReturn; // is function noreturn?
-    std::map<std::string, std::string> mReturnValue;
-    std::map<std::string, std::string> mReturnValueType;
-    std::map<std::string, int> mReturnValueContainer;
+    std::unordered_map<std::string, std::string> mReturnValue;
+    std::unordered_map<std::string, std::string> mReturnValueType;
+    std::unordered_map<std::string, int> mReturnValueContainer;
     std::map<std::string, std::vector<MathLib::bigint>> mUnknownReturnValues;
     std::map<std::string, bool> mReportErrors;
     std::map<std::string, bool> mProcessAfterCode;
@@ -138,7 +137,7 @@ struct Library::LibraryData
     std::map<std::string, int> mReflection; // invocation of reflection
     std::unordered_map<std::string, struct PodType> mPodTypes; // pod types
     std::map<std::string, PlatformType> mPlatformTypes; // platform independent typedefs
-    std::map<std::string, Platform> mPlatforms; // platform dependent typedefs
+    std::unordered_map<std::string, Platform> mPlatforms; // platform dependent typedefs
     std::map<std::pair<std::string,std::string>, TypeCheck> mTypeChecks;
     std::unordered_map<std::string, NonOverlappingData> mNonOverlappingData;
     std::unordered_set<std::string> mEntrypoints;
@@ -178,8 +177,8 @@ static std::vector<std::string> getnames(const char *names)
 
 static void gettokenlistfromvalid(const std::string& valid, TokenList& tokenList)
 {
-    std::istringstream istr(valid + ',');
-    tokenList.createTokens(istr); // TODO: check result?
+    const std::string str(valid + ",\n");
+    tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
     for (Token *tok = tokenList.front(); tok; tok = tok->next()) {
         if (Token::Match(tok,"- %num%")) {
             tok->str("-" + tok->strAt(1));
@@ -195,27 +194,24 @@ Library::Error Library::load(const char exename[], const char path[], bool debug
     }
 
     const bool is_abs_path = Path::isAbsolute(path);
+    const bool is_rel_path = Path::isRelative(path);
+
+    std::string fullfilename(path);
+
+    // TODO: what if the extension is not .cfg?
+    // only append extension when we provide the library name and not a path
+    if (!is_abs_path && !is_rel_path && Path::getFilenameExtension(fullfilename).empty())
+        fullfilename += ".cfg";
 
     std::string absolute_path;
     // open file..
     tinyxml2::XMLDocument doc;
     if (debug)
-        std::cout << "looking for library '" + std::string(path) + "'" << std::endl;
-    tinyxml2::XMLError error = xml_LoadFile(doc, path);
+        std::cout << "looking for library '" + fullfilename + "'" << std::endl;
+    tinyxml2::XMLError error = xml_LoadFile(doc, fullfilename.c_str());
     if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
-        // failed to open file.. is there no extension?
-        std::string fullfilename(path);
-        if (Path::getFilenameExtension(fullfilename).empty()) {
-            fullfilename += ".cfg";
-            if (debug)
-                std::cout << "looking for library '" + fullfilename + "'" << std::endl;
-            error = xml_LoadFile(doc, fullfilename.c_str());
-            if (error != tinyxml2::XML_ERROR_FILE_NOT_FOUND)
-                absolute_path = Path::getAbsoluteFilePath(fullfilename);
-        }
-
         // only perform further lookups when the given path was not absolute
-        if (!is_abs_path && error == tinyxml2::XML_ERROR_FILE_NOT_FOUND)
+        if (!is_abs_path)
         {
             std::list<std::string> cfgfolders;
     #ifdef FILESDIR
@@ -240,13 +236,13 @@ Library::Error Library::load(const char exename[], const char path[], bool debug
             }
         }
     } else
-        absolute_path = Path::getAbsoluteFilePath(path);
+        absolute_path = Path::getAbsoluteFilePath(fullfilename);
 
     if (error == tinyxml2::XML_SUCCESS) {
         if (mData->mFiles.find(absolute_path) == mData->mFiles.end()) {
             Error err = load(doc);
             if (err.errorcode == ErrorCode::OK)
-                mData->mFiles.insert(absolute_path);
+                mData->mFiles.insert(std::move(absolute_path));
             return err;
         }
 
@@ -314,6 +310,66 @@ Library::Container::Action Library::Container::actionFrom(const std::string& act
     return Container::Action::NO_ACTION;
 }
 
+std::string Library::Container::toString(Library::Container::Yield yield)
+{
+    switch (yield) {
+    case Library::Container::Yield::AT_INDEX:
+        return "at_index";
+    case Library::Container::Yield::ITEM:
+        return "item";
+    case Library::Container::Yield::BUFFER:
+        return "buffer";
+    case Library::Container::Yield::BUFFER_NT:
+        return "buffer-nt";
+    case Library::Container::Yield::START_ITERATOR:
+        return "start-iterator";
+    case Library::Container::Yield::END_ITERATOR:
+        return "end-iterator";
+    case Library::Container::Yield::ITERATOR:
+        return "iterator";
+    case Library::Container::Yield::SIZE:
+        return "size";
+    case Library::Container::Yield::EMPTY:
+        return "empty";
+    case Library::Container::Yield::NO_YIELD:
+        break;
+    }
+    return "";
+}
+
+std::string Library::Container::toString(Library::Container::Action action)
+{
+    switch (action) {
+    case Library::Container::Action::RESIZE:
+        return "resize";
+    case Library::Container::Action::CLEAR:
+        return "clear";
+    case Library::Container::Action::PUSH:
+        return "push";
+    case Library::Container::Action::POP:
+        return "pop";
+    case Library::Container::Action::FIND:
+        return "find";
+    case Library::Container::Action::FIND_CONST:
+        return "find-const";
+    case Library::Container::Action::INSERT:
+        return "insert";
+    case Library::Container::Action::ERASE:
+        return "erase";
+    case Library::Container::Action::APPEND:
+        return "append";
+    case Library::Container::Action::CHANGE_CONTENT:
+        return "change-content";
+    case Library::Container::Action::CHANGE:
+        return "change";
+    case Library::Container::Action::CHANGE_INTERNAL:
+        return "change-internal";
+    case Library::Container::Action::NO_ACTION:
+        break;
+    }
+    return "";
+}
+
 Library::Error Library::load(const tinyxml2::XMLDocument &doc)
 {
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
@@ -564,6 +620,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                 container.startPattern2 = startPattern;
                 if (!endsWith(container.startPattern, '<'))
                     container.startPattern2 += " !!::";
+                container.startPatternHasStd = startsWith(container.startPattern2, "std :: ");
             }
             const char* const endPattern = node->Attribute("endPattern");
             if (endPattern)
@@ -758,7 +815,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                     unknown_elements.insert(typenodename);
             }
             if (platform.empty()) {
-                const PlatformType * const type_ptr = platform_type(type_name, emptyString);
+                const PlatformType * const type_ptr = platform_type(type_name, "");
                 if (type_ptr) {
                     if (*type_ptr == type)
                         return Error(ErrorCode::DUPLICATE_PLATFORM_TYPE, type_name);
@@ -941,7 +998,7 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
                         const char *argattr = argnode->Attribute("arg");
                         if (!argattr)
                             return Error(ErrorCode::MISSING_ATTRIBUTE, "arg");
-                        if (strlen(argattr) != 1 || argattr[0]<'0' || argattr[0]>'9')
+                        if (strlen(argattr) != 1 || argattr[0]<'0' || argattr[0]> '9')
                             return Error(ErrorCode::BAD_ATTRIBUTE_VALUE, argattr);
 
                         ac.minsizes.reserve(type == ArgumentChecks::MinSize::Type::MUL ? 2 : 1);
@@ -950,7 +1007,7 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
                             const char *arg2attr = argnode->Attribute("arg2");
                             if (!arg2attr)
                                 return Error(ErrorCode::MISSING_ATTRIBUTE, "arg2");
-                            if (strlen(arg2attr) != 1 || arg2attr[0]<'0' || arg2attr[0]>'9')
+                            if (strlen(arg2attr) != 1 || arg2attr[0]<'0' || arg2attr[0]> '9')
                                 return Error(ErrorCode::BAD_ATTRIBUTE_VALUE, arg2attr);
                             ac.minsizes.back().arg2 = arg2attr[0] - '0';
                         }
@@ -1267,10 +1324,10 @@ const Library::ArgumentChecks * Library::getarg(const Token *ftok, int argnr) co
     const Function* func = nullptr;
     if (isNotLibraryFunction(ftok, &func))
         return nullptr;
-    const auto it2 = utils::as_const(func->argumentChecks).find(argnr);
+    const auto it2 = func->argumentChecks.find(argnr);
     if (it2 != func->argumentChecks.cend())
         return &it2->second;
-    const auto it3 = utils::as_const(func->argumentChecks).find(-1);
+    const auto it3 = func->argumentChecks.find(-1);
     if (it3 != func->argumentChecks.cend())
         return &it3->second;
     return nullptr;
@@ -1329,6 +1386,8 @@ const Library::Container* Library::detectContainerInternal(const Token* const ty
 {
     if (!typeStart)
         return nullptr;
+    if (typeStart->isKeyword())
+        return nullptr;
     const Token* firstLinkedTok = nullptr;
     for (const Token* tok = typeStart; tok && !tok->varId(); tok = tok->next()) {
         if (!tok->link())
@@ -1338,12 +1397,18 @@ const Library::Container* Library::detectContainerInternal(const Token* const ty
         break;
     }
 
+    const bool hasScope = typeStart->strAt(1) == "::";
+    const bool bailIfHasStd = !withoutStd && !hasScope;
+
     for (const std::pair<const std::string, Library::Container> & c : mData->mContainers) {
         const Container& container = c.second;
         if (container.startPattern.empty())
             continue;
 
-        const int offset = (withoutStd && startsWith(container.startPattern2, "std :: ")) ? 7 : 0;
+        if (bailIfHasStd && container.startPatternHasStd)
+            continue;
+
+        const int offset = (withoutStd && container.startPatternHasStd) ? 7 : 0;
 
         // If endPattern is undefined, it will always match, but itEndPattern has to be defined.
         if (detect != IteratorOnly && container.endPattern.empty()) {
@@ -1505,8 +1570,7 @@ bool Library::isCompliantValidationExpression(const char* p)
             error |= (*(p + 1) == '-');
         }
         else if (*p == ':') {
-            // cppcheck-suppress bitwiseOnBoolean - TODO: fix this
-            error |= range | (*(p + 1) == '.');
+            error |= range || (*(p + 1) == '.');
             range = true;
             has_dot = false;
             has_E = false;
@@ -1520,8 +1584,7 @@ bool Library::isCompliantValidationExpression(const char* p)
             has_dot = false;
             has_E = false;
         } else if (*p == '.') {
-            // cppcheck-suppress bitwiseOnBoolean - TODO: fix this
-            error |= has_dot | (!std::isdigit(*(p + 1)));
+            error |= has_dot || (!std::isdigit(*(p + 1)));
             has_dot = true;
         } else if (*p == 'E' || *p == 'e') {
             error |= has_E;
@@ -1718,6 +1781,8 @@ bool Library::isFunctionConst(const Token *ftok) const
             const Yield yield = astContainerYield(ftok->astParent()->astOperand1(), *this);
             if (yield == Yield::EMPTY || yield == Yield::SIZE || yield == Yield::BUFFER_NT)
                 return true;
+            if ((yield == Yield::START_ITERATOR || yield == Yield::END_ITERATOR) && ftok->str()[0] == 'c')
+                return true;
         }
         return false;
     }
@@ -1896,6 +1961,8 @@ const Library::SmartPointer* Library::detectSmartPointer(const Token* tok, bool
 {
     if (!tok)
         return nullptr;
+    if (tok->isKeyword())
+        return nullptr;
     std::string typestr = withoutStd ? "std::" : "";
     if (tok->str() == "::")
         tok = tok->next();
@@ -1941,7 +2008,7 @@ Library::TypeCheck Library::getTypeCheck(std::string check,  std::string typeNam
 
 bool Library::hasAnyTypeCheck(const std::string& typeName) const
 {
-    return std::any_of(mData->mTypeChecks.begin(), mData->mTypeChecks.end(), [&](const std::pair<std::pair<std::string, std::string>, Library::TypeCheck>& tc) {
+    return std::any_of(mData->mTypeChecks.begin(), mData->mTypeChecks.end(), [&](const std::pair<const std::pair<std::string, std::string>, Library::TypeCheck>& tc) {
         return tc.first.second == typeName;
     });
 }
diff --git a/lib/library.h b/lib/library.h
index 1b0fcc20390..709a0db2b90 100644
--- a/lib/library.h
+++ b/lib/library.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,7 +24,6 @@
 #include "config.h"
 #include "mathlib.h"
 #include "standards.h"
-#include "utils.h"
 
 #include <array>
 #include <cstdint>
@@ -239,28 +238,31 @@ class CPPCHECKLIB Library {
         bool unstableErase{};
         bool unstableInsert{};
         bool view{};
+        bool startPatternHasStd{};
 
         Action getAction(const std::string& function) const {
-            const auto i = utils::as_const(functions).find(function);
+            const auto i = functions.find(function);
             if (i != functions.end())
                 return i->second.action;
             return Action::NO_ACTION;
         }
 
         Yield getYield(const std::string& function) const {
-            const auto i = utils::as_const(functions).find(function);
+            const auto i = functions.find(function);
             if (i != functions.end())
                 return i->second.yield;
             return Yield::NO_YIELD;
         }
 
         const std::string& getReturnType(const std::string& function) const {
-            const auto i = utils::as_const(functions).find(function);
+            const auto i = functions.find(function);
             return (i != functions.end()) ? i->second.returnType : mEmptyString;
         }
 
-        static Yield yieldFrom(const std::string& yieldName);
-        static Action actionFrom(const std::string& actionName);
+        CPPCHECKLIB static Yield yieldFrom(const std::string& yieldName);
+        CPPCHECKLIB static Action actionFrom(const std::string& actionName);
+        CPPCHECKLIB static std::string toString(Yield yield);
+        CPPCHECKLIB static std::string toString(Action action);
     };
     const std::unordered_map<std::string, Container>& containers() const;
     const Container* detectContainer(const Token* typeStart) const;
@@ -399,7 +401,7 @@ class CPPCHECKLIB Library {
     const Token* getContainerFromYield(const Token* tok, Container::Yield yield) const;
     const Token* getContainerFromAction(const Token* tok, Container::Action action) const;
 
-    static bool isContainerYield(const Token* cond, Library::Container::Yield y, const std::string& fallback = emptyString);
+    static bool isContainerYield(const Token* cond, Library::Container::Yield y, const std::string& fallback = "");
     static Library::Container::Yield getContainerYield(const Token* cond);
 
     bool isreflection(const std::string &token) const;
@@ -479,7 +481,7 @@ class CPPCHECKLIB Library {
     std::string getFunctionName(const Token *ftok, bool &error) const;
 
     static const AllocFunc* getAllocDealloc(const std::map<std::string, AllocFunc> &data, const std::string &name) {
-        const auto it = utils::as_const(data).find(name);
+        const auto it = data.find(name);
         return (it == data.end()) ? nullptr : &it->second;
     }
 
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index 54240fa4f2f..c7c055899fd 100644
--- a/lib/mathlib.cpp
+++ b/lib/mathlib.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -26,7 +26,6 @@
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
-#include <exception>
 #include <limits>
 #include <locale>
 #include <sstream>
@@ -267,7 +266,7 @@ MathLib::value MathLib::value::shiftLeft(const MathLib::value &v) const
     if (!isInt() || !v.isInt())
         throw InternalError(nullptr, "Shift operand is not integer");
     MathLib::value ret(*this);
-    if (v.mIntValue >= MathLib::bigint_bits) {
+    if (v.mIntValue < 0 || v.mIntValue >= MathLib::bigint_bits || ret.mIntValue < 0) {
         return ret;
     }
     ret.mIntValue <<= v.mIntValue;
@@ -279,7 +278,7 @@ MathLib::value MathLib::value::shiftRight(const MathLib::value &v) const
     if (!isInt() || !v.isInt())
         throw InternalError(nullptr, "Shift operand is not integer");
     MathLib::value ret(*this);
-    if (v.mIntValue >= MathLib::bigint_bits) {
+    if (v.mIntValue < 0 || v.mIntValue >= MathLib::bigint_bits) {
         return ret;
     }
     ret.mIntValue >>= v.mIntValue;
@@ -344,8 +343,13 @@ MathLib::biguint MathLib::toBigUNumber(const std::string & str, const Token * co
         return static_cast<biguint>(static_cast<bigint>(doubleval));
     }
 
-    if (isCharLiteral(str))
-        return simplecpp::characterLiteralToLL(str);
+    if (isCharLiteral(str)) {
+        try {
+            return simplecpp::characterLiteralToLL(str);
+        } catch (const std::runtime_error& e) {
+            throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: characterLiteralToLL(" + str + ") => " + e.what());
+        }
+    }
 
     try {
         std::size_t idx = 0;
@@ -429,8 +433,13 @@ MathLib::bigint MathLib::toBigNumber(const std::string & str, const Token * cons
         return static_cast<bigint>(doubleval);
     }
 
-    if (isCharLiteral(str))
-        return simplecpp::characterLiteralToLL(str);
+    if (isCharLiteral(str)) {
+        try {
+            return simplecpp::characterLiteralToLL(str);
+        } catch (const std::runtime_error& e) {
+            throw InternalError(tok, "Internal Error. MathLib::toBigNumber: characterLiteralToLL(" + str + ") => " + e.what());
+        }
+    }
 
     try {
         std::size_t idx = 0;
@@ -505,7 +514,7 @@ double MathLib::toDoubleNumber(const std::string &str, const Token * const tok)
     if (isCharLiteral(str)) {
         try {
             return simplecpp::characterLiteralToLL(str);
-        } catch (const std::exception& e) {
+        } catch (const std::runtime_error& e) {
             throw InternalError(tok, "Internal Error. MathLib::toDoubleNumber: characterLiteralToLL(" + str + ") => " + e.what());
         }
     }
@@ -789,7 +798,6 @@ static bool isValidIntegerSuffixIt(std::string::const_iterator it, std::string::
             (state == Status::SUFFIX_LITERAL));
 }
 
-// cppcheck-suppress unusedFunction
 bool MathLib::isValidIntegerSuffix(const std::string& str, bool supportMicrosoftExtensions)
 {
     return isValidIntegerSuffixIt(str.cbegin(), str.cend(), supportMicrosoftExtensions);
@@ -1216,7 +1224,7 @@ std::string MathLib::calculate(const std::string &first, const std::string &seco
         return MathLib::toString(MathLib::toBigNumber(first) ^ MathLib::toBigNumber(second)) + intsuffix(first, second);
 
     default:
-        throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate(). Please report this to Cppcheck developers.");
+        throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate().");
     }
 }
 
diff --git a/lib/mathlib.h b/lib/mathlib.h
index 6b415d3bb55..84338b5ce70 100644
--- a/lib/mathlib.h
+++ b/lib/mathlib.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -38,8 +38,6 @@ class Token;
 /** @brief simple math functions that uses operands stored in std::string. useful when performing math on tokens. */
 
 class CPPCHECKLIB MathLib {
-    friend class TestMathLib;
-
 public:
 #if defined(HAVE_BOOST) && defined(HAVE_BOOST_INT128)
     using bigint = boost::multiprecision::int128_t;
@@ -60,6 +58,9 @@ class CPPCHECKLIB MathLib {
         void promote(const value &v);
 
     public:
+        /**
+         * @throws InternalError thrown on invalid value
+         */
         explicit value(const std::string &s);
         std::string str() const;
         bool isInt() const {
@@ -73,10 +74,19 @@ class CPPCHECKLIB MathLib {
             return isFloat() ? mDoubleValue : static_cast<double>(mIntValue);
         }
 
+        /**
+         * @throws InternalError thrown on invalid/unhandled calculation or division by zero
+         */
         static value calc(char op, const value &v1, const value &v2);
         int compare(const value &v) const;
         value add(int v) const;
+        /**
+         * @throws InternalError thrown if operand is not an integer
+         */
         value shiftLeft(const value &v) const;
+        /**
+         * @throws InternalError thrown if operand is not an integer
+         */
         value shiftRight(const value &v) const;
     };
 
@@ -84,17 +94,23 @@ class CPPCHECKLIB MathLib {
 
     /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt() */
     static bigint toBigNumber(const Token * tok);
-    /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt() */
+    /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt()
+     * @throws InternalError thrown if conversion failed
+     */
     static bigint toBigNumber(const std::string & str, const Token *tok = nullptr);
     /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt() */
     static biguint toBigUNumber(const Token * tok);
-    /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt() */
+    /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt()
+     * @throws InternalError thrown if conversion failed
+     */
     static biguint toBigUNumber(const std::string & str, const Token *tok = nullptr);
 
     template<class T> static std::string toString(T value) = delete;
     /** @brief for conversion of numeric literals */
     static double toDoubleNumber(const Token * tok);
-    /** @brief for conversion of numeric literals */
+    /** @brief for conversion of numeric literals
+     * @throws InternalError thrown if conversion failed
+     */
     static double toDoubleNumber(const std::string & str, const Token * tok = nullptr);
 
     static bool isInt(const std::string & str);
@@ -121,8 +137,17 @@ class CPPCHECKLIB MathLib {
     static std::string add(const std::string & first, const std::string & second);
     static std::string subtract(const std::string & first, const std::string & second);
     static std::string multiply(const std::string & first, const std::string & second);
+    /**
+     * @throws InternalError thrown on overflow or division by zero
+     */
     static std::string divide(const std::string & first, const std::string & second);
+    /**
+     * @throws InternalError thrown on division by zero
+     */
     static std::string mod(const std::string & first, const std::string & second);
+    /**
+     * @throws InternalError thrown on unexpected action
+     */
     static std::string calculate(const std::string & first, const std::string & second, char action);
 
     static std::string sin(const std::string & tok);
diff --git a/lib/path.cpp b/lib/path.cpp
index eba26230022..fc059cdea4e 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -51,6 +51,8 @@
 #endif
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
+#elif defined(__HAIKU__)
+#include <image.h>
 #endif
 
 
@@ -158,6 +160,17 @@ std::string Path::getCurrentExecutablePath(const char* fallback)
 #elif defined(__APPLE__)
     uint32_t size = sizeof(buf);
     success = (_NSGetExecutablePath(buf, &size) == 0);
+#elif defined(__HAIKU__)
+    int32 cookie = 0;
+    image_info info;
+    while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK)
+    {
+        if (info.type == B_APP_IMAGE)
+        {
+            break;
+        }
+    }
+    return std::string(info.name);
 #else
     const char* procPath =
 #ifdef __SVR4 // Solaris
@@ -175,19 +188,26 @@ std::string Path::getCurrentExecutablePath(const char* fallback)
 
 bool Path::isAbsolute(const std::string& path)
 {
-    const std::string& nativePath = toNativeSeparators(path);
-
 #ifdef _WIN32
     if (path.length() < 2)
         return false;
 
+    if ((path[0] == '\\' || path[0] == '/') && (path[1] == '\\' || path[1] == '/'))
+        return true;
+
     // On Windows, 'C:\foo\bar' is an absolute path, while 'C:foo\bar' is not
-    return startsWith(nativePath, "\\\\") || (std::isalpha(nativePath[0]) != 0 && nativePath.compare(1, 2, ":\\") == 0);
+    return std::isalpha(path[0]) && path[1] == ':' && (path[2] == '\\' || path[2] == '/');
 #else
-    return !nativePath.empty() && nativePath[0] == '/';
+    return !path.empty() && path[0] == '/';
 #endif
 }
 
+bool Path::isRelative(const std::string& path)
+{
+    const std::string p = fromNativeSeparators(path);
+    return (p.find('/') != std::string::npos) && !isAbsolute(path);
+}
+
 std::string Path::getRelativePath(const std::string& absolutePath, const std::vector<std::string>& basePaths)
 {
     for (const std::string &bp : basePaths) {
@@ -241,8 +261,15 @@ static bool hasEmacsCppMarker(const char* path)
         return false;
     std::string buf(128, '\0');
     {
+#if __cplusplus >= 201703L
+        // C++17 provides an overload with non-const data()
+        #define CONST_CAST(x) (x)
+#else
+        #define CONST_CAST(x) const_cast<char*>(x)
+#endif
         // TODO: read the whole first line only
-        const char * const res = fgets(const_cast<char*>(buf.data()), buf.size(), fp);
+        const char * const res = fgets(CONST_CAST(buf.data()), buf.size(), fp);
+#undef CONST_CAST
         fclose(fp);
         fp = nullptr;
         if (!res)
@@ -317,7 +344,6 @@ static bool hasEmacsCppMarker(const char* path)
 
 Standards::Language Path::identify(const std::string &path, bool cppHeaderProbe, bool *header)
 {
-    // cppcheck-suppress uninitvar - TODO: FP
     if (header)
         *header = false;
 
@@ -335,7 +361,6 @@ Standards::Language Path::identify(const std::string &path, bool cppHeaderProbe,
         return Standards::Language::CPP;
     if (c_src_exts.find(ext) != c_src_exts.end())
         return Standards::Language::C;
-    // cppcheck-suppress knownConditionTrueFalse - TODO: FP
     if (!caseInsensitiveFilesystem())
         strTolower(ext);
     if (ext == ".h") {
@@ -381,7 +406,7 @@ std::string Path::getAbsoluteFilePath(const std::string& filePath)
     if (absolute)
         absolute_path = absolute;
     free(absolute);
-    // only throw on realpath() fialure to resolve a path when the given one was non-existent
+    // only throw on realpath() failure to resolve a path when the given one was non-existent
     if (!spath.empty() && absolute_path.empty() && !exists(spath))
         throw std::runtime_error("path '" + filePath + "' does not exist");
 #else
@@ -441,10 +466,19 @@ bool Path::exists(const std::string &path, bool* isdir)
     return type == S_IFREG;
 }
 
-std::string Path::join(const std::string& path1, const std::string& path2) {
+std::string Path::join(std::string path1, std::string path2)
+{
+    path1 = fromNativeSeparators(std::move(path1));
+    path2 = fromNativeSeparators(std::move(path2));
     if (path1.empty() || path2.empty())
         return path1 + path2;
+    // this matches the behavior of std::filesystem::path::operator/=() and os.path.join()
     if (path2.front() == '/')
         return path2;
     return ((path1.back() == '/') ? path1 : (path1 + "/")) + path2;
 }
+
+std::string Path::join(std::string path1, std::string path2, std::string path3)
+{
+    return Path::join(Path::join(std::move(path1), std::move(path2)), std::move(path3));
+}
diff --git a/lib/path.h b/lib/path.h
index 9f13da09236..863e74580f8 100644
--- a/lib/path.h
+++ b/lib/path.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -118,6 +118,13 @@ class CPPCHECKLIB Path {
      */
     static bool isAbsolute(const std::string& path);
 
+    /**
+     * @brief Check if given path is relative
+     * @param path Path to check
+     * @return true if given path is relative
+     */
+    static bool isRelative(const std::string& path);
+
     /**
      * @brief Create a relative path from an absolute one, if absolute path is inside the basePaths.
      * @param absolutePath Path to be made relative.
@@ -201,9 +208,18 @@ class CPPCHECKLIB Path {
     static bool exists(const std::string &path, bool* isdir = nullptr);
 
     /**
-     * join 2 paths with '/' separators
+     * @brief join 2 paths with '/' separators
+     * if path2 is an absolute path path1 will be dismissed.
+     * @return the joined path with normalized slashes
+     */
+    static std::string join(std::string path1, std::string path2);
+
+    /**
+     * @brief join 3 paths with '/' separators
+     * if path2 is an absolute path path1 will be dismissed.
+     * @return the joined path with normalized slashes
      */
-    static std::string join(const std::string& path1, const std::string& path2);
+    static std::string join(std::string path1, std::string path2, std::string path3);
 };
 
 /// @}
diff --git a/lib/pathanalysis.h b/lib/pathanalysis.h
index 307edc76499..1085fec3f4b 100644
--- a/lib/pathanalysis.h
+++ b/lib/pathanalysis.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
diff --git a/lib/pathmatch.cpp b/lib/pathmatch.cpp
index 638c2bce005..87420828f17 100644
--- a/lib/pathmatch.cpp
+++ b/lib/pathmatch.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,74 +19,133 @@
 #include "pathmatch.h"
 
 #include "path.h"
-#include "utils.h"
 
-#include <cstddef>
+#include <algorithm>
+#include <stack>
+#include <string>
 #include <utility>
+#include <vector>
 
-PathMatch::PathMatch(std::vector<std::string> paths, bool caseSensitive)
-    : mPaths(std::move(paths)), mCaseSensitive(caseSensitive)
+
+PathMatch::PathMatch(std::vector<std::string> patterns, std::string basepath, Syntax syntax) :
+    mPatterns(std::move(patterns)), mBasepath(std::move(basepath)), mSyntax(syntax)
+{}
+
+bool PathMatch::match(const std::string &path, Filemode mode) const
 {
-    for (std::string& p : mPaths)
-    {
-        p = Path::fromNativeSeparators(p);
-        if (!mCaseSensitive)
-            strTolower(p);
-    }
-    // TODO: also make lowercase?
-    mWorkingDirectory.push_back(Path::fromNativeSeparators(Path::getCurrentPath()));
+    return std::any_of(mPatterns.cbegin(), mPatterns.cend(), [&] (const std::string &pattern) {
+        return match(pattern, path, mBasepath, mode, mSyntax);
+    });
 }
 
-bool PathMatch::match(const std::string &path) const
+bool PathMatch::match(const std::string &pattern, const std::string &path, const std::string &basepath, Filemode mode, Syntax syntax)
 {
-    if (path.empty())
+    /* Fast paths for common patterns */
+    if (pattern.empty())
         return false;
 
-    std::string findpath = Path::fromNativeSeparators(path);
-    if (!mCaseSensitive)
-        strTolower(findpath);
-    std::string finddir;
-    if (!endsWith(findpath,'/'))
-        finddir = removeFilename(findpath);
-    else
-        finddir = findpath;
+    if (pattern == "*" || pattern == "**")
+        return true;
+
+    /* If the pattern ends with a path separator it matches only directories. If the path names a regular file then
+     * the last path component can't match. */
+    bool dir_mismatch = PathIterator::issep(pattern.back(), syntax) && mode != Filemode::directory;
+
+    if (!dir_mismatch && pattern == path)
+        return true;
+
+    /* A "real" pattern is absolute or relative to the base path. A pattern that isn't real can match at any
+     * path component boundary. */
+    bool real = Path::isAbsolute(pattern) || isRelativePattern(pattern);
 
-    const bool is_absolute = Path::isAbsolute(path);
+    /* Pattern iterator */
+    PathIterator s = PathIterator::fromPattern(pattern, basepath, syntax);
+    /* Path iterator */
+    PathIterator t = PathIterator::fromPath(path, basepath, syntax);
 
-    // TODO: align the match logic with ImportProject::ignorePaths()
-    for (auto i = mPaths.cbegin(); i != mPaths.cend(); ++i) {
-        const std::string pathToMatch((!is_absolute && Path::isAbsolute(*i)) ? Path::getRelativePath(*i, mWorkingDirectory) : *i);
+    if (dir_mismatch) {
+        /* Final compponent can't match, so skip it. */
+        while (*t != '\0' && *t != '/')
+            ++t;
+    }
+
+    /* Pattern restart position */
+    PathIterator p = s;
+    /* Path restart position */
+    PathIterator q = t;
+
+    /* Backtrack stack */
+    std::stack<std::pair<PathIterator::Pos, PathIterator::Pos>> b;
 
-        // Filtering directory name
-        if (endsWith(pathToMatch,'/')) {
-            if (pathToMatch.length() > finddir.length())
+    for (;;) {
+        switch (*s) {
+        /* Star or star-star, matches any number of characters */
+        case '*': {
+            bool slash = false;
+            ++s;
+            if (*s == '*') {
+                /* Star-star matches slashes as well */
+                slash = true;
+                ++s;
+            }
+            while (*t != '\0' && (slash || *t != '/')) {
+                if (*s == *t) {
+                    /* Could stop here, but do greedy match and add
+                     * backtrack instead */
+                    b.emplace(s.getpos(), t.getpos());
+                }
+                ++t;
+            }
+            continue;
+        }
+        /* Single character wildcard */
+        case '?': {
+            if (*t != '\0' && *t != '/') {
+                ++s;
+                ++t;
                 continue;
-            // Match relative paths starting with mask
-            // -isrc matches src/foo.cpp
-            if (finddir.compare(0, pathToMatch.size(), pathToMatch) == 0)
-                return true;
-            // Match only full directory name in middle or end of the path
-            // -isrc matches myproject/src/ but does not match
-            // myproject/srcfiles/ or myproject/mysrc/
-            if (finddir.find("/" + pathToMatch) != std::string::npos)
+            }
+            break;
+        }
+        /* Start of pattern; matches start of path, or a path separator if the
+         * pattern is not "real" (an absolute or relative path). */
+        case '\0': {
+            if (*t == '\0' || (*t == '/' && !real))
                 return true;
+            break;
         }
-        // Filtering filename
-        else {
-            if (pathToMatch.length() > findpath.length())
+        /* Literal character */
+        default: {
+            if (*s == *t) {
+                ++s;
+                ++t;
                 continue;
-            // Check if path ends with mask
-            // -ifoo.cpp matches (./)foo.c, src/foo.cpp and proj/src/foo.cpp
-            // -isrc/file.cpp matches src/foo.cpp and proj/src/foo.cpp
-            if (findpath.compare(findpath.size() - pathToMatch.size(), findpath.size(), pathToMatch) == 0)
-                return true;
+            }
+            break;
+        }
         }
-    }
-    return false;
-}
 
-std::string PathMatch::removeFilename(const std::string &path)
-{
-    const std::size_t ind = path.find_last_of('/');
-    return path.substr(0, ind + 1);
+        /* No match, try to backtrack */
+        if (!b.empty()) {
+            const auto bp = b.top();
+            b.pop();
+            s.setpos(bp.first);
+            t.setpos(bp.second);
+            continue;
+        }
+
+        /* Couldn't backtrack, try matching from the next path separator */
+        while (*q != '\0' && *q != '/')
+            ++q;
+
+        if (*q == '/') {
+            ++q;
+            s = p;
+            t = q;
+            continue;
+        }
+
+        /* No more path separators to try from */
+        return false;
+    }
 }
diff --git a/lib/pathmatch.h b/lib/pathmatch.h
index f0ace4fbc94..72fc89b7faa 100644
--- a/lib/pathmatch.h
+++ b/lib/pathmatch.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,52 +21,419 @@
 
 #include "config.h"
 
+#include <cctype>
+#include <cstdint>
+#include <cstdio>
 #include <string>
 #include <vector>
 
+#include "path.h"
+
 /// @addtogroup CLI
 /// @{
 
 /**
- * @brief Simple path matching for ignoring paths in CLI.
+ * Path matching rules:
+ * - All patterns are canonicalized (path separators vary by platform):
+ *   - '/./' => '/'
+ *   - '/dir/../' => '/'
+ *   - '//' => '/'
+ *   - Trailing slashes are removed (root slash is preserved)
+ * - Patterns can contain globs:
+ *   - '**' matches any number of characters including path separators.
+ *   - '*' matches any number of characters except path separators.
+ *   - '?' matches any single character except path separators.
+ * - If a pattern looks like an absolute path (e.g. starts with '/', but varies by platform):
+ *   - Match all files where the pattern matches the start of the file's canonical absolute path up until a path
+ *     separator or the end of the pathname.
+ * - If a pattern looks like a relative path, i.e. is '.' or '..', or
+ *   starts with '.' or '..' followed by a path separator:
+ *   - The pattern is interpreted as a path relative to `basepath` and then converted to an absolute path and
+ *     treated as such according to the above procedure. If the pattern is relative to some other directory, it should
+ *     be modified to be relative to `basepath` first (this should be done with patterns in project files, for example).
+ * - Otherwise:
+ *   - Match all files where the pattern matches any part of the file's canonical absolute path up until a
+ *     path separator or the end of the pathname, and the matching part directly follows a path separator.
+ * - If a pattern ends with a path separator before canonicalization then the final path component of the pattern
+ *   only matches the final path component of the file path if the file is a directory (specified by the file mode
+ *   parameter).
+ *
+ * TODO: Handle less common windows syntaxes:
+ *   - Drive-specific relative path: C:dir\foo.cpp
+ *   - Root-relative path: \dir\foo.cpp
+ **/
+
+/**
+ * @brief Syntactic path matching for ignoring paths in CLI.
  */
 class CPPCHECKLIB PathMatch {
 public:
 
     /**
-     * The constructor.
+     * @brief Path syntax.
      *
-     * If a path is a directory it needs to end with a file separator.
+     * windows: Case insensitive, forward and backward slashes, UNC or drive letter root.
+     * unix: Case sensitive, forward slashes, slash root.
      *
-     * @param paths List of masks.
-     * @param caseSensitive Match the case of the characters when
-     *   matching paths?
      */
-    explicit PathMatch(std::vector<std::string> paths, bool caseSensitive = true);
+    enum class Syntax : std::uint8_t {
+        windows,
+        unix,
+    };
 
     /**
-     * @brief Match path against list of masks.
+     * @brief The default syntax for the current platform.
+     */
+#ifdef _WIN32
+    static constexpr Syntax platform_syntax = Syntax::windows;
+#else
+    static constexpr Syntax platform_syntax = Syntax::unix;
+#endif
+
+    /**
+     * @brief File mode of a file being matched
      *
-     * If you want to match a directory the given path needs to end with a path separator.
+     * regular: File is a regular file.
+     * directory: File is a directory.
+     */
+    enum class Filemode : std::uint8_t {
+        regular,
+        directory,
+    };
+
+    /**
+     * The constructor.
+     *
+     * @param patterns List of patterns.
+     * @param basepath Path to which patterns and matched paths are relative, when applicable.
+     * @param syntax Path syntax.
+     */
+    explicit PathMatch(std::vector<std::string> patterns = {}, std::string basepath = std::string(), Syntax syntax = platform_syntax);
+
+    /**
+     * @brief Match path against list of patterns.
      *
      * @param path Path to match.
+     * @param mode The file mode of the file named by the path.
      * @return true if any of the masks match the path, false otherwise.
      */
-    bool match(const std::string &path) const;
+    bool match(const std::string &path, Filemode mode = Filemode::regular) const;
 
-protected:
+    /**
+     * @brief Match path against a single pattern.
+     *
+     * @param pattern Pattern to use.
+     * @param path Path to match.
+     * @param basepath Path to which the pattern and path is relative, when applicable.
+     * @param mode The file mode of the file named by the path.
+     * @param syntax Path syntax.
+     * @return true if the pattern matches the path, false otherwise.
+     */
+    static bool match(const std::string &pattern, const std::string &path, const std::string &basepath = std::string(), Filemode mode = Filemode::regular, Syntax syntax = platform_syntax);
 
     /**
-     * @brief Remove filename part from the path.
-     * @param path Path to edit.
-     * @return path without filename part.
+     * @brief Check if a pattern is a relative path name.
+     *
+     * @param pattern Pattern to check.
+     * @return true if the pattern has the form of a relative path name pattern.
      */
-    static std::string removeFilename(const std::string &path);
+    static bool isRelativePattern(const std::string &pattern)
+    {
+        if (pattern.empty() || pattern[0] != '.')
+            return false;
+
+        if (pattern.size() < 2 || pattern[1] == '/' || pattern[1] == '\\')
+            return true;
+
+        if (pattern[1] != '.')
+            return false;
+
+        if (pattern.size() < 3 || pattern[2] == '/' || pattern[2] == '\\')
+            return true;
+
+        return false;
+    }
+
+    /**
+     * @brief Join a pattern with a base path.
+     *
+     * @param basepath The base path to join the pattern to.
+     * @param pattern The pattern to join.
+     * @return The pattern appended to the base path with a separator if the pattern is a relative
+     * path name, otherwise just returns pattern.
+     */
+    static std::string joinRelativePattern(const std::string &basepath, const std::string &pattern)
+    {
+        if (isRelativePattern(pattern))
+            return Path::join(basepath, pattern);
+        return pattern;
+    }
+
+protected:
+    class PathIterator;
+
+private:
+    /* List of patterns */
+    std::vector<std::string> mPatterns;
+    /* Base path to with patterns and paths are relative */
+    std::string mBasepath;
+    /* The syntax to use */
+    Syntax mSyntax;
+};
+
+/**
+ * A more correct and less convenient name for this class would be PathStringsCanonicalReverseIterator.
+ *
+ * This class takes two path strings and iterates their concatenation in reverse while doing canonicalization,
+ * i.e. collapsing double-dots, removing extra slashes, dot-slashes, and trailing slashes, as well as converting
+ * native slashes to forward slashes and optionally converting characters to lowercase.
+ *
+ * Both strings are optional. If both strings are present, then they're concatenated with a slash
+ * (subject to canonicalization).
+ *
+ * Double-dots at the root level are removed. Trailing slashes are removed, the root is preserved.
+ *
+ * Doing the iteration in reverse allows canonicalization to be performed without lookahead. This is useful
+ * for comparing path strings, potentially relative to different base paths, without having to do prior string
+ * processing or extra allocations.
+ *
+ * The length of the output is at most strlen(a) + strlen(b) + 1.
+ *
+ * Example:
+ *   - input:  "/hello/universe/.", "../world//"
+ *   - output: "dlrow/olleh/"
+ **/
+class PathMatch::PathIterator {
+public:
+    /* Create from a pattern and base path */
+    static PathIterator fromPattern(const std::string &pattern, const std::string &basepath, Syntax syntax)
+    {
+        if (isRelativePattern(pattern))
+            return PathIterator(basepath.c_str(), pattern.c_str(), syntax);
+        return PathIterator(pattern.c_str(), nullptr, syntax);
+    }
+
+    /* Create from path and base path */
+    static PathIterator fromPath(const std::string &path, const std::string &basepath, Syntax syntax)
+    {
+        if (Path::isAbsolute(path))
+            return PathIterator(path.c_str(), nullptr, syntax);
+        return PathIterator(basepath.c_str(), path.c_str(), syntax);
+    }
+
+    /* Constructor */
+    explicit PathIterator(const char *path_a = nullptr, const char *path_b = nullptr, Syntax syntax = platform_syntax) :
+        mStart{path_a, path_b}, mSyntax(syntax)
+    {
+
+        for (int i = 0; i < 2; i++) {
+            const char *&p = mEnd[i];
+            p = mStart[i];
+
+            if (p == nullptr || *p == '\0')
+                continue;
+
+            if (mPos.l == 0) {
+                /* Check length of root component */
+                if (issep(p[0], syntax)) {
+                    mRootLength++;
+                    if (syntax == Syntax::windows && issep(p[1], syntax)) {
+                        mRootLength++;
+                        if (p[2] == '.' || p[2] == '?') {
+                            mRootLength++;
+                            if (issep(p[3], syntax))
+                                mRootLength++;
+                        }
+                    }
+                } else if (syntax == Syntax::windows && isdrive(p[0]) && p[1] == ':') {
+                    mRootLength += 2;
+                    if (issep(p[2], syntax))
+                        mRootLength++;
+                }
+                p += mRootLength;
+                mPos.l = mRootLength;
+            } else {
+                /* Add path separator */
+                mPos.l++;
+            }
+
+            while (*p != '\0') {
+                p++;
+                mPos.l++;
+            }
+
+            mPos.p = p - 1;
+        }
+
+        if (mPos.l == 0)
+            mPos.c = '\0';
+
+        skips(false);
+    }
+
+    /* Position struct */
+    struct Pos {
+        /* String pointer */
+        const char *p{};
+        /* Raw characters left */
+        std::size_t l{};
+        /* Buffered character */
+        int c {EOF};
+    };
+
+    /* Save the current position */
+    const Pos &getpos() const
+    {
+        return mPos;
+    }
+
+    /* Restore a saved position */
+    void setpos(const Pos &pos)
+    {
+        mPos = pos;
+    }
+
+    /* Read the current character */
+    char operator*() const
+    {
+        return current();
+    }
+
+    /* Go to the next character */
+    void operator++()
+    {
+        advance();
+    }
+
+    /* Consume remaining characters into an std::string and reverse, use for testing */
+    std::string read()
+    {
+        std::string str;
+
+        while (current() != '\0') {
+            str.insert(0, 1, current());
+            advance();
+        }
+
+        return str;
+    }
+
+    /* Syntax helper, check if a character is a path separator */
+    static bool issep(char c, Syntax syntax)
+    {
+        return c == '/' || (syntax == Syntax::windows && c == '\\');
+    }
+
+    /* Syntax helper, check if a character is a drive letter */
+    static bool isdrive(char c)
+    {
+        return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
+    }
 
 private:
-    std::vector<std::string> mPaths;
-    bool mCaseSensitive;
-    std::vector<std::string> mWorkingDirectory;
+    /* Read the current character */
+    char current() const
+    {
+        if (mPos.c != EOF)
+            return mPos.c;
+
+        char c = *mPos.p;
+
+        if (mSyntax == Syntax::windows) {
+            if (c == '\\')
+                return '/';
+            return std::tolower(c);
+        }
+
+        return c;
+    }
+
+    /* Do canonicalization on a path component boundary */
+    void skips(bool leadsep)
+    {
+        while (mPos.l > mRootLength) {
+            Pos pos = mPos;
+
+            if (leadsep) {
+                if (current() != '/')
+                    break;
+                nextc();
+            }
+
+            char c = current();
+            if (c == '.') {
+                nextc();
+                c = current();
+                if (c == '.') {
+                    nextc();
+                    c = current();
+                    if (c == '/') {
+                        /* Skip 'dir/../' */
+                        nextc();
+                        skips(false);
+                        while (mPos.l > mRootLength && current() != '/')
+                            nextc();
+                        continue;
+                    }
+                } else if (c == '/') {
+                    /* Skip '/./' */
+                    continue;
+                } else if (c == '\0') {
+                    /* Skip leading './' */
+                    break;
+                }
+            } else if (c == '/') {
+                /* Skip double separator (keep root) */
+                nextc();
+                leadsep = false;
+                continue;
+            }
+
+            mPos = pos;
+            break;
+        }
+    }
+
+    /* Go to the next character, doing skips on path separators */
+    void advance()
+    {
+        nextc();
+
+        if (current() == '/')
+            skips(true);
+    }
+
+    /* Go to the next character */
+    void nextc()
+    {
+        if (mPos.l == 0)
+            return;
+
+        mPos.l--;
+
+        if (mPos.l == 0)
+            mPos.c = '\0';
+        else if (mPos.c != EOF) {
+            mPos.c = EOF;
+        } else {
+            if (mPos.p == mStart[1]) {
+                mPos.p = mEnd[0];
+                mPos.c = '/';
+            }
+            mPos.p--;
+        }
+    }
+
+    /* String start pointers */
+    const char *mStart[2] {};
+    /* String end pointers */
+    const char *mEnd[2] {};
+    /* Current position */
+    Pos mPos {};
+    /* Length of the root component */
+    std::size_t mRootLength {};
+    /* Syntax */
+    Syntax mSyntax;
 };
 
 /// @}
diff --git a/lib/platform.cpp b/lib/platform.cpp
index d0eb992b0a0..0e202b9f49a 100644
--- a/lib/platform.cpp
+++ b/lib/platform.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 #include <cstring>
 #include <iostream>
 #include <limits>
+#include <utility>
 #include <vector>
 
 #include "xml.h"
@@ -39,6 +40,7 @@ bool Platform::set(Type t)
     case Type::Unspecified: // unknown type sizes (sizes etc are set but are not known)
     case Type::Native: // same as system this code was compile on
         type = t;
+        windows = false;
         sizeof_bool = sizeof(bool);
         sizeof_short = sizeof(short);
         sizeof_int = sizeof(int);
@@ -56,14 +58,12 @@ bool Platform::set(Type t)
             defaultSign = std::numeric_limits<char>::is_signed ? 's' : 'u';
         }
         char_bit = 8;
-        short_bit = char_bit * sizeof_short;
-        int_bit = char_bit * sizeof_int;
-        long_bit = char_bit * sizeof_long;
-        long_long_bit = char_bit * sizeof_long_long;
+        calculateBitMembers();
         return true;
     case Type::Win32W:
     case Type::Win32A:
         type = t;
+        windows = true;
         sizeof_bool = 1; // 4 in Visual C++ 4.2
         sizeof_short = 2;
         sizeof_int = 4;
@@ -75,15 +75,13 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 2;
         sizeof_size_t = 4;
         sizeof_pointer = 4;
-        defaultSign = '\0';
+        defaultSign = 's';
         char_bit = 8;
-        short_bit = char_bit * sizeof_short;
-        int_bit = char_bit * sizeof_int;
-        long_bit = char_bit * sizeof_long;
-        long_long_bit = char_bit * sizeof_long_long;
+        calculateBitMembers();
         return true;
     case Type::Win64:
         type = t;
+        windows = true;
         sizeof_bool = 1;
         sizeof_short = 2;
         sizeof_int = 4;
@@ -95,15 +93,13 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 2;
         sizeof_size_t = 8;
         sizeof_pointer = 8;
-        defaultSign = '\0';
+        defaultSign = 's';
         char_bit = 8;
-        short_bit = char_bit * sizeof_short;
-        int_bit = char_bit * sizeof_int;
-        long_bit = char_bit * sizeof_long;
-        long_long_bit = char_bit * sizeof_long_long;
+        calculateBitMembers();
         return true;
     case Type::Unix32:
         type = t;
+        windows = false;
         sizeof_bool = 1;
         sizeof_short = 2;
         sizeof_int = 4;
@@ -115,15 +111,13 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 4;
         sizeof_size_t = 4;
         sizeof_pointer = 4;
-        defaultSign = '\0';
+        defaultSign = 's';
         char_bit = 8;
-        short_bit = char_bit * sizeof_short;
-        int_bit = char_bit * sizeof_int;
-        long_bit = char_bit * sizeof_long;
-        long_long_bit = char_bit * sizeof_long_long;
+        calculateBitMembers();
         return true;
     case Type::Unix64:
         type = t;
+        windows = false;
         sizeof_bool = 1;
         sizeof_short = 2;
         sizeof_int = 4;
@@ -135,12 +129,9 @@ bool Platform::set(Type t)
         sizeof_wchar_t = 4;
         sizeof_size_t = 8;
         sizeof_pointer = 8;
-        defaultSign = '\0';
+        defaultSign = 's';
         char_bit = 8;
-        short_bit = char_bit * sizeof_short;
-        int_bit = char_bit * sizeof_int;
-        long_bit = char_bit * sizeof_long;
-        long_long_bit = char_bit * sizeof_long_long;
+        calculateBitMembers();
         return true;
     case Type::File:
         // sizes are not set.
@@ -152,6 +143,7 @@ bool Platform::set(Type t)
 
 bool Platform::set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths, bool debug)
 {
+    // TODO: needs to be invalidated in case it was already set
     if (platformstr == "win32A")
         set(Type::Win32A);
     else if (platformstr == "win32W")
@@ -170,69 +162,90 @@ bool Platform::set(const std::string& platformstr, std::string& errstr, const st
         errstr = "unrecognized platform: '" + platformstr + "' (no lookup).";
         return false;
     }
-    else {
-        bool found = false;
-        for (const std::string& path : paths) {
-            if (debug)
-                std::cout << "looking for platform '" + platformstr + "' in '" + path + "'" << std::endl;
-            if (loadFromFile(path.c_str(), platformstr, debug)) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            errstr = "unrecognized platform: '" + platformstr + "'.";
-            return false;
-        }
+    else if (!loadFromFile(paths, platformstr, debug)) {
+        errstr = "unrecognized platform: '" + platformstr + "'.";
+        return false;
     }
 
     return true;
 }
 
-bool Platform::loadFromFile(const char exename[], const std::string &filename, bool debug)
+bool Platform::loadFromFile(const std::vector<std::string>& paths, const std::string &filename, bool debug)
 {
-    // TODO: only append .xml if missing
+    if (debug)
+        std::cout << "looking for platform '" + filename + "'" << std::endl;
+
+    const bool is_abs_path = Path::isAbsolute(filename);
+    const bool is_rel_path = Path::isRelative(filename);
+
+    std::string fullfilename(filename);
+    // TODO: what if extension is not .xml?
+    // only append extension when we provide the library name is not a path - TODO: handle relative paths?
+    if (!is_abs_path && !is_rel_path && Path::getFilenameExtension(fullfilename).empty())
+        fullfilename += ".xml";
+
     // TODO: use native separators
-    std::vector<std::string> filenames{
-        filename,
-        filename + ".xml",
-        "platforms/" + filename,
-        "platforms/" + filename + ".xml"
-    };
-    if (exename && (std::string::npos != Path::fromNativeSeparators(exename).find('/'))) {
-        filenames.push_back(Path::getPathFromFilename(Path::fromNativeSeparators(exename)) + filename);
-        filenames.push_back(Path::getPathFromFilename(Path::fromNativeSeparators(exename)) + "platforms/" + filename);
-        filenames.push_back(Path::getPathFromFilename(Path::fromNativeSeparators(exename)) + "platforms/" + filename + ".xml");
+    std::vector<std::string> filenames;
+    if (is_abs_path)
+    {
+        filenames.push_back(std::move(fullfilename));
     }
+    else {
+        // TODO: drop duplicated paths
+        for (const std::string& path : paths)
+        {
+            if (path.empty())
+                continue; // TODO: error out instead?
+
+            std::string ppath = Path::fromNativeSeparators(path);
+            if (ppath.back() != '/')
+                ppath += '/';
+            // TODO: look in platforms first?
+            filenames.push_back(ppath + fullfilename);
+            filenames.push_back(ppath + "platforms/" + fullfilename);
+        }
 #ifdef FILESDIR
-    std::string filesdir = FILESDIR;
-    if (!filesdir.empty() && filesdir[filesdir.size()-1] != '/')
-        filesdir += '/';
-    filenames.push_back(filesdir + ("platforms/" + filename));
-    filenames.push_back(filesdir + ("platforms/" + filename + ".xml"));
+        std::string filesdir = FILESDIR;
+        if (!filesdir.empty()) {
+            if (filesdir.back() != '/')
+                filesdir += '/';
+            // TODO: look in filesdir?
+            filenames.push_back(filesdir + "platforms/" + fullfilename);
+        }
 #endif
+    }
 
     // open file..
     tinyxml2::XMLDocument doc;
-    bool success = false;
+    tinyxml2::XMLError err = tinyxml2::XML_SUCCESS;
     for (const std::string & f : filenames) {
         if (debug)
             std::cout << "try to load platform file '" << f << "' ... ";
-        if (doc.LoadFile(f.c_str()) == tinyxml2::XML_SUCCESS) {
+        err = doc.LoadFile(f.c_str());
+        if (err == tinyxml2::XML_SUCCESS) {
             if (debug)
                 std::cout << "Success" << std::endl;
-            success = true;
             break;
         }
         if (debug)
             std::cout << doc.ErrorStr() << std::endl;
+        if (err != tinyxml2::XML_ERROR_FILE_NOT_FOUND)
+            break;
     }
-    if (!success)
+    if (err != tinyxml2::XML_SUCCESS)
         return false;
 
     return loadFromXmlDocument(&doc);
 }
 
+static const char* xmlText(const tinyxml2::XMLElement* node, bool& error)
+{
+    const char* const str = node->GetText();
+    if (!str)
+        error = true;
+    return str;
+}
+
 static unsigned int xmlTextAsUInt(const tinyxml2::XMLElement* node, bool& error)
 {
     unsigned int retval = 0;
@@ -241,6 +254,14 @@ static unsigned int xmlTextAsUInt(const tinyxml2::XMLElement* node, bool& error)
     return retval;
 }
 
+static unsigned int xmlTextAsBool(const tinyxml2::XMLElement* node, bool& error)
+{
+    bool retval = false;
+    if (node->QueryBoolText(&retval) != tinyxml2::XML_SUCCESS)
+        error = true;
+    return retval;
+}
+
 bool Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
 {
     const tinyxml2::XMLElement * const rootnode = doc->FirstChildElement();
@@ -252,11 +273,9 @@ bool Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
         const char* name = node->Name();
         if (std::strcmp(name, "default-sign") == 0) {
-            const char* str = node->GetText();
-            if (str)
+            const char * const str = xmlText(node, error);
+            if (!error)
                 defaultSign = *str;
-            else
-                error = true;
         } else if (std::strcmp(name, "char_bit") == 0)
             char_bit = xmlTextAsUInt(node, error);
         else if (std::strcmp(name, "sizeof") == 0) {
@@ -286,13 +305,11 @@ bool Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
                     sizeof_wchar_t = xmlTextAsUInt(sz, error);
             }
         }
+        else if (std::strcmp(node->Name(), "windows") == 0) {
+            windows = xmlTextAsBool(node, error);
+        }
     }
-
-    short_bit = char_bit * sizeof_short;
-    int_bit = char_bit * sizeof_int;
-    long_bit = char_bit * sizeof_long;
-    long_long_bit = char_bit * sizeof_long_long;
-
+    calculateBitMembers();
     type = Type::File;
     return !error;
 }
diff --git a/lib/platform.h b/lib/platform.h
index 86d1ccdfc2f..97e7d296fba 100644
--- a/lib/platform.h
+++ b/lib/platform.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,12 +24,12 @@
 #include "config.h"
 #include "mathlib.h"
 #include "standards.h"
+#include "utils.h"
 
 #include <cassert>
 #include <climits>
 #include <cstddef>
 #include <cstdint>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -66,8 +66,22 @@ class CPPCHECKLIB Platform {
         return (1ULL << bit) - 1ULL;
     }
 
+    void calculateBitMembers() {
+        short_bit = char_bit * sizeof_short;
+        int_bit = char_bit * sizeof_int;
+        long_bit = char_bit * sizeof_long;
+        long_long_bit = char_bit * sizeof_long_long;
+        float_bit = char_bit * sizeof_float;
+        double_bit = char_bit * sizeof_double;
+        long_double_bit = char_bit * sizeof_long_double;
+    }
+
     /** provides list of defines specified by the limit.h/climits includes */
     std::string getLimitsDefines(bool c99) const;
+
+protected:
+    /** load platform from xml document, primarily for testing */
+    bool loadFromXmlDocument(const tinyxml2::XMLDocument *doc);
 public:
     Platform();
 
@@ -99,6 +113,9 @@ class CPPCHECKLIB Platform {
     std::uint8_t int_bit;        /// bits in int
     std::uint8_t long_bit;       /// bits in long
     std::uint8_t long_long_bit;  /// bits in long long
+    std::uint8_t float_bit;  /// bits in float
+    std::uint8_t double_bit;  /// bits in double
+    std::uint8_t long_double_bit;  /// bits in long double
 
     /** size of standard types */
     std::size_t sizeof_bool;
@@ -115,6 +132,8 @@ class CPPCHECKLIB Platform {
 
     char defaultSign;  // unsigned:'u', signed:'s', unknown:'\0'
 
+    bool windows{false}; // indicates if the platform is Windows
+
     enum Type : std::uint8_t {
         Unspecified, // No platform specified
         Native, // whatever system this code was compiled on
@@ -137,24 +156,20 @@ class CPPCHECKLIB Platform {
 
     /**
      * load platform file
-     * @param exename application path
+     * @param paths the additional paths to look into
      * @param filename platform filename
      * @param debug log verbose information about the lookup
      * @return returns true if file was loaded successfully
      */
-    bool loadFromFile(const char exename[], const std::string &filename, bool debug = false);
+    bool loadFromFile(const std::vector<std::string>& paths, const std::string &filename, bool debug = false);
 
-    /** load platform from xml document, primarily for testing */
-    bool loadFromXmlDocument(const tinyxml2::XMLDocument *doc);
 
     /**
      * @brief Returns true if platform type is Windows
      * @return true if Windows platform type.
      */
     bool isWindows() const {
-        return type == Type::Win32A ||
-               type == Type::Win32W ||
-               type == Type::Win64;
+        return windows;
     }
 
     const char *toString() const {
@@ -179,9 +194,8 @@ class CPPCHECKLIB Platform {
             return "unix64";
         case Type::File:
             return "platformFile";
-        default:
-            throw std::runtime_error("unknown platform");
         }
+        cppcheck::unreachable();
     }
 
     long long unsignedCharMax() const {
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 901dc57cffe..1289e6e6510 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,6 +22,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "library.h"
+#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
@@ -34,6 +35,8 @@
 #include <cassert>
 #include <cstddef>
 #include <iterator>
+#include <memory>
+#include <stdexcept>
 #include <sstream>
 #include <utility>
 
@@ -44,18 +47,12 @@ static bool sameline(const simplecpp::Token *tok1, const simplecpp::Token *tok2)
     return tok1 && tok2 && tok1->location.sameline(tok2->location);
 }
 
-Directive::Directive(const simplecpp::Location & _loc, std::string _str) :
-    file(_loc.file()),
+Directive::Directive(const simplecpp::TokenList &tokens, const simplecpp::Location & _loc, std::string _str) :
+    file(tokens.file(_loc)),
     linenr(_loc.line),
     str(std::move(_str))
 {}
 
-Directive::Directive(std::string _file, const int _linenr, std::string _str) :
-    file(std::move(_file)),
-    linenr(_linenr),
-    str(std::move(_str))
-{}
-
 Directive::DirectiveToken::DirectiveToken(const simplecpp::Token & _tok) :
     line(_tok.location.line),
     column(_tok.location.col),
@@ -64,25 +61,19 @@ Directive::DirectiveToken::DirectiveToken(const simplecpp::Token & _tok) :
 
 char Preprocessor::macroChar = char(1);
 
-Preprocessor::Preprocessor(const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang)
-    : mSettings(settings)
+Preprocessor::Preprocessor(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang)
+    : mTokens(tokens)
+    , mSettings(settings)
     , mErrorLogger(errorLogger)
     , mLang(lang)
 {
     assert(mLang != Standards::Language::None);
 }
 
-Preprocessor::~Preprocessor()
-{
-    for (const std::pair<const std::string, simplecpp::TokenList*>& tokenList : mTokenLists)
-        delete tokenList.second;
-}
-
 namespace {
     struct BadInlineSuppression {
-        BadInlineSuppression(std::string file, const int line, std::string msg) : file(std::move(file)), line(line), errmsg(std::move(msg)) {}
-        std::string file;
-        int line;
+        BadInlineSuppression(const simplecpp::Location& loc, std::string msg) : location(loc), errmsg(std::move(msg)) {}
+        simplecpp::Location location;
         std::string errmsg;
     };
 }
@@ -97,25 +88,32 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
     const std::string::size_type pos1 = comment.find_first_not_of("/* \t");
     if (pos1 == std::string::npos)
         return false;
-    if (pos1 + cppchecksuppress.size() >= comment.size())
-        return false;
     if (comment.substr(pos1, cppchecksuppress.size()) != cppchecksuppress)
         return false;
+    if (pos1 + cppchecksuppress.size() >= comment.size()) {
+        bad.emplace_back(tok->location, "suppression without error ID");
+        return false;
+    }
 
     // check if it has a prefix
     const std::string::size_type posEndComment = comment.find_first_of(" [", pos1+cppchecksuppress.size());
 
     // skip spaces after "cppcheck-suppress" and its possible prefix
     const std::string::size_type pos2 = comment.find_first_not_of(' ', posEndComment);
-    if (pos2 == std::string::npos)
+    if (pos2 == std::string::npos) {
+        bad.emplace_back(tok->location, "suppression without error ID");
         return false;
+    }
 
     SuppressionList::Type errorType = SuppressionList::Type::unique;
 
     // determine prefix if specified
     if (posEndComment >= (pos1 + cppchecksuppress.size() + 1)) {
-        if (comment.at(pos1 + cppchecksuppress.size()) != '-')
+        const std::string suppressCmdString = comment.substr(pos1, pos2-pos1-1);
+        if (comment.at(pos1 + cppchecksuppress.size()) != '-') {
+            bad.emplace_back(tok->location, "unknown suppression type '" + suppressCmdString + "'");
             return false;
+        }
 
         const unsigned int argumentLength =
             posEndComment - (pos1 + cppchecksuppress.size() + 1);
@@ -131,8 +129,10 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
             errorType = SuppressionList::Type::blockEnd;
         else if ("macro" == suppressTypeString)
             errorType = SuppressionList::Type::macro;
-        else
+        else {
+            bad.emplace_back(tok->location, "unknown suppression type '" + suppressCmdString + "'");
             return false;
+        }
     }
 
     if (comment[pos2] == '[') {
@@ -144,11 +144,14 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
             s.isInline = true;
             s.type = errorType;
             s.lineNumber = tok->location.line;
+            s.column = tok->location.col;
         }
 
+        // TODO: return false?
         if (!errmsg.empty())
-            bad.emplace_back(tok->location.file(), tok->location.line, std::move(errmsg));
+            bad.emplace_back(tok->location, std::move(errmsg));
 
+        // TODO: report ones without ID - return false?
         std::copy_if(suppressions.cbegin(), suppressions.cend(), std::back_inserter(inlineSuppressions), [](const SuppressionList::Suppression& s) {
             return !s.errorId.empty();
         });
@@ -162,21 +165,25 @@ static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std:
         s.isInline = true;
         s.type = errorType;
         s.lineNumber = tok->location.line;
+        s.column = tok->location.col;
 
+        // TODO: report when no ID - unreachable?
         if (!s.errorId.empty())
             inlineSuppressions.push_back(std::move(s));
 
+        // TODO: unreachable?
+        // TODO: return false?
         if (!errmsg.empty())
-            bad.emplace_back(tok->location.file(), tok->location.line, std::move(errmsg));
+            bad.emplace_back(tok->location, std::move(errmsg));
     }
 
     return true;
 }
 
-static std::string getRelativeFilename(const simplecpp::Token* tok, const Settings &settings) {
+static std::string getRelativeFilename(const simplecpp::TokenList &tokens, const simplecpp::Token* tok, const Settings &settings) {
     if (!tok)
         return "";
-    std::string relativeFilename(tok->location.file());
+    std::string relativeFilename(tokens.file(tok->location));
     if (settings.relativePaths) {
         for (const std::string & basePath : settings.basePaths) {
             const std::string bp = basePath + "/";
@@ -194,6 +201,8 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
 
     bool onlyComments = true;
 
+    polyspace::Parser polyspaceParser(settings);
+
     for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
         if (!tok->comment) {
             onlyComments = false;
@@ -201,20 +210,24 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
         }
 
         std::list<SuppressionList::Suppression> inlineSuppressions;
-        if (!parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad))
-            continue;
+        if (polyspace::isPolyspaceComment(tok->str())) {
+            inlineSuppressions = polyspaceParser.parse(tok->str(), tok->location.line, getRelativeFilename(tokens, tok, settings));
+        } else {
+            if (!parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad))
+                continue;
 
-        if (!sameline(tok->previous, tok)) {
-            // find code after comment..
-            if (tok->next) {
-                tok = tok->next;
+            if (!sameline(tok->previous, tok)) {
+                // find code after comment..
+                if (tok->next) {
+                    tok = tok->next;
 
-                while (tok->comment) {
-                    parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad);
-                    if (tok->next) {
-                        tok = tok->next;
-                    } else {
-                        break;
+                    while (tok->comment) {
+                        parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad);
+                        if (tok->next) {
+                            tok = tok->next;
+                        } else {
+                            break;
+                        }
                     }
                 }
             }
@@ -228,7 +241,7 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
             continue;
 
         // Relative filename
-        const std::string relativeFilename = getRelativeFilename(tok, settings);
+        const std::string relativeFilename = getRelativeFilename(tokens, tok, settings);
 
         // Macro name
         std::string macroName;
@@ -242,9 +255,11 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
         // Add the suppressions.
         for (SuppressionList::Suppression &suppr : inlineSuppressions) {
             suppr.fileName = relativeFilename;
+            suppr.fileIndex = tok->location.fileIndex;
 
-            if (SuppressionList::Type::blockBegin == suppr.type)
-            {
+            if (SuppressionList::Type::block == suppr.type) {
+                suppressions.addSuppression(std::move(suppr));
+            } else if (SuppressionList::Type::blockBegin == suppr.type) {
                 inlineSuppressionsBlockBegin.push_back(std::move(suppr));
             } else if (SuppressionList::Type::blockEnd == suppr.type) {
                 bool throwError = true;
@@ -264,6 +279,7 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
                             suppr.lineBegin = supprBegin->lineNumber;
                             suppr.lineEnd = suppr.lineNumber;
                             suppr.lineNumber = supprBegin->lineNumber;
+                            suppr.column = supprBegin->column;
                             suppr.type = SuppressionList::Type::block;
                             inlineSuppressionsBlockBegin.erase(supprBegin);
                             suppressions.addSuppression(std::move(suppr)); // TODO: check result
@@ -275,8 +291,12 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
                 }
 
                 if (throwError) {
+                    simplecpp::Location loc;
                     // NOLINTNEXTLINE(bugprone-use-after-move) - moved only when thrownError is false
-                    bad.emplace_back(suppr.fileName, suppr.lineNumber, "Suppress End: No matching begin");
+                    loc.fileIndex = suppr.fileIndex;
+                    loc.line = suppr.lineNumber;
+                    loc.col = suppr.column;
+                    bad.emplace_back(loc, "Suppress End: No matching begin");
                 }
             } else if (SuppressionList::Type::unique == suppr.type || suppr.type == SuppressionList::Type::macro) {
                 // special handling when suppressing { warnings for backwards compatibility
@@ -290,84 +310,75 @@ static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Sett
 
                 suppr.thisAndNextLine = thisAndNextLine;
                 suppr.lineNumber = tok->location.line;
+                suppr.column = tok->location.col;
                 suppr.macroName = macroName;
                 suppressions.addSuppression(std::move(suppr)); // TODO: check result
             } else if (SuppressionList::Type::file == suppr.type) {
                 if (onlyComments)
                     suppressions.addSuppression(std::move(suppr)); // TODO: check result
-                else
-                    bad.emplace_back(suppr.fileName, suppr.lineNumber, "File suppression should be at the top of the file");
+                else {
+                    simplecpp::Location loc;
+                    loc.fileIndex = suppr.fileIndex;
+                    loc.line = suppr.lineNumber;
+                    loc.col = suppr.column;
+                    bad.emplace_back(loc, "File suppression should be at the top of the file");
+                }
             }
         }
     }
 
-    for (const SuppressionList::Suppression & suppr: inlineSuppressionsBlockBegin)
-        // cppcheck-suppress useStlAlgorithm
-        bad.emplace_back(suppr.fileName, suppr.lineNumber, "Suppress Begin: No matching end");
+    for (const SuppressionList::Suppression & suppr: inlineSuppressionsBlockBegin) {
+        simplecpp::Location loc;
+        loc.fileIndex = suppr.fileIndex;
+        loc.line = suppr.lineNumber;
+        loc.col = suppr.column;
+        bad.emplace_back(loc, "Suppress Begin: No matching end");
+    }
+}
+
+void Preprocessor::inlineSuppressions(SuppressionList &suppressions) const
+{
+    inlineSuppressions(mTokens, suppressions);
 }
 
-void Preprocessor::inlineSuppressions(const simplecpp::TokenList &tokens, SuppressionList &suppressions)
+void Preprocessor::inlineSuppressions(const simplecpp::TokenList &tokens, SuppressionList &suppressions) const
 {
     if (!mSettings.inlineSuppressions)
         return;
     std::list<BadInlineSuppression> err;
     ::addInlineSuppressions(tokens, mSettings, suppressions, err);
-    for (auto it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        if (it->second)
-            ::addInlineSuppressions(*it->second, mSettings, suppressions, err);
-    }
     for (const BadInlineSuppression &bad : err) {
-        error(bad.file, bad.line, bad.errmsg);
+        invalidSuppression(bad.location, bad.errmsg);
     }
 }
 
-std::vector<RemarkComment> Preprocessor::getRemarkComments(const simplecpp::TokenList &tokens) const
+void Preprocessor::createDirectives(std::list<Directive> &directives) const
 {
-    std::vector<RemarkComment> ret;
-    addRemarkComments(tokens, ret);
-    for (auto it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        if (it->second)
-            addRemarkComments(*it->second, ret);
-    }
-    return ret;
+    createDirectives(mTokens, directives);
 }
 
-std::list<Directive> Preprocessor::createDirectives(const simplecpp::TokenList &tokens) const
+void Preprocessor::createDirectives(const simplecpp::TokenList &tokens, std::list<Directive> &directives)
 {
-    // directive list..
-    std::list<Directive> directives;
-
-    std::vector<const simplecpp::TokenList *> list;
-    list.reserve(1U + mTokenLists.size());
-    list.push_back(&tokens);
-    for (auto it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        list.push_back(it->second);
-    }
-
-    for (const simplecpp::TokenList *tokenList : list) {
-        for (const simplecpp::Token *tok = tokenList->cfront(); tok; tok = tok->next) {
-            if ((tok->op != '#') || (tok->previous && tok->previous->location.line == tok->location.line))
-                continue;
-            if (tok->next && tok->next->str() == "endfile")
+    for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
+        if ((tok->op != '#') || (tok->previous && tok->previous->location.line == tok->location.line))
+            continue;
+        if (tok->next && tok->next->str() == "endfile")
+            continue;
+        Directive directive(tokens, tok->location, "");
+        for (const simplecpp::Token *tok2 = tok; tok2 && tok2->location.line == directive.linenr; tok2 = tok2->next) {
+            if (tok2->comment)
                 continue;
-            Directive directive(tok->location, "");
-            for (const simplecpp::Token *tok2 = tok; tok2 && tok2->location.line == directive.linenr; tok2 = tok2->next) {
-                if (tok2->comment)
-                    continue;
-                if (!directive.str.empty() && (tok2->location.col > tok2->previous->location.col + tok2->previous->str().size()))
-                    directive.str += ' ';
-                if (directive.str == "#" && tok2->str() == "file")
-                    directive.str += "include";
-                else
-                    directive.str += tok2->str();
-
-                directive.strTokens.emplace_back(*tok2);
-            }
-            directives.push_back(std::move(directive));
+            if (!directive.str.empty() && (tok2->location.col > tok2->previous->location.col + tok2->previous->str().size()))
+                directive.str += ' ';
+            if (directive.str == "#" && tok2->str() == "file")
+                directive.str += "include";
+            else
+                directive.str += tok2->str();
+
+            directive.strTokens.emplace_back(*tok2);
         }
+        directives.push_back(std::move(directive));
     }
-
-    return directives;
 }
 
 static std::string readcondition(const simplecpp::Token *iftok, const std::set<std::string> &defined, const std::set<std::string> &undefined)
@@ -406,30 +417,77 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
             return next1->str();
     }
 
-    if (len == 3 && cond->name && next1->str() == "==" && next2->number) {
+    if (len == 3 && cond->name && (next1->str() == "==" || next1->str() == "<=" || next1->str() == ">=") && next2->number) {
         if (defined.find(cond->str()) == defined.end())
-            return cond->str() + '=' + cond->next->next->str();
+            return cond->str() + '=' + next1->next->str();
+    }
+
+    const auto lessGreaterThanConfig = [](const simplecpp::Token* dtok, const simplecpp::Token* ctok) {
+        auto v = MathLib::toBigNumber(ctok->next->str());
+        if (ctok->op == '<')
+            v -= 1;
+        else
+            v += 1;
+        return dtok->str() + '=' + std::to_string(v);
+    };
+
+    if (len == 3 && cond->name && (next1->op == '<' || next1->op == '>') && next2->number) {
+        if (defined.find(cond->str()) == defined.end()) {
+            return lessGreaterThanConfig(cond, next1);
+        }
     }
 
     std::set<std::string> configset;
+    bool isNotDefinedMacro = false;
     for (; sameline(iftok,cond); cond = cond->next) {
         if (cond->op == '!') {
             if (!sameline(iftok,cond->next) || !cond->next->name)
                 break;
-            if (cond->next->str() == "defined")
+            if (cond->next->str() == "defined") {
+                isNotDefinedMacro = true;
                 continue;
+            }
             configset.insert(cond->next->str() + "=0");
             continue;
         }
-        if (cond->str() != "defined")
+        if (cond->str() == "==" || cond->str() == "<=" || cond->str() == ">=") {
+            if (!cond->next)
+                break;
+            if (cond->next->number) {
+                const simplecpp::Token *dtok = cond->previous;
+                if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end())
+                    configset.insert(dtok->str() + '=' + cond->next->str());
+            }
             continue;
-        const simplecpp::Token *dtok = cond->next;
-        if (!dtok)
-            break;
-        if (dtok->op == '(')
-            dtok = dtok->next;
-        if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end())
-            configset.insert(dtok->str());
+        }
+        if (cond->op == '<' || cond->op == '>') {
+            if (!cond->next)
+                break;
+            if (cond->next->number) {
+                const simplecpp::Token *dtok = cond->previous;
+                if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end()) {
+                    configset.insert(lessGreaterThanConfig(dtok, cond));
+                }
+            }
+            continue;
+        }
+        if (cond->str() == "defined") {
+            const simplecpp::Token *dtok = cond->next;
+            if (!dtok)
+                break;
+            if (dtok->op == '(')
+                dtok = dtok->next;
+
+            if (sameline(iftok,dtok) && dtok->name && defined.find(dtok->str()) == defined.end() && undefined.find(dtok->str()) == undefined.end()) {
+                if (!isNotDefinedMacro) {
+                    configset.insert(dtok->str() + "=" + dtok->str()); // if defined is set to itself.
+                } else {
+                    configset.insert(dtok->str());
+                }
+                isNotDefinedMacro = false;
+            }
+            continue;
+        }
     }
     std::string cfgStr;
     for (const std::string &s : configset) {
@@ -440,18 +498,19 @@ static std::string readcondition(const simplecpp::Token *iftok, const std::set<s
     return cfgStr;
 }
 
-static bool hasDefine(const std::string &userDefines, const std::string &cfg)
+static bool hasDefine(const std::string &userDefines, const std::string &cfgStr)
 {
-    if (cfg.empty()) {
+    if (cfgStr.empty()) {
         return false;
     }
 
     std::string::size_type pos = 0;
+    const std::string cfgname = cfgStr.substr(0, cfgStr.find('='));
     while (pos < userDefines.size()) {
-        pos = userDefines.find(cfg, pos);
+        pos = userDefines.find(cfgname, pos);
         if (pos == std::string::npos)
             break;
-        const std::string::size_type pos2 = pos + cfg.size();
+        const std::string::size_type pos2 = pos + cfgname.size();
         if ((pos == 0 || userDefines[pos-1U] == ';') && (pos2 == userDefines.size() || userDefines[pos2] == '='))
             return true;
         pos = pos2;
@@ -477,11 +536,11 @@ static std::string cfg(const std::vector<std::string> &configs, const std::strin
     return ret;
 }
 
-static bool isUndefined(const std::string &cfg, const std::set<std::string> &undefined)
+static bool isUndefined(const std::string &cfgStr, const std::set<std::string> &undefined)
 {
-    for (std::string::size_type pos1 = 0U; pos1 < cfg.size();) {
-        const std::string::size_type pos2 = cfg.find(';',pos1);
-        const std::string def = (pos2 == std::string::npos) ? cfg.substr(pos1) : cfg.substr(pos1, pos2 - pos1);
+    for (std::string::size_type pos1 = 0U; pos1 < cfgStr.size();) {
+        const std::string::size_type pos2 = cfgStr.find(';',pos1);
+        const std::string def = (pos2 == std::string::npos) ? cfgStr.substr(pos1) : cfgStr.substr(pos1, pos2 - pos1);
 
         const std::string::size_type eq = def.find('=');
         if (eq == std::string::npos && undefined.find(def) != undefined.end())
@@ -537,8 +596,11 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 const simplecpp::Token *expr1 = cmdtok->next;
                 if (sameline(tok,expr1) && expr1->name && !sameline(tok,expr1->next))
                     config = expr1->str();
-                if (defined.find(config) != defined.end())
+                if (defined.find(config) != defined.end()) {
                     config.clear();
+                } else if ((cmdtok->str() == "ifdef") && sameline(cmdtok,expr1) && !config.empty()) {
+                    config.append("=" + expr1->str()); //Set equal to itself if ifdef.
+                }
             } else if (cmdtok->str() == "if") {
                 config = readcondition(cmdtok, defined, undefined);
             }
@@ -578,6 +640,24 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 }
             }
 
+            // check if config already exists in the ret set, but as a more general or more specific version
+            if (cmdtok->str() != "ifndef")
+            {
+                const std::string::size_type eq = config.find('=');
+                const std::string config2 = (eq != std::string::npos) ? config.substr(0, eq) : config + "=" + config;
+                const std::set<std::string>::iterator it2 = ret.find(config2);
+                if (it2 != ret.end()) {
+                    if (eq == std::string::npos) {
+                        // The instance in ret is more specific than the one in config (no =value), replace it with the one in config
+                        ret.erase(it2);
+                    } else {
+                        // The instance in ret is more general than the one in config (have =value), keep the one in ret
+                        config.clear();
+                        continue;
+                    }
+                }
+            }
+
             configs_if.push_back((cmdtok->str() == "ifndef") ? std::string() : config);
             configs_ifndef.push_back((cmdtok->str() == "ifndef") ? std::move(config) : std::string());
             ret.insert(cfg(configs_if,userDefines));
@@ -611,8 +691,18 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 configs_if.push_back(std::move(config));
                 ret.insert(cfg(configs_if, userDefines));
             } else if (!configs_ifndef.empty()) {
-                configs_if.push_back(configs_ifndef.back());
-                ret.insert(cfg(configs_if, userDefines));
+                //Check if ifndef already existing in ret as more general/specific version
+                const std::string &confCandidate = configs_ifndef.back();
+                if (ret.find(confCandidate) == ret.end()) {
+                    // No instance of config_ifndef in ret. Check if a more specific version exists, in that case replace it
+                    const std::set<std::string>::iterator it = ret.find(confCandidate + "=" + confCandidate);
+                    if (it != ret.end()) {
+                        // The instance in ret is more specific than the one in confCandidate (no =value), replace it with the one in confCandidate
+                        ret.erase(it);
+                    }
+                    configs_if.push_back(configs_ifndef.back());
+                    ret.insert(cfg(configs_if, userDefines));
+                }
             }
         } else if (cmdtok->str() == "endif" && !sameline(tok, cmdtok->next)) {
             if (!configs_if.empty())
@@ -622,7 +712,7 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
         } else if (cmdtok->str() == "error") {
             if (!configs_ifndef.empty() && !configs_ifndef.back().empty()) {
                 if (configs_ifndef.size() == 1U)
-                    ret.erase(emptyString);
+                    ret.erase("");
                 std::vector<std::string> configs(configs_if);
                 configs.push_back(configs_ifndef.back());
                 ret.erase(cfg(configs, userDefines));
@@ -661,30 +751,28 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
         ret.insert(std::move(elseError));
 }
 
-
-std::set<std::string> Preprocessor::getConfigs(const simplecpp::TokenList &tokens) const
+void Preprocessor::getConfigs(std::set<std::string> &defined, std::set<std::string> &configs) const
 {
-    std::set<std::string> ret = { "" };
-    if (!tokens.cfront())
-        return ret;
-
-    std::set<std::string> defined = { "__cplusplus" };
+    if (!mTokens.cfront())
+        return;
 
-    ::getConfigs(tokens, defined, mSettings.userDefines, mSettings.userUndefs, ret);
+    ::getConfigs(mTokens, defined, mSettings.userDefines, mSettings.userUndefs, configs);
+}
 
-    for (auto it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        if (!mSettings.configurationExcluded(it->first))
-            ::getConfigs(*(it->second), defined, mSettings.userDefines, mSettings.userUndefs, ret);
-    }
+void Preprocessor::getConfigs(const std::string &filename, const simplecpp::TokenList &tokens, std::set<std::string> &defined, std::set<std::string> &configs) const
+{
+    if (!tokens.cfront())
+        return;
 
-    return ret;
+    if (!mSettings.configurationExcluded(filename))
+        ::getConfigs(tokens, defined, mSettings.userDefines, mSettings.userUndefs, configs);
 }
 
-static void splitcfg(const std::string &cfg, std::list<std::string> &defines, const std::string &defaultValue)
+static void splitcfg(const std::string &cfgStr, std::list<std::string> &defines, const std::string &defaultValue)
 {
-    for (std::string::size_type defineStartPos = 0U; defineStartPos < cfg.size();) {
-        const std::string::size_type defineEndPos = cfg.find(';', defineStartPos);
-        std::string def = (defineEndPos == std::string::npos) ? cfg.substr(defineStartPos) : cfg.substr(defineStartPos, defineEndPos - defineStartPos);
+    for (std::string::size_type defineStartPos = 0U; defineStartPos < cfgStr.size();) {
+        const std::string::size_type defineEndPos = cfgStr.find(';', defineStartPos);
+        std::string def = (defineEndPos == std::string::npos) ? cfgStr.substr(defineStartPos) : cfgStr.substr(defineStartPos, defineEndPos - defineStartPos);
         if (!defaultValue.empty() && def.find('=') == std::string::npos)
             def += '=' + defaultValue;
         defines.push_back(std::move(def));
@@ -694,14 +782,14 @@ static void splitcfg(const std::string &cfg, std::list<std::string> &defines, co
     }
 }
 
-static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfg, Standards::Language lang)
+static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfgStr, Standards::Language lang)
 {
     // TODO: make it possible to specify platform-dependent sizes
     simplecpp::DUI dui;
 
     splitcfg(mSettings.userDefines, dui.defines, "1");
-    if (!cfg.empty())
-        splitcfg(cfg, dui.defines, "");
+    if (!cfgStr.empty())
+        splitcfg(cfgStr, dui.defines, "");
 
     for (const std::string &def : mSettings.library.defines()) {
         const std::string::size_type pos = def.find_first_of(" (");
@@ -721,127 +809,103 @@ static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cf
     dui.undefined = mSettings.userUndefs; // -U
     dui.includePaths = mSettings.includePaths; // -I
     dui.includes = mSettings.userIncludes;  // --include
-    // TODO: use mSettings.standards.stdValue instead
     if (lang == Standards::Language::CPP) {
-        dui.std = mSettings.standards.getCPP();
+        dui.std = mSettings.standards.stdValueCPP;
+        if (dui.std.empty()) {
+            dui.std = mSettings.standards.getCPP();
+        }
         splitcfg(mSettings.platform.getLimitsDefines(Standards::getCPP(dui.std)), dui.defines, "");
     }
     else if (lang == Standards::Language::C) {
-        dui.std = mSettings.standards.getC();
+        dui.std = mSettings.standards.stdValueC;
+        if (dui.std.empty()) {
+            dui.std = mSettings.standards.getC();
+        }
         splitcfg(mSettings.platform.getLimitsDefines(Standards::getC(dui.std)), dui.defines, "");
     }
     dui.clearIncludeCache = mSettings.clearIncludeCache;
     return dui;
 }
 
-bool Preprocessor::hasErrors(const simplecpp::Output &output)
+const simplecpp::Output* Preprocessor::handleErrors(const simplecpp::OutputList& outputList)
 {
-    switch (output.type) {
-    case simplecpp::Output::ERROR:
-    case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY:
-    case simplecpp::Output::SYNTAX_ERROR:
-    case simplecpp::Output::UNHANDLED_CHAR_ERROR:
-    case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
-    case simplecpp::Output::FILE_NOT_FOUND:
-    case simplecpp::Output::DUI_ERROR:
-        return true;
-    case simplecpp::Output::WARNING:
-    case simplecpp::Output::MISSING_HEADER:
-    case simplecpp::Output::PORTABILITY_BACKSLASH:
-        break;
-    }
-    return false;
+    const bool showerror = (!mSettings.userDefines.empty() && !mSettings.force);
+    return reportOutput(outputList, showerror);
 }
 
-bool Preprocessor::hasErrors(const simplecpp::OutputList &outputList)
+bool Preprocessor::loadAllIncludes(std::vector<std::string> &files)
 {
-    const auto it = std::find_if(outputList.cbegin(), outputList.cend(), [](const simplecpp::Output &output) {
-        return hasErrors(output);
-    });
-    return it != outputList.cend();
-}
+    const simplecpp::DUI dui = createDUI(mSettings, "", mLang);
 
-void Preprocessor::handleErrors(const simplecpp::OutputList& outputList, bool throwError)
-{
-    const bool showerror = (!mSettings.userDefines.empty() && !mSettings.force);
-    reportOutput(outputList, showerror);
-    if (throwError) {
-        const auto it = std::find_if(outputList.cbegin(), outputList.cend(), [](const simplecpp::Output &output){
-            return hasErrors(output);
-        });
-        if (it != outputList.cend()) {
-            throw *it;
-        }
-    }
+    simplecpp::OutputList outputList;
+    mFileCache = simplecpp::load(mTokens, files, dui, &outputList, std::move(mFileCache));
+    return !handleErrors(outputList);
 }
 
-bool Preprocessor::loadFiles(const simplecpp::TokenList &rawtokens, std::vector<std::string> &files)
+simplecpp::FileData *Preprocessor::loadFile(std::vector<std::string> &files, const std::string &file)
 {
     const simplecpp::DUI dui = createDUI(mSettings, "", mLang);
 
-    simplecpp::OutputList outputList;
-    mTokenLists = simplecpp::load(rawtokens, files, dui, &outputList);
-    handleErrors(outputList, false);
-    return !hasErrors(outputList);
+    return mFileCache.get("", file, dui, false, files, nullptr).first;
+}
+
+void Preprocessor::removeComments()
+{
+    removeComments(mTokens);
 }
 
 void Preprocessor::removeComments(simplecpp::TokenList &tokens)
 {
     tokens.removeComments();
-    for (std::pair<const std::string, simplecpp::TokenList*>& tokenList : mTokenLists) {
-        if (tokenList.second)
-            tokenList.second->removeComments();
-    }
 }
 
-void Preprocessor::setPlatformInfo(simplecpp::TokenList &tokens, const Settings& settings)
+void Preprocessor::setPlatformInfo()
 {
-    tokens.sizeOfType["bool"]          = settings.platform.sizeof_bool;
-    tokens.sizeOfType["short"]         = settings.platform.sizeof_short;
-    tokens.sizeOfType["int"]           = settings.platform.sizeof_int;
-    tokens.sizeOfType["long"]          = settings.platform.sizeof_long;
-    tokens.sizeOfType["long long"]     = settings.platform.sizeof_long_long;
-    tokens.sizeOfType["float"]         = settings.platform.sizeof_float;
-    tokens.sizeOfType["double"]        = settings.platform.sizeof_double;
-    tokens.sizeOfType["long double"]   = settings.platform.sizeof_long_double;
-    tokens.sizeOfType["bool *"]        = settings.platform.sizeof_pointer;
-    tokens.sizeOfType["short *"]       = settings.platform.sizeof_pointer;
-    tokens.sizeOfType["int *"]         = settings.platform.sizeof_pointer;
-    tokens.sizeOfType["long *"]        = settings.platform.sizeof_pointer;
-    tokens.sizeOfType["long long *"]   = settings.platform.sizeof_pointer;
-    tokens.sizeOfType["float *"]       = settings.platform.sizeof_pointer;
-    tokens.sizeOfType["double *"]      = settings.platform.sizeof_pointer;
-    tokens.sizeOfType["long double *"] = settings.platform.sizeof_pointer;
+    mTokens.sizeOfType["bool"]          = mSettings.platform.sizeof_bool;
+    mTokens.sizeOfType["short"]         = mSettings.platform.sizeof_short;
+    mTokens.sizeOfType["int"]           = mSettings.platform.sizeof_int;
+    mTokens.sizeOfType["long"]          = mSettings.platform.sizeof_long;
+    mTokens.sizeOfType["long long"]     = mSettings.platform.sizeof_long_long;
+    mTokens.sizeOfType["float"]         = mSettings.platform.sizeof_float;
+    mTokens.sizeOfType["double"]        = mSettings.platform.sizeof_double;
+    mTokens.sizeOfType["long double"]   = mSettings.platform.sizeof_long_double;
+    mTokens.sizeOfType["bool *"]        = mSettings.platform.sizeof_pointer;
+    mTokens.sizeOfType["short *"]       = mSettings.platform.sizeof_pointer;
+    mTokens.sizeOfType["int *"]         = mSettings.platform.sizeof_pointer;
+    mTokens.sizeOfType["long *"]        = mSettings.platform.sizeof_pointer;
+    mTokens.sizeOfType["long long *"]   = mSettings.platform.sizeof_pointer;
+    mTokens.sizeOfType["float *"]       = mSettings.platform.sizeof_pointer;
+    mTokens.sizeOfType["double *"]      = mSettings.platform.sizeof_pointer;
+    mTokens.sizeOfType["long double *"] = mSettings.platform.sizeof_pointer;
 }
 
-simplecpp::TokenList Preprocessor::preprocess(const simplecpp::TokenList &tokens1, const std::string &cfg, std::vector<std::string> &files, bool throwError)
+simplecpp::TokenList Preprocessor::preprocess(const std::string &cfgStr, std::vector<std::string> &files, simplecpp::OutputList& outputList)
 {
-    const simplecpp::DUI dui = createDUI(mSettings, cfg, mLang);
+    const simplecpp::DUI dui = createDUI(mSettings, cfgStr, mLang);
 
-    simplecpp::OutputList outputList;
     std::list<simplecpp::MacroUsage> macroUsage;
     std::list<simplecpp::IfCond> ifCond;
     simplecpp::TokenList tokens2(files);
-    simplecpp::preprocess(tokens2, tokens1, files, mTokenLists, dui, &outputList, &macroUsage, &ifCond);
+    simplecpp::preprocess(tokens2, mTokens, files, mFileCache, dui, &outputList, &macroUsage, &ifCond);
     mMacroUsage = std::move(macroUsage);
     mIfCond = std::move(ifCond);
 
-    handleErrors(outputList, throwError);
-
     tokens2.removeComments();
 
     return tokens2;
 }
 
-std::string Preprocessor::getcode(const simplecpp::TokenList &tokens1, const std::string &cfg, std::vector<std::string> &files, const bool writeLocations)
+std::string Preprocessor::getcode(const std::string &cfgStr, std::vector<std::string> &files, const bool writeLocations)
 {
-    simplecpp::TokenList tokens2 = preprocess(tokens1, cfg, files, false);
+    simplecpp::OutputList outputList;
+    simplecpp::TokenList tokens2 = preprocess(cfgStr, files, outputList);
+    handleErrors(outputList);
     unsigned int prevfile = 0;
     unsigned int line = 1;
     std::ostringstream ret;
     for (const simplecpp::Token *tok = tokens2.cfront(); tok; tok = tok->next) {
         if (writeLocations && tok->location.fileIndex != prevfile) {
-            ret << "\n#line " << tok->location.line << " \"" << tok->location.file() << "\"\n";
+            ret << "\n#line " << tok->location.line << " \"" << mTokens.file(tok->location) << "\"\n";
             prevfile = tok->location.fileIndex;
             line = tok->location.line;
         }
@@ -860,81 +924,145 @@ std::string Preprocessor::getcode(const simplecpp::TokenList &tokens1, const std
     return ret.str();
 }
 
-void Preprocessor::reportOutput(const simplecpp::OutputList &outputList, bool showerror)
+const simplecpp::Output* Preprocessor::reportOutput(const simplecpp::OutputList &outputList, bool showerror)
 {
+    const simplecpp::Output* out_ret = nullptr;
+
     for (const simplecpp::Output &out : outputList) {
         switch (out.type) {
         case simplecpp::Output::ERROR:
+            out_ret = &out;
             if (!startsWith(out.msg,"#error") || showerror)
-                error(out.location.file(), out.location.line, out.msg);
+                error(out.location, out.msg, out.type);
             break;
         case simplecpp::Output::WARNING:
         case simplecpp::Output::PORTABILITY_BACKSLASH:
+        case simplecpp::Output::PORTABILITY_LINE_DIRECTIVE:
+        case simplecpp::Output::PORTABILITY_NO_EOF_NEWLINE:
             break;
         case simplecpp::Output::MISSING_HEADER: {
+            // not considered an "error"
             const std::string::size_type pos1 = out.msg.find_first_of("<\"");
             const std::string::size_type pos2 = out.msg.find_first_of(">\"", pos1 + 1U);
             if (pos1 < pos2 && pos2 != std::string::npos)
-                missingInclude(out.location.file(), out.location.line, out.msg.substr(pos1+1, pos2-pos1-1), out.msg[pos1] == '\"' ? UserHeader : SystemHeader);
+                missingInclude(out.location, out.msg.substr(pos1+1, pos2-pos1-1), out.msg[pos1] == '\"' ? UserHeader : SystemHeader);
         }
         break;
+        case simplecpp::Output::DIRECTIVE_AS_MACRO_PARAMETER:
         case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY:
         case simplecpp::Output::SYNTAX_ERROR:
         case simplecpp::Output::UNHANDLED_CHAR_ERROR:
-            error(out.location.file(), out.location.line, out.msg);
+            out_ret = &out;
+            error(out.location, out.msg, out.type);
             break;
         case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
         case simplecpp::Output::FILE_NOT_FOUND:
         case simplecpp::Output::DUI_ERROR:
-            error("", 0, out.msg);
+            out_ret = &out;
+            error({}, out.msg, out.type);
             break;
         }
     }
+
+    return out_ret;
+}
+
+static std::string simplecppErrToId(simplecpp::Output::Type type)
+{
+    switch (type) {
+    case simplecpp::Output::ERROR:
+        return "preprocessorErrorDirective";
+    case simplecpp::Output::SYNTAX_ERROR:
+    case simplecpp::Output::DIRECTIVE_AS_MACRO_PARAMETER:
+        return "syntaxError";
+    case simplecpp::Output::UNHANDLED_CHAR_ERROR:
+        return "unhandledChar";
+    case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY:
+        return "includeNestedTooDeeply";
+    case simplecpp::Output::FILE_NOT_FOUND:
+        return "missingFile";
+    case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
+        return "missingIncludeExplicit";
+    // should never occur
+    case simplecpp::Output::DUI_ERROR:
+    // handled separately
+    case simplecpp::Output::MISSING_HEADER:
+    // no handled at all (warnings)
+    case simplecpp::Output::WARNING:
+    case simplecpp::Output::PORTABILITY_BACKSLASH:
+    case simplecpp::Output::PORTABILITY_LINE_DIRECTIVE:
+    case simplecpp::Output::PORTABILITY_NO_EOF_NEWLINE:
+        throw std::runtime_error("unexpected simplecpp::Output type " + std::to_string(type));
+    }
+
+    cppcheck::unreachable();
 }
 
-void Preprocessor::error(const std::string &filename, unsigned int linenr, const std::string &msg)
+void Preprocessor::error(const simplecpp::Location& loc, const std::string &msg, simplecpp::Output::Type type) const
+{
+    error(loc, msg, simplecppErrToId(type));
+}
+
+void Preprocessor::error(const simplecpp::Location& loc, const std::string &msg, const std::string& id) const
 {
     std::list<ErrorMessage::FileLocation> locationList;
-    if (!filename.empty()) {
-        std::string file = Path::fromNativeSeparators(filename);
+    if (!mTokens.file(loc).empty()) {
+        std::string file = Path::fromNativeSeparators(mTokens.file(loc));
         if (mSettings.relativePaths)
             file = Path::getRelativePath(file, mSettings.basePaths);
 
-        locationList.emplace_back(file, linenr, 0);
+        locationList.emplace_back(file, loc.line, loc.col);
     }
     mErrorLogger.reportErr(ErrorMessage(std::move(locationList),
                                         mFile0,
                                         Severity::error,
                                         msg,
-                                        "preprocessorErrorDirective",
+                                        id,
                                         Certainty::normal));
 }
 
 // Report that include is missing
-void Preprocessor::missingInclude(const std::string &filename, unsigned int linenr, const std::string &header, HeaderTypes headerType)
+void Preprocessor::missingInclude(const simplecpp::Location& loc, const std::string &header, HeaderTypes headerType)
 {
     if (!mSettings.checks.isEnabled(Checks::missingInclude))
         return;
 
     std::list<ErrorMessage::FileLocation> locationList;
-    if (!filename.empty()) {
-        locationList.emplace_back(filename, linenr, 0);
+    if (!mTokens.file(loc).empty()) {
+        // TODO: add relative path handling?
+        locationList.emplace_back(mTokens.file(loc), loc.line, loc.col);
     }
     ErrorMessage errmsg(std::move(locationList), mFile0, Severity::information,
                         (headerType==SystemHeader) ?
-                        "Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results." :
+                        "Include file: <" + header + "> not found. Please note: Standard library headers do not need to be provided to get proper results." :
                         "Include file: \"" + header + "\" not found.",
                         (headerType==SystemHeader) ? "missingIncludeSystem" : "missingInclude",
                         Certainty::normal);
     mErrorLogger.reportErr(errmsg);
 }
 
+void Preprocessor::invalidSuppression(const simplecpp::Location& loc, const std::string &msg) const
+{
+    error(loc, msg, "invalidSuppression");
+}
+
 void Preprocessor::getErrorMessages(ErrorLogger &errorLogger, const Settings &settings)
 {
-    Preprocessor preprocessor(settings, errorLogger, Standards::Language::CPP);
-    preprocessor.missingInclude("", 1, "", UserHeader);
-    preprocessor.missingInclude("", 1, "", SystemHeader);
-    preprocessor.error("", 1, "#error message");   // #error ..
+    std::vector<std::string> files;
+    simplecpp::TokenList tokens(files);
+    Preprocessor preprocessor(tokens, settings, errorLogger, Standards::Language::CPP);
+    simplecpp::Location loc;
+    loc.line = 1;
+    loc.col = 2;
+    preprocessor.missingInclude(loc, "", UserHeader);
+    preprocessor.missingInclude(loc, "", SystemHeader);
+    preprocessor.error(loc, "message", simplecpp::Output::ERROR);
+    preprocessor.error(loc, "message", simplecpp::Output::SYNTAX_ERROR);
+    preprocessor.error(loc, "message", simplecpp::Output::UNHANDLED_CHAR_ERROR);
+    preprocessor.error(loc, "message", simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY);
+    preprocessor.error(loc, "message", simplecpp::Output::FILE_NOT_FOUND);
+    preprocessor.error(loc, "message", simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND);
+    preprocessor.invalidSuppression(loc, "message");
 }
 
 void Preprocessor::dump(std::ostream &out) const
@@ -946,10 +1074,10 @@ void Preprocessor::dump(std::ostream &out) const
         for (const simplecpp::MacroUsage &macroUsage: mMacroUsage) {
             out << "    <macro"
                 << " name=\"" << macroUsage.macroName << "\""
-                << " file=\"" << ErrorLogger::toxml(macroUsage.macroLocation.file()) << "\""
+                << " file=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(macroUsage.macroLocation), mSettings.basePaths) : mTokens.file(macroUsage.macroLocation)) << "\""
                 << " line=\"" << macroUsage.macroLocation.line << "\""
                 << " column=\"" << macroUsage.macroLocation.col << "\""
-                << " usefile=\"" << ErrorLogger::toxml(macroUsage.useLocation.file()) << "\""
+                << " usefile=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(macroUsage.useLocation), mSettings.basePaths) : mTokens.file(macroUsage.useLocation)) << "\""
                 << " useline=\"" << macroUsage.useLocation.line << "\""
                 << " usecolumn=\"" << macroUsage.useLocation.col << "\""
                 << " is-known-value=\"" << bool_to_string(macroUsage.macroValueKnown) << "\""
@@ -962,7 +1090,7 @@ void Preprocessor::dump(std::ostream &out) const
         out << "  <simplecpp-if-cond>" << std::endl;
         for (const simplecpp::IfCond &ifCond: mIfCond) {
             out << "    <if-cond"
-                << " file=\"" << ErrorLogger::toxml(ifCond.location.file()) << "\""
+                << " file=\"" << ErrorLogger::toxml(mSettings.relativePaths ? Path::getRelativePath(mTokens.file(ifCond.location), mSettings.basePaths) : mTokens.file(ifCond.location)) << "\""
                 << " line=\"" << ifCond.location.line << "\""
                 << " column=\"" << ifCond.location.col << "\""
                 << " E=\"" << ErrorLogger::toxml(ifCond.E) << "\""
@@ -973,18 +1101,18 @@ void Preprocessor::dump(std::ostream &out) const
     }
 }
 
-std::size_t Preprocessor::calculateHash(const simplecpp::TokenList &tokens1, const std::string &toolinfo) const
+std::size_t Preprocessor::calculateHash(const std::string &toolinfo) const
 {
     std::string hashData = toolinfo;
-    for (const simplecpp::Token *tok = tokens1.cfront(); tok; tok = tok->next) {
+    for (const simplecpp::Token *tok = mTokens.cfront(); tok; tok = tok->next) {
         if (!tok->comment) {
             hashData += tok->str();
             hashData += static_cast<char>(tok->location.line);
             hashData += static_cast<char>(tok->location.col);
         }
     }
-    for (auto it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        for (const simplecpp::Token *tok = it->second->cfront(); tok; tok = tok->next) {
+    for (const auto &filedata : mFileCache) {
+        for (const simplecpp::Token *tok = filedata->tokens.cfront(); tok; tok = tok->next) {
             if (!tok->comment) {
                 hashData += tok->str();
                 hashData += static_cast<char>(tok->location.line);
@@ -995,15 +1123,12 @@ std::size_t Preprocessor::calculateHash(const simplecpp::TokenList &tokens1, con
     return (std::hash<std::string>{})(hashData);
 }
 
-void Preprocessor::simplifyPragmaAsm(simplecpp::TokenList &tokenList) const
+void Preprocessor::simplifyPragmaAsm()
 {
-    Preprocessor::simplifyPragmaAsmPrivate(tokenList);
-    for (const std::pair<const std::string, simplecpp::TokenList*>& list : mTokenLists) {
-        Preprocessor::simplifyPragmaAsmPrivate(*list.second);
-    }
+    simplifyPragmaAsm(mTokens);
 }
 
-void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
+void Preprocessor::simplifyPragmaAsm(simplecpp::TokenList &tokenList)
 {
     // assembler code..
     for (simplecpp::Token *tok = tokenList.front(); tok; tok = tok->next) {
@@ -1021,6 +1146,7 @@ void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
             continue;
 
         const simplecpp::Token *endasm = tok3;
+        bool foundEndasm = false;
         while ((endasm = endasm->next) != nullptr) {
             if (endasm->op != '#' || sameline(endasm,endasm->previousSkipComments()))
                 continue;
@@ -1032,9 +1158,13 @@ void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
                 continue;
             while (sameline(endasm,endasm3))
                 endasm = endasm->next;
+            foundEndasm = true;
             break;
         }
 
+        if (!foundEndasm)
+            throw InternalError(nullptr, "syntax error: missing #pragma endasm", InternalError::SYNTAX);
+
         const simplecpp::Token * const tok4 = tok3->next;
         tok->setstr("asm");
         const_cast<simplecpp::Token *>(tok2)->setstr("(");
@@ -1045,9 +1175,15 @@ void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
     }
 }
 
+std::vector<RemarkComment> Preprocessor::getRemarkComments() const
+{
+    return getRemarkComments(mTokens);
+}
 
-void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const
+std::vector<RemarkComment> Preprocessor::getRemarkComments(const simplecpp::TokenList &tokens) const
 {
+    std::vector<RemarkComment> remarkComments;
+
     for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
         if (!tok->comment)
             continue;
@@ -1089,9 +1225,11 @@ void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::ve
             continue;
 
         // Relative filename
-        const std::string relativeFilename = getRelativeFilename(remarkedToken, mSettings);
+        const std::string relativeFilename = getRelativeFilename(tokens, remarkedToken, mSettings);
 
         // Add the suppressions.
         remarkComments.emplace_back(relativeFilename, remarkedToken->location.line, remarkText);
     }
+
+    return remarkComments;
 }
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
index 8659cc36fb7..91a0b7e7d37 100644
--- a/lib/preprocessor.h
+++ b/lib/preprocessor.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -28,7 +28,6 @@
 #include <cstdint>
 #include <istream>
 #include <list>
-#include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ -69,8 +68,7 @@ struct CPPCHECKLIB Directive {
     std::vector<DirectiveToken> strTokens;
 
     /** record a directive (possibly filtering src) */
-    Directive(const simplecpp::Location & _loc, std::string _str);
-    Directive(std::string _file, int _linenr, std::string _str);
+    Directive(const simplecpp::TokenList &tokens, const simplecpp::Location & _loc, std::string _str);
 };
 
 class CPPCHECKLIB RemarkComment {
@@ -100,46 +98,55 @@ class CPPCHECKLIB RemarkComment {
  * configurations that exist in a source file.
  */
 class CPPCHECKLIB WARN_UNUSED Preprocessor {
-    // TODO: get rid of this
-    friend class PreprocessorHelper;
     friend class TestPreprocessor;
-    friend class TestUnusedVar;
 
 public:
     /** character that is inserted in expanded macros */
     static char macroChar;
 
-    explicit Preprocessor(const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang);
-    virtual ~Preprocessor();
+    Preprocessor(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang);
 
-    void inlineSuppressions(const simplecpp::TokenList &tokens, SuppressionList &suppressions);
+    void inlineSuppressions(SuppressionList &suppressions) const;
 
-    std::list<Directive> createDirectives(const simplecpp::TokenList &tokens) const;
+    void inlineSuppressions(const simplecpp::TokenList &tokens, SuppressionList &suppressions) const;
 
-    std::set<std::string> getConfigs(const simplecpp::TokenList &tokens) const;
+    void createDirectives(std::list<Directive> &directives) const;
+
+    static void createDirectives(const simplecpp::TokenList &tokens, std::list<Directive> &directives);
+
+    void getConfigs(std::set<std::string> &defined, std::set<std::string> &configs) const;
+
+    void getConfigs(const std::string &filename, const simplecpp::TokenList &tokens, std::set<std::string> &defined, std::set<std::string> &configs) const;
+
+    std::vector<RemarkComment> getRemarkComments() const;
 
     std::vector<RemarkComment> getRemarkComments(const simplecpp::TokenList &tokens) const;
 
-    bool loadFiles(const simplecpp::TokenList &rawtokens, std::vector<std::string> &files);
+    bool loadAllIncludes(std::vector<std::string> &files);
+
+    simplecpp::FileData *loadFile(std::vector<std::string> &files, const std::string &file);
+
+    void removeComments();
 
-    void removeComments(simplecpp::TokenList &tokens);
+    static void removeComments(simplecpp::TokenList &tokens);
 
-    static void setPlatformInfo(simplecpp::TokenList &tokens, const Settings& settings);
+    void setPlatformInfo();
 
-    simplecpp::TokenList preprocess(const simplecpp::TokenList &tokens1, const std::string &cfg, std::vector<std::string> &files, bool throwError = false);
+    simplecpp::TokenList preprocess(const std::string &cfgStr, std::vector<std::string> &files, simplecpp::OutputList& outputList);
 
-    std::string getcode(const simplecpp::TokenList &tokens1, const std::string &cfg, std::vector<std::string> &files, bool writeLocations);
+    std::string getcode(const std::string &cfgStr, std::vector<std::string> &files, bool writeLocations);
 
     /**
      * Calculate HASH. Using toolinfo, tokens1, filedata.
      *
-     * @param tokens1    Sourcefile tokens
      * @param toolinfo   Arbitrary extra toolinfo
      * @return HASH
      */
-    std::size_t calculateHash(const simplecpp::TokenList &tokens1, const std::string &toolinfo) const;
+    std::size_t calculateHash(const std::string &toolinfo) const;
 
-    void simplifyPragmaAsm(simplecpp::TokenList &tokenList) const;
+    void simplifyPragmaAsm();
+
+    static void simplifyPragmaAsm(simplecpp::TokenList &tokenList);
 
     static void getErrorMessages(ErrorLogger &errorLogger, const Settings &settings);
 
@@ -148,14 +155,17 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
      */
     void dump(std::ostream &out) const;
 
-    static bool hasErrors(const simplecpp::Output &output);
+    const simplecpp::Output* reportOutput(const simplecpp::OutputList &outputList, bool showerror);
 
-private:
-    void handleErrors(const simplecpp::OutputList &outputList, bool throwError);
+    void error(const simplecpp::Location& loc, const std::string &msg, simplecpp::Output::Type type) const;
+
+    const simplecpp::Output* handleErrors(const simplecpp::OutputList &outputList);
 
-    void reportOutput(const simplecpp::OutputList &outputList, bool showerror);
+    void setLoadCallback(simplecpp::FileDataCache::load_callback_type cb) {
+        mFileCache.set_load_callback(std::move(cb));
+    }
 
-    static void simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList);
+private:
 
     /**
      * Include file types.
@@ -165,22 +175,19 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
         SystemHeader
     };
 
-    void missingInclude(const std::string &filename, unsigned int linenr, const std::string &header, HeaderTypes headerType);
-    void error(const std::string &filename, unsigned int linenr, const std::string &msg);
-
-    static bool hasErrors(const simplecpp::OutputList &outputList);
+    void missingInclude(const simplecpp::Location& loc, const std::string &header, HeaderTypes headerType);
+    void invalidSuppression(const simplecpp::Location& loc, const std::string &msg) const;
+    void error(const simplecpp::Location& loc, const std::string &msg, const std::string& id) const;
 
-    void addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const;
+    simplecpp::TokenList& mTokens;
 
     const Settings& mSettings;
     ErrorLogger &mErrorLogger;
 
-    /** list of all directives met while preprocessing file */
-
-    std::map<std::string, simplecpp::TokenList *> mTokenLists;
+    simplecpp::FileDataCache mFileCache;
 
     /** filename for cpp/c file - useful when reporting errors */
-    std::string mFile0;
+    std::string mFile0; // TODO: this is never set
     Standards::Language mLang{Standards::Language::None};
 
     /** simplecpp tracking info */
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
index 5ed7d688a62..142385ac641 100644
--- a/lib/programmemory.cpp
+++ b/lib/programmemory.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -40,15 +40,22 @@
 #include <list>
 #include <memory>
 #include <stack>
-#include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
 
-ExprIdToken::ExprIdToken(const Token* tok) : tok(tok), exprid(tok ? tok->exprId() : 0) {}
+ExprIdToken::ExprIdToken(const Token* tok)
+    : tok(tok)
+{
+    assert(tok);
+    exprid = tok->exprId();
+}
+
+ExprIdToken::ExprIdToken(nonneg int exprId) : exprid(exprId) {}
 
 nonneg int ExprIdToken::getExpressionId() const {
-    return tok ? tok->exprId() : exprid;
+    return exprid;
 }
 
 std::size_t ExprIdToken::Hash::operator()(ExprIdToken etok) const
@@ -57,9 +64,11 @@ std::size_t ExprIdToken::Hash::operator()(ExprIdToken etok) const
 }
 
 void ProgramMemory::setValue(const Token* expr, const ValueFlow::Value& value) {
+    if (!expr)
+        return;
+
     copyOnWrite();
 
-    (*mValues)[expr] = value;
     ValueFlow::Value subvalue = value;
     const Token* subexpr = solveExprValue(
         expr,
@@ -72,19 +81,21 @@ void ProgramMemory::setValue(const Token* expr, const ValueFlow::Value& value) {
         return {};
     },
         subvalue);
+    if (expr != subexpr)
+        (*mValues)[expr] = value;
     if (subexpr)
         (*mValues)[subexpr] = std::move(subvalue);
 }
+
 const ValueFlow::Value* ProgramMemory::getValue(nonneg int exprid, bool impossible) const
 {
-    const auto it = utils::as_const(*mValues).find(exprid);
+    const auto it = find(exprid);
     const bool found = it != mValues->cend() && (impossible || !it->second.isImpossible());
     if (found)
         return &it->second;
     return nullptr;
 }
 
-// cppcheck-suppress unusedFunction
 bool ProgramMemory::getIntValue(nonneg int exprid, MathLib::bigint& result) const
 {
     const ValueFlow::Value* value = getValue(exprid);
@@ -139,11 +150,11 @@ bool ProgramMemory::getContainerEmptyValue(nonneg int exprid, MathLib::bigint& r
     return false;
 }
 
-void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool isEqual)
+void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint value, bool equal)
 {
     ValueFlow::Value v(value);
     v.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
-    if (!isEqual)
+    if (!equal)
         v.valueKind = ValueFlow::Value::ValueKind::Impossible;
     setValue(expr, v);
 }
@@ -154,18 +165,28 @@ void ProgramMemory::setUnknown(const Token* expr) {
     (*mValues)[expr].valueType = ValueFlow::Value::ValueType::UNINIT;
 }
 
-bool ProgramMemory::hasValue(nonneg int exprid)
+bool ProgramMemory::hasValue(nonneg int exprid) const
 {
-    return mValues->find(exprid) != mValues->end();
+    const auto it = find(exprid);
+    return it != mValues->cend();
 }
 
 const ValueFlow::Value& ProgramMemory::at(nonneg int exprid) const {
-    return mValues->at(exprid);
+    const auto it = find(exprid);
+    if (it == mValues->cend()) {
+        throw std::out_of_range("ProgramMemory::at");
+    }
+    return it->second;
 }
+
 ValueFlow::Value& ProgramMemory::at(nonneg int exprid) {
     copyOnWrite();
 
-    return mValues->at(exprid);
+    const auto it = find(exprid);
+    if (it == mValues->end()) {
+        throw std::out_of_range("ProgramMemory::at");
+    }
+    return it->second;
 }
 
 void ProgramMemory::erase_if(const std::function<bool(const ExprIdToken&)>& pred)
@@ -173,7 +194,7 @@ void ProgramMemory::erase_if(const std::function<bool(const ExprIdToken&)>& pred
     if (mValues->empty())
         return;
 
-    // TODO: how to delay until we actuallly modify?
+    // TODO: how to delay until we actually modify?
     copyOnWrite();
 
     for (auto it = mValues->begin(); it != mValues->end();) {
@@ -184,7 +205,7 @@ void ProgramMemory::erase_if(const std::function<bool(const ExprIdToken&)>& pred
     }
 }
 
-void ProgramMemory::swap(ProgramMemory &pm) NOEXCEPT
+void ProgramMemory::swap(ProgramMemory &pm) noexcept
 {
     mValues.swap(pm.mValues);
 }
@@ -205,7 +226,7 @@ bool ProgramMemory::empty() const
 }
 
 // NOLINTNEXTLINE(performance-unnecessary-value-param) - technically correct but we are moving the given values
-void ProgramMemory::replace(ProgramMemory pm)
+void ProgramMemory::replace(ProgramMemory pm, bool skipUnknown)
 {
     if (pm.empty())
         return;
@@ -213,6 +234,11 @@ void ProgramMemory::replace(ProgramMemory pm)
     copyOnWrite();
 
     for (auto&& p : (*pm.mValues)) {
+        if (skipUnknown) {
+            auto it = mValues->find(p.first);
+            if (it != mValues->end() && it->second.isUninitValue())
+                continue;
+        }
         (*mValues)[p.first] = std::move(p.second);
     }
 }
@@ -225,26 +251,44 @@ void ProgramMemory::copyOnWrite()
     mValues = std::make_shared<Map>(*mValues);
 }
 
-static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings& settings);
+ProgramMemory::Map::const_iterator ProgramMemory::find(nonneg int exprid) const
+{
+    const auto& cvalues = utils::as_const(*mValues);
+    return cvalues.find(ExprIdToken::create(exprid));
+}
 
-static bool evaluateCondition(MathLib::bigint r, const Token* condition, ProgramMemory& pm, const Settings& settings)
+ProgramMemory::Map::iterator ProgramMemory::find(nonneg int exprid)
+{
+    return mValues->find(ExprIdToken::create(exprid));
+}
+
+static ValueFlow::Value execute(const Token* expr,
+                                ProgramMemory& pm,
+                                const Settings& settings,
+                                const ProgramMemory::Map& vars = {});
+
+static bool evaluateCondition(MathLib::bigint r,
+                              const Token* condition,
+                              ProgramMemory& pm,
+                              const Settings& settings,
+                              const ProgramMemory::Map& vars = {})
 {
     if (!condition)
         return false;
     MathLib::bigint result = 0;
     bool error = false;
-    execute(condition, pm, &result, &error, settings);
+    execute(condition, pm, &result, &error, settings, vars);
     return !error && result == r;
 }
 
-bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings)
+bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings, const ProgramMemory::Map& vars)
 {
-    return evaluateCondition(0, condition, pm, settings);
+    return evaluateCondition(0, condition, pm, settings, vars);
 }
 
-bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings)
+bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings, const ProgramMemory::Map& vars)
 {
-    return evaluateCondition(1, condition, pm, settings);
+    return evaluateCondition(1, condition, pm, settings, vars);
 }
 
 static bool frontIs(const std::vector<MathLib::bigint>& v, bool i)
@@ -300,7 +344,13 @@ static bool isBasicForLoop(const Token* tok)
     return true;
 }
 
-static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, const Token* endTok, const Settings& settings, bool then)
+// findChanged: optional cached findExpressionChanged (see ProgramMemoryState::FindChangedFn).
+static void programMemoryParseCondition(ProgramMemory& pm,
+                                        const Token* tok,
+                                        const Token* endTok,
+                                        const Settings& settings,
+                                        bool then,
+                                        const ProgramMemoryState::FindChangedFn& findChanged = {})
 {
     auto eval = [&](const Token* t) -> std::vector<MathLib::bigint> {
         if (!t)
@@ -314,6 +364,10 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
             return {result};
         return std::vector<MathLib::bigint>{};
     };
+    // Use the cached closure if given, else compute directly.
+    auto changed = [&](const Token* e, const Token* s, const Token* en) -> const Token* {
+        return findChanged ? findChanged(e, s, en) : findExpressionChanged(e, s, en, settings);
+    };
     if (Token::Match(tok, "==|>=|<=|<|>|!=")) {
         ValueFlow::Value truevalue;
         ValueFlow::Value falsevalue;
@@ -324,7 +378,7 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
             return;
         if (!truevalue.isIntValue())
             return;
-        if (endTok && findExpressionChanged(vartok, tok->next(), endTok, settings))
+        if (endTok && changed(vartok, tok->next(), endTok))
             return;
         const bool impossible = (tok->str() == "==" && !then) || (tok->str() == "!=" && then);
         const ValueFlow::Value& v = then ? truevalue : falsevalue;
@@ -333,26 +387,26 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
         if (containerTok)
             pm.setContainerSizeValue(containerTok, v.intvalue, !impossible);
     } else if (Token::simpleMatch(tok, "!")) {
-        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, !then);
+        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, !then, findChanged);
     } else if (then && Token::simpleMatch(tok, "&&")) {
-        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then);
-        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then);
+        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then, findChanged);
+        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then, findChanged);
     } else if (!then && Token::simpleMatch(tok, "||")) {
-        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then);
-        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then);
+        programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then, findChanged);
+        programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then, findChanged);
     } else if (Token::Match(tok, "&&|%oror%")) {
         std::vector<MathLib::bigint> lhs = eval(tok->astOperand1());
         std::vector<MathLib::bigint> rhs = eval(tok->astOperand2());
         if (lhs.empty() || rhs.empty()) {
             if (frontIs(lhs, !then))
-                programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then);
+                programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then, findChanged);
             else if (frontIs(rhs, !then))
-                programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then);
+                programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then, findChanged);
             else
                 pm.setIntValue(tok, 0, then);
         }
     } else if (tok && tok->exprId() > 0) {
-        if (endTok && findExpressionChanged(tok, tok->next(), endTok, settings))
+        if (endTok && changed(tok, tok->next(), endTok))
             return;
         pm.setIntValue(tok, 0, then);
         const Token* containerTok = settings.library.getContainerFromYield(tok, Library::Container::Yield::EMPTY);
@@ -361,14 +415,18 @@ static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, con
     }
 }
 
-static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Scope* scope, const Token* endTok, const Settings& settings)
+static void fillProgramMemoryFromConditions(ProgramMemory& pm,
+                                            const Scope* scope,
+                                            const Token* endTok,
+                                            const Settings& settings,
+                                            const ProgramMemoryState::FindChangedFn& findChanged)
 {
     if (!scope)
         return;
     if (!scope->isLocal())
         return;
     assert(scope != scope->nestedIn);
-    fillProgramMemoryFromConditions(pm, scope->nestedIn, endTok, settings);
+    fillProgramMemoryFromConditions(pm, scope->nestedIn, endTok, settings, findChanged);
     if (scope->type == ScopeType::eIf || scope->type == ScopeType::eWhile || scope->type == ScopeType::eElse || scope->type == ScopeType::eFor) {
         const Token* condTok = getCondTokFromEnd(scope->bodyEnd);
         if (!condTok)
@@ -377,13 +435,16 @@ static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Scope* scop
         bool error = false;
         execute(condTok, pm, &result, &error, settings);
         if (error)
-            programMemoryParseCondition(pm, condTok, endTok, settings, scope->type != ScopeType::eElse);
+            programMemoryParseCondition(pm, condTok, endTok, settings, scope->type != ScopeType::eElse, findChanged);
     }
 }
 
-static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Token* tok, const Settings& settings)
+static void fillProgramMemoryFromConditions(ProgramMemory& pm,
+                                            const Token* tok,
+                                            const Settings& settings,
+                                            const ProgramMemoryState::FindChangedFn& findChanged = {})
 {
-    fillProgramMemoryFromConditions(pm, tok->scope(), tok, settings);
+    fillProgramMemoryFromConditions(pm, tok->scope(), tok, settings, findChanged);
 }
 
 static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok, const Settings& settings, const ProgramMemory& state, const ProgramMemory::Map& vars)
@@ -392,22 +453,23 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
     for (const Token *tok2 = tok; tok2; tok2 = tok2->previous()) {
         if ((Token::simpleMatch(tok2, "=") || Token::Match(tok2->previous(), "%var% (|{")) && tok2->astOperand1() &&
             tok2->astOperand2()) {
-            bool setvar = false;
             const Token* vartok = tok2->astOperand1();
-            for (const auto& p:vars) {
-                if (p.first != vartok->exprId())
-                    continue;
-                if (vartok == tok)
-                    continue;
-                pm.setValue(vartok, p.second);
-                setvar = true;
+            if (!pm.hasValue(vartok->exprId())) {
+                const Token* valuetok = tok2->astOperand2();
+                ProgramMemory local = state;
+                // Tracked values are substituted by execute() when the expression is evaluated.
+                pm.setValue(vartok, execute(valuetok, local, settings, vars));
             }
-            if (!setvar) {
-                if (!pm.hasValue(vartok->exprId())) {
-                    const Token* valuetok = tok2->astOperand2();
-                    pm.setValue(vartok, execute(valuetok, pm, settings));
-                }
+        } else if (Token::simpleMatch(tok2, ")") && tok2->link() &&
+                   Token::Match(tok2->link()->previous(), "assert|ASSERT ( !!)")) {
+            const Token* cond = tok2->link()->astOperand2();
+            if (!conditionIsTrue(cond, state, settings)) {
+                // TODO: change to assert when we can propagate the assert, for now just bail
+                if (conditionIsFalse(cond, state, settings))
+                    return;
+                programMemoryParseCondition(pm, cond, nullptr, settings, true);
             }
+            tok2 = tok2->link()->previous();
         } else if (tok2->exprId() > 0 && Token::Match(tok2, ".|(|[|*|%var%") && !pm.hasValue(tok2->exprId()) &&
                    isVariableChanged(tok2, 0, settings)) {
             pm.setUnknown(tok2);
@@ -468,7 +530,7 @@ static ProgramMemory getInitialProgramState(const Token* tok,
     return pm;
 }
 
-ProgramMemoryState::ProgramMemoryState(const Settings& s) : settings(s)
+ProgramMemoryState::ProgramMemoryState(const Settings& s) : settings(s), changedCache(std::make_shared<ChangedCache>())
 {}
 
 void ProgramMemoryState::replace(ProgramMemory pm, const Token* origin)
@@ -476,7 +538,7 @@ void ProgramMemoryState::replace(ProgramMemory pm, const Token* origin)
     if (origin)
         for (const auto& p : pm)
             origins[p.first.getExpressionId()] = origin;
-    state.replace(std::move(pm));
+    state.replace(std::move(pm), /*skipUnknown*/ true);
 }
 
 static void addVars(ProgramMemory& pm, const ProgramMemory::Map& vars)
@@ -489,53 +551,83 @@ static void addVars(ProgramMemory& pm, const ProgramMemory::Map& vars)
 
 void ProgramMemoryState::addState(const Token* tok, const ProgramMemory::Map& vars)
 {
-    ProgramMemory pm = state;
-    addVars(pm, vars);
-    fillProgramMemoryFromConditions(pm, tok, settings);
-    ProgramMemory local = pm;
+    ProgramMemory local = state;
+    addVars(local, vars);
+    fillProgramMemoryFromConditions(local, tok, settings, getCachedFindExpressionChanged(/*skipDeadCode*/ false));
+    ProgramMemory pm;
     fillProgramMemoryFromAssignments(pm, tok, settings, local, vars);
-    addVars(pm, vars);
-    replace(std::move(pm), tok);
+    local.replace(std::move(pm));
+    addVars(local, vars);
+    replace(std::move(local), tok);
 }
 
-void ProgramMemoryState::assume(const Token* tok, bool b, bool isEmpty)
+void ProgramMemoryState::assume(const Token* tok, bool b, bool isEmpty, const Token* origin)
 {
     ProgramMemory pm = state;
     if (isEmpty)
         pm.setContainerSizeValue(tok, 0, b);
     else
         programMemoryParseCondition(pm, tok, nullptr, settings, b);
-    const Token* origin = tok;
-    const Token* top = tok->astTop();
-    if (Token::Match(top->previous(), "for|while|if (") && !Token::simpleMatch(tok->astParent(), "?")) {
-        origin = top->link()->next();
-        if (!b && origin->link()) {
-            origin = origin->link();
+    if (!origin) {
+        origin = tok;
+        const Token* top = tok->astTop();
+        if (Token::Match(top->previous(), "for|while|if (") && !Token::simpleMatch(tok->astParent(), "?")) {
+            origin = top->link()->next();
+            if (!b && origin->link()) {
+                origin = origin->link();
+            }
         }
     }
     replace(std::move(pm), origin);
 }
 
-void ProgramMemoryState::removeModifiedVars(const Token* tok)
+ProgramMemoryState::FindChangedFn ProgramMemoryState::getCachedFindExpressionChanged(bool skipDeadCode) const
 {
-    const ProgramMemory& pm = state;
-    auto eval = [&](const Token* cond) -> std::vector<MathLib::bigint> {
-        ProgramMemory pm2 = pm;
-        auto result = execute(cond, pm2, settings);
-        if (isTrue(result))
-            return {1};
-        if (isFalse(result))
-            return {0};
-        return {};
+    // Structural findExpressionChanged() is pure, so memoize it in changedCache (never invalidated).
+    // skipDeadCode adds the dead-code walk; it evaluates guards against a fixed state snapshot (so every
+    // variable follows the same path) and memoizes those evals in evalCache for the closure's lifetime.
+    using EvalCache = std::map<const Token*, std::vector<MathLib::bigint>>;
+    const std::shared_ptr<ChangedCache> cache = changedCache;
+    const Settings* const sp = &settings;
+    ProgramMemory snapshot = state;
+    const std::shared_ptr<EvalCache> evalCache = skipDeadCode ? std::make_shared<EvalCache>() : nullptr;
+    return [cache, sp, snapshot, skipDeadCode, evalCache](const Token* expr,
+                                                          const Token* start,
+                                                          const Token* end) -> const Token* {
+        const auto key = std::make_tuple(expr, start, end);
+        const auto it = cache->find(key);
+        const Token* modified = (it != cache->end())
+                                    ? it->second
+                                    : cache->emplace(key, findExpressionChanged(expr, start, end, *sp)).first->second;
+        if (!skipDeadCode || !modified)
+            return modified;
+        auto eval = [&](const Token* cond) -> std::vector<MathLib::bigint> {
+            const auto cit = evalCache->find(cond);
+            if (cit != evalCache->end())
+                return cit->second;
+            ProgramMemory pm2 = snapshot;
+            const auto result = execute(cond, pm2, *sp);
+            std::vector<MathLib::bigint> r;
+            if (isTrue(result))
+                r = {1};
+            else if (isFalse(result))
+                r = {0};
+            return evalCache->emplace(cond, std::move(r)).first->second;
+        };
+        return findExpressionChangedSkipDeadCode(expr, start, end, *sp, eval);
     };
+}
+
+void ProgramMemoryState::removeModifiedVars(const Token* tok)
+{
+    const auto findChanged = getCachedFindExpressionChanged(/*skipDeadCode*/ true);
     state.erase_if([&](const ExprIdToken& e) {
         const Token* start = origins[e.getExpressionId()];
         const Token* expr = e.tok;
-        if (!expr || findExpressionChangedSkipDeadCode(expr, start, tok, settings, eval)) {
+        const bool changed = !expr || findChanged(expr, start, tok);
+        if (changed)
             origins.erase(e.getExpressionId());
-            return true;
-        }
-        return false;
+        return changed;
     });
 }
 
@@ -583,10 +675,6 @@ static MathLib::bigint asInt(const ValueFlow::Value& value)
     return value.isFloatValue() ? static_cast<MathLib::bigint>(value.floatValue) : value.intvalue;
 }
 
-static std::string removeAssign(const std::string& assign) {
-    return std::string{assign.cbegin(), assign.cend() - 1};
-}
-
 namespace {
     struct assign {
         template<class T, class U>
@@ -602,22 +690,23 @@ static bool isIntegralValue(const ValueFlow::Value& value)
     return value.isIntValue() || value.isIteratorValue() || value.isSymbolicValue();
 }
 
-static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value& lhs, const ValueFlow::Value& rhs)
+static ValueFlow::Value evaluate(const Token* op, const ValueFlow::Value& lhs, const ValueFlow::Value& rhs, bool removeAssign = false)
 {
+    const std::string opStr = removeAssign ? op->str().substr(0, op->str().size() - 1) : op->str();
     ValueFlow::Value result;
     if (lhs.isImpossible() && rhs.isImpossible())
         return ValueFlow::Value::unknown();
     if (lhs.isImpossible() || rhs.isImpossible()) {
         // noninvertible
-        if (contains({"%", "/", "&", "|"}, op))
+        if (contains({"%", "/", "&", "|"}, opStr))
             return ValueFlow::Value::unknown();
         result.setImpossible();
     }
     if (isNumericValue(lhs) && isNumericValue(rhs)) {
         if (lhs.isFloatValue() || rhs.isFloatValue()) {
-            result.valueType = ValueFlow::Value::ValueType::FLOAT;
+            result.valueType = op->isArithmeticalOp() ? ValueFlow::Value::ValueType::FLOAT : ValueFlow::Value::ValueType::INT;
             bool error = false;
-            result.floatValue = calculate(op, asFloat(lhs), asFloat(rhs), &error);
+            result.floatValue = calculate(opStr, asFloat(lhs), asFloat(rhs), &error);
             if (error)
                 return ValueFlow::Value::unknown();
             return result;
@@ -629,12 +718,12 @@ static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value&
     // If not the same type then one must be int
     if (lhs.valueType != rhs.valueType && !lhs.isIntValue() && !rhs.isIntValue())
         return ValueFlow::Value::unknown();
-    const bool compareOp = contains({"==", "!=", "<", ">", ">=", "<="}, op);
+    const bool compareOp = op->isComparisonOp();
     // Comparison must be the same type
     if (compareOp && lhs.valueType != rhs.valueType)
         return ValueFlow::Value::unknown();
     // Only add, subtract, and compare for non-integers
-    if (!compareOp && !contains({"+", "-"}, op) && !lhs.isIntValue() && !rhs.isIntValue())
+    if (!compareOp && !contains({"+", "-"}, opStr) && !lhs.isIntValue() && !rhs.isIntValue())
         return ValueFlow::Value::unknown();
     // Both can't be iterators for non-compare
     if (!compareOp && lhs.isIteratorValue() && rhs.isIteratorValue())
@@ -652,10 +741,10 @@ static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value&
         result.valueType = ValueFlow::Value::ValueType::INT;
     }
     bool error = false;
-    result.intvalue = calculate(op, lhs.intvalue, rhs.intvalue, &error);
+    result.intvalue = calculate(opStr, lhs.intvalue, rhs.intvalue, &error);
     if (error)
         return ValueFlow::Value::unknown();
-    if (result.isImpossible() && op == "!=") {
+    if (result.isImpossible() && opStr == "!=") {
         if (isTrue(result)) {
             result.intvalue = 1;
         } else if (isFalse(result)) {
@@ -676,9 +765,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["strlen"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!(v.isTokValue() && v.tokvalue->tokType() == Token::eString))
+        const ValueFlow::Value& v_ref = args[0];
+        if (!(v_ref.isTokValue() && v_ref.tokvalue->tokType() == Token::eString))
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.valueType = ValueFlow::Value::ValueType::INT;
         v.intvalue = Token::getStrLength(v.tokvalue);
         v.tokvalue = nullptr;
@@ -717,9 +807,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["sin"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::sin(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -727,9 +818,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["lgamma"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::lgamma(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -737,9 +829,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["cos"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::cos(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -747,9 +840,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["tan"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::tan(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -757,9 +851,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["asin"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::asin(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -767,9 +862,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["acos"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::acos(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -777,9 +873,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["atan"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::atan(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -919,9 +1016,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["ilogb"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.intvalue = std::ilogb(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::INT;
         return v;
@@ -929,9 +1027,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["erf"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::erf(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -939,9 +1038,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["erfc"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::erfc(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -949,9 +1049,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["floor"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::floor(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -959,9 +1060,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["sqrt"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::sqrt(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -969,9 +1071,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["cbrt"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::cbrt(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -979,9 +1082,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["ceil"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::ceil(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -989,9 +1093,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["exp"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::exp(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -999,9 +1104,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["exp2"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::exp2(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1009,9 +1115,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["expm1"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::expm1(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1019,9 +1126,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["fabs"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::fabs(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1029,9 +1137,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["log"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::log(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1039,9 +1148,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["log10"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::log10(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1049,9 +1159,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["log1p"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::log1p(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1059,9 +1170,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["log2"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::log2(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1069,9 +1181,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["logb"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::logb(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1079,9 +1192,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["nearbyint"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::nearbyint(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1089,9 +1203,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["sinh"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::sinh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1099,9 +1214,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["cosh"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::cosh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1109,9 +1225,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["tanh"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::tanh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1119,9 +1236,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["asinh"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::asinh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1129,9 +1247,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["acosh"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::acosh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1139,9 +1258,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["atanh"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::atanh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1149,9 +1269,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["round"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::round(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1159,9 +1280,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["tgamma"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::tgamma(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1169,9 +1291,10 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
     functions["trunc"] = [](const std::vector<ValueFlow::Value>& args) {
         if (args.size() != 1)
             return ValueFlow::Value::unknown();
-        ValueFlow::Value v = args[0];
-        if (!v.isFloatValue() && !v.isIntValue())
+        const ValueFlow::Value& v_ref = args[0];
+        if (!v_ref.isFloatValue() && !v_ref.isIntValue())
             return ValueFlow::Value::unknown();
+        ValueFlow::Value v = v_ref;
         v.floatValue = std::trunc(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
@@ -1236,6 +1359,9 @@ namespace {
     struct Executor {
         ProgramMemory* pm;
         const Settings& settings;
+        // Values tracked by the forward/reverse analysis. A tracked value is the authoritative
+        // current value of its expression and takes precedence over the program memory.
+        const ProgramMemory::Map* vars = nullptr;
         int fdepth = 4;
         int depth = 10;
 
@@ -1244,6 +1370,26 @@ namespace {
             assert(pm != nullptr);
         }
 
+        // Is the tracked value for this expression available?
+        const ValueFlow::Value* getTrackedValue(const Token* expr) const
+        {
+            if (!vars || expr->exprId() == 0)
+                return nullptr;
+            const auto it = vars->find(ExprIdToken::create(expr->exprId()));
+            return it == vars->end() ? nullptr : &it->second;
+        }
+
+        // Does the expression read a tracked value? If so, any value cached for it may be stale
+        // (the tracked value may have changed since), so it must be re-evaluated, not served cached.
+        bool dependsOnTrackedValue(const Token* expr) const
+        {
+            if (!vars || vars->empty())
+                return false;
+            return findAstNode(expr, [&](const Token* tok) {
+                return getTrackedValue(tok) != nullptr;
+            }) != nullptr;
+        }
+
         static ValueFlow::Value unknown() {
             return ValueFlow::Value::unknown();
         }
@@ -1366,6 +1512,31 @@ namespace {
             return unknown();
         }
 
+        // Get the size of the container. If the container itself is not tracked in the program
+        // memory then check if it is symbolically equal to a container whose size is tracked.
+        ValueFlow::Value executeContainerSize(const Token* containerTok)
+        {
+            ValueFlow::Value v = execute(containerTok);
+            if (v.isContainerSizeValue())
+                return v;
+            for (const ValueFlow::Value& value : containerTok->values()) {
+                if (!value.isSymbolicValue())
+                    continue;
+                if (value.isImpossible())
+                    continue;
+                if (value.intvalue != 0)
+                    continue;
+                if (!value.tokvalue)
+                    continue;
+                if (value.tokvalue->exprId() == 0)
+                    continue;
+                const ValueFlow::Value* sizeValue = pm->getValue(value.tokvalue->exprId());
+                if (sizeValue && sizeValue->isContainerSizeValue())
+                    return *sizeValue;
+            }
+            return unknown();
+        }
+
         ValueFlow::Value executeImpl(const Token* expr)
         {
             const ValueFlow::Value* value = nullptr;
@@ -1394,14 +1565,14 @@ namespace {
                 const Token* containerTok = expr->tokAt(-2)->astOperand1();
                 const Library::Container::Yield yield = containerTok->valueType()->container->getYield(expr->strAt(-1));
                 if (yield == Library::Container::Yield::SIZE) {
-                    ValueFlow::Value v = execute(containerTok);
+                    ValueFlow::Value v = executeContainerSize(containerTok);
                     if (!v.isContainerSizeValue())
                         return unknown();
                     v.valueType = ValueFlow::Value::ValueType::INT;
                     return v;
                 }
                 if (yield == Library::Container::Yield::EMPTY) {
-                    ValueFlow::Value v = execute(containerTok);
+                    ValueFlow::Value v = executeContainerSize(containerTok);
                     if (!v.isContainerSizeValue())
                         return unknown();
                     if (v.isImpossible() && v.intvalue == 0)
@@ -1418,7 +1589,7 @@ namespace {
                     if (!pm->hasValue(expr->astOperand1()->exprId()))
                         return unknown();
                     ValueFlow::Value& lhs = pm->at(expr->astOperand1()->exprId());
-                    rhs = evaluate(removeAssign(expr->str()), lhs, rhs);
+                    rhs = evaluate(expr, lhs, rhs, /*removeAssign*/ true);
                     if (lhs.isIntValue())
                         ValueFlow::Value::visitValue(rhs, std::bind(assign{}, std::ref(lhs.intvalue), std::placeholders::_1));
                     else if (lhs.isFloatValue())
@@ -1472,15 +1643,17 @@ namespace {
                     return unknown();
                 const MathLib::bigint index = rhs.intvalue;
                 if (index >= 0 && index < strValue.size())
-                    return ValueFlow::Value{strValue[static_cast<std::size_t>(index)]};
+                    return ValueFlow::Value{strValue[index]};
                 if (index == strValue.size())
                     return ValueFlow::Value{};
             } else if (Token::Match(expr, "%cop%") && expr->astOperand1() && expr->astOperand2()) {
                 ValueFlow::Value lhs = execute(expr->astOperand1());
+                if (lhs.isUninitValue())
+                    return unknown();
                 ValueFlow::Value rhs = execute(expr->astOperand2());
-                ValueFlow::Value r = unknown();
-                if (!lhs.isUninitValue() && !rhs.isUninitValue())
-                    r = evaluate(expr->str(), lhs, rhs);
+                if (rhs.isUninitValue())
+                    return unknown();
+                ValueFlow::Value r = evaluate(expr, lhs, rhs);
                 if (expr->isComparisonOp() && (r.isUninitValue() || r.isImpossible())) {
                     if (rhs.isIntValue() && !expr->astOperand1()->values().empty()) {
                         std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(),
@@ -1540,7 +1713,15 @@ namespace {
                 }
                 return execute(expr->astOperand1());
             }
-            if (expr->exprId() > 0 && pm->hasValue(expr->exprId())) {
+            // Return the tracked value and write it back when it differs, so later reads see the
+            // same value (as fillProgramMemoryFromAssignments used to do).
+            if (const ValueFlow::Value* tracked = getTrackedValue(expr)) {
+                const ValueFlow::Value* stored = pm->getValue(expr->exprId(), /*impossible*/ true);
+                if (!stored || *stored != *tracked)
+                    pm->setValue(expr, *tracked);
+                return *tracked;
+            }
+            if (expr->exprId() > 0 && pm->hasValue(expr->exprId()) && !dependsOnTrackedValue(expr)) {
                 ValueFlow::Value result = utils::as_const(*pm).at(expr->exprId());
                 if (result.isImpossible() && result.isIntValue() && result.intvalue == 0 && isUsedAsBool(expr, settings)) {
                     result.intvalue = !result.intvalue;
@@ -1733,9 +1914,13 @@ namespace {
     };
 }     // namespace
 
-static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings& settings)
+static ValueFlow::Value execute(const Token* expr,
+                                ProgramMemory& pm,
+                                const Settings& settings,
+                                const ProgramMemory::Map& vars)
 {
     Executor ex{&pm, settings};
+    ex.vars = &vars;
     return ex.execute(expr);
 }
 
@@ -1752,9 +1937,8 @@ static std::shared_ptr<Token> createTokenFromExpression(const std::string& retur
 {
     std::shared_ptr<TokenList> tokenList = std::make_shared<TokenList>(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
     {
-        const std::string code = "return " + returnValue + ";";
-        std::istringstream istr(code);
-        if (!tokenList->createTokens(istr))
+        const std::string code = "return " + returnValue + ";\n";
+        if (!tokenList->createTokensFromBuffer(code.data(), code.size()))
             return nullptr;
     }
 
@@ -1826,9 +2010,10 @@ void execute(const Token* expr,
              ProgramMemory& programMemory,
              MathLib::bigint* result,
              bool* error,
-             const Settings& settings)
+             const Settings& settings,
+             const ProgramMemory::Map& vars)
 {
-    ValueFlow::Value v = execute(expr, programMemory, settings);
+    ValueFlow::Value v = execute(expr, programMemory, settings, vars);
     if (!v.isIntValue() || v.isImpossible()) {
         if (error)
             *error = true;
diff --git a/lib/programmemory.h b/lib/programmemory.h
index 36b453b71de..de81d0bc901 100644
--- a/lib/programmemory.h
+++ b/lib/programmemory.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -28,6 +28,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@@ -41,14 +42,9 @@ struct ExprIdToken {
     const Token* tok = nullptr;
     nonneg int exprid = 0;
 
-    ExprIdToken() = default;
     // cppcheck-suppress noExplicitConstructor
     // NOLINTNEXTLINE(google-explicit-constructor)
     ExprIdToken(const Token* tok);
-    // TODO: Make this constructor only available from ProgramMemory
-    // cppcheck-suppress noExplicitConstructor
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    ExprIdToken(nonneg int exprid) : exprid(exprid) {}
 
     nonneg int getExpressionId() const;
 
@@ -84,21 +80,30 @@ struct ExprIdToken {
         return !(lhs < rhs);
     }
 
-    const Token& operator*() const NOEXCEPT {
+    const Token& operator*() const noexcept {
         return *tok;
     }
 
-    const Token* operator->() const NOEXCEPT {
+    const Token* operator->() const noexcept {
         return tok;
     }
 
     struct Hash {
         std::size_t operator()(ExprIdToken etok) const;
     };
+
+    /** create object for hashed lookups */
+    static ExprIdToken create(nonneg int exprId) {
+        return ExprIdToken(exprId);
+    }
+
+private:
+    // for hashed lookups only
+    explicit ExprIdToken(nonneg int exprId);
 };
 
 struct CPPCHECKLIB ProgramMemory {
-    using Map = std::unordered_map<ExprIdToken, ValueFlow::Value, ExprIdToken::Hash>;
+    using Map = std::map<ExprIdToken, ValueFlow::Value>;
 
     ProgramMemory() : mValues(new Map()) {}
 
@@ -112,25 +117,25 @@ struct CPPCHECKLIB ProgramMemory {
 
     bool getContainerSizeValue(nonneg int exprid, MathLib::bigint& result) const;
     bool getContainerEmptyValue(nonneg int exprid, MathLib::bigint& result) const;
-    void setContainerSizeValue(const Token* expr, MathLib::bigint value, bool isEqual = true);
+    void setContainerSizeValue(const Token* expr, MathLib::bigint value, bool equal = true);
 
     void setUnknown(const Token* expr);
 
     bool getTokValue(nonneg int exprid, const Token*& result) const;
-    bool hasValue(nonneg int exprid);
+    bool hasValue(nonneg int exprid) const;
 
     const ValueFlow::Value& at(nonneg int exprid) const;
     ValueFlow::Value& at(nonneg int exprid);
 
     void erase_if(const std::function<bool(const ExprIdToken&)>& pred);
 
-    void swap(ProgramMemory &pm) NOEXCEPT;
+    void swap(ProgramMemory &pm) noexcept;
 
     void clear();
 
     bool empty() const;
 
-    void replace(ProgramMemory pm);
+    void replace(ProgramMemory pm, bool skipUnknown = false);
 
     Map::const_iterator begin() const {
         return mValues->cbegin();
@@ -150,14 +155,33 @@ struct CPPCHECKLIB ProgramMemory {
 
 private:
     void copyOnWrite();
+    Map::const_iterator find(nonneg int exprid) const;
+    Map::iterator find(nonneg int exprid);
 
     std::shared_ptr<Map> mValues;
 };
 
 struct ProgramMemoryState {
+    struct ChangedKeyHash {
+        std::size_t operator()(const std::tuple<const Token*, const Token*, const Token*>& t) const
+        {
+            const std::hash<const Token*> h;
+            std::size_t seed = h(std::get<0>(t));
+            seed ^= h(std::get<1>(t)) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+            seed ^= h(std::get<2>(t)) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+            return seed;
+        }
+    };
+    using ChangedCache =
+        std::unordered_map<std::tuple<const Token*, const Token*, const Token*>, const Token*, ChangedKeyHash>;
+    // The token modifying expr between start and end, or nullptr.
+    using FindChangedFn = std::function<const Token*(const Token* expr, const Token* start, const Token* end)>;
+
     ProgramMemory state;
     std::map<nonneg int, const Token*> origins;
     const Settings& settings;
+    // Memoized findExpressionChanged() pre-filter; structural, so never invalidated.
+    std::shared_ptr<ChangedCache> changedCache;
 
     explicit ProgramMemoryState(const Settings& s);
 
@@ -165,10 +189,13 @@ struct ProgramMemoryState {
 
     void addState(const Token* tok, const ProgramMemory::Map& vars);
 
-    void assume(const Token* tok, bool b, bool isEmpty = false);
+    void assume(const Token* tok, bool b, bool isEmpty = false, const Token* origin = nullptr);
 
     void removeModifiedVars(const Token* tok);
 
+    // A findExpressionChanged() closure memoized in changedCache
+    FindChangedFn getCachedFindExpressionChanged(bool skipDeadCode) const;
+
     ProgramMemory get(const Token* tok, const Token* ctx, const ProgramMemory::Map& vars) const;
 };
 
@@ -178,21 +205,30 @@ void execute(const Token* expr,
              ProgramMemory& programMemory,
              MathLib::bigint* result,
              bool* error,
-             const Settings& settings);
+             const Settings& settings,
+             const ProgramMemory::Map& vars = {});
 
 /**
  * Is condition always false when variable has given value?
  * \param condition   top ast token in condition
  * \param pm   program memory
+ * \param vars  optional tracked values that take precedence over the program memory
  */
-bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings);
+bool conditionIsFalse(const Token* condition,
+                      ProgramMemory pm,
+                      const Settings& settings,
+                      const ProgramMemory::Map& vars = {});
 
 /**
  * Is condition always true when variable has given value?
  * \param condition   top ast token in condition
  * \param pm   program memory
+ * \param vars  optional tracked values that take precedence over the program memory
  */
-bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings);
+bool conditionIsTrue(const Token* condition,
+                     ProgramMemory pm,
+                     const Settings& settings,
+                     const ProgramMemory::Map& vars = {});
 
 /**
  * Get program memory by looking backwards from given token.
diff --git a/lib/regex.cpp b/lib/regex.cpp
new file mode 100644
index 00000000000..3a94b293ed5
--- /dev/null
+++ b/lib/regex.cpp
@@ -0,0 +1,276 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+#ifdef HAVE_RULES
+
+#include "regex.h"
+
+#include <utility>
+
+#ifdef _WIN32
+#define PCRE_STATIC
+#endif
+#include <pcre.h>
+
+namespace {
+    std::string pcreErrorCodeToString(const int pcreExecRet)
+    {
+        switch (pcreExecRet) {
+        case PCRE_ERROR_NULL:
+            return "Either code or subject was passed as NULL, or ovector was NULL "
+                   "and ovecsize was not zero (PCRE_ERROR_NULL)";
+        case PCRE_ERROR_BADOPTION:
+            return "An unrecognized bit was set in the options argument (PCRE_ERROR_BADOPTION)";
+        case PCRE_ERROR_BADMAGIC:
+            return "PCRE stores a 4-byte \"magic number\" at the start of the compiled code, "
+                   "to catch the case when it is passed a junk pointer and to detect when a "
+                   "pattern that was compiled in an environment of one endianness is run in "
+                   "an environment with the other endianness. This is the error that PCRE "
+                   "gives when the magic number is not present (PCRE_ERROR_BADMAGIC)";
+        case PCRE_ERROR_UNKNOWN_NODE:
+            return "While running the pattern match, an unknown item was encountered in the "
+                   "compiled pattern. This error could be caused by a bug in PCRE or by "
+                   "overwriting of the compiled pattern (PCRE_ERROR_UNKNOWN_NODE)";
+        case PCRE_ERROR_NOMEMORY:
+            return "If a pattern contains back references, but the ovector that is passed "
+                   "to pcre_exec() is not big enough to remember the referenced substrings, "
+                   "PCRE gets a block of memory at the start of matching to use for this purpose. "
+                   "If the call via pcre_malloc() fails, this error is given. The memory is "
+                   "automatically freed at the end of matching. This error is also given if "
+                   "pcre_stack_malloc() fails in pcre_exec(). "
+                   "This can happen only when PCRE has been compiled with "
+                   "--disable-stack-for-recursion (PCRE_ERROR_NOMEMORY)";
+        case PCRE_ERROR_NOSUBSTRING:
+            return "This error is used by the pcre_copy_substring(), pcre_get_substring(), "
+                   "and pcre_get_substring_list() functions (see below). "
+                   "It is never returned by pcre_exec() (PCRE_ERROR_NOSUBSTRING)";
+        case PCRE_ERROR_MATCHLIMIT:
+            return "The backtracking limit, as specified by the match_limit field in a pcre_extra "
+                   "structure (or defaulted) was reached. "
+                   "See the description above (PCRE_ERROR_MATCHLIMIT)";
+        case PCRE_ERROR_CALLOUT:
+            return "This error is never generated by pcre_exec() itself. "
+                   "It is provided for use by callout functions that want to yield a distinctive "
+                   "error code. See the pcrecallout documentation for details (PCRE_ERROR_CALLOUT)";
+        case PCRE_ERROR_BADUTF8:
+            return "A string that contains an invalid UTF-8 byte sequence was passed as a subject, "
+                   "and the PCRE_NO_UTF8_CHECK option was not set. If the size of the output vector "
+                   "(ovecsize) is at least 2, the byte offset to the start of the the invalid UTF-8 "
+                   "character is placed in the first element, and a reason code is placed in the "
+                   "second element. The reason codes are listed in the following section. For "
+                   "backward compatibility, if PCRE_PARTIAL_HARD is set and the problem is a truncated "
+                   "UTF-8 character at the end of the subject (reason codes 1 to 5), "
+                   "PCRE_ERROR_SHORTUTF8 is returned instead of PCRE_ERROR_BADUTF8";
+        case PCRE_ERROR_BADUTF8_OFFSET:
+            return "The UTF-8 byte sequence that was passed as a subject was checked and found to "
+                   "be valid (the PCRE_NO_UTF8_CHECK option was not set), but the value of "
+                   "startoffset did not point to the beginning of a UTF-8 character or the end of "
+                   "the subject (PCRE_ERROR_BADUTF8_OFFSET)";
+        case PCRE_ERROR_PARTIAL:
+            return "The subject string did not match, but it did match partially. See the "
+                   "pcrepartial documentation for details of partial matching (PCRE_ERROR_PARTIAL)";
+        case PCRE_ERROR_BADPARTIAL:
+            return "This code is no longer in use. It was formerly returned when the PCRE_PARTIAL "
+                   "option was used with a compiled pattern containing items that were not supported "
+                   "for partial matching. From release 8.00 onwards, there are no restrictions on "
+                   "partial matching (PCRE_ERROR_BADPARTIAL)";
+        case PCRE_ERROR_INTERNAL:
+            return "An unexpected internal error has occurred. This error could be caused by a bug "
+                   "in PCRE or by overwriting of the compiled pattern (PCRE_ERROR_INTERNAL)";
+        case PCRE_ERROR_BADCOUNT:
+            return "This error is given if the value of the ovecsize argument is negative "
+                   "(PCRE_ERROR_BADCOUNT)";
+        case PCRE_ERROR_RECURSIONLIMIT:
+            return "The internal recursion limit, as specified by the match_limit_recursion "
+                   "field in a pcre_extra structure (or defaulted) was reached. "
+                   "See the description above (PCRE_ERROR_RECURSIONLIMIT)";
+        case PCRE_ERROR_DFA_UITEM:
+            return "PCRE_ERROR_DFA_UITEM";
+        case PCRE_ERROR_DFA_UCOND:
+            return "PCRE_ERROR_DFA_UCOND";
+        case PCRE_ERROR_DFA_WSSIZE:
+            return "PCRE_ERROR_DFA_WSSIZE";
+        case PCRE_ERROR_DFA_RECURSE:
+            return "PCRE_ERROR_DFA_RECURSE";
+        case PCRE_ERROR_NULLWSLIMIT:
+            return "PCRE_ERROR_NULLWSLIMIT";
+        case PCRE_ERROR_BADNEWLINE:
+            return "An invalid combination of PCRE_NEWLINE_xxx options was "
+                   "given (PCRE_ERROR_BADNEWLINE)";
+        case PCRE_ERROR_BADOFFSET:
+            return "The value of startoffset was negative or greater than the length "
+                   "of the subject, that is, the value in length (PCRE_ERROR_BADOFFSET)";
+        case PCRE_ERROR_SHORTUTF8:
+            return "This error is returned instead of PCRE_ERROR_BADUTF8 when the subject "
+                   "string ends with a truncated UTF-8 character and the PCRE_PARTIAL_HARD option is set. "
+                   "Information about the failure is returned as for PCRE_ERROR_BADUTF8. "
+                   "It is in fact sufficient to detect this case, but this special error code for "
+                   "PCRE_PARTIAL_HARD precedes the implementation of returned information; "
+                   "it is retained for backwards compatibility (PCRE_ERROR_SHORTUTF8)";
+        case PCRE_ERROR_RECURSELOOP:
+            return "This error is returned when pcre_exec() detects a recursion loop "
+                   "within the pattern. Specifically, it means that either the whole pattern "
+                   "or a subpattern has been called recursively for the second time at the same "
+                   "position in the subject string. Some simple patterns that might do this "
+                   "are detected and faulted at compile time, but more complicated cases, "
+                   "in particular mutual recursions between two different subpatterns, "
+                   "cannot be detected until run time (PCRE_ERROR_RECURSELOOP)";
+        case PCRE_ERROR_JIT_STACKLIMIT:
+            return "This error is returned when a pattern that was successfully studied "
+                   "using a JIT compile option is being matched, but the memory available "
+                   "for the just-in-time processing stack is not large enough. See the pcrejit "
+                   "documentation for more details (PCRE_ERROR_JIT_STACKLIMIT)";
+        case PCRE_ERROR_BADMODE:
+            return "This error is given if a pattern that was compiled by the 8-bit library "
+                   "is passed to a 16-bit or 32-bit library function, or vice versa (PCRE_ERROR_BADMODE)";
+        case PCRE_ERROR_BADENDIANNESS:
+            return "This error is given if a pattern that was compiled and saved is reloaded on a "
+                   "host with different endianness. The utility function pcre_pattern_to_host_byte_order() "
+                   "can be used to convert such a pattern so that it runs on the new host (PCRE_ERROR_BADENDIANNESS)";
+        case PCRE_ERROR_DFA_BADRESTART:
+            return "PCRE_ERROR_DFA_BADRESTART";
+#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
+        case PCRE_ERROR_BADLENGTH:
+            return "This error is given if pcre_exec() is called with a negative value for the length argument (PCRE_ERROR_BADLENGTH)";
+        case PCRE_ERROR_JIT_BADOPTION:
+            return "This error is returned when a pattern that was successfully studied using a JIT compile "
+                   "option is being matched, but the matching mode (partial or complete match) does not correspond "
+                   "to any JIT compilation mode. When the JIT fast path function is used, this error may be "
+                   "also given for invalid options. See the pcrejit documentation for more details (PCRE_ERROR_JIT_BADOPTION)";
+#endif
+        }
+        return "unknown PCRE error " + std::to_string(pcreExecRet);
+    }
+
+    class PcreRegex : public Regex
+    {
+    public:
+        explicit PcreRegex(std::string pattern)
+            : mPattern(std::move(pattern))
+        {}
+
+        ~PcreRegex() override
+        {
+            if (mExtra) {
+                pcre_free_study(mExtra);
+                mExtra = nullptr;
+            }
+            if (mRe) {
+                pcre_free(mRe);
+                mRe = nullptr;
+            }
+        }
+
+        std::string compile();
+        std::string match(const std::string& str, const MatchFn& matchFn) const override;
+
+        Engine engine() const override {
+            return Engine::Pcre;
+        }
+
+    private:
+        std::string mPattern;
+        pcre* mRe{};
+        pcre_extra* mExtra{};
+    };
+
+    std::string PcreRegex::compile()
+    {
+        if (mRe)
+            return "regular expression has already been compiled";
+
+        const char *pcreCompileErrorStr = nullptr;
+        int erroffset = 0;
+        pcre * const re = pcre_compile(mPattern.c_str(),0,&pcreCompileErrorStr,&erroffset,nullptr);
+        if (!re) {
+            if (pcreCompileErrorStr)
+                return pcreCompileErrorStr;
+            return "unknown error";
+        }
+
+        // Optimize the regex, but only if PCRE_CONFIG_JIT is available
+#ifdef PCRE_CONFIG_JIT
+        const char *pcreStudyErrorStr = nullptr;
+        pcre_extra * const pcreExtra = pcre_study(re, PCRE_STUDY_JIT_COMPILE, &pcreStudyErrorStr);
+        // pcre_study() returns NULL for both errors and when it can not optimize the regex.
+        // The last argument is how one checks for errors.
+        // It is NULL if everything works, and points to an error string otherwise.
+        if (pcreStudyErrorStr) {
+            // pcre_compile() worked, but pcre_study() returned an error. Free the resources allocated by pcre_compile().
+            pcre_free(re);
+            return std::string(pcreStudyErrorStr) + " (pcre_study)";
+        }
+        mExtra = pcreExtra;
+#endif
+
+        mRe = re;
+
+        return "";
+    }
+
+    std::string PcreRegex::match(const std::string& str, const MatchFn& matchFn) const
+    {
+        if (!mRe)
+            return "regular expression has not been compiled yet";
+
+        int pos = 0;
+        int ovector[30]= {0};
+        while (pos < static_cast<int>(str.size())) {
+            const int pcreExecRet = pcre_exec(mRe, mExtra, str.c_str(), static_cast<int>(str.size()), pos, 0, ovector, 30);
+            if (pcreExecRet == PCRE_ERROR_NOMATCH)
+                return "";
+            if (pcreExecRet < 0) {
+                return pcreErrorCodeToString(pcreExecRet) + " (pos: " + std::to_string(pos) + ")";
+            }
+            const auto pos1 = static_cast<unsigned int>(ovector[0]);
+            const auto pos2 = static_cast<unsigned int>(ovector[1]);
+
+            matchFn(pos1, pos2);
+
+            // jump to the end of the match for the next pcre_exec
+            pos = static_cast<int>(pos2);
+        }
+
+        return "";
+    }
+}
+
+template<typename T>
+static T* createAndCompileRegex(std::string pattern, std::string& err)
+{
+    T* regex = new T(std::move(pattern));
+    err = regex->compile();
+    return regex;
+}
+
+std::shared_ptr<Regex> Regex::create(std::string pattern, Engine engine, std::string& err)
+{
+    Regex* regex = nullptr;
+    if (engine == Engine::Pcre)
+        regex = createAndCompileRegex<PcreRegex>(std::move(pattern), err);
+    else {
+        err = "unknown regular expression engine";
+    }
+    if (!err.empty()) {
+        delete regex;
+        return nullptr;
+    }
+    return std::shared_ptr<Regex>(regex);
+}
+
+#endif // HAVE_RULES
diff --git a/lib/regex.h b/lib/regex.h
new file mode 100644
index 00000000000..c17fba41d4e
--- /dev/null
+++ b/lib/regex.h
@@ -0,0 +1,54 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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 regexH
+#define regexH
+//---------------------------------------------------------------------------
+
+#ifdef HAVE_RULES
+
+#include "config.h"
+
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+
+class CPPCHECKLIB Regex
+{
+public:
+    virtual ~Regex() = default;
+
+    using MatchFn = std::function<void (int start, int end)>;
+    virtual std::string match(const std::string& str, const MatchFn& matchFn) const = 0;
+
+    enum class Engine : std::uint8_t
+    {
+        Unknown = 0,
+        Pcre = 1
+    };
+
+    virtual Engine engine() const = 0;
+
+    static std::shared_ptr<Regex> create(std::string pattern, Engine engine, std::string& err);
+};
+
+#endif // HAVE_RULES
+
+#endif // regexH
diff --git a/lib/reverseanalyzer.cpp b/lib/reverseanalyzer.cpp
index 254dda7826f..0c3c966f2b2 100644
--- a/lib/reverseanalyzer.cpp
+++ b/lib/reverseanalyzer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -110,8 +110,11 @@ namespace {
         {
             if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
                 tok = tok->linkAt(-2);
-            if (Token::simpleMatch(tok->previous(), ") {"))
+            if (Token::simpleMatch(tok->previous(), ") {")) {
+                if (Token::simpleMatch(tok->linkAt(-1)->astOperand2(), ";"))
+                    return tok->linkAt(-1)->astOperand2();
                 return tok->linkAt(-1);
+            }
             if (Token::simpleMatch(tok->previous(), "do {"))
                 return tok->previous();
             return tok;
@@ -195,10 +198,13 @@ namespace {
             return nullptr;
         }
 
+        /**
+         * @throws InternalError thrown on cyclic analysis
+         */
         void traverse(Token* start, const Token* end = nullptr) {
             if (start == end)
                 return;
-            std::size_t i = start->index();
+            nonneg int i = start->index();
             for (Token* tok = start->previous(); succeeds(tok, end); tok = tok->previous()) {
                 if (tok->index() >= i)
                     throw InternalError(tok, "Cyclic reverse analysis.");
@@ -229,7 +235,7 @@ namespace {
                         if (!Token::Match(assignTop->astOperand1(), "%assign%")) {
                             continueB &= updateRecursive(assignTop->astOperand1());
                         }
-                        if (!assignTop->astParent())
+                        if (!assignTop->astParent() || Token::simpleMatch(assignTop->astParent(), ";"))
                             break;
                         assignTop = assignTop->astParent();
                     }
@@ -295,13 +301,13 @@ namespace {
                     if (!condTok)
                         break;
                     Analyzer::Action condAction = analyzeRecursive(condTok);
+                    if (condAction.isModified())
+                        break;
                     const bool inLoop = Token::Match(condTok->astTop()->previous(), "for|while (");
                     // Evaluate condition of for and while loops first
                     if (inLoop) {
                         if (Token::findmatch(tok->link(), "goto|break", tok))
                             break;
-                        if (condAction.isModified())
-                            break;
                         valueFlowGenericForward(condTok, analyzer, tokenlist, errorLogger, settings);
                     }
                     Token* thenEnd;
@@ -334,9 +340,6 @@ namespace {
                         valueFlowGenericForward(condTok, analyzer, tokenlist, errorLogger, settings);
                     else if (condAction.isRead())
                         break;
-                    // If the condition modifies the variable then bail
-                    if (condAction.isModified())
-                        break;
                     tok = jumpToStart(tok->link());
                     continue;
                 }
diff --git a/lib/rule.h b/lib/rule.h
new file mode 100644
index 00000000000..dd5cf92effd
--- /dev/null
+++ b/lib/rule.h
@@ -0,0 +1,43 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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 ruleH
+#define ruleH
+
+#ifdef HAVE_RULES
+
+#include "errortypes.h"
+
+#include <memory>
+#include <string>
+
+class Regex;
+
+/** Rule */
+struct Rule
+{
+    std::string tokenlist = "normal"; // use normal tokenlist
+    std::string pattern;
+    std::string id = "rule"; // default id
+    std::string summary;
+    Severity severity = Severity::style; // default severity
+    std::shared_ptr<Regex> regex;
+};
+#endif // HAVE_RULES
+
+#endif // ruleH
diff --git a/lib/sarifreport.cpp b/lib/sarifreport.cpp
new file mode 100644
index 00000000000..38eb9ea96ca
--- /dev/null
+++ b/lib/sarifreport.cpp
@@ -0,0 +1,225 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+#include "sarifreport.h"
+
+#include "cppcheck.h"
+#include "errorlogger.h"
+#include "errortypes.h"
+#include "settings.h"
+
+#include <cstdint>
+#include <set>
+#include <sstream>
+#include <utility>
+
+static const char sarifVersion[] = "2.1.0";
+static const char sarifSchema[] = "https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json";
+
+void SarifReport::addFinding(ErrorMessage msg)
+{
+    mFindings.push_back(std::move(msg));
+}
+
+picojson::array SarifReport::serializeRules() const
+{
+    picojson::array ret;
+    std::set<std::string> ruleIds;
+    for (const auto& finding : mFindings) {
+        // github only supports findings with locations
+        if (finding.callStack.empty())
+            continue;
+        if (ruleIds.insert(finding.id).second) {
+            // setting name and description to empty strings will make github default
+            // to the instance specific violation message and not rule description,
+            // this makes it so not all the violations have the same description.
+            picojson::object rule;
+            rule["id"] = picojson::value(finding.id);
+            // rule.name
+            rule["name"] = picojson::value("");
+            // rule.shortDescription.text
+            picojson::object shortDescription;
+            shortDescription["text"] = picojson::value("");
+            rule["shortDescription"] = picojson::value(shortDescription);
+            // rule.fullDescription.text
+            picojson::object fullDescription;
+            fullDescription["text"] = picojson::value("");
+            rule["fullDescription"] = picojson::value(fullDescription);
+            // rule.help.text
+            picojson::object help;
+            help["text"] = picojson::value("");
+            rule["help"] = picojson::value(help);
+            // rule.properties.precision, rule.properties.problem.severity
+            picojson::object properties;
+            properties["precision"] = picojson::value(sarifPrecision(finding));
+            // rule.properties.security-severity, rule.properties.tags
+            picojson::array tags;
+
+            // If we have a CWE ID, treat it as security-related (CWE is the authoritative source for security weaknesses)
+            if (finding.cwe.id > 0) {
+                double securitySeverity = 0;
+                if (finding.severity == Severity::error && !ErrorLogger::isCriticalErrorId(finding.id)) {
+                    securitySeverity = 9.9; // critical = 9.0+
+                }
+                else if (finding.severity == Severity::warning) {
+                    securitySeverity = 8.5; // high = 7.0 to 8.9
+                }
+                else if (finding.severity == Severity::performance || finding.severity == Severity::portability ||
+                         finding.severity == Severity::style) {
+                    securitySeverity = 5.5; // medium = 4.0 to 6.9
+                }
+                else if (finding.severity == Severity::information || finding.severity == Severity::internal ||
+                         finding.severity == Severity::debug || finding.severity == Severity::none) {
+                    securitySeverity = 2.0; // low = 0.1 to 3.9
+                }
+                if (securitySeverity > 0.0) {
+                    std::ostringstream ss;
+                    ss << securitySeverity;
+                    properties["security-severity"] = picojson::value(ss.str());
+                    tags.emplace_back("external/cwe/cwe-" + std::to_string(finding.cwe.id));
+                    tags.emplace_back("security");
+                }
+            }
+
+            // Add tags array if it has any content
+            if (!tags.empty()) {
+                properties["tags"] = picojson::value(tags);
+            }
+
+            // Set problem.severity for use with github
+            const std::string problemSeverity = sarifSeverity(finding);
+            properties["problem.severity"] = picojson::value(problemSeverity);
+            rule["properties"] = picojson::value(properties);
+            // rule.defaultConfiguration.level
+            picojson::object defaultConfiguration;
+            defaultConfiguration["level"] = picojson::value(sarifSeverity(finding));
+            rule["defaultConfiguration"] = picojson::value(defaultConfiguration);
+
+            ret.emplace_back(rule);
+        }
+    }
+    return ret;
+}
+
+picojson::array SarifReport::serializeLocations(const ErrorMessage& finding)
+{
+    picojson::array ret;
+    for (const auto& location : finding.callStack) {
+        picojson::object physicalLocation;
+        picojson::object artifactLocation;
+        artifactLocation["uri"] = picojson::value(location.getfile(false));
+        physicalLocation["artifactLocation"] = picojson::value(artifactLocation);
+        picojson::object region;
+        region["startLine"] = picojson::value(static_cast<int64_t>(location.line < 1 ? 1 : location.line));
+        region["startColumn"] = picojson::value(static_cast<int64_t>(location.column < 1 ? 1 : location.column));
+        region["endLine"] = region["startLine"];
+        region["endColumn"] = region["startColumn"];
+        physicalLocation["region"] = picojson::value(region);
+        picojson::object loc;
+        loc["physicalLocation"] = picojson::value(physicalLocation);
+        ret.emplace_back(loc);
+    }
+    return ret;
+}
+
+picojson::array SarifReport::serializeResults() const
+{
+    picojson::array results;
+    for (const auto& finding : mFindings) {
+        // github only supports findings with locations
+        if (finding.callStack.empty())
+            continue;
+        picojson::object res;
+        res["level"] = picojson::value(sarifSeverity(finding));
+        res["locations"] = picojson::value(serializeLocations(finding));
+        picojson::object message;
+        message["text"] = picojson::value(finding.shortMessage());
+        res["message"] = picojson::value(message);
+        res["ruleId"] = picojson::value(finding.id);
+        if (finding.hash != 0) {
+            picojson::object partialFingerprints;
+            partialFingerprints["hash/v1"] = picojson::value(std::to_string(finding.hash));
+            res["partialFingerprints"] = picojson::value(partialFingerprints);
+        }
+        results.emplace_back(res);
+    }
+    return results;
+}
+
+picojson::value SarifReport::serializeRuns(const std::string& productName, const std::string& version) const
+{
+    picojson::object driver;
+    driver["name"] = picojson::value(productName);
+    driver["semanticVersion"] = picojson::value(version);
+    driver["informationUri"] = picojson::value("https://cppcheck.sourceforge.io");
+    driver["rules"] = picojson::value(serializeRules());
+    picojson::object tool;
+    tool["driver"] = picojson::value(driver);
+    picojson::object run;
+    run["tool"] = picojson::value(tool);
+    run["results"] = picojson::value(serializeResults());
+    picojson::array runs{picojson::value(run)};
+    return picojson::value(runs);
+}
+
+std::string SarifReport::serialize(std::string productName) const
+{
+    const auto nameAndVersion = Settings::getNameAndVersion(productName);
+    productName = nameAndVersion.first.empty() ? "Cppcheck" : nameAndVersion.first;
+    std::string version = nameAndVersion.first.empty() ? CppCheck::version() : nameAndVersion.second;
+    if (version.find(' ') != std::string::npos)
+        version.erase(version.find(' '), std::string::npos);
+
+    picojson::object doc;
+    doc["$schema"] = picojson::value(sarifSchema);
+    doc["runs"] = serializeRuns(productName, version);
+
+    // Insert "version" property at the start.
+    // From SARIF specification (https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/sarif-v2.1.0-errata01-os-complete.html#_Toc141790730):
+    // Although the order in which properties appear in a JSON object value is not semantically significant, the version property SHOULD appear first.
+
+    return "{\n  \"version\": \"" + std::string(sarifVersion) + "\"," + picojson::value(doc).serialize(true).substr(1);
+}
+
+std::string SarifReport::sarifSeverity(const ErrorMessage& errmsg)
+{
+    if (ErrorLogger::isCriticalErrorId(errmsg.id))
+        return "error";
+    switch (errmsg.severity) {
+    case Severity::error:
+    case Severity::warning:
+        return "error";
+    case Severity::style:
+    case Severity::portability:
+    case Severity::performance:
+        return "warning";
+    case Severity::information:
+    case Severity::internal:
+    case Severity::debug:
+    case Severity::none:
+        return "note";
+    }
+    return "note";
+}
+
+std::string SarifReport::sarifPrecision(const ErrorMessage& errmsg)
+{
+    if (errmsg.certainty == Certainty::inconclusive)
+        return "medium";
+    return "high";
+}
diff --git a/lib/sarifreport.h b/lib/sarifreport.h
new file mode 100644
index 00000000000..6baf88cb04d
--- /dev/null
+++ b/lib/sarifreport.h
@@ -0,0 +1,53 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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 SARIF_REPORT_H
+#define SARIF_REPORT_H
+
+#include "config.h"
+#include "errorlogger.h"
+
+#include <string>
+#include <vector>
+
+// Include picojson headers
+#include "json.h"
+
+class CPPCHECKLIB SarifReport {
+public:
+    SarifReport() = default;
+    ~SarifReport() = default;
+
+    void addFinding(ErrorMessage msg);
+    std::string serialize(std::string productName) const;
+
+private:
+    // Implementation methods
+    picojson::array serializeRules() const;
+    static picojson::array serializeLocations(const ErrorMessage& finding);
+    picojson::array serializeResults() const;
+    picojson::value serializeRuns(const std::string& productName, const std::string& version) const;
+
+    // Utility methods
+    static std::string sarifSeverity(const ErrorMessage& errmsg);
+    static std::string sarifPrecision(const ErrorMessage& errmsg);
+
+    std::vector<ErrorMessage> mFindings;
+};
+
+#endif // SARIF_REPORT_H
diff --git a/lib/settings.cpp b/lib/settings.cpp
index f8d42b97632..479346208e3 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,18 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "addoninfo.h"
 #include "config.h"
+#include "errortypes.h"
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
 #include "suppressions.h"
-#include "utils.h"
 #include "vfvalue.h"
 
+#ifdef HAVE_RULES
+#include "rule.h"
+#endif
+
 #include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <iostream>
-#include <sstream>
 #include <utility>
 
 #include "json.h"
@@ -41,6 +47,9 @@
 
 std::atomic<bool> Settings::mTerminated;
 
+const int Settings::maxConfigsNotAssigned = 0;
+const int Settings::maxConfigsDefault = 12;
+
 const char Settings::SafeChecks::XmlRootName[] = "safe-checks";
 const char Settings::SafeChecks::XmlClasses[] = "class-public";
 const char Settings::SafeChecks::XmlExternalFunctions[] = "external-functions";
@@ -65,9 +74,16 @@ Settings::Settings()
     pid = getPid();
 }
 
+Settings::~Settings() = default;
+
+Settings::Settings(const Settings&) = default;
+Settings & Settings::operator=(const Settings &) = default;
+
+Settings::Settings(Settings&&) CPPCHECK_NOEXCEPT = default;
+Settings & Settings::operator=(Settings &&) CPPCHECK_NOEXCEPT = default;
+
 std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug)
 {
-    // TODO: this always needs to be run *after* the Settings has been filled
     static const std::string cfgFilename = "cppcheck.cfg";
     std::string fileName;
 #ifdef FILESDIR
@@ -82,7 +98,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
     // cppcheck-suppress knownConditionTrueFalse
     if (fileName.empty()) {
         // TODO: make sure that exename is set
-        fileName = Path::getPathFromFilename(settings.exename) + cfgFilename;
+        fileName = Path::join(Path::getPathFromFilename(settings.exename), cfgFilename);
         if (debug)
             std::cout << "looking for '" << fileName << "'" << std::endl;
         if (!Path::isFile(fileName))
@@ -105,7 +121,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
     }
     const picojson::object& obj = json.get<picojson::object>();
     {
-        const auto it = utils::as_const(obj).find("productName");
+        const auto it = obj.find("productName");
         if (it != obj.cend()) {
             const auto& v = it->second;
             if (!v.is<std::string>())
@@ -114,7 +130,16 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("about");
+        const auto it = obj.find("manualUrl");
+        if (it != obj.cend()) {
+            const auto& v = it->second;
+            if (!v.is<std::string>())
+                return "'manualUrl' is not a string";
+            settings.manualUrl = v.get<std::string>();
+        }
+    }
+    {
+        const auto it = obj.find("about");
         if (it != obj.cend()) {
             const auto& v = it->second;
             if (!v.is<std::string>())
@@ -123,7 +148,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("addons");
+        const auto it = obj.find("addons");
         if (it != obj.cend()) {
             const auto& entry = it->second;
             if (!entry.is<picojson::array>())
@@ -141,7 +166,7 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("suppressions");
+        const auto it = obj.find("suppressions");
         if (it != obj.cend()) {
             const auto& entry = it->second;
             if (!entry.is<picojson::array>())
@@ -158,15 +183,17 @@ std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppress
         }
     }
     {
-        const auto it = utils::as_const(obj).find("safety");
+        const auto it = obj.find("safety");
         if (it != obj.cend()) {
             const auto& v = it->second;
             if (!v.is<bool>())
                 return "'safety' is not a bool";
-            settings.safety = settings.safety || v.get<bool>();
+            settings.safety = v.get<bool>();
         }
     }
 
+    settings.settingsFiles.emplace_back(std::move(fileName));
+
     return "";
 }
 
@@ -282,7 +309,7 @@ std::string Settings::applyEnabled(const std::string &str, bool enable)
     }
     // FIXME: hack to make sure "error" is always enabled
     severity.enable(Severity::error);
-    return errmsg;
+    return {};
 }
 
 bool Settings::isEnabled(const ValueFlow::Value *value, bool inconclusiveCheck) const
@@ -308,6 +335,7 @@ void Settings::setCheckLevel(CheckLevel level)
         vfOptions.maxIfCount = 100;
         vfOptions.doConditionExpressionAnalysis = false;
         vfOptions.maxForwardBranches = 4;
+        vfOptions.maxForwardConditionForkDepth = 0;
         vfOptions.maxIterations = 1;
     }
     else if (level == CheckLevel::normal) {
@@ -317,6 +345,7 @@ void Settings::setCheckLevel(CheckLevel level)
         vfOptions.maxIfCount = 100;
         vfOptions.doConditionExpressionAnalysis = false;
         vfOptions.maxForwardBranches = 4;
+        vfOptions.maxForwardConditionForkDepth = 1;
     }
     else if (level == CheckLevel::exhaustive) {
         // Checking can take a little while. ~ 10 times slower than normal analysis is OK.
@@ -325,6 +354,8 @@ void Settings::setCheckLevel(CheckLevel level)
         vfOptions.maxSubFunctionArgs = 256;
         vfOptions.doConditionExpressionAnalysis = true;
         vfOptions.maxForwardBranches = -1;
+        vfOptions.maxForwardConditionForkDepth = 4;
+        vfOptions.maxForwardConditionForks = 256;
     }
 }
 
@@ -339,7 +370,6 @@ static const std::set<std::string> autosarCheckers{
     "bufferAccessOutOfBounds",
     "comparePointers",
     "constParameter",
-    "cstyleCast",
     "ctuOneDefinitionRuleViolation",
     "doubleFree",
     "duplInheritedMember",
@@ -381,7 +411,6 @@ static const std::set<std::string> autosarCheckers{
     "unsignedLessThanZero",
     "unusedFunction",
     "unusedStructMember",
-    "unusedValue",
     "unusedVariable",
     "useInitializationList",
     "variableScope",
@@ -392,15 +421,21 @@ static const std::set<std::string> autosarCheckers{
 
 static const std::set<std::string> certCCheckers{
     "IOWithoutPositioning",
+    "argumentSize",
+    "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "arrayIndexThenCheck",
     "autoVariables",
     "autovarInvalidDeallocation",
     "bitwiseOnBoolean",
+    "bufferAccessOutOfBounds",
     "comparePointers",
     "danglingLifetime",
     "deallocret",
     "deallocuse",
     "doubleFree",
     "floatConversionOverflow",
+    "integerOverflow",
     "invalidFunctionArg",
     "invalidLengthModifierError",
     "invalidLifetime",
@@ -412,11 +447,15 @@ static const std::set<std::string> certCCheckers{
     "memleakOnRealloc",
     "mismatchAllocDealloc",
     "missingReturn",
+    "negativeIndex",
     "nullPointer",
     "nullPointerArithmetic",
     "nullPointerArithmeticRedundantCheck",
     "nullPointerDefaultArg",
     "nullPointerRedundantCheck",
+    "objectIndex",
+    "pointerOutOfBounds",
+    "pointerOutOfBoundsCond",
     "preprocessorErrorDirective",
     "resourceLeak",
     "returnDanglingLifetime",
@@ -434,6 +473,14 @@ static const std::set<std::string> certCCheckers{
 static const std::set<std::string> certCppCheckers{
     "IOWithoutPositioning",
     "accessMoved",
+    "argumentSize",
+    "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "arrayIndexThenCheck",
+    "autoVariables",
+    "autovarInvalidDeallocation",
+    "bitwiseOnBoolean",
+    "bufferAccessOutOfBounds",
     "comparePointers",
     "containerOutOfBounds",
     "ctuOneDefinitionRuleViolation",
@@ -441,23 +488,50 @@ static const std::set<std::string> certCppCheckers{
     "danglingReference",
     "danglingTempReference",
     "danglingTemporaryLifetime",
-    "deallocThrow",
+    "deallocret",
     "deallocuse",
     "doubleFree",
     "eraseDereference",
+    "exceptDeallocThrow",
     "exceptThrowInDestructor",
+    "floatConversionOverflow",
     "initializerList",
+    "integerOverflow",
     "invalidContainer",
+    "invalidFunctionArg",
+    "invalidLengthModifierError",
+    "invalidLifetime",
+    "invalidScanfFormatWidth",
+    "invalidscanf",
+    "leakReturnValNotUsed",
+    "leakUnsafeArgAlloc",
     "memleak",
+    "memleakOnRealloc",
     "mismatchAllocDealloc",
     "missingReturn",
+    "negativeIndex",
     "nullPointer",
+    "nullPointerArithmetic",
+    "nullPointerArithmeticRedundantCheck",
+    "nullPointerDefaultArg",
+    "nullPointerRedundantCheck",
+    "objectIndex",
     "operatorEqToSelf",
+    "pointerOutOfBounds",
+    "pointerOutOfBoundsCond",
+    "preprocessorErrorDirective",
+    "resourceLeak",
     "returnDanglingLifetime",
     "sizeofCalculation",
+    "stringLiteralWrite",
+    "uninitStructMember",
+    "uninitdata",
     "uninitvar",
+    "useClosedFile",
     "virtualCallInConstructor",
-    "virtualDestructor"
+    "virtualDestructor",
+    "wrongPrintfScanfArgNum",
+    "wrongPrintfScanfParameterPositionError"
 };
 
 static const std::set<std::string> misrac2012Checkers{
@@ -497,6 +571,7 @@ static const std::set<std::string> misrac2012Checkers{
     "unknownEvaluationOrder",
     "unreachableCode",
     "unreadVariable",
+    "unusedFunction",
     "unusedLabel",
     "unusedVariable",
     "useClosedFile",
@@ -540,6 +615,51 @@ static const std::set<std::string> misrac2023Checkers{
     "unknownEvaluationOrder",
     "unreachableCode",
     "unreadVariable",
+    "unusedFunction",
+    "unusedLabel",
+    "unusedVariable",
+    "useClosedFile",
+    "writeReadOnlyFile"
+};
+
+static const std::set<std::string> misrac2025Checkers{
+    "argumentSize",
+    "autovarInvalidDeallocation",
+    "bufferAccessOutOfBounds",
+    "comparePointers",
+    "compareValueOutOfTypeRangeError",
+    "constParameterPointer",
+    "constStatement",
+    "danglingLifetime",
+    "danglingTemporaryLifetime",
+    "duplicateBreak",
+    "funcArgNamesDifferent",
+    "incompatibleFileOpen",
+    "invalidFunctionArg",
+    "knownConditionTrueFalse",
+    "leakNoVarFunctionCall",
+    "leakReturnValNotUsed",
+    "memleak",
+    "memleakOnRealloc",
+    "missingReturn",
+    "overlappingWriteFunction",
+    "overlappingWriteUnion",
+    "pointerOutOfBounds",
+    "preprocessorErrorDirective",
+    "redundantAssignInSwitch",
+    "redundantAssignment",
+    "redundantCondition",
+    "resourceLeak",
+    "returnDanglingLifetime",
+    "shadowVariable",
+    "sizeofCalculation",
+    "sizeofwithsilentarraypointer",
+    "syntaxError",
+    "uninitvar",
+    "unknownEvaluationOrder",
+    "unreachableCode",
+    "unreadVariable",
+    "unusedFunction",
     "unusedLabel",
     "unusedVariable",
     "useClosedFile",
@@ -553,6 +673,7 @@ static const std::set<std::string> misracpp2008Checkers{
     "constVariable",
     "cstyleCast",
     "ctuOneDefinitionRuleViolation",
+    "dangerousTypeCast",
     "danglingLifetime",
     "duplInheritedMember",
     "duplicateBreak",
@@ -602,6 +723,7 @@ static const std::set<std::string> misracpp2023Checkers{
     "constParameterReference",
     "ctuOneDefinitionRuleViolation",
     "danglingLifetime",
+    "floatConversionOverflow",
     "identicalConditionAfterEarlyExit",
     "identicalInnerCondition",
     "ignoredReturnValue",
@@ -633,13 +755,15 @@ static const std::set<std::string> misracpp2023Checkers{
 
 bool Settings::isPremiumEnabled(const char id[]) const
 {
+    if (premiumArgs.empty())
+        return false;
     if (premiumArgs.find("autosar") != std::string::npos && autosarCheckers.count(id))
         return true;
     if (premiumArgs.find("cert-c-") != std::string::npos && certCCheckers.count(id))
         return true;
     if (premiumArgs.find("cert-c++") != std::string::npos && certCppCheckers.count(id))
         return true;
-    if (premiumArgs.find("misra-c-") != std::string::npos && (misrac2012Checkers.count(id) || misrac2023Checkers.count(id)))
+    if (premiumArgs.find("misra-c-") != std::string::npos && (misrac2012Checkers.count(id) || misrac2023Checkers.count(id) || misrac2025Checkers.count(id)))
         return true;
     if (premiumArgs.find("misra-c++-2008") != std::string::npos && misracpp2008Checkers.count(id))
         return true;
@@ -648,51 +772,6 @@ bool Settings::isPremiumEnabled(const char id[]) const
     return false;
 }
 
-void Settings::setMisraRuleTexts(const ExecuteCmdFn& executeCommand)
-{
-    if (premiumArgs.find("--misra-c-20") != std::string::npos) {
-        const auto it = std::find_if(addonInfos.cbegin(), addonInfos.cend(), [](const AddonInfo& a) {
-            return a.name == "premiumaddon.json";
-        });
-        if (it != addonInfos.cend()) {
-            std::string arg;
-            if (premiumArgs.find("--misra-c-2023") != std::string::npos)
-                arg = "--misra-c-2023-rule-texts";
-            else
-                arg = "--misra-c-2012-rule-texts";
-            std::string output;
-            executeCommand(it->executable, {std::move(arg)}, "2>&1", output);
-            setMisraRuleTexts(output);
-        }
-    }
-}
-
-void Settings::setMisraRuleTexts(const std::string& data)
-{
-    mMisraRuleTexts.clear();
-    std::istringstream istr(data);
-    std::string line;
-    while (std::getline(istr, line)) {
-        std::string::size_type pos = line.find(' ');
-        if (pos == std::string::npos)
-            continue;
-        std::string id = line.substr(0, pos);
-        std::string text = line.substr(pos + 1);
-        if (id.empty() || text.empty())
-            continue;
-        if (text[text.size() -1] == '\r')
-            text.erase(text.size() -1);
-        mMisraRuleTexts[id] = std::move(text);
-    }
-}
-
-std::string Settings::getMisraRuleText(const std::string& id, const std::string& text) const {
-    if (id.compare(0, 9, "misra-c20") != 0)
-        return text;
-    const auto it = mMisraRuleTexts.find(id.substr(id.rfind('-') + 1));
-    return it != mMisraRuleTexts.end() ? it->second : text;
-}
-
 Settings::ExecutorType Settings::defaultExecutor()
 {
     static constexpr ExecutorType defaultExecutor =
@@ -703,3 +782,24 @@ Settings::ExecutorType Settings::defaultExecutor()
 #endif
     return defaultExecutor;
 }
+
+bool Settings::unusedFunctionOnly()
+{
+    const char* unusedFunctionOnly = std::getenv("UNUSEDFUNCTION_ONLY");
+    return unusedFunctionOnly && (std::strcmp(unusedFunctionOnly, "1") == 0);
+}
+
+bool Settings::collectLogCheckers(bool* summary, bool* xmlReport, bool* textReport) const
+{
+    const bool s = safety || severity.isEnabled(Severity::information);
+    if (summary)
+        *summary = s;
+    const bool x = outputFormat == Settings::OutputFormat::xml && xml_version == 3;
+    if (xmlReport)
+        *xmlReport = x;
+    const bool t = !checkersReportFilename.empty();
+    if (textReport)
+        *textReport = t;
+
+    return s || x || t;
+}
diff --git a/lib/settings.h b/lib/settings.h
index 7e9be6c6a40..ce4a32e1690 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,9 +21,7 @@
 #define settingsH
 //---------------------------------------------------------------------------
 
-#include "addoninfo.h"
 #include "config.h"
-#include "errortypes.h"
 #include "library.h"
 #include "platform.h"
 #include "standards.h"
@@ -32,9 +30,7 @@
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
-#include <functional>
 #include <list>
-#include <map>
 #include <set>
 #include <string>
 #include <tuple>
@@ -46,11 +42,17 @@
 #include <cstdio>
 #endif
 
+#ifdef HAVE_RULES
+struct Rule;
+#endif
 struct Suppressions;
-enum class SHOWTIME_MODES : std::uint8_t;
+struct AddonInfo;
 namespace ValueFlow {
     class Value;
 }
+enum class Severity : std::uint8_t;
+enum class Certainty : std::uint8_t;
+enum class Checks : std::uint8_t;
 
 /// @addtogroup Core
 /// @{
@@ -92,6 +94,16 @@ class SimpleEnableGroup {
 };
 
 
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 9
+// Hack to workaround GCC bug.
+// Details: https://trac.cppcheck.net/ticket/14850
+// seen on g++ before 10.x
+#define  CPPCHECK_NOEXCEPT
+#else
+#define  CPPCHECK_NOEXCEPT  noexcept
+#endif
+
+
 /**
  * @brief This is just a container for general settings so that we don't need
  * to pass individual values to functions or constructors now or in the
@@ -106,6 +118,13 @@ class CPPCHECKLIB WARN_UNUSED Settings {
 
 public:
     Settings();
+    ~Settings();
+
+    Settings(const Settings&);
+    Settings& operator=(const Settings&);
+
+    Settings(Settings&&) CPPCHECK_NOEXCEPT;
+    Settings& operator=(Settings&&) CPPCHECK_NOEXCEPT;
 
     static std::string loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug = false);
 
@@ -132,9 +151,6 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief --cppcheck-build-dir. Always uses / as path separator. No trailing path separator. */
     std::string buildDir;
 
-    /** @brief check all configurations (false if -D or --max-configs is used */
-    bool checkAllConfigurations = true;
-
     /** Is the 'configuration checking' wanted? */
     bool checkConfiguration{};
 
@@ -188,6 +204,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Are we running from DACA script? */
     bool daca{};
 
+    /** @brief Is --debug-analyzerinfo given? */
+    bool debugainfo{};
+
     /** @brief Is --debug-ast given? */
     bool debugast{};
 
@@ -197,6 +216,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Is --debug-ignore given? */
     bool debugignore{};
 
+    /** @brief Is --debug-ipc given? */
+    bool debugipc{};
+
     /** @brief Internal: Is --debug-lookup or --debug-lookup=all given? */
     bool debuglookup{};
 
@@ -236,9 +258,6 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Do not filter duplicated errors. */
     bool emitDuplicates{};
 
-    /** @brief Name of the language that is enforced. Empty per default. */
-    Standards::Language enforcedLang{};
-
 #if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
     /** @brief Is --exception-handling given */
     bool exceptionHandling{};
@@ -293,9 +312,33 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     int loadAverage{};
 #endif
 
-    /** @brief Maximum number of configurations to check before bailing.
-        Default is 12. (--max-configs=N) */
-    int maxConfigs = 12;
+    std::string manualUrl{"https://cppcheck.sourceforge.io/manual.pdf"};
+
+    /** --max-configs value */
+    int maxConfigsOption = 0; // "Not Assigned" value
+
+    /** max configs from --project option */
+    int maxConfigsProject = 0; // "Not Assigned" value
+
+    static const int maxConfigsNotAssigned;
+    static const int maxConfigsDefault;
+
+    bool isMaxConfigsAssigned() const {
+        return maxConfigsOption != maxConfigsNotAssigned || maxConfigsProject != maxConfigsNotAssigned;
+    }
+
+    /** @brief Maximum number of configurations to check before bailing. */
+    int getMaxConfigs() const {
+        if (force)
+            return 0x7fffffff;
+        if (maxConfigsOption != maxConfigsNotAssigned)
+            return maxConfigsOption;
+        if (maxConfigsProject != maxConfigsNotAssigned)
+            return maxConfigsProject;
+        if (!userDefines.empty())
+            return 1;
+        return maxConfigsDefault;
+    }
 
     /** @brief --max-ctu-depth */
     int maxCtuDepth = 2;
@@ -317,6 +360,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief plist output (--plist-output=&lt;dir&gt;) */
     std::string plistOutput;
 
+    /** @brief Are we Cppcheck Premium */
+    bool premium{};
+
     /** @brief Extra arguments for Cppcheck Premium addon */
     std::string premiumArgs;
 
@@ -336,15 +382,6 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     int reportProgress{-1};
 
 #ifdef HAVE_RULES
-    /** Rule */
-    struct CPPCHECKLIB Rule {
-        std::string tokenlist = "normal"; // use normal tokenlist
-        std::string pattern;
-        std::string id = "rule"; // default id
-        std::string summary;
-        Severity severity = Severity::style; // default severity
-    };
-
     /**
      * @brief Extra rules
      */
@@ -403,12 +440,24 @@ class CPPCHECKLIB WARN_UNUSED Settings {
 
     SafeChecks safeChecks;
 
+    /** @brief the files we successfully loaded settings from */
+    std::vector<std::string> settingsFiles;
+
     SimpleEnableGroup<Severity> severity;
     SimpleEnableGroup<Certainty> certainty;
     SimpleEnableGroup<Checks> checks;
 
+    enum class ShowTime : std::uint8_t {
+        NONE,
+        FILE,
+        FILE_TOTAL,
+        SUMMARY,
+        TOP5_SUMMARY,
+        TOP5_FILE
+    };
+
     /** @brief show timing information (--showtime=file|summary|top5) */
-    SHOWTIME_MODES showtime{};
+    ShowTime showtime{};
 
     /** Struct contains standards settings */
     Standards standards;
@@ -427,6 +476,9 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief The maximum time in seconds for the typedef simplification */
     std::size_t typedefMaxTime{};
 
+    /** @brief Error IDs which should not be reported as unmatchedSuppression */
+    std::vector<std::string> unmatchedSuppressionFilters;
+
     /** @brief defines given by the user */
     std::string userDefines;
 
@@ -442,7 +494,7 @@ class CPPCHECKLIB WARN_UNUSED Settings {
         /** @brief the maximum iterations to execute */
         std::size_t maxIterations = 4;
 
-        /** @brief maximum numer if-branches */
+        /** @brief maximum number if-branches */
         int maxIfCount = -1;
 
         /** @brief maximum number of sets of arguments to pass to subfuncions */
@@ -460,6 +512,15 @@ class CPPCHECKLIB WARN_UNUSED Settings {
         /** @brief Maximum performed forward branches */
         int maxForwardBranches = -1;
 
+        /** @brief Maximum depth of nested condition-fork continuations in the forward analyzer.
+            Bounds the exponential fan-out of carrying condition state forward at exhaustive level (where
+            maxForwardBranches is unlimited); past it the forward analysis continues on a single linear path
+            without skipping any branch. 0 disables forking (linear); a negative value means unlimited. */
+        int maxForwardConditionForkDepth = 4;
+
+        /** @brief Maximum total condition-fork continuations in one forward traversal. */
+        int maxForwardConditionForks = 256;
+
         /** @brief Maximum performed alignof recursion */
         int maxAlignOfRecursion = 100;
 
@@ -543,17 +604,15 @@ class CPPCHECKLIB WARN_UNUSED Settings {
 
     void setCheckLevel(CheckLevel level);
 
-    using ExecuteCmdFn = std::function<int (std::string,std::vector<std::string>,std::string,std::string&)>;
-    void setMisraRuleTexts(const ExecuteCmdFn& executeCommand);
-    void setMisraRuleTexts(const std::string& data);
-    std::string getMisraRuleText(const std::string& id, const std::string& text) const;
-
     static ExecutorType defaultExecutor();
 
+    static bool unusedFunctionOnly();
+
+    bool collectLogCheckers(bool* summary = nullptr, bool* xmlReport = nullptr, bool* textReport = nullptr) const;
+
 private:
     static std::string parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity>, SimpleEnableGroup<Checks>> &groups);
     std::string applyEnabled(const std::string &str, bool enable);
-    std::map<std::string, std::string> mMisraRuleTexts;
 };
 
 /// @}
diff --git a/lib/smallvector.h b/lib/smallvector.h
index 3eb423288a0..b269ac7bbe1 100644
--- a/lib/smallvector.h
+++ b/lib/smallvector.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -24,7 +24,7 @@
 static constexpr std::size_t DefaultSmallVectorSize = 3;
 
 #ifdef HAVE_BOOST
-#include <boost/container/small_vector.hpp>
+#include <boost/container/small_vector.hpp> // IWYU pragma: export
 
 template<typename T, std::size_t N = DefaultSmallVectorSize>
 using SmallVector = boost::container::small_vector<T, N>;
@@ -36,9 +36,8 @@ template<class T, std::size_t N>
 struct TaggedAllocator : std::allocator<T>
 {
     template<class ... Ts>
-    // cppcheck-suppress noExplicitConstructor
     // NOLINTNEXTLINE(google-explicit-constructor)
-    TaggedAllocator(Ts&&... ts)
+    TaggedAllocator(Ts && ... ts)
         : std::allocator<T>(std::forward<Ts>(ts)...)
     {}
 
diff --git a/lib/standards.cpp b/lib/standards.cpp
index 9f7c48e4c80..06b129ab8cf 100644
--- a/lib/standards.cpp
+++ b/lib/standards.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -36,6 +36,8 @@ static Standards::cstd_t mapC(simplecpp::cstd_t cstd) {
         return Standards::C17;
     case simplecpp::C23:
         return Standards::C23;
+    case simplecpp::C2Y:
+        return Standards::C2Y;
     case simplecpp::CUnknown:
         return Standards::CLatest;
     }
@@ -73,6 +75,8 @@ std::string Standards::getC(cstd_t c_std)
         return "c17";
     case C23:
         return "c23";
+    case C2Y:
+        return "c2y";
     }
     return "";
 }
@@ -153,3 +157,15 @@ bool Standards::setStd(const std::string& str)
 {
     return setC(str) || setCPP(str);
 }
+
+std::string Standards::getStdForLanguage(Standards::Language language) const
+{
+    switch (language) {
+    case C:
+        return getC();
+    case CPP:
+        return getCPP();
+    default:
+        return "";
+    }
+}
diff --git a/lib/standards.h b/lib/standards.h
index deebb3521d0..0ab73300a9a 100644
--- a/lib/standards.h
+++ b/lib/standards.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -38,7 +38,7 @@ struct CPPCHECKLIB Standards {
     enum Language : std::uint8_t { None, C, CPP };
 
     /** C code standard */
-    enum cstd_t : std::uint8_t { C89, C99, C11, C17, C23, CLatest = C23 } c = CLatest;
+    enum cstd_t : std::uint8_t { C89, C99, C11, C17, C23, C2Y, CLatest = C2Y } c = CLatest;
 
     /** C++ code standard */
     enum cppstd_t : std::uint8_t { CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26, CPPLatest = CPP26 } cpp = CPPLatest;
@@ -58,6 +58,7 @@ struct CPPCHECKLIB Standards {
     static std::string getCPP(cppstd_t std);
     static cppstd_t getCPP(const std::string &std);
     bool setStd(const std::string& str);
+    std::string getStdForLanguage(Language language) const;
 };
 
 /// @}
diff --git a/lib/summaries.cpp b/lib/summaries.cpp
index 9226094baec..fa5399fd73d 100644
--- a/lib/summaries.cpp
+++ b/lib/summaries.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,6 +19,7 @@
 #include "summaries.h"
 
 #include "analyzerinfo.h"
+#include "path.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -34,7 +35,7 @@
 
 
 
-std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg, int fileIndex)
+std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg, std::size_t fsFileId)
 {
     const SymbolDatabase *symbolDatabase = tokenizer.getSymbolDatabase();
     const Settings &settings = tokenizer.getSettings();
@@ -82,7 +83,7 @@ std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg
     }
 
     if (!settings.buildDir.empty()) {
-        std::string filename = AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, tokenizer.list.getSourceFilePath(), cfg, fileIndex);
+        std::string filename = AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, Path::simplifyPath(tokenizer.list.getSourceFilePath()), cfg, fsFileId);
         const std::string::size_type pos = filename.rfind(".a");
         if (pos != std::string::npos) {
             filename[pos+1] = 's';
diff --git a/lib/summaries.h b/lib/summaries.h
index 238ea4107d3..d720d023306 100644
--- a/lib/summaries.h
+++ b/lib/summaries.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,13 +23,14 @@
 
 #include "config.h"
 
+#include <cstddef>
 #include <set>
 #include <string>
 
 class Tokenizer;
 
 namespace Summaries {
-    CPPCHECKLIB std::string create(const Tokenizer &tokenizer, const std::string &cfg, int fileIndex);
+    CPPCHECKLIB std::string create(const Tokenizer &tokenizer, const std::string &cfg, std::size_t fsFileId);
     CPPCHECKLIB void loadReturn(const std::string &buildDir, std::set<std::string> &summaryReturn);
 }
 
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index 7f2351878c0..b45ba151914 100644
--- a/lib/suppressions.cpp
+++ b/lib/suppressions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,25 +18,27 @@
 
 #include "suppressions.h"
 
+#include "addoninfo.h"
 #include "errorlogger.h"
-#include "errortypes.h"
 #include "filesettings.h"
 #include "path.h"
+#include "pathmatch.h"
 #include "utils.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
+#include "settings.h"
 
 #include <algorithm>
 #include <cctype>   // std::isdigit, std::isalnum, etc
 #include <cstring>
+#include <exception>
 #include <functional> // std::bind, std::placeholders
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 
 #include "xml.h"
 
-static const char ID_UNUSEDFUNCTION[] = "unusedFunction";
 static const char ID_CHECKERSREPORT[] = "checkersReport";
 
 SuppressionList::ErrorMessage SuppressionList::ErrorMessage::fromErrorMessage(const ::ErrorMessage &msg, const std::set<std::string> &macroNames)
@@ -129,12 +131,15 @@ std::string SuppressionList::parseXmlFile(const char *filename)
             if (std::strcmp(name, "id") == 0)
                 s.errorId = text;
             else if (std::strcmp(name, "fileName") == 0)
-                s.fileName = text;
+                s.fileName = Path::simplifyPath(text);
             else if (std::strcmp(name, "lineNumber") == 0)
                 s.lineNumber = strToInt<int>(text);
             else if (std::strcmp(name, "symbolName") == 0)
                 s.symbolName = text;
-            else if (*text && std::strcmp(name, "hash") == 0)
+            else if (std::strcmp(name, "macroName") == 0) {
+                s.macroName = text;
+                s.type = SuppressionList::Type::macro;
+            } else if (*text && std::strcmp(name, "hash") == 0)
                 s.hash = strToInt<std::size_t>(text);
             else
                 return std::string("unknown element '") + name + "' in suppressions XML '" + filename + "', expected id/fileName/lineNumber/symbolName/hash.";
@@ -205,9 +210,8 @@ std::vector<SuppressionList::Suppression> SuppressionList::parseMultiSuppressCom
     return suppressions;
 }
 
-SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
+SuppressionList::Suppression SuppressionList::parseLine(std::string line)
 {
-    std::istringstream lineStream;
     SuppressionList::Suppression suppression;
 
     // Strip any end of line comments
@@ -216,13 +220,18 @@ SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
         while (endpos > 0 && std::isspace(line[endpos-1])) {
             endpos--;
         }
-        lineStream.str(line.substr(0, endpos));
-    } else {
-        lineStream.str(line);
+        line.resize(endpos);
     }
 
-    if (std::getline(lineStream, suppression.errorId, ':')) {
-        if (std::getline(lineStream, suppression.fileName)) {
+    const auto parts = splitString(line, '\n');
+    const std::string& suppr_l = parts[0];
+
+    const std::string::size_type first_sep = suppr_l.find(':');
+    suppression.errorId = suppr_l.substr(0, first_sep);
+    if (first_sep != std::string::npos) {
+        suppression.fileName = suppr_l.substr(first_sep+1);
+        if (!suppression.fileName.empty()) {
+            // TODO: this only works with files which have an extension
             // If there is not a dot after the last colon in "file" then
             // the colon is a separator and the contents after the colon
             // is a line number..
@@ -232,30 +241,48 @@ SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
 
             // if a colon is found and there is no dot after it..
             if (pos != std::string::npos &&
-                suppression.fileName.find('.', pos) == std::string::npos) {
-                // Try to parse out the line number
-                try {
-                    std::istringstream istr1(suppression.fileName.substr(pos+1));
-                    istr1 >> suppression.lineNumber;
-                } catch (...) {
-                    suppression.lineNumber = SuppressionList::Suppression::NO_LINE;
-                }
+                suppression.fileName.find('.', pos) == std::string::npos)
+            {
+                // parse out the line number
+                const std::string line_s = suppression.fileName.substr(pos+1);
+                suppression.fileName.erase(pos);
 
-                if (suppression.lineNumber != SuppressionList::Suppression::NO_LINE) {
-                    suppression.fileName.erase(pos);
+                if (suppression.fileName.empty())
+                    throw std::runtime_error("filename is missing");
+
+                try {
+                    suppression.lineNumber = strToInt<int>(line_s);
+                } catch (const std::runtime_error& e) {
+                    throw std::runtime_error(std::string("invalid line number (") + e.what() + ")");
                 }
             }
+            suppression.fileName = Path::simplifyPath(suppression.fileName);
+        } else {
+            throw std::runtime_error("filename is missing");
         }
     }
 
-    suppression.fileName = Path::simplifyPath(suppression.fileName);
+    // TODO: make this optional - do we even encounter this in production code?
+    // when parsing string generated internally by toString() there can be newline
+    for (std::size_t i = 1; i < parts.size(); ++i) {
+        if (startsWith(parts[i], "symbol="))
+            suppression.symbolName = parts[i].substr(7);
+        else if (parts[i] == "polyspace=1")
+            suppression.isPolyspace = true;
+        else
+            throw std::runtime_error("unexpected extra '" + parts[i] + "'");
+    }
 
     return suppression;
 }
 
 std::string SuppressionList::addSuppressionLine(const std::string &line)
 {
-    return addSuppression(parseLine(line));
+    try {
+        return addSuppression(parseLine(line));
+    } catch (const std::exception& e) {
+        return e.what();
+    }
 }
 
 std::string SuppressionList::addSuppression(SuppressionList::Suppression suppression)
@@ -302,7 +329,6 @@ std::string SuppressionList::addSuppressions(std::list<Suppression> suppressions
     return "";
 }
 
-// cppcheck-suppress unusedFunction
 bool SuppressionList::updateSuppressionState(const SuppressionList::Suppression& suppression)
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
@@ -311,13 +337,10 @@ bool SuppressionList::updateSuppressionState(const SuppressionList::Suppression&
     auto foundSuppression = std::find_if(mSuppressions.begin(), mSuppressions.end(),
                                          std::bind(&Suppression::isSameParameters, &suppression, std::placeholders::_1));
     if (foundSuppression != mSuppressions.end()) {
-        // Update state of existing global suppression
-        if (!suppression.isLocal()) {
-            if (suppression.checked)
-                foundSuppression->checked = true;
-            if (suppression.matched)
-                foundSuppression->matched = true;
-        }
+        if (suppression.checked)
+            foundSuppression->checked = true;
+        if (suppression.matched)
+            foundSuppression->matched = true;
         return true;
     }
 
@@ -334,15 +357,24 @@ bool SuppressionList::Suppression::parseComment(std::string comment, std::string
     if (comment.size() < 2)
         return false;
 
-    if (comment.find(';') != std::string::npos)
-        comment.erase(comment.find(';'));
-
-    if (comment.find("//", 2) != std::string::npos)
-        comment.erase(comment.find("//",2));
-
     if (comment.compare(comment.size() - 2, 2, "*/") == 0)
         comment.erase(comment.size() - 2, 2);
 
+    std::string::size_type extraPos = comment.find(';');
+    std::string::size_type extraDelimiterSize = 1;
+
+    if (extraPos == std::string::npos) {
+        extraPos = comment.find("//", 2);
+        extraDelimiterSize = 2;
+    }
+
+    if (extraPos != std::string::npos) {
+        extraComment = trim(comment.substr(extraPos + extraDelimiterSize));
+        for (auto it = extraComment.begin(); it != extraComment.end();)
+            it = *it & 0x80 ? extraComment.erase(it) : it + 1;
+        comment.erase(extraPos);
+    }
+
     const std::set<std::string> cppchecksuppress{
         "cppcheck-suppress",
         "cppcheck-suppress-begin",
@@ -387,12 +419,12 @@ SuppressionList::Suppression::Result SuppressionList::Suppression::isSuppressed(
         if (!errorId.empty() && !matchglob(errorId, errmsg.errorId))
             return Result::Checked;
     } else {
-        if (!fileName.empty() && !matchglob(fileName, errmsg.getFileName()))
-            return Result::None;
         if ((SuppressionList::Type::unique == type) && (lineNumber != NO_LINE) && (lineNumber != errmsg.lineNumber)) {
             if (!thisAndNextLine || lineNumber + 1 != errmsg.lineNumber)
                 return Result::None;
         }
+        if (!fileName.empty() && !PathMatch::match(fileName, errmsg.getFileName()))
+            return Result::None;
         if (hash > 0 && hash != errmsg.hash)
             return Result::Checked;
         // the empty check is a hack to allow wildcard suppressions on IDs to be marked as checked
@@ -440,29 +472,11 @@ bool SuppressionList::Suppression::isMatch(const SuppressionList::ErrorMessage &
     cppcheck::unreachable();
 }
 
-// cppcheck-suppress unusedFunction - used by GUI only
-std::string SuppressionList::Suppression::getText() const
-{
-    std::string ret;
-    if (!errorId.empty())
-        ret = errorId;
-    if (!fileName.empty())
-        ret += " fileName=" + fileName;
-    if (lineNumber != NO_LINE)
-        ret += " lineNumber=" + std::to_string(lineNumber);
-    if (!symbolName.empty())
-        ret += " symbolName=" + symbolName;
-    if (hash > 0)
-        ret += " hash=" + std::to_string(hash);
-    if (startsWith(ret," "))
-        return ret.substr(1);
-    return ret;
-}
-
 bool SuppressionList::isSuppressed(const SuppressionList::ErrorMessage &errmsg, bool global)
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
+    // TODO: handle unmatchedPolyspaceSuppression?
     const bool unmatchedSuppression(errmsg.errorId == "unmatchedSuppression");
     bool returnValue = false;
     for (Suppression &s : mSuppressions) {
@@ -502,12 +516,14 @@ bool SuppressionList::isSuppressed(const ::ErrorMessage &errmsg, const std::set<
     return isSuppressed(SuppressionList::ErrorMessage::fromErrorMessage(errmsg, macroNames));
 }
 
-void SuppressionList::dump(std::ostream & out) const
+void SuppressionList::dump(std::ostream & out, const std::string& filePath) const
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
     out << "  <suppressions>" << std::endl;
     for (const Suppression &suppression : mSuppressions) {
+        if (suppression.isInline && !suppression.fileName.empty() && !filePath.empty() && filePath != suppression.fileName)
+            continue;
         out << "    <suppression";
         out << " errorId=\"" << ErrorLogger::toxml(suppression.errorId) << '"';
         if (!suppression.fileName.empty())
@@ -532,12 +548,18 @@ void SuppressionList::dump(std::ostream & out) const
             out << " type=\"blockEnd\"";
         else if (suppression.type == SuppressionList::Type::macro)
             out << " type=\"macro\"";
+        if (suppression.isInline)
+            out << " inline=\"true\"";
+        else
+            out << " inline=\"false\"";
+        if (!suppression.extraComment.empty())
+            out << " comment=\"" << ErrorLogger::toxml(suppression.extraComment) << "\"";
         out << " />" << std::endl;
     }
     out << "  </suppressions>" << std::endl;
 }
 
-std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedLocalSuppressions(const FileWithDetails &file, const bool includeUnusedFunction) const
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedLocalSuppressions(const FileWithDetails &file) const
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
@@ -555,16 +577,14 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedLocalSuppre
             continue;
         if (s.errorId == ID_CHECKERSREPORT)
             continue;
-        if (!includeUnusedFunction && s.errorId == ID_UNUSEDFUNCTION)
-            continue;
-        if (!s.isLocal() || s.fileName != file.spath())
+        if (!s.isLocal() || !PathMatch::match(s.fileName, file.spath()))
             continue;
         result.push_back(s);
     }
     return result;
 }
 
-std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppressions(const bool includeUnusedFunction) const
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppressions() const
 {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
@@ -578,8 +598,6 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppr
             continue;
         if (s.hash > 0)
             continue;
-        if (!includeUnusedFunction && s.errorId == ID_UNUSEDFUNCTION)
-            continue;
         if (s.errorId == ID_CHECKERSREPORT)
             continue;
         if (s.isLocal())
@@ -589,7 +607,7 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppr
     return result;
 }
 
-std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppressions(const bool includeUnusedFunction) const
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppressions() const
 {
     std::list<SuppressionList::Suppression> result;
     for (const SuppressionList::Suppression &s : SuppressionList::mSuppressions) {
@@ -602,8 +620,6 @@ std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppr
             continue;
         if (s.hash > 0)
             continue;
-        if (!includeUnusedFunction && s.errorId == ID_UNUSEDFUNCTION)
-            continue;
         result.push_back(s);
     }
     return result;
@@ -616,25 +632,25 @@ std::list<SuppressionList::Suppression> SuppressionList::getSuppressions() const
     return mSuppressions;
 }
 
-void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer) {
+void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const TokenList &tokenlist) {
     std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
     int currLineNr = -1;
     int currFileIdx = -1;
-    for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
+    for (const Token *tok = tokenlist.front(); tok; tok = tok->next()) {
         if (currFileIdx != tok->fileIndex() || currLineNr != tok->linenr()) {
             currLineNr = tok->linenr();
             currFileIdx = tok->fileIndex();
             for (auto &suppression : mSuppressions) {
                 if (suppression.type == SuppressionList::Type::unique) {
-                    if (!suppression.checked && (suppression.lineNumber == currLineNr) && (suppression.fileName == tokenizer.list.file(tok))) {
+                    if (!suppression.checked && (suppression.lineNumber == currLineNr) && (suppression.fileName == tokenlist.file(tok))) {
                         suppression.checked = true;
                     }
                 } else if (suppression.type == SuppressionList::Type::block) {
-                    if ((!suppression.checked && (suppression.lineBegin <= currLineNr) && (suppression.lineEnd >= currLineNr) && (suppression.fileName == tokenizer.list.file(tok)))) {
+                    if ((!suppression.checked && (suppression.lineBegin <= currLineNr) && (suppression.lineEnd >= currLineNr) && (suppression.fileName == tokenlist.file(tok)))) {
                         suppression.checked = true;
                     }
-                } else if (!suppression.checked && suppression.fileName == tokenizer.list.file(tok)) {
+                } else if (!suppression.checked && suppression.fileName == tokenlist.file(tok)) {
                     suppression.checked = true;
                 }
             }
@@ -642,43 +658,10 @@ void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &
     }
 }
 
-bool SuppressionList::reportUnmatchedSuppressions(const std::list<SuppressionList::Suppression> &unmatched, ErrorLogger &errorLogger)
-{
-    bool err = false;
-    // Report unmatched suppressions
-    for (const SuppressionList::Suppression &s : unmatched) {
-        // don't report "unmatchedSuppression" as unmatched
-        if (s.errorId == "unmatchedSuppression")
-            continue;
-
-        // check if this unmatched suppression is suppressed
-        bool suppressed = false;
-        for (const SuppressionList::Suppression &s2 : unmatched) {
-            if (s2.errorId == "unmatchedSuppression") {
-                if ((s2.fileName.empty() || s2.fileName == "*" || s2.fileName == s.fileName) &&
-                    (s2.lineNumber == SuppressionList::Suppression::NO_LINE || s2.lineNumber == s.lineNumber)) {
-                    suppressed = true;
-                    break;
-                }
-            }
-        }
-
-        if (suppressed)
-            continue;
-
-        std::list<::ErrorMessage::FileLocation> callStack;
-        if (!s.fileName.empty())
-            callStack.emplace_back(s.fileName, s.lineNumber, 0);
-        errorLogger.reportErr(::ErrorMessage(std::move(callStack), "", Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
-        err = true;
-    }
-    return err;
-}
-
 std::string SuppressionList::Suppression::toString() const
 {
     std::string s;
-    s+= errorId;
+    s += errorId;
     if (!fileName.empty()) {
         s += ':';
         s += fileName;
@@ -687,9 +670,250 @@ std::string SuppressionList::Suppression::toString() const
             s += std::to_string(lineNumber);
         }
     }
-    if (!symbolName.empty()) {
-        s += ':';
-        s += symbolName;
-    }
+    if (!symbolName.empty())
+        s += "\nsymbol=" + symbolName;
+    if (isPolyspace)
+        s += "\npolyspace=1";
     return s;
 }
+
+polyspace::Parser::Parser(const Settings &settings)
+{
+    const bool haveMisraAddon = std::any_of(settings.addonInfos.cbegin(),
+                                            settings.addonInfos.cend(),
+                                            [] (const AddonInfo &info) {
+        return info.name == "misra";
+    });
+
+    if (haveMisraAddon) {
+        mFamilyMap["MISRA-C3"] = "misra-c2012-";
+        mFamilyMap["MISRA2012"] = "misra-c2012-";
+    }
+
+    const auto matchArg = [&](const std::string &arg) {
+        const std::string args = settings.premiumArgs;
+        const std::string::size_type pos = args.find(arg);
+
+        if (pos == std::string::npos)
+            return false;
+
+        const char prevChar = (pos > 0) ? args[pos - 1] : ' ';
+        const char nextChar = (pos + arg.size() < args.size()) ? args[pos + arg.size()] : ' ';
+
+        return prevChar == ' ' && (nextChar == ' ' || nextChar == ':');
+    };
+
+    if (matchArg("--misra-c-2012")) {
+        mFamilyMap["MISRA-C3"] = "premium-misra-c-2012-";
+        mFamilyMap["MISRA2012"] = "premium-misra-c-2012-";
+    }
+
+    if (matchArg("--misra-c-2023"))
+        mFamilyMap["MISRA-C-2023"] = "premium-misra-c-2023-";
+
+    if (matchArg("--misra-cpp-2008") || matchArg("--misra-c++-2008"))
+        mFamilyMap["MISRA-CPP"] = "premium-misra-cpp-2008-";
+
+    if (matchArg("--misra-cpp-2023") || matchArg("--misra-c++-2023"))
+        mFamilyMap["MISRA-CPP-2023"] = "premium-misra-cpp-2023-";
+
+    if (matchArg("--cert-c") || matchArg("--cert-c-2016"))
+        mFamilyMap["CERT-C"] = "premium-cert-c-";
+
+    if (matchArg("--cert-cpp") || matchArg("--cert-c++") ||
+        matchArg("--cert-cpp-2016") || matchArg("--cert-c++-2016"))
+        mFamilyMap["CERT-CPP"] = "premium-cert-cpp-";
+
+    if (matchArg("--autosar"))
+        mFamilyMap["AUTOSAR-CPP14"] = "premium-autosar-";
+}
+
+polyspace::CommentKind polyspace::Parser::parseKind(const std::string& comment, std::string::size_type& pos)
+{
+    const std::string::size_type pos1 = pos;
+    pos = comment.find_first_of(" \t", pos);
+    if (pos >= comment.size())
+        return CommentKind::Invalid;
+
+    const std::string token = comment.substr(pos1, pos-pos1);
+
+    if (token == "polyspace")
+        return CommentKind::Regular;
+
+    if (token == "polyspace-begin")
+        return CommentKind::Begin;
+
+    if (token == "polyspace-end")
+        return CommentKind::End;
+
+    return CommentKind::Invalid;
+}
+
+
+std::list<SuppressionList::Suppression> polyspace::Parser::parse(const std::string &comment, int line, const std::string &filename) const
+{
+    // Syntax for a polyspace suppression:
+    // https://se.mathworks.com/help/bugfinder/ug/annotate-hide-known-acceptable-polyspace-results-web-browser.html
+
+    std::list<SuppressionList::Suppression> ret;
+
+    if (mFamilyMap.empty())
+        return ret;
+
+    for (std::string::size_type pos = comment.find_first_not_of("/* "); pos < comment.size();) {
+        // polyspace
+        const auto polyspaceKind = parseKind(comment, pos);
+        if (polyspaceKind == CommentKind::Invalid)
+            break;
+
+        // optional range
+        const int rangeValue = parseRange(comment, pos);
+
+        // ids..
+        const std::set<std::string> ids = parseIds(comment, pos);
+
+        // skip justification
+        if (pos < comment.size() && comment[pos] == '[') {
+            pos = comment.find(']',pos+1);
+            if (pos >= comment.size())
+                break;
+            pos = comment.find_first_not_of(" \t", pos+1);
+            if (pos >= comment.size())
+                break;
+        }
+
+        // extra comment
+        std::string extraComment;
+        if (pos < comment.size() && comment[pos] == '\"') {
+            const std::string::size_type p1 = pos + 1;
+            pos = comment.find('\"',p1);
+            if (pos >= comment.size())
+                break;
+            extraComment = comment.substr(p1, pos-p1);
+        }
+
+        for (const std::string& errorId: ids) {
+            SuppressionList::Suppression suppr;
+            suppr.errorId = errorId;
+            suppr.isInline = true;
+            suppr.isPolyspace = true;
+            suppr.fileName = filename;
+            suppr.lineNumber = line;
+            suppr.extraComment = extraComment;
+
+            if (rangeValue > 0) {
+                suppr.type = SuppressionList::Type::block;
+                suppr.lineBegin = line;
+                suppr.lineEnd = line + rangeValue;
+            }
+            else if (polyspaceKind == polyspace::CommentKind::Regular)
+                suppr.type = SuppressionList::Type::unique;
+            else if (polyspaceKind == polyspace::CommentKind::Begin)
+                suppr.type = SuppressionList::Type::blockBegin;
+            else
+                suppr.type = SuppressionList::Type::blockEnd;
+
+            ret.emplace_back(suppr);
+        }
+
+        // proceed to next "polyspace" if it exists
+        if (pos < comment.size())
+            pos = comment.find("polyspace", pos);
+    }
+
+    return ret;
+}
+
+
+int polyspace::Parser::parseRange(const std::string& comment, std::string::size_type& pos) {
+    pos = comment.find_first_not_of(" \t", pos);
+    if (pos >= comment.size())
+        return 0;
+    if (comment[pos] != '+')
+        return 0;
+    const std::string::size_type startpos = pos + 1;
+    std::string::size_type endpos = comment.find_first_of(" \t", startpos);
+    if (endpos > comment.size())
+        return 0;
+    const std::string range = comment.substr(startpos, endpos-startpos);
+    try {
+        int ret = std::stoi(range);
+        pos = endpos;
+        return ret;
+    } catch (const std::invalid_argument &) {}
+    return 0;
+}
+
+std::vector<std::pair<std::string, std::string>> polyspace::Parser::parseFamilyRules(const std::string& comment, std::string::size_type& pos) {
+    std::vector<std::pair<std::string, std::string>> fr;
+    std::string family;
+    std::string rule;
+    enum class State: uint8_t { family, colon, rule, rule_or_family } state = State::family;
+    const std::string::size_type endpos = startsWith(comment, "/*") ? comment.size() - 2 : comment.size();
+    for (; pos <= endpos; ++pos) {
+        const char c = comment[pos];
+        if (std::strchr("[\"", c))
+            break;
+        switch (state) {
+        case State::family:
+            if (std::isalnum(c) || std::strchr("-_.",c))
+                family += c;
+            else if (!family.empty() && std::strchr(" \t:",c))
+                state = State::colon;
+            break;
+        case State::colon:
+            if (!std::strchr(" \t:", c)) {
+                rule.clear();
+                --pos;
+                state = State::rule;
+            }
+            break;
+        case State::rule:
+            if (std::strchr(", \t",c)) {
+                if (!rule.empty()) {
+                    fr.emplace_back(family,rule);
+                    rule.clear();
+                    if (c != ',')
+                        state = State::rule_or_family;
+                }
+            }
+            else
+                rule += c;
+            break;
+        case State::rule_or_family:
+            rule.clear();
+            if (std::isalnum(c)) {
+                --pos;
+                family.clear();
+                state = State::family;
+            } else if (c == ',') {
+                --pos;
+                state = State::rule;
+            }
+            break;
+        }
+    }
+    if (!family.empty() && !rule.empty())
+        fr.emplace_back(family,rule);
+    return fr;
+}
+
+std::set<std::string> polyspace::Parser::parseIds(const std::string& comment, std::string::size_type& pos) const {
+    std::set<std::string> ids;
+    for (const auto& fr: parseFamilyRules(comment,pos)) {
+        const auto it = mFamilyMap.find(fr.first);
+        if (it != mFamilyMap.cend())
+            ids.emplace(it->second + fr.second);
+    }
+    return ids;
+}
+
+
+bool polyspace::isPolyspaceComment(const std::string &comment)
+{
+    const std::string polyspace = "polyspace";
+    const std::string::size_type pos = comment.find_first_not_of("/* ");
+    if (pos == std::string::npos)
+        return false;
+    return comment.compare(pos, polyspace.size(), polyspace, 0, polyspace.size()) == 0;
+}
diff --git a/lib/suppressions.h b/lib/suppressions.h
index 5e4cccb3890..849c972d0a7 100644
--- a/lib/suppressions.h
+++ b/lib/suppressions.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,12 +31,13 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <map>
 
-class Tokenizer;
+class TokenList;
 class ErrorMessage;
-class ErrorLogger;
 enum class Certainty : std::uint8_t;
 class FileWithDetails;
+class Settings;
 
 /// @addtogroup Core
 /// @{
@@ -56,7 +57,7 @@ class CPPCHECKLIB SuppressionList {
         const std::string &getFileName() const {
             return mFileName;
         }
-        int lineNumber;
+        int lineNumber; // TODO: need to be unsigned
         Certainty certainty;
         std::string symbolNames;
         std::set<std::string> macroNames;
@@ -128,8 +129,6 @@ class CPPCHECKLIB SuppressionList {
 
         bool isMatch(const ErrorMessage &errmsg);
 
-        std::string getText() const;
-
         bool isWildcard() const {
             return fileName.find_first_of("?*") != std::string::npos;
         }
@@ -151,9 +150,13 @@ class CPPCHECKLIB SuppressionList {
 
         std::string errorId;
         std::string fileName;
-        int lineNumber = NO_LINE;
+        std::string extraComment;
+        // TODO: use simplecpp::Location?
+        int fileIndex{};
+        int lineNumber = NO_LINE; // TODO: needs to be unsigned
         int lineBegin = NO_LINE;
         int lineEnd = NO_LINE;
+        int column{};
         Type type = Type::unique;
         std::string symbolName;
         std::string macroName;
@@ -162,6 +165,7 @@ class CPPCHECKLIB SuppressionList {
         bool matched{}; /** This suppression was fully matched in an isSuppressed() call */
         bool checked{}; /** This suppression applied to code which was being analyzed but did not match the error in an isSuppressed() call */
         bool isInline{};
+        bool isPolyspace{};
 
         enum : std::int8_t { NO_LINE = -1 };
     };
@@ -192,8 +196,9 @@ class CPPCHECKLIB SuppressionList {
      * Create a Suppression object from a suppression line
      * @param line The line to parse.
      * @return a suppression object
+     * @throws std::runtime_error thrown if the given suppression is invalid
      */
-    static Suppression parseLine(const std::string &line);
+    static Suppression parseLine(std::string line);
 
     /**
      * @brief Don't show the given error.
@@ -251,25 +256,25 @@ class CPPCHECKLIB SuppressionList {
      * @brief Create an xml dump of suppressions
      * @param out stream to write XML to
      */
-    void dump(std::ostream &out) const;
+    void dump(std::ostream &out, const std::string& filePath = {}) const;
 
     /**
      * @brief Returns list of unmatched local (per-file) suppressions.
      * @return list of unmatched suppressions
      */
-    std::list<Suppression> getUnmatchedLocalSuppressions(const FileWithDetails &file, bool includeUnusedFunction) const;
+    std::list<Suppression> getUnmatchedLocalSuppressions(const FileWithDetails &file) const;
 
     /**
      * @brief Returns list of unmatched global (glob pattern) suppressions.
      * @return list of unmatched suppressions
      */
-    std::list<Suppression> getUnmatchedGlobalSuppressions(bool includeUnusedFunction) const;
+    std::list<Suppression> getUnmatchedGlobalSuppressions() const;
 
     /**
      * @brief Returns list of unmatched inline suppressions.
      * @return list of unmatched suppressions
      */
-    std::list<Suppression> getUnmatchedInlineSuppressions(bool includeUnusedFunction) const;
+    std::list<Suppression> getUnmatchedInlineSuppressions() const;
 
     /**
      * @brief Returns list of all suppressions.
@@ -280,14 +285,7 @@ class CPPCHECKLIB SuppressionList {
     /**
      * @brief Marks Inline Suppressions as checked if source line is in the token stream
      */
-    void markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer);
-
-    /**
-     * Report unmatched suppressions
-     * @param unmatched list of unmatched suppressions (from Settings::Suppressions::getUnmatched(Local|Global)Suppressions)
-     * @return true is returned if errors are reported
-     */
-    static bool reportUnmatchedSuppressions(const std::list<SuppressionList::Suppression> &unmatched, ErrorLogger &errorLogger);
+    void markUnmatchedInlineSuppressionsAsChecked(const TokenList &tokenlist);
 
 private:
     mutable std::mutex mSuppressionsSync;
@@ -303,6 +301,34 @@ struct Suppressions
     SuppressionList nofail;
 };
 
+namespace polyspace {
+
+    enum class CommentKind : std::uint8_t {
+        Invalid, Regular, Begin, End,
+    };
+
+    class CPPCHECKLIB Parser {
+    public:
+        Parser() = delete;
+        explicit Parser(const Settings &settings);
+
+        std::list<SuppressionList::Suppression> parse(const std::string &comment, int line, const std::string &filename) const;
+
+        static int parseRange(const std::string& comment, std::string::size_type& pos);
+        static std::vector<std::pair<std::string, std::string>> parseFamilyRules(const std::string& comment, std::string::size_type& pos);
+
+    private:
+        std::set<std::string> parseIds(const std::string& comment, std::string::size_type& pos) const;
+
+        static CommentKind parseKind(const std::string& comment, std::string::size_type& pos);
+
+        std::map<std::string, std::string> mFamilyMap;
+    };
+
+    bool CPPCHECKLIB isPolyspaceComment(const std::string &comment);
+
+}
+
 /// @}
 //---------------------------------------------------------------------------
 #endif // suppressionsH
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 1c5a6747883..7a0148a24a2 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -40,10 +40,12 @@
 #include <algorithm>
 #include <cassert>
 #include <cstring>
+#include <functional>
 #include <initializer_list>
 #include <iomanip>
 #include <iostream>
 #include <iterator>
+#include <numeric>
 #include <sstream>
 #include <stack>
 #include <string>
@@ -51,10 +53,13 @@
 #include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 //---------------------------------------------------------------------------
 
-SymbolDatabase::SymbolDatabase(Tokenizer& tokenizer, const Settings& settings, ErrorLogger& errorLogger)
-    : mTokenizer(tokenizer), mSettings(settings), mErrorLogger(errorLogger)
+SymbolDatabase::SymbolDatabase(Tokenizer& tokenizer)
+    : mTokenizer(tokenizer)
+    , mSettings(tokenizer.getSettings())
+    , mErrorLogger(tokenizer.getErrorLogger())
 {
     if (!mTokenizer.tokens())
         return;
@@ -133,15 +138,21 @@ const Token* SymbolDatabase::isEnumDefinition(const Token* tok)
     if (tok->str() == "{")
         return tok;
     tok = tok->next(); // skip ':'
-    while (Token::Match(tok, "%name%|::"))
+    bool hasType = false;
+    while (Token::Match(tok, "%name%|::")) {
+        if (tok->isName())
+            hasType = true;
         tok = tok->next();
+    }
+    if (!hasType)
+        throw InternalError(tok, "SymbolDatabase bailout; invalid enum", InternalError::SYNTAX);
     return Token::simpleMatch(tok, "{") ? tok : nullptr;
 }
 
 void SymbolDatabase::createSymbolDatabaseFindAllScopes()
 {
     // create global scope
-    scopeList.emplace_back(this, nullptr, nullptr);
+    scopeList.emplace_back(*this, nullptr, nullptr);
 
     // pointer to current scope
     Scope *scope = &scopeList.back();
@@ -155,6 +166,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
     };
 
     std::stack<const Token*> inIfCondition;
+    std::stack<Scope*> pendingIfScopes;
 
     auto addLambda = [this, &scope](const Token* tok, const Token* lambdaEndToken) -> const Token* {
         const Token* lambdaStartToken = lambdaEndToken->link();
@@ -169,15 +181,38 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
     // Store current access in each scope (depends on evaluation progress)
     std::map<const Scope*, AccessControl> access;
 
-    const bool doProgress = (mSettings.reportProgress != -1);
+    std::map<const Scope *, std::set<std::string>> forwardDecls;
+
+    const std::function<const Scope *(const Token *, const Scope *)> findForwardDeclScope = [&](const Token *tok, const Scope *startScope) {
+        if (tok->str() == "::")
+            return findForwardDeclScope(tok->next(), &scopeList.front());
+
+        if (Token::Match(tok, "%name% :: %name%")) {
+            auto it = std::find_if(startScope->nestedList.cbegin(), startScope->nestedList.cend(), [&](const Scope *scope) {
+                return scope->className == tok->str();
+            });
+
+            if (it == startScope->nestedList.cend())
+                return static_cast<const Scope *>(nullptr);
+
+            return findForwardDeclScope(tok->tokAt(2), *it);
+        }
+
+        auto it = forwardDecls.find(startScope);
+        if (it == forwardDecls.cend())
+            return static_cast<const Scope *>(nullptr);
+
+        return it->second.count(tok->str()) > 0 ? startScope : nullptr;
+    };
+
+    ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, mTokenizer.list.getSourceFilePath(), "SymbolDatabase (find all scopes)");
 
     // find all scopes
     for (const Token *tok = mTokenizer.tokens(); tok; tok = tok ? tok->next() : nullptr) {
         // #5593 suggested to add here:
-        if (doProgress)
-            mErrorLogger.reportProgress(mTokenizer.list.getSourceFilePath(),
-                                        "SymbolDatabase",
-                                        tok->progressValue());
+
+        progressReporter.report(tok->progressValue());
+
         // Locate next class
         if ((tok->isCpp() && tok->isKeyword() &&
              ((Token::Match(tok, "class|struct|union|namespace ::| %name% final| {|:|::|<") &&
@@ -289,7 +324,11 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 scope = new_scope;
                 tok = tok2;
             } else {
-                scopeList.emplace_back(this, tok, scope);
+
+                const Scope *forwardDeclScope = findForwardDeclScope(tok->next(), scope);
+                const Scope *nestedIn = forwardDeclScope ? forwardDeclScope : scope;
+
+                scopeList.emplace_back(*this, tok, nestedIn);
                 new_scope = &scopeList.back();
 
                 if (tok->str() == "class")
@@ -301,7 +340,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 if (new_scope->isClassOrStructOrUnion() || new_scope->type == ScopeType::eEnum) {
                     Type* new_type = findType(name, scope);
                     if (!new_type) {
-                        typeList.emplace_back(new_scope->classDef, new_scope, scope);
+                        typeList.emplace_back(new_scope->classDef, new_scope, nestedIn);
                         new_type = &typeList.back();
                         scope->definedTypesMap[new_type->name()] = new_type;
                     } else
@@ -354,7 +393,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                  Token::Match(tok, "namespace %name% %type% (") &&
                  tok->tokAt(2)->isUpperCaseName() &&
                  Token::simpleMatch(tok->linkAt(3), ") {")) {
-            scopeList.emplace_back(this, tok, scope);
+            scopeList.emplace_back(*this, tok, scope);
 
             Scope *new_scope = &scopeList.back();
             access[new_scope] = AccessControl::Public;
@@ -384,6 +423,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 typeList.emplace_back(tok, nullptr, scope);
                 Type* new_type = &typeList.back();
                 scope->definedTypesMap[new_type->name()] = new_type;
+                forwardDecls[scope].insert(tok->strAt(1));
             }
             tok = tok->tokAt(2);
         }
@@ -430,7 +470,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
         // unnamed struct and union
         else if (tok->isKeyword() && Token::Match(tok, "struct|union {") &&
                  Token::Match(tok->linkAt(1), "} *|&| %name% ;|[|=")) {
-            scopeList.emplace_back(this, tok, scope);
+            scopeList.emplace_back(*this, tok, scope);
 
             Scope *new_scope = &scopeList.back();
             access[new_scope] = AccessControl::Public;
@@ -449,7 +489,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 scope->definedTypesMap[new_type->name()] = new_type;
             }
 
-            scope->addVariable(varNameTok, tok, tok, access[scope], new_scope->definedType, scope, mSettings);
+            scope->addVariable(varNameTok, tok, tok, access[scope], new_scope->definedType, scope);
 
             const Token *tok2 = tok->next();
 
@@ -472,7 +512,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
         else if (tok->isKeyword() && ((Token::Match(tok, "struct|union {") &&
                                        Token::simpleMatch(tok->linkAt(1), "} ;")) ||
                                       Token::simpleMatch(tok, "namespace {"))) {
-            scopeList.emplace_back(this, tok, scope);
+            scopeList.emplace_back(*this, tok, scope);
 
             Scope *new_scope = &scopeList.back();
             access[new_scope] = AccessControl::Public;
@@ -680,7 +720,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 }
                 // function prototype?
                 else if (declEnd && declEnd->str() == ";") {
-                    if (tok->astParent() && tok->astParent()->str() == "::" &&
+                    if ((Token::simpleMatch(tok->tokAt(-1), "::") || (tok->tokAt(-1) && Token::simpleMatch(tok->tokAt(-2), ":: ~"))) &&
                         Token::Match(declEnd->previous(), "default|delete")) {
                         addClassFunction(scope, tok, argStart);
                         continue;
@@ -689,7 +729,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     bool newFunc = true; // Is this function already in the database?
                     auto range = scope->functionMap.equal_range(tok->str());
                     for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
-                        if (it->second->argsMatch(scope, it->second->argDef, argStart, emptyString, 0)) {
+                        if (it->second->argsMatch(scope, it->second->argDef, argStart, "", 0)) {
                             newFunc = false;
                             break;
                         }
@@ -710,11 +750,11 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
             if (tok->isKeyword() && Token::Match(tok, "else|try|do {")) {
                 const Token* tok1 = tok->next();
                 if (tok->str() == "else")
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eElse, tok1);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eElse, tok1);
                 else if (tok->str() == "do")
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eDo, tok1);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eDo, tok1);
                 else //if (tok->str() == "try")
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eTry, tok1);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eTry, tok1);
 
                 tok = tok1;
                 scope->nestedList.push_back(&scopeList.back());
@@ -722,24 +762,25 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
             } else if (tok->isKeyword() && Token::Match(tok, "if|for|while|catch|switch (") && Token::simpleMatch(tok->linkAt(1), ") {")) {
                 const Token *scopeStartTok = tok->linkAt(1)->next();
                 if (tok->str() == "if")
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eIf, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eIf, scopeStartTok);
                 else if (tok->str() == "for") {
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eFor, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eFor, scopeStartTok);
                 } else if (tok->str() == "while")
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eWhile, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eWhile, scopeStartTok);
                 else if (tok->str() == "catch") {
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eCatch, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eCatch, scopeStartTok);
                 } else // if (tok->str() == "switch")
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eSwitch, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eSwitch, scopeStartTok);
 
                 scope->nestedList.push_back(&scopeList.back());
-                scope = &scopeList.back();
-                if (scope->type == ScopeType::eFor)
-                    scope->checkVariable(tok->tokAt(2), AccessControl::Local, mSettings); // check for variable declaration and add it to new scope if found
-                else if (scope->type == ScopeType::eCatch)
-                    scope->checkVariable(tok->tokAt(2), AccessControl::Throw, mSettings); // check for variable declaration and add it to new scope if found
+                Scope* newScope = &scopeList.back();
+                if (newScope->type == ScopeType::eFor)
+                    newScope->checkVariable(tok->tokAt(2), AccessControl::Local); // check for variable declaration and add it to new scope if found
+                else if (newScope->type == ScopeType::eCatch)
+                    newScope->checkVariable(tok->tokAt(2), AccessControl::Throw); // check for variable declaration and add it to new scope if found
                 tok = tok->next();
                 inIfCondition.push(scopeStartTok);
+                pendingIfScopes.push(newScope);
             } else if (Token::Match(tok, "%var% {")) {
                 endInitList.emplace(tok->linkAt(1), scope);
                 tok = tok->next();
@@ -750,8 +791,10 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     endInitList.emplace(tok->link(), scope);
                 } else if (!inIfCondition.empty() && tok == inIfCondition.top()) {
                     inIfCondition.pop();
+                    scope = pendingIfScopes.top();
+                    pendingIfScopes.pop();
                 } else if (isExecutableScope(tok)) {
-                    scopeList.emplace_back(this, tok, scope, ScopeType::eUnconditional, tok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eUnconditional, tok);
                     scope->nestedList.push_back(&scopeList.back());
                     scope = &scopeList.back();
                 } else {
@@ -773,7 +816,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                             bool newFunc = true; // Is this function already in the database?
                             auto range = scope->functionMap.equal_range(ftok->str());
                             for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
-                                if (it->second->argsMatch(scope, it->second->argDef, argStart, emptyString, 0)) {
+                                if (it->second->argsMatch(scope, it->second->argDef, argStart, "", 0)) {
                                     newFunc = false;
                                     break;
                                 }
@@ -849,14 +892,14 @@ void SymbolDatabase::createSymbolDatabaseVariableInfo()
     // fill in variable info
     for (Scope& scope : scopeList) {
         // find variables
-        scope.getVariableList(mSettings);
+        scope.getVariableList();
     }
 
     // fill in function arguments
     for (Scope& scope : scopeList) {
         for (auto func = scope.functionList.begin(); func != scope.functionList.end(); ++func) {
             // add arguments
-            func->addArguments(this, &scope);
+            func->addArguments(&scope);
         }
     }
 }
@@ -989,7 +1032,7 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                             if (var.isClass() && !var.isReference()) {
                                 if (var.type()) {
                                     // does this type need initialization?
-                                    if (var.type()->needInitialization == Type::NeedInitialization::True && !var.hasDefault() && !var.isStatic())
+                                    if (var.type()->needInitialization == Type::NeedInitialization::True && !var.hasDefault())
                                         needInitialization = true;
                                     else if (var.type()->needInitialization == Type::NeedInitialization::Unknown) {
                                         if (!(var.valueType() && var.valueType()->type == ValueType::CONTAINER))
@@ -1006,10 +1049,8 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                             scope.definedType->needInitialization = Type::NeedInitialization::True;
                         else if (!unknown)
                             scope.definedType->needInitialization = Type::NeedInitialization::False;
-                        else {
-                            if (scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
-                                unknowns++;
-                        }
+                        else
+                            unknowns++;
                     }
                 } else if (scope.type == ScopeType::eUnion && scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
                     scope.definedType->needInitialization = Type::NeedInitialization::True;
@@ -1156,7 +1197,7 @@ void SymbolDatabase::createSymbolDatabaseSetFunctionPointers(bool firstPass)
             inTemplateArg = tok->link();
         if (inTemplateArg == tok)
             inTemplateArg = nullptr;
-        if (tok->isName() && !tok->function() && tok->varId() == 0 && ((tok->astParent() && tok->astParent()->isComparisonOp()) || Token::Match(tok, "%name% [{(,)>;:]]")) && !isReservedName(tok)) {
+        if (tok->isName() && !tok->function() && tok->varId() == 0 && ((tok->astParent() && tok->astParent()->isComparisonOp()) || Token::Match(tok, "%name% [{}(,)>;:]]")) && !isReservedName(tok)) {
             if (tok->strAt(1) == ">" && !tok->linkAt(1))
                 continue;
 
@@ -1166,7 +1207,7 @@ void SymbolDatabase::createSymbolDatabaseSetFunctionPointers(bool firstPass)
 
             tok->function(function);
 
-            if (tok->strAt(1) != "(")
+            if (!function->isConstructor() && tok->strAt(1) != "(")
                 const_cast<Function *>(function)->functionPointerUsage = tok;
         }
     }
@@ -1209,6 +1250,7 @@ void SymbolDatabase::createSymbolDatabaseSetTypePointers()
 {
     std::unordered_set<std::string> typenames;
     for (const Type &t : typeList) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
         typenames.insert(t.name());
     }
 
@@ -1455,7 +1497,7 @@ void SymbolDatabase::createSymbolDatabaseEnums()
 
 void SymbolDatabase::createSymbolDatabaseIncompleteVars()
 {
-    for (Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
+    for (Token* tok = mTokenizer.list.front(); precedes(tok, mTokenizer.list.back()); tok = tok->next()) {
         const Scope * scope = tok->scope();
         if (!scope)
             continue;
@@ -1474,7 +1516,10 @@ void SymbolDatabase::createSymbolDatabaseIncompleteVars()
                 continue;
             }
             if (tok->str() == "using") {
-                tok = Token::findsimplematch(tok, ";");
+                Token* usingEnd = Token::findsimplematch(tok, ";");
+                if (!usingEnd)
+                    mTokenizer.syntaxError(tok);
+                tok = usingEnd;
                 continue;
             }
         }
@@ -1488,6 +1533,8 @@ void SymbolDatabase::createSymbolDatabaseIncompleteVars()
             continue;
         if (Token::Match(tok->next(), "&|&&|* *| *| )|,|%var%|const"))
             continue;
+        if (Token::Match(tok->previous(), "%str%"))
+            continue;
         // Very likely a typelist
         if (Token::Match(tok->tokAt(-2), "%type% ,") || Token::Match(tok->next(), ", %type%"))
             continue;
@@ -1523,6 +1570,7 @@ void SymbolDatabase::createSymbolDatabaseIncompleteVars()
     }
 }
 
+// cppcheck-suppress functionConst - has side effects
 void SymbolDatabase::createSymbolDatabaseEscapeFunctions()
 {
     for (const Scope& scope : scopeList) {
@@ -1568,6 +1616,26 @@ static std::string getIncompleteNameID(const Token* tok)
 }
 
 namespace {
+    int getExprIdForOperand(const Token* tok) {
+        if (!tok)
+            return 0;
+
+        int otherExprId = 0;
+
+        // Look through all referenced tokens.
+        // If two exprIds are found and one matches tok->exprId(), return the other.
+        // Otherwise, default to returning tok->exprId().
+        for (const auto& ref: followAllReferences(tok)) {
+            const int refExprId = ref.token->exprId();
+            if (refExprId != 0 && refExprId != tok->exprId()) {
+                if (otherExprId != 0 && otherExprId != refExprId)
+                    return tok->exprId();
+                otherExprId = refExprId;
+            }
+        }
+        return otherExprId != 0 ? otherExprId : tok->exprId();
+    }
+
     struct ExprIdKey {
         std::string parentOp;
         nonneg int operand1;
@@ -1602,8 +1670,8 @@ namespace {
 
             ExprIdKey key;
             key.parentOp = tok->astParent()->str();
-            key.operand1 = op1 ? op1->exprId() : 0;
-            key.operand2 = op2 ? op2->exprId() : 0;
+            key.operand1 = getExprIdForOperand(op1);
+            key.operand2 = getExprIdForOperand(op2);
 
             if (tok->astParent()->isCast() && tok->astParent()->str() == "(") {
                 const Token* typeStartToken;
@@ -1622,19 +1690,6 @@ namespace {
                 key.parentOp += type;
             }
 
-            for (const auto& ref: followAllReferences(op1)) {
-                if (ref.token->exprId() != 0) { // cppcheck-suppress useStlAlgorithm
-                    key.operand1 = ref.token->exprId();
-                    break;
-                }
-            }
-            for (const auto& ref: followAllReferences(op2)) {
-                if (ref.token->exprId() != 0) { // cppcheck-suppress useStlAlgorithm
-                    key.operand2 = ref.token->exprId();
-                    break;
-                }
-            }
-
             if (key.operand1 > key.operand2 && key.operand2 &&
                 Token::Match(tok->astParent(), "%or%|%oror%|+|*|&|&&|^|==|!=")) {
                 // In C++ the order of operands of + might matter
@@ -1875,7 +1930,10 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
                 }
 
                 if (bits > 0 && bits <= 62) {
-                    if (dimension.tok->valueType()->sign == ValueType::Sign::UNSIGNED)
+                    auto sign = dimension.tok->valueType()->sign;
+                    if (sign == ValueType::Sign::UNKNOWN_SIGN && dimension.tok->valueType()->type == ValueType::Type::CHAR)
+                        sign = mDefaultSignedness;
+                    if (sign == ValueType::Sign::UNSIGNED)
                         dimension.num = 1LL << bits;
                     else
                         dimension.num = 1LL << (bits - 1);
@@ -1906,7 +1964,7 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
     // function returning function pointer? '... ( ... %name% ( ... ))( ... ) {'
     // function returning reference to array '... ( & %name% ( ... ))[ ... ] {'
     // TODO: Activate this again
-    if ((false) && tok->str() == "(" && tok->strAt(1) != "*" && // NOLINT(readability-simplify-boolean-expr)
+    if ((false) && tok->str() == "(" && tok->strAt(1) != "*" && // NOLINT(readability-simplify-boolean-expr,readability-redundant-parentheses)
         (tok->link()->strAt(-1) == ")" || Token::simpleMatch(tok->link()->tokAt(-2), ") const"))) {
         const Token* tok2 = tok->link()->next();
         if (tok2 && tok2->str() == "(" && Token::Match(tok2->link()->next(), "{|;|const|=")) {
@@ -2120,7 +2178,7 @@ namespace {
     {
         if (const Scope* scope = var->nameToken()->scope()) {
             auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [&](const Function& function) {
-                for (nonneg int arg = 0; arg < function.argCount(); ++arg) {
+                for (size_t arg = 0; arg < function.argCount(); ++arg) {
                     if (var == function.getArgumentVar(arg))
                         return true;
                 }
@@ -2148,6 +2206,174 @@ void SymbolDatabase::validateVariables() const
     }
 }
 
+bool SymbolDatabase::isVariableWithoutSideEffects(const Variable& var, const Type* type) const
+{
+    const Type* variableType = var.type();
+    if (variableType && variableType != type) {
+        if (!isRecordTypeWithoutSideEffects(variableType))
+            return false;
+    }
+    else {
+        if (!var.valueType())
+            return false;
+        const ValueType::Type valueType = var.valueType()->type;
+        if ((valueType == ValueType::Type::UNKNOWN_TYPE) || (valueType == ValueType::Type::NONSTD))
+            return false;
+    }
+
+    return true;
+}
+
+bool SymbolDatabase::isFunctionWithoutSideEffects(const Function& func, const Token* functionUsageToken, std::list<const Function*> checkedFuncs) const
+{
+    // no body to analyze
+    if (!func.hasBody()) {
+        return false;
+    }
+
+    for (const Token* argsToken = functionUsageToken->next(); !Token::simpleMatch(argsToken, ")"); argsToken = argsToken->next()) {
+        const Variable* argVar = argsToken->variable();
+        if (argVar && argVar->isGlobal()) {
+            return false; // TODO: analyze global variable usage
+        }
+    }
+
+    bool sideEffectReturnFound = false;
+    std::set<const Variable*> pointersToGlobals;
+    for (const Token* bodyToken = func.functionScope->bodyStart->next(); bodyToken != func.functionScope->bodyEnd;
+         bodyToken = bodyToken->next()) {
+        // check variable inside function body
+        const Variable* bodyVariable = bodyToken->variable();
+        if (bodyVariable) {
+            if (!isVariableWithoutSideEffects(*bodyVariable)) {
+                return false;
+            }
+            // check if global variable is changed
+            if (bodyVariable->isGlobal() || (pointersToGlobals.find(bodyVariable) != pointersToGlobals.end())) {
+                const int indirect = bodyVariable->isArray() ? bodyVariable->dimensions().size() : bodyVariable->isPointer();
+                if (isVariableChanged(bodyToken, indirect, mSettings)) {
+                    return false;
+                }
+                // check if pointer to global variable assigned to another variable (another_var = &global_var)
+                if (Token::simpleMatch(bodyToken->tokAt(-1), "&") && Token::simpleMatch(bodyToken->tokAt(-2), "=")) {
+                    const Token* assigned_var_token = bodyToken->tokAt(-3);
+                    if (assigned_var_token && assigned_var_token->variable()) {
+                        pointersToGlobals.insert(assigned_var_token->variable());
+                    }
+                }
+            }
+        }
+
+        // check nested function
+        const Function* bodyFunction = bodyToken->function();
+        if (bodyFunction) {
+            if (std::find(checkedFuncs.cbegin(), checkedFuncs.cend(), bodyFunction) != checkedFuncs.cend()) { // recursion found
+                continue;
+            }
+            checkedFuncs.push_back(bodyFunction);
+            if (!isFunctionWithoutSideEffects(*bodyFunction, bodyToken, checkedFuncs)) {
+                return false;
+            }
+        }
+
+        // check returned value
+        if (Token::simpleMatch(bodyToken, "return")) {
+            const Token* returnValueToken = bodyToken->next();
+            // TODO: handle complex return expressions
+            if (!Token::simpleMatch(returnValueToken->next(), ";")) {
+                sideEffectReturnFound = true;
+                continue;
+            }
+            // simple one-token return
+            const Variable* returnVariable = returnValueToken->variable();
+            if (returnValueToken->isLiteral() ||
+                (returnVariable && isVariableWithoutSideEffects(*returnVariable))) {
+                continue;
+            }
+            sideEffectReturnFound = true;
+        }
+
+        // unknown name
+        if (bodyToken->isNameOnly()) {
+            return false;
+        }
+    }
+
+    return !sideEffectReturnFound;
+}
+
+bool SymbolDatabase::isRecordTypeWithoutSideEffects(const Type* type) const
+{
+    const std::pair<std::map<const Type*, bool>::iterator, bool> found = mIsRecordTypeWithoutSideEffectsMap.insert(
+        std::pair<const Type*, bool>(type, false));         //Initialize with side effects for possible recursions
+    bool& withoutSideEffects = found.first->second;
+    if (!found.second)
+        return withoutSideEffects;
+
+    // unknown types are assumed to have side effects
+    if (!type || !type->classScope)
+        return (withoutSideEffects = false);
+
+    // Non-empty constructors => possible side effects
+    for (const Function& f : type->classScope->functionList) {
+        if (!f.isConstructor() && !f.isDestructor())
+            continue;
+        if (f.argDef && Token::simpleMatch(f.argDef->link(), ") ="))
+            continue; // ignore default/deleted constructors
+        const bool emptyBody = (f.functionScope && Token::simpleMatch(f.functionScope->bodyStart, "{ }"));
+
+        const Token* nextToken = f.argDef ? f.argDef->link() : nullptr;
+        if (Token::simpleMatch(nextToken, ") :")) {
+            // validating initialization list
+            nextToken = nextToken->next(); // goto ":"
+
+            for (const Token* initListToken = nextToken; Token::Match(initListToken, "[:,] %var% [({]"); initListToken = initListToken->linkAt(2)->next()) {
+                const Token* varToken = initListToken->next();
+                const Variable* variable = varToken->variable();
+                if (variable && !isVariableWithoutSideEffects(*variable)) {
+                    return withoutSideEffects = false;
+                }
+
+                const Token* valueEnd = initListToken->linkAt(2);
+                for (const Token* valueToken = initListToken->tokAt(3); valueToken != valueEnd; valueToken = valueToken->next()) {
+                    const Variable* initValueVar = valueToken->variable();
+                    if (initValueVar && !isVariableWithoutSideEffects(*initValueVar)) {
+                        return withoutSideEffects = false;
+                    }
+                    if ((valueToken->tokType() == Token::Type::eName) ||
+                        (valueToken->tokType() == Token::Type::eLambda) ||
+                        (valueToken->tokType() == Token::Type::eOther)) {
+                        return withoutSideEffects = false;
+                    }
+                    const Function* initValueFunc = valueToken->function();
+                    if (initValueFunc && !isFunctionWithoutSideEffects(*initValueFunc, valueToken,
+                                                                       std::list<const Function*> {})) {
+                        return withoutSideEffects = false;
+                    }
+                }
+            }
+        }
+
+        if (!emptyBody)
+            return (withoutSideEffects = false);
+    }
+
+    // Derived from type that has side effects?
+    if (std::any_of(type->derivedFrom.cbegin(), type->derivedFrom.cend(), [this](const Type::BaseInfo& derivedFrom) {
+        return !isRecordTypeWithoutSideEffects(derivedFrom.type);
+    }))
+        return (withoutSideEffects = false);
+
+    // Is there a member variable with possible side effects
+    for (const Variable& var : type->classScope->varlist) {
+        withoutSideEffects = isVariableWithoutSideEffects(var, type);
+        if (!withoutSideEffects) {
+            return withoutSideEffects;
+        }
+    }
+    return (withoutSideEffects = true);
+}
+
 void SymbolDatabase::validate() const
 {
     if (mSettings.debugwarnings) {
@@ -2156,9 +2382,9 @@ void SymbolDatabase::validate() const
     validateVariables();
 }
 
-void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &variableList)
+void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &vars)
 {
-    mVariableList = variableList;
+    mVariableList = vars;
 }
 
 void SymbolDatabase::debugSymbolDatabase() const
@@ -2181,7 +2407,7 @@ void SymbolDatabase::debugSymbolDatabase() const
             }
             errorPath.emplace_back(tok, "");
             mErrorLogger.reportErr(
-                {errorPath, &mTokenizer.list, Severity::debug, "valueType", msg, CWE{0}, Certainty::normal});
+                {std::move(errorPath), &mTokenizer.list, Severity::debug, "valueType", msg, CWE{0}, Certainty::normal});
         }
     }
 }
@@ -2264,7 +2490,7 @@ Variable& Variable::operator=(const Variable &var) &
     if (this == &var)
         return *this;
 
-    ValueType* vt = nullptr;
+    const ValueType* vt = nullptr;
     if (var.mValueType)
         vt = new ValueType(*var.mValueType);
 
@@ -2289,7 +2515,12 @@ bool Variable::isMember() const {
 
 bool Variable::isPointerArray() const
 {
-    return isArray() && nameToken() && nameToken()->previous() && (nameToken()->strAt(-1) == "*");
+    if (!isArray())
+        return false;
+    const Token* tok = nameToken() ? nameToken()->previous() : nullptr;
+    while (Token::Match(tok, "const|volatile"))
+        tok = tok->previous();
+    return Token::simpleMatch(tok, "*");
 }
 
 bool Variable::isUnsigned() const
@@ -2325,8 +2556,11 @@ void Variable::evaluate(const Settings& settings)
     const Library & lib = settings.library;
 
     bool isContainer = false;
-    if (mNameToken)
+    if (mNameToken) {
         setFlag(fIsArray, arrayDimensions(settings, isContainer));
+        setFlag(fIsMaybeUnused, mNameToken->isAttributeMaybeUnused());
+    }
+
 
     if (mTypeStartToken)
         setValueType(ValueType::parseDecl(mTypeStartToken,settings));
@@ -2363,10 +2597,6 @@ void Variable::evaluate(const Settings& settings)
             setFlag(fIsReference, true); // Set also fIsReference
         }
 
-        if (tok->isAttributeMaybeUnused()) {
-            setFlag(fIsMaybeUnused, true);
-        }
-
         if (tok->str() == "<" && tok->link())
             tok = tok->link();
         else
@@ -2423,16 +2653,16 @@ void Variable::evaluate(const Settings& settings)
     }
 }
 
-void Variable::setValueType(const ValueType &valueType)
+void Variable::setValueType(const ValueType &vt)
 {
-    if (valueType.type == ValueType::Type::UNKNOWN_TYPE) {
+    if (vt.type == ValueType::Type::UNKNOWN_TYPE) {
         const Token *declType = Token::findsimplematch(mTypeStartToken, "decltype (", mTypeEndToken);
         if (declType && !declType->next()->valueType())
             return;
     }
-    auto* vt = new ValueType(valueType);
+    const auto* tmp = new ValueType(vt);
     delete mValueType;
-    mValueType = vt;
+    mValueType = tmp;
     if ((mValueType->pointer > 0) && (!isArray() || Token::Match(mNameToken->previous(), "( * %name% )")))
         setFlag(fIsPointer, true);
     setFlag(fIsConst, mValueType->constness & (1U << mValueType->pointer));
@@ -2546,8 +2776,6 @@ Function::Function(const Token *tok,
         // constructor of any kind
         else
             type = FunctionType::eConstructor;
-
-        isExplicit(tokenDef->strAt(-1) == "explicit" || tokenDef->strAt(-2) == "explicit");
     }
 
     const Token *tok1 = setFlags(tok, scope);
@@ -2621,6 +2849,14 @@ Function::Function(const Token *tok,
         isInline(true);
         hasBody(true);
     }
+
+    for (tok = tokenDef->previous(); Token::Match(tok, "&|&&|*|::|)|]|%name%"); tok = tok->previous()) {
+        // We should set other keywords here as well
+        if (tok->str() == "explicit")
+            isExplicit(true);
+        if (tok->str() == "]" || tok->str() == ")")
+            tok = tok->link();
+    }
 }
 
 Function::Function(const Token *tokenDef, const std::string &clangType)
@@ -2794,10 +3030,10 @@ static bool typesMatch(
     const Token *&new_second)
 {
     // get first type
-    const Type* first_type = first_scope->check->findType(first_token, first_scope, /*lookOutside*/ true);
+    const Type* first_type = first_scope->symdb.findType(first_token, first_scope, /*lookOutside*/ true);
     if (first_type) {
         // get second type
-        const Type* second_type = second_scope->check->findType(second_token, second_scope, /*lookOutside*/ true);
+        const Type* second_type = second_scope->symdb.findType(second_token, second_scope, /*lookOutside*/ true);
         // check if types match
         if (first_type == second_type) {
             const Token* tok1 = first_token;
@@ -3127,8 +3363,12 @@ static bool checkReturns(const Function* function, bool unknown, bool emptyEnabl
     assert(defEnd != defStart);
     if (pred(defStart, defEnd))
         return true;
-    if (isUnknownType(defStart, defEnd))
+    if (isUnknownType(defStart, defEnd)) {
+        const Token* tok = function->token ? function->token->next() : function->tokenDef->next();
+        if (tok->valueType() && tok->valueType()->type >= ValueType::Type::RECORD)
+            return false;
         return unknown;
+    }
     return false;
 }
 
@@ -3167,6 +3407,20 @@ bool Function::returnsVoid(const Function* function, bool unknown)
     });
 }
 
+bool Function::isCoroutine(const Function* function, const Standards &standards, const Tokenizer &tokens)
+{
+    if (!tokens.isCPP() || standards.cpp < Standards::CPP20)
+        return false;
+    if (!function->functionScope)
+        return false;
+    const Scope *scope = function->functionScope;
+    for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
+        if (Token::Match(tok, "co_return|co_await|co_yield"))
+            return true;
+    }
+    return false;
+}
+
 std::vector<const Token*> Function::findReturns(const Function* f)
 {
     std::vector<const Token*> result;
@@ -3238,7 +3492,7 @@ Function* SymbolDatabase::addGlobalFunction(Scope*& scope, const Token*& tok, co
             const Function *f = it->second;
             if (f->hasBody())
                 continue;
-            if (f->argsMatch(scope, f->argDef, argStart, emptyString, 0)) {
+            if (f->argsMatch(scope, f->argDef, argStart, "", 0)) {
                 function = const_cast<Function *>(it->second);
                 break;
             }
@@ -3447,7 +3701,7 @@ void SymbolDatabase::addClassFunction(Scope *&scope, const Token *&tok, const To
 void SymbolDatabase::addNewFunction(Scope *&scope, const Token *&tok)
 {
     const Token *tok1 = tok;
-    scopeList.emplace_back(this, tok1, scope);
+    scopeList.emplace_back(*this, tok1, scope);
     Scope *newScope = &scopeList.back();
 
     // find start of function '{'
@@ -3575,7 +3829,7 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
                 }
             }
 
-            const Type * baseType = classScope->check->findType(base.nameTok, enclosingScope);
+            const Type * baseType = classScope->symdb.findType(base.nameTok, enclosingScope);
             if (baseType && !baseType->findDependency(this))
                 base.type = baseType;
 
@@ -3596,7 +3850,7 @@ std::string Type::name() const
     else if (start->str() == "class")
         start = start->tokAt(1);
     else if (!start->isName())
-        return emptyString;
+        return "";
     const Token* next = start;
     while (Token::Match(next, "::|<|>|(|)|[|]|*|&|&&|%name%")) {
         if (Token::Match(next, "<|(|[") && next->link())
@@ -3641,7 +3895,7 @@ void SymbolDatabase::returnImplicitIntError(const Token *tok) const
 const Function* Type::getFunction(const std::string& funcName) const
 {
     if (classScope) {
-        const auto it = utils::as_const(classScope->functionMap).find(funcName);
+        const auto it = classScope->functionMap.find(funcName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
@@ -3852,9 +4106,8 @@ static const char* functionTypeToString(FunctionType type)
         return "Function";
     case FunctionType::eLambda:
         return "Lambda";
-    default:
-        return "Unknown";
     }
+    cppcheck::unreachable();
 }
 
 static std::string tokenToString(const Token* tok, const Tokenizer& tokenizer)
@@ -4218,6 +4471,11 @@ void SymbolDatabase::printXml(std::ostream &out) const
             outs += ErrorLogger::toxml(scope->className);
             outs += "\"";
         }
+        if (scope->classDef) {
+            outs += " classDef=\"";
+            outs += id_string(scope->classDef);
+            outs += "\"";
+        }
         if (scope->bodyStart) {
             outs += " bodyStart=\"";
             outs += id_string(scope->bodyStart);
@@ -4302,7 +4560,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
                         outs += "/>\n";
                     else {
                         outs += ">\n";
-                        for (unsigned int argnr = 0; argnr < function->argCount(); ++argnr) {
+                        for (size_t argnr = 0; argnr < function->argCount(); ++argnr) {
                             const Variable *arg = function->getArgumentVar(argnr);
                             outs += "          <arg nr=\"";
                             outs += std::to_string(argnr+1);
@@ -4365,8 +4623,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
     }
 
     // Variables..
-    for (const Variable *var : mVariableList)
-        variables.insert(var);
+    std::copy(mVariableList.begin(), mVariableList.end(), std::inserter(variables, variables.end()));
     outs += "  <variables>\n";
     for (const Variable *var : variables) {
         if (!var)
@@ -4431,9 +4688,9 @@ void SymbolDatabase::printXml(std::ostream &out) const
 
 //---------------------------------------------------------------------------
 
-static const Type* findVariableTypeIncludingUsedNamespaces(const SymbolDatabase* symbolDatabase, const Scope* scope, const Token* typeTok)
+static const Type* findVariableTypeIncludingUsedNamespaces(const Scope* scope, const Token* typeTok)
 {
-    const Type* argType = symbolDatabase->findVariableType(scope, typeTok);
+    const Type* argType = scope->symdb.findVariableType(scope, typeTok);
     if (argType)
         return argType;
 
@@ -4441,7 +4698,7 @@ static const Type* findVariableTypeIncludingUsedNamespaces(const SymbolDatabase*
     while (scope) {
         for (const Scope::UsingInfo &ui : scope->usingList) {
             if (ui.scope) {
-                argType = symbolDatabase->findVariableType(ui.scope, typeTok);
+                argType = scope->symdb.findVariableType(ui.scope, typeTok);
                 if (argType)
                     return argType;
             }
@@ -4453,7 +4710,7 @@ static const Type* findVariableTypeIncludingUsedNamespaces(const SymbolDatabase*
 
 //---------------------------------------------------------------------------
 
-void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *scope)
+void Function::addArguments(const Scope *scope)
 {
     // check for non-empty argument list "( ... )"
     const Token * start = arg ? arg : argDef;
@@ -4481,8 +4738,8 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
                 nameTok = tok->tokAt(2);
                 endTok = nameTok->previous();
                 tok = tok->link();
-            } else if (tok != startTok && !nameTok && Token::Match(tok, "( * %var% ) (") && Token::Match(tok->link()->linkAt(1), ") [,)]")) {
-                nameTok = tok->tokAt(2);
+            } else if (tok != startTok && !nameTok && Token::Match(tok, "( * const| %var% ) (") && Token::Match(tok->link()->linkAt(1), ") [,)]")) {
+                nameTok = tok->link()->previous();
                 endTok = nameTok->previous();
                 tok = tok->link()->linkAt(1);
             } else if (tok != startTok && !nameTok && Token::Match(tok, "( * %var% ) [")) {
@@ -4514,7 +4771,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
         while (Token::Match(typeTok, "const|volatile|enum|struct|::"))
             typeTok = typeTok->next();
         if (Token::Match(typeTok, ",|)")) { // #8333
-            symbolDatabase->mTokenizer.syntaxError(typeTok);
+            scope->symdb.mTokenizer.syntaxError(typeTok);
         }
         if (Token::Match(typeTok, "%type% <") && Token::Match(typeTok->linkAt(1), "> :: %type%"))
             typeTok = typeTok->linkAt(1)->tokAt(2);
@@ -4533,7 +4790,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
                     endTok = nameTok->previous();
 
                     if (hasBody())
-                        symbolDatabase->debugMessage(nameTok, "varid0", "Function::addArguments found argument \'" + nameTok->str() + "\' with varid 0.");
+                        scope->symdb.debugMessage(nameTok, "varid0", "Function::addArguments found argument \'" + nameTok->str() + "\' with varid 0.");
                 } else
                     endTok = typeTok;
             } else
@@ -4542,7 +4799,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
 
         const ::Type *argType = nullptr;
         if (!typeTok->isStandardType()) {
-            argType = findVariableTypeIncludingUsedNamespaces(symbolDatabase, scope, typeTok);
+            argType = findVariableTypeIncludingUsedNamespaces(scope, typeTok);
 
             // save type
             const_cast<Token *>(typeTok)->type(argType);
@@ -4564,7 +4821,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
         if (startTok == nameTok)
             break;
 
-        argumentList.emplace_back(nameTok, startTok, endTok, count++, AccessControl::Argument, argType, functionScope, symbolDatabase->mSettings);
+        argumentList.emplace_back(nameTok, startTok, endTok, count++, AccessControl::Argument, argType, functionScope, scope->symdb.mSettings);
 
         if (tok->str() == ")") {
             // check for a variadic function or a variadic template function
@@ -4616,7 +4873,7 @@ std::vector<const Function*> Function::getOverloadedFunctions() const
 
     while (scope) {
         const bool isMemberFunction = scope->isClassOrStruct() && !isStatic();
-        for (auto it = utils::as_const(scope->functionMap).find(tokenDef->str());
+        for (auto it = scope->functionMap.find(tokenDef->str());
              it != scope->functionMap.end() && it->first == tokenDef->str();
              ++it) {
             const Function* func = it->second;
@@ -4667,7 +4924,7 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
         const Scope *parent = derivedFromType->classScope;
 
         // check if function defined in base class
-        auto range = utils::as_const(parent->functionMap).equal_range(tokenDef->str());
+        auto range = parent->functionMap.equal_range(tokenDef->str());
         for (auto it = range.first; it != range.second; ++it) {
             const Function * func = it->second;
             if (func->isImplicitlyVirtual()) { // Base is virtual and of same name
@@ -4688,7 +4945,7 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
                 }
 
                 // check for matching function parameters
-                match = match && argsMatch(baseType->classScope, func->argDef, argDef, emptyString, 0);
+                match = match && argsMatch(baseType->classScope, func->argDef, argDef, "", 0);
 
                 // check for matching cv-ref qualifiers
                 match = match
@@ -4724,7 +4981,7 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
     return nullptr;
 }
 
-const Variable* Function::getArgumentVar(nonneg int num) const
+const Variable* Function::getArgumentVar(size_t num) const
 {
     if (num < argumentList.size()) {
         auto it = argumentList.begin();
@@ -4737,8 +4994,8 @@ const Variable* Function::getArgumentVar(nonneg int num) const
 
 //---------------------------------------------------------------------------
 
-Scope::Scope(const SymbolDatabase *check_, const Token *classDef_, const Scope *nestedIn_, ScopeType type_, const Token *start_) :
-    check(check_),
+Scope::Scope(const SymbolDatabase &symdb_, const Token *classDef_, const Scope *nestedIn_, ScopeType type_, const Token *start_) :
+    symdb(symdb_),
     classDef(classDef_),
     nestedIn(nestedIn_),
     type(type_)
@@ -4746,8 +5003,8 @@ Scope::Scope(const SymbolDatabase *check_, const Token *classDef_, const Scope *
     setBodyStartEnd(start_);
 }
 
-Scope::Scope(const SymbolDatabase *check_, const Token *classDef_, const Scope *nestedIn_) :
-    check(check_),
+Scope::Scope(const SymbolDatabase &symdb_, const Token *classDef_, const Scope *nestedIn_) :
+    symdb(symdb_),
     classDef(classDef_),
     nestedIn(nestedIn_)
 {
@@ -4803,36 +5060,36 @@ AccessControl Scope::defaultAccess() const
 }
 
 void Scope::addVariable(const Token *token_, const Token *start_, const Token *end_,
-                        AccessControl access_, const Type *type_, const Scope *scope_, const Settings& settings)
+                        AccessControl access_, const Type *type_, const Scope *scope_)
 {
     // keep possible size_t -> int truncation outside emplace_back() to have a single line
     // C4267 VC++ warning instead of several dozens lines
     const int varIndex = varlist.size();
-    varlist.emplace_back(token_, start_, end_, varIndex, access_, type_, scope_, settings);
+    varlist.emplace_back(token_, start_, end_, varIndex, access_, type_, scope_, scope_->symdb.mSettings);
 }
 
 // Get variable list..
-void Scope::getVariableList(const Settings& settings)
+void Scope::getVariableList()
 {
     if (!bodyStartList.empty()) {
         for (const Token *bs: bodyStartList)
-            getVariableList(settings, bs->next(), bs->link());
+            getVariableList(bs->next(), bs->link());
     }
 
     // global scope
     else if (type == ScopeType::eGlobal)
-        getVariableList(settings, check->mTokenizer.tokens(), nullptr);
+        getVariableList(symdb.mTokenizer.tokens(), nullptr);
 
     // forward declaration
     else
         return;
 }
 
-void Scope::getVariableList(const Settings& settings, const Token* start, const Token* end)
+void Scope::getVariableList(const Token* start, const Token* end)
 {
     // Variable declared in condition: if (auto x = bar())
-    if (Token::Match(classDef, "if|while ( %type%") && Token::simpleMatch(classDef->next()->astOperand2(), "=")) {
-        checkVariable(classDef->tokAt(2), defaultAccess(), settings);
+    if (Token::Match(classDef, "if|while|switch ( %type%") && Token::simpleMatch(classDef->next()->astOperand2(), "=")) {
+        checkVariable(classDef->tokAt(2), defaultAccess());
     }
 
     AccessControl varaccess = defaultAccess();
@@ -4929,14 +5186,14 @@ void Scope::getVariableList(const Settings& settings, const Token* start, const
         if (tok->str() == ";")
             continue;
 
-        tok = checkVariable(tok, varaccess, settings);
+        tok = checkVariable(tok, varaccess);
 
         if (!tok)
             break;
     }
 }
 
-const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, const Settings& settings)
+const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess)
 {
     // Is it a throw..?
     if (tok->isKeyword() && Token::Match(tok, "throw %any% (") &&
@@ -4966,11 +5223,11 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
     const Token *typestart = tok;
 
     // C++17 structured bindings
-    if (tok && tok->isCpp() && (settings.standards.cpp >= Standards::CPP17) && Token::Match(tok, "auto &|&&| [")) {
+    if (tok && tok->isCpp() && (symdb.mSettings.standards.cpp >= Standards::CPP17) && Token::Match(tok, "auto &|&&| [")) {
         const Token *typeend = Token::findsimplematch(typestart, "[")->previous();
         for (tok = typeend->tokAt(2); Token::Match(tok, "%name%|,"); tok = tok->next()) {
             if (tok->varId())
-                addVariable(tok, typestart, typeend, varaccess, nullptr, this, settings);
+                addVariable(tok, typestart, typeend, varaccess, nullptr, this);
         }
         return typeend->linkAt(1);
     }
@@ -4992,14 +5249,14 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
 
         if (vartok->varId() == 0) {
             if (!vartok->isBoolean())
-                check->debugMessage(vartok, "varid0", "Scope::checkVariable found variable \'" + vartok->str() + "\' with varid 0.");
+                symdb.debugMessage(vartok, "varid0", "Scope::checkVariable found variable \'" + vartok->str() + "\' with varid 0.");
             return tok;
         }
 
         const Type *vType = nullptr;
 
         if (typetok) {
-            vType = findVariableTypeIncludingUsedNamespaces(check, this, typetok);
+            vType = findVariableTypeIncludingUsedNamespaces(this, typetok);
 
             const_cast<Token *>(typetok)->type(vType);
         }
@@ -5008,7 +5265,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
         if (Token::Match(typestart, "enum|struct"))
             typestart = typestart->next();
 
-        addVariable(vartok, typestart, vartok->previous(), varaccess, vType, this, settings);
+        addVariable(vartok, typestart, vartok->previous(), varaccess, vType, this);
 
         if (type == ScopeType::eFor && orig->strAt(-2) == "for") {
             for (const Token* tok2 = tok; tok2 && !Token::Match(tok2, "[;:]"); tok2 = tok2->next()) {
@@ -5018,10 +5275,10 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
                 }
                 if (Token::Match(tok2, ", %name%")) {
                     if (tok2->next()->varId() == 0) {
-                        check->debugMessage(tok2->next(), "varid0", "Scope::checkVariable found variable \'" + tok2->strAt(1) + "\' with varid 0.");
+                        symdb.debugMessage(tok2->next(), "varid0", "Scope::checkVariable found variable \'" + tok2->strAt(1) + "\' with varid 0.");
                         return tok;
                     }
-                    addVariable(tok2->next(), typestart, vartok->previous(), varaccess, vType, this, settings);
+                    addVariable(tok2->next(), typestart, vartok->previous(), varaccess, vType, this);
                 }
             }
         }
@@ -5051,6 +5308,26 @@ const Variable *Scope::getVariable(const std::string &varname) const
 
 static const Token* skipPointers(const Token* tok)
 {
+    const Token *start = tok;
+    bool memberPointer = false;
+    while (tok) {
+        if (Token::simpleMatch(tok, "::")) {
+            tok = tok->next();
+            continue;
+        }
+        if (Token::Match(tok, "%type% ::")) {
+            tok = tok->tokAt(2);
+            memberPointer = true;
+            continue;
+        }
+        if (Token::Match(tok, "%type% <") && tok->linkAt(1)) {
+            tok = tok->linkAt(1)->next();
+            continue;
+        }
+        break;
+    }
+    if (memberPointer && !Token::simpleMatch(tok, "*"))
+        return start;
     while (Token::Match(tok, "*|&|&&") || (Token::Match(tok, "( [*&]") && Token::Match(tok->link()->next(), "(|["))) {
         tok = tok->next();
         if (tok && tok->strAt(-1) == "(" && Token::Match(tok, "%type% ::"))
@@ -5088,7 +5365,7 @@ bool Scope::isVariableDeclaration(const Token* const tok, const Token*& vartok,
     if (isCPP && Token::Match(tok, "throw|new"))
         return false;
 
-    const bool isCPP11 = isCPP && check->mSettings.standards.cpp >= Standards::CPP11;
+    const bool isCPP11 = isCPP && symdb.mSettings.standards.cpp >= Standards::CPP11;
 
     if (isCPP11 && tok->str() == "using")
         return false;
@@ -5584,7 +5861,10 @@ bool Scope::hasInlineOrLambdaFunction(const Token** tokStart, bool onlyInline) c
     });
 }
 
-void Scope::findFunctionInBase(const std::string & name, nonneg int args, std::vector<const Function *> & matches) const
+void Scope::findFunctionInBase(const std::string& name,
+                               const Token* tok,
+                               size_t args,
+                               std::vector<const Function*>& matches) const
 {
     if (isClassOrStruct() && definedType && !definedType->derivedFrom.empty()) {
         const std::vector<Type::BaseInfo> &derivedFrom = definedType->derivedFrom;
@@ -5594,16 +5874,18 @@ void Scope::findFunctionInBase(const std::string & name, nonneg int args, std::v
                 if (base->classScope == this) // Ticket #5120, #5125: Recursive class; tok should have been found already
                     continue;
 
-                auto range = utils::as_const(base->classScope->functionMap).equal_range(name);
+                auto range = base->classScope->functionMap.equal_range(name);
                 for (auto it = range.first; it != range.second; ++it) {
                     const Function *func = it->second;
+                    if (func->isDestructor() && !Token::simpleMatch(tok->tokAt(-1), "~"))
+                        continue;
                     if ((func->isVariadic() && args >= (func->argCount() - 1)) ||
                         (args == func->argCount() || (args < func->argCount() && args >= func->minArgCount()))) {
                         matches.push_back(func);
                     }
                 }
 
-                base->classScope->findFunctionInBase(name, args, matches);
+                base->classScope->findFunctionInBase(name, tok, args, matches);
             }
         }
     }
@@ -5680,7 +5962,7 @@ static void checkVariableCallMatch(const Variable* callarg, const Variable* func
             callarg->typeStartToken()->isLong() == funcarg->typeStartToken()->isLong()) {
             same++;
         } else if (callarg->isArrayOrPointer()) {
-            if (ptrequals && constEquals && funcarg->typeStartToken()->str() == "void")
+            if (ptrequals && constEquals && funcarg->typeStartToken()->str() == "void") // cppcheck-suppress knownConditionTrueFalse // #14418
                 fallback1++;
             else if (constEquals && funcarg->isStlStringType() && Token::Match(callarg->typeStartToken(), "char|wchar_t"))
                 fallback2++;
@@ -5742,8 +6024,10 @@ static bool hasMatchingConstructor(const Scope* classScope, const ValueType* arg
     });
 }
 
-const Function* Scope::findFunction(const Token *tok, bool requireConst, Reference ref) const
+const Function* Scope::findFunction(const Token* tok, bool requireConst, Reference ref, const std::string& funcName) const
 {
+    const std::string& name = funcName.empty() ? tok->str() : funcName;
+
     const bool isCall = Token::Match(tok->next(), "(|{");
 
     const std::vector<const Token *> arguments = getArguments(tok);
@@ -5753,8 +6037,8 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
     // find all the possible functions that could match
     const std::size_t args = arguments.size();
 
-    auto addMatchingFunctions = [&](const Scope *scope) {
-        auto range = utils::as_const(scope->functionMap).equal_range(tok->str());
+    auto addMatchingFunctions = [&](const Scope* scope) {
+        auto range = scope->functionMap.equal_range(name);
         for (auto it = range.first; it != range.second; ++it) {
             const Function *func = it->second;
             if (ref == Reference::LValue && func->hasRvalRefQualifier())
@@ -5789,7 +6073,7 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
     const std::size_t numberOfMatchesNonBase = matches.size();
 
     // check in base classes
-    findFunctionInBase(tok->str(), args, matches);
+    findFunctionInBase(name, tok, args, matches);
 
     // Non-call => Do not match parameters
     if (!isCall) {
@@ -6019,8 +6303,8 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
         matches.erase(itPure);
 
     // Only one candidate left
-    if (matches.size() == 1 && std::none_of(functionList.begin(), functionList.end(), [tok](const Function& f) {
-        return startsWith(f.name(), tok->str() + " <");
+    if (matches.size() == 1 && std::none_of(functionList.begin(), functionList.end(), [&name](const Function& f) {
+        return startsWith(f.name(), name + " <");
     }))
         return matches[0];
 
@@ -6186,7 +6470,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
         }
     }
     // Check for constructor
-    if (Token::Match(tok, "%name% (|{")) {
+    if (!Token::simpleMatch(tok->tokAt(-2), "this .") && Token::Match(tok, "%name% (|{")) {
         ValueType vt = ValueType::parseDecl(tok, mSettings);
         if (vt.typeScope)
             return vt.typeScope->findFunction(tok, false);
@@ -6196,6 +6480,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
 
 //---------------------------------------------------------------------------
 
+// cppcheck-suppress unusedFunction
 const Scope *SymbolDatabase::findScopeByName(const std::string& name) const
 {
     auto it = std::find_if(scopeList.cbegin(), scopeList.cend(), [&](const Scope& s) {
@@ -6265,7 +6550,7 @@ static T* findTypeImpl(S& thisScope, const std::string & name)
         return it->second;
 
     // is type defined in anonymous namespace..
-    it = thisScope.definedTypesMap.find(emptyString);
+    it = thisScope.definedTypesMap.find("");
     if (it != thisScope.definedTypesMap.end()) {
         for (S *scope : thisScope.nestedList) {
             if (scope->className.empty() && (scope->type == ScopeType::eNamespace || scope->isClassOrStructOrUnion())) {
@@ -6292,7 +6577,7 @@ Type* Scope::findType(const std::string& name)
 
 //---------------------------------------------------------------------------
 
-Scope *Scope::findInNestedListRecursive(const std::string & name)
+const Scope *Scope::findInNestedListRecursive(const std::string & name) const
 {
     auto it = std::find_if(nestedList.cbegin(), nestedList.cend(), [&](const Scope* s) {
         return s->className == name;
@@ -6300,8 +6585,8 @@ Scope *Scope::findInNestedListRecursive(const std::string & name)
     if (it != nestedList.end())
         return *it;
 
-    for (Scope* scope: nestedList) {
-        Scope *child = scope->findInNestedListRecursive(name);
+    for (const Scope* scope: nestedList) {
+        const Scope *child = scope->findInNestedListRecursive(name);
         if (child)
             return child;
     }
@@ -6359,23 +6644,6 @@ const Type* SymbolDatabase::findType(const Token *startTok, const Scope *startSc
     if (startTok->str() == startScope->className && startScope->isClassOrStruct() && startTok->strAt(1) != "::")
         return startScope->definedType;
 
-    if (startTok->isC()) {
-        const Scope* scope = startScope;
-        while (scope) {
-            if (startTok->str() == scope->className && scope->isClassOrStruct())
-                return scope->definedType;
-            const Scope* typeScope = scope->findRecordInNestedList(startTok->str(), /*isC*/ true);
-            if (typeScope) {
-                if (startTok->str() == typeScope->className && typeScope->isClassOrStruct()) {
-                    if (const Type* type = typeScope->definedType)
-                        return type;
-                }
-            }
-            scope = scope->nestedIn;
-        }
-        return nullptr;
-    }
-
     const Scope* start_scope = startScope;
 
     // absolute path - directly start in global scope
@@ -6538,7 +6806,7 @@ Function * SymbolDatabase::findFunctionInScope(const Token *func, const Scope *n
     const Function * function = nullptr;
     const bool destructor = func->strAt(-1) == "~";
 
-    auto range = utils::as_const(ns->functionMap).equal_range(func->str());
+    auto range = ns->functionMap.equal_range(func->str());
     for (auto it = range.first; it != range.second; ++it) {
         if (it->second->argsMatch(ns, it->second->argDef, func->next(), path, path_length) &&
             it->second->isDestructor() == destructor) {
@@ -6653,7 +6921,7 @@ void SymbolDatabase::setValueType(Token* tok, const Enumerator& enumerator, cons
         if (valuetype.type == ValueType::Type::UNKNOWN_TYPE)
             valuetype.fromLibraryType(type->expressionString(), mSettings);
 
-        if (valuetype.isIntegral()) {
+        if (valuetype.sign == ValueType::UNKNOWN_SIGN && valuetype.isIntegral()) {
             if (type->isSigned())
                 valuetype.sign = ValueType::Sign::SIGNED;
             else if (type->isUnsigned())
@@ -6777,6 +7045,10 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
                 setAutoTokenProperties(autoTok);
                 if (vt2->pointer > vt.pointer)
                     vt.pointer++;
+                if (Token::simpleMatch(autoTok->next(), "&"))
+                    vt.reference = Reference::LValue;
+                if (Token::simpleMatch(autoTok->next(), "&&"))
+                    vt.reference = Reference::RValue;
                 setValueType(var1Tok, vt);
                 if (var1Tok != parent->previous())
                     setValueType(parent->previous(), vt);
@@ -6809,7 +7081,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
         return;
     }
 
-    if (parent->str() == "[" && (!parent->isCpp() || parent->astOperand1() == tok) && valuetype.pointer > 0U && !Token::Match(parent->previous(), "[{,]")) {
+    if (parent->str() == "[" && (!parent->isCpp() || parent->astOperand1() == tok) && valuetype.pointer > 0 && !Token::Match(parent->previous(), "[{,]")) {
         const Token *op1 = parent->astOperand1();
         while (op1 && op1->str() == "[")
             op1 = op1->astOperand1();
@@ -6821,7 +7093,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
         setValueType(parent, vt);
         return;
     }
-    if (Token::Match(parent->previous(), "%name% (") && parent->astOperand1() == tok && valuetype.pointer > 0U) {
+    if (Token::Match(parent->tokAt(-1), "%name% (") && !parent->tokAt(-1)->isKeyword() && parent->astOperand1() == tok && valuetype.pointer > 0) {
         ValueType vt(valuetype);
         vt.pointer -= 1U;
         setValueType(parent, vt);
@@ -6834,7 +7106,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
         setValueType(parent, vt);
         return;
     }
-    if (parent->str() == "*" && !parent->astOperand2() && valuetype.pointer > 0U) {
+    if (parent->str() == "*" && !parent->astOperand2() && valuetype.pointer > 0) {
         ValueType vt(valuetype);
         vt.pointer -= 1U;
         setValueType(parent, vt);
@@ -6867,7 +7139,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
             return;
         }
     }
-    if (parent->str() == "*" && Token::simpleMatch(parent->astOperand2(), "[") && valuetype.pointer > 0U) {
+    if (parent->str() == "*" && Token::simpleMatch(parent->astOperand2(), "[") && valuetype.pointer > 0) {
         const Token *op1 = parent->astOperand2()->astOperand1();
         while (op1 && op1->str() == "[")
             op1 = op1->astOperand1();
@@ -7051,15 +7323,55 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const
     }
 
     // c++17 auto type deduction of braced init list
-    if (parent->isCpp() && mSettings.standards.cpp >= Standards::CPP17 && vt2 && Token::Match(parent->tokAt(-2), "auto %var% {")) {
-        Token *autoTok = parent->tokAt(-2);
-        setValueType(autoTok, *vt2);
-        setAutoTokenProperties(autoTok);
-        if (parent->previous()->variable())
-            const_cast<Variable*>(parent->previous()->variable())->setValueType(*vt2);
-        else
-            debugMessage(parent->previous(), "debug", "Missing variable class for variable with varid");
-        return;
+    if (parent->isCpp() && mSettings.standards.cpp >= Standards::CPP17
+        && Token::Match(parent->astOperand1(), "%var% {") && vt2) {
+
+        auto reference = Reference::None;
+        nonneg int pointer = 0;
+        nonneg int constness = 0;
+        nonneg int volatileness = 0;
+
+        Token *varTok = parent->astOperand1();
+        Token *typeTok = varTok->previous();
+
+        while (Token::Match(typeTok, "&|&&|*|const|volatile")) {
+            if (typeTok->str() == "&")
+                reference = Reference::LValue;
+            else if (typeTok->str() == "&&")
+                reference = Reference::RValue;
+            else if (typeTok->str() == "*")
+                pointer++;
+            else if (typeTok->str() == "const")
+                constness |= 1 << pointer;
+            else if (typeTok->str() == "volatile")
+                volatileness |= 1 << pointer;
+            typeTok = typeTok->previous();
+        }
+
+        if (typeTok->str() == "auto") {
+            setValueType(typeTok, *vt2);
+            setAutoTokenProperties(typeTok);
+
+            auto *varVt = new ValueType(*vt2);
+
+            varVt->reference = reference;
+            varVt->constness |= constness;
+            varVt->volatileness |= volatileness;
+
+            if (Token::simpleMatch(typeTok->previous(), "const auto"))
+                varVt->constness |= 1 << pointer;
+
+            if (Token::simpleMatch(typeTok->previous(), "volatile auto"))
+                varVt->volatileness |= 1 << pointer;
+
+            varTok->setValueType(varVt);
+
+            if (varTok->variable())
+                const_cast<Variable*>(varTok->variable())->setValueType(*varVt);
+            else
+                debugMessage(varTok, "debug", "Missing variable class for variable with varid");
+            return;
+        }
     }
 
     if (!vt1)
@@ -7314,13 +7626,13 @@ static const Token* parsedecl(const Token* type,
                 valuetype->container = container;
             } else {
                 const Scope *scope = type->scope();
-                valuetype->typeScope = scope->check->findScope(typeTokens.front(), scope);
+                valuetype->typeScope = scope->symdb.findScope(typeTokens.front(), scope);
                 if (valuetype->typeScope)
                     valuetype->type = (scope->type == ScopeType::eClass) ? ValueType::Type::RECORD : ValueType::Type::NONSTD;
             }
-        } else if (ValueType::Type::UNKNOWN_TYPE != ValueType::typeFromString(type->str(), type->isLong())) {
+        } else if (ValueType::Type type_s = ValueType::typeFromString(type->str(), type->isLong())) { // != UNKNOWN_TYPE
             const ValueType::Type t0 = valuetype->type;
-            valuetype->type = ValueType::typeFromString(type->str(), type->isLong());
+            valuetype->type = type_s;
             if (t0 == ValueType::Type::LONG) {
                 if (valuetype->type == ValueType::Type::LONG)
                     valuetype->type = ValueType::Type::LONGLONG;
@@ -7424,8 +7736,10 @@ static const Token* parsedecl(const Token* type,
             valuetype->typeScope = type->type()->classScope;
         } else if (type->isName() && valuetype->sign != ValueType::Sign::UNKNOWN_SIGN && valuetype->pointer == 0U)
             return nullptr;
-        else if (Token::Match(type->previous(), "!!:: %name% !!::"))
-            valuetype->fromLibraryType(type->str(), settings);
+        else if (Token::Match(type->previous(), "!!:: %name% !!::")) {
+            if (!type->isKeyword())
+                valuetype->fromLibraryType(type->str(), settings);
+        }
         if (!type->originalName().empty())
             valuetype->originalTypeName = type->originalName();
         type = type->next();
@@ -7435,9 +7749,7 @@ static const Token* parsedecl(const Token* type,
 
     // Set signedness for integral types..
     if (valuetype->isIntegral() && valuetype->sign == ValueType::Sign::UNKNOWN_SIGN) {
-        if (valuetype->type == ValueType::Type::CHAR)
-            valuetype->sign = defaultSignedness;
-        else if (valuetype->type >= ValueType::Type::SHORT)
+        if (valuetype->type >= ValueType::Type::SHORT)
             valuetype->sign = ValueType::Sign::SIGNED;
     }
 
@@ -7457,14 +7769,14 @@ static const Function *getOperatorFunction(const Token * const tok)
 
     const Scope *classScope = getClassScope(tok->astOperand1());
     if (classScope) {
-        auto it = utils::as_const(classScope->functionMap).find(functionName);
+        auto it = classScope->functionMap.find(functionName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
 
     classScope = getClassScope(tok->astOperand2());
     if (classScope) {
-        auto it = utils::as_const(classScope->functionMap).find(functionName);
+        auto it = classScope->functionMap.find(functionName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
@@ -7485,10 +7797,51 @@ static const Function* getFunction(const Token* tok) {
             lambda = lvar->nameToken()->tokAt(2)->function();
         if (lambda && lambda->retDef)
             return lambda;
+        // calling an object of a class that overloads operator()
+        if (tok != lvar->nameToken() && !lvar->isPointer() && !lvar->isArray() && lvar->typeScope()) {
+            const Function* callOp =
+                lvar->typeScope()->findFunction(tok, lvar->isConst(), Reference::LValue, "operator()");
+            if (callOp && callOp->retDef)
+                return callOp;
+        }
     }
     return nullptr;
 }
 
+static int getIntegerConstantMacroWidth(const Token* tok) {
+    if (!Token::Match(tok, "%name% (") || Token::simpleMatch(tok->next()->astOperand2(), ","))
+        return 0;
+    const std::string &name = tok->str();
+    if (name.back() != 'C')
+        return 0;
+    size_t pos = (name[0] == 'U') ? 1 : 0;
+    if (name[pos] != 'I' || name[pos + 1] != 'N' || name[pos + 2] != 'T')
+        return 0;
+    pos += 3;
+    int intnum = 0;
+    if (name[pos] == '8') {
+        ++pos;
+        intnum = 8;
+    }
+    else if (name[pos] == '1' && name[pos + 1] == '6') {
+        pos += 2;
+        intnum = 16;
+    }
+    else if (name[pos] == '3' && name[pos + 1] == '2') {
+        pos += 2;
+        intnum = 32;
+    }
+    else if (name[pos] == '6' && name[pos + 1] == '4') {
+        pos += 2;
+        intnum = 64;
+    }
+    else
+        return 0;
+    if (pos + 2 != name.size() || name[pos] != '_')
+        return 0;
+    return intnum;
+}
+
 void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *tokens)
 {
     if (!tokens)
@@ -7545,7 +7898,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
 
                 setValueType(tok, ValueType(sign, type, 0U));
             }
-        } else if (tok->isComparisonOp() || tok->tokType() == Token::eLogicalOp) {
+        } else if ((tok->isComparisonOp() || tok->tokType() == Token::eLogicalOp) && tok->astOperand1()) {
             if (tok->isCpp() && tok->isComparisonOp() && (getClassScope(tok->astOperand1()) || getClassScope(tok->astOperand2()))) {
                 const Function *function = getOperatorFunction(tok);
                 if (function) {
@@ -7616,6 +7969,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
 
             else if (Token::simpleMatch(tok->previous(), "sizeof (")) {
                 ValueType valuetype(ValueType::Sign::UNSIGNED, ValueType::Type::LONG, 0U);
+                // TODO: handle via sizeof_size_t instead
                 if (mSettings.platform.type == Platform::Type::Win64)
                     valuetype.type = ValueType::Type::LONGLONG;
 
@@ -7630,6 +7984,29 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 }
             }
 
+            // functions from stdint.h
+            else if (const int macroWidth = getIntegerConstantMacroWidth(tok->previous())) {
+                ValueType valuetype;
+                if (macroWidth == mSettings.platform.char_bit)
+                    valuetype.type = ValueType::Type::CHAR;
+                else if (macroWidth == mSettings.platform.short_bit)
+                    valuetype.type = ValueType::Type::SHORT;
+                else if (macroWidth == mSettings.platform.int_bit)
+                    valuetype.type = ValueType::Type::INT;
+                else if (macroWidth == mSettings.platform.long_bit)
+                    valuetype.type = ValueType::Type::LONG;
+                else if (macroWidth == mSettings.platform.long_long_bit)
+                    valuetype.type = ValueType::Type::LONGLONG;
+                else
+                    valuetype.type = ValueType::Type::INT;
+
+                if (tok->strAt(-1)[0] == 'U')
+                    valuetype.sign = ValueType::Sign::UNSIGNED;
+                else
+                    valuetype.sign = ValueType::Sign::SIGNED;
+                setValueType(tok, valuetype);
+            }
+
             // function style cast
             else if (tok->previous() && tok->previous()->isStandardType()) {
                 ValueType valuetype;
@@ -7716,8 +8093,8 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 if (!typestr.empty()) {
                     ValueType valuetype;
                     TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
-                    std::istringstream istr(typestr+";");
-                    tokenList.createTokens(istr); // TODO: check result?
+                    const std::string str(typestr+";\n");
+                    tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
                     tokenList.simplifyStdType();
                     if (parsedecl(tokenList.front(), &valuetype, mDefaultSignedness, mSettings)) {
                         valuetype.originalTypeName = typestr;
@@ -7749,17 +8126,20 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                             }
                         }
                         //Is iterator fetching function called?
-                    } else if (Token::simpleMatch(tok->astOperand1(), "::") &&
-                               tok->astOperand2() &&
-                               tok->astOperand2()->isVariable()) {
-                        const auto* const paramVariable = tok->astOperand2()->variable();
+                    } else if (Token::simpleMatch(tok->astOperand1(), "::") && Token::Match(tok->astOperand2(), "%var%|.|[")) {
+                        const Token* varTok = tok->astOperand2();
+                        while (Token::simpleMatch(varTok, "["))
+                            varTok = varTok->astOperand1();
+                        while (Token::simpleMatch(varTok, "."))
+                            varTok = varTok->astOperand2();
+                        const Variable* const paramVariable = varTok ? varTok->variable() : nullptr;
                         if (!paramVariable ||
                             !paramVariable->valueType() ||
                             !paramVariable->valueType()->container) {
                             continue;
                         }
 
-                        const auto yield = astFunctionYield(tok->previous(), mSettings);
+                        const auto yield = astFunctionYield(tok->previous(), mSettings.library);
                         if (yield == Library::Container::Yield::START_ITERATOR ||
                             yield == Library::Container::Yield::END_ITERATOR ||
                             yield == Library::Container::Yield::ITERATOR) {
@@ -7806,8 +8186,8 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                     continue;
                 }
                 TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
-                std::istringstream istr(typestr+";");
-                if (tokenList.createTokens(istr)) {
+                const std::string str(typestr+";\n");
+                if (tokenList.createTokensFromBuffer(str.data(), str.size())) {
                     ValueType vt;
                     tokenList.simplifyPlatformTypes();
                     tokenList.simplifyStdType();
@@ -8108,7 +8488,7 @@ std::string ValueType::dump() const
         break;
     }
 
-    if (bits > 0) {
+    if (bits >= 0) {
         ret += " valueType-bits=\"";
         ret += std::to_string(bits);
         ret += '\"';
@@ -8167,40 +8547,191 @@ bool ValueType::isVolatile(nonneg int indirect) const
         return false;
     return volatileness & (1 << (pointer - indirect));
 }
-MathLib::bigint ValueType::typeSize(const Platform &platform, bool p) const
+
+namespace {
+    struct Result
+    {
+        size_t total;
+        bool success;
+    };
+}
+
+template<class F>
+static Result accumulateStructMembers(const Scope* scope, F f, ValueType::Accuracy accuracy, const Settings& settings)
 {
-    if (p && pointer)
-        return platform.sizeof_pointer;
+    size_t total = 0;
+    std::set<const Scope*> anonScopes;
+    for (const Variable& var : scope->varlist) {
+        if (var.isStatic())
+            continue;
+        const MathLib::bigint bits = var.nameToken() ? var.nameToken()->bits() : -1;
+        if (const ValueType* vt = var.valueType()) {
+            if (vt->type == ValueType::Type::RECORD && vt->typeScope == scope)
+                return {0, false};
+            const MathLib::bigint dim = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), MathLib::bigint(1), [](MathLib::bigint i1, const Dimension& dim) {
+                return i1 * dim.num;
+            });
+            if (var.nameToken()->scope() != scope && var.nameToken()->scope()->definedType) { // anonymous union
+                const auto ret = anonScopes.insert(var.nameToken()->scope());
+                if (ret.second)
+                    total = f(total, *vt, dim, bits);
+            }
+            else if (vt->container && vt->container->startPattern == "std :: array <") {
+                const ValueType vtElement = ValueType::parseDecl(vt->containerTypeToken, settings);
+                total = f(total, vtElement, dim, bits);
+            }
+            else
+                total = f(total, *vt, dim, bits);
+        }
+        if (accuracy == ValueType::Accuracy::ExactOrZero && total == 0 && bits == -1)
+            return {0, false};
+    }
+    return {total, true};
+}
 
-    if (typeScope && typeScope->definedType && typeScope->definedType->sizeOf)
-        return typeScope->definedType->sizeOf;
 
-    switch (type) {
-    case ValueType::Type::BOOL:
-        return platform.sizeof_bool;
-    case ValueType::Type::CHAR:
+static size_t bitCeil(size_t x)
+{
+    if (x <= 1)
+        return 1;
+    --x;
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+    x |= x >> 32;
+    return x + 1;
+}
+
+static size_t getAlignOf(const ValueType& vt, const Settings& settings, ValueType::Accuracy accuracy, ValueType::SizeOf sizeOf, int maxRecursion = 0)
+{
+    if (maxRecursion > settings.vfOptions.maxAlignOfRecursion) {
+        // TODO: add bailout message
+        return 0;
+    }
+    if ((vt.pointer && sizeOf == ValueType::SizeOf::Pointer) || vt.reference != Reference::None || vt.isPrimitive()) {
+        auto align = vt.getSizeOf(settings, accuracy, ValueType::SizeOf::Pointer);
+        return align == 0 ? 0 : bitCeil(align);
+    }
+    if (vt.type == ValueType::Type::RECORD && vt.typeScope) {
+        auto accHelper = [&](size_t max, const ValueType& vt2, size_t /*dim*/, MathLib::bigint /*bits*/) {
+            size_t a = getAlignOf(vt2, settings, accuracy, ValueType::SizeOf::Pointer, ++maxRecursion);
+            return std::max(max, a);
+        };
+        Result result = accumulateStructMembers(vt.typeScope, accHelper, accuracy, settings);
+        size_t total = result.total;
+        if (const Type* dt = vt.typeScope->definedType) {
+            total = std::accumulate(dt->derivedFrom.begin(), dt->derivedFrom.end(), total, [&](size_t v, const Type::BaseInfo& bi) {
+                if (bi.type && bi.type->classScope)
+                    v += accumulateStructMembers(bi.type->classScope, accHelper, accuracy, settings).total;
+                return v;
+            });
+        }
+        return result.success ? std::max<size_t>(1, total) : total;
+    }
+    if (vt.type == ValueType::Type::CONTAINER)
+        return settings.platform.sizeof_pointer; // Just guess
+    return 0;
+}
+
+size_t ValueType::getSizeOf( const Settings& settings, Accuracy accuracy, SizeOf sizeOf, int maxRecursion) const
+{
+    if (maxRecursion > settings.vfOptions.maxSizeOfRecursion) {
+        // TODO: add bailout message
+        return 0;
+    }
+    const auto& platform = settings.platform;
+    if (sizeOf == SizeOf::Pointer && (pointer || reference != Reference::None))
+        return platform.sizeof_pointer;
+    if (type == ValueType::Type::BOOL || type == ValueType::Type::CHAR)
         return 1;
-    case ValueType::Type::SHORT:
+    if (type == ValueType::Type::SHORT)
         return platform.sizeof_short;
-    case ValueType::Type::WCHAR_T:
+    if (type == ValueType::Type::WCHAR_T)
         return platform.sizeof_wchar_t;
-    case ValueType::Type::INT:
+    if (type == ValueType::Type::INT)
         return platform.sizeof_int;
-    case ValueType::Type::LONG:
+    if (type == ValueType::Type::LONG)
         return platform.sizeof_long;
-    case ValueType::Type::LONGLONG:
+    if (type == ValueType::Type::LONGLONG)
         return platform.sizeof_long_long;
-    case ValueType::Type::FLOAT:
+    if (type == ValueType::Type::FLOAT)
         return platform.sizeof_float;
-    case ValueType::Type::DOUBLE:
+    if (type == ValueType::Type::DOUBLE)
         return platform.sizeof_double;
-    case ValueType::Type::LONGDOUBLE:
+    if (type == ValueType::Type::LONGDOUBLE)
         return platform.sizeof_long_double;
-    default:
-        break;
+    if (type == ValueType::Type::CONTAINER)
+        return 3 * platform.sizeof_pointer; // Just guess
+    if (type == ValueType::Type::RECORD && typeScope) {
+        size_t currentBitCount = 0;
+        size_t currentBitfieldAlloc = 0;
+        auto accHelper = [&](size_t total, const ValueType& vt2, size_t dim, MathLib::bigint nBits) -> size_t {
+            const size_t charBit = settings.platform.char_bit;
+            size_t n = vt2.getSizeOf(settings, accuracy, SizeOf::Pointer, ++maxRecursion);
+            size_t a = getAlignOf(vt2, settings, accuracy, SizeOf::Pointer);
+            if (n == 0 || a == 0)
+                return accuracy == Accuracy::ExactOrZero ? 0 : total;
+            if (nBits == 0) {
+                if (currentBitfieldAlloc == 0) {
+                    nBits = n * charBit;
+                } else {
+                    nBits = (currentBitfieldAlloc * charBit) - currentBitCount;
+                }
+            }
+            if (nBits > 0) {
+                size_t ret = total;
+                if (currentBitfieldAlloc == 0) {
+                    currentBitfieldAlloc = n;
+                    currentBitCount = 0;
+                } else if (currentBitCount + nBits > charBit * currentBitfieldAlloc) {
+                    ret += currentBitfieldAlloc;
+                    currentBitfieldAlloc = n;
+                    currentBitCount = 0;
+                }
+                while (nBits > charBit * currentBitfieldAlloc) {
+                    ret += currentBitfieldAlloc;
+                    nBits -= charBit * currentBitfieldAlloc;
+                }
+                currentBitCount += nBits;
+                return ret;
+            }
+            n *= dim;
+            size_t padding = (a - (total % a)) % a;
+            if (currentBitCount > 0) {
+                bool fitsInBitfield = currentBitCount + (n * charBit) <= currentBitfieldAlloc * charBit;
+                bool isAligned = currentBitCount % (charBit * a) == 0;
+                if (vt2.isIntegral() && fitsInBitfield && isAligned) {
+                    currentBitCount += charBit * n;
+                    return total;
+                }
+                n += currentBitfieldAlloc;
+                currentBitfieldAlloc = 0;
+                currentBitCount = 0;
+            }
+            return typeScope->type == ScopeType::eUnion ? std::max(total, n) : total + padding + n;
+        };
+        Result result = accumulateStructMembers(typeScope, accHelper, accuracy, settings);
+        size_t total = result.total;
+        if (currentBitCount > 0)
+            total += currentBitfieldAlloc;
+        if (const ::Type* dt = typeScope->definedType) {
+            total = std::accumulate(dt->derivedFrom.begin(), dt->derivedFrom.end(), total, [&](size_t v, const ::Type::BaseInfo& bi) {
+                if (bi.type && bi.type->classScope)
+                    v += accumulateStructMembers(bi.type->classScope, accHelper, accuracy, settings).total;
+                return v;
+            });
+        }
+        if (accuracy == Accuracy::ExactOrZero && total == 0 && !result.success)
+            return 0;
+        total = std::max(size_t{1}, total);
+        size_t align = getAlignOf(*this, settings, accuracy, sizeOf);
+        if (align == 0)
+            return accuracy == Accuracy::ExactOrZero ? 0 : total;
+        total += (align - (total % align)) % align;
+        return total;
     }
-
-    // Unknown invalid size
     return 0;
 }
 
@@ -8266,7 +8797,7 @@ std::string ValueType::str() const
     } else if (type == ValueType::Type::SMART_POINTER && smartPointer) {
         ret += " smart-pointer(" + smartPointer->name + ")";
     }
-    for (unsigned int p = 0; p < pointer; p++) {
+    for (nonneg int p = 0; p < pointer; p++) {
         ret += " *";
         if (constness & (2 << p))
             ret += " const";
@@ -8278,7 +8809,7 @@ std::string ValueType::str() const
     else if (reference == Reference::RValue)
         ret += " &&";
     if (ret.empty())
-        return ret;
+        return {};
     return ret.substr(1);
 }
 
@@ -8306,7 +8837,8 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
         return ValueType::MatchResult::NOMATCH; // TODO
     }
     if (call->pointer > 0) {
-        if ((call->constness | func->constness) != func->constness)
+        const unsigned int mask = (1U << call->pointer) - 1;
+        if (((call->constness | func->constness) & mask) != (func->constness & mask))
             return ValueType::MatchResult::NOMATCH;
         if ((call->volatileness | func->volatileness) != func->volatileness)
             return ValueType::MatchResult::NOMATCH;
@@ -8349,7 +8881,7 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
             return ValueType::MatchResult::UNKNOWN;
     }
 
-    if (call->isIntegral() && func->isIntegral() && call->sign != ValueType::Sign::UNKNOWN_SIGN && func->sign != ValueType::Sign::UNKNOWN_SIGN && call->sign != func->sign)
+    if (call->isIntegral() && func->isIntegral() && call->sign != func->sign)
         return ValueType::MatchResult::FALLBACK1;
 
     if (func->reference != Reference::None && (func->constness > call->constness || func->volatileness > call->volatileness))
@@ -8388,3 +8920,10 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
     }
     return res;
 }
+
+void SymbolDatabase::getErrorMessages(ErrorLogger& /*errorLogger*/)
+{
+    // TODO
+    //SymbolDatabase symdb;
+    //symdb.returnImplicitIntError(nullptr);
+}
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index 7ffc1f19d65..86ce9419999 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,6 +31,7 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cstddef>
 #include <cstdint>
 #include <iosfwd>
 #include <list>
@@ -40,14 +41,13 @@
 #include <utility>
 #include <vector>
 
-class Platform;
-class ErrorLogger;
 class Function;
 class Scope;
 class Settings;
 class SymbolDatabase;
 class Tokenizer;
 class ValueType;
+class ErrorLogger;
 
 enum class Reference : std::uint8_t {
     None,
@@ -651,7 +651,7 @@ class CPPCHECKLIB Variable {
         return mValueType;
     }
 
-    void setValueType(const ValueType &valueType);
+    void setValueType(const ValueType &vt);
 
     AccessControl accessControl() const {
         return mAccess;
@@ -767,17 +767,20 @@ class CPPCHECKLIB Function {
 
     std::string fullName() const;
 
-    nonneg int argCount() const {
+    size_t argCount() const {
         return argumentList.size();
     }
-    nonneg int minArgCount() const {
+    size_t minArgCount() const {
         return argumentList.size() - initArgCount;
     }
-    const Variable* getArgumentVar(nonneg int num) const;
-    nonneg int initializedArgCount() const {
+    const Variable* getArgumentVar(size_t num) const;
+    size_t initializedArgCount() const {
         return initArgCount;
     }
-    void addArguments(const SymbolDatabase *symbolDatabase, const Scope *scope);
+    /**
+     * @throws InternalError thrown on unrecognized lambda
+     */
+    void addArguments(const Scope *scope);
 
     /** @brief check if this function is virtual in the base classes */
     bool isImplicitlyVirtual(bool defaultVal = false, bool* pFoundAllBaseClasses = nullptr) const;
@@ -925,7 +928,7 @@ class CPPCHECKLIB Function {
     const Scope* functionScope{};     ///< scope of function body
     const Scope* nestedIn{};          ///< Scope the function is declared in
     std::list<Variable> argumentList; ///< argument list, must remain list due to clangimport usage!
-    nonneg int initArgCount{};        ///< number of args with default values
+    size_t initArgCount{};            ///< number of args with default values
     FunctionType type = FunctionType::eFunction; ///< constructor, destructor, ...
     const Token* noexceptArg{};       ///< noexcept token
     const Token* throwArg{};          ///< throw token
@@ -942,6 +945,7 @@ class CPPCHECKLIB Function {
     static bool returnsStandardType(const Function* function, bool unknown = false);
 
     static bool returnsVoid(const Function* function, bool unknown = false);
+    static bool isCoroutine(const Function* function, const Standards &standards, const Tokenizer &tokens);
 
     static std::vector<const Token*> findReturns(const Function* f);
 
@@ -1038,10 +1042,10 @@ class CPPCHECKLIB Scope {
         const Scope *scope;
     };
 
-    Scope(const SymbolDatabase *check_, const Token *classDef_, const Scope *nestedIn_);
-    Scope(const SymbolDatabase *check_, const Token *classDef_, const Scope *nestedIn_, ScopeType type_, const Token *start_);
+    Scope(const SymbolDatabase &symdb_, const Token *classDef_, const Scope *nestedIn_);
+    Scope(const SymbolDatabase &symdb_, const Token *classDef_, const Scope *nestedIn_, ScopeType type_, const Token *start_);
 
-    const SymbolDatabase* check{};
+    const SymbolDatabase& symdb;
     std::string className;
     const Token* classDef{};   ///< class/struct/union/namespace token
     const Token* bodyStart{};  ///< '{' token
@@ -1140,9 +1144,14 @@ class CPPCHECKLIB Scope {
      * @brief find a function
      * @param tok token of function call
      * @param requireConst if const refers to a const variable only const methods should be matched
+     * @param ref reference qualification of the object the function is called on
+     * @param funcName name to look up instead of tok->str(), e.g. "operator()" when tok is a variable that is called
      * @return pointer to function if found or NULL if not found
      */
-    const Function *findFunction(const Token *tok, bool requireConst=false, Reference ref=Reference::None) const;
+    const Function* findFunction(const Token* tok,
+                                 bool requireConst = false,
+                                 Reference ref = Reference::None,
+                                 const std::string& funcName = "") const;
 
     const Scope *findRecordInNestedList(const std::string & name, bool isC = false) const;
     Scope *findRecordInNestedList(const std::string & name, bool isC = false);
@@ -1154,14 +1163,14 @@ class CPPCHECKLIB Scope {
      * @brief find if name is in nested list
      * @param name name of nested scope
      */
-    Scope *findInNestedListRecursive(const std::string & name);
+    const Scope *findInNestedListRecursive(const std::string & name) const;
 
     void addVariable(const Token *token_, const Token *start_,
                      const Token *end_, AccessControl access_, const Type *type_,
-                     const Scope *scope_, const Settings& settings);
+                     const Scope *scope_);
 
     /** @brief initialize varlist */
-    void getVariableList(const Settings& settings);
+    void getVariableList();
 
     const Function *getDestructor() const;
 
@@ -1179,10 +1188,9 @@ class CPPCHECKLIB Scope {
      * @brief check if statement is variable declaration and add it if it is
      * @param tok pointer to start of statement
      * @param varaccess access control of statement
-     * @param settings Settings
      * @return pointer to last token
      */
-    const Token *checkVariable(const Token *tok, AccessControl varaccess, const Settings& settings);
+    const Token *checkVariable(const Token *tok, AccessControl varaccess);
 
     /**
      * @brief get variable from name
@@ -1207,10 +1215,13 @@ class CPPCHECKLIB Scope {
      */
     bool isVariableDeclaration(const Token* tok, const Token*& vartok, const Token*& typetok) const;
 
-    void findFunctionInBase(const std::string & name, nonneg int args, std::vector<const Function *> & matches) const;
+    void findFunctionInBase(const std::string& name,
+                            const Token* tok,
+                            size_t args,
+                            std::vector<const Function*>& matches) const;
 
     /** @brief initialize varlist */
-    void getVariableList(const Settings& settings, const Token *start, const Token *end);
+    void getVariableList(const Token *start, const Token *end);
 };
 
 /** Value type */
@@ -1238,7 +1249,7 @@ class CPPCHECKLIB ValueType {
         DOUBLE,
         LONGDOUBLE
     } type = UNKNOWN_TYPE;
-    nonneg int bits{};                         ///< bitfield bitcount
+    int bits{};                                ///< bitfield bitcount
     nonneg int pointer{};                      ///< 0=>not pointer, 1=>*, 2=>**, 3=>***, etc
     nonneg int constness{};                    ///< bit 0=data, bit 1=*, bit 2=**
     nonneg int volatileness{};                 ///< bit 0=data, bit 1=*, bit 2=**
@@ -1313,7 +1324,15 @@ class CPPCHECKLIB ValueType {
 
     bool isVolatile(nonneg int indirect = 0) const;
 
-    MathLib::bigint typeSize(const Platform &platform, bool p=false) const;
+    enum class Accuracy : std::uint8_t {
+        ExactOrZero,
+        LowerBound,
+    };
+    enum class SizeOf : std::uint8_t {
+        Pointer,
+        Pointee,
+    };
+    size_t getSizeOf(const Settings& settings, Accuracy accuracy, SizeOf sizeOf, int maxRecursion = 0) const;
 
     /// Check if type is the same ignoring const and references
     bool isTypeEqual(const ValueType* that) const;
@@ -1328,7 +1347,7 @@ class CPPCHECKLIB ValueType {
 class CPPCHECKLIB SymbolDatabase {
     friend class TestSymbolDatabase;
 public:
-    SymbolDatabase(Tokenizer& tokenizer, const Settings& settings, ErrorLogger& errorLogger);
+    explicit SymbolDatabase(Tokenizer& tokenizer);
     ~SymbolDatabase();
 
     /** @brief Information about all namespaces/classes/structures */
@@ -1414,17 +1433,26 @@ class CPPCHECKLIB SymbolDatabase {
     /** Set array dimensions when valueflow analysis is completed */
     void setArrayDimensionsUsingValueFlow();
 
-    void clangSetVariables(const std::vector<const Variable *> &variableList);
+    void clangSetVariables(const std::vector<const Variable *> &vars);
     void createSymbolDatabaseExprIds();
 
     /* returns the opening { if tok points to enum */
     static const Token* isEnumDefinition(const Token* tok);
 
+    static void getErrorMessages(ErrorLogger& /*errorLogger*/);
+
+    // check if type has no side effects (no constructors and no members with constructors)
+    /** @todo false negative: check constructors for side effects */
+    bool isRecordTypeWithoutSideEffects(const Type* type) const;
+
 private:
     friend class Scope;
     friend class Function;
 
     // Create symboldatabase...
+    /**
+     * @throws InternalError thrown on unhandled code
+     */
     void createSymbolDatabaseFindAllScopes();
     void createSymbolDatabaseClassInfo();
     void createSymbolDatabaseVariableInfo();
@@ -1448,6 +1476,9 @@ class CPPCHECKLIB SymbolDatabase {
     void addClassFunction(Scope *&scope, const Token *&tok, const Token *argStart);
     RET_NONNULL static Function *addGlobalFunctionDecl(Scope*& scope, const Token* tok, const Token *argStart, const Token* funcStart);
     Function *addGlobalFunction(Scope*& scope, const Token*& tok, const Token *argStart, const Token* funcStart);
+    /**
+     * @throws InternalError thrown on unrecognized function
+     */
     void addNewFunction(Scope *&scope, const Token *&tok);
     bool isFunction(const Token *tok, const Scope* outerScope, const Token *&funcStart, const Token *&argStart, const Token*& declEnd) const;
     const Type *findTypeInNested(const Token *startTok, const Scope *startScope) const;
@@ -1472,9 +1503,14 @@ class CPPCHECKLIB SymbolDatabase {
     void validateExecutableScopes() const;
     /**
      * @brief Check variable list, e.g. variables w/o scope
+     * @throws InternalError thrown on variable without scope
      */
     void validateVariables() const;
 
+    bool isVariableWithoutSideEffects(const Variable& var, const Type* type = nullptr) const;
+    bool isFunctionWithoutSideEffects(const Function& func, const Token* functionUsageToken,
+                                      std::list<const Function*> checkedFuncs) const;
+
     Tokenizer& mTokenizer;
     const Settings &mSettings;
     ErrorLogger &mErrorLogger;
@@ -1486,6 +1522,8 @@ class CPPCHECKLIB SymbolDatabase {
     std::list<Type> mBlankTypes;
 
     ValueType::Sign mDefaultSignedness;
+
+    mutable std::map<const Type*, bool> mIsRecordTypeWithoutSideEffectsMap;
 };
 
 
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index 47bde8814bd..a194c0c8793 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -170,8 +170,12 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *token, std::string scope,
                 if (isFunction())
                     tok1 = tok1->link()->next();
                 while (tok1 && !Token::Match(tok1, ";|{")) {
-                    if (tok1->str() == "<")
-                        tok1 = tok1->findClosingBracket();
+                    if (tok1->str() == "<") {
+                        if (const Token* closing = tok1->findClosingBracket())
+                            tok1 = closing;
+                        else
+                            syntaxError(tok1);
+                    }
                     else if (Token::Match(tok1, "(|[") && tok1->link())
                         tok1 = tok1->link();
                     if (tok1)
@@ -219,9 +223,8 @@ TemplateSimplifier::TokenAndName::TokenAndName(Token *token, std::string scope,
     }
 
     // make sure at most only one family flag is set
-    assert(isClass() ? !(isFunction() || isVariable()) : true);
-    assert(isFunction() ? !(isClass() || isVariable()) : true);
-    assert(isVariable() ? !(isClass() || isFunction()) : true);
+    if (isClass() + isFunction() + isVariable() > 1)
+        syntaxError(token);
 
     if (mToken)
         mToken->templateSimplifierPointer(this);
@@ -275,7 +278,7 @@ bool TemplateSimplifier::TokenAndName::isAliasToken(const Token *tok) const
 
 TemplateSimplifier::TemplateSimplifier(Tokenizer &tokenizer)
     : mTokenizer(tokenizer), mTokenList(mTokenizer.list), mSettings(mTokenizer.getSettings()),
-    mErrorLogger(mTokenizer.mErrorLogger)
+    mErrorLogger(mTokenizer.getErrorLogger())
 {}
 
 void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates()
@@ -493,7 +496,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
             return 0;
 
         // num/type ..
-        if (!tok->isNumber() && tok->tokType() != Token::eChar && tok->tokType() != Token::eString && !tok->isName() && !tok->isOp())
+        if (!tok->isNumber() && tok->tokType() != Token::eChar && tok->tokType() != Token::eString && !tok->isName() && !tok->isOp() && tok->str() != ".")
             return 0;
         tok = tok->next();
         if (!tok)
@@ -624,7 +627,7 @@ void TemplateSimplifier::deleteToken(Token *tok)
         tok->deleteThis();
 }
 
-static void invalidateForwardDecls(const Token* beg, const Token* end, std::map<Token*, Token*>* forwardDecls) {
+static void invalidateForwardDecls(const Token* beg, const Token* end, std::map<const Token*, Token*>* forwardDecls) {
     if (!forwardDecls)
         return;
     for (auto& fwd : *forwardDecls) {
@@ -636,7 +639,7 @@ static void invalidateForwardDecls(const Token* beg, const Token* end, std::map<
     }
 }
 
-bool TemplateSimplifier::removeTemplate(Token *tok, std::map<Token*, Token*>* forwardDecls)
+bool TemplateSimplifier::removeTemplate(Token *tok, std::map<const Token*, Token*>* forwardDecls)
 {
     if (!Token::simpleMatch(tok, "template <"))
         return false;
@@ -690,6 +693,8 @@ bool TemplateSimplifier::getTemplateDeclarations()
             else if (Token::Match(tok2, "{|=|;")) {
                 const int namepos = getTemplateNamePosition(parmEnd);
                 if (namepos > 0) {
+                    if (!tok->scopeInfo())
+                        syntaxError(tok);
                     TokenAndName decl(tok, tok->scopeInfo()->name, parmEnd->tokAt(namepos), parmEnd);
                     if (decl.isForwardDeclaration()) {
                         // Declaration => add to mTemplateForwardDeclarations
@@ -1151,6 +1156,8 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
                     instantiationArgs[index].push_back(tok1);
                     tok1 = tok1->next();
                 } while (tok1 && tok1 != endLink);
+                if (!tok1)
+                    syntaxError(end);
                 instantiationArgs[index].push_back(tok1);
             } else if (tok1->str() == "<" &&
                        (tok1->strAt(1) == ">" || (tok1->previous()->isName() &&
@@ -1160,6 +1167,8 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
                     instantiationArgs[index].push_back(tok1);
                     tok1 = tok1->next();
                 } while (tok1 && tok1 != endLink);
+                if (!tok1)
+                    syntaxError(end);
                 instantiationArgs[index].push_back(tok1);
             } else if (tok1->str() == ",") {
                 ++index;
@@ -1581,7 +1590,7 @@ void TemplateSimplifier::addNamespace(const TokenAndName &templateDeclaration, c
             }
         } else {
             if (insert)
-                mTokenList.back()->tokAt(offset)->insertToken(token, emptyString);
+                mTokenList.back()->tokAt(offset)->insertToken(token);
             else
                 mTokenList.addtoken(token, tok->linenr(), tok->column(), tok->fileIndex());
         }
@@ -1592,10 +1601,10 @@ void TemplateSimplifier::addNamespace(const TokenAndName &templateDeclaration, c
     if (token != tokStart->str() || tok->strAt(-1) != "::") {
         if (insert) {
             if (!inTemplate)
-                mTokenList.back()->tokAt(offset)->insertToken(templateDeclaration.scope().substr(start), emptyString);
+                mTokenList.back()->tokAt(offset)->insertToken(templateDeclaration.scope().substr(start));
             else
                 mTokenList.back()->tokAt(offset)->str(mTokenList.back()->strAt(offset) + templateDeclaration.scope().substr(start));
-            mTokenList.back()->tokAt(offset)->insertToken("::", emptyString);
+            mTokenList.back()->tokAt(offset)->insertToken("::");
         } else {
             if (!inTemplate)
                 mTokenList.addtoken(templateDeclaration.scope().substr(start), tok->linenr(), tok->column(), tok->fileIndex());
@@ -1647,6 +1656,12 @@ void TemplateSimplifier::expandTemplate(
 
     std::vector<newInstantiation> newInstantiations;
 
+    for (const Token* tok = templateInstantiation.token()->next()->findClosingBracket();
+         tok && tok != templateInstantiation.token(); tok = tok->previous()) {
+        if (tok->isName())
+            mUsedVariables[newName].insert(tok->str());
+    }
+
     // add forward declarations
     if (copy && isClass) {
         templateDeclaration.token()->insertTokenBefore(templateDeclarationToken->strAt(1));
@@ -1756,11 +1771,11 @@ void TemplateSimplifier::expandTemplate(
                         ++typeindentlevel;
                     else if (typetok->str() == ")")
                         --typeindentlevel;
-                    dst->insertToken(typetok->str(), typetok->originalName(), typetok->getMacroName(), true);
+                    dst->insertTokenBefore(typetok->str(), typetok->originalName(), typetok->getMacroName());
                     dst->previous()->linenr(start->linenr());
                     dst->previous()->column(start->column());
                     Token *previous = dst->previous();
-                    previous->isTemplateArg(true);
+                    previous->templateArgFrom(typetok);
                     previous->isSigned(typetok->isSigned());
                     previous->isUnsigned(typetok->isUnsigned());
                     previous->isLong(typetok->isLong());
@@ -1784,7 +1799,7 @@ void TemplateSimplifier::expandTemplate(
                     }
                 }
                 if (pointerType && Token::simpleMatch(dst1, "const")) {
-                    dst->insertToken("const", dst1->originalName(), dst1->getMacroName(), true);
+                    dst->insertTokenBefore("const", dst1->originalName(), dst1->getMacroName());
                     dst->previous()->linenr(start->linenr());
                     dst->previous()->column(start->column());
                     dst1->deleteThis();
@@ -1836,7 +1851,7 @@ void TemplateSimplifier::expandTemplate(
                         }
                         // just copy the token if it wasn't instantiated
                         if (start != closing) {
-                            dst->insertToken(start->str(), start->originalName(), start->getMacroName(), true);
+                            dst->insertTokenBefore(start->str(), start->originalName(), start->getMacroName());
                             dst->previous()->linenr(start->linenr());
                             dst->previous()->column(start->column());
                             dst->previous()->isSigned(start->isSigned());
@@ -1844,7 +1859,7 @@ void TemplateSimplifier::expandTemplate(
                             dst->previous()->isLong(start->isLong());
                         }
                     } else {
-                        dst->insertToken(start->str(), start->originalName(), start->getMacroName(), true);
+                        dst->insertTokenBefore(start->str(), start->originalName(), start->getMacroName());
                         dst->previous()->linenr(start->linenr());
                         dst->previous()->column(start->column());
                         dst->previous()->isSigned(start->isSigned());
@@ -2010,7 +2025,7 @@ void TemplateSimplifier::expandTemplate(
                                         Token::createMutualLinks(brackets1.top(), back);
                                         brackets1.pop();
                                     }
-                                    back->isTemplateArg(true);
+                                    back->templateArgFrom(typetok);
                                     back->isUnsigned(typetok->isUnsigned());
                                     back->isSigned(typetok->isSigned());
                                     back->isLong(typetok->isLong());
@@ -2074,8 +2089,11 @@ void TemplateSimplifier::expandTemplate(
         std::stack<const Token *> templates;
         int scopeCount = 0;
         for (; tok3; tok3 = tok3->next()) {
-            if (tok3->str() == "{")
+            if (tok3->str() == "{") {
+                if (isFunction && isSpecialization && inTemplateDefinition)
+                    break;
                 ++scopeCount;
+            }
             else if (tok3->str() == "}")
                 --scopeCount;
             if (scopeCount < 0)
@@ -2093,11 +2111,31 @@ void TemplateSimplifier::expandTemplate(
                     Token * const beforeTypeToken = mTokenList.back();
                     bool pointerType = false;
                     const bool isVariadicTemplateArg = templateDeclaration.isVariadic() && itype + 1 == typeParametersInDeclaration.size();
-                    if (isVariadicTemplateArg && mTypesUsedInTemplateInstantiation.size() > 1 && !Token::simpleMatch(tok3->next(), "..."))
-                        continue;
                     if (isVariadicTemplateArg && Token::Match(tok3, "%name% ... %name%"))
                         tok3 = tok3->tokAt(2);
+                    if (!isVariadicTemplateArg && copy && Token::Match(mTypesUsedInTemplateInstantiation[itype].token(), "%num% ,|>|>>") &&
+                        Token::Match(tok3->previous(), "%assign%|%cop%|( %name% %cop%|;|)")) {
+                        const Token* declTok = typeParametersInDeclaration[itype];
+                        while (Token::Match(declTok->previous(), "%name%|::|*"))
+                            declTok = declTok->previous();
+                        if (Token::Match(declTok->previous(), "[<,]")) {
+                            const Token* typetok = mTypesUsedInTemplateInstantiation[itype].token();
+                            mTokenList.addtoken("(", declTok);
+                            Token* const par1 = mTokenList.back();
+                            while (declTok != typeParametersInDeclaration[itype]) {
+                                mTokenList.addtoken(declTok);
+                                declTok = declTok->next();
+                            }
+                            mTokenList.addtoken(")", declTok);
+                            Token::createMutualLinks(par1, mTokenList.back());
+                            mTokenList.addtoken(typetok, tok3);
+                            for (Token* t = par1; t; t = t->next())
+                                t->templateArgFrom(typetok);
+                            continue;
+                        }
+                    }
                     const std::string endStr(isVariadicTemplateArg ? ">" : ",>");
+                    Token* begPar = nullptr;
                     for (Token *typetok = mTypesUsedInTemplateInstantiation[itype].token();
                          typetok && (typeindentlevel > 0 || endStr.find(typetok->str()[0]) == std::string::npos);
                          typetok = typetok->next()) {
@@ -2121,6 +2159,10 @@ void TemplateSimplifier::expandTemplate(
                             --typeindentlevel;
                         Token *back;
                         if (copy) {
+                            if (isVariadicTemplateArg && typetok == mTypesUsedInTemplateInstantiation[itype].token() && typetok->isLiteral()) {
+                                mTokenList.addtoken("(", mTokenList.back());
+                                begPar = mTokenList.back();
+                            }
                             mTokenList.addtoken(typetok, tok3);
                             back = mTokenList.back();
                         } else
@@ -2147,7 +2189,11 @@ void TemplateSimplifier::expandTemplate(
                             brackets1.pop();
                         }
                         if (copy)
-                            back->isTemplateArg(true);
+                            back->templateArgFrom(typetok);
+                    }
+                    if (begPar) {
+                        mTokenList.addtoken(")", mTokenList.back());
+                        Token::createMutualLinks(begPar, mTokenList.back());
                     }
                     if (pointerType && Token::simpleMatch(beforeTypeToken, "const")) {
                         mTokenList.addtoken(beforeTypeToken);
@@ -2216,7 +2262,7 @@ void TemplateSimplifier::expandTemplate(
                 Token::Match(tok3->next()->findClosingBracket(), ">|>>")) {
                 const Token *closingBracket = tok3->next()->findClosingBracket();
                 if (Token::simpleMatch(closingBracket->next(), "&")) {
-                    int num = 0;
+                    size_t num = 0;
                     const Token *par = tok3->next();
                     while (num < typeParametersInDeclaration.size() && par != closingBracket) {
                         const std::string pattern("[<,] " + typeParametersInDeclaration[num]->str() + " [,>]");
@@ -2551,6 +2597,10 @@ void TemplateSimplifier::simplifyTemplateArgs(Token *start, const Token *end, st
                     again = true;
                     tok = tok->previous();
                 }
+            } else if (Token::Match(tok, "( %type% ) %num%")) {
+                tok = tok->previous();
+                again = true;
+                tok->deleteNext(3);
             }
         }
 
@@ -2823,9 +2873,9 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                 } else if ((((Token::Match(tok->previous(), "[=[(,] 0 * %name%|%num% ,|]|)|;|=|%cop%") ||
                               Token::Match(tok->previous(), "return|case 0 *|&& %name%|%num% ,|:|;|=|%cop%")) &&
                              validTokenEnd(bounded, tok, backToken, 3)) ||
-                            (((Token::Match(tok->previous(), "[=[(,] 0 * (") ||
-                               Token::Match(tok->previous(), "return|case 0 *|&& (")) &&
-                              validTokenEnd(bounded, tok, backToken, 2))))) {
+                            ((Token::Match(tok->previous(), "[=[(,] 0 * (") ||
+                              Token::Match(tok->previous(), "return|case 0 *|&& (")) &&
+                             validTokenEnd(bounded, tok, backToken, 2)))) {
                     tok->deleteNext();
                     if (tok->strAt(1) == "(")
                         eraseTokens(tok, tok->linkAt(1));
@@ -2995,7 +3045,7 @@ bool TemplateSimplifier::matchSpecialization(
                 declToken->isSigned() != instToken->isSigned() ||
                 declToken->isUnsigned() != instToken->isUnsigned() ||
                 declToken->isLong() != instToken->isLong()) {
-                int nr = 0;
+                size_t nr = 0;
                 while (nr < templateParameters.size() && templateParameters[nr]->str() != declToken->str())
                     ++nr;
 
@@ -3093,7 +3143,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
 
     // locate template usage..
     std::string::size_type numberOfTemplateInstantiations = mTemplateInstantiations.size();
-    unsigned int recursiveCount = 0;
+    int recursiveCount = 0;
 
     bool instantiated = false;
 
@@ -3116,7 +3166,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                                               "templateRecursion",
                                               "TemplateSimplifier: max template recursion ("
                                               + std::to_string(mSettings.maxTemplateRecursion)
-                                              + ") reached for template '"+typeForNewName+"'. You might want to limit Cppcheck recursion.",
+                                              + ") reached for template '"+typeForNewName+"'.",
                                               Certainty::normal);
                     mErrorLogger.reportErr(errmsg);
                 }
@@ -3781,7 +3831,7 @@ void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
         // Remove concepts/requires
         // TODO concepts are not removed yet
         for (Token *tok = mTokenList.front(); tok; tok = tok->next()) {
-            if (!Token::Match(tok, ")|>|>> requires %name%|("))
+            if (!Token::Match(tok, ")|>|>>|const|noexcept requires %name%|("))
                 continue;
             const Token* end = skipRequires(tok->next());
             if (end)
@@ -3870,6 +3920,7 @@ void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
         std::unordered_map<std::string, int> nameOrdinal;
         int ordinal = 0;
         for (const auto& decl : mTemplateDeclarations) {
+            // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
             nameOrdinal.emplace(decl.fullName(), ordinal++);
         }
 
@@ -4030,7 +4081,7 @@ void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
             if (Token::Match(tok, "( ... %op%")) {
                 op = tok->tokAt(2);
                 args = tok->link()->previous();
-            } else if (Token::Match(tok, "( %name% %op% ...")) {
+            } else if (Token::Match(tok, "( %name% %op% ...") && !Token::simpleMatch(tok->previous(), "] (")) {
                 op = tok->tokAt(2);
                 args = tok->link()->previous()->isName() ? nullptr : tok->next();
             } else if (Token::Match(tok->link()->tokAt(-3), "%op% ... )")) {
diff --git a/lib/templatesimplifier.h b/lib/templatesimplifier.h
index ba0e30e651f..3c5fed3ea1c 100644
--- a/lib/templatesimplifier.h
+++ b/lib/templatesimplifier.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -45,8 +45,6 @@ struct newInstantiation;
 
 /** @brief Simplify templates from the preprocessed and partially simplified code. */
 class CPPCHECKLIB TemplateSimplifier {
-    friend class TestSimplifyTemplate;
-
 public:
     explicit TemplateSimplifier(Tokenizer &tokenizer);
 
@@ -54,6 +52,10 @@ class CPPCHECKLIB TemplateSimplifier {
         return mDump;
     }
 
+    const std::map<std::string, std::set<std::string>>& getUsedVariables() const {
+        return mUsedVariables;
+    }
+
     /**
      */
     void checkComplicatedSyntaxErrorsInTemplates();
@@ -146,10 +148,11 @@ class CPPCHECKLIB TemplateSimplifier {
         TokenAndName(Token *token, std::string scope);
         /**
          * Constructor used for declarations.
-         * \param token template declaration token "template < ... >"
-         * \param scope full qualification of template(scope)
-         * \param nameToken template name token "template < ... > class name"
-         * \param paramEnd template parameter end token ">"
+         * @param token template declaration token "template < ... >"
+         * @param scope full qualification of template(scope)
+         * @param nameToken template name token "template < ... > class name"
+         * @param paramEnd template parameter end token ">"
+         * @throws InternalError thrown on template issues
          */
         TokenAndName(Token *token, std::string scope, const Token *nameToken, const Token *paramEnd);
         TokenAndName(const TokenAndName& other);
@@ -262,6 +265,7 @@ class CPPCHECKLIB TemplateSimplifier {
     static Token *findTemplateDeclarationEnd(Token *tok);
     static const Token *findTemplateDeclarationEnd(const Token *tok);
 
+protected:
     /**
      * Match template declaration/instantiation
      * @param instance template instantiation
@@ -272,6 +276,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     static bool instantiateMatch(const Token *instance, std::size_t numberOfArguments, bool variadic, const char patternAfter[]);
 
+public: // TODO: only needs to be public for tests
     /**
      * Match template declaration/instantiation
      * @param tok The ">" token e.g. before "class"
@@ -280,6 +285,7 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     int getTemplateNamePosition(const Token *tok);
 
+private:
     /**
      * Get class template name position
      * @param tok The ">" token e.g. before "class"
@@ -304,6 +310,7 @@ class CPPCHECKLIB TemplateSimplifier {
      * */
     static bool getTemplateNamePositionTemplateVariable(const Token *tok, int &namepos);
 
+public:
     /**
      * Simplify templates
      * @param maxtime time when the simplification should be stopped
@@ -315,9 +322,11 @@ class CPPCHECKLIB TemplateSimplifier {
      * @param tok start token
      * @return true if modifications to token-list are done.
      *         false if no modifications are done.
+     * @throws InternalError thrown on division by zero in template instantiation
      */
     static bool simplifyNumericCalculations(Token *tok, bool isTemplate = true);
 
+private:
     /**
      * Simplify constant calculations such as "1+2" => "3".
      * This also performs simple cleanup of parentheses etc.
@@ -332,7 +341,6 @@ class CPPCHECKLIB TemplateSimplifier {
      */
     void simplifyTemplateArgs(Token *start, const Token *end, std::vector<newInstantiation>* newInst = nullptr);
 
-private:
     /**
      * Get template declarations
      * @return true if code has templates.
@@ -439,6 +447,7 @@ class CPPCHECKLIB TemplateSimplifier {
                               const std::list<std::string> &typeStringsUsedInTemplateInstantiation,
                               const std::string &newName);
 
+protected:
     /**
      * @brief TemplateParametersInDeclaration
      * @param tok  template < typename T, typename S >
@@ -450,12 +459,15 @@ class CPPCHECKLIB TemplateSimplifier {
         const Token * tok,
         std::vector<const Token *> & typeParametersInDeclaration);
 
+private:
     /**
      * Remove a specific "template < ..." template class/function
      */
-    static bool removeTemplate(Token *tok, std::map<Token*, Token*>* forwardDecls = nullptr);
+    static bool removeTemplate(Token *tok, std::map<const Token*, Token*>* forwardDecls = nullptr);
 
-    /** Syntax error */
+    /** Syntax error
+     * @throws InternalError thrown unconditionally
+     */
     NORETURN static void syntaxError(const Token *tok);
 
     static bool matchSpecialization(
@@ -500,9 +512,9 @@ class CPPCHECKLIB TemplateSimplifier {
 
     std::list<TokenAndName> mTemplateDeclarations;
     std::list<TokenAndName> mTemplateForwardDeclarations;
-    std::map<Token *, Token *> mTemplateForwardDeclarationsMap;
-    std::map<Token *, Token *> mTemplateSpecializationMap;
-    std::map<Token *, Token *> mTemplatePartialSpecializationMap;
+    std::map<const Token *, Token *> mTemplateForwardDeclarationsMap;
+    std::map<const Token *, Token *> mTemplateSpecializationMap;
+    std::map<const Token *, Token *> mTemplatePartialSpecializationMap;
     std::list<TokenAndName> mTemplateInstantiations;
     std::list<TokenAndName> mInstantiatedTemplates;
     std::list<TokenAndName> mMemberFunctionsToDelete;
@@ -510,6 +522,8 @@ class CPPCHECKLIB TemplateSimplifier {
     std::vector<TokenAndName> mTypesUsedInTemplateInstantiation;
     std::unordered_map<const Token*, int> mTemplateNamePos;
     std::string mDump;
+
+    std::map<std::string, std::set<std::string>> mUsedVariables;
 };
 
 /// @}
diff --git a/lib/timer.cpp b/lib/timer.cpp
index 4b1f07d5de3..275acc06078 100644
--- a/lib/timer.cpp
+++ b/lib/timer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,82 +18,70 @@
 
 #include "timer.h"
 
-#include "utils.h"
-
 #include <algorithm>
 #include <iostream>
+#include <numeric>
 #include <utility>
 #include <vector>
 
 namespace {
-    using dataElementType = std::pair<std::string, TimerResultsData>;
-    bool more_second_sec(const dataElementType& lhs, const dataElementType& rhs)
-    {
-        return lhs.second.seconds() > rhs.second.seconds();
-    }
-
     // TODO: remove and print through (synchronized) ErrorLogger instead
     std::mutex stdCoutLock;
 }
 
 // TODO: this does not include any file context when SHOWTIME_FILE thus rendering it useless - should we include the logging with the progress logging?
 // that could also get rid of the broader locking
-void TimerResults::showResults(SHOWTIME_MODES mode) const
+void TimerResults::showResults(size_t max_results, bool metrics) const
 {
-    if (mode == SHOWTIME_MODES::SHOWTIME_NONE || mode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL)
-        return;
+    using dataElementType = std::pair<std::string, std::vector<std::chrono::milliseconds>>;
 
-    TimerResultsData overallData;
     std::vector<dataElementType> data;
-
     {
         std::lock_guard<std::mutex> l(mResultsSync);
 
         data.reserve(mResults.size());
         data.insert(data.begin(), mResults.cbegin(), mResults.cend());
     }
-    std::sort(data.begin(), data.end(), more_second_sec);
+
+    const auto asSeconds = [](std::chrono::milliseconds ms) -> std::chrono::duration<double> {
+        return std::chrono::duration_cast<std::chrono::duration<double>>(ms);
+    };
+
+    const auto getSeconds = [&asSeconds](const std::vector<std::chrono::milliseconds>& results) -> std::chrono::duration<double> {
+        return std::accumulate(results.cbegin(), results.cend(), std::chrono::duration<double>{}, [&asSeconds](std::chrono::duration<double> secs, std::chrono::milliseconds duration) {
+            return secs + asSeconds(duration);
+        });
+    };
+
+    std::sort(data.begin(), data.end(), [&getSeconds](const dataElementType& lhs, const dataElementType& rhs) -> bool {
+        return getSeconds(lhs.second) > getSeconds(rhs.second);
+    });
 
     // lock the whole logging operation to avoid multiple threads printing their results at the same time
     std::lock_guard<std::mutex> l(stdCoutLock);
 
-    std::cout << std::endl;
-
     size_t ordinal = 1; // maybe it would be nice to have an ordinal in output later!
     for (auto iter=data.cbegin(); iter!=data.cend(); ++iter) {
-        const double sec = iter->second.seconds();
-        const double secAverage = sec / static_cast<double>(iter->second.mNumberOfResults);
-        bool hasParent = false;
-        {
-            // Do not use valueFlow.. in "Overall time" because those are included in Tokenizer already
-            if (startsWith(iter->first,"valueFlow"))
-                hasParent = true;
-
-            // Do not use inner timers in "Overall time"
-            const std::string::size_type pos = iter->first.rfind("::");
-            if (pos != std::string::npos)
-                hasParent = std::any_of(data.cbegin(), data.cend(), [iter,pos](const dataElementType& d) {
-                    return d.first.size() == pos && iter->first.compare(0, d.first.size(), d.first) == 0;
-                });
-        }
-        if (!hasParent)
-            overallData.mClocks += iter->second.mClocks;
-        if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5_FILE && mode != SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY) || (ordinal<=5)) {
-            std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults  << " result(s))" << std::endl;
+        if (ordinal <= max_results) {
+            const double sec = getSeconds(iter->second).count();
+            std::cout << iter->first << ": " << sec << "s";
+            if (metrics) {
+                const double secAverage = sec / static_cast<double>(iter->second.size());
+                const double secMin = asSeconds(*std::min_element(iter->second.cbegin(), iter->second.cend())).count();
+                const double secMax = asSeconds(*std::max_element(iter->second.cbegin(), iter->second.cend())).count();
+                std::cout << " (avg. " << secAverage << "s / min " << secMin << "s / max " << secMax << "s - " << iter->second.size() << " result(s))";
+            }
+            std::cout << std::endl;
         }
         ++ordinal;
     }
-
-    const double secOverall = overallData.seconds();
-    std::cout << "Overall time: " << secOverall << "s" << std::endl;
 }
 
-void TimerResults::addResults(const std::string& str, std::clock_t clocks)
+void TimerResults::addResults(const std::string& name, std::chrono::milliseconds duration)
 {
     std::lock_guard<std::mutex> l(mResultsSync);
 
-    mResults[str].mClocks += clocks;
-    mResults[str].mNumberOfResults++;
+    mResults[name].push_back(duration);
 }
 
 void TimerResults::reset()
@@ -102,18 +90,14 @@ void TimerResults::reset()
     mResults.clear();
 }
 
-Timer::Timer(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults)
-    : mStr(std::move(str))
-    , mTimerResults(timerResults)
-    , mStart(std::clock())
-    , mShowTimeMode(showtimeMode)
-    , mStopped(showtimeMode == SHOWTIME_MODES::SHOWTIME_NONE || showtimeMode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL)
-{}
-
-Timer::Timer(bool fileTotal, std::string filename)
-    : mStr(std::move(filename))
-    , mStopped(!fileTotal)
-{}
+Timer::Timer(std::string str, TimerResultsIntf* timerResults)
+    : mName(std::move(str))
+    , mResults(timerResults)
+{
+    if (!mResults)
+        return;
+    mStart = Clock::now();
+}
 
 Timer::~Timer()
 {
@@ -122,23 +106,54 @@ Timer::~Timer()
 
 void Timer::stop()
 {
-    if ((mShowTimeMode != SHOWTIME_MODES::SHOWTIME_NONE) && !mStopped) {
-        const std::clock_t end = std::clock();
-        const std::clock_t diff = end - mStart;
+    if (mStart == TimePoint{})
+        return;
 
-        if (mShowTimeMode == SHOWTIME_MODES::SHOWTIME_FILE) {
-            const double sec = static_cast<double>(diff) / CLOCKS_PER_SEC;
-            std::lock_guard<std::mutex> l(stdCoutLock);
-            std::cout << mStr << ": " << sec << "s" << std::endl;
-        } else if (mShowTimeMode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL) {
-            const double sec = static_cast<double>(diff) / CLOCKS_PER_SEC;
+    const auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStart);
+    mResults->addResults(mName, diff);
+
+    mStart = TimePoint{}; // prevent multiple stops
+}
+
+static std::string durationToString(std::chrono::milliseconds duration)
+{
+    // Extract hours
+    auto hours = std::chrono::duration_cast<std::chrono::hours>(duration);
+    duration -= hours; // Subtract the extracted hours
+
+    // Extract minutes
+    auto minutes = std::chrono::duration_cast<std::chrono::minutes>(duration);
+    duration -= minutes; // Subtract the extracted minutes
+
+    // Extract seconds
+    std::chrono::duration<double> seconds = std::chrono::duration_cast<std::chrono::duration<double>>(duration);
+
+    std::string ellapsedTime;
+    if (hours.count() > 0)
+        ellapsedTime += std::to_string(hours.count()) + "h ";
+    if (minutes.count() > 0)
+        ellapsedTime += std::to_string(minutes.count()) + "m ";
+    std::string secondsStr{std::to_string(seconds.count())};
+    auto pos = secondsStr.find_first_of('.');
+    if (pos != std::string::npos && (pos + 4) < secondsStr.size())
+        secondsStr.resize(pos + 4); // keep three decimal
+    return (ellapsedTime + secondsStr + "s");
+}
+
+OneShotTimer::OneShotTimer(std::string name)
+{
+    class MyResults : public TimerResultsIntf
+    {
+    private:
+        void addResults(const std::string &name, std::chrono::milliseconds duration) override
+        {
             std::lock_guard<std::mutex> l(stdCoutLock);
-            std::cout << "Check time: " << mStr << ": " << sec << "s" << std::endl;
-        } else {
-            if (mTimerResults)
-                mTimerResults->addResults(mStr, diff);
+
+            // TODO: do not use std::cout directly
+            std::cout << name << ": " << durationToString(duration) << std::endl;
         }
-    }
+    };
 
-    mStopped = true;
+    mResults.reset(new MyResults);
+    mTimer.reset(new Timer(std::move(name), mResults.get()));
 }
diff --git a/lib/timer.h b/lib/timer.h
index e67e170902e..1ee7fde52f9 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,58 +22,48 @@
 
 #include "config.h"
 
-#include <cstdint>
-#include <ctime>
-#include <functional>
+#include <chrono>
+#include <cstddef>
+#include <limits>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <utility>
-
-enum class SHOWTIME_MODES : std::uint8_t {
-    SHOWTIME_NONE,
-    SHOWTIME_FILE,
-    SHOWTIME_FILE_TOTAL,
-    SHOWTIME_SUMMARY,
-    SHOWTIME_TOP5_SUMMARY,
-    SHOWTIME_TOP5_FILE
-};
+#include <vector>
 
 class CPPCHECKLIB TimerResultsIntf {
 public:
     virtual ~TimerResultsIntf() = default;
 
-    virtual void addResults(const std::string& str, std::clock_t clocks) = 0;
-};
-
-struct TimerResultsData {
-    std::clock_t mClocks{};
-    long mNumberOfResults{};
-
-    double seconds() const {
-        const double ret = static_cast<double>(static_cast<unsigned long>(mClocks)) / static_cast<double>(CLOCKS_PER_SEC);
-        return ret;
-    }
+    virtual void addResults(const std::string& name, std::chrono::milliseconds duration) = 0;
 };
 
-class CPPCHECKLIB TimerResults : public TimerResultsIntf {
+class CPPCHECKLIB WARN_UNUSED TimerResults : public TimerResultsIntf {
 public:
     TimerResults() = default;
 
-    void showResults(SHOWTIME_MODES mode) const;
-    void addResults(const std::string& str, std::clock_t clocks) override;
+    void showResults(size_t max_results = std::numeric_limits<size_t>::max(), bool metrics = true) const;
+    void addResults(const std::string& name, std::chrono::milliseconds duration) override;
 
     void reset();
 
-private:
-    std::map<std::string, TimerResultsData> mResults;
+    std::map<std::string, std::vector<std::chrono::milliseconds>> getResults() const {
+        std::lock_guard<std::mutex> l(mResultsSync);
+        return mResults;
+    }
+
+protected:
+    std::map<std::string, std::vector<std::chrono::milliseconds>> mResults;
     mutable std::mutex mResultsSync;
 };
 
 class CPPCHECKLIB Timer {
 public:
-    Timer(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults = nullptr);
-    Timer(bool fileTotal, std::string filename);
+    using Clock = std::chrono::high_resolution_clock;
+    using TimePoint = std::chrono::time_point<Clock>;
+
+    explicit Timer(std::string str, TimerResultsIntf* timerResults = nullptr);
     ~Timer();
 
     Timer(const Timer&) = delete;
@@ -81,17 +71,26 @@ class CPPCHECKLIB Timer {
 
     void stop();
 
-    static void run(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults, const std::function<void()>& f) {
-        Timer t(std::move(str), showtimeMode, timerResults);
+    template<class TFunc>
+    static void run(std::string str, TimerResultsIntf* timerResults, const TFunc& f) {
+        Timer t(std::move(str), timerResults);
         f();
     }
 
 private:
-    const std::string mStr;
-    TimerResultsIntf* mTimerResults{};
-    std::clock_t mStart = std::clock();
-    const SHOWTIME_MODES mShowTimeMode = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
-    bool mStopped{};
+    const std::string mName;
+    TimePoint mStart;
+    TimerResultsIntf* mResults{};
 };
+
+class CPPCHECKLIB OneShotTimer
+{
+public:
+    explicit OneShotTimer(std::string name);
+private:
+    std::unique_ptr<TimerResultsIntf> mResults;
+    std::unique_ptr<Timer> mTimer;
+};
+
 //---------------------------------------------------------------------------
 #endif // timerH
diff --git a/lib/token.cpp b/lib/token.cpp
index 246fa16d8b7..eac69decee7 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,7 +23,6 @@
 #include "library.h"
 #include "mathlib.h"
 #include "settings.h"
-#include "simplecpp.h"
 #include "symboldatabase.h"
 #include "tokenlist.h"
 #include "utils.h"
@@ -48,6 +47,8 @@
 #include <unordered_set>
 #include <utility>
 
+#include <simplecpp.h>
+
 namespace {
     struct less {
         template<class T, class U>
@@ -57,17 +58,16 @@ namespace {
     };
 }
 
-const std::list<ValueFlow::Value> TokenImpl::mEmptyValueList;
+const std::list<ValueFlow::Value> Token::mEmptyValueList;
 const std::string Token::mEmptyString;
 
 Token::Token(const TokenList& tokenlist, std::shared_ptr<TokensFrontBack> tokensFrontBack)
     : mList(tokenlist)
     , mTokensFrontBack(std::move(tokensFrontBack))
+    , mImpl(new Impl)
     , mIsC(mList.isC())
     , mIsCpp(mList.isCPP())
-{
-    mImpl = new TokenImpl();
-}
+{}
 
 Token::Token(const Token* tok)
     : Token(tok->mList, const_cast<Token*>(tok)->mTokensFrontBack)
@@ -153,7 +153,7 @@ void Token::update_property_info()
             if ((MathLib::isInt(mStr) || MathLib::isFloat(mStr)) && mStr.find('_') == std::string::npos)
                 tokType(eNumber);
             else
-                tokType(eName); // assume it is a user defined literal
+                tokType(eLiteral); // assume it is a user defined literal
         } else if (mStr == "=" || mStr == "<<=" || mStr == ">>=" ||
                    (mStr.size() == 2U && mStr[1] == '=' && std::strchr("+-*/%&^|", mStr[0])))
             tokType(eAssignmentOp);
@@ -204,16 +204,15 @@ static const std::unordered_set<std::string> stdTypes = { "bool"
                                                           , "int"
                                                           , "long"
                                                           , "short"
-                                                          , "size_t"
                                                           , "void"
                                                           , "wchar_t"
                                                           , "signed"
                                                           , "unsigned"
 };
 
-bool Token::isStandardType(const std::string& str)
+bool Token::isStandardType(const std::string& s)
 {
-    return stdTypes.find(str) != stdTypes.end();
+    return stdTypes.find(s) != stdTypes.end();
 }
 
 void Token::update_property_isStandardType()
@@ -403,6 +402,9 @@ void Token::replace(Token *replaceThis, Token *start, Token *end)
     delete replaceThis;
 }
 
+/**
+ * @throws InternalError thrown on unexpected command or missing varid with %varid%
+ */
 static
 #if defined(__GNUC__)
 // GCC does not inline this by itself
@@ -421,7 +423,7 @@ int multiComparePercent(const Token *tok, const char*& haystack, nonneg int vari
                 return 1;
         } else { // %varid%
             if (varid == 0) {
-                throw InternalError(tok, "Internal error. Token::Match called with varid 0. Please report this to Cppcheck developers");
+                throw InternalError(tok, "Internal error. Token::Match called with varid 0.");
             }
 
             haystack += 6;
@@ -551,7 +553,7 @@ int multiCompareImpl(const Token *tok, const char *haystack, nonneg int varid)
     const char *needle = tok->str().c_str();
     const char *needlePointer = needle;
     for (;;) {
-        if (needlePointer == needle && haystack[0] == '%' && haystack[1] != '|' && haystack[1] != '\0' && haystack[1] != ' ') {
+        if (needlePointer == needle && haystack[0] == '%' && haystack[1] != '|' && haystack[1] != '\0' && haystack[1] != ' ' && haystack[1] != '=') {
             const int ret = multiComparePercent(tok, haystack, varid);
             if (ret < 2)
                 return ret;
@@ -611,7 +613,6 @@ bool Token::simpleMatch(const Token *tok, const char pattern[], size_t pattern_l
         return false; // shortcut
     const char *current = pattern;
     const char *end = pattern + pattern_len;
-    // cppcheck-suppress shadowFunction - TODO: fix this
     const char *next = static_cast<const char*>(std::memchr(pattern, ' ', pattern_len));
     if (!next)
         next = end;
@@ -634,31 +635,31 @@ bool Token::simpleMatch(const Token *tok, const char pattern[], size_t pattern_l
     return true;
 }
 
-bool Token::firstWordEquals(const char *str, const char *word)
+bool Token::firstWordEquals(const char *s, const char *word)
 {
     for (;;) {
-        if (*str != *word)
-            return (*str == ' ' && *word == 0);
-        if (*str == 0)
+        if (*s != *word)
+            return (*s == ' ' && *word == 0);
+        if (*s == 0)
             break;
 
-        ++str;
+        ++s;
         ++word;
     }
 
     return true;
 }
 
-const char *Token::chrInFirstWord(const char *str, char c)
+const char *Token::chrInFirstWord(const char *s, char c)
 {
     for (;;) {
-        if (*str == ' ' || *str == 0)
+        if (*s == ' ' || *s == 0)
             return nullptr;
 
-        if (*str == c)
-            return str;
+        if (*s == c)
+            return s;
 
-        ++str;
+        ++s;
     }
 }
 
@@ -766,7 +767,6 @@ nonneg int Token::getStrArraySize(const Token *tok)
 {
     assert(tok != nullptr);
     assert(tok->tokType() == eString);
-    // cppcheck-suppress shadowFunction - TODO: fix this
     const std::string str(getStringLiteral(tok->str()));
     int sizeofstring = 1;
     for (int i = 0; i < static_cast<int>(str.size()); i++) {
@@ -784,7 +784,7 @@ nonneg int Token::getStrSize(const Token *tok, const Settings &settings)
     if (tok->valueType()) {
         ValueType vt(*tok->valueType());
         vt.pointer = 0;
-        sizeofType = ValueFlow::getSizeOf(vt, settings);
+        sizeofType = vt.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
     }
     return getStrArraySize(tok) * sizeofType;
 }
@@ -1011,41 +1011,41 @@ Token *Token::findsimplematch(Token * const startTok, const char pattern[], size
 }
 
 template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-static T *findmatchImpl(T * const startTok, const char pattern[], const nonneg int varId)
+static T *findmatchImpl(T * const startTok, const char pattern[], const nonneg int varid)
 {
     for (T* tok = startTok; tok; tok = tok->next()) {
-        if (Token::Match(tok, pattern, varId))
+        if (Token::Match(tok, pattern, varid))
             return tok;
     }
     return nullptr;
 }
 
-const Token *Token::findmatch(const Token * const startTok, const char pattern[], const nonneg int varId)
+const Token *Token::findmatch(const Token * const startTok, const char pattern[], const nonneg int varid)
 {
-    return findmatchImpl(startTok, pattern, varId);
+    return findmatchImpl(startTok, pattern, varid);
 }
 
-Token *Token::findmatch(Token * const startTok, const char pattern[], const nonneg int varId) {
-    return findmatchImpl(startTok, pattern, varId);
+Token *Token::findmatch(Token * const startTok, const char pattern[], const nonneg int varid) {
+    return findmatchImpl(startTok, pattern, varid);
 }
 
 template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-static T *findmatchImpl(T * const startTok, const char pattern[], const Token * const end, const nonneg int varId)
+static T *findmatchImpl(T * const startTok, const char pattern[], const Token * const end, const nonneg int varid)
 {
     for (T* tok = startTok; tok && tok != end; tok = tok->next()) {
-        if (Token::Match(tok, pattern, varId))
+        if (Token::Match(tok, pattern, varid))
             return tok;
     }
     return nullptr;
 }
 
-const Token *Token::findmatch(const Token * const startTok, const char pattern[], const Token * const end, const nonneg int varId)
+const Token *Token::findmatch(const Token * const startTok, const char pattern[], const Token * const end, const nonneg int varid)
 {
-    return findmatchImpl(startTok, pattern, end, varId);
+    return findmatchImpl(startTok, pattern, end, varid);
 }
 
-Token *Token::findmatch(Token * const startTok, const char pattern[], const Token * const end, const nonneg int varId) {
-    return findmatchImpl(startTok, pattern, end, varId);
+Token *Token::findmatch(Token * const startTok, const char pattern[], const Token * const end, const nonneg int varid) {
+    return findmatchImpl(startTok, pattern, end, varid);
 }
 
 void Token::function(const Function *f)
@@ -1060,7 +1060,7 @@ void Token::function(const Function *f)
         tokType(eName);
 }
 
-Token* Token::insertToken(const std::string& tokenStr, const std::string& originalNameStr, const std::string& macroNameStr, bool prepend)
+Token* Token::insertToken(const std::string& tokenStr, bool prepend)
 {
     Token *newToken;
     if (mStr.empty())
@@ -1068,10 +1068,6 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
     else
         newToken = new Token(mList, mTokensFrontBack);
     newToken->str(tokenStr);
-    if (!originalNameStr.empty())
-        newToken->originalName(originalNameStr);
-    if (!macroNameStr.empty())
-        newToken->setMacroName(macroNameStr);
 
     if (newToken != this) {
         newToken->mImpl->mLineNumber = mImpl->mLineNumber;
@@ -1197,6 +1193,22 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
     return newToken;
 }
 
+Token* Token::insertToken(const std::string& tokenStr, const std::string& originalNameStr, bool prepend)
+{
+    Token* const newToken = insertToken(tokenStr, prepend);
+    if (!originalNameStr.empty())
+        newToken->originalName(originalNameStr);
+    return newToken;
+}
+
+Token* Token::insertToken(const std::string& tokenStr, const std::string& originalNameStr, const std::string& macroNameStr, bool prepend)
+{
+    Token* const newToken = insertToken(tokenStr, originalNameStr, prepend);
+    if (!macroNameStr.empty())
+        newToken->setMacroName(macroNameStr);
+    return newToken;
+}
+
 void Token::eraseTokens(Token *begin, const Token *end)
 {
     if (!begin || begin == end)
@@ -1318,10 +1330,10 @@ std::string Token::stringifyList(const stringifyOptions& options, const std::vec
 
     std::string ret;
 
-    unsigned int lineNumber = mImpl->mLineNumber - (options.linenumbers ? 1U : 0U);
+    nonneg int lineNumber = mImpl->mLineNumber - (options.linenumbers ? 1 : 0);
     // cppcheck-suppress shadowFunction - TODO: fix this
-    unsigned int fileIndex = options.files ? ~0U : mImpl->mFileIndex;
-    std::map<int, unsigned int> lineNumbers;
+    nonneg int fileIndex = options.files ? ~0U : mImpl->mFileIndex;
+    std::map<nonneg int, nonneg int> lineNumbers;
     for (const Token *tok = this; tok != end; tok = tok->next()) {
         assert(tok && "end precedes token");
         if (!tok)
@@ -1406,11 +1418,6 @@ std::string Token::stringifyList(const Token* end, bool attributes) const
     return stringifyList(false, attributes, false, false, false, nullptr, end);
 }
 
-std::string Token::stringifyList(bool varid) const
-{
-    return stringifyList(varid, false, true, true, true, nullptr, nullptr);
-}
-
 void Token::astParent(Token* tok)
 {
     const Token* tok2 = tok;
@@ -1606,8 +1613,8 @@ static std::string stringFromTokenRange(const Token* start, const Token* end)
                 else if (c >= ' ' && c <= 126)
                     ret += c;
                 else {
-                    char str[10];
-                    sprintf(str, "\\x%02x", c);
+                    char str[5];
+                    snprintf(str, sizeof(str), "\\x%02x", c);
                     ret += str;
                 }
             }
@@ -1655,7 +1662,7 @@ static void astStringXml(const Token *tok, nonneg int indent, std::ostream &out)
     }
 }
 
-void Token::printAst(bool verbose, bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const
+void Token::printAst(bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const
 {
     if (!xml)
         out << "\n\n##AST" << std::endl;
@@ -1672,10 +1679,8 @@ void Token::printAst(bool verbose, bool xml, const std::vector<std::string> &fil
                     << "\" column=\"" << tok->column() << "\">" << std::endl;
                 astStringXml(tok, 2U, out);
                 out << "</ast>" << std::endl;
-            } else if (verbose)
+            } else
                 out << "[" << fileNames[tok->fileIndex()] << ":" << tok->linenr() << "]" << std::endl << tok->astStringVerbose() << std::endl;
-            else
-                out << tok->astString(" ") << std::endl;
             if (tok->str() == "(")
                 tok = tok->link();
         }
@@ -1808,7 +1813,7 @@ void Token::printValueFlow(const std::vector<std::string>& files, bool xml, std:
                 outs += "      <value ";
                 switch (value.valueType) {
                 case ValueFlow::Value::ValueType::INT:
-                    if (tok->valueType() && tok->valueType()->sign == ValueType::UNSIGNED) {
+                    if (tok->valueType() && tok->valueType()->sign == ValueType::UNSIGNED && value.toString() != "!<=-1") {
                         outs += "intvalue=\"";
                         outs += MathLib::toString(static_cast<MathLib::biguint>(value.intvalue));
                         outs += '\"';
@@ -2348,12 +2353,12 @@ const ::Type* Token::typeOf(const Token* tok, const Token** typeTok)
         return tok->variable()->type();
     if (tok->function())
         return tok->function()->retType;
+    if (tok->valueType() && tok->valueType()->typeScope && tok->valueType()->typeScope->definedType)
+        return tok->valueType()->typeScope->definedType;
     if (Token::simpleMatch(tok, "return")) {
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Scope *scope = tok->scope();
         if (!scope)
             return nullptr;
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Function *function = scope->function;
         if (!function)
             return nullptr;
@@ -2428,6 +2433,7 @@ std::pair<const Token*, const Token*> Token::typeDecl(const Token* tok, bool poi
                     varTok = varTok->next();
                 while (Token::Match(varTok, "%name% ::"))
                     varTok = varTok->tokAt(2);
+                assert(varTok != tok);
                 std::pair<const Token*, const Token*> r = typeDecl(varTok);
                 if (r.first)
                     return r;
@@ -2449,7 +2455,7 @@ std::pair<const Token*, const Token*> Token::typeDecl(const Token* tok, bool poi
                     typeBeg = previousBeforeAstLeftmostLeaf(tok2);
                     typeEnd = tok2;
                 }
-                if (typeBeg)
+                if (typeBeg && typeBeg != typeEnd)
                     result = { typeBeg->next(), typeEnd }; // handle smart pointers/iterators first
             }
             if (astIsRangeBasedForDecl(var->nameToken()) && astIsContainer(var->nameToken()->astParent()->astOperand2())) { // range-based for
@@ -2463,18 +2469,15 @@ std::pair<const Token*, const Token*> Token::typeDecl(const Token* tok, bool poi
         return {var->typeStartToken(), var->typeEndToken()->next()};
     }
     if (Token::simpleMatch(tok, "return")) {
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Scope* scope = tok->scope();
         if (!scope)
             return {};
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Function* function = scope->function;
         if (!function)
             return {};
         return { function->retDef, function->returnDefEnd() };
     }
     if (tok->previous() && tok->previous()->function()) {
-        // cppcheck-suppress shadowFunction - TODO: fix this
         const Function *function = tok->previous()->function();
         return {function->retDef, function->returnDefEnd()};
     }
@@ -2620,7 +2623,6 @@ const ValueFlow::Value* Token::getMovedValue() const
     return it == mImpl->mValues->end() ? nullptr : &*it;
 }
 
-// cppcheck-suppress unusedFunction
 const ValueFlow::Value* Token::getContainerSizeValue(const MathLib::bigint val) const
 {
     if (!mImpl->mValues)
@@ -2631,7 +2633,7 @@ const ValueFlow::Value* Token::getContainerSizeValue(const MathLib::bigint val)
     return it == mImpl->mValues->end() ? nullptr : &*it;
 }
 
-TokenImpl::~TokenImpl()
+Token::Impl::~Impl()
 {
     delete mMacroName;
     delete mOriginalName;
@@ -2639,8 +2641,8 @@ TokenImpl::~TokenImpl()
     delete mValues;
 
     if (mTemplateSimplifierPointers) {
-        for (auto *templateSimplifierPointer : *mTemplateSimplifierPointers) {
-            templateSimplifierPointer->token(nullptr);
+        for (auto *p : *mTemplateSimplifierPointers) {
+            p->token(nullptr);
         }
     }
     delete mTemplateSimplifierPointers;
@@ -2652,26 +2654,26 @@ TokenImpl::~TokenImpl()
     }
 }
 
-void TokenImpl::setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint value)
+void Token::Impl::setCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint value)
 {
     CppcheckAttributes *attr = mCppcheckAttributes;
-    while (attr && attr->type != type)
+    while (attr && attr->type != attrType)
         attr = attr->next;
     if (attr)
         attr->value = value;
     else {
         attr = new CppcheckAttributes;
-        attr->type = type;
+        attr->type = attrType;
         attr->value = value;
         attr->next = mCppcheckAttributes;
         mCppcheckAttributes = attr;
     }
 }
 
-bool TokenImpl::getCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint &value) const
+bool Token::Impl::getCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint &value) const
 {
-    CppcheckAttributes *attr = mCppcheckAttributes;
-    while (attr && attr->type != type)
+    const CppcheckAttributes *attr = mCppcheckAttributes;
+    while (attr && attr->type != attrType)
         attr = attr->next;
     if (attr)
         value = attr->value;
@@ -2721,3 +2723,30 @@ Token* findLambdaEndScope(Token* tok)
 const Token* findLambdaEndScope(const Token* tok) {
     return findLambdaEndScope(const_cast<Token*>(tok));
 }
+
+void Token::templateArgFrom(const Token* fromToken) {
+    setFlag(fIsTemplateArg, fromToken != nullptr);
+    mImpl->mTemplateArgFileIndex = fromToken ? fromToken->mImpl->mFileIndex : -1;
+    mImpl->mTemplateArgLineNumber = fromToken ? fromToken->mImpl->mLineNumber : -1;
+    mImpl->mTemplateArgColumn = fromToken ? fromToken->mImpl->mColumn : -1;
+}
+
+const SmallVector<ReferenceToken>& Token::refs(bool temporary) const
+{
+    if (temporary) {
+        if (!mImpl->mRefsTemp)
+            mImpl->mRefsTemp.reset(new SmallVector<ReferenceToken>(followAllReferences(this, true)));
+        return *mImpl->mRefsTemp;
+    }
+
+    if (!mImpl->mRefs)
+        mImpl->mRefs.reset(new SmallVector<ReferenceToken>(followAllReferences(this, false)));
+    return *mImpl->mRefs;
+}
+
+bool Token::isMutableExpr() const
+{
+    if (mImpl->mMutableExpr == -1)
+        mImpl->mMutableExpr = isMutableExpression(this);
+    return !!mImpl->mMutableExpr;
+}
diff --git a/lib/token.h b/lib/token.h
index 59774747f70..fd4804ec980 100644
--- a/lib/token.h
+++ b/lib/token.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "errortypes.h"
 #include "mathlib.h"
+#include "smallvector.h"
 #include "templatesimplifier.h"
 #include "utils.h"
 #include "vfvalue.h"
@@ -33,6 +34,7 @@
 #include <cstdint>
 #include <cstddef>
 #include <functional>
+#include <limits>
 #include <list>
 #include <memory>
 #include <ostream>
@@ -53,6 +55,7 @@ class ConstTokenRange;
 class Token;
 struct TokensFrontBack;
 class TokenList;
+struct ReferenceToken;
 
 struct ScopeInfo2 {
     ScopeInfo2(std::string name_, const Token *bodyEnd_, std::set<std::string> usingNamespaces_ = std::set<std::string>()) : name(std::move(name_)), bodyEnd(bodyEnd_), usingNamespaces(std::move(usingNamespaces_)) {}
@@ -63,92 +66,6 @@ struct ScopeInfo2 {
 
 enum class TokenDebug : std::uint8_t { None, ValueFlow, ValueType };
 
-struct TokenImpl {
-    nonneg int mVarId{};
-    nonneg int mFileIndex{};
-    nonneg int mLineNumber{};
-    nonneg int mColumn{};
-    nonneg int mExprId{};
-
-    /**
-     * A value from 0-100 that provides a rough idea about where in the token
-     * list this token is located.
-     */
-    nonneg int mProgressValue{};
-
-    /**
-     * Token index. Position in token list
-     */
-    nonneg int mIndex{};
-
-    /** Bitfield bit count. */
-    unsigned char mBits{};
-
-    // AST..
-    Token* mAstOperand1{};
-    Token* mAstOperand2{};
-    Token* mAstParent{};
-
-    // symbol database information
-    const Scope* mScope{};
-    union {
-        const Function *mFunction;
-        const Variable *mVariable;
-        const ::Type* mType;
-        const Enumerator *mEnumerator;
-    };
-
-    // original name like size_t
-    std::string* mOriginalName{};
-
-    // If this token came from a macro replacement list, this is the name of that macro
-    std::string* mMacroName{};
-
-    // ValueType
-    ValueType* mValueType{};
-
-    // ValueFlow
-    std::list<ValueFlow::Value>* mValues{};
-    static const std::list<ValueFlow::Value> mEmptyValueList;
-
-    // Pointer to a template in the template simplifier
-    std::set<TemplateSimplifier::TokenAndName*>* mTemplateSimplifierPointers{};
-
-    // Pointer to the object representing this token's scope
-    std::shared_ptr<ScopeInfo2> mScopeInfo;
-
-    // __cppcheck_in_range__
-    struct CppcheckAttributes {
-        enum Type : std::uint8_t { LOW, HIGH } type = LOW;
-        MathLib::bigint value{};
-        CppcheckAttributes* next{};
-    };
-    CppcheckAttributes* mCppcheckAttributes{};
-
-    // alignas expressions
-    std::unique_ptr<std::vector<std::string>> mAttributeAlignas;
-    void addAttributeAlignas(const std::string& a) {
-        if (!mAttributeAlignas)
-            mAttributeAlignas = std::unique_ptr<std::vector<std::string>>(new std::vector<std::string>());
-        if (std::find(mAttributeAlignas->cbegin(), mAttributeAlignas->cend(), a) == mAttributeAlignas->cend())
-            mAttributeAlignas->push_back(a);
-    }
-
-    std::string mAttributeCleanup;
-
-    // For memoization, to speed up parsing of huge arrays #8897
-    enum class Cpp11init : std::uint8_t { UNKNOWN, CPP11INIT, NOINIT } mCpp11init = Cpp11init::UNKNOWN;
-
-    TokenDebug mDebug{};
-
-    void setCppcheckAttribute(CppcheckAttributes::Type type, MathLib::bigint value);
-    bool getCppcheckAttribute(CppcheckAttributes::Type type, MathLib::bigint &value) const;
-
-    TokenImpl() : mFunction(nullptr) {}
-
-    ~TokenImpl();
-};
-
 /// @addtogroup Core
 /// @{
 
@@ -163,9 +80,110 @@ struct TokenImpl {
  * The Token class also has other functions for management of token list, matching tokens, etc.
  */
 class CPPCHECKLIB Token {
-    friend class TestToken;
+
+public:
+    enum CppcheckAttributesType : std::uint8_t { LOW, HIGH };
+    enum class Cpp11init : std::uint8_t { UNKNOWN, CPP11INIT, NOINIT };
 
 private:
+    struct Impl {
+        nonneg int mVarId{};
+        nonneg int mFileIndex{};
+        nonneg int mLineNumber{};
+        nonneg int mColumn{};
+        nonneg int mExprId{};
+
+        // original template argument location
+        int mTemplateArgFileIndex{-1};
+        int mTemplateArgLineNumber{-1};
+        int mTemplateArgColumn{-1};
+
+        /**
+         * A value from 0-100 that provides a rough idea about where in the token
+         * list this token is located.
+         */
+        nonneg int mProgressValue{};
+
+        /**
+         * Token index. Position in token list
+         */
+        nonneg int mIndex{};
+
+        /** Bitfield bit count. */
+        short mBits = -1;
+
+        // AST..
+        Token* mAstOperand1{};
+        Token* mAstOperand2{};
+        Token* mAstParent{};
+        Token* mAstTop{};
+
+        // symbol database information
+        const Scope* mScope{};
+        union {
+            const Function *mFunction{};
+            const Variable *mVariable;
+            const ::Type* mType;
+            const Enumerator *mEnumerator;
+        };
+
+        // original name like size_t
+        std::string* mOriginalName{};
+
+        // If this token came from a macro replacement list, this is the name of that macro
+        std::string* mMacroName{};
+
+        // ValueType
+        ValueType* mValueType{};
+
+        // ValueFlow
+        std::list<ValueFlow::Value>* mValues{};
+
+        // Pointer to a template in the template simplifier
+        std::set<TemplateSimplifier::TokenAndName*>* mTemplateSimplifierPointers{};
+
+        // Pointer to the object representing this token's scope
+        std::shared_ptr<ScopeInfo2> mScopeInfo;
+
+        // __cppcheck_in_range__
+        struct CppcheckAttributes {
+            CppcheckAttributesType type{LOW};
+            MathLib::bigint value{};
+            CppcheckAttributes* next{};
+        };
+        CppcheckAttributes* mCppcheckAttributes{};
+
+        // alignas expressions
+        std::unique_ptr<std::vector<std::string>> mAttributeAlignas;
+        void addAttributeAlignas(const std::string& a) {
+            if (!mAttributeAlignas)
+                mAttributeAlignas = std::unique_ptr<std::vector<std::string>>(new std::vector<std::string>());
+            if (std::find(mAttributeAlignas->cbegin(), mAttributeAlignas->cend(), a) == mAttributeAlignas->cend())
+                mAttributeAlignas->push_back(a);
+        }
+
+        std::string mAttributeCleanup;
+
+        // For memoization, to speed up parsing of huge arrays #8897
+        Cpp11init mCpp11init{Cpp11init::UNKNOWN};
+
+        TokenDebug mDebug{};
+
+        std::unique_ptr<SmallVector<ReferenceToken>> mRefs;
+        std::unique_ptr<SmallVector<ReferenceToken>> mRefsTemp;
+
+        std::int8_t mMutableExpr{-1};
+
+        void setCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint value);
+        bool getCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint &value) const;
+
+        Impl() = default;
+        ~Impl();
+
+        Impl(const Impl &) = delete;
+        Impl operator=(const Impl &) = delete;
+    };
+
     const TokenList& mList;
     std::shared_ptr<TokensFrontBack> mTokensFrontBack;
 
@@ -231,35 +249,35 @@ class CPPCHECKLIB Token {
      * For example index 1 would return next token, and 2
      * would return next from that one.
      */
-    const Token *tokAt(int index) const
+    const Token *tokAt(int idx) const
     {
-        return tokAtImpl(this, index);
+        return tokAtImpl(this, idx);
     }
-    Token *tokAt(int index)
+    Token *tokAt(int idx)
     {
-        return tokAtImpl(this, index);
+        return tokAtImpl(this, idx);
     }
 
     /**
      * @return the link to the token in given index, related to this token.
      * For example index 1 would return the link to next token.
      */
-    const Token *linkAt(int index) const
+    const Token *linkAt(int idx) const
     {
-        return linkAtImpl(this, index);
+        return linkAtImpl(this, idx);
     }
-    Token *linkAt(int index)
+    Token *linkAt(int idx)
     {
-        return linkAtImpl(this, index);
+        return linkAtImpl(this, idx);
     }
 
     /**
      * @return String of the token in given index, related to this token.
      * If that token does not exist, an empty string is being returned.
      */
-    const std::string &strAt(int index) const
+    const std::string &strAt(int idx) const
     {
-        const Token *tok = this->tokAt(index);
+        const Token *tok = this->tokAt(idx);
         return tok ? tok->mStr : mEmptyString;
     }
 
@@ -586,11 +604,11 @@ class CPPCHECKLIB Token {
     bool hasAttributeCleanup() const {
         return !mImpl->mAttributeCleanup.empty();
     }
-    void setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint value) {
-        mImpl->setCppcheckAttribute(type, value);
+    void setCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint value) {
+        mImpl->setCppcheckAttribute(attrType, value);
     }
-    bool getCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint &value) const {
-        return mImpl->getCppcheckAttribute(type, value);
+    bool getCppcheckAttribute(CppcheckAttributesType attrType, MathLib::bigint &value) const {
+        return mImpl->getCppcheckAttribute(attrType, value);
     }
     // cppcheck-suppress unusedFunction
     bool hasCppcheckAttributes() const {
@@ -714,11 +732,11 @@ class CPPCHECKLIB Token {
         setFlag(fIsTemplate, b);
     }
 
-    bool isSimplifiedScope() const {
-        return getFlag(fIsSimplifedScope);
+    bool isSimplifiedIfInitStmt() const {
+        return getFlag(fIsSimplifiedIfInitStmt);
     }
-    void isSimplifiedScope(bool b) {
-        setFlag(fIsSimplifedScope, b);
+    void isSimplifiedIfInitStmt(bool b) {
+        setFlag(fIsSimplifiedIfInitStmt, b);
     }
 
     bool isFinalType() const {
@@ -742,11 +760,26 @@ class CPPCHECKLIB Token {
         setFlag(fIsInitBracket, b);
     }
 
+    bool isAnonymous() const {
+        return getFlag(fIsAnonymous);
+    }
+    void isAnonymous(bool b) {
+        setFlag(fIsAnonymous, b);
+    }
+
+    bool isInsertedBrace() const {
+        return getFlag(fIsInsertedBrace);
+    }
+    Token* isInsertedBrace(bool b) {
+        setFlag(fIsInsertedBrace, b);
+        return this;
+    }
+
     // cppcheck-suppress unusedFunction
     bool isBitfield() const {
-        return mImpl->mBits > 0;
+        return mImpl->mBits >= 0;
     }
-    unsigned char bits() const {
+    short bits() const {
         return mImpl->mBits;
     }
     const std::set<TemplateSimplifier::TokenAndName*>* templateSimplifierPointers() const {
@@ -760,8 +793,14 @@ class CPPCHECKLIB Token {
             mImpl->mTemplateSimplifierPointers = new std::set<TemplateSimplifier::TokenAndName*>;
         mImpl->mTemplateSimplifierPointers->insert(tokenAndName);
     }
-    void setBits(const unsigned char b) {
-        mImpl->mBits = b;
+    bool setBits(const MathLib::bigint b) {
+        const MathLib::bigint max = std::numeric_limits<short>::max();
+        if (b > max) {
+            mImpl->mBits = static_cast<short>(max);
+            return false;
+        }
+        mImpl->mBits = b < 0 ? -1 : static_cast<short>(b);
+        return true;
     }
 
     bool isUtf8() const {
@@ -780,12 +819,12 @@ class CPPCHECKLIB Token {
     }
 
     bool isCChar() const {
-        return (((mTokType == eString) && isPrefixStringCharLiteral(mStr, '"', emptyString)) ||
-                ((mTokType == eChar) && isPrefixStringCharLiteral(mStr, '\'', emptyString) && (replaceEscapeSequences(getCharLiteral(mStr)).size() == 1)));
+        return (((mTokType == eString) && isPrefixStringCharLiteral(mStr, '"', "")) ||
+                ((mTokType == eChar) && isPrefixStringCharLiteral(mStr, '\'', "") && (replaceEscapeSequences(getCharLiteral(mStr)).size() == 1)));
     }
 
     bool isCMultiChar() const {
-        return (mTokType == eChar) && isPrefixStringCharLiteral(mStr, '\'', emptyString) && (replaceEscapeSequences(getCharLiteral(mStr)).size() > 1);
+        return (mTokType == eChar) && isPrefixStringCharLiteral(mStr, '\'', "") && (replaceEscapeSequences(getCharLiteral(mStr)).size() > 1);
     }
 
     /**
@@ -808,8 +847,15 @@ class CPPCHECKLIB Token {
     bool isTemplateArg() const {
         return getFlag(fIsTemplateArg);
     }
-    void isTemplateArg(const bool value) {
-        setFlag(fIsTemplateArg, value);
+    void templateArgFrom(const Token* fromToken);
+    int templateArgFileIndex() const {
+        return mImpl->mTemplateArgFileIndex;
+    }
+    int templateArgLineNumber() const {
+        return mImpl->mTemplateArgLineNumber;
+    }
+    int templateArgColumn() const {
+        return mImpl->mTemplateArgColumn;
     }
 
     const std::string& getMacroName() const {
@@ -834,8 +880,8 @@ class CPPCHECKLIB Token {
     }
     static const Token *findsimplematch(const Token * startTok, const char pattern[], size_t pattern_len, const Token * end);
 
-    static const Token *findmatch(const Token * startTok, const char pattern[], nonneg int varId = 0);
-    static const Token *findmatch(const Token * startTok, const char pattern[], const Token * end, nonneg int varId = 0);
+    static const Token *findmatch(const Token * startTok, const char pattern[], nonneg int varid = 0);
+    static const Token *findmatch(const Token * startTok, const char pattern[], const Token * end, nonneg int varid = 0);
 
     template<size_t count>
     static Token *findsimplematch(Token * const startTok, const char (&pattern)[count]) {
@@ -848,34 +894,38 @@ class CPPCHECKLIB Token {
     }
     static Token *findsimplematch(Token * startTok, const char pattern[], size_t pattern_len, const Token * end);
 
-    static Token *findmatch(Token * startTok, const char pattern[], nonneg int varId = 0);
-    static Token *findmatch(Token * startTok, const char pattern[], const Token * end, nonneg int varId = 0);
+    static Token *findmatch(Token * startTok, const char pattern[], nonneg int varid = 0);
+    static Token *findmatch(Token * startTok, const char pattern[], const Token * end, nonneg int varid = 0);
 
 private:
     template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-    static T *tokAtImpl(T *tok, int index)
+    static T *tokAtImpl(T *tok, int idx)
     {
-        while (index > 0 && tok) {
+        while (idx > 0 && tok) {
             tok = tok->next();
-            --index;
+            --idx;
         }
-        while (index < 0 && tok) {
+        while (idx < 0 && tok) {
             tok = tok->previous();
-            ++index;
+            ++idx;
         }
         return tok;
     }
 
+    /**
+     * @throws InternalError thrown if index is out of range
+     */
     template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-    static T *linkAtImpl(T *thisTok, int index)
+    static T *linkAtImpl(T *thisTok, int idx)
     {
-        T *tok = thisTok->tokAt(index);
+        T *tok = thisTok->tokAt(idx);
         if (!tok) {
             throw InternalError(thisTok, "Internal error. Token::linkAt called with index outside the tokens range.");
         }
         return tok->link();
     }
 
+protected:
     /**
      * Needle is build from multiple alternatives. If one of
      * them is equal to haystack, return value is 1. If there
@@ -931,17 +981,46 @@ class CPPCHECKLIB Token {
      */
     static void eraseTokens(Token *begin, const Token *end);
 
+    /**
+     * Insert new token after this token. This function will handle
+     * relations between next and previous token also.
+     * @param tokenStr String for the new token.
+     */
+    RET_NONNULL Token* insertToken(const std::string& tokenStr)
+    {
+        return insertToken(tokenStr, false);
+    }
+    /**
+     * Insert new token after this token. This function will handle
+     * relations between next and previous token also.
+     * @param tokenStr String for the new token.
+     * @param originalNameStr String used for Token::originalName().
+     */
+    RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr)
+    {
+        return insertToken(tokenStr, originalNameStr, false);
+    }
     /**
      * Insert new token after this token. This function will handle
      * relations between next and previous token also.
      * @param tokenStr String for the new token.
      * @param originalNameStr String used for Token::originalName().
-     * @param prepend Insert the new token before this token when it's not
-     * the first one on the tokens list.
+     * @param macroNameStr String used for Token::getMacroName().
      */
-    RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr = emptyString, const std::string& macroNameStr = emptyString, bool prepend = false);
+    RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr, const std::string& macroNameStr)
+    {
+        return insertToken(tokenStr, originalNameStr, macroNameStr, false);
+    }
 
-    RET_NONNULL Token* insertTokenBefore(const std::string& tokenStr, const std::string& originalNameStr = emptyString, const std::string& macroNameStr = emptyString)
+    RET_NONNULL Token* insertTokenBefore(const std::string& tokenStr)
+    {
+        return insertToken(tokenStr, true);
+    }
+    RET_NONNULL Token* insertTokenBefore(const std::string& tokenStr, const std::string& originalNameStr)
+    {
+        return insertToken(tokenStr, originalNameStr, true);
+    }
+    RET_NONNULL Token* insertTokenBefore(const std::string& tokenStr, const std::string& originalNameStr, const std::string& macroNameStr)
     {
         return insertToken(tokenStr, originalNameStr, macroNameStr, true);
     }
@@ -1039,7 +1118,7 @@ class CPPCHECKLIB Token {
             options.files = true;
             return options;
         }
-        // cppcheck-suppress unusedFunction
+        // cppcheck-suppress unusedFunction - used in tests only
         static stringifyOptions forDebugVarId() {
             stringifyOptions options = forDebug();
             options.varid = true;
@@ -1071,7 +1150,6 @@ class CPPCHECKLIB Token {
 
     std::string stringifyList(const stringifyOptions& options, const std::vector<std::string>* fileNames = nullptr, const Token* end = nullptr) const;
     std::string stringifyList(const Token* end, bool attributes = true) const;
-    std::string stringifyList(bool varid = false) const;
 
     /**
      * Stringify a list of token, from current instance on.
@@ -1197,7 +1275,7 @@ class CPPCHECKLIB Token {
 
     static std::string typeStr(const Token* tok);
 
-    static bool isStandardType(const std::string& str);
+    static bool isStandardType(const std::string& s);
 
     /**
      * @return a pointer to the Enumerator associated with this token.
@@ -1289,9 +1367,15 @@ class CPPCHECKLIB Token {
     }
 
     const std::list<ValueFlow::Value>& values() const {
-        return mImpl->mValues ? *mImpl->mValues : TokenImpl::mEmptyValueList;
+        return mImpl->mValues ? *mImpl->mValues : mEmptyValueList;
     }
 
+    // provides and caches result of a followAllReferences() call
+    const SmallVector<ReferenceToken>& refs(bool temporary = true) const;
+
+    // provides and caches the result of a isMutableExpression() call
+    bool isMutableExpr() const;
+
     /**
      * Sets the original name.
      */
@@ -1349,6 +1433,7 @@ class CPPCHECKLIB Token {
     void assignIndexes();
 
 private:
+    static const std::list<ValueFlow::Value> mEmptyValueList;
 
     void next(Token *nextToken) {
         mNext = nextToken;
@@ -1362,17 +1447,21 @@ class CPPCHECKLIB Token {
 
     /**
      * Works almost like strcmp() except returns only true or false and
-     * if str has empty space &apos; &apos; character, that character is handled
+     * if s has empty space &apos; &apos; character, that character is handled
      * as if it were &apos;\\0&apos;
      */
-    static bool firstWordEquals(const char *str, const char *word);
+    static bool firstWordEquals(const char *s, const char *word);
 
     /**
      * Works almost like strchr() except
-     * if str has empty space &apos; &apos; character, that character is handled
+     * if s has empty space &apos; &apos; character, that character is handled
      * as if it were &apos;\\0&apos;
      */
-    static const char *chrInFirstWord(const char *str, char c);
+    static const char *chrInFirstWord(const char *s, char c);
+
+    RET_NONNULL Token* insertToken(const std::string& tokenStr, bool prepend);
+    RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr, bool prepend);
+    RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr, const std::string& macroNameStr, bool prepend);
 
     std::string mStr;
 
@@ -1417,7 +1506,7 @@ class CPPCHECKLIB Token {
         fIsImplicitInt          = (1ULL << 33), // Is "int" token implicitly added?
         fIsInline               = (1ULL << 34), // Is this a inline type
         fIsTemplate             = (1ULL << 35),
-        fIsSimplifedScope       = (1ULL << 36), // scope added when simplifying e.g. if (int i = ...; ...)
+        fIsSimplifiedIfInitStmt = (1ULL << 36), // simplified if/switch/while init statement e.g. if (int i = ...; ...) => { int i = ...; if (..) ..  }
         fIsRemovedVoidParameter = (1ULL << 37), // A void function parameter has been removed
         fIsIncompleteConstant   = (1ULL << 38),
         fIsRestrict             = (1ULL << 39), // Is this a restrict pointer type
@@ -1426,6 +1515,8 @@ class CPPCHECKLIB Token {
         fIsFinalType            = (1ULL << 42), // Is this a type with final specifier
         fIsInitComma            = (1ULL << 43), // Is this comma located inside some {..}. i.e: {1,2,3,4}
         fIsInitBracket          = (1ULL << 44), // Is this bracket used as a part of variable initialization i.e: int a{5}, b(2);
+        fIsAnonymous            = (1ULL << 45), // Is this a token added for an unnamed member
+        fIsInsertedBrace        = (1ULL << 46), // brace added when simplifying e.g. if (x) f(); => if (x) { f(); }
     };
 
     enum : std::uint8_t {
@@ -1437,7 +1528,7 @@ class CPPCHECKLIB Token {
 
     uint64_t mFlags{};
 
-    TokenImpl* mImpl{};
+    Impl* mImpl{};
 
     /**
      * Get specified flag state.
@@ -1458,7 +1549,9 @@ class CPPCHECKLIB Token {
     }
 
     /** Updates internal property cache like _isName or _isBoolean.
-        Called after any mStr() modification. */
+        Called after any mStr() modification.
+        @throws InternalError thrown if a bool literal has a varid
+     */
     void update_property_info();
 
     /** Update internal property cache about isStandardType() */
@@ -1474,7 +1567,13 @@ class CPPCHECKLIB Token {
 public:
     void astOperand1(Token *tok);
     void astOperand2(Token *tok);
+    /**
+     * @throws InternalError thrown on cyclic dependency
+     */
     void astParent(Token* tok);
+    void astTop(Token * tok) {
+        mImpl->mAstTop = tok;
+    }
 
     Token * astOperand1() {
         return mImpl->mAstOperand1;
@@ -1515,6 +1614,9 @@ class CPPCHECKLIB Token {
 
     }
     RET_NONNULL Token *astTop() {
+        if (mImpl->mAstTop) {
+            return mImpl->mAstTop;
+        }
         Token *ret = this;
         while (ret->mImpl->mAstParent)
             ret = ret->mImpl->mAstParent;
@@ -1522,12 +1624,18 @@ class CPPCHECKLIB Token {
     }
 
     RET_NONNULL const Token *astTop() const {
+        if (mImpl->mAstTop) {
+            return mImpl->mAstTop;
+        }
         const Token *ret = this;
         while (ret->mImpl->mAstParent)
             ret = ret->mImpl->mAstParent;
         return ret;
     }
 
+    /**
+     * @throws InternalError thrown if start or end cannot be found
+     */
     std::pair<const Token *, const Token *> findExpressionStartEndTokens() const;
 
     /**
@@ -1544,6 +1652,7 @@ class CPPCHECKLIB Token {
         mImpl->mValues = nullptr;
     }
 
+    // cppcheck-suppress unusedFunction - used in tests only
     std::string astString(const char *sep = "") const {
         std::string ret;
         if (mImpl->mAstOperand1)
@@ -1559,7 +1668,7 @@ class CPPCHECKLIB Token {
 
     std::string expressionString() const;
 
-    void printAst(bool verbose, bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const;
+    void printAst(bool xml, const std::vector<std::string> &fileNames, std::ostream &out) const;
 
     void printValueFlow(const std::vector<std::string>& files, bool xml, std::ostream &out) const;
 
@@ -1567,9 +1676,9 @@ class CPPCHECKLIB Token {
     std::shared_ptr<ScopeInfo2> scopeInfo() const;
 
     void setCpp11init(bool cpp11init) const {
-        mImpl->mCpp11init=cpp11init ? TokenImpl::Cpp11init::CPP11INIT : TokenImpl::Cpp11init::NOINIT;
+        mImpl->mCpp11init=cpp11init ? Cpp11init::CPP11INIT : Cpp11init::NOINIT;
     }
-    TokenImpl::Cpp11init isCpp11init() const {
+    Cpp11init isCpp11init() const {
         return mImpl->mCpp11init;
     }
 
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 8e0b515ca78..afe85ef693a 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -47,7 +47,7 @@
 #include <ctime>
 #include <iostream>
 #include <iterator>
-#include <exception>
+#include <limits>
 #include <memory>
 #include <set>
 #include <sstream>
@@ -103,14 +103,14 @@ static void skipEnumBody(T *&tok)
 /**
  * is tok the start brace { of a class, struct, union, or enum
  */
-static bool isClassStructUnionEnumStart(const Token * tok)
+static const Token* isClassStructUnionEnumStart(const Token* tok)
 {
     if (!Token::Match(tok->previous(), "class|struct|union|enum|%name%|>|>> {"))
-        return false;
+        return nullptr;
     const Token * tok2 = tok->previous();
-    while (tok2 && !Token::Match(tok2, "class|struct|union|enum|{|}|;"))
+    while (tok2 && !Token::Match(tok2, "class|struct|union|enum|{|}|)|;"))
         tok2 = tok2->previous();
-    return Token::Match(tok2, "class|struct|union|enum");
+    return (Token::Match(tok2, "class|struct|union|enum") && !Token::simpleMatch(tok2->tokAt(-1), "->")) ? tok2 : nullptr;
 }
 
 //---------------------------------------------------------------------------
@@ -135,7 +135,7 @@ Tokenizer::~Tokenizer()
 
 nonneg int Tokenizer::sizeOfType(const std::string& type) const
 {
-    const auto it = utils::as_const(mTypeSize).find(type);
+    const auto it = mTypeSize.find(type);
     if (it == mTypeSize.end()) {
         const Library::PodType* podtype = mSettings.library.podtype(type);
         if (!podtype)
@@ -154,7 +154,7 @@ nonneg int Tokenizer::sizeOfType(const Token *type) const
     if (type->tokType() == Token::eString)
         return Token::getStrLength(type) + 1U;
 
-    const auto it = utils::as_const(mTypeSize).find(type->str());
+    const auto it = mTypeSize.find(type->str());
     if (it == mTypeSize.end()) {
         const Library::PodType* podtype = mSettings.library.podtype(type->str());
         if (!podtype)
@@ -195,7 +195,7 @@ bool Tokenizer::duplicateTypedef(Token *&tokPtr, const Token *name, const Token
                 if (end->strAt(1) == "(")
                     end = end->linkAt(1);
 
-                end = (end)?end->next():nullptr;
+                end = end ? end->next() : nullptr;
             }
             if (end)
                 end = end->next();
@@ -549,9 +549,9 @@ namespace {
     private:
         Token* mTypedefToken;  // The "typedef" token
         Token* mEndToken{nullptr};  // Semicolon
-        std::pair<Token*, Token*> mRangeType;
-        std::pair<Token*, Token*> mRangeTypeQualifiers;
-        std::pair<Token*, Token*> mRangeAfterVar;
+        std::pair<const Token*, Token*> mRangeType;
+        std::pair<const Token*, Token*> mRangeTypeQualifiers;
+        std::pair<const Token*, Token*> mRangeAfterVar;
         Token* mNameToken{nullptr};
         bool mFail = false;
         bool mReplaceFailed = false;
@@ -563,28 +563,50 @@ namespace {
             if (Token::simpleMatch(start, "typename"))
                 start = start->next();
 
+            const auto checkForRecursion = [this]() {
+                if (Token::Match(mTypedefToken, "typedef %name% %name% ;"))
+                    return;
+                int nBraces = 0;
+                for (const Token *tok = mTypedefToken; tok != mEndToken; tok = tok->next()) {
+                    if (tok->str() == "{")
+                        ++nBraces;
+                    else if (tok->str() == "}")
+                        --nBraces;
+                    if (nBraces > 0)
+                        continue;
+                    if (tok == mNameToken)
+                        continue;
+                    if (tok->str() != mNameToken->str())
+                        continue;
+                    if (Token::Match(tok->previous(), "struct|class|enum|union"))
+                        continue;
+                    throw InternalError(tok, "recursive typedef encountered");
+                }
+            };
+
             // TODO handle unnamed structs etc
             if (Token::Match(start, "const| enum|struct|union|class %name%| {")) {
-                const std::pair<Token*, Token*> rangeBefore(start, Token::findsimplematch(start, "{"));
+                const std::pair<const Token*, Token*> rangeBefore(start, Token::findsimplematch(start, "{"));
 
                 // find typedef name token
-                Token* nameToken = rangeBefore.second->link()->next();
-                while (Token::Match(nameToken, "%name%|* %name%|*"))
-                    nameToken = nameToken->next();
-                const std::pair<Token*, Token*> rangeQualifiers(rangeBefore.second->link()->next(), nameToken);
+                Token* nameTok = rangeBefore.second->link()->next();
+                while (Token::Match(nameTok, "%name%|* %name%|*"))
+                    nameTok = nameTok->next();
+                const std::pair<const Token*, Token*> rangeQualifiers(rangeBefore.second->link()->next(), nameTok);
 
-                if (Token::Match(nameToken, "%name% ;")) {
+                if (Token::Match(nameTok, "%name% ;")) {
                     if (Token::Match(rangeBefore.second->previous(), "enum|struct|union|class {"))
-                        rangeBefore.second->previous()->insertToken(nameToken->str());
+                        rangeBefore.second->previous()->insertToken(nameTok->str());
                     mRangeType = rangeBefore;
                     mRangeTypeQualifiers = rangeQualifiers;
                     Token* typeName = rangeBefore.second->previous();
                     if (typeName->isKeyword()) {
                         // TODO typeName->insertToken("T:" + std::to_string(num++));
-                        typeName->insertToken(nameToken->str());
+                        typeName->insertToken(nameTok->str());
                     }
-                    mNameToken = nameToken;
-                    mEndToken = nameToken->next();
+                    mNameToken = nameTok;
+                    mEndToken = nameTok->next();
+                    checkForRecursion();
                     return;
                 }
             }
@@ -595,6 +617,7 @@ namespace {
                     mRangeType.second = type;
                     mNameToken = type;
                     mEndToken = mNameToken->next();
+                    checkForRecursion();
                     return;
                 }
                 if (type != start && Token::Match(type, "%name% [")) {
@@ -609,6 +632,7 @@ namespace {
                     mEndToken = end->next();
                     mRangeAfterVar.first = mNameToken->next();
                     mRangeAfterVar.second = mEndToken;
+                    checkForRecursion();
                     return;
                 }
                 if (Token::Match(type->next(), "( * const| %name% ) (") && Token::simpleMatch(type->linkAt(1)->linkAt(1), ") ;")) {
@@ -618,6 +642,7 @@ namespace {
                     mRangeType.second = mNameToken;
                     mRangeAfterVar.first = mNameToken->next();
                     mRangeAfterVar.second = mEndToken;
+                    checkForRecursion();
                     return;
                 }
                 if (type != start && Token::Match(type, "%name% ( !!(") && Token::simpleMatch(type->linkAt(1), ") ;") && !type->isStandardType()) {
@@ -627,11 +652,12 @@ namespace {
                     mRangeType.second = type;
                     mRangeAfterVar.first = mNameToken->next();
                     mRangeAfterVar.second = mEndToken;
+                    checkForRecursion();
                     return;
                 }
             }
             // TODO: handle all typedefs
-            if ((false))
+            if ((false)) // NOLINT(readability-redundant-parentheses)
                 printTypedef(typedefToken, std::cout);
             mFail = true;
         }
@@ -669,12 +695,15 @@ namespace {
             return mNameToken ? mNameToken->str() : "";
         }
 
-        void replace(Token* tok) {
+        /**
+         * @throws InternalError thrown if simplification failed
+         */
+        void replace(Token* tok, const std::string &originalname) {
             if (tok == mNameToken)
                 return;
 
             mUsed = true;
-            const bool isFunctionPointer = Token::Match(mNameToken, "%name% )");
+            const bool isFunctionPointer = Tokenizer::isFunctionPointer(mNameToken);
 
             // Special handling for T(...) when T is a pointer
             if (Token::Match(tok, "%name% [({]") && !isFunctionPointer && !Token::simpleMatch(tok->linkAt(1), ") (")) {
@@ -701,7 +730,7 @@ namespace {
                         insertTokens(tok2, mRangeTypeQualifiers);
                     }
                     else { // functional-style cast
-                        tok->originalName(tok->str());
+                        tok->originalName(originalname);
                         tok->isSimplifiedTypedef(true);
                         tok->str("(");
                         Token* tok2 = insertTokens(tok, mRangeType);
@@ -720,15 +749,15 @@ namespace {
             // Special handling of function pointer cast
             if (isFunctionPointer && isCast(tok->previous())) {
                 tok->insertToken("*");
-                Token* const tok_1 = insertTokens(tok, std::pair<Token*, Token*>(mRangeType.first, mNameToken->linkAt(1)));
-                tok_1->originalName(tok->str());
+                Token* const tok_1 = insertTokens(tok, std::pair<const Token*, Token*>(mRangeType.first, mNameToken->linkAt(1)));
+                tok_1->originalName(originalname);
                 tok->deleteThis();
                 return;
             }
 
             // Inherited type => skip "struct" / "class"
             if (Token::Match(mRangeType.first, "const| struct|class %name% {") && Token::Match(tok->previous(), "public|protected|private|<")) {
-                tok->originalName(tok->str());
+                tok->originalName(originalname);
                 tok->str(mRangeType.second->strAt(-1));
                 return;
             }
@@ -736,7 +765,7 @@ namespace {
             if (Token::Match(tok, "%name% ::")) {
                 if (Token::Match(mRangeType.first, "const| struct|class|union|enum %name% %name%|{") ||
                     Token::Match(mRangeType.first, "%name% %name% ;")) {
-                    tok->originalName(tok->str());
+                    tok->originalName(originalname);
                     tok->str(mRangeType.second->strAt(-1));
                 } else {
                     mReplaceFailed = true;
@@ -790,12 +819,12 @@ namespace {
             Token* const tok2 = insertTokens(tok, rangeType);
             Token* const tok3 = insertTokens(tok2, mRangeTypeQualifiers);
 
-            tok2->originalName(tok->str());
-            tok3->originalName(tok->str());
+            tok2->originalName(originalname);
+            tok3->originalName(originalname);
             Token *after = tok3;
             while (Token::Match(after, "%name%|*|&|&&|::"))
                 after = after->next();
-            if (Token::Match(mNameToken, "%name% (") && Token::simpleMatch(tok3->next(), "*")) {
+            if (Token::Match(mNameToken, "%name% (") && Token::Match(tok3->next(), "*|const")) {
                 while (Token::Match(after, "(|["))
                     after = after->link()->next();
                 if (after) {
@@ -838,6 +867,8 @@ namespace {
                     useAfterVarRange = false;
                     if (Token::simpleMatch(tok3->previous(), "( *"))
                         tok3->deletePrevious();
+                    else if (Token::simpleMatch(tok3->tokAt(-2), "( * const"))
+                        tok3->tokAt(-1)->deletePrevious();
                 }
                 else if (after->str() == "[") {
                     while (after && after->str() == "[")
@@ -993,7 +1024,7 @@ namespace {
             return false;
         }
 
-        static Token* insertTokens(Token* to, std::pair<Token*,Token*> range) {
+        static Token* insertTokens(Token* to, std::pair<const Token*,Token*> range) {
             for (const Token* from = range.first; from != range.second; from = from->next()) {
                 to->insertToken(from->str());
                 to->next()->column(to->column());
@@ -1019,35 +1050,65 @@ namespace {
     };
 }
 
+bool Tokenizer::isFunctionPointer(const Token* tok) {
+    if (!Token::Match(tok, "%name%"))
+        return false;
+    tok = tok->next();
+    while (Token::Match(tok, "["))
+        tok = tok->link()->next();
+    return Token::simpleMatch(tok, ") (");
+}
+
+static bool matchCurrentType(const Token* tok, std::map<int, std::string>& types)
+{
+    if (tok->isC())
+        return false;
+    return std::any_of(types.begin(), types.end(), [&](const std::pair<int, std::string>& element) {
+        return tok->str() == element.second;
+    });
+}
+
 void Tokenizer::simplifyTypedef()
 {
     // Simplify global typedefs that are not redefined with the fast 1-pass simplification.
     // Then use the slower old typedef simplification.
-    std::map<std::string, int> numberOfTypedefs;
+    std::map<std::string, std::set<std::string>> numberOfTypedefs;
     for (Token* tok = list.front(); tok; tok = tok->next()) {
         if (tok->str() == "typedef") {
             TypedefSimplifier ts(tok);
-            if (!ts.fail())
-                numberOfTypedefs[ts.name()]++;
+            if (ts.fail() || !ts.nameToken())
+                continue;
+            std::string existing_data_type;
+            for (const Token* t = ts.getTypedefToken()->next(); t != ts.endToken(); t = t->next()) {
+                if (t != ts.nameToken())
+                    existing_data_type += t->str() + " ";
+            }
+            numberOfTypedefs[ts.name()].emplace(std::move(existing_data_type));
             continue;
         }
     }
 
     int indentlevel = 0;
     std::map<std::string, TypedefSimplifier> typedefs;
+    std::map<int, std::string> inType;
     for (Token* tok = list.front(); tok; tok = tok->next()) {
         if (!tok->isName()) {
-            if (tok->str()[0] == '{')
+            if (tok->str()[0] == '{') {
                 ++indentlevel;
-            else if (tok->str()[0] == '}')
+                if (const Token* typeStart = isClassStructUnionEnumStart(tok)) {
+                    inType.emplace(indentlevel, typeStart->strAt(1));
+                }
+            }
+            else if (tok->str()[0] == '}') {
+                inType.erase(indentlevel);
                 --indentlevel;
+            }
             continue;
         }
 
         if (indentlevel == 0 && tok->str() == "typedef") {
             TypedefSimplifier ts(tok);
-            if (!ts.fail() && numberOfTypedefs[ts.name()] == 1 &&
-                (numberOfTypedefs.find(ts.getTypedefToken()->strAt(1)) == numberOfTypedefs.end() || ts.getTypedefToken()->strAt(2) == "(")) {
+            if (!ts.fail() && numberOfTypedefs[ts.name()].size() == 1) {
                 if (mSettings.severity.isEnabled(Severity::portability) && ts.isInvalidConstFunctionType(typedefs))
                     invalidConstFunctionTypeError(tok->next());
                 typedefs.emplace(ts.name(), ts);
@@ -1058,10 +1119,13 @@ void Tokenizer::simplifyTypedef()
         }
 
         auto it = typedefs.find(tok->str());
-        if (it != typedefs.end() && it->second.canReplace(tok)) {
+        if (it != typedefs.end() && it->second.canReplace(tok) && !matchCurrentType(tok, inType)) {
             std::set<std::string> r;
+            std::string originalname;
             while (it != typedefs.end() && r.insert(tok->str()).second) {
-                it->second.replace(tok);
+                if (originalname.empty())
+                    originalname = tok->str();
+                it->second.replace(tok, originalname);
                 it = typedefs.find(tok->str());
             }
         } else if (tok->str() == "enum") {
@@ -1082,13 +1146,32 @@ void Tokenizer::simplifyTypedef()
                 syntaxError(t.second.getTypedefToken());
             } else {
                 const Token* const typedefToken = t.second.getTypedefToken();
+                const Token* const nameToken = t.second.nameToken();
                 TypedefInfo typedefInfo;
                 typedefInfo.name = t.second.name();
-                typedefInfo.filename = list.file(typedefToken);
-                typedefInfo.lineNumber = typedefToken->linenr();
-                typedefInfo.column = typedefToken->column();
+                typedefInfo.filename = list.file(nameToken);
+                typedefInfo.lineNumber = nameToken->linenr();
+                typedefInfo.column = nameToken->column();
+                if (Token::Match(typedefToken->next(), "struct|enum|class|union %name% {")) {
+                    typedefInfo.originalName = typedefToken->strAt(2);
+                    if (typedefToken->strAt(2) == typedefInfo.name) {
+                        typedefInfo.tagLine = typedefToken->tokAt(2)->linenr();
+                        typedefInfo.tagColumn = typedefToken->tokAt(2)->column();
+                    }
+                }
                 typedefInfo.used = t.second.isUsed();
-                typedefInfo.isFunctionPointer = Token::Match(t.second.nameToken(), "%name% ) (");
+                typedefInfo.isFunctionPointer = isFunctionPointer(t.second.nameToken());
+                if (typedefInfo.isFunctionPointer) {
+                    const Token* tok = typedefToken;
+                    while (tok != t.second.endToken()) {
+                        TypedefToken ttok;
+                        ttok.name = tok->str();
+                        ttok.lineNumber = tok->linenr();
+                        ttok.column = tok->column();
+                        typedefInfo.typedefInfoTokens.emplace_back(ttok);
+                        tok = tok->next();
+                    }
+                }
                 mTypedefInfo.push_back(std::move(typedefInfo));
 
                 t.second.removeDeclaration();
@@ -1099,24 +1182,28 @@ void Tokenizer::simplifyTypedef()
             list.front()->deleteThis();
     }
 
+    validate();
+
     simplifyTypedefCpp();
 }
 
-static Token* simplifyTypedefCopyTokens(Token* to, const Token* fromStart, const Token* toEnd, const Token* location) {
+static Token* simplifyTypedefCopyTokens(Token* to, const Token* fromStart, const Token* toEnd, const Token* location, const std::string &originalName) {
     Token* ret = TokenList::copyTokens(to, fromStart, toEnd);
     for (Token* tok = to->next(); tok != ret->next(); tok = tok->next()) {
         tok->linenr(location->linenr());
         tok->column(location->column());
         tok->isSimplifiedTypedef(true);
+        tok->originalName(originalName);
     }
     return ret;
 }
 
-static Token* simplifyTypedefInsertToken(Token* tok, const std::string& str, const Token* location) {
+static Token* simplifyTypedefInsertToken(Token* tok, const std::string& str, const Token* location, const std::string &originalName) {
     tok = tok->insertToken(str);
     tok->linenr(location->linenr());
     tok->column(location->column());
     tok->isSimplifiedTypedef(true);
+    tok->originalName(originalName);
     return tok;
 }
 
@@ -1133,11 +1220,10 @@ void Tokenizer::simplifyTypedefCpp()
     std::vector<Space> spaceInfo(1);
 
     const std::time_t maxTime = mSettings.typedefMaxTime > 0 ? std::time(nullptr) + mSettings.typedefMaxTime: 0;
-    const bool doProgress = (mSettings.reportProgress != -1) && !list.getFiles().empty();
+    ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, list.getSourceFilePath(), "Tokenize (typedef)");
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (doProgress)
-            mErrorLogger.reportProgress(list.getFiles()[0], "Tokenize (typedef)", tok->progressValue());
+        progressReporter.report(tok->progressValue());
 
         if (Settings::terminated())
             return;
@@ -1243,7 +1329,7 @@ void Tokenizer::simplifyTypedefCpp()
         bool refToArray = false;
         bool ptrMember = false;
         bool typeOf = false;
-        Token *namespaceStart = nullptr;
+        const Token *namespaceStart = nullptr;
         Token *namespaceEnd = nullptr;
 
         // check for invalid input
@@ -1608,10 +1694,25 @@ void Tokenizer::simplifyTypedefCpp()
         TypedefInfo typedefInfo;
         typedefInfo.name = typeName->str();
         typedefInfo.filename = list.file(typeName);
-        typedefInfo.lineNumber = typeName->linenr();
-        typedefInfo.column = typeName->column();
+        typedefInfo.lineNumber = typeDef->linenr();
+        typedefInfo.column = typeDef->column();
+        if (Token::Match(typeDef->next(), "struct|enum|class|union %name% {") && typeDef->strAt(2) == typedefInfo.name) {
+            typedefInfo.tagLine = typeDef->tokAt(2)->linenr();
+            typedefInfo.tagColumn = typeDef->tokAt(2)->column();
+        }
         typedefInfo.used = false;
-        typedefInfo.isFunctionPointer = Token::Match(typeName, "%name% ) (");
+        typedefInfo.isFunctionPointer = isFunctionPointer(typeName);
+        if (typedefInfo.isFunctionPointer) {
+            const Token* t = typeDef;
+            while (t != tok) {
+                TypedefToken ttok;
+                ttok.name = t->str();
+                ttok.lineNumber = t->linenr();
+                ttok.column = t->column();
+                typedefInfo.typedefInfoTokens.emplace_back(ttok);
+                t = t->next();
+            }
+        }
         mTypedefInfo.push_back(std::move(typedefInfo));
 
         while (!done) {
@@ -1938,12 +2039,13 @@ void Tokenizer::simplifyTypedefCpp()
 
                     // start substituting at the typedef name by replacing it with the type
                     const Token* location = tok2;
+                    const std::string originalName = tok2->str();
                     for (Token* tok3 = typeStart; tok3 && (tok3->str() != ";"); tok3 = tok3->next())
                         tok3->isSimplifiedTypedef(true);
                     if (isPointerTypeCall) {
                         tok2->deleteThis();
-                        tok2 = simplifyTypedefInsertToken(tok2, "0", location);
-                        simplifyTypedefInsertToken(tok2->next(), "0", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "0", location, originalName);
+                        simplifyTypedefInsertToken(tok2->next(), "0", location, originalName);
                     }
                     if (Token::Match(tok2->tokAt(-1), "class|struct|union") && tok2->strAt(-1) == typeStart->str())
                         tok2->deletePrevious();
@@ -1952,6 +2054,7 @@ void Tokenizer::simplifyTypedefCpp()
                         tok2->previous()->str("typedef");
                         tok2->insertToken(tok2->str());
                     }
+                    tok2->originalName(originalName);
                     tok2->str(typeStart->str());
 
                     // restore qualification if it was removed
@@ -1960,12 +2063,12 @@ void Tokenizer::simplifyTypedefCpp()
                             tok2 = tok2->previous();
 
                         if (globalScope) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "::", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "::", location, originalName);
                         }
 
                         for (std::size_t i = classLevel; i < spaceInfo.size(); ++i) {
-                            tok2 = simplifyTypedefInsertToken(tok2, spaceInfo[i].className, location);
-                            tok2 = simplifyTypedefInsertToken(tok2, "::", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, spaceInfo[i].className, location, originalName);
+                            tok2 = simplifyTypedefInsertToken(tok2, "::", location, originalName);
                         }
                     }
 
@@ -1982,11 +2085,11 @@ void Tokenizer::simplifyTypedefCpp()
                                 std::string::size_type spaceIdx = 0;
                                 std::string::size_type startIdx = 0;
                                 while ((spaceIdx = removed1.find(' ', startIdx)) != std::string::npos) {
-                                    simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx, spaceIdx - startIdx), location);
+                                    simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx, spaceIdx - startIdx), location, originalName);
                                     startIdx = spaceIdx + 1;
                                 }
-                                simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx), location);
-                                simplifyTypedefInsertToken(tok2->previous(), "::", location);
+                                simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx), location, originalName);
+                                simplifyTypedefInsertToken(tok2->previous(), "::", location, originalName);
                                 break;
                             }
                             idx = removed1.rfind(" ::");
@@ -1998,23 +2101,23 @@ void Tokenizer::simplifyTypedefCpp()
                     }
                     Token* constTok = Token::simpleMatch(tok2->previous(), "const") ? tok2->previous() : nullptr;
                     // add remainder of type
-                    tok2 = simplifyTypedefCopyTokens(tok2, typeStart->next(), typeEnd, location);
+                    tok2 = simplifyTypedefCopyTokens(tok2, typeStart->next(), typeEnd, location, originalName);
 
                     if (!pointers.empty()) {
                         for (const std::string &p : pointers)
                             // cppcheck-suppress useStlAlgorithm
-                            tok2 = simplifyTypedefInsertToken(tok2, p, location);
+                            tok2 = simplifyTypedefInsertToken(tok2, p, location, originalName);
                         if (constTok && !functionPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "const", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "const", location, originalName);
                             constTok->deleteThis();
                             location = constTok;
                         }
                     }
 
                     if (funcStart && funcEnd) {
-                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         Token *paren = tok2;
-                        tok2 = simplifyTypedefCopyTokens(tok2, funcStart, funcEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, funcStart, funcEnd, location, originalName);
 
                         if (!inCast)
                             tok2 = processFunc(tok2, inOperator);
@@ -2025,17 +2128,17 @@ void Tokenizer::simplifyTypedefCpp()
                         while (Token::Match(tok2, "%name%|] ["))
                             tok2 = tok2->linkAt(1);
 
-                        tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                         Token::createMutualLinks(tok2, paren);
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
 
                         if (specStart) {
                             Token *spec = specStart;
-                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             while (spec != specEnd) {
                                 spec = spec->next();
-                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             }
                         }
                     }
@@ -2047,20 +2150,20 @@ void Tokenizer::simplifyTypedefCpp()
                         if (!inTemplate && function && tok2->next() && tok2->strAt(1) != "*")
                             needParen = false;
                         if (needParen) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         }
                         Token *tok3 = tok2;
                         if (namespaceStart) {
                             const Token *tok4 = namespaceStart;
 
                             while (tok4 != namespaceEnd) {
-                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location, originalName);
                                 tok4 = tok4->next();
                             }
-                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location, originalName);
                         }
                         if (functionPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         }
 
                         if (!inCast)
@@ -2070,35 +2173,35 @@ void Tokenizer::simplifyTypedefCpp()
                             if (!tok2)
                                 syntaxError(nullptr);
 
-                            tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                             Token::createMutualLinks(tok2, tok3);
                         }
                         if (!tok2)
                             syntaxError(nullptr);
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
                         if (inTemplate) {
                             tok2 = tok2->next();
                         }
 
                         if (specStart) {
                             Token *spec = specStart;
-                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             while (spec != specEnd) {
                                 spec = spec->next();
-                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location, originalName);
                             }
                         }
                     } else if (functionRetFuncPtr || functionPtrRetFuncPtr) {
-                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         Token *tok3 = tok2;
-                        tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
 
                         Token * tok4 = nullptr;
                         if (functionPtrRetFuncPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                             tok4 = tok2;
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         }
 
                         // skip over variable name if there
@@ -2111,24 +2214,24 @@ void Tokenizer::simplifyTypedefCpp()
                         }
 
                         if (tok4 && functionPtrRetFuncPtr) {
-                            tok2 = simplifyTypedefInsertToken(tok2,")", location);
+                            tok2 = simplifyTypedefInsertToken(tok2,")", location, originalName);
                             Token::createMutualLinks(tok2, tok4);
                         }
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
 
-                        tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                         Token::createMutualLinks(tok2, tok3);
 
-                        tok2 = simplifyTypedefCopyTokens(tok2, argFuncRetStart, argFuncRetEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argFuncRetStart, argFuncRetEnd, location, originalName);
                     } else if (ptrToArray || refToArray) {
-                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
                         Token *tok3 = tok2;
 
                         if (ptrToArray)
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         else
-                            tok2 = simplifyTypedefInsertToken(tok2, "&", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "&", location, originalName);
 
                         bool hasName = false;
                         // skip over name
@@ -2147,14 +2250,14 @@ void Tokenizer::simplifyTypedefCpp()
                                 tok2 = tok2->linkAt(1);
                         }
 
-                        simplifyTypedefInsertToken(tok2, ")", location);
+                        simplifyTypedefInsertToken(tok2, ")", location, originalName);
                         Token::createMutualLinks(tok2->next(), tok3);
 
                         if (!hasName)
                             tok2 = tok2->next();
                     } else if (ptrMember) {
                         if (Token::simpleMatch(tok2, "* (")) {
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
                         } else {
                             // This is the case of casting operator.
                             // Name is not available, and () should not be
@@ -2163,7 +2266,7 @@ void Tokenizer::simplifyTypedefCpp()
                             Token *openParenthesis = nullptr;
 
                             if (!castOperator) {
-                                tok2 = simplifyTypedefInsertToken(tok2, "(", location);
+                                tok2 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
 
                                 openParenthesis = tok2;
                             }
@@ -2171,25 +2274,25 @@ void Tokenizer::simplifyTypedefCpp()
                             const Token *tok4 = namespaceStart;
 
                             while (tok4 != namespaceEnd) {
-                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location);
+                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location, originalName);
                                 tok4 = tok4->next();
                             }
-                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location);
+                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location, originalName);
 
-                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location, originalName);
 
                             if (openParenthesis) {
                                 // Skip over name, if any
                                 if (Token::Match(tok2->next(), "%name%"))
                                     tok2 = tok2->next();
 
-                                tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                                tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
 
                                 Token::createMutualLinks(tok2, openParenthesis);
                             }
                         }
                     } else if (typeOf) {
-                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location, originalName);
                     } else if (Token::Match(tok2, "%name% [")) {
                         while (Token::Match(tok2, "%name%|] [")) {
                             tok2 = tok2->linkAt(1);
@@ -2211,7 +2314,7 @@ void Tokenizer::simplifyTypedefCpp()
                             // reference or pointer to array?
                             if (Token::Match(tok2, "&|*|&&")) {
                                 tok2 = tok2->previous();
-                                Token *tok3 = simplifyTypedefInsertToken(tok2, "(", location);
+                                Token *tok3 = simplifyTypedefInsertToken(tok2, "(", location, originalName);
 
                                 // handle missing variable name
                                 if (Token::Match(tok3, "( *|&|&& *|&|&& %name%"))
@@ -2222,6 +2325,13 @@ void Tokenizer::simplifyTypedefCpp()
                                     tok2 = tok2->tokAt(2);
                                 else
                                     tok2 = tok2->tokAt(3);
+                                while (tok2->link()) {
+                                    tok2 = tok2->link()->next();
+                                    if (Token::simpleMatch(tok2, ";")) {
+                                        tok2 = tok2->previous();
+                                        break;
+                                    }
+                                }
                                 if (!tok2)
                                     syntaxError(nullptr);
 
@@ -2242,7 +2352,7 @@ void Tokenizer::simplifyTypedefCpp()
                                         tok2 = tok2->tokAt(3);
                                 }
 
-                                tok2 = simplifyTypedefInsertToken(tok2, ")", location);
+                                tok2 = simplifyTypedefInsertToken(tok2, ")", location, originalName);
                                 Token::createMutualLinks(tok2, tok3);
                             }
 
@@ -2253,10 +2363,13 @@ void Tokenizer::simplifyTypedefCpp()
                             while (tok2->strAt(1) == "[")
                                 tok2 = tok2->linkAt(1);
 
-                            tok2 = simplifyTypedefCopyTokens(tok2, arrayStart, arrayEnd, location);
+                            tok2 = simplifyTypedefCopyTokens(tok2, arrayStart, arrayEnd, location, originalName);
                             if (!tok2->next())
                                 syntaxError(tok2);
 
+                            if (Token::Match(tok2, "] ; %name% = {") && tok2->next()->isSplittedVarDeclEq())
+                                tok2->deleteNext(2);
+
                             if (tok2->str() == "=") {
                                 if (tok2->strAt(1) == "{")
                                     tok2 = tok2->linkAt(1)->next();
@@ -2367,7 +2480,8 @@ namespace {
             while (scope && scope->parent) {
                 if (scope->name.empty())
                     break;
-                fullName = scope->name + " :: " + fullName;
+                fullName.insert(0, " :: ");
+                fullName.insert(0, scope->name);
                 scope = scope->parent;
             }
         }
@@ -2382,8 +2496,8 @@ namespace {
         std::set<std::string> recordTypes;
         std::set<std::string> baseTypes;
 
-        ScopeInfo3 *addChild(Type scopeType, const std::string &scopeName, const Token *bodyStartToken, const Token *bodyEndToken) {
-            children.emplace_back(this, scopeType, scopeName, bodyStartToken, bodyEndToken);
+        ScopeInfo3 *addChild(Type scopeType, std::string scopeName, const Token *bodyStartToken, const Token *bodyEndToken) {
+            children.emplace_back(this, scopeType, std::move(scopeName), bodyStartToken, bodyEndToken);
             return &children.back();
         }
 
@@ -2531,19 +2645,19 @@ namespace {
                             scope = tok1->strAt(-3) + " :: " + scope;
                             tok1 = tok1->tokAt(-2);
                         }
-                        scopeInfo = scopeInfo->addChild(ScopeInfo3::MemberFunction, scope, tok, tok->link());
+                        scopeInfo = scopeInfo->addChild(ScopeInfo3::MemberFunction, std::move(scope), tok, tok->link());
                         added = true;
                     }
                     // inline member function
                     else if ((scopeInfo->type == ScopeInfo3::Record || scopeInfo->type == ScopeInfo3::Namespace) && tok1 && Token::Match(tok1->tokAt(-1), "%name% (")) {
-                        const std::string scope = scopeInfo->name + "::" + tok1->strAt(-1);
-                        scopeInfo = scopeInfo->addChild(ScopeInfo3::MemberFunction, scope, tok, tok->link());
+                        std::string scope = scopeInfo->name + "::" + tok1->strAt(-1);
+                        scopeInfo = scopeInfo->addChild(ScopeInfo3::MemberFunction, std::move(scope), tok, tok->link());
                         added = true;
                     }
                 }
 
                 if (!added)
-                    scopeInfo = scopeInfo->addChild(ScopeInfo3::Other, emptyString, tok, tok->link());
+                    scopeInfo = scopeInfo->addChild(ScopeInfo3::Other, "", tok, tok->link());
             }
             return;
         }
@@ -2598,7 +2712,7 @@ namespace {
         }
 
         if (tok && tok->str() == "{") {
-            scopeInfo = scopeInfo->addChild(record ? ScopeInfo3::Record : ScopeInfo3::Namespace, classname, tok, tok->link());
+            scopeInfo = scopeInfo->addChild(record ? ScopeInfo3::Record : ScopeInfo3::Namespace, std::move(classname), tok, tok->link());
             scopeInfo->baseTypes = std::move(baseTypes);
         }
     }
@@ -2627,7 +2741,7 @@ namespace {
     {
         Token *tok1 = tok;
 
-        if (tok1 && tok1->str() != nameToken->str())
+        if (!tok1 || tok1->str() != nameToken->str())
             return false;
 
         // skip this using
@@ -2636,6 +2750,9 @@ namespace {
             return false;
         }
 
+        if (!tok->tokAt(-1))
+            return false;
+
         // skip other using with this name
         if (tok1->strAt(-1) == "using") {
             // fixme: this is wrong
@@ -2645,11 +2762,18 @@ namespace {
             return false;
         }
 
+        if (tok1->tokAt(-1)->tokType() == Token::eType || tok1->tokAt(-1)->tokType() == Token::eName)
+            return false;
+
         if (Token::Match(tok1->tokAt(-1), "class|struct|union|enum|namespace")) {
             // fixme
             return false;
         }
 
+        if (Token::simpleMatch(tok1->tokAt(-2), "> ::")) {
+            return false;
+        }
+
         if (Token::Match(tok1, "%name% (") && TokenList::isFunctionHead(tok1->next(), "{;:")) {
             if (Token::Match(tok1->previous(), "%name%") && !tok1->previous()->isControlFlowKeyword())
                 return false;
@@ -2832,7 +2956,7 @@ static const Token* skipConstVolatileBackwards(const Token* tok) {
 
 bool Tokenizer::simplifyUsing()
 {
-    if (!isCPP() || mSettings.standards.cpp < Standards::CPP11)
+    if (!isCPP())
         return false;
 
     // simplify using N::x; to using x = N::x;
@@ -2873,11 +2997,10 @@ bool Tokenizer::simplifyUsing()
     };
     std::list<Using> usingList;
 
-    const bool doProgress = (mSettings.reportProgress != -1) && !list.getFiles().empty();
+    ProgressReporter progressReporter(mErrorLogger, mSettings.reportProgress, list.getSourceFilePath(), "Tokenize (using)");
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (doProgress)
-            mErrorLogger.reportProgress(list.getFiles()[0], "Tokenize (using)", tok->progressValue());
+        progressReporter.report(tok->progressValue());
 
         if (Settings::terminated())
             return substitute;
@@ -2925,7 +3048,6 @@ bool Tokenizer::simplifyUsing()
                 Token::Match(tok->linkAt(2), "] ] = ::| %name%")))))
             continue;
 
-        const std::string& name = tok->strAt(1);
         const Token *nameToken = tok->next();
         std::string scope = currentScope->fullName;
         Token *usingStart = tok;
@@ -2941,6 +3063,9 @@ bool Tokenizer::simplifyUsing()
         if (!usingEnd)
             continue;
 
+        for (Token *typeTok = start; typeTok != usingEnd; typeTok = typeTok->next())
+            typeTok->isSimplifiedTypedef(true);
+
         // Move struct defined in using out of using.
         // using T = struct t { }; => struct t { }; using T = struct t;
         // fixme: this doesn't handle attributes
@@ -2965,18 +3090,18 @@ bool Tokenizer::simplifyUsing()
             structEnd = structEnd->link();
 
             // add ';' after end of struct
-            structEnd->insertToken(";", emptyString);
+            structEnd->insertToken(";");
 
             // add name for anonymous struct
             if (!hasName) {
                 std::string newName;
                 if (structEnd->strAt(2) == ";")
-                    newName = name;
+                    newName = nameToken->str();
                 else
                     newName = "Unnamed" + std::to_string(mUnnamedCount++);
                 TokenList::copyTokens(structEnd->next(), tok, start);
-                structEnd->tokAt(5)->insertToken(newName, emptyString);
-                start->insertToken(newName, emptyString);
+                structEnd->tokAt(5)->insertToken(newName);
+                start->insertToken(newName);
             } else
                 TokenList::copyTokens(structEnd->next(), tok, start->next());
 
@@ -3018,7 +3143,7 @@ bool Tokenizer::simplifyUsing()
         ScopeInfo3 scopeInfo1;
         ScopeInfo3 *currentScope1 = &scopeInfo1;
         Token *startToken = list.front();
-        Token *endToken = nullptr;
+        const Token *endToken = nullptr;
         bool inMemberFunc = false;
         const ScopeInfo3 * memberFuncScope = nullptr;
         const Token * memberFuncEnd = nullptr;
@@ -3032,7 +3157,7 @@ bool Tokenizer::simplifyUsing()
             if (!currentScope1)
                 return substitute; // something bad happened
             startToken = usingEnd->next();
-            endToken = const_cast<Token*>(currentScope->bodyEnd->next());
+            endToken = currentScope->bodyEnd->next();
             if (currentScope->type == ScopeInfo3::MemberFunction) {
                 const ScopeInfo3 * temp = currentScope->findScope(currentScope->fullName);
                 if (temp) {
@@ -3118,7 +3243,7 @@ bool Tokenizer::simplifyUsing()
             if (!isTypedefInfoAdded && Token::Match(tok1, "%name% (")) {
                 isTypedefInfoAdded = true;
                 TypedefInfo usingInfo;
-                usingInfo.name = name;
+                usingInfo.name = nameToken->str();
                 usingInfo.filename = list.file(nameToken);
                 usingInfo.lineNumber = nameToken->linenr();
                 usingInfo.column = nameToken->column();
@@ -3163,6 +3288,8 @@ bool Tokenizer::simplifyUsing()
             }
 
             Token * arrayStart = nullptr;
+            Token * fpArgList = nullptr;
+            Token * fpQual = nullptr;
 
             // parse the type
             Token *type = start;
@@ -3262,6 +3389,18 @@ bool Tokenizer::simplifyUsing()
                 } while (type && type->str() == "[");
             }
 
+            // check for function pointer
+            if (type && type->str() == "(") {
+                if (Token::simpleMatch(type->link(), ") (")) {
+                    fpArgList = type->link()->next();
+                    fpQual = type;
+                    type = type->link()->linkAt(1)->next();
+                } else if (type->link()->next() == usingEnd) {
+                    fpArgList = type;
+                    type = usingEnd;
+                }
+            }
+
             // make sure we are in a good state
             if (!tok1 || !tok1->next())
                 break; // bail
@@ -3277,6 +3416,34 @@ bool Tokenizer::simplifyUsing()
                         tok1->deleteThis();
                         substitute = true;
                     }
+                } else if (fpArgList && fpQual && Token::Match(tok1->next(), "%name%")) {
+                    // function pointer
+                    const bool isFuncDecl = Token::simpleMatch(tok1->tokAt(2), "(");
+                    Token *dest = tok1->next();
+                    while (Token::Match(dest, "%name% :: %name%"))
+                        dest = dest->tokAt(2);
+                    TokenList::copyTokens(dest, fpArgList, usingEnd->previous());
+                    Token* const copyEnd = TokenList::copyTokens(tok1, start, fpQual->link()->previous());
+                    Token* leftPar = copyEnd->previous();
+                    while (leftPar->str() != "(")
+                        leftPar = leftPar->previous();
+                    Token *insertTok = isFuncDecl ? copyEnd->linkAt(2) : copyEnd->next();
+                    while (Token::Match(insertTok, "%name% :: %name%"))
+                        insertTok = insertTok->tokAt(2);
+                    Token* const rightPar = insertTok->insertToken(")");
+                    Token::createMutualLinks(leftPar, rightPar);
+                    tok1->deleteThis();
+                    substitute = true;
+                } else if (fpArgList && !fpQual && Token::Match(tok1->next(), "* const| %name%")) {
+                    // function pointer
+                    Token* const dest = tok1->tokAt(tok1->strAt(2) == "const" ? 3 : 2);
+                    Token* const copyEndArgs = TokenList::copyTokens(dest, fpArgList, usingEnd->previous());
+                    Token* const copyEndRet = TokenList::copyTokens(tok1, start, fpArgList->previous());
+                    Token* const leftPar = copyEndRet->insertToken("(");
+                    Token* const rightPar = copyEndArgs->link()->tokAt(-1)->insertToken(")");
+                    Token::createMutualLinks(leftPar, rightPar);
+                    tok1->deleteThis();
+                    substitute = true;
                 } else {
                     // add some qualification back if needed
                     std::string removed1 = std::move(removed);
@@ -3338,6 +3505,8 @@ bool Tokenizer::simplifyUsing()
                 skip = true;
                 simplifyUsingError(usingStart, usingEnd);
             }
+            if (!after)
+                syntaxError(tok1);
             tok1 = after->previous();
         }
 
@@ -3390,7 +3559,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
     mConfiguration = configuration;
 
     if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1", mSettings.showtime, mTimerResults);
+        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1", mTimerResults);
         if (!simplifyTokenList1(list.getFiles().front().c_str()))
             return false;
     } else {
@@ -3398,18 +3567,16 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
             return false;
     }
 
-    const SHOWTIME_MODES showTime = mTimerResults ? mSettings.showtime : SHOWTIME_MODES::SHOWTIME_NONE;
-
-    Timer::run("Tokenizer::simplifyTokens1::createAst", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::createAst", mTimerResults, [&]() {
         list.createAst();
         list.validateAst(mSettings.debugnormal);
     });
 
-    Timer::run("Tokenizer::simplifyTokens1::createSymbolDatabase", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::createSymbolDatabase", mTimerResults, [&]() {
         createSymbolDatabase();
     });
 
-    Timer::run("Tokenizer::simplifyTokens1::setValueType", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::setValueType", mTimerResults, [&]() {
         mSymbolDatabase->setValueTypeInTokenList(false);
         mSymbolDatabase->setValueTypeInTokenList(true);
     });
@@ -3424,7 +3591,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
     const bool doValueFlow = !disableValueflowEnv || (std::strcmp(disableValueflowEnv, "1") != 0);
 
     if (doValueFlow) {
-        Timer::run("Tokenizer::simplifyTokens1::ValueFlow", showTime, mTimerResults, [&]() {
+        Timer::run("Tokenizer::simplifyTokens1::ValueFlow", mTimerResults, [&]() {
             ValueFlow::setValues(list, *mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
         });
 
@@ -3437,7 +3604,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
             if (tok->tokType() == Token::eChar && tok->values().empty()) {
                 try {
                     simplecpp::characterLiteralToLL(tok->str());
-                } catch (const std::exception &e) {
+                } catch (const std::runtime_error &e) {
                     unhandledCharLiteral(tok, e.what());
                 }
             }
@@ -3598,11 +3765,16 @@ void Tokenizer::concatenateNegativeNumberAndAnyPositive()
         if (!Token::Match(tok, "?|:|,|(|[|{|return|case|sizeof|%op% +|-") || tok->tokType() == Token::eIncDecOp)
             continue;
 
+        if (tok->findOpeningBracket())
+            continue;
+
+        if (!tok->tokAt(2) || (tok->tokAt(2)->isOp() && !Token::Match(tok->tokAt(2), "[+-]")))
+            syntaxError(tok);
+
         while (tok->str() != ">" && tok->next() && tok->strAt(1) == "+" && (!Token::Match(tok->tokAt(2), "%name% (|;") || Token::Match(tok, "%op%")))
             tok->deleteNext();
 
         if (Token::Match(tok->next(), "+|- %num%")) {
-            // cppcheck-suppress redundantCopyLocalConst - cannot make it a reference because it is deleted afterwards
             std::string prefix = tok->strAt(1);
             tok->deleteNext();
             tok->next()->str(prefix + tok->strAt(1));
@@ -3692,7 +3864,7 @@ void Tokenizer::simplifyParenthesizedLibraryFunctions()
         if (!Token::simpleMatch(tok, ") ("))
             continue;
         Token *rpar = tok, *lpar = tok->link();
-        if (!lpar || Token::Match(lpar->previous(), "%name%"))
+        if (!lpar || (Token::Match(lpar->previous(), "%name%") && !Token::Match(lpar->previous(), "return|delete|throw")))
             continue;
         const Token *ftok = rpar->previous();
         if (mSettings.library.isNotLibraryFunction(ftok))
@@ -3732,7 +3904,8 @@ void Tokenizer::simplifyRedundantConsecutiveBraces()
     for (Token *tok = list.front(); tok;) {
         if (Token::simpleMatch(tok, "= {")) {
             tok = tok->linkAt(1);
-        } else if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->linkAt(1), "} }")) {
+        } else if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->linkAt(1), "} }") &&
+                   !Token::Match(tok->previous(), "%name%")) {
             //remove internal parentheses
             tok->linkAt(1)->deleteThis();
             tok->deleteNext();
@@ -4135,10 +4308,13 @@ void Tokenizer::simplifyTemplates()
 namespace {
     /** Class used in Tokenizer::setVarIdPass1 */
     class VariableMap {
+    public:
+        struct VarInfo { nonneg int id{}; bool assigned{}; };
+        using MapType = std::unordered_map<std::string, VarInfo>;
     private:
-        std::unordered_map<std::string, nonneg int> mVariableId;
-        std::unordered_map<std::string, nonneg int> mVariableId_global;
-        std::stack<std::vector<std::pair<std::string, nonneg int>>> mScopeInfo;
+        MapType mVariableId;
+        MapType mVariableId_global;
+        std::stack<std::vector<MapType::value_type>> mScopeInfo;
         mutable nonneg int mVarId{};
     public:
         VariableMap() = default;
@@ -4149,7 +4325,10 @@ namespace {
             return mVariableId.find(varname) != mVariableId.end();
         }
 
-        const std::unordered_map<std::string, nonneg int>& map(bool global) const {
+        const MapType& map(bool global) const {
+            return global ? mVariableId_global : mVariableId;
+        }
+        MapType& map(bool global) {
             return global ? mVariableId_global : mVariableId;
         }
         nonneg int& getVarId() {
@@ -4169,8 +4348,8 @@ bool VariableMap::leaveScope()
     if (mScopeInfo.empty())
         return false;
 
-    for (const std::pair<std::string, nonneg int>& outerVariable : mScopeInfo.top()) {
-        if (outerVariable.second != 0)
+    for (const MapType::value_type& outerVariable : mScopeInfo.top()) {
+        if (outerVariable.second.id != 0)
             mVariableId[outerVariable.first] = outerVariable.second;
         else
             mVariableId.erase(outerVariable.first);
@@ -4182,28 +4361,32 @@ bool VariableMap::leaveScope()
 void VariableMap::addVariable(const std::string& varname, bool globalNamespace)
 {
     if (mScopeInfo.empty()) {
-        mVariableId[varname] = ++mVarId;
+        mVariableId[varname].id = ++mVarId;
         if (globalNamespace)
             mVariableId_global[varname] = mVariableId[varname];
         return;
     }
     const auto it = mVariableId.find(varname);
     if (it == mVariableId.end()) {
-        mScopeInfo.top().emplace_back(varname, 0);
-        mVariableId[varname] = ++mVarId;
+        mScopeInfo.top().emplace_back(varname, VarInfo{});
+        mVariableId[varname].id = ++mVarId;
         if (globalNamespace)
             mVariableId_global[varname] = mVariableId[varname];
         return;
     }
     mScopeInfo.top().emplace_back(varname, it->second);
-    it->second = ++mVarId;
+    it->second.id = ++mVarId;
+    it->second.assigned = false;
 }
 
-static bool setVarIdParseDeclaration(Token*& tok, const VariableMap& variableMap, bool executableScope)
+/**
+ * @throws Token* thrown when closing brackets are missing
+ */
+static bool setVarIdParseDeclaration(Token*& tok, const VariableMap& variableMap, bool executableScope, Standards::cstd_t cStandard)
 {
     const Token* const tok1 = tok;
     Token* tok2 = tok;
-    if (!tok2->isName())
+    if (!tok2->isName() || (tok2->tokType() != Token::eType && tok2->tokType() != Token::eName && tok2->tokType() != Token::eKeyword))
         return false;
 
     nonneg int typeCount = 0;
@@ -4219,7 +4402,9 @@ static bool setVarIdParseDeclaration(Token*& tok, const VariableMap& variableMap
             }
             if (tok2->isCpp() && Token::Match(tok2, "namespace|public|private|protected"))
                 return false;
-            if (tok2->isCpp() && Token::simpleMatch(tok2, "decltype (")) {
+            bool isC23 = tok2->isC() && cStandard >= Standards::C23;
+            if (((tok2->isCpp() || isC23) && Token::Match(tok2, "decltype|typeof (")) ||
+                (tok2->isC() && Token::simpleMatch(tok2, "__typeof ("))) {
                 typeCount = 1;
                 tok2 = tok2->linkAt(1)->next();
                 continue;
@@ -4368,13 +4553,17 @@ static void setVarIdStructMembers(Token *&tok1,
                     tok->varId(it->second);
                 }
             }
+            if (Token::Match(tok, "%name% = { . %name% =|{")) {
+                setVarIdStructMembers(tok, structMembers, varId);
+                tok = tok->linkAt(2);
+            }
             tok = tok->next();
         }
 
         return;
     }
 
-    while (Token::Match(tok->next(), ")| . %name% !!(")) {
+    while (Token::Match(tok->next(), ")| . %name%")) {
         // Don't set varid for trailing return type
         if (tok->strAt(1) == ")" && Token::Match(tok->linkAt(1)->tokAt(-1), "%name%|]") && !tok->linkAt(1)->tokAt(-1)->isKeyword() &&
             TokenList::isFunctionHead(tok->linkAt(1), "{;")) {
@@ -4396,6 +4585,8 @@ static void setVarIdStructMembers(Token *&tok1,
         std::map<std::string, nonneg int>& members = structMembers[struct_varid];
         const auto it = utils::as_const(members).find(tok->str());
         if (it == members.cend()) {
+            if (Token::Match(tok, "%name% ("))
+                break;
             members[tok->str()] = ++varId;
             tok->varId(varId);
         } else {
@@ -4406,10 +4597,26 @@ static void setVarIdStructMembers(Token *&tok1,
     tok1 = tok;
 }
 
+static void addTemplateVarIdUsage(const std::string &tokstr,
+                                  const std::map<std::string, std::set<std::string>>& templateVarUsage,
+                                  const VariableMap::MapType& variableMap,
+                                  std::set<nonneg int>& templateVarIdUsage) {
+    const auto v = templateVarUsage.find(tokstr);
+    if (v != templateVarUsage.end()) {
+        for (const std::string& varname: v->second) {
+            const auto it = variableMap.find(varname);
+            if (it != variableMap.end())
+                templateVarIdUsage.insert(it->second.id);
+        }
+    }
+}
+
 static bool setVarIdClassDeclaration(Token* const startToken,
                                      VariableMap& variableMap,
                                      const nonneg int scopeStartVarId,
-                                     std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers)
+                                     const std::map<std::string, std::set<std::string>>& templateVarUsage,
+                                     std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers,
+                                     std::set<nonneg int>& templateVarIdUsage)
 {
     // end of scope
     const Token* const endToken = startToken->link();
@@ -4456,7 +4663,7 @@ static bool setVarIdClassDeclaration(Token* const startToken,
         } else if (initList && indentlevel == 0 && Token::Match(tok->previous(), "[,:] %name% [({]")) {
             const auto it = variableMap.map(false).find(tok->str());
             if (it != variableMap.map(false).end()) {
-                tok->varId(it->second);
+                tok->varId(it->second.id);
             }
         } else if (tok->isName() && tok->varId() <= scopeStartVarId) {
             if (indentlevel > 0 || initList) {
@@ -4474,8 +4681,10 @@ static bool setVarIdClassDeclaration(Token* const startToken,
                 if (!inEnum) {
                     const auto it = variableMap.map(false).find(tok->str());
                     if (it != variableMap.map(false).end()) {
-                        tok->varId(it->second);
+                        tok->varId(it->second.id);
                         setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+                    } else if (tok->str().back() == '>') {
+                        addTemplateVarIdUsage(tok->str(), templateVarUsage, variableMap.map(false), templateVarIdUsage);
                     }
                 }
             }
@@ -4510,7 +4719,7 @@ void Tokenizer::setVarIdClassFunction(const std::string &classname,
         if (Token::Match(tok2, "%name% ::"))
             continue;
 
-        const auto it = utils::as_const(varlist).find(tok2->str());
+        const auto it = varlist.find(tok2->str());
         if (it != varlist.end()) {
             tok2->varId(it->second);
             setVarIdStructMembers(tok2, structMembers, varId_);
@@ -4655,7 +4864,9 @@ void Tokenizer::setVarIdPass1()
                         if (!setVarIdClassDeclaration(tok->link(),
                                                       variableMap,
                                                       scopeStack.top().startVarid,
-                                                      structMembers)) {
+                                                      mTemplateSimplifier->getUsedVariables(),
+                                                      structMembers,
+                                                      mTemplateVarIdUsage)) {
                             syntaxError(nullptr);
                         }
                     }
@@ -4732,7 +4943,7 @@ void Tokenizer::setVarIdPass1()
             }
 
             try { /* Ticket #8151 */
-                decl = setVarIdParseDeclaration(tok2, variableMap, scopeStack.top().isExecutable);
+                decl = setVarIdParseDeclaration(tok2, variableMap, scopeStack.top().isExecutable, mSettings.standards.c);
             } catch (const Token * errTok) {
                 syntaxError(errTok);
             }
@@ -4742,11 +4953,31 @@ void Tokenizer::setVarIdPass1()
 
             if (decl) {
                 if (cpp) {
-                    if (Token *declTypeTok = Token::findsimplematch(tok, "decltype (", tok2)) {
-                        for (Token *declTok = declTypeTok->linkAt(1); declTok != declTypeTok; declTok = declTok->previous()) {
-                            if (declTok->isName() && !Token::Match(declTok->previous(), "::|.") && variableMap.hasVariable(declTok->str()))
-                                declTok->varId(variableMap.map(false).find(declTok->str())->second);
-                        }
+                    for (const Token* tok3 = tok->next(); tok3->isName(); tok3 = tok3->next()) {
+                        addTemplateVarIdUsage(tok3->str(),
+                                              mTemplateSimplifier->getUsedVariables(),
+                                              variableMap.map(false),
+                                              mTemplateVarIdUsage);
+                        addTemplateVarIdUsage(tok3->str(),
+                                              mTemplateSimplifier->getUsedVariables(),
+                                              variableMap.map(true),
+                                              mTemplateVarIdUsage);
+                        if (!tok3->next())
+                            syntaxError(tok3);
+                    }
+                }
+
+                Token *declTypeTok = nullptr;
+                if (cpp || mSettings.standards.c >= Standards::C23) {
+                    declTypeTok = Token::findmatch(tok, "decltype|typeof (", tok2);
+                } else {
+                    declTypeTok = Token::findsimplematch(tok, "__typeof (", tok2);
+                }
+
+                if (declTypeTok) {
+                    for (Token *declTok = declTypeTok->linkAt(1); declTok != declTypeTok; declTok = declTok->previous()) {
+                        if (declTok->isName() && !Token::Match(declTok->previous(), "::|.") && variableMap.hasVariable(declTok->str()))
+                            declTok->varId(variableMap.map(false).find(declTok->str())->second.id);
                     }
                 }
 
@@ -4796,7 +5027,7 @@ void Tokenizer::setVarIdPass1()
                         decl = false;
                 } else if (cpp && Token::Match(prev2, "%type% {") && Token::simpleMatch(tok2->link(), "} ;")) { // C++11 initialization style
                     if (tok2->link() != tok2->next() && // add value-initialized variable T x{};
-                        (Token::Match(prev2, "do|try|else") || Token::Match(prev2->tokAt(-2), "struct|class|:")))
+                        (Token::Match(prev2, "do|try|else") || Token::simpleMatch(prev2->tokAt(-2), ":")))
                         continue;
                 } else
                     decl = false;
@@ -4826,7 +5057,7 @@ void Tokenizer::setVarIdPass1()
                                                    Token::Match(tok->tokAt(-1), ":: %name%"))) {
                                 const auto it = variableMap.map(false).find(tok->str());
                                 if (it != variableMap.map(false).end())
-                                    tok->varId(it->second);
+                                    tok->varId(it->second.id);
                             }
                             tok = tok->next();
                         }
@@ -4855,6 +5086,13 @@ void Tokenizer::setVarIdPass1()
                     continue;
             }
 
+            if (tok->str().back() == '>') {
+                addTemplateVarIdUsage(tok->str(),
+                                      mTemplateSimplifier->getUsedVariables(),
+                                      variableMap.map(globalNamespace),
+                                      mTemplateVarIdUsage);
+            }
+
             // function declaration inside executable scope? Function declaration is of form: type name "(" args ")"
             if (scopeStack.top().isExecutable && !scopeStack.top().isStructInit && Token::Match(tok, "%name% [,)[]")) {
                 bool par = false;
@@ -4882,8 +5120,8 @@ void Tokenizer::setVarIdPass1()
                 // there are tokens which can't appear at the begin of a function declaration such as "return"
                 const bool isNotstartKeyword = start->next() && notstart.find(start->strAt(1)) != notstart.end();
 
-                // now check if it is a function declaration
-                if (Token::Match(start, "[;{}] %type% %name%|*") && par && Token::simpleMatch(end, ") ;") && !isNotstartKeyword) {
+                // now check if it is a function (pointer) declaration
+                if ((Token::simpleMatch(start, ") (") || Token::Match(start, "[;{}] %type% %name%|*")) && par && Token::Match(end, ") [;=]") && !isNotstartKeyword) {
                     // function declaration => don't set varid
                     tok = end;
                     continue;
@@ -4894,8 +5132,11 @@ void Tokenizer::setVarIdPass1()
                 !Token::simpleMatch(tok->next(), ": ;") && !(tok->tokAt(-1) && Token::Match(tok->tokAt(-2), "{|, ."))) {
                 const auto it = variableMap.map(globalNamespace).find(tok->str());
                 if (it != variableMap.map(globalNamespace).end()) {
-                    tok->varId(it->second);
-                    setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+                    if (!it->second.assigned || !Token::Match(tok->previous(), "%type% %name% (") || tok->previous()->isKeyword()) {
+                        it->second.assigned = true;
+                        tok->varId(it->second.id);
+                        setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+                    }
                 }
             }
         } else if (Token::Match(tok, "::|. %name%") && Token::Match(tok->previous(), ")|]|>|%name%")) {
@@ -4937,8 +5178,10 @@ static Token * matchMemberName(const std::list<std::string> &scope, const Token
 
     // Current scope..
     for (auto it = scope.cbegin(); it != scope.cend(); ++it) {
-        if (scopeIt == scopeInfo.cend() || scopeIt->name != *it)
-            return nullptr;
+        if (scopeIt == scopeInfo.cend() || scopeIt->name != *it) {
+            scopeIt = scopeInfo.cbegin();
+            break;
+        }
         ++scopeIt;
     }
 
@@ -5001,7 +5244,7 @@ static Token * matchMemberVarName(const Member &var, const std::list<ScopeInfo2>
 {
     Token *tok = matchMemberName(var, scopeInfo);
     if (Token::Match(tok, "%name%")) {
-        if (!tok->next() || tok->strAt(1) != "(" || (tok->tokAt(2) && tok->tokAt(2)->isLiteral()))
+        if (!tok->next() || tok->strAt(1) != "(" || (tok->tokAt(2) && (tok->tokAt(2)->isLiteral() || tok->tokAt(2)->isOp())))
             return tok;
     }
     return nullptr;
@@ -5042,7 +5285,16 @@ void Tokenizer::setVarIdPass2()
         std::map<const Token *, std::string> endOfScope;
         std::list<std::string> scope;
         std::list<const Token *> usingnamespaces;
+        const Token *enumEnd = nullptr;
         for (Token *tok = list.front(); tok; tok = tok->next()) {
+            if (isEnumStart(tok)) {
+                enumEnd = tok->link();
+                continue;
+            }
+            if (tok == enumEnd) {
+                enumEnd = nullptr;
+                continue;
+            }
             if (!tok->previous() || Token::Match(tok->previous(), "[;{}]")) {
                 if (Token::Match(tok, "using namespace %name% ::|;")) {
                     Token *endtok = tok->tokAt(2);
@@ -5072,7 +5324,8 @@ void Tokenizer::setVarIdPass2()
                 tok = tok->next()->findClosingBracket()->next();
             else if (usingnamespaces.empty() || tok->varId() || !tok->isName() || tok->isStandardType() || tok->tokType() == Token::eKeyword || tok->tokType() == Token::eBoolean ||
                      Token::Match(tok->previous(), ".|namespace|class|struct|&|&&|*|> %name%") || Token::Match(tok->previous(), "%type%| %name% ( %type%|)") || Token::Match(tok, "public:|private:|protected:") ||
-                     (!tok->next() && Token::Match(tok->previous(), "}|; %name%")))
+                     (!tok->next() && Token::Match(tok->previous(), "}|; %name%")) ||
+                     (enumEnd && Token::Match(tok->previous(), "{|, %name% =|,|}")))
                 continue;
 
             if (tok->strAt(-1) == "::" && tok->tokAt(-2) && tok->tokAt(-2)->isName())
@@ -5091,7 +5344,7 @@ void Tokenizer::setVarIdPass2()
             }
             if (!tok->next())
                 syntaxError(tok);
-            if (Token::Match(tok, "%name% (") && !(tok->tokAt(2) && tok->tokAt(2)->isLiteral()))
+            if (Token::Match(tok, "%name% (") && !(tok->tokAt(2) && (tok->tokAt(2)->isLiteral() || tok->tokAt(2)->isOp())))
                 allMemberFunctions.emplace_back(scope, usingnamespaces, tok1);
             else
                 allMemberVars.emplace_back(scope, usingnamespaces, tok1);
@@ -5341,7 +5594,7 @@ void Tokenizer::createLinks2()
     bool isStruct = false;
 
     std::stack<Token*> type;
-    std::stack<Token*> templateTokens;
+    std::stack<const Token*> templateTokens;
     for (Token *token = list.front(); token; token = token->next()) {
         if (Token::Match(token, "%name%|> %name% [:<]"))
             isStruct = true;
@@ -5395,7 +5648,9 @@ void Tokenizer::createLinks2()
 
             while (!type.empty() && type.top()->str() == "<") {
                 const Token* end = type.top()->findClosingBracket();
-                if (Token::Match(end, "> %comp%|;|.|=|{|(|::"))
+                if (Token::Match(end, "> %comp%|;|.|=|{|}|(|)|::"))
+                    break;
+                if (Token::Match(end, "> %name% (|::"))
                     break;
                 // Variable declaration
                 if (Token::Match(end, "> %var% ;") && (type.top()->tokAt(-2) == nullptr || Token::Match(type.top()->tokAt(-2), ";|}|{")))
@@ -5567,27 +5822,11 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     validate();
 
-    const SHOWTIME_MODES showTime = mTimerResults ? mSettings.showtime : SHOWTIME_MODES::SHOWTIME_NONE;
-
     // Bail out if code is garbage
-    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::findGarbageCode", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::findGarbageCode", mTimerResults, [&]() {
         findGarbageCode();
     });
 
-    checkConfiguration();
-
-    // if (x) MACRO() ..
-    for (const Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::simpleMatch(tok, "if (")) {
-            tok = tok->linkAt(1);
-            if (Token::Match(tok, ") %name% (") &&
-                tok->next()->isUpperCaseName() &&
-                Token::Match(tok->linkAt(2), ") {|else")) {
-                syntaxError(tok->next());
-            }
-        }
-    }
-
     if (Settings::terminated())
         return false;
 
@@ -5613,17 +5852,11 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     if (isCPP())
         simplifyExternC();
 
+    validate();
+
     // simplify compound statements: "[;{}] ( { code; } ) ;"->"[;{}] code;"
     simplifyCompoundStatements();
 
-    // check for simple syntax errors..
-    for (const Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::simpleMatch(tok, "> struct {") &&
-            Token::simpleMatch(tok->linkAt(2), "} ;")) {
-            syntaxError(tok);
-        }
-    }
-
     if (!simplifyAddBraces())
         return false;
 
@@ -5727,7 +5960,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     simplifyTypedefLHS();
 
     // typedef..
-    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTypedef", showTime, mTimerResults, [&]() {
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTypedef", mTimerResults, [&]() {
         simplifyTypedef();
     });
 
@@ -5821,7 +6054,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
         simplifyTypeIntrinsics();
 
         // Handle templates..
-        Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTemplates", showTime, mTimerResults, [&]() {
+        Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTemplates", mTimerResults, [&]() {
             simplifyTemplates();
         });
 
@@ -5848,13 +6081,16 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     validate(); // #6772 "segmentation fault (invalid code) in Tokenizer::setVarId"
 
-    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::setVarId", showTime, mTimerResults, [&](){
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::setVarId", mTimerResults, [&](){
         setVarId();
     });
 
     // Link < with >
     createLinks2();
 
+    // Handle std::aligned_storage<...>
+    simplifyAlignedStorage();
+
     // Mark C++ casts
     markCppCasts();
 
@@ -5897,7 +6133,6 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 }
 //---------------------------------------------------------------------------
 
-// TODO: do not depend on --verbose
 void Tokenizer::printDebugOutput(std::ostream &out) const
 {
     if (!list.front())
@@ -5918,14 +6153,14 @@ void Tokenizer::printDebugOutput(std::ostream &out) const
     if (mSymbolDatabase) {
         if (xml)
             mSymbolDatabase->printXml(out);
-        else if (mSettings.debugsymdb || (mSettings.debugnormal && mSettings.verbose))
+        else if (mSettings.debugsymdb)
             mSymbolDatabase->printOut("Symbol database");
     }
 
-    if (mSettings.debugast || (mSettings.debugnormal && mSettings.verbose))
-        list.front()->printAst(mSettings.verbose, xml, list.getFiles(), out);
+    if (mSettings.debugast)
+        list.front()->printAst(xml, list.getFiles(), out);
 
-    if (mSettings.debugnormal || mSettings.debugvalueflow)
+    if (mSettings.debugvalueflow)
         list.front()->printValueFlow(list.getFiles(), xml, out);
 
     if (xml)
@@ -6033,10 +6268,16 @@ void Tokenizer::dump(std::ostream &out) const
             outs += " externLang=\"C\"";
         if (tok->isExpandedMacro())
             outs += " macroName=\"" + tok->getMacroName() + "\"";
-        if (tok->isTemplateArg())
+        if (tok->isTemplateArg()) {
             outs += " isTemplateArg=\"true\"";
+            outs += " templateArgFileIndex=\"" + std::to_string(tok->templateArgFileIndex()) + "\"";
+            outs += " templateArgLineNumber=\"" + std::to_string(tok->templateArgLineNumber()) + "\"";
+            outs += " templateArgColumn=\"" + std::to_string(tok->templateArgColumn()) + "\"";
+        }
         if (tok->isRemovedVoidParameter())
             outs += " isRemovedVoidParameter=\"true\"";
+        if (tok->isInsertedBrace())
+            outs += " isInsertedBrace=\"true\"";
         if (tok->isSplittedVarDeclComma())
             outs += " isSplittedVarDeclComma=\"true\"";
         if (tok->isSplittedVarDeclEq())
@@ -6059,6 +6300,8 @@ void Tokenizer::dump(std::ostream &out) const
             outs += " isAttributeFallthrough=\"true\"";
         if (tok->isInitBracket())
             outs += " isInitBracket=\"true\"";
+        if (tok->isAnonymous())
+            outs += " isAnonymous=\"true\"";
         if (tok->hasAttributeAlignas()) {
             const std::vector<std::string>& a = tok->getAttributeAlignas();
             outs += " alignas=\"" + ErrorLogger::toxml(a[0]) + "\"";
@@ -6158,8 +6401,23 @@ void Tokenizer::dump(std::ostream &out) const
             outs += "\" ";
             outs += "std-string-like=\"";
             outs += bool_to_string(c->stdStringLike);
-            outs += "\"/>";
-            outs += '\n';
+            outs += "\"";
+            if (c->functions.empty()) {
+                outs += "/>\n";
+                continue;
+            }
+            outs += ">\n";
+            for (const auto& fp: c->functions) {
+                std::string action;
+                std::string yield;
+                if (fp.second.action != Library::Container::Action::NO_ACTION)
+                    action = " action=\"" + Library::Container::toString(fp.second.action) + "\"";
+                if (fp.second.yield != Library::Container::Yield::NO_YIELD)
+                    yield = " yield=\"" + Library::Container::toString(fp.second.yield) + "\"";
+                if (!action.empty() || !yield.empty())
+                    outs += "      <f name=\"" + fp.first + "\"" + action + yield + "/>\n";
+            }
+            outs += "    </container>\n";
         }
         outs += "  </containers>";
         outs += '\n';
@@ -6171,6 +6429,12 @@ void Tokenizer::dump(std::ostream &out) const
     outs += dumpTypedefInfo();
 
     outs += mTemplateSimplifier->dump();
+    if (!mTemplateVarIdUsage.empty()) {
+        outs += "  <template-varid-usage>\n";
+        for (nonneg int id: mTemplateVarIdUsage)
+            outs += "    <var id=\"" + std::to_string(id) + "\"/>\n";
+        outs += "  </template-varid-usage>\n";
+    }
 
     out << outs;
 }
@@ -6182,12 +6446,19 @@ std::string Tokenizer::dumpTypedefInfo() const
     std::string outs = "  <typedef-info>";
     outs += '\n';
     for (const TypedefInfo &typedefInfo: mTypedefInfo) {
+        const bool toks = !typedefInfo.typedefInfoTokens.empty();
         outs += "    <info";
 
         outs += " name=\"";
         outs += typedefInfo.name;
         outs += "\"";
 
+        if (!typedefInfo.originalName.empty()) {
+            outs += " originalName=\"";
+            outs += typedefInfo.originalName;
+            outs += "\"";
+        }
+
         outs += " file=\"";
         outs += ErrorLogger::toxml(typedefInfo.filename);
         outs += "\"";
@@ -6199,7 +6470,15 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += " column=\"";
         outs += std::to_string(typedefInfo.column);
         outs += "\"";
+        if (typedefInfo.tagLine > -1 && typedefInfo.tagColumn > -1) {
+            outs += " tagline=\"";
+            outs += std::to_string(typedefInfo.tagLine);
+            outs += "\"";
 
+            outs += " tagcolumn=\"";
+            outs += std::to_string(typedefInfo.tagColumn);
+            outs += "\"";
+        }
         outs += " used=\"";
         outs += std::to_string(typedefInfo.used?1:0);
         outs += "\"";
@@ -6207,9 +6486,26 @@ std::string Tokenizer::dumpTypedefInfo() const
         outs += " isFunctionPointer=\"";
         outs += std::to_string(typedefInfo.isFunctionPointer);
         outs += "\"";
-
-        outs += "/>";
+        if (toks)
+            outs += ">";
+        else
+            outs += "/>";
         outs += '\n';
+        for (const auto& t : typedefInfo.typedefInfoTokens) {
+            outs += "      <token ";
+            outs += "line=\"";
+            outs += std::to_string(t.lineNumber);
+            outs += "\" ";
+            outs += "column=\"";
+            outs += std::to_string(t.column);
+            outs += "\" ";
+            outs += "str=\"";
+            outs += ErrorLogger::toxml(t.name);
+            outs += "\"/>";
+            outs += '\n';
+        }
+        if (toks)
+            outs += "    </info>\n";
     }
     outs += "  </typedef-info>";
     outs += '\n';
@@ -6266,10 +6562,16 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
     }
 
     const std::set<std::string> functionStart{"static", "const", "unsigned", "signed", "void", "bool", "char", "short", "int", "long", "float", "*"};
+    bool goBack = false;
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         const bool isIncluded = (tok->fileIndex() != 0);
 
+        if (goBack) {
+            tok = tok->previous();
+        }
+        goBack = false;
+
         // Remove executable code
         if (isIncluded && !mSettings.checkHeaders && tok->str() == "{") {
             // TODO: We probably need to keep the executable code if this function is called from the source file.
@@ -6335,6 +6637,7 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
                         const Token *endToken = closingBracket->linkAt(3)->linkAt(1)->next();
                         Token::eraseTokens(tok, endToken);
                         tok->deleteThis();
+                        goBack = true;
                     }
                 }
             }
@@ -6648,7 +6951,7 @@ Token *Tokenizer::simplifyAddBracesToCommand(Token *tok)
             // before the "while"
             if (tokEnd) {
                 tokEnd=tokEnd->next();
-                if (!tokEnd || tokEnd->str()!="while") // no while
+                if (!Token::simpleMatch(tokEnd, "while (") || !Token::simpleMatch(tokEnd->linkAt(1), ") ;")) // no while
                     syntaxError(tok);
             }
         }
@@ -6728,6 +7031,7 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
         }
         tokEnd->insertToken("}");
         Token * tokCloseBrace = tokEnd->next();
+        tokCloseBrace->column(tokEnd->column());
 
         Token::createMutualLinks(tokOpenBrace, tokCloseBrace);
         tokBracesEnd = tokCloseBrace;
@@ -6759,9 +7063,13 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
 
         tokAfterCondition->previous()->insertToken("{");
         Token * tokOpenBrace=tokAfterCondition->previous();
+        tokOpenBrace->column(tokAfterCondition->column());
+        tokOpenBrace->isInsertedBrace(true);
 
         tokEnd->insertToken("}");
         Token * tokCloseBrace=tokEnd->next();
+        tokCloseBrace->column(tokEnd->column());
+        tokCloseBrace->isInsertedBrace(true);
 
         Token::createMutualLinks(tokOpenBrace,tokCloseBrace);
         tokBracesEnd=tokCloseBrace;
@@ -6778,12 +7086,11 @@ void Tokenizer::simplifyFunctionParameters()
         }
 
         // Find the function e.g. foo( x ) or foo( x, y )
-        else if (Token::Match(tok, "%name% ( %name% [,)]") &&
-                 !(tok->strAt(-1) == ":" || tok->strAt(-1) == "," || tok->strAt(-1) == "::")) {
+        else if (Token::Match(tok, "%name% ( %name% [,)]") && !Token::Match(tok->tokAt(-1), ":|,|::|=")) {
             // We have found old style function, now we need to change it
 
             // First step: Get list of argument names in parentheses
-            std::map<std::string, Token *> argumentNames;
+            std::map<std::string, const Token *> argumentNames;
             bool bailOut = false;
             const Token * tokparam = nullptr;
 
@@ -6902,7 +7209,7 @@ void Tokenizer::simplifyFunctionParameters()
             if (argumentNames.size() != argumentNames2.size()) {
                 //move back 'tok1' to the last ';'
                 tok1 = tok1->previous();
-                for (const std::pair<const std::string, Token *>& argumentName : argumentNames) {
+                for (const std::pair<const std::string, const Token *>& argumentName : argumentNames) {
                     if (argumentNames2.find(argumentName.first) == argumentNames2.end()) {
                         //add the missing parameter argument declaration
                         tok1->insertToken(";");
@@ -7026,7 +7333,7 @@ void Tokenizer::simplifyFunctionPointers()
         while (Token::Match(tok2, "%type%|:: %type%|::"))
             tok2 = tok2->next();
 
-        if (!Token::Match(tok2, "%name% ) (") &&
+        if (!isFunctionPointer(tok2) &&
             !Token::Match(tok2, "%name% [ ] ) (") &&
             !(Token::Match(tok2, "%name% (") && Token::simpleMatch(tok2->linkAt(1), ") ) (")))
             continue;
@@ -7090,6 +7397,19 @@ void Tokenizer::simplifyVarDecl(const bool only_k_r_fpar)
     simplifyVarDecl(list.front(), nullptr, only_k_r_fpar);
 }
 
+static Token* isTrailingReturnType(Token* tok)
+{
+    while (Token::Match(tok, "%name%|::|>")) {
+        if (Token* open = tok->findOpeningBracket())
+            tok = open->tokAt(-1);
+        else
+            tok = tok->tokAt(-1);
+    }
+    if (tok && Token::simpleMatch(tok->tokAt(-1), ") ."))
+        return tok->tokAt(-1);
+    return nullptr;
+}
+
 // cppcheck-suppress functionConst - has side effects
 void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, const bool only_k_r_fpar)
 {
@@ -7117,14 +7437,16 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
                 if (!tok->linkAt(1))
                     syntaxError(tokBegin);
                 // Check for lambdas before skipping
-                if (Token::Match(tok->tokAt(-2), ") . %name%")) { // trailing return type
+                if (Token* trailingStart = isTrailingReturnType(tok)) {
                     // TODO: support lambda without parameter clause?
-                    Token* lambdaStart = tok->linkAt(-2)->previous();
+                    Token* lambdaStart = trailingStart->link()->tokAt(-1);
                     if (Token::simpleMatch(lambdaStart, "]"))
                         lambdaStart = lambdaStart->link();
                     Token* lambdaEnd = findLambdaEndScope(lambdaStart);
                     if (lambdaEnd)
                         simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
+                    else
+                        simplifyVarDecl(tok->tokAt(2), tok->linkAt(1), only_k_r_fpar);
                 } else {
                     for (Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
                         Token* lambdaEnd = findLambdaEndScope(tok2);
@@ -7319,7 +7641,7 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
             }
             // Function pointer
             if (Token::simpleMatch(varName, "( *") &&
-                Token::Match(varName->link()->previous(), "%name% ) (") &&
+                isFunctionPointer(varName->link()->previous()) &&
                 Token::simpleMatch(varName->link()->linkAt(1), ") =")) {
                 Token *endDecl = varName->link()->linkAt(1);
                 varName = varName->link()->previous();
@@ -7360,9 +7682,9 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
             else if (Token::Match(varName, "%name% [")) {
                 tok2 = varName->next();
 
-                while (Token::Match(tok2->link(), "] ,|=|["))
+                while (Token::Match(tok2->link(), "] [,=[{]"))
                     tok2 = tok2->link()->next();
-                if (!Token::Match(tok2, "=|,"))
+                if (!Token::Match(tok2, "[=,{]"))
                     tok2 = nullptr;
                 if (tok2 && tok2->str() == "=") {
                     while (tok2 && tok2->str() != "," && tok2->str() != ";") {
@@ -7432,9 +7754,11 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
                         varTok = varTok->next();
                     if (!varTok)
                         syntaxError(tok2); // invalid code
-                    TokenList::insertTokens(eq, varTok, 2);
-                    eq->str(";");
-                    eq->isSplittedVarDeclEq(true);
+                    if (eq->str() == "=") {
+                        TokenList::insertTokens(eq, varTok, 2);
+                        eq->str(";");
+                        eq->isSplittedVarDeclEq(true);
+                    }
 
                     // "= x, "   =>   "= x; type "
                     if (tok2->str() == ",") {
@@ -7500,16 +7824,20 @@ void Tokenizer::simplifyStaticConst()
             }
 
             // Move the qualifier to the left-most position in the declaration
+            const int column = tok->next()->column();
             tok->deleteNext();
             if (!leftTok) {
                 list.front()->insertToken(qualifiers[i]);
                 list.front()->swapWithNext();
+                list.front()->column(column);
                 tok = list.front();
             } else if (leftTok->next()) {
                 leftTok->next()->insertTokenBefore(qualifiers[i]);
+                leftTok->next()->column(column);
                 tok = leftTok->next();
             } else {
                 leftTok->insertToken(qualifiers[i]);
+                leftTok->next()->column(column);
                 tok = leftTok;
             }
         }
@@ -7605,15 +7933,15 @@ bool Tokenizer::simplifyCAlternativeTokens()
         if (!tok->isName())
             continue;
 
-        const auto cOpIt = utils::as_const(cAlternativeTokens).find(tok->str());
+        const auto cOpIt = cAlternativeTokens.find(tok->str());
         if (cOpIt != cAlternativeTokens.end()) {
             alt.push_back(tok);
 
             // Is this a variable declaration..
-            if (isC() && Token::Match(tok->previous(), "%type%|* %name% [;,=]"))
+            if (isC() && Token::Match(tok->previous(), "%type%|* %name% [;,=)]"))
                 return false;
 
-            if (!Token::Match(tok->previous(), "%name%|%num%|%char%|)|]|> %name% %name%|%num%|%char%|%op%|("))
+            if (!Token::Match(tok->previous(), "%name%|%num%|%char%|%str%|)|]|> %name% %name%|%num%|%char%|%op%|%str%|("))
                 continue;
             if (Token::Match(tok->next(), "%assign%|%or%|%oror%|&&|*|/|%|^") && !Token::Match(tok->previous(), "%num%|%char%|) %name% *"))
                 continue;
@@ -7628,6 +7956,10 @@ bool Tokenizer::simplifyCAlternativeTokens()
         } else if (Token::Match(tok, "not|compl")) {
             alt.push_back(tok);
 
+            // Is this a variable/parameter declaration
+            if (isC() && Token::Match(tok->previous(), "%type%|* %name% [;,=)]"))
+                return false;
+
             if ((Token::Match(tok->previous(), "%assign%") || Token::Match(tok->next(), "%num%")) && !Token::Match(tok->next(), ".|->")) {
                 replaceAll = true;
                 continue;
@@ -7647,7 +7979,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
         return false;
 
     for (Token *tok: alt) {
-        const auto cOpIt = utils::as_const(cAlternativeTokens).find(tok->str());
+        const auto cOpIt = cAlternativeTokens.find(tok->str());
         if (cOpIt != cAlternativeTokens.end())
             tok->str(cOpIt->second);
         else if (tok->str() == "not")
@@ -7674,8 +8006,11 @@ void Tokenizer::simplifyInitVar()
             continue;
 
         if (Token::Match(tok, "%type% *|&| %name% (|{")) {
+            bool isNamespace = Token::simpleMatch(tok, "namespace");
             while (tok && !Token::Match(tok, "(|{"))
                 tok = tok->next();
+            if (isNamespace)
+                continue;
             if (tok)
                 tok->isInitBracket(true);
             /* tok = initVar(tok);
@@ -7765,8 +8100,8 @@ void Tokenizer::elseif()
 
             if (Token::Match(tok2, "}|;")) {
                 if (tok2->next() && tok2->strAt(1) != "else") {
-                    tok->insertToken("{");
-                    tok2->insertToken("}");
+                    tok->insertToken("{")->isInsertedBrace(true);
+                    tok2->insertToken("}")->isInsertedBrace(true);
                     Token::createMutualLinks(tok->next(), tok2->next());
                     break;
                 }
@@ -7832,7 +8167,8 @@ void Tokenizer::simplifyIfSwitchForInit()
         tok->str("{");
         endscope->insertToken("}");
         Token::createMutualLinks(tok, endscope->next());
-        tok->isSimplifiedScope(true);
+        tok->isInsertedBrace(true);
+        tok->isSimplifiedIfInitStmt(true);
     }
 }
 
@@ -7986,7 +8322,7 @@ bool Tokenizer::simplifyRedundantParentheses()
             while (Token::Match(tok2, "%type%|static|const|extern") && tok2->str() != "operator") {
                 tok2 = tok2->previous();
             }
-            if (tok2 && !Token::Match(tok2, "[;,{]")) {
+            if (tok2 && !Token::Match(tok2, "[;{]")) {
                 // Not a variable declaration
             } else {
                 tok->deleteThis();
@@ -8124,14 +8460,6 @@ void Tokenizer::unhandled_macro_class_x_y(const Token *tok, const std::string& t
                 bracket + "' is not handled. You can use -I or --include to add handling of this code.");
 }
 
-void Tokenizer::macroWithSemicolonError(const Token *tok, const std::string &macroName) const
-{
-    reportError(tok,
-                Severity::information,
-                "macroWithSemicolon",
-                "Ensure that '" + macroName + "' is defined either using -I, --include or -D.");
-}
-
 void Tokenizer::invalidConstFunctionTypeError(const Token *tok) const
 {
     reportError(tok,
@@ -8192,25 +8520,6 @@ bool Tokenizer::isOneNumber(const std::string &s)
     return isNumberOneOf(s, 1L, "1.0");
 }
 // ------------------------------------------------------------------------
-void Tokenizer::checkConfiguration() const
-{
-    if (!mSettings.checkConfiguration)
-        return;
-    for (const Token *tok = tokens(); tok; tok = tok->next()) {
-        if (!Token::Match(tok, "%name% ("))
-            continue;
-        if (tok->isControlFlowKeyword())
-            continue;
-        for (const Token *tok2 = tok->tokAt(2); tok2 && tok2->str() != ")"; tok2 = tok2->next()) {
-            if (tok2->str() == ";") {
-                macroWithSemicolonError(tok, tok->str());
-                break;
-            }
-            if (Token::Match(tok2, "(|{"))
-                tok2 = tok2->link();
-        }
-    }
-}
 
 void Tokenizer::validateC() const
 {
@@ -8524,7 +8833,7 @@ void Tokenizer::findGarbageCode() const
             unknownMacroError(tok->linkAt(1)->previous());
 
         // UNKNOWN_MACRO(return)
-        else if (!tok->isKeyword() && Token::Match(tok, "%name% throw|return"))
+        else if (!tok->isKeyword() && (Token::Match(tok, "%name% return") || (isCPP() && Token::Match(tok, "%name% throw"))))
             unknownMacroError(tok);
 
         // Assign/increment/decrement literal
@@ -8532,6 +8841,9 @@ void Tokenizer::findGarbageCode() const
             if (!cpp || mSettings.standards.cpp < Standards::CPP20 || !Token::Match(tok->previous(), "%name% : %num% ="))
                 syntaxError(tok, tok->strAt(1) + " " + tok->strAt(2));
         }
+        else if (!cpp && Token::Match(tok, "++|-- ++|--")) {
+            syntaxError(tok, tok->str() + tok->strAt(1));
+        }
         else if (Token::simpleMatch(tok, ") return") && !Token::Match(tok->link()->previous(), "if|while|for (")) {
             if (tok->link()->previous() && tok->link()->previous()->isUpperCaseName())
                 unknownMacroError(tok->link()->previous());
@@ -8557,6 +8869,9 @@ void Tokenizer::findGarbageCode() const
                 }
                 if (!Token::Match(tok->next(), "( !!)"))
                     syntaxError(tok);
+                if (Token::simpleMatch(tok->linkAt(1), ") }")) {
+                    syntaxError(tok->linkAt(1)->next());
+                }
                 if (tok->str() != "for") {
                     if (isGarbageExpr(tok->next(), tok->linkAt(1), cpp && (mSettings.standards.cpp>=Standards::cppstd_t::CPP17)))
                         syntaxError(tok);
@@ -8568,6 +8883,13 @@ void Tokenizer::findGarbageCode() const
                 if (!Token::simpleMatch(tok->linkAt(1)->linkAt(2), ") ;"))
                     syntaxError(tok->linkAt(1)->linkAt(2));
             }
+            // if (x) MACRO() ..
+            if (Token::simpleMatch(tok, "if (")) {
+                const Token* tok2 = tok->linkAt(1);
+                if (Token::Match(tok2, ") %name% (") && tok2->next()->isUpperCaseName() &&
+                    Token::Match(tok2->linkAt(2), ") {|else"))
+                    syntaxError(tok2->next());
+            }
         }
 
         // keyword keyword
@@ -8584,6 +8906,8 @@ void Tokenizer::findGarbageCode() const
                     syntaxError(tok, prev == tok->previous() ? (prev->str() + " " + tok->str()) : (prev->str() + " .. " + tok->str()));
             }
         }
+        else if (tok->isStandardType() && tok->next() && tok->str() == tok->strAt(1) && tok->str() != "long")
+            syntaxError(tok);
     }
 
     // invalid struct declaration
@@ -8644,6 +8968,16 @@ void Tokenizer::findGarbageCode() const
         else if (tok->isKeyword() && nonGlobalKeywords.count(tok->str()) && !Token::Match(tok->tokAt(-2), "operator %str%"))
             syntaxError(tok, "keyword '" + tok->str() + "' is not allowed in global scope");
     }
+    for (const Token *tok = tokens(); tok; tok = tok->next()) {
+        if (tok->str() == "{" && isClassStructUnionEnumStart(tok)) {
+            for (const Token* tok2 = tok->next(); tok2 != tok->link(); tok2 = tok2->next()) {
+                if (tok2->str() == "{")
+                    tok2 = tok2->link();
+                else if (tok2->isKeyword() && nonGlobalKeywords.count(tok2->str()) && !Token::Match(tok2->tokAt(-2), "operator %str%"))
+                    syntaxError(tok2, "keyword '" + tok2->str() + "' is not allowed in class/struct/union/enum scope");
+            }
+        }
+    }
 
     // case keyword must be inside switch
     for (const Token *tok = tokens(); tok; tok = tok->next()) {
@@ -8682,15 +9016,21 @@ void Tokenizer::findGarbageCode() const
             continue;
         // count number of semicolons
         int semicolons = 0, colons = 0;
-        const Token* const startTok = tok;
-        tok = tok->linkAt(1)->previous(); // find ")" of the for-loop
-        // walk backwards until we find the beginning (startTok) of the for() again
-        for (; tok != startTok; tok = tok->previous()) {
+        const Token* const endTok = tok->linkAt(1);
+        for (tok = tok->tokAt(2); tok != endTok; tok = tok->next()) {
+            if (const Token* lam = findLambdaEndTokenWithoutAST(tok)) {
+                if (lam == endTok)
+                    break;
+                tok = lam;
+                continue;
+            }
             if (tok->str() == ";") { // do the counting
                 semicolons++;
             } else if (tok->str() == ":") {
+                if (tok->strAt(-1) == ",")
+                    syntaxError(tok);
                 colons++;
-            } else if (tok->str() == ")") { // skip pairs of ( )
+            } else if (tok->str() == "(" || tok->str() == "{") { // skip pairs of ( )
                 tok = tok->link();
             }
         }
@@ -8744,7 +9084,7 @@ void Tokenizer::findGarbageCode() const
                     syntaxError(tok, code);
             }
         }
-        if (Token::Match(tok, "%num%|%bool%|%char%|%str% %num%|%bool%|%char%|%str%") && !Token::Match(tok, "%str% %str%"))
+        if (Token::Match(tok, "%num%|%bool%|%char%|%str% %num%|%bool%|%char%|%str%|::") && !Token::Match(tok, "%str% %str%"))
             syntaxError(tok);
         if (Token::Match(tok, "%num%|%bool%|%char%|%str% {|(")) {
             if (tok->strAt(1) == "(")
@@ -8767,7 +9107,7 @@ void Tokenizer::findGarbageCode() const
             syntaxError(tok);
         if (Token::Match(tok, "[;([{] %comp%|%oror%|%or%|%|/"))
             syntaxError(tok);
-        if (Token::Match(tok, "%cop%|= ]") && !(cpp && Token::Match(tok->previous(), "%type%|[|,|%num% &|=|> ]")))
+        if (Token::Match(tok, "%cop%|= ]") && !Token::simpleMatch(tok, "*") && !(cpp && Token::Match(tok->previous(), "<|%type%|[|,|%num% &|=|> ]")))
             syntaxError(tok);
         if (Token::Match(tok, "[+-] [;,)]}]") && !(cpp && Token::simpleMatch(tok->previous(), "operator")))
             syntaxError(tok);
@@ -8784,16 +9124,25 @@ void Tokenizer::findGarbageCode() const
             !Token::simpleMatch(tok->previous(), ".") &&
             !Token::simpleMatch(tok->next(), ".") &&
             !Token::Match(tok->previous(), "{|, . %name% =|.|[|{") &&
+            !(tok->previous() && tok->previous()->isLiteral()) &&
             !Token::Match(tok->previous(), ", . %name%")) {
             if (!Token::Match(tok->previous(), "%name%|)|]|>|}"))
                 syntaxError(tok, tok->strAt(-1) + " " + tok->str() + " " + tok->strAt(1));
             if (!Token::Match(tok->next(), "%name%|*|~"))
                 syntaxError(tok, tok->strAt(-1) + " " + tok->str() + " " + tok->strAt(1));
         }
+        if (Token::Match(tok, ".|-> .|->"))
+            syntaxError(tok);
         if (Token::Match(tok, "[{,] . %name%") && !Token::Match(tok->tokAt(3), "[.=[{]"))
             syntaxError(tok->next());
         if (Token::Match(tok, "%name% %op% %name%") && !tok->isKeyword() && tok->next()->isIncDecOp())
             syntaxError(tok->next());
+        if (!tok->isKeyword() && Token::Match(tok, "%name% .|-> %name% %name%") && !tok->tokAt(2)->isKeyword()) {
+            if (tok->tokAt(3)->isUpperCaseName())
+                unknownMacroError(tok->tokAt(3));
+            else
+                syntaxError(tok);
+        }
         if (Token::Match(tok, "[!|+-/%^~] )|]"))
             syntaxError(tok);
         if (Token::Match(tok, "==|!=|<=|>= %comp%") && tok->strAt(-1) != "operator")
@@ -8803,16 +9152,22 @@ void Tokenizer::findGarbageCode() const
             syntaxError(tok);
         if (Token::Match(tok, "& %comp%|&&|%oror%|&|%or%") && tok->strAt(1) != ">")
             syntaxError(tok);
+        if (Token::Match(tok, "%comp%|&&|%oror%|&|%or% }") && tok->str() != ">")
+            syntaxError(tok);
         if (Token::Match(tok, "^ %op%") && !Token::Match(tok->next(), "[>*+-!~]"))
             syntaxError(tok);
         if (Token::Match(tok, ": [)]=]"))
             syntaxError(tok);
         if (Token::Match(tok, "typedef [,;:]"))
             syntaxError(tok);
-        if (Token::Match(tok, "!|~ %comp%") &&
-            !(cpp && tok->strAt(1) == ">" && Token::simpleMatch(tok->tokAt(-1), "operator")))
+        if (Token::Match(tok, "? %assign%"))
+            syntaxError(tok);
+        if (Token::Match(tok, "[!~+-/] %comp%") &&
+            !(cpp && Token::Match(tok->next(), "[<>]") && Token::simpleMatch(tok->tokAt(-1), "operator")))
+            syntaxError(tok);
+        if (Token::Match(tok, "%comp% {") && (!cpp || tok->str() != ">"))
             syntaxError(tok);
-        if (Token::Match(tok, "] %name%") && (!cpp || !(tok->tokAt(-1) && Token::simpleMatch(tok->tokAt(-2), "delete [")))) {
+        if (Token::Match(tok, "] %name%") && (!cpp || !(tok->tokAt(1)->isKeyword() || (tok->tokAt(-1) && Token::simpleMatch(tok->tokAt(-2), "delete ["))))) {
             if (tok->next()->isUpperCaseName())
                 unknownMacroError(tok->next());
             else
@@ -8847,19 +9202,23 @@ void Tokenizer::findGarbageCode() const
                 }
                 if (!tok2->next() || tok2->isControlFlowKeyword() || Token::Match(tok2, "typedef|static|."))
                     syntaxError(tok);
-                if (Token::Match(tok2, "%name% %name%") && tok2->str() == tok2->strAt(1)) {
-                    if (Token::simpleMatch(tok2->tokAt(2), ";"))
-                        continue;
-                    if (tok2->isStandardType() && tok2->str() == "long")
-                        continue;
-                    if (Token::Match(tok2->tokAt(-1), "enum|struct|union") || (isCPP() && Token::Match(tok2->tokAt(-1), "class|::")))
-                        continue;
-                    syntaxError(tok2);
+                if (Token::Match(tok2, "%name% %name%")) {
+                    if (tok2->str() == tok2->strAt(1)) {
+                        if (Token::simpleMatch(tok2->tokAt(2), ";"))
+                            continue;
+                        if (tok2->isStandardType() && tok2->str() == "long")
+                            continue;
+                        if (Token::Match(tok2->tokAt(-1), "enum|struct|union") || (isCPP() && Token::Match(tok2->tokAt(-1), "class|::")))
+                            continue;
+                        syntaxError(tok2);
+                    }
+                    if (Token::Match(tok2->tokAt(2), "%name%") && tok2->isNameOnly() && tok2->tokAt(1)->isNameOnly() && tok2->tokAt(2)->isNameOnly())
+                        syntaxError(tok2);
                 }
             }
         }
-        if (cpp && tok->str() == "namespace" && tok->tokAt(-1)) {
-            if (!Token::Match(tok->tokAt(-1), ";|{|}|using|inline")) {
+        if (cpp && tok->str() == "namespace") {
+            if (tok->tokAt(-1) && !Token::Match(tok->tokAt(-1), ";|{|}|using|inline")) {
                 if (tok->tokAt(-1)->isUpperCaseName())
                     unknownMacroError(tok->tokAt(-1));
                 else if (tok->linkAt(-1) && tok->linkAt(-1)->tokAt(-1) && tok->linkAt(-1)->tokAt(-1)->isUpperCaseName())
@@ -8867,6 +9226,8 @@ void Tokenizer::findGarbageCode() const
                 else
                     syntaxError(tok);
             }
+            if (!tok->next() || (Token::Match(tok->next(), "%name% =") && !Token::Match(tok->tokAt(3), "::|%name%")))
+                syntaxError(tok);
         }
         if (cpp && tok->str() == "using" && !Token::Match(tok->next(), "::|%name%"))
             syntaxError(tok);
@@ -8899,6 +9260,8 @@ void Tokenizer::findGarbageCode() const
                 syntaxError(tok);
             if (Token::simpleMatch(tok, ": template") && !Token::Match(tok->tokAt(-1), "public|private|protected"))
                 syntaxError(tok);
+            if (Token::Match(tok, "> class|struct|union {") && Token::simpleMatch(tok->linkAt(2), "} ;"))
+                syntaxError(tok);
             if (!Token::simpleMatch(tok, "template <"))
                 continue;
             if (!tok->tokAt(2) || tok->tokAt(2)->isLiteral())
@@ -9032,7 +9395,7 @@ static bool isAnonymousEnum(const Token* tok)
         while (Token::Match(end, "%name%|::"))
             end = end->next();
     }
-    return end && Token::Match(end->link(), "} (| %type%| )| [,;[({=]");
+    return end && Token::Match(end->link(), "} (| %type%| )| [*,;[({=]");
 }
 
 void Tokenizer::simplifyStructDecl()
@@ -9111,18 +9474,22 @@ void Tokenizer::simplifyStructDecl()
             if (Token::Match(after->next(), "const|static|volatile| *|&| const| (| %type% )| ,|;|[|=|(|{")) {
                 after->insertToken(";");
                 after = after->next();
+                Token *declEnd = after;
                 while (!Token::Match(start, "struct|class|union|enum")) {
                     after->insertToken(start->str());
                     after = after->next();
+                    after->column(start->column());
                     start->deleteThis();
                 }
                 tok = start;
                 if (!after)
                     break; // see #4869 segmentation fault in Tokenizer::simplifyStructDecl (invalid code)
                 after->insertToken(type->str());
+                after->next()->column(type->column());
                 if (start->str() != "class") {
                     after->insertToken(start->str());
                     after = after->next();
+                    after->column(start->column());
                 }
 
                 after = after->tokAt(2);
@@ -9133,7 +9500,8 @@ void Tokenizer::simplifyStructDecl()
                 }
 
                 // check for initialization
-                if (Token::Match(after, "%any% (|{")) {
+                bool isFuncDecl = Token::Match(after, "%name% (") && Token::simpleMatch(after->linkAt(1), ") {");
+                if (Token::Match(after, "%any% (|{") && !isFuncDecl) {
                     after->insertToken("=");
                     after = after->next();
                     const bool isEnum = start->str() == "enum";
@@ -9149,6 +9517,16 @@ void Tokenizer::simplifyStructDecl()
                         }
                     }
                 }
+
+                // pull declaration out of for loop
+                if (Token::simpleMatch(start->tokAt(-2), "for ( struct")) {
+                    Token *link = start->linkAt(-1);
+                    start->deletePrevious(2);
+                    declEnd->insertToken("(");
+                    declEnd->next()->link(link);
+                    link->link(declEnd->next());
+                    declEnd->insertToken("for");
+                }
             }
         }
 
@@ -9210,7 +9588,7 @@ static Token* getVariableTokenAfterAttributes(Token* tok) {
     Token *after = getTokenAfterAttributes(tok, true);
 
     // check if after variable name
-    if (Token::Match(after, ";|=")) {
+    if (Token::Match(after, "[;={]")) {
         Token *prev = tok->previous();
         while (Token::simpleMatch(prev, "]"))
             prev = prev->link()->previous();
@@ -9218,9 +9596,16 @@ static Token* getVariableTokenAfterAttributes(Token* tok) {
             vartok = prev;
     }
 
+
     // check if before variable name
-    else if (Token::Match(after, "%type%"))
-        vartok = after;
+    else {
+        while (Token::Match(after->next(), "const|volatile|static|*|&|&&|%type%")) {
+            after = after->next();
+        }
+        if (Token::Match(after, "%name%")) {
+            vartok = after;
+        }
+    }
 
     return vartok;
 }
@@ -9253,7 +9638,7 @@ Token* Tokenizer::getAttributeFuncTok(Token* tok, bool gccattr) const {
         if (Token::simpleMatch(prev, ")")) {
             if (Token::Match(prev->link()->previous(), "%name% ("))
                 return prev->link()->previous();
-            if (Token::Match(prev->link()->tokAt(-2), "%name% ) ("))
+            if (isFunctionPointer(prev->link()->tokAt(-2)))
                 return prev->link()->tokAt(-2);
         }
         if (Token::simpleMatch(prev, ")") && Token::Match(prev->link()->tokAt(-2), "operator %op% (") && isCPP())
@@ -9317,6 +9702,8 @@ void Tokenizer::simplifyAttribute()
 
                 else if (Token::Match(attr, "[(,] unused|__unused__|used|__used__ [,)]")) {
                     Token *vartok = getVariableTokenAfterAttributes(tok);
+                    if (!vartok)
+                        vartok = functok;
                     if (vartok) {
                         const std::string &attribute(attr->strAt(1));
                         if (attribute.find("unused") != std::string::npos)
@@ -9386,10 +9773,10 @@ void Tokenizer::simplifyCppcheckAttribute()
 
         if (vartok->isName()) {
             if (Token::Match(tok->previous(), "__cppcheck_low__ ( %num% )"))
-                vartok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::LOW,
+                vartok->setCppcheckAttribute(Token::CppcheckAttributesType::LOW,
                                              MathLib::toBigNumber(tok->tokAt(1)));
             else if (Token::Match(tok->previous(), "__cppcheck_high__ ( %num% )"))
-                vartok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::HIGH,
+                vartok->setCppcheckAttribute(Token::CppcheckAttributesType::HIGH,
                                              MathLib::toBigNumber(tok->tokAt(1)));
         }
 
@@ -9432,7 +9819,7 @@ void Tokenizer::simplifyCPPAttribute()
                     head = skipCPPOrAlignAttribute(head)->next();
                 while (Token::Match(head, "%name%|::|*|&|<|>|,")) // skip return type
                     head = head->next();
-                if (head && head->str() == "(" && TokenList::isFunctionHead(head, "{;")) {
+                if (head && head->str() == "(" && (TokenList::isFunctionHead(head, "{;") || Token::simpleMatch(head->link(), ") __attribute__"))) {
                     head->previous()->isAttributeNoreturn(true);
                 }
             } else if (Token::findsimplematch(tok->tokAt(2), "nodiscard", tok->link())) {
@@ -9457,11 +9844,43 @@ void Tokenizer::simplifyCPPAttribute()
                 Token* head = skipCPPOrAlignAttribute(tok)->next();
                 while (isCPPAttribute(head) || isAlignAttribute(head))
                     head = skipCPPOrAlignAttribute(head)->next();
-                head->isAttributeMaybeUnused(true);
+
+                if (!head)
+                    syntaxError(tok);
+
+                if (Token::Match(head, ";|,|)")) {
+                    Token *backTok = tok;
+                    while (Token::Match(backTok, "]|[|)")) {
+                        if (Token::Match(backTok, "]|)"))
+                            backTok = backTok->link();
+                        backTok = backTok->previous();
+                    }
+                    if (Token::Match(backTok, "%name%")) {
+                        backTok->isAttributeMaybeUnused(true);
+                    }
+                } else {
+                    while (Token::Match(head->next(), "%name%|::|*|&|&&"))
+                        head = head->next();
+                    if (Token::Match(head, "%name%") && !Token::Match(head, "auto ["))
+                        head->isAttributeMaybeUnused(true);
+                    else if (Token::Match(tok->previous(), "%name%") && Token::Match(tok->link(), "] [;={]")) {
+                        tok->previous()->isAttributeMaybeUnused(true);
+                    } else if (Token::simpleMatch(head->next(), "[")) {
+                        head = head->next();
+                        const Token *end = head->link();
+                        for (head = head->next(); head != end; head = head->next()) {
+                            if (Token::Match(head, "%name%")) {
+                                head->isAttributeMaybeUnused(true);
+                            }
+                        }
+                    }
+                }
             } else if (Token::findsimplematch(tok->tokAt(2), "unused", tok->link())) {
                 Token* head = skipCPPOrAlignAttribute(tok)->next();
                 while (isCPPAttribute(head) || isAlignAttribute(head))
                     head = skipCPPOrAlignAttribute(head)->next();
+                if (!head)
+                    syntaxError(tok);
                 head->isAttributeUnused(true);
             } else if (Token::Match(tok->previous(), ") [ [ expects|ensures|assert default|audit|axiom| : %name% <|<=|>|>= %num% ] ]")) {
                 const Token *vartok = tok->tokAt(4);
@@ -9477,16 +9896,16 @@ void Tokenizer::simplifyCPPAttribute()
                 }
                 if (argtok && argtok->str() == vartok->str()) {
                     if (vartok->strAt(1) == ">=")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::LOW,
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::LOW,
                                                      MathLib::toBigNumber(vartok->tokAt(2)));
                     else if (vartok->strAt(1) == ">")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::LOW,
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::LOW,
                                                      MathLib::toBigNumber(vartok->tokAt(2)) + 1);
                     else if (vartok->strAt(1) == "<=")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::HIGH,
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::HIGH,
                                                      MathLib::toBigNumber(vartok->tokAt(2)));
                     else if (vartok->strAt(1) == "<")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::HIGH,
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::HIGH,
                                                      MathLib::toBigNumber(vartok->tokAt(2)) - 1);
                 }
             }
@@ -9503,10 +9922,19 @@ void Tokenizer::simplifyCPPAttribute()
             Token* atok = nullptr;
             if (Token::Match(tok->previous(), "%name%"))
                 atok = tok->previous();
-            else {
+            else if (Token::simpleMatch(tok->previous(), "]")) {
+                atok = tok;
+                while (atok && Token::simpleMatch(atok->previous(), "]")) {
+                    atok = atok->linkAt(-1);
+                    atok = atok ? atok->previous() : nullptr;
+                }
+                if (!Token::Match(atok, "%name%"))
+                    atok = nullptr;
+            } else {
                 atok = tok;
                 while (isCPPAttribute(atok) || isAlignAttribute(atok))
                     atok = skipCPPOrAlignAttribute(atok)->next();
+                atok = atok ? getVariableTokenAfterAttributes(atok) : atok;
             }
             if (atok) {
                 std::string a;
@@ -9749,7 +10177,7 @@ void Tokenizer::simplifyAsm()
             Token::eraseTokens(tok, tok->linkAt(1)->next());
         }
 
-        else if (Token::Match(tok, "asm|__asm|__asm__ volatile|__volatile|__volatile__| (")) {
+        else if (Token::Match(tok, "asm|__asm|__asm__ volatile|__volatile|__volatile__|goto|inline| (")) {
             // Goto "("
             Token *partok = tok->next();
             if (partok->str() != "(")
@@ -9762,7 +10190,7 @@ void Tokenizer::simplifyAsm()
             Token *endasm = tok->next();
             const Token *firstSemiColon = nullptr;
             int comment = 0;
-            while (Token::Match(endasm, "%num%|%name%|,|:|;") || (endasm && endasm->linenr() == comment)) {
+            while (Token::Match(endasm, "%num%|%name%|,|:|;|*|(") || (endasm && (endasm->isLiteral() || endasm->linenr() == comment))) {
                 if (Token::Match(endasm, "_asm|__asm|__endasm"))
                     break;
                 if (endasm->str() == ";") {
@@ -9770,6 +10198,11 @@ void Tokenizer::simplifyAsm()
                     if (!firstSemiColon)
                         firstSemiColon = endasm;
                 }
+                if (endasm->str() == "(") {
+                    if (!firstSemiColon)
+                        endasm = endasm->link();
+                    break;
+                }
                 endasm = endasm->next();
             }
             if (Token::simpleMatch(endasm, "__endasm")) {
@@ -9780,7 +10213,15 @@ void Tokenizer::simplifyAsm()
             } else if (firstSemiColon) {
                 instruction = tok->next()->stringifyList(firstSemiColon);
                 Token::eraseTokens(tok, firstSemiColon);
+            } else if (Token::Match(endasm, ") { !!}")) {
+                tok->deleteThis();
+                tok = endasm->tokAt(2);
+                endasm = endasm->linkAt(1);
+                instruction = tok->stringifyList(endasm);
+                Token::eraseTokens(tok, endasm);
             } else if (!endasm) {
+                if (!tok->next())
+                    syntaxError(tok);
                 instruction = tok->next()->stringifyList(endasm);
                 Token::eraseTokens(tok, endasm);
                 tok->insertToken(";");
@@ -9917,12 +10358,8 @@ void Tokenizer::simplifyAt()
 // Simplify bitfields
 void Tokenizer::simplifyBitfields()
 {
-    bool goback = false;
+    std::size_t anonymousBitfieldCounter = 0;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (goback) {
-            goback = false;
-            tok = tok->previous();
-        }
         Token *last = nullptr;
 
         if (Token::simpleMatch(tok, "for ("))
@@ -9931,27 +10368,30 @@ void Tokenizer::simplifyBitfields()
         if (!Token::Match(tok, ";|{|}|public:|protected:|private:"))
             continue;
 
-        bool isEnum = false;
-        if (tok->str() == "}") {
-            const Token *type = tok->link()->previous();
-            while (type && type->isName()) {
-                if (type->str() == "enum") {
-                    isEnum = true;
-                    break;
-                }
-                type = type->previous();
-            }
-        }
+        const bool isEnum = tok->str() == "}" && isEnumStart(tok->link());
+
+        const auto tooLargeError = [this](const Token *tok) {
+            const auto max = std::numeric_limits<short>::max();
+            reportError(tok,
+                        Severity::warning,
+                        "tooLargeBitField",
+                        "Bit-field size exceeds max number of bits " + std::to_string(max));
+        };
 
         Token* typeTok = tok->next();
         while (Token::Match(typeTok, "const|volatile"))
             typeTok = typeTok->next();
+        if (Token::Match(typeTok, ":: %name%"))
+            typeTok = typeTok->next();
+        while (Token::Match(typeTok, "%name% :: %name%"))
+            typeTok = typeTok->tokAt(2);
         if (Token::Match(typeTok, "%type% %name% :") &&
             !Token::Match(tok->next(), "case|public|protected|private|class|struct") &&
             !Token::simpleMatch(tok->tokAt(2), "default :")) {
             Token *tok1 = typeTok->next();
-            if (Token::Match(tok1, "%name% : %num% [;=]"))
-                tok1->setBits(static_cast<unsigned char>(MathLib::toBigNumber(tok1->tokAt(2))));
+            if (Token::Match(tok1, "%name% : %num% [;=,]"))
+                if (!tok1->setBits(MathLib::toBigNumber(tok1->tokAt(2))))
+                    tooLargeError(tok1->tokAt(2));
             if (tok1 && tok1->tokAt(2) &&
                 (Token::Match(tok1->tokAt(2), "%bool%|%num%") ||
                  !Token::Match(tok1->tokAt(2), "public|protected|private| %type% ::|<|,|{|;"))) {
@@ -9972,8 +10412,18 @@ void Tokenizer::simplifyBitfields()
             }
         } else if (Token::Match(typeTok, "%type% : %num%|%bool% ;") &&
                    typeTok->str() != "default") {
-            tok->deleteNext(4 + tokDistance(tok, typeTok) - 1);
-            goback = true;
+            const std::size_t id = anonymousBitfieldCounter++;
+            const std::string name = "anonymous@" + std::to_string(id);
+            Token *newTok = typeTok->insertToken(name);
+            newTok->isAnonymous(true);
+            bool failed;
+            if (newTok->tokAt(2)->isBoolean())
+                failed = !newTok->setBits(newTok->strAt(2) == "true");
+            else
+                failed = !newTok->setBits(MathLib::toBigNumber(newTok->tokAt(2)));
+            if (failed)
+                tooLargeError(newTok->tokAt(2));
+            newTok->deleteNext(2);
         }
 
         if (last && last->str() == ",") {
@@ -9990,18 +10440,25 @@ void Tokenizer::simplifyBitfields()
     }
 }
 
-static bool isStdContainerOrIterator(const Token* tok, const Settings& settings)
+static bool isStdContainerOrIterator(const Token* tok, const Library& library)
 {
-    const Library::Container* ctr = settings.library.detectContainerOrIterator(tok, nullptr, /*withoutStd*/ true);
+    const Library::Container* ctr = library.detectContainerOrIterator(tok, nullptr, /*withoutStd*/ true);
     return ctr && startsWith(ctr->startPattern, "std ::");
 }
 
-static bool isStdSmartPointer(const Token* tok, const Settings& settings)
+static bool isStdSmartPointer(const Token* tok, const Library& library)
 {
-    const Library::SmartPointer* ptr = settings.library.detectSmartPointer(tok, /*withoutStd*/ true);
+    const Library::SmartPointer* ptr = library.detectSmartPointer(tok, /*withoutStd*/ true);
     return ptr && startsWith(ptr->name, "std::");
 }
 
+static bool isLibraryType(const Token* tok, const Library& library)
+{
+    return library.hasAnyTypeCheck("std::" + tok->str()) ||
+           library.podtype("std::" + tok->str()) ||
+           isStdContainerOrIterator(tok, library);
+}
+
 // Add std:: in front of std classes, when using namespace std; was given
 void Tokenizer::simplifyNamespaceStd()
 {
@@ -10029,14 +10486,15 @@ void Tokenizer::simplifyNamespaceStd()
                 if (start != tok && start->isName() && !start->isKeyword() && (!start->previous() || Token::Match(start->previous(), "[;{}]")))
                     userFunctions.insert(tok->str());
             }
-            if (userFunctions.find(tok->str()) == userFunctions.end() && mSettings.library.matchArguments(tok, "std::" + tok->str()))
+            if ((userFunctions.find(tok->str()) == userFunctions.end() && mSettings.library.matchArguments(tok, "std::" + tok->str())) ||
+                (tok->tokAt(-1)->isKeyword() && isLibraryType(tok, mSettings.library)))
                 insert = true;
         } else if (Token::simpleMatch(tok->next(), "<") &&
-                   (isStdContainerOrIterator(tok, mSettings) || isStdSmartPointer(tok, mSettings)))
+                   (isStdContainerOrIterator(tok, mSettings.library) || isStdSmartPointer(tok, mSettings.library)))
             insert = true;
-        else if (mSettings.library.hasAnyTypeCheck("std::" + tok->str()) ||
-                 mSettings.library.podtype("std::" + tok->str()) ||
-                 isStdContainerOrIterator(tok, mSettings))
+        else if (isLibraryType(tok, mSettings.library))
+            insert = true;
+        else if (Token::simpleMatch(tok, "aligned_storage"))
             insert = true;
 
         if (insert) {
@@ -10157,12 +10615,12 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
     if (!mSettings.platform.isWindows())
         return;
 
-    const bool ansi = mSettings.platform.type == Platform::Type::Win32A;
+    const bool ansi = (mSettings.platform.type == Platform::Type::Win32A); // TODO: check for UNICODE define instead
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->strAt(1) != "(")
             continue;
 
-        const auto match = utils::as_const(apis).find(tok->str());
+        const auto match = apis.find(tok->str());
         if (match!=apis.end()) {
             tok->str(ansi ? match->second.mbcs : match->second.unicode);
             tok->originalName(match->first);
@@ -10241,7 +10699,7 @@ void Tokenizer::simplifyBorland()
 void Tokenizer::createSymbolDatabase()
 {
     if (!mSymbolDatabase)
-        mSymbolDatabase = new SymbolDatabase(*this, mSettings, mErrorLogger);
+        mSymbolDatabase = new SymbolDatabase(*this);
     mSymbolDatabase->validate();
 }
 
@@ -10252,7 +10710,7 @@ bool Tokenizer::operatorEnd(const Token * tok)
             return true;
 
         tok = tok->next();
-        while (tok && !Token::Match(tok, "[=;{),]")) {
+        while (tok && !Token::Match(tok, "[=;{}),]")) {
             if (Token::Match(tok, "const|volatile|override")) {
                 tok = tok->next();
             } else if (tok->str() == "noexcept") {
@@ -10853,6 +11311,57 @@ void Tokenizer::simplifyNamespaceAliases()
     }
 }
 
+void Tokenizer::simplifyAlignedStorage()
+{
+    if (!isCPP())
+        return;
+
+    const Standards::cppstd_t std = mSettings.standards.cpp;
+    if (std < Standards::CPP11 || std >= Standards::CPP23)
+        return;
+
+    for (Token *tok = list.front(); tok; tok = tok->next()) {
+        if (!Token::simpleMatch(tok, "std :: aligned_storage <"))
+            continue;
+
+        tok = tok->tokAt(3);
+        const Token *end = tok->link();
+        tok = tok->next();
+
+        if (!tok)
+            break;
+
+        if (!end)
+            continue;
+
+        for (; tok != end; tok = tok->next()) {
+            if (Token::simpleMatch(tok, ",")) {
+                tok = tok->next();
+                break;
+            }
+
+            if (Token::Match(tok, "(|<"))
+                tok = tok->link();
+        }
+
+        std::string str;
+        for (; tok != end; tok = tok->next()) {
+            str += " " + tok->str();
+        }
+
+        if (str.empty())
+            continue;
+
+        if (!Token::Match(tok, "> :: type %name%"))
+            continue;
+
+        str = str.substr(1);
+
+        tok = tok->tokAt(3);
+        tok->addAttributeAlignas(str);
+    }
+}
+
 void Tokenizer::setDirectives(std::list<Directive> directives)
 {
     mDirectives = std::move(directives);
@@ -10886,6 +11395,5 @@ void Tokenizer::getErrorMessages(ErrorLogger& errorLogger, const Settings& setti
     tokenizer.invalidConstFunctionTypeError(nullptr);
     // checkLibraryNoReturn
     tokenizer.unhandled_macro_class_x_y(nullptr, "", "", "", "");
-    tokenizer.macroWithSemicolonError(nullptr, "");
     tokenizer.unhandledCharLiteral(nullptr, "");
 }
diff --git a/lib/tokenize.h b/lib/tokenize.h
index 9770ec2d288..f7f6ddbecae 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -28,12 +28,13 @@
 #include <iosfwd>
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
 class Settings;
 class SymbolDatabase;
-class TimerResults;
+class TimerResultsIntf;
 class Token;
 class TemplateSimplifier;
 class ErrorLogger;
@@ -47,17 +48,12 @@ enum class Severity : std::uint8_t;
 class CPPCHECKLIB Tokenizer {
 
     friend class SymbolDatabase;
-    friend class TemplateSimplifier;
-
-    friend class TestSimplifyTemplate;
-    friend class TestSimplifyTypedef;
-    friend class TestTokenizer;
 
 public:
     Tokenizer(TokenList tokenList, ErrorLogger &errorLogger);
     ~Tokenizer();
 
-    void setTimerResults(TimerResults *tr) {
+    void setTimerResults(TimerResultsIntf *tr) {
         mTimerResults = tr;
     }
 
@@ -81,6 +77,10 @@ class CPPCHECKLIB Tokenizer {
 
     bool simplifyTokens1(const std::string &configuration, int fileIndex=0);
 
+    bool isVarUsedInTemplate(nonneg int id) const {
+        return mTemplateVarIdUsage.count(id) != 0;
+    }
+
 private:
     /** Set variable id */
     void setVarId();
@@ -111,6 +111,7 @@ class CPPCHECKLIB Tokenizer {
     void removeExtraTemplateKeywords();
 
 
+protected:
     /** Split up template right angle brackets.
      * foo < bar < >> => foo < bar < > >
      */
@@ -188,6 +189,7 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyVariableMultipleAssign();
 
+protected:
     /**
      * Simplify the 'C Alternative Tokens'
      * Examples:
@@ -197,6 +199,7 @@ class CPPCHECKLIB Tokenizer {
      */
     bool simplifyCAlternativeTokens();
 
+private:
     /** Add braces to an if-block, for-block, etc.
      * @return true if no syntax errors
      */
@@ -226,7 +229,9 @@ class CPPCHECKLIB Tokenizer {
      * typedef A mytype;
      * A c;
      */
+protected:
     void simplifyTypedef();
+private:
     void simplifyTypedefCpp();
     /**
      * Move typedef token to the left og the expression
@@ -239,7 +244,9 @@ class CPPCHECKLIB Tokenizer {
 
     /**
      */
+public:
     bool simplifyUsing();
+private:
     void simplifyUsingError(const Token* usingStart, const Token* usingEnd);
 
     /** Simplify useless C++ empty namespaces, like: 'namespace %name% { }'*/
@@ -300,10 +307,12 @@ class CPPCHECKLIB Tokenizer {
 
     void fillTypeSizes();
 
+protected:
     void combineOperators();
 
     void combineStringAndCharLiterals();
 
+private:
     void concatenateNegativeNumberAndAnyPositive();
 
     void simplifyExternC();
@@ -320,6 +329,7 @@ class CPPCHECKLIB Tokenizer {
 
     void findComplicatedSyntaxErrorsInTemplates();
 
+protected:
     /**
      * Modify strings in the token list by replacing hex and oct
      * values. E.g. "\x61" -> "a" and "\000" -> "\0"
@@ -347,6 +357,7 @@ class CPPCHECKLIB Tokenizer {
      */
     NORETURN void cppcheckError(const Token *tok) const;
 
+protected:
     /**
      * Setup links for tokens so that one can call Token::link().
      */
@@ -357,6 +368,7 @@ class CPPCHECKLIB Tokenizer {
      */
     void createLinks2();
 
+private:
     /**
      * Set isCast() for C++ casts
      */
@@ -364,29 +376,32 @@ class CPPCHECKLIB Tokenizer {
 
 public:
 
-    /** Syntax error */
+    /** Syntax error
+     * @throws InternalError thrown unconditionally
+     */
     NORETURN void syntaxError(const Token *tok, const std::string &code = "") const;
 
-    /** Syntax error. Unmatched character. */
+    /** Syntax error. Unmatched character.
+     * @throws InternalError thrown unconditionally
+     */
     NORETURN void unmatchedToken(const Token *tok) const;
 
-    /** Syntax error. C++ code in C file. */
+private:
+    /** Syntax error. C++ code in C file.
+     * @throws InternalError thrown unconditionally
+     */
     NORETURN void syntaxErrorC(const Token *tok, const std::string &what) const;
 
-    /** Warn about unknown macro(s), configuration is recommended */
+    /** Warn about unknown macro(s), configuration is recommended
+     * @throws InternalError thrown unconditionally
+     */
     NORETURN void unknownMacroError(const Token *tok1) const;
 
     void unhandledCharLiteral(const Token *tok, const std::string& msg) const;
 
-private:
-
     /** Report that there is an unhandled "class x y {" code */
     void unhandled_macro_class_x_y(const Token *tok, const std::string& type, const std::string& x, const std::string& y, const std::string& bracket) const;
 
-    /** Check configuration (unknown macros etc) */
-    void checkConfiguration() const;
-    void macroWithSemicolonError(const Token *tok, const std::string &macroName) const;
-
     void invalidConstFunctionTypeError(const Token *tok) const;
 
     /**
@@ -394,12 +409,14 @@ class CPPCHECKLIB Tokenizer {
      */
     void validateC() const;
 
+protected:
     /**
      * assert that tokens are ok - used during debugging for example
      * to catch problems in simplifyTokenList1/2.
      */
     void validate() const;
 
+private:
     /** Detect unknown macros and throw unknownMacro */
     void reportUnknownMacros() const;
 
@@ -432,9 +449,11 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyCppcheckAttribute();
 
+protected:
     /** Simplify c++20 spaceship operator */
     void simplifySpaceshipOperator();
 
+private:
     /**
      * Remove keywords "volatile", "inline", "register", and "restrict"
      */
@@ -509,6 +528,11 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyNamespaceAliases();
 
+    /**
+     * Handle std::aligned_storage<...>
+     */
+    void simplifyAlignedStorage();
+
     /**
      * Convert C++17 style nested namespace to older style
      */
@@ -521,11 +545,13 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyCoroutines();
 
+protected:
     /**
      * Prepare ternary operators with parentheses so that the AST can be created
      * */
     void prepareTernaryOpForAST();
 
+private:
     /**
      * report error message
      */
@@ -560,8 +586,10 @@ class CPPCHECKLIB Tokenizer {
 
     void dump(std::ostream &out) const;
 
+private:
     Token *deleteInvalidTypedef(Token *typeDef);
 
+public:
     /**
      * Get variable count.
      * @return number of variables
@@ -586,7 +614,7 @@ class CPPCHECKLIB Tokenizer {
     /**
      * Helper function to check whether number is one (1 or 0.1E+1 or 1E+0) or not?
      * @param s the string to check
-     * @return true in case is is one and false otherwise.
+     * @return true in case it is one and false otherwise.
      */
     static bool isOneNumber(const std::string &s);
 
@@ -598,10 +626,21 @@ class CPPCHECKLIB Tokenizer {
      */
     static const Token * startOfExecutableScope(const Token * tok);
 
+    /**
+     * Helper function to check whether tok is the declaration of a function pointer
+     * @param tok the Token to check
+     * @return true in case tok is a function pointer and false otherwise.
+     */
+    static bool isFunctionPointer(const Token* tok);
+
     const Settings &getSettings() const {
         return mSettings;
     }
 
+    ErrorLogger &getErrorLogger() {
+        return mErrorLogger;
+    }
+
     void calculateScopes();
 
     /** Disable copy constructor */
@@ -639,8 +678,12 @@ class CPPCHECKLIB Tokenizer {
     /** Symbol database that all checks etc can use */
     SymbolDatabase* mSymbolDatabase{};
 
+protected:
     TemplateSimplifier * const mTemplateSimplifier;
 
+private:
+    std::set<nonneg int> mTemplateVarIdUsage;
+
     /** E.g. "A" for code where "#ifdef A" is true. This is used to
         print additional information in error situations. */
     std::string mConfiguration;
@@ -648,13 +691,22 @@ class CPPCHECKLIB Tokenizer {
     /** sizeof information for known types */
     std::map<std::string, int> mTypeSize;
 
-    struct TypedefInfo {
+    struct TypedefToken {
         std::string name;
-        std::string filename;
         int lineNumber;
         int column;
-        bool used;
-        bool isFunctionPointer;
+    };
+    struct TypedefInfo {
+        std::string name;
+        std::string originalName;
+        std::string filename;
+        int lineNumber{};
+        int column{};
+        int tagLine{-1};
+        int tagColumn{-1};
+        bool used{};
+        bool isFunctionPointer{};
+        std::vector<TypedefToken> typedefInfoTokens;
     };
     std::vector<TypedefInfo> mTypedefInfo;
 
@@ -667,9 +719,9 @@ class CPPCHECKLIB Tokenizer {
     nonneg int mUnnamedCount{};
 
     /**
-     * TimerResults
+     * timer results
      */
-    TimerResults* mTimerResults{};
+    TimerResultsIntf* mTimerResults{};
 };
 
 /// @}
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 01b88419f12..bad4f4df6f4 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -86,9 +86,11 @@ void TokenList::deallocateTokens()
         mTokensFrontBack->front = nullptr;
         mTokensFrontBack->back = nullptr;
     }
+    // TODO: clear mOrigFiles?
     mFiles.clear();
 }
 
+// TODO: also update mOrigFiles?
 int TokenList::appendFileIfNew(std::string fileName)
 {
     assert(!fileName.empty());
@@ -100,6 +102,8 @@ int TokenList::appendFileIfNew(std::string fileName)
     if (it != mFiles.cend())
         return static_cast<int>(std::distance(mFiles.cbegin(), it));
 
+    assert(mTokensFrontBack->front == nullptr); // has no effect if tokens have already been created
+
     // The "mFiles" vector remembers what files have been tokenized..
     mFiles.push_back(std::move(fileName));
 
@@ -194,6 +198,7 @@ void TokenList::addtoken(const Token * tok, const nonneg int lineno, const nonne
     mTokensFrontBack->back->column(column);
     mTokensFrontBack->back->fileIndex(fileno);
     mTokensFrontBack->back->flags(tok->flags());
+    mTokensFrontBack->back->tokType(tok->tokType());
 }
 
 void TokenList::addtoken(const Token *tok, const Token *locationTok)
@@ -215,6 +220,7 @@ void TokenList::addtoken(const Token *tok, const Token *locationTok)
     mTokensFrontBack->back->linenr(locationTok->linenr());
     mTokensFrontBack->back->column(locationTok->column());
     mTokensFrontBack->back->fileIndex(locationTok->fileIndex());
+    mTokensFrontBack->back->tokType(tok->tokType());
 }
 
 void TokenList::addtoken(const Token *tok)
@@ -238,6 +244,7 @@ void TokenList::addtoken(const Token *tok)
     mTokensFrontBack->back->linenr(tok->linenr());
     mTokensFrontBack->back->column(tok->column());
     mTokensFrontBack->back->fileIndex(tok->fileIndex());
+    mTokensFrontBack->back->tokType(tok->tokType());
 }
 
 
@@ -291,6 +298,8 @@ void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)
     std::stack<Token *> link;
 
     while (n > 0) {
+        if (!src)
+            throw InternalError(dest, std::string(__func__) + ": invalid source range", InternalError::INTERNAL);
         dest->insertToken(src->str(), src->originalName());
         dest = dest->next();
 
@@ -317,17 +326,37 @@ void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)
 
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokens(std::istream &code)
+bool TokenList::createTokensFromBuffer(const char* data, size_t size)
 {
-    return createTokensInternal(code, mFiles.empty() ? "" : *mFiles.cbegin());
+    return createTokensFromBufferInternal(data, size, mFiles.empty() ? "" : *mFiles.cbegin());
 }
 
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokensInternal(std::istream &code, const std::string& file0)
+#ifdef STORE_INPUT_DIR
+#include <atomic>
+#include <fstream>
+
+static void storeInput(const char* data, size_t size)
 {
+    static std::atomic_uint64_t num(0);
+    {
+        std::ofstream out(STORE_INPUT_DIR "/" + std::to_string(num++));
+        out.write(data, size);
+    }
+}
+#endif
+
+bool TokenList::createTokensFromBufferInternal(const char* data, size_t size, const std::string& file0)
+{
+#ifdef STORE_INPUT_DIR
+    storeInput(data, size);
+#endif
+
     simplecpp::OutputList outputList;
-    simplecpp::TokenList tokens(code, mFiles, file0, &outputList);
+    simplecpp::DUI dui;
+    dui.std = mSettings.standards.getStdForLanguage(mLang);
+    simplecpp::TokenList tokens({data, size}, mFiles, file0, dui, &outputList);
 
     createTokens(std::move(tokens));
 
@@ -347,8 +376,10 @@ void TokenList::createTokens(simplecpp::TokenList&& tokenList)
         // TODO: this points to mFiles when called from createTokens(std::istream &, const std::string&)
         mOrigFiles = mFiles = tokenList.getFiles();
     }
-    else
+    else {
+        // TODO: clear mOrigFiles?
         mFiles.clear();
+    }
 
     for (const simplecpp::Token *tok = tokenList.cfront(); tok;) {
 
@@ -432,10 +463,10 @@ static Token* skipDecl(Token* tok, std::vector<Token*>* inner = nullptr)
         return Token::Match(tok, "%name%| ,|)");
     };
 
-    if (!Token::Match(tok->previous(), "( %name%"))
+    if (tok->varId() || !Token::Match(tok->previous(), "( %name%"))
         return tok;
     Token *vartok = tok;
-    while (Token::Match(vartok, "%name%|*|&|::|<")) {
+    while (Token::Match(vartok, "%name%|*|&|&&|::|<")) {
         if (vartok->str() == "<") {
             if (vartok->link())
                 vartok = vartok->link();
@@ -464,7 +495,7 @@ static bool iscast(const Token *tok, bool cpp)
     if (Token::Match(tok->link(), ") %assign%|,|..."))
         return false;
 
-    if (tok->previous() && tok->previous()->isName() && tok->strAt(-1) != "return" &&
+    if (tok->previous() && tok->previous()->isName() && !Token::Match(tok->previous(), "return|case") &&
         (!cpp || !Token::Match(tok->previous(), "delete|throw")))
         return false;
 
@@ -518,7 +549,7 @@ static bool iscast(const Token *tok, bool cpp)
         if (!Token::Match(tok2, "%name%|*|::"))
             return false;
 
-        if (tok2->isStandardType() && (tok2->strAt(1) != "(" || Token::Match(tok2->next(), "( * *| )")))
+        if (tok2->isStandardType() && (tok2->strAt(1) != "(" || Token::simpleMatch(tok2->linkAt(1)->tokAt(-1), "* )")))
             type = true;
     }
 
@@ -553,9 +584,9 @@ static Token * findCppTypeInitPar(Token *tok)
 static bool iscpp11init_impl(const Token * tok);
 static bool iscpp11init(const Token * const tok)
 {
-    if (tok->isCpp11init() == TokenImpl::Cpp11init::UNKNOWN)
+    if (tok->isCpp11init() == Token::Cpp11init::UNKNOWN)
         tok->setCpp11init(iscpp11init_impl(tok));
-    return tok->isCpp11init() == TokenImpl::Cpp11init::CPP11INIT;
+    return tok->isCpp11init() == Token::Cpp11init::CPP11INIT;
 }
 
 static bool iscpp11init_impl(const Token * const tok)
@@ -564,11 +595,9 @@ static bool iscpp11init_impl(const Token * const tok)
         return false;
     const Token *nameToken = tok;
     while (nameToken && nameToken->str() == "{") {
-        if (nameToken->isCpp11init() != TokenImpl::Cpp11init::UNKNOWN)
-            return nameToken->isCpp11init() == TokenImpl::Cpp11init::CPP11INIT;
+        if (nameToken->isCpp11init() != Token::Cpp11init::UNKNOWN)
+            return nameToken->isCpp11init() == Token::Cpp11init::CPP11INIT;
         nameToken = nameToken->previous();
-        if (nameToken && nameToken->str() == "," && Token::simpleMatch(nameToken->previous(), "} ,"))
-            nameToken = nameToken->linkAt(-1);
     }
     if (!nameToken)
         return false;
@@ -580,10 +609,16 @@ static bool iscpp11init_impl(const Token * const tok)
     if (nameToken->str() == ">" && nameToken->link())
         nameToken = nameToken->link()->previous();
     if (Token::Match(nameToken, "]|*")) {
-        const Token* newTok = nameToken->link() ? nameToken->link()->previous() : nameToken->previous();
-        while (Token::Match(newTok, "%type%|::|*") && !newTok->isKeyword())
-            newTok = newTok->previous();
-        if (Token::simpleMatch(newTok, "new"))
+        const Token* tok2 = nameToken;
+        if (tok2->link()) {
+            while (tok2 && precedes(tok2->link(), nameToken))
+                tok2 = tok2->link()->previous();
+        }
+        else
+            tok2 = tok2->previous();
+        while (Token::Match(tok2, "%type%|::|*") && !tok2->isKeyword())
+            tok2 = tok2->previous();
+        if (Token::Match(tok2, "new|%var%"))
             return true;
     }
 
@@ -594,6 +629,10 @@ static bool iscpp11init_impl(const Token * const tok)
             if (Token::simpleMatch(castTok->astParent(), "case"))
                 return true;
         }
+        if (findParent(colonTok->previous(), [](const Token *parent){
+            return parent->str() == "case";
+        }))
+            return true;
         const Token* caseTok = colonTok->tokAt(-2);
         while (caseTok && Token::Match(caseTok->tokAt(-1), "::|%name%"))
             caseTok = caseTok->tokAt(-1);
@@ -648,6 +687,9 @@ static bool isQualifier(const Token* tok)
     return Token::Match(tok, "{|;");
 }
 
+/**
+ * @throws InternalError thrown if maximum AST depth is exceeded
+ */
 static void compileUnaryOp(Token *&tok, AST_state& state, void (*f)(Token *&tok, AST_state& state))
 {
     Token *unaryop = tok;
@@ -684,6 +726,9 @@ static void skipGenericType(Token *&tok)
     }
 }
 
+/**
+ * @throws InternalError thrown if maximum AST depth is exceeded
+ */
 static void compileBinOp(Token *&tok, AST_state& state, void (*f)(Token *&tok, AST_state& state))
 {
     Token *binop = tok;
@@ -715,11 +760,16 @@ static void compileBinOp(Token *&tok, AST_state& state, void (*f)(Token *&tok, A
         binop->astOperand1(state.op.top());
         state.op.pop();
     }
+    if (!state.op.empty() && state.op.top() == binop)
+        throw InternalError(tok, "Syntax Error: Infinite loop when creating AST.", InternalError::AST);
     state.op.push(binop);
 }
 
 static void compileExpression(Token *&tok, AST_state& state);
 
+/**
+ * @throws InternalError thrown if unexpected tokens are encountered
+ */
 static void compileTerm(Token *&tok, AST_state& state)
 {
     if (!tok)
@@ -821,7 +871,7 @@ static void compileTerm(Token *&tok, AST_state& state)
         } else if ((state.cpp && iscpp11init(tok)) || Token::simpleMatch(tok->previous(), "] {")) {
             Token *const end = tok->link();
             if (state.op.empty() || Token::Match(tok->previous(), "[{,]") || Token::Match(tok->tokAt(-2), "%name% (")) {
-                if (Token::Match(tok->tokAt(-1), "!!, { . %name% =|{")) {
+                if (Token::Match(tok->tokAt(-1), "!!, { . %name% =|{") && !Token::simpleMatch(tok->tokAt(-1), "(")) {
                     const int inArrayAssignment = state.inArrayAssignment;
                     state.inArrayAssignment = 1;
                     compileBinOp(tok, state, compileExpression);
@@ -854,7 +904,7 @@ static void compileTerm(Token *&tok, AST_state& state)
                 state.inArrayAssignment--;
                 tok = tok1->link()->next();
             }
-        } else if (!state.inArrayAssignment && !Token::simpleMatch(prev, "=")) {
+        } else if ((!state.inArrayAssignment && !Token::simpleMatch(prev, "=")) || Token::simpleMatch(prev, "?")) {
             state.op.push(tok);
             tok = tok->link()->next();
         } else {
@@ -919,6 +969,9 @@ static bool isPrefixUnary(const Token* tok, bool cpp)
     return tok->strAt(-1) == ")" && iscast(tok->linkAt(-1), cpp);
 }
 
+/**
+ * @throws InternalError thrown if unexpected tokens are encountered
+ */
 static void compilePrecedence2(Token *&tok, AST_state& state)
 {
     auto doCompileScope = [&](const Token* tok) -> bool {
@@ -1033,7 +1086,12 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
             else
                 compileUnaryOp(tok, state, compileExpression);
             tok = tok2->link()->next();
-        } else if (Token::simpleMatch(tok->previous(), "requires {")) {
+        } else if ((Token::simpleMatch(tok->tokAt(-1), "requires {") && tok->tokAt(-1)->isKeyword())
+                   || (Token::simpleMatch(tok->tokAt(-1), ")")
+                       && tok->linkAt(-1)
+                       && Token::simpleMatch(tok->linkAt(-1)->tokAt(-1), "requires (") && tok->linkAt(-1)->tokAt(-1)->isKeyword())) {
+            if (!tok->link())
+                throw InternalError(tok, "Syntax error, token has no link.", InternalError::AST);
             tok->astOperand1(state.op.top());
             state.op.pop();
             state.op.push(tok);
@@ -1070,7 +1128,7 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
             state.inGeneric = inGenericSaved;
             tok = tok->link()->next();
             if (Token::simpleMatch(tok, "::"))
-                compileBinOp(tok, state, compileTerm);
+                compileBinOp(tok, state, compileScope);
         } else if (iscast(tok, state.cpp) && Token::simpleMatch(tok->link(), ") {") &&
                    Token::simpleMatch(tok->link()->linkAt(1), "} [")) {
             Token *cast = tok;
@@ -1409,6 +1467,9 @@ static void compileComma(Token *&tok, AST_state& state)
     }
 }
 
+/**
+ * @throws InternalError thrown if maximum AST depth is exceeded
+ */
 static void compileExpression(Token *&tok, AST_state& state)
 {
     if (state.depth > AST_MAX_DEPTH)
@@ -1545,6 +1606,9 @@ static Token *skipMethodDeclEnding(Token *tok)
     return nullptr;
 }
 
+/**
+ * @throws InternalError thrown in case of syntax error
+ */
 static Token * createAstAtToken(Token *tok)
 {
     const bool cpp = tok->isCpp();
@@ -1557,6 +1621,13 @@ static Token * createAstAtToken(Token *tok)
         if (Token::Match(tok2, "%var% [;,)]"))
             return tok2;
     }
+    if (Token::Match(tok, "enum class| %name%| :")) {
+        if (Token::simpleMatch(tok->next(), "class"))
+            tok = tok->next();
+        if (Token::Match(tok->next(), "%name%"))
+            tok = tok->next();
+        return tok->next();
+    }
     if (Token *const endTok = skipMethodDeclEnding(tok)) {
         Token *tok2 = tok;
         do {
@@ -1574,7 +1645,7 @@ static Token * createAstAtToken(Token *tok)
     if (Token::Match(tok, "%type%") && !Token::Match(tok, "return|throw|if|while|new|delete")) {
         bool isStandardTypeOrQualifier = false;
         Token* type = tok;
-        while (Token::Match(type, "%type%|*|&|<")) {
+        while (Token::Match(type, "%type%|*|&|&&|<")) {
             if (type->isName() && (type->isStandardType() || Token::Match(type, "const|mutable|static|volatile")))
                 isStandardTypeOrQualifier = true;
             if (type->str() == "<") {
@@ -1627,6 +1698,8 @@ static Token * createAstAtToken(Token *tok)
                 tok->next()->astOperand1(tok);
                 tok->next()->astOperand2(colon);
 
+                createAstAtTokenInner(colon, tok->linkAt(1), cpp);
+
                 return decl;
             }
         }
@@ -1752,15 +1825,23 @@ static Token * createAstAtToken(Token *tok)
         }
     }
 
-    if (Token::Match(tok, "%type% %name%|*|&|::") && !Token::Match(tok, "return|new|delete")) {
-        int typecount = 0;
+    if ((Token::Match(tok, "%type% %name%|*|&|&&|::") && !Token::Match(tok, "return|new|delete")) ||
+        (Token::Match(tok, ":: %type%") && !tok->next()->isKeyword())) {
+        int typecount = tok->str() == "::" ? 1 : 0;
         Token *typetok = tok;
-        while (Token::Match(typetok, "%type%|::|*|&")) {
+        while (Token::Match(typetok, "%type%|::|*|&|&&|<")) {
             if (typetok->isName() && !Token::simpleMatch(typetok->previous(), "::"))
                 typecount++;
+            if (typetok->str() == "<") {
+                if (Token* closing = typetok->findClosingBracket()) {
+                    typetok = closing->next();
+                    continue;
+                }
+                break;
+            }
             typetok = typetok->next();
         }
-        if (Token::Match(typetok, "%var% =") && typetok->varId())
+        if (Token::Match(typetok, "%var% [={]"))
             tok = typetok;
 
         // Do not create AST for function declaration
@@ -1769,7 +1850,7 @@ static Token * createAstAtToken(Token *tok)
             !Token::Match(tok, "return|throw") &&
             Token::Match(typetok->previous(), "%name% ( !!*") &&
             typetok->previous()->varId() == 0 &&
-            !typetok->previous()->isKeyword() &&
+            (!typetok->previous()->isKeyword() || typetok->previous()->isOperatorKeyword()) &&
             (skipMethodDeclEnding(typetok->link()) || Token::Match(typetok->link(), ") ;|{")))
             return typetok;
     }
@@ -1825,6 +1906,16 @@ void TokenList::createAst() const
             throw InternalError(tok, "Syntax Error: Infinite loop when creating AST.", InternalError::AST);
         tok = nextTok;
     }
+    for (Token *tok = mTokensFrontBack->front; tok; tok = tok ? tok->next() : nullptr) {
+        if (tok->astParent())
+            continue;
+        if (!tok->astOperand1() && !tok->astOperand2())
+            continue;
+        visitAstNodes(tok, [&](Token* child) {
+            child->astTop(tok);
+            return ChildrenToVisit::op1_and_op2;
+        });
+    }
 }
 
 namespace {
@@ -1833,7 +1924,12 @@ namespace {
 
         ~OnException() {
 #ifndef _MSC_VER
-            if (std::uncaught_exception())
+#if defined(__cpp_lib_uncaught_exceptions)
+            const bool b = std::uncaught_exceptions() > 0;
+#else
+            const bool b = std::uncaught_exception();
+#endif
+            if (b)
                 f();
 #endif
         }
@@ -1853,12 +1949,18 @@ void TokenList::validateAst(bool print) const
         if ((tok->isAssignmentOp() || tok->isComparisonOp() || Token::Match(tok,"[|^/%]")) && tok->astOperand1() && !tok->astOperand2())
             throw InternalError(tok, "Syntax Error: AST broken, binary operator has only one operand.", InternalError::AST);
 
+        if (!(tok->astOperand1() && tok->astOperand2()) && ((isC() && tok->str() == "&&") || Token::Match(tok, "%or%|%oror%")))
+            throw InternalError(tok, "Syntax Error: AST broken, binary operator is missing operand(s).", InternalError::AST);
+
         // Syntax error if we encounter "?" with operand2 that is not ":"
         if (tok->str() == "?") {
             if (!tok->astOperand1() || !tok->astOperand2())
                 throw InternalError(tok, "AST broken, ternary operator missing operand(s)", InternalError::AST);
-            if (tok->astOperand2()->str() != ":")
+            const Token* colon = tok->astOperand2();
+            if (colon->str() != ":")
                 throw InternalError(tok, "Syntax Error: AST broken, ternary operator lacks ':'.", InternalError::AST);
+            if ((colon->astOperand1() && !precedes(colon->astOperand1(), colon)) || !succeeds(colon->astOperand2(), colon))
+                throw InternalError(tok, "AST broken, ternary operator has bad operand(s)", InternalError::AST);
         }
 
         // Check for endless recursion
@@ -1908,7 +2010,7 @@ void TokenList::validateAst(bool print) const
             if (Token::simpleMatch(tok->previous(), "operator"))
                 continue;
             // Skip incomplete code
-            if (!tok->astOperand1() && !tok->astOperand2() && !tok->astParent())
+            if (!tok->astOperand1() && !tok->astOperand2() && !tok->astParent() && !(tok->str().size() == 2 && tok->str()[1] == '='))
                 continue;
             // Skip lambda assignment and/or initializer
             if (Token::Match(tok, "= {|^|["))
@@ -1932,9 +2034,9 @@ void TokenList::validateAst(bool print) const
                                     "' doesn't have two operands.",
                                     InternalError::AST);
         }
-        if (tok->str() == "case" && !tok->astOperand1()) {
+        if (!tok->astOperand1() && Token::Match(tok, "case|!")) {
             throw InternalError(tok,
-                                "Syntax Error: AST broken, 'case' doesn't have an operand.",
+                                "Syntax Error: AST broken, '" + tok->str() + "' doesn't have an operand.",
                                 InternalError::AST);
         }
 
@@ -2235,7 +2337,7 @@ bool TokenList::isCPP() const
     return mLang == Standards::Language::CPP;
 }
 
-const Token * TokenList::isFunctionHead(const Token *tok, const std::string &endsWith)
+const Token * TokenList::isFunctionHead(const Token *tok, const std::string &suffix)
 {
     if (!tok)
         return nullptr;
@@ -2248,11 +2350,11 @@ const Token * TokenList::isFunctionHead(const Token *tok, const std::string &end
     if (Token::Match(tok, ") ;|{|[")) {
         tok = tok->next();
         while (tok && tok->str() == "[" && tok->link()) {
-            if (endsWith.find(tok->str()) != std::string::npos)
+            if (suffix.find(tok->str()) != std::string::npos)
                 return tok;
             tok = tok->link()->next();
         }
-        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
+        return (tok && suffix.find(tok->str()) != std::string::npos) ? tok : nullptr;
     }
     if (tok->isCpp() && tok->str() == ")") {
         tok = tok->next();
@@ -2287,7 +2389,7 @@ const Token * TokenList::isFunctionHead(const Token *tok, const std::string &end
         }
         if (tok && tok->str() == ":" && !Token::Match(tok->next(), "%name%|::"))
             return nullptr;
-        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
+        return (tok && suffix.find(tok->str()) != std::string::npos) ? tok : nullptr;
     }
     return nullptr;
 }
diff --git a/lib/tokenlist.h b/lib/tokenlist.h
index 56385f519e2..f5b652f3506 100644
--- a/lib/tokenlist.h
+++ b/lib/tokenlist.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,7 +25,7 @@
 #include "standards.h"
 
 #include <cstddef>
-#include <iosfwd>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
@@ -56,7 +56,7 @@ class CPPCHECKLIB TokenList {
     TokenList(const TokenList &) = delete;
     TokenList &operator=(const TokenList &) = delete;
 
-    TokenList(TokenList&& other) NOEXCEPT = default;
+    TokenList(TokenList&& other) noexcept = default;
 
     /** @return the source file path. e.g. "file.cpp" */
     const std::string& getSourceFilePath() const;
@@ -98,9 +98,16 @@ class CPPCHECKLIB TokenList {
      * - multiline strings are not handled.
      * - UTF in the code are not handled.
      * - comments are not handled.
-     * @param code input stream for code
      */
-    bool createTokens(std::istream &code);
+    bool createTokensFromBuffer(const uint8_t* data, size_t size) {
+        return createTokensFromBuffer(reinterpret_cast<const char*>(data), size);
+    }
+    bool createTokensFromBuffer(const char* data, size_t size);
+    template<size_t size>
+    // cppcheck-suppress unusedFunction - used in tests only
+    bool createTokensFromString(const char (&data)[size]) {
+        return createTokensFromBuffer(data, size-1);
+    }
 
     void createTokens(simplecpp::TokenList&& tokenList);
 
@@ -161,12 +168,13 @@ class CPPCHECKLIB TokenList {
 
     /**
      * Create abstract syntax tree.
+     * @throws InternalError thrown if encountering an infinite loop in AST creation
      */
     void createAst() const;
 
     /**
      * Check abstract syntax tree.
-     * Throws InternalError on failure
+     * @throws InternalError thrown if validation fails
      */
     void validateAst(bool print) const;
 
@@ -198,17 +206,17 @@ class CPPCHECKLIB TokenList {
     /**
      * is token pointing at function head?
      * @param tok         A '(' or ')' token in a possible function head
-     * @param endsWith    string after function head
-     * @return token matching with endsWith if syntax seems to be a function head else nullptr
+     * @param suffix      string after function head
+     * @return token matching with suffix if syntax seems to be a function head else nullptr
      */
-    static const Token * isFunctionHead(const Token *tok, const std::string &endsWith);
+    static const Token * isFunctionHead(const Token *tok, const std::string &suffix);
 
     const Settings& getSettings() const {
         return mSettings;
     }
 
 private:
-    bool createTokensInternal(std::istream &code, const std::string& file0);
+    bool createTokensFromBufferInternal(const char* data, std::size_t size, const std::string& file0);
 
     /** Token list */
     std::shared_ptr<TokensFrontBack> mTokensFrontBack;
diff --git a/lib/utils.cpp b/lib/utils.cpp
index 11661556968..b840fc3194b 100644
--- a/lib/utils.cpp
+++ b/lib/utils.cpp
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <iterator>
 #include <stack>
 #include <utility>
 
@@ -40,12 +39,19 @@ int caseInsensitiveStringCompare(const std::string &lhs, const std::string &rhs)
 
 bool isValidGlobPattern(const std::string& pattern)
 {
+    int consecutiveAsterisks = 0;
     for (auto i = pattern.cbegin(); i != pattern.cend(); ++i) {
-        if (*i == '*' || *i == '?') {
-            const auto j = i + 1;
-            if (j != pattern.cend() && (*j == '*' || *j == '?')) {
+        if (*i == '*') {
+            ++consecutiveAsterisks;
+            if (consecutiveAsterisks > 2) {
                 return false;
             }
+        } else if (*i == '?') {
+            if (consecutiveAsterisks > 0) {
+                return false;
+            }
+        } else {
+            consecutiveAsterisks = 0;
         }
     }
     return true;
@@ -85,10 +91,6 @@ bool matchglob(const std::string& pattern, const std::string& name, bool caseIns
                     n++;
                 } else if (caseInsensitive && tolower(*n) == tolower(*p)) {
                     n++;
-                } else if (*n == '\\' && *p == '/') {
-                    n++;
-                } else if (*n == '/' && *p == '\\') {
-                    n++;
                 } else {
                     matching = false;
                 }
@@ -117,12 +119,6 @@ bool matchglob(const std::string& pattern, const std::string& name, bool caseIns
     }
 }
 
-bool matchglobs(const std::vector<std::string> &patterns, const std::string &name, bool caseInsensitive) {
-    return std::any_of(begin(patterns), end(patterns), [&name, caseInsensitive](const std::string &pattern) {
-        return matchglob(pattern, name, caseInsensitive);
-    });
-}
-
 void strTolower(std::string& str)
 {
     // This wrapper exists because Sun's CC does not allow a static_cast
diff --git a/lib/utils.h b/lib/utils.h
index 82edc353160..410bd7c6040 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cctype>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
@@ -124,6 +125,11 @@ bool endsWith(const std::string& str, const char (&end)[N])
     return endsWith(str, end, N - 1);
 }
 
+inline bool endsWith(const std::string& str, const std::string& end)
+{
+    return endsWith(str, end.c_str(), end.length());
+}
+
 inline static bool isPrefixStringCharLiteral(const std::string &str, char q, const std::string& p)
 {
     // str must be at least the prefix plus the start and end quote
@@ -204,8 +210,6 @@ CPPCHECKLIB bool isValidGlobPattern(const std::string& pattern);
 
 CPPCHECKLIB bool matchglob(const std::string& pattern, const std::string& name, bool caseInsensitive = false);
 
-CPPCHECKLIB bool matchglobs(const std::vector<std::string> &patterns, const std::string &name, bool caseInsensitive = false);
-
 CPPCHECKLIB void strTolower(std::string& str);
 
 template<typename T, typename std::enable_if<std::is_signed<T>::value, bool>::type=true>
@@ -217,7 +221,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         tmp = std::stoll(str, &idx);
         if (idx != str.size()) {
             if (err)
-                *err = "not an integer";
+                *err = "not an integer (pos)";
             return false;
         }
     } catch (const std::out_of_range&) {
@@ -226,7 +230,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         return false;
     } catch (const std::invalid_argument &) {
         if (err)
-            *err = "not an integer";
+            *err = "not an integer (invalid_argument)";
         return false;
     }
     if (str.front() == '-' && std::numeric_limits<T>::min() == 0) {
@@ -234,6 +238,16 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
             *err = "needs to be positive";
         return false;
     }
+    if (str.front() != '+' && str.front() != '-' && isdigit(str.front()) == 0) {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
+    if (str.size() > 1 && str.front() == '0') {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
     if (tmp < std::numeric_limits<T>::min() || tmp > std::numeric_limits<T>::max()) {
         if (err)
             *err = "out of range (limits)";
@@ -252,7 +266,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         tmp = std::stoull(str, &idx);
         if (idx != str.size()) {
             if (err)
-                *err = "not an integer";
+                *err = "not an integer (pos)";
             return false;
         }
     } catch (const std::out_of_range&) {
@@ -261,7 +275,7 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
         return false;
     } catch (const std::invalid_argument &) {
         if (err)
-            *err = "not an integer";
+            *err = "not an integer (invalid_argument)";
         return false;
     }
     if (str.front() == '-') {
@@ -269,6 +283,16 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
             *err = "needs to be positive";
         return false;
     }
+    if (str.front() != '+' && isdigit(str.front()) == 0) {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
+    if (str.size() > 1 && str.front() == '0') {
+        if (err)
+            *err = "not an integer";
+        return false;
+    }
     if (tmp > std::numeric_limits<T>::max()) {
         if (err)
             *err = "out of range (limits)";
@@ -278,6 +302,9 @@ bool strToInt(const std::string& str, T &num, std::string* err = nullptr)
     return true;
 }
 
+/**
+ * @throws std::runtime_error thrown if conversion failed
+ */
 template<typename T>
 T strToInt(const std::string& str)
 {
@@ -293,7 +320,6 @@ T strToInt(const std::string& str)
  * \return size of array
  * */
 template<typename T, int size>
-// cppcheck-suppress unusedFunction - only used in conditional code
 std::size_t getArrayLength(const T (& /*unused*/)[size])
 {
     return size;
@@ -398,17 +424,23 @@ static inline T* empty_if_null(T* p)
 }
 
 /**
- * Split string by given sperator.
+ * Split string by given separator.
  * @param str The string to split
- * @param sep The seperator
- * @return The list of seperate strings (including empty ones). The whole input string if no seperator found.
+ * @param sep The separator
+ * @return The list of separate strings (including empty ones). The whole input string if no separator found.
  */
 CPPCHECKLIB std::vector<std::string> splitString(const std::string& str, char sep);
 
 namespace utils {
+    /**
+     * Drop-in replacement for C++17's std::as_const
+     * @param t  The function forms the lvalue reference to const type of this argument.
+     */
     template<class T>
     constexpr typename std::add_const<T>::type & as_const(T& t) noexcept
     {
+        static_assert(!std::is_const<T>::value, "object is already const");
+        static_assert(!std::is_pointer<T>::value, "object is a pointer");
         // NOLINTNEXTLINE(bugprone-return-const-ref-from-parameter) - potential false positive
         return t;
     }
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index aa77d16e1f7..325a55e98e5 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -114,7 +114,6 @@
 #include <cassert>
 #include <chrono>
 #include <cstdint>
-#include <cstdlib>
 #include <cstring>
 #include <functional>
 #include <initializer_list>
@@ -122,12 +121,11 @@
 #include <limits>
 #include <map>
 #include <memory>
-#include <numeric>
 #include <set>
-#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 static void bailoutInternal(const std::string& type,
@@ -367,7 +365,7 @@ const Token *ValueFlow::parseCompareInt(const Token *tok, ValueFlow::Value &true
     });
 }
 
-static bool isEscapeScope(const Token* tok, const Settings& settings, bool unknown = false)
+static bool isEscapeScope(const Token* tok, const Library& library, bool unknown = false)
 {
     if (!Token::simpleMatch(tok, "{"))
         return false;
@@ -376,7 +374,7 @@ static bool isEscapeScope(const Token* tok, const Settings& settings, bool unkno
     if (termTok && termTok->scope() == tok->scope())
         return true;
     std::string unknownFunction;
-    if (settings.library.isScopeNoReturn(tok->link(), &unknownFunction))
+    if (library.isScopeNoReturn(tok->link(), &unknownFunction))
         return unknownFunction.empty() || unknown;
     return false;
 }
@@ -403,10 +401,14 @@ void ValueFlow::combineValueProperties(const ValueFlow::Value &value1, const Val
         result.valueType = value2.valueType;
         result.tokvalue = value2.tokvalue;
     }
-    if (value1.isIteratorValue())
+    if (value1.isIteratorValue()) {
         result.valueType = value1.valueType;
-    if (value2.isIteratorValue())
+        result.container = value1.container;
+    }
+    if (value2.isIteratorValue()) {
         result.valueType = value2.valueType;
+        result.container = value2.container;
+    }
     result.condition = value1.condition ? value1.condition : value2.condition;
     result.varId = (value1.varId != 0) ? value1.varId : value2.varId;
     result.varvalue = (result.varId == value1.varId) ? value1.varvalue : value2.varvalue;
@@ -424,136 +426,6 @@ void ValueFlow::combineValueProperties(const ValueFlow::Value &value1, const Val
         result.path = value1.path;
 }
 
-
-template<class F>
-static size_t accumulateStructMembers(const Scope* scope, F f)
-{
-    size_t total = 0;
-    std::set<const Scope*> anonScopes;
-    for (const Variable& var : scope->varlist) {
-        if (var.isStatic())
-            continue;
-        if (const ValueType* vt = var.valueType()) {
-            if (vt->type == ValueType::Type::RECORD && vt->typeScope == scope)
-                return 0;
-            const MathLib::bigint dim = std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), 1LL, [](MathLib::bigint i1, const Dimension& dim) {
-                return i1 * dim.num;
-            });
-            if (var.nameToken()->scope() != scope && var.nameToken()->scope()->definedType) { // anonymous union
-                const auto ret = anonScopes.insert(var.nameToken()->scope());
-                if (ret.second)
-                    total = f(total, *vt, dim);
-            }
-            else
-                total = f(total, *vt, dim);
-        }
-        if (total == 0)
-            return 0;
-    }
-    return total;
-}
-
-static size_t bitCeil(size_t x)
-{
-    if (x <= 1)
-        return 1;
-    --x;
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-    x |= x >> 32;
-    return x + 1;
-}
-
-static size_t getAlignOf(const ValueType& vt, const Settings& settings, int maxRecursion = 0)
-{
-    if (maxRecursion == settings.vfOptions.maxAlignOfRecursion) {
-        // TODO: add bailout message
-        return 0;
-    }
-    if (vt.pointer || vt.reference != Reference::None || vt.isPrimitive()) {
-        auto align = ValueFlow::getSizeOf(vt, settings);
-        return align == 0 ? 0 : bitCeil(align);
-    }
-    if (vt.type == ValueType::Type::RECORD && vt.typeScope) {
-        auto accHelper = [&](size_t max, const ValueType& vt2, size_t /*dim*/) {
-            size_t a = getAlignOf(vt2, settings, ++maxRecursion);
-            return std::max(max, a);
-        };
-        size_t total = 0;
-        if (const Type* dt = vt.typeScope->definedType) {
-            total = std::accumulate(dt->derivedFrom.begin(), dt->derivedFrom.end(), total, [&](size_t v, const Type::BaseInfo& bi) {
-                if (bi.type && bi.type->classScope)
-                    v += accumulateStructMembers(bi.type->classScope, accHelper);
-                return v;
-            });
-        }
-        return total + accumulateStructMembers(vt.typeScope, accHelper);
-    }
-    if (vt.type == ValueType::Type::CONTAINER)
-        return settings.platform.sizeof_pointer; // Just guess
-    return 0;
-}
-
-size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, int maxRecursion)
-{
-    if (maxRecursion == settings.vfOptions.maxSizeOfRecursion) {
-        // TODO: add bailout message
-        return 0;
-    }
-    if (vt.pointer || vt.reference != Reference::None)
-        return settings.platform.sizeof_pointer;
-    if (vt.type == ValueType::Type::BOOL || vt.type == ValueType::Type::CHAR)
-        return 1;
-    if (vt.type == ValueType::Type::SHORT)
-        return settings.platform.sizeof_short;
-    if (vt.type == ValueType::Type::WCHAR_T)
-        return settings.platform.sizeof_wchar_t;
-    if (vt.type == ValueType::Type::INT)
-        return settings.platform.sizeof_int;
-    if (vt.type == ValueType::Type::LONG)
-        return settings.platform.sizeof_long;
-    if (vt.type == ValueType::Type::LONGLONG)
-        return settings.platform.sizeof_long_long;
-    if (vt.type == ValueType::Type::FLOAT)
-        return settings.platform.sizeof_float;
-    if (vt.type == ValueType::Type::DOUBLE)
-        return settings.platform.sizeof_double;
-    if (vt.type == ValueType::Type::LONGDOUBLE)
-        return settings.platform.sizeof_long_double;
-    if (vt.type == ValueType::Type::CONTAINER)
-        return 3 * settings.platform.sizeof_pointer; // Just guess
-    if (vt.type == ValueType::Type::RECORD && vt.typeScope) {
-        auto accHelper = [&](size_t total, const ValueType& vt2, size_t dim) -> size_t {
-            size_t n = ValueFlow::getSizeOf(vt2, settings, ++maxRecursion);
-            size_t a = getAlignOf(vt2, settings);
-            if (n == 0 || a == 0)
-                return 0;
-            n *= dim;
-            size_t padding = (a - (total % a)) % a;
-            return vt.typeScope->type == ScopeType::eUnion ? std::max(total, n) : total + padding + n;
-        };
-        size_t total = accumulateStructMembers(vt.typeScope, accHelper);
-        if (const Type* dt = vt.typeScope->definedType) {
-            total = std::accumulate(dt->derivedFrom.begin(), dt->derivedFrom.end(), total, [&](size_t v, const Type::BaseInfo& bi) {
-                if (bi.type && bi.type->classScope)
-                    v += accumulateStructMembers(bi.type->classScope, accHelper);
-                return v;
-            });
-        }
-        if (total == 0)
-            return 0;
-        size_t align = getAlignOf(vt, settings);
-        if (align == 0)
-            return 0;
-        total += (align - (total % align)) % align;
-        return total;
-    }
-    return 0;
-}
-
 static void valueFlowNumber(TokenList &tokenlist, const Settings& settings)
 {
     for (Token *tok = tokenlist.front(); tok;) {
@@ -562,12 +434,7 @@ static void valueFlowNumber(TokenList &tokenlist, const Settings& settings)
 
     if (tokenlist.isCPP() || settings.standards.c >= Standards::C23) {
         for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
-            if (tok->isName() && !tok->varId() && Token::Match(tok, "%bool%")) {
-                ValueFlow::Value value(tok->str() == "true");
-                if (!tok->isTemplateArg())
-                    value.setKnown();
-                setTokenValue(tok, std::move(value), settings);
-            } else if (Token::Match(tok, "[(,] NULL [,)]")) {
+            if (Token::Match(tok, "[(,] NULL [,)]")) {
                 // NULL function parameters are not simplified in the
                 // normal tokenlist
                 ValueFlow::Value value(0);
@@ -604,11 +471,11 @@ static const Token* findTypeEnd(const Token* tok)
 
 static std::vector<const Token*> evaluateType(const Token* start, const Token* end)
 {
-    std::vector<const Token*> result;
     if (!start)
-        return result;
+        return {};
     if (!end)
-        return result;
+        return {};
+    std::vector<const Token*> result;
     for (const Token* tok = start; tok != end; tok = tok->next()) {
         if (!Token::Match(tok, "%name%|::|<|(|*|&|&&"))
             return {};
@@ -636,7 +503,7 @@ static std::vector<const Token*> evaluateType(const Token* start, const Token* e
                     return {};
                 result.insert(result.end(), inner.begin(), inner.end());
             } else {
-                // We cant evaluate the decltype so bail
+                // We can't evaluate the decltype so bail
                 return {};
             }
             tok = tok->linkAt(1);
@@ -1035,10 +902,10 @@ static void valueFlowSameExpressions(TokenList& tokenlist, const Settings& setti
 
         long long val;
 
-        if (Token::Match(tok, "==|>=|<=|/")) {
+        if (Token::Match(tok, "==|>=|<=|/|/=")) {
             val = 1;
         }
-        else if (Token::Match(tok, "!=|>|<|%|-")) {
+        else if (Token::Match(tok, "!=|>|<|%|%=|-|-=|^|^=")) {
             val = 0;
         }
         else
@@ -1342,6 +1209,12 @@ static void valueFlowEnumValue(SymbolDatabase & symboldatabase, const Settings &
     }
 }
 
+// trampoline to generate unique timer results entry
+static void valueFlowEnumValueEarly(SymbolDatabase & symboldatabase, const Settings & settings)
+{
+    valueFlowEnumValue(symboldatabase, settings);
+}
+
 static void valueFlowGlobalConstVar(TokenList& tokenList, const Settings& settings)
 {
     // Get variable values...
@@ -1446,10 +1319,9 @@ static Analyzer::Result valueFlowForward(Token* startToken,
     return result;
 }
 
-template<class ValueOrValues>
 static Analyzer::Result valueFlowForward(Token* startToken,
                                          const Token* exprTok,
-                                         ValueOrValues v,
+                                         ValueFlow::Value v,
                                          const TokenList& tokenlist,
                                          ErrorLogger& errorLogger,
                                          const Settings& settings,
@@ -1533,28 +1405,24 @@ enum class LifetimeCapture : std::uint8_t { Undefined, ByValue, ByReference };
 
 static std::string lifetimeType(const Token *tok, const ValueFlow::Value *val)
 {
-    std::string result;
     if (!val)
         return "object";
     switch (val->lifetimeKind) {
     case ValueFlow::Value::LifetimeKind::Lambda:
-        result = "lambda";
-        break;
+        return "lambda";
     case ValueFlow::Value::LifetimeKind::Iterator:
-        result = "iterator";
-        break;
+        return "iterator";
     case ValueFlow::Value::LifetimeKind::Object:
     case ValueFlow::Value::LifetimeKind::SubObject:
     case ValueFlow::Value::LifetimeKind::Address:
         if (astIsPointer(tok))
-            result = "pointer";
-        else if (Token::simpleMatch(tok, "=") && astIsPointer(tok->astOperand2()))
-            result = "pointer";
-        else
-            result = "object";
-        break;
+            return "pointer";
+        if (Token::simpleMatch(tok, "=") && astIsPointer(tok->astOperand2()))
+            return "pointer";
+        return "object";
     }
-    return result;
+
+    cppcheck::unreachable();
 }
 
 std::string ValueFlow::lifetimeMessage(const Token *tok, const ValueFlow::Value *val, ErrorPath &errorPath)
@@ -1648,7 +1516,7 @@ ValueFlow::Value ValueFlow::getLifetimeObjValue(const Token *tok, bool inconclus
     // There should only be one lifetime
     if (values.size() != 1)
         return ValueFlow::Value{};
-    return values.front();
+    return std::move(values.front());
 }
 
 template<class Predicate>
@@ -1901,7 +1769,12 @@ static bool isLifetimeBorrowed(const ValueType *vt, const ValueType *vtParent)
             return true;
         if (vtParent->pointer < vt->pointer && vtParent->isIntegral())
             return true;
-        if (vtParent->str() == vt->str())
+        ValueType temp = *vtParent;
+        if ((temp.constness & 1) && !(vt->constness & 1)) // allow assignment to const/volatile
+            temp.constness &= ~1;
+        if ((temp.volatileness & 1) && !(vt->volatileness & 1))
+            temp.volatileness &= ~1;
+        if (temp.str() == vt->str())
             return true;
     }
 
@@ -1944,8 +1817,8 @@ static bool isNotEqual(std::pair<const Token*, const Token*> x, std::pair<const
 static bool isNotEqual(std::pair<const Token*, const Token*> x, const std::string& y, bool cpp, const Settings& settings)
 {
     TokenList tokenList(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
-    std::istringstream istr(y);
-    tokenList.createTokens(istr); // TODO: check result?
+    const std::string str(y + "\n");
+    tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
     return isNotEqual(x, std::make_pair(tokenList.front(), tokenList.back()));
 }
 static bool isNotEqual(std::pair<const Token*, const Token*> x, const ValueType* y, bool cpp, const Settings& settings)
@@ -2084,6 +1957,35 @@ const Token* ValueFlow::getEndOfExprScope(const Token* tok, const Scope* default
     return end;
 }
 
+static void getLhsLifetimeParentsImpl(const Token* lhs, const Library& library, std::vector<const Token*>& result)
+{
+    if (!lhs)
+        return;
+
+    if (Token::simpleMatch(lhs, "[")) {
+        getLhsLifetimeParentsImpl(lhs->astOperand1(), library, result);
+    } else if (Token::simpleMatch(lhs, ".") && lhs->originalName() != "->") {
+        const Token* obj = lhs->astOperand1();
+        if (Token::simpleMatch(obj, "[") && obj->exprId() > 0)
+            result.push_back(obj);
+        getLhsLifetimeParentsImpl(obj, library, result);
+    } else {
+        const Token* tok = getParentLifetime(lhs, library);
+        if (tok && tok->exprId() > 0) {
+            const Variable* var = tok->variable();
+            if (!var || var->isLocal() || var->isArgument())
+                result.push_back(tok);
+        }
+    }
+}
+
+static std::vector<const Token*> getLhsLifetimeParents(const Token* lhs, const Library& library)
+{
+    std::vector<const Token*> result;
+    getLhsLifetimeParentsImpl(lhs, library, result);
+    return result;
+}
+
 static void valueFlowForwardLifetime(Token * tok, const TokenList &tokenlist, ErrorLogger &errorLogger, const Settings &settings)
 {
     // Forward lifetimes to constructed variable
@@ -2136,14 +2038,8 @@ static void valueFlowForwardLifetime(Token * tok, const TokenList &tokenlist, Er
                 if (val.lifetimeKind == ValueFlow::Value::LifetimeKind::Address)
                     val.lifetimeKind = ValueFlow::Value::LifetimeKind::SubObject;
             }
-            // TODO: handle `[`
-            if (Token::simpleMatch(parent->astOperand1(), ".")) {
-                const Token* parentLifetime =
-                    getParentLifetime(parent->astOperand1()->astOperand2(), settings.library);
-                if (parentLifetime && parentLifetime->exprId() > 0) {
-                    valueFlowForward(nextExpression, endOfVarScope, parentLifetime, std::move(values), tokenlist, errorLogger, settings);
-                }
-            }
+            for (const Token *p : getLhsLifetimeParents(parent->astOperand1(), settings.library))
+                valueFlowForward(nextExpression, endOfVarScope, p, values, tokenlist, errorLogger, settings);
         }
         // Constructor
     } else if (Token::simpleMatch(parent, "{") && !isScopeBracket(parent)) {
@@ -2314,6 +2210,11 @@ struct LifetimeStore {
             for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(argtok, settings)) {
                 if (!settings.certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
                     continue;
+
+                const Variable* var = lt.token->variable();
+                if (!var || !var->isArgument())
+                    continue;
+
                 ValueFlow::Value value;
                 value.valueType = ValueFlow::Value::ValueType::LIFETIME;
                 value.tokvalue = lt.token;
@@ -2321,12 +2222,8 @@ struct LifetimeStore {
                 value.errorPath = er;
                 value.lifetimeKind = type;
                 value.setInconclusive(inconclusive || lt.inconclusive);
-                const Variable* var = lt.token->variable();
-                if (var && var->isArgument()) {
-                    value.lifetimeScope = ValueFlow::Value::LifetimeScope::Argument;
-                } else {
-                    continue;
-                }
+                value.lifetimeScope = ValueFlow::Value::LifetimeScope::Argument;
+
                 // Don't add the value a second time
                 if (std::find(tok->values().cbegin(), tok->values().cend(), value) != tok->values().cend())
                     continue;
@@ -2343,12 +2240,12 @@ struct LifetimeStore {
             for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok3, settings)) {
                 if (!settings.certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
                     continue;
-                ErrorPath er = v.errorPath;
-                er.insert(er.end(), lt.errorPath.cbegin(), lt.errorPath.cend());
                 if (!lt.token)
                     return false;
                 if (!pred(lt.token))
                     return false;
+                ErrorPath er = v.errorPath;
+                er.insert(er.end(), lt.errorPath.cbegin(), lt.errorPath.cend());
                 er.emplace_back(argtok, message);
                 er.insert(er.end(), errorPath.cbegin(), errorPath.cend());
 
@@ -2590,7 +2487,7 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
     const int returnContainer = settings.library.returnValueContainer(tok);
     if (returnContainer >= 0) {
         std::vector<const Token *> args = getArguments(tok);
-        for (int argnr = 1; argnr <= args.size(); ++argnr) {
+        for (size_t argnr = 1; argnr <= args.size(); ++argnr) {
             const Library::ArgumentChecks::IteratorInfo *i = settings.library.getArgIteratorInfo(tok, argnr);
             if (!i)
                 continue;
@@ -2626,8 +2523,8 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
         std::vector<const Token *> args = getArguments(tok);
         const std::size_t n = args.size();
         if (n > 1 && Token::typeStr(args[n - 2]) == Token::typeStr(args[n - 1]) &&
-            (((astIsIterator(args[n - 2]) && astIsIterator(args[n - 1])) ||
-              (astIsPointer(args[n - 2]) && astIsPointer(args[n - 1]))))) {
+            ((astIsIterator(args[n - 2]) && astIsIterator(args[n - 1])) ||
+             (astIsPointer(args[n - 2]) && astIsPointer(args[n - 1])))) {
             LifetimeStore{
                 args.back(), "Added to container '" + memtok->str() + "'.", ValueFlow::Value::LifetimeKind::Object}
             .byDerefCopy(memtok, tokenlist, errorLogger, settings);
@@ -2650,6 +2547,8 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
         for (const Token* returnTok : returns) {
             if (returnTok == tok)
                 continue;
+            if (!ValueFlow::isLifetimeBorrowed(returnTok, settings))
+                return;
             const Variable *returnVar = ValueFlow::getLifetimeVariable(returnTok, settings);
             if (returnVar && returnVar->isArgument() && (returnVar->isConst() || !isVariableChanged(returnVar, settings))) {
                 LifetimeStore ls = LifetimeStore::fromFunctionArg(f, tok, returnVar, tokenlist, settings, errorLogger);
@@ -2722,7 +2621,7 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
             std::vector<const Token*> args = getArguments(tok);
             if (iArg > 0 && iArg <= args.size()) {
                 const Token* varTok = args[iArg - 1];
-                if (varTok->variable() && varTok->variable()->isLocal())
+                if (varTok->variable() && varTok->variable()->isLocal() && varTok->variable()->isArray())
                     LifetimeStore{ varTok, "Passed to '" + tok->str() + "'.", ValueFlow::Value::LifetimeKind::Address }.byRef(
                         tok->next(), tokenlist, errorLogger, settings);
             }
@@ -2817,21 +2716,32 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
                 "Passed to constructor of '" + t->name() + "'.",
                 ValueFlow::Value::LifetimeKind::SubObject,
                 [&](LifetimeStore& ls) {
+                const bool isDesignatedInitializerArg = isDesignatedInitializer(ls.argtok->astOperand1());
                 // Skip static variable
-                it = std::find_if(it, scope->varlist.cend(), [](const Variable& var) {
-                    return !var.isStatic();
+                it = std::find_if(it, scope->varlist.cend(), [&](const Variable &var) {
+                    if (var.isStatic())
+                        return false;
+                    if (!isDesignatedInitializerArg)
+                        return true;
+                    return var.name() == ls.argtok->astOperand1()->astOperand1()->str();
                 });
                 if (it == scope->varlist.cend())
                     return;
-                const Variable& var = *it;
-                if (var.valueType() && var.valueType()->container && var.valueType()->container->stdStringLike && !var.valueType()->container->view)
+                if (isDesignatedInitializerArg)
+                    ls.argtok = ls.argtok->astOperand2();
+                const Variable &var = *it;
+                if (ls.argtok->valueType() && ls.argtok->valueType()->pointer &&
+                    var.valueType() && var.valueType()->container && var.valueType()->container->stdStringLike && !var.valueType()->container->view)
                     return; // TODO: check in isLifetimeBorrowed()?
                 if (var.isReference() || var.isRValueReference()) {
                     ls.byRef(tok, tokenlist, errorLogger, settings);
                 } else if (ValueFlow::isLifetimeBorrowed(ls.argtok, settings)) {
                     ls.byVal(tok, tokenlist, errorLogger, settings);
                 }
-                it++;
+                if (isDesignatedInitializerArg) // TODO: handle mixed initialization?
+                    it = scope->varlist.cbegin();
+                else
+                    it++;
             });
         } else {
             const Function* constructor = findConstructor(scope, tok, args);
@@ -3119,6 +3029,14 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
         else if (tok->isUnaryOp("&")) {
             if (Token::simpleMatch(tok->astParent(), "*"))
                 continue;
+            if (Token::simpleMatch(tok->astOperand1(), "[")) {
+                const Token* const op1 = tok->astOperand1()->astOperand1();
+                const Token* tok2 = op1;
+                while (Token::simpleMatch(tok2, "."))
+                    tok2 = tok2->astOperand2();
+                if (tok2 && tok2 != op1 && (!tok2->variable() || !tok2->variable()->isArray()) && !(tok2->valueType() && tok2->valueType()->container))
+                    continue;
+            }
             for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok->astOperand1(), settings)) {
                 if (!settings.certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
                     continue;
@@ -3156,7 +3074,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
             // Skip if its a free function that doesnt yield an iterator to the container
             if (Token::Match(parent->previous(), "%name% (") &&
                 !contains({Library::Container::Yield::START_ITERATOR, Library::Container::Yield::END_ITERATOR},
-                          astFunctionYield(parent->previous(), settings)))
+                          astFunctionYield(parent->previous(), settings.library)))
                 continue;
 
             ValueFlow::Value master;
@@ -3168,7 +3086,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
                 master.lifetimeKind = ValueFlow::Value::LifetimeKind::Iterator;
             } else if (astIsIterator(parent) && Token::Match(parent->previous(), "%name% (") &&
                        contains({Library::Container::Yield::START_ITERATOR, Library::Container::Yield::END_ITERATOR},
-                                astFunctionYield(parent->previous(), settings))) {
+                                astFunctionYield(parent->previous(), settings.library))) {
                 master.errorPath.emplace_back(parent, "Iterator to container is created here.");
                 master.lifetimeKind = ValueFlow::Value::LifetimeKind::Iterator;
             } else if ((astIsPointer(parent->tokAt(2)) &&
@@ -3206,7 +3124,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
             }
 
             for (const Token* tok2 : toks) {
-                for (const ReferenceToken& rt : followAllReferences(tok2, false)) {
+                for (const ReferenceToken& rt : tok2->refs(false)) {
                     ValueFlow::Value value = master;
                     value.tokvalue = rt.token;
                     value.errorPath.insert(value.errorPath.begin(), rt.errors.cbegin(), rt.errors.cend());
@@ -3229,7 +3147,7 @@ static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, co
             valueFlowLifetimeConstructor(tok->next(), tokenlist, errorLogger, settings);
         }
         // Check function calls
-        else if (Token::Match(tok, "%name% (") && !Token::simpleMatch(tok->linkAt(1), ") {")) {
+        else if (tok->scope()->isExecutable() && Token::Match(tok, "%name% (")) {
             valueFlowLifetimeFunction(tok, tokenlist, errorLogger, settings);
         }
         // Unique pointer lifetimes
@@ -3330,6 +3248,14 @@ static Token* findEndOfFunctionCallForParameter(Token* parameterToken)
     return nextAfterAstRightmostLeaf(parent);
 }
 
+static bool isTryEmplace(const Token* tok)
+{
+    if (tok->str() != "(" || !Token::simpleMatch(tok->astOperand1(), ".") || !tok->astOperand1()->astOperand1() || !Token::simpleMatch(tok->astOperand1()->astOperand2(), "try_emplace"))
+        return false;
+    const ValueType* vt = tok->astOperand1()->astOperand1()->valueType();
+    return vt && vt->container && vt->container->stdAssociativeLike;
+}
+
 static void valueFlowAfterMove(const TokenList& tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (!tokenlist.isCPP() || settings.standards.cpp < Standards::CPP11)
@@ -3372,9 +3298,17 @@ static void valueFlowAfterMove(const TokenList& tokenlist, const SymbolDatabase&
             const nonneg int varId = varTok->varId();
             // x is not MOVED after assignment if code is:  x = ... std::move(x) .. ;
             const Token *parent = tok->astParent();
+            bool bail = false;
             while (parent && parent->str() != "=" && parent->str() != "return" &&
-                   !(parent->str() == "(" && isOpenParenthesisMemberFunctionCallOfVarId(parent, varId)))
+                   !(parent->str() == "(" && isOpenParenthesisMemberFunctionCallOfVarId(parent, varId))) {
+                if (isTryEmplace(parent)) {
+                    bail = true;
+                    break;
+                }
                 parent = parent->astParent();
+            }
+            if (bail)
+                continue;
             if (parent &&
                 (parent->str() == "return" || // MOVED in return statement
                  parent->str() == "(")) // MOVED in self assignment, isOpenParenthesisMemberFunctionCallOfVarId == true
@@ -3392,8 +3326,11 @@ static void valueFlowAfterMove(const TokenList& tokenlist, const SymbolDatabase&
                         ternaryColon = ternaryColon->astParent();
                     if (Token::simpleMatch(ternaryColon, ":")) {
                         endOfFunctionCall = ternaryColon->astOperand2();
-                        if (Token::simpleMatch(endOfFunctionCall, "("))
-                            endOfFunctionCall = endOfFunctionCall->link();
+                        Token* next = nextAfterAstRightmostLeaf(endOfFunctionCall);
+                        if (next)
+                            endOfFunctionCall = next;
+                        else
+                            endOfFunctionCall = endOfFunctionCall->next();
                     }
                 }
                 ValueFlow::Value value;
@@ -3575,7 +3512,7 @@ static void valueFlowConditionExpressions(const TokenList& tokenlist,
             }
 
             // Check if the block terminates early
-            if (isEscapeScope(blockTok, settings)) {
+            if (isEscapeScope(blockTok, settings.library)) {
                 const Scope* scope2 = scope;
                 // If escaping a loop then only use the loop scope
                 if (isBreakOrContinueScope(blockTok->link())) {
@@ -3614,8 +3551,8 @@ static bool isTruncated(const ValueType* src, const ValueType* dst, const Settin
     if (src->smartPointer && dst->smartPointer)
         return false;
     if ((src->isIntegral() && dst->isIntegral()) || (src->isFloat() && dst->isFloat())) {
-        const size_t srcSize = ValueFlow::getSizeOf(*src, settings);
-        const size_t dstSize = ValueFlow::getSizeOf(*dst, settings);
+        const size_t srcSize = src->getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
+        const size_t dstSize = dst->getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
         if (srcSize > dstSize)
             return true;
         if (srcSize == dstSize && src->sign != dst->sign)
@@ -3676,6 +3613,9 @@ static void valueFlowSymbolic(const TokenList& tokenlist, const SymbolDatabase&
                 continue;
             if (tok->astOperand2()->exprId() == 0)
                 continue;
+            if (tok->astOperand2()->variable() && tok->astOperand2()->variable()->isArray() &&
+                tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->pointer) // array to pointer decay
+                continue;
             if (!isConstExpression(tok->astOperand2(), settings.library))
                 continue;
             if (tok->astOperand1()->valueType() && tok->astOperand2()->valueType()) {
@@ -3765,7 +3705,7 @@ static void valueFlowSymbolicOperators(const SymbolDatabase& symboldatabase, con
                     continue;
 
                 ValueFlow::Value v = makeSymbolic(arg);
-                v.errorPath = c.errorPath;
+                v.errorPath = std::move(c.errorPath);
                 v.errorPath.emplace_back(tok, "Passed to " + tok->str());
                 if (c.intvalue == 0)
                     v.setImpossible();
@@ -3795,7 +3735,7 @@ static void valueFlowSymbolicOperators(const SymbolDatabase& symboldatabase, con
                     continue;
                 if (vartok->exprId() == 0)
                     continue;
-                if (Token::Match(tok, "<<|>>|/") && !astIsLHS(vartok))
+                if (Token::Match(tok, "<<|>>|/|-") && !astIsLHS(vartok))
                     continue;
                 if (Token::Match(tok, "<<|>>|^|+|-|%or%") && constant->intvalue != 0)
                     continue;
@@ -3901,6 +3841,9 @@ static void valueFlowSymbolicInfer(const SymbolDatabase& symboldatabase, const S
     }
 }
 
+/**
+ * @throws InternalError thrown if start token precedes end token
+ */
 template<class ContainerOfValue>
 static void valueFlowForwardConst(Token* start,
                                   const Token* end,
@@ -3911,14 +3854,29 @@ static void valueFlowForwardConst(Token* start,
 {
     if (!precedes(start, end))
         throw InternalError(var->nameToken(), "valueFlowForwardConst: start token does not precede the end token.");
+    const bool hasContainerSizeValue = std::any_of(values.begin(), values.end(), [](const ValueFlow::Value& value) {
+        return value.isContainerSizeValue();
+    });
     for (Token* tok = start; tok != end; tok = tok->next()) {
         if (tok->varId() == var->declarationId()) {
             for (const ValueFlow::Value& value : values)
                 setTokenValue(tok, value, settings);
         } else {
             [&] {
+                // Add the container size to iterators of the container (mirrors ContainerExpressionAnalyzer::match)
+                if (hasContainerSizeValue && isIteratorOf(tok, var->declarationId())) {
+                    for (const ValueFlow::Value& value : values) {
+                        if (!value.isContainerSizeValue())
+                            continue;
+                        ValueFlow::Value sizeValue = value;
+                        if (!sizeValue.container)
+                            sizeValue.container = var->nameToken();
+                        setTokenValue(tok, std::move(sizeValue), settings);
+                    }
+                    return;
+                }
                 // Follow references
-                auto refs = followAllReferences(tok);
+                const auto& refs = tok->refs();
                 auto it = std::find_if(refs.cbegin(), refs.cend(), [&](const ReferenceToken& ref) {
                     return ref.token->varId() == var->declarationId();
                 });
@@ -4138,10 +4096,10 @@ static std::list<ValueFlow::Value> truncateValues(std::list<ValueFlow::Value> va
     if (!dst || !dst->isIntegral())
         return values;
 
-    const size_t sz = ValueFlow::getSizeOf(*dst, settings);
+    const size_t sz = dst->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
 
     if (src) {
-        const size_t osz = ValueFlow::getSizeOf(*src, settings);
+        const size_t osz = src->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
         if (osz >= sz && dst->sign == ValueType::Sign::SIGNED && src->sign == ValueType::Sign::UNSIGNED) {
             values.remove_if([&](const ValueFlow::Value& value) {
                 if (!value.isIntValue())
@@ -4189,6 +4147,8 @@ static bool isVariableInit(const Token *tok)
         return false;
     if (var->nameToken() != tok->astOperand1())
         return false;
+    if (var->isPointer())
+        return true;
     const ValueType* vt = var->valueType();
     if (!vt)
         return false;
@@ -4211,7 +4171,7 @@ static bool intersects(const C1& c1, const C2& c2)
     return false;
 }
 
-static void valueFlowAfterAssign(TokenList &tokenlist,
+static void valueFlowAfterAssign(const TokenList &tokenlist,
                                  const SymbolDatabase& symboldatabase,
                                  ErrorLogger &errorLogger,
                                  const Settings &settings,
@@ -4260,11 +4220,15 @@ static void valueFlowAfterAssign(TokenList &tokenlist,
             values.remove_if([&](const ValueFlow::Value& value) {
                 return types.count(value.valueType) > 0;
             });
-            // Remove container size if its not a container
-            if (!astIsContainer(tok->astOperand2()))
+            // Remove container size if its not a container - unless the size records its container
+            // and flows into a pointer to the container data (e.g. p = v.data())
+            if (!astIsContainer(tok->astOperand2())) {
+                const bool lhsIsPointer = astIsPointer(tok->astOperand1());
                 values.remove_if([&](const ValueFlow::Value& value) {
-                    return value.valueType == ValueFlow::Value::ValueType::CONTAINER_SIZE;
+                    return value.valueType == ValueFlow::Value::ValueType::CONTAINER_SIZE &&
+                           (!value.container || !lhsIsPointer);
                 });
+            }
             // Remove symbolic values that are the same as the LHS
             values.remove_if([&](const ValueFlow::Value& value) {
                 if (value.isSymbolicValue() && value.tokvalue)
@@ -4324,6 +4288,7 @@ static void valueFlowAfterAssign(TokenList &tokenlist,
                         continue;
                     const Token* expr = value.tokvalue;
                     value.intvalue = -value.intvalue;
+                    value.invertBound();
                     value.tokvalue = tok->astOperand1();
 
                     // Skip if it intersects with an already assigned symbol
@@ -4641,7 +4606,7 @@ struct ConditionHandler {
                 }
 
                 // Variable changed in loop code
-                const Token* const start = top;
+                const Token* const start = top->strAt(-1) == "for" ? top->astOperand2() : top; // skip init statement
                 const Token* const block = top->link()->next();
                 const Token* const end = block->link();
 
@@ -4715,6 +4680,14 @@ struct ConditionHandler {
         });
     }
 
+    static void lowerToInconclusive(std::list<ValueFlow::Value>& values)
+    {
+        for (ValueFlow::Value& v : values) {
+            if (!v.isImpossible())
+                v.setInconclusive();
+        }
+    }
+
     void afterCondition(TokenList& tokenlist,
                         const SymbolDatabase& symboldatabase,
                         ErrorLogger& errorLogger,
@@ -4947,10 +4920,13 @@ struct ConditionHandler {
                 else if (!dead_if)
                     dead_if = isReturnScope(after, settings.library, &unknownFunction);
 
+                // If the taken branch might not return (it ends in a call to an unknown,
+                // possibly noreturn function) then its values might not flow past the
+                // conditional code -> lower them to inconclusive.
                 if (!dead_if && unknownFunction) {
                     if (settings.debugwarnings)
                         bailout(tokenlist, errorLogger, unknownFunction, "possible noreturn scope");
-                    return;
+                    lowerToInconclusive(thenValues);
                 }
 
                 if (Token::simpleMatch(after, "} else {")) {
@@ -4961,7 +4937,7 @@ struct ConditionHandler {
                     if (!dead_else && unknownFunction) {
                         if (settings.debugwarnings)
                             bailout(tokenlist, errorLogger, unknownFunction, "possible noreturn scope");
-                        return;
+                        lowerToInconclusive(elseValues);
                     }
                 }
 
@@ -4977,11 +4953,15 @@ struct ConditionHandler {
                     std::copy_if(thenValues.cbegin(),
                                  thenValues.cend(),
                                  std::back_inserter(values),
-                                 std::mem_fn(&ValueFlow::Value::isPossible));
+                                 [](const ValueFlow::Value& v) {
+                        return v.isPossible() || v.isInconclusive();
+                    });
                     std::copy_if(elseValues.cbegin(),
                                  elseValues.cend(),
                                  std::back_inserter(values),
-                                 std::mem_fn(&ValueFlow::Value::isPossible));
+                                 [](const ValueFlow::Value& v) {
+                        return v.isPossible() || v.isInconclusive();
+                    });
                 }
 
                 if (values.empty())
@@ -5054,6 +5034,24 @@ static void valueFlowCondition(const ValuePtr<ConditionHandler>& handler,
     handler->afterCondition(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions);
 }
 
+static const Token* getConditionVariable(const Token* tok)
+{
+    if (tok->str() == "!")
+        return tok->astOperand1();
+
+    if (const Token* parent = tok->astParent()) {
+        if (Token::Match(parent, "%oror%|&&|?") ||
+            Token::Match(parent->previous(), "if|while (") ||
+            (parent->str() == ";" && astIsLHS(tok) && Token::simpleMatch(parent->astParent(), ";"))) { // for loop condition
+            if (Token::simpleMatch(tok, "="))
+                return tok->astOperand1();
+            if (!Token::Match(tok, "%comp%|%assign%"))
+                return tok;
+        }
+    }
+    return nullptr;
+}
+
 struct SimpleConditionHandler : ConditionHandler {
     std::vector<Condition> parse(const Token* tok, const Settings& /*settings*/) const override {
 
@@ -5072,19 +5070,7 @@ struct SimpleConditionHandler : ConditionHandler {
         if (!conds.empty())
             return conds;
 
-        const Token* vartok = nullptr;
-
-        if (tok->str() == "!") {
-            vartok = tok->astOperand1();
-
-        } else if (tok->astParent() && (Token::Match(tok->astParent(), "%oror%|&&|?") ||
-                                        Token::Match(tok->astParent()->previous(), "if|while ("))) {
-            if (Token::simpleMatch(tok, "="))
-                vartok = tok->astOperand1();
-            else if (!Token::Match(tok, "%comp%|%assign%"))
-                vartok = tok;
-        }
-
+        const Token* vartok = getConditionVariable(tok);
         if (!vartok)
             return {};
         Condition cond;
@@ -5180,8 +5166,7 @@ static void valueFlowInferCondition(TokenList& tokenlist, const Settings& settin
             std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(), "!=", tok->values(), 0);
             if (result.size() != 1)
                 continue;
-            ValueFlow::Value value = result.front();
-            setTokenValue(tok, std::move(value), settings);
+            setTokenValue(tok, std::move(result.front()), settings);
         }
     }
 }
@@ -5252,9 +5237,9 @@ struct SymbolicConditionHandler : SimpleConditionHandler {
 };
 
 static bool valueFlowForLoop2(const Token *tok,
-                              ProgramMemory *memory1,
-                              ProgramMemory *memory2,
-                              ProgramMemory *memoryAfter,
+                              ProgramMemory &memory1,
+                              ProgramMemory &memory2,
+                              ProgramMemory &memoryAfter,
                               const Settings& settings)
 {
     // for ( firstExpression ; secondExpression ; thirdExpression )
@@ -5269,8 +5254,18 @@ static bool valueFlowForLoop2(const Token *tok,
     if (error)
         return false;
     execute(secondExpression, programMemory, &result, &error, settings);
-    if (result == 0) // 2nd expression is false => no looping
+    if (result == 0) {
+        if (!error) { // 2nd expression is false => no looping
+            ProgramMemory startMemory(programMemory);
+            ProgramMemory endMemory(programMemory);
+
+            memory1.swap(startMemory);
+            memory2.swap(endMemory);
+            memoryAfter.swap(programMemory);
+            return true;
+        }
         return false;
+    }
     if (error) {
         // If a variable is reassigned in second expression, return false
         bool reassign = false;
@@ -5297,13 +5292,10 @@ static bool valueFlowForLoop2(const Token *tok,
     }
     // TODO: add bailout message
 
-    if (memory1)
-        memory1->swap(startMemory);
+    memory1.swap(startMemory);
     if (!error) {
-        if (memory2)
-            memory2->swap(endMemory);
-        if (memoryAfter)
-            memoryAfter->swap(programMemory);
+        memory2.swap(endMemory);
+        memoryAfter.swap(programMemory);
     }
 
     return true;
@@ -5438,7 +5430,7 @@ static void valueFlowForLoopSimplifyAfter(Token* fortok, nonneg int varid, const
     }
 }
 
-static void valueFlowForLoop(TokenList &tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger &errorLogger, const Settings &settings)
+static void valueFlowForLoop(const TokenList &tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger &errorLogger, const Settings &settings)
 {
     for (const Scope &scope : symboldatabase.scopeList) {
         if (scope.type != ScopeType::eFor)
@@ -5478,24 +5470,33 @@ static void valueFlowForLoop(TokenList &tokenlist, const SymbolDatabase& symbold
             valueFlowForLoopSimplifyAfter(tok, varid, afterValue, tokenlist, errorLogger, settings);
         } else {
             ProgramMemory mem1, mem2, memAfter;
-            if (valueFlowForLoop2(tok, &mem1, &mem2, &memAfter, settings)) {
-                for (const auto& p : mem1) {
-                    if (!p.second.isIntValue())
-                        continue;
-                    if (p.second.isImpossible())
-                        continue;
-                    if (p.first.tok->varId() == 0)
-                        continue;
-                    valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
-                }
-                for (const auto& p : mem2) {
-                    if (!p.second.isIntValue())
-                        continue;
-                    if (p.second.isImpossible())
-                        continue;
-                    if (p.first.tok->varId() == 0)
-                        continue;
-                    valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
+            if (valueFlowForLoop2(tok, mem1, mem2, memAfter, settings)) {
+                if (mem1 == memAfter) { // #8192 check if loop never runs
+                    Token* condTok = getCondTok(tok);
+                    if (condTok && !condTok->hasKnownIntValue()) {
+                        ValueFlow::Value v(0);
+                        v.setKnown();
+                        ValueFlow::setTokenValue(condTok, std::move(v), settings);
+                    }
+                } else {
+                    for (const auto& p : mem1) {
+                        if (!p.second.isIntValue())
+                            continue;
+                        if (p.second.isImpossible())
+                            continue;
+                        if (p.first.tok->varId() == 0)
+                            continue;
+                        valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
+                    }
+                    for (const auto& p : mem2) {
+                        if (!p.second.isIntValue())
+                            continue;
+                        if (p.second.isImpossible())
+                            continue;
+                        if (p.first.tok->varId() == 0)
+                            continue;
+                        valueFlowForLoopSimplify(bodyStart, p.first.tok, false, p.second.intvalue, tokenlist, errorLogger, settings);
+                    }
                 }
                 for (const auto& p : memAfter) {
                     if (!p.second.isIntValue())
@@ -5600,7 +5601,7 @@ static void valueFlowInjectParameter(const TokenList& tokenlist,
                                      const Settings& settings,
                                      const Variable* arg,
                                      const Scope* functionScope,
-                                     const std::list<ValueFlow::Value>& argvalues)
+                                     std::list<ValueFlow::Value> argvalues)
 {
     // Is argument passed by value or const reference, and is it a known non-class type?
     if (arg->isReference() && !arg->isConst() && !arg->isClass())
@@ -5614,7 +5615,7 @@ static void valueFlowInjectParameter(const TokenList& tokenlist,
     valueFlowForward(const_cast<Token*>(functionScope->bodyStart->next()),
                      functionScope->bodyEnd,
                      arg->nameToken(),
-                     argvalues,
+                     std::move(argvalues),
                      tokenlist,
                      errorLogger,
                      settings);
@@ -5788,7 +5789,7 @@ static void valueFlowSubFunction(const TokenList& tokenlist,
                 // Remove uninit values if argument is passed by value
                 if (argtok->variable() && !argtok->variable()->isPointer() && argvalues.size() == 1 &&
                     argvalues.front().isUninitValue()) {
-                    if (CheckUninitVar::isVariableUsage(argtok, settings.library, false, CheckUninitVar::Alloc::NO_ALLOC, 0))
+                    if (CheckUninitVarImpl::isVariableUsage(argtok, settings.library, false, CheckUninitVarImpl::Alloc::NO_ALLOC, 0))
                         continue;
                 }
 
@@ -5802,7 +5803,7 @@ static void valueFlowSubFunction(const TokenList& tokenlist,
                     v.errorPath.emplace_back(argtok,
                                              "Calling function '" + calledFunction->name() + "', " + nr + " argument '" +
                                              argtok->expressionString() + "' value is " + v.infoString());
-                    v.path = 256 * v.path + id % 256;
+                    v.path = (256 * v.path) + (id % 256);
                     // Change scope of lifetime values
                     if (v.isLifetimeValue())
                         v.lifetimeScope = ValueFlow::Value::LifetimeScope::SubFunction;
@@ -5827,20 +5828,21 @@ static void valueFlowFunctionDefaultParameter(const TokenList& tokenlist, const
         const Function* function = scope->function;
         if (!function)
             continue;
-        for (nonneg int arg = function->minArgCount(); arg < function->argCount(); arg++) {
+        for (size_t arg = function->minArgCount(); arg < function->argCount(); arg++) {
             const Variable* var = function->getArgumentVar(arg);
             if (var && var->hasDefault() && Token::Match(var->nameToken(), "%var% = %num%|%str%|%char%|%name% [,)]")) {
                 const std::list<ValueFlow::Value> &values = var->nameToken()->tokAt(2)->values();
                 std::list<ValueFlow::Value> argvalues;
                 for (const ValueFlow::Value &value : values) {
+                    if (!value.isKnown())
+                        continue;
                     ValueFlow::Value v(value);
                     v.defaultArg = true;
-                    v.changeKnownToPossible();
-                    if (v.isPossible())
-                        argvalues.push_back(std::move(v));
+                    v.setPossible();
+                    argvalues.push_back(std::move(v));
                 }
                 if (!argvalues.empty())
-                    valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, argvalues);
+                    valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, std::move(argvalues));
             }
         }
     }
@@ -6016,7 +6018,7 @@ static void addToErrorPath(ValueFlow::Value& value, const ValueFlow::Value& from
 }
 
 static std::vector<Token*> findAllUsages(const Variable* var,
-                                         Token* start, // cppcheck-suppress constParameterPointer // FP
+                                         Token* start,
                                          const Library& library)
 {
     // std::vector<Token*> result;
@@ -6068,9 +6070,12 @@ static Token* findStartToken(const Variable* var, Token* start, const Library& l
     }))
         return first->previous();
     // Compute the outer scope
-    while (scope && scope->nestedIn != var->scope())
+    while (scope && scope->nestedIn != var->scope()) {
+        if (scope->type == ScopeType::eLambda && !Token::simpleMatch(scope->bodyEnd, "} ("))
+            return start;
         scope = scope->nestedIn;
-    if (!scope)
+    }
+    if (!scope || (scope->type == ScopeType::eLambda && !Token::simpleMatch(scope->bodyEnd, "} (")))
         return start;
     auto* tok = const_cast<Token*>(scope->bodyStart);
     if (!tok)
@@ -6223,7 +6228,7 @@ static bool isContainerSizeChangedByFunction(const Token* tok,
     }
 
     bool inconclusive = false;
-    const bool isChanged = isVariableChangedByFunctionCall(tok, indirect, settings, &inconclusive);
+    const bool isChanged = isVariableChangedByFunctionCall(tok, indirect, settings.library, &inconclusive);
     return (isChanged || inconclusive);
 }
 
@@ -6258,6 +6263,8 @@ const Token* ValueFlow::solveExprValue(const Token* expr,
                                        const std::function<std::vector<MathLib::bigint>(const Token*)>& eval,
                                        ValueFlow::Value& value)
 {
+    if (!expr)
+        return nullptr;
     if (!value.isIntValue() && !value.isIteratorValue() && !value.isSymbolicValue())
         return expr;
     if (value.isSymbolicValue() && !Token::Match(expr, "+|-"))
@@ -6306,6 +6313,8 @@ bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Set
         return true;
     if (astIsLHS(tok) && Token::simpleMatch(tok->astParent(), "["))
         return tok->valueType()->container->stdAssociativeLike;
+    if (Token::simpleMatch(tok->astParent(), "*") && indirect > 0)
+        return isContainerSizeChanged(tok->astParent(), indirect - 1, settings, depth + 1);
     const Library::Container::Action action = astContainerAction(tok, settings.library);
     switch (action) {
     case Library::Container::Action::RESIZE:
@@ -6424,9 +6433,9 @@ static void valueFlowSmartPointer(TokenList &tokenlist, ErrorLogger & errorLogge
     }
 }
 
-static Library::Container::Yield findIteratorYield(Token* tok, const Token*& ftok, const Settings& settings)
+static Library::Container::Yield findIteratorYield(Token* tok, const Token*& ftok, const Library& library)
 {
-    auto yield = astContainerYield(tok, settings.library, &ftok);
+    auto yield = astContainerYield(tok, library, &ftok);
     if (ftok)
         return yield;
 
@@ -6434,7 +6443,7 @@ static Library::Container::Yield findIteratorYield(Token* tok, const Token*& fto
         return yield;
 
     // begin/end free functions
-    return astFunctionYield(tok->astParent()->previous(), settings, &ftok);
+    return astFunctionYield(tok->astParent()->previous(), library, &ftok);
 }
 
 static void valueFlowIterators(TokenList& tokenlist, const Settings& settings)
@@ -6447,20 +6456,25 @@ static void valueFlowIterators(TokenList& tokenlist, const Settings& settings)
         if (!astIsContainer(tok))
             continue;
         const Token* ftok = nullptr;
-        const Library::Container::Yield yield = findIteratorYield(tok, ftok, settings);
+        const Library::Container::Yield yield = findIteratorYield(tok, ftok, settings.library);
         if (!ftok)
             continue;
-        if (yield == Library::Container::Yield::START_ITERATOR) {
-            ValueFlow::Value v(0);
-            v.setKnown();
-            v.valueType = ValueFlow::Value::ValueType::ITERATOR_START;
-            setTokenValue(const_cast<Token*>(ftok)->next(), std::move(v), settings);
-        } else if (yield == Library::Container::Yield::END_ITERATOR) {
-            ValueFlow::Value v(0);
-            v.setKnown();
-            v.valueType = ValueFlow::Value::ValueType::ITERATOR_END;
-            setTokenValue(const_cast<Token*>(ftok)->next(), std::move(v), settings);
-        }
+        if (yield != Library::Container::Yield::START_ITERATOR && yield != Library::Container::Yield::END_ITERATOR)
+            continue;
+        // The iterator value records the container it iterates. A pointer or a reference only
+        // transports the iterator, so record the container it refers to instead.
+        const Token* containerTok = tok;
+        if (astIsPointer(containerTok) || (containerTok->variable() && containerTok->variable()->isReference())) {
+            const ValueFlow::Value lifetime = ValueFlow::getLifetimeObjValue(containerTok);
+            if (lifetime.tokvalue && astIsContainer(lifetime.tokvalue) && !astIsPointer(lifetime.tokvalue))
+                containerTok = lifetime.tokvalue;
+        }
+        ValueFlow::Value v(0);
+        v.setKnown();
+        v.valueType = yield == Library::Container::Yield::START_ITERATOR ? ValueFlow::Value::ValueType::ITERATOR_START
+                                                                         : ValueFlow::Value::ValueType::ITERATOR_END;
+        v.container = containerTok;
+        setTokenValue(const_cast<Token*>(ftok)->next(), std::move(v), settings);
     }
 }
 
@@ -6598,6 +6612,9 @@ static std::vector<ValueFlow::Value> getContainerSizeFromConstructorArgs(const s
         if (astIsPointer(args[0])) {
             if (args.size() == 1 && args[0]->tokType() == Token::Type::eString)
                 return {makeContainerSizeValue(Token::getStrLength(args[0]), known)};
+            if (args.size() == 1 && args[0]->variable() && args[0]->variable()->isArray() &&
+                args[0]->variable()->isConst() && args[0]->variable()->dimensions().size() == 1 && args[0]->variable()->dimensions()[0].known)
+                return {makeContainerSizeValue(args[0]->variable()->dimensions()[0].num, known)};
             if (args.size() == 2 && astIsIntegral(args[1], false)) // { char*, count }
                 return {makeContainerSizeValue(args[1], known)};
         } else if (astIsContainer(args[0])) {
@@ -6611,10 +6628,12 @@ static std::vector<ValueFlow::Value> getContainerSizeFromConstructorArgs(const s
     return {};
 }
 
-static bool valueFlowIsSameContainerType(const ValueType& contType, const Token* tok, const Settings& settings)
+static bool valueFlowIsSameContainerType(const ValueType& contType, const Token* tok, bool isView, const Settings& settings)
 {
-    if (!tok || !tok->valueType() || !tok->valueType()->containerTypeToken)
+    if (!tok || !tok->valueType())
         return true;
+    if (!tok->valueType()->containerTypeToken)
+        return !isView;
 
     const ValueType tokType = ValueType::parseDecl(tok->valueType()->containerTypeToken, settings);
     return contType.isTypeEqual(&tokType) || tokType.type == ValueType::Type::UNKNOWN_TYPE;
@@ -6643,7 +6662,7 @@ static std::vector<ValueFlow::Value> getInitListSize(const Token* tok,
                 initList = true;
             else if (vt.isIntegral() && astIsIntegral(args[0], false))
                 initList = true;
-            else if (args.size() == 1 && valueFlowIsSameContainerType(vt, tok->astOperand2(), settings))
+            else if (args.size() == 1 && valueFlowIsSameContainerType(vt, tok->astOperand2(), valueType->container->view, settings))
                 initList = false; // copy ctor
             else if (args.size() == 2 && (!args[0]->valueType() || !args[1]->valueType())) // might be unknown iterators
                 initList = false;
@@ -6812,6 +6831,30 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
                 }
                 for (const ValueFlow::Value& value : values)
                     setTokenValue(tok, value, settings);
+            }
+            else if (Token::Match(tok->previous(), ",|(") && (Token::Match(tok, "{|%str%") || settings.library.detectContainer(tok))) {
+                if (Token* argTok = tok->previous()->astOperand2()) {
+                    int nArg{};
+                    if (const Token* funcTok = getTokenArgumentFunction(argTok, nArg)) {
+                        if (const Function* func = funcTok->function()) {
+                            if (const Variable* var = func->getArgumentVar(nArg)) {
+                                if (var->valueType() && var->valueType()->container && var->valueType()->container->size_templateArgNo < 0) {
+                                    auto values = argTok->tokType() == Token::Type::eString
+                                        ? std::vector<ValueFlow::Value>{makeContainerSizeValue(Token::getStrLength(argTok))}
+                                    : getInitListSize(argTok, var->valueType(), settings, true);
+                                    ValueFlow::Value tokValue;
+                                    tokValue.valueType = ValueFlow::Value::ValueType::TOK;
+                                    tokValue.tokvalue = argTok;
+                                    tokValue.setKnown();
+                                    values.push_back(std::move(tokValue));
+
+                                    for (const ValueFlow::Value& value : values)
+                                        setTokenValue(argTok, value, settings);
+                                }
+                            }
+                        }
+                    }
+                }
             } else if (Token::Match(tok, ";|{|} %var% =") && Token::Match(tok->tokAt(2)->astOperand2(), "[({]") &&
                        // init list
                        ((tok->tokAt(2) == tok->tokAt(2)->astOperand2()->astParent() && !tok->tokAt(2)->astOperand2()->astOperand2() && tok->tokAt(2)->astOperand2()->str() == "{") ||
@@ -6857,17 +6900,17 @@ static void valueFlowContainerSize(const TokenList& tokenlist,
             } else if (tok->str() == "+=" && astIsContainer(tok->astOperand1())) {
                 const Token* containerTok = tok->astOperand1();
                 const Token* valueTok = tok->astOperand2();
-                const MathLib::bigint size = ValueFlow::valueFlowGetStrLength(valueTok);
+                const MathLib::bigint size = ValueFlow::valueFlowGetStrLength(valueTok, settings.library);
                 forwardMinimumContainerSize(size, tok, containerTok);
 
             } else if (tok->str() == "=" && Token::simpleMatch(tok->astOperand2(), "+") && astIsContainerString(tok)) {
                 const Token* tok2 = tok->astOperand2();
                 MathLib::bigint size = 0;
                 while (Token::simpleMatch(tok2, "+") && tok2->astOperand2()) {
-                    size += ValueFlow::valueFlowGetStrLength(tok2->astOperand2());
+                    size += ValueFlow::valueFlowGetStrLength(tok2->astOperand2(), settings.library);
                     tok2 = tok2->astOperand1();
                 }
-                size += ValueFlow::valueFlowGetStrLength(tok2);
+                size += ValueFlow::valueFlowGetStrLength(tok2, settings.library);
                 forwardMinimumContainerSize(size, tok, tok->astOperand1());
             }
         }
@@ -6983,6 +7026,12 @@ static void valueFlowDynamicBufferSize(const TokenList& tokenlist, const SymbolD
     auto getBufferSizeFromNew = [&](const Token* newTok) -> MathLib::bigint {
         MathLib::bigint sizeValue = -1, numElem = -1;
 
+        // ::operator new(size_t size)
+        if (Token::Match(newTok->astOperand1(), "::| operatornew")) {
+            const Token *sizeTok = newTok->astOperand2();
+            return sizeTok->hasKnownIntValue() ? sizeTok->getKnownIntValue() : -1;
+        }
+
         if (newTok && newTok->astOperand1()) { // number of elements
             const Token* bracTok = nullptr, *typeTok = nullptr;
             if (newTok->astOperand1()->str() == "[")
@@ -7006,8 +7055,9 @@ static void valueFlowDynamicBufferSize(const TokenList& tokenlist, const SymbolD
             if (!typeTok || !typeTok->varId())
                 typeTok = newTok->astParent()->previous(); // hack for "int** z = ..."
             if (typeTok && typeTok->valueType()) {
-                const MathLib::bigint typeSize = typeTok->valueType()->typeSize(settings.platform, typeTok->valueType()->pointer > 1);
-                if (typeSize >= 0)
+                const auto sizeOf = typeTok->valueType()->pointer > 1 ? ValueType::SizeOf::Pointer : ValueType::SizeOf::Pointee;
+                const size_t typeSize = typeTok->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, sizeOf);
+                if (typeSize > 0 || numElem == 0)
                     sizeValue = numElem * typeSize;
             }
         }
@@ -7028,7 +7078,7 @@ static void valueFlowDynamicBufferSize(const TokenList& tokenlist, const SymbolD
             if (!rhs)
                 continue;
 
-            const bool isNew = rhs->isCpp() && rhs->str() == "new";
+            const bool isNew = rhs->isCpp() && (rhs->str() == "new" || (rhs->str() == "(" && Token::Match(rhs->astOperand1(), "::| operatornew")));
             if (!isNew && !Token::Match(rhs->previous(), "%name% ("))
                 continue;
 
@@ -7052,8 +7102,8 @@ static bool getMinMaxValues(const std::string& typestr,
                             MathLib::bigint& maxvalue)
 {
     TokenList typeTokens(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
-    std::istringstream istr(typestr + ";");
-    if (!typeTokens.createTokens(istr))
+    const std::string str(typestr + ";\n");
+    if (!typeTokens.createTokensFromBuffer(str.data(), str.size()))
         return false;
     typeTokens.simplifyPlatformTypes();
     typeTokens.simplifyStdType();
@@ -7095,8 +7145,8 @@ static void valueFlowSafeFunctions(const TokenList& tokenlist, const SymbolDatab
             }
 
             MathLib::bigint low, high;
-            bool isLow = arg.nameToken()->getCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::LOW, low);
-            bool isHigh = arg.nameToken()->getCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::HIGH, high);
+            bool isLow = arg.nameToken()->getCppcheckAttribute(Token::CppcheckAttributesType::LOW, low);
+            bool isHigh = arg.nameToken()->getCppcheckAttribute(Token::CppcheckAttributesType::HIGH, high);
 
             if (!isLow && !isHigh && !all)
                 continue;
@@ -7220,7 +7270,7 @@ static void valueFlowDebug(TokenList& tokenlist, ErrorLogger& errorLogger, const
             ErrorPath errorPath = v.errorPath;
             errorPath.insert(errorPath.end(), v.debugPath.cbegin(), v.debugPath.cend());
             errorPath.emplace_back(tok, "");
-            errorLogger.reportErr({errorPath, &tokenlist, Severity::debug, "valueFlow", msg, CWE{0}, Certainty::normal});
+            errorLogger.reportErr({std::move(errorPath), &tokenlist, Severity::debug, "valueFlow", msg, CWE{0}, Certainty::normal});
         }
     }
 }
@@ -7275,7 +7325,7 @@ struct ValueFlowPassRunner {
     bool run_once(std::initializer_list<ValuePtr<ValueFlowPass>> passes) const
     {
         return std::any_of(passes.begin(), passes.end(), [&](const ValuePtr<ValueFlowPass>& pass) {
-            return run(pass);
+            return run(pass, 0);
         });
     }
 
@@ -7283,10 +7333,16 @@ struct ValueFlowPassRunner {
     {
         std::size_t values = 0;
         std::size_t n = state.settings.vfOptions.maxIterations;
+        const bool doProgress = state.settings.reportProgress >= 0;
         while (n > 0 && values != getTotalValues()) {
             values = getTotalValues();
+            const std::size_t passnum = state.settings.vfOptions.maxIterations - n + 1;
+            const std::string passnum_s = std::to_string(passnum);
             if (std::any_of(passes.begin(), passes.end(), [&](const ValuePtr<ValueFlowPass>& pass) {
-                return run(pass);
+                // the string concatination is a hot spot in TestIO::testScanfArgument and TestIO::testPrintfArgumentVariables
+                std::string stage = doProgress ? std::string("ValueFlow::") + pass->name() + (' ' + passnum_s) : "";
+                ProgressReporter progressReporter(state.errorLogger, state.settings.reportProgress, state.tokenlist.getSourceFilePath(), std::move(stage));
+                return run(pass, passnum);
             }))
                 return true;
             --n;
@@ -7306,7 +7362,7 @@ struct ValueFlowPassRunner {
         return false;
     }
 
-    bool run(const ValuePtr<ValueFlowPass>& pass) const
+    bool run(const ValuePtr<ValueFlowPass>& pass, std::size_t it) const
     {
         auto start = Clock::now();
         if (start > stop) {
@@ -7316,7 +7372,12 @@ struct ValueFlowPassRunner {
         if (!state.tokenlist.isCPP() && pass->cpp())
             return false;
         if (timerResults) {
-            Timer t(pass->name(), state.settings.showtime, timerResults);
+            std::string name = pass->name();
+            if (it > 0) {
+                name += ' ';
+                name += std::to_string(it);
+            }
+            Timer t(name, timerResults);
             pass->run(state);
         } else {
             pass->run(state);
@@ -7429,6 +7490,8 @@ void ValueFlow::setValues(TokenList& tokenlist,
                           const Settings& settings,
                           TimerResultsIntf* timerResults)
 {
+    ProgressReporter progressReporter(errorLogger, settings.reportProgress, tokenlist.getSourceFilePath(), "ValueFlow");
+
     for (Token* tok = tokenlist.front(); tok; tok = tok->next())
         tok->clearValueFlow();
 
@@ -7446,7 +7509,7 @@ void ValueFlow::setValues(TokenList& tokenlist,
 
     ValueFlowPassRunner runner{ValueFlowState{tokenlist, symboldatabase, errorLogger, settings}, timerResults};
     runner.run_once({
-        VFA(valueFlowEnumValue(symboldatabase, settings)),
+        VFA(valueFlowEnumValueEarly(symboldatabase, settings)),
         VFA(valueFlowNumber(tokenlist, settings)),
         VFA(valueFlowString(tokenlist, settings)),
         VFA(valueFlowTypeTraits(tokenlist, settings)),
@@ -7479,6 +7542,7 @@ void ValueFlow::setValues(TokenList& tokenlist,
         VFA(valueFlowInferCondition(tokenlist, settings)),
         VFA(valueFlowSwitchVariable(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowForLoop(tokenlist, symboldatabase, errorLogger, settings)),
+        VFA(valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowFunctionReturn(tokenlist, errorLogger, settings)),
         VFA(valueFlowLifetime(tokenlist, errorLogger, settings)),
@@ -7495,7 +7559,6 @@ void ValueFlow::setValues(TokenList& tokenlist,
     });
 
     runner.run_once({
-        VFA(valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowDebug(tokenlist, errorLogger, settings)), // TODO: add option to print it after each step/iteration
     });
 }
diff --git a/lib/valueflow.h b/lib/valueflow.h
index af3715e474a..f701f55c418 100644
--- a/lib/valueflow.h
+++ b/lib/valueflow.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,7 +25,6 @@
 #include "errortypes.h"
 #include "mathlib.h"
 
-#include <cstdlib>
 #include <functional>
 #include <list>
 #include <string>
@@ -38,7 +37,6 @@ class SymbolDatabase;
 class TimerResultsIntf;
 class Token;
 class TokenList;
-class ValueType;
 class Variable;
 class Scope;
 
@@ -60,8 +58,6 @@ namespace ValueFlow {
 
     std::string eitherTheConditionIsRedundant(const Token *condition);
 
-    size_t getSizeOf(const ValueType &vt, const Settings &settings, int maxRecursion = 0);
-
     const Value* findValue(const std::list<Value>& values,
                            const Settings& settings,
                            const std::function<bool(const Value&)> &pred);
diff --git a/lib/valueptr.h b/lib/valueptr.h
index 5c2ce55bedf..b6f02ef1186 100644
--- a/lib/valueptr.h
+++ b/lib/valueptr.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -37,6 +37,7 @@ class CPPCHECKLIB ValuePtr {
 public:
     using pointer = T*;
     using element_type = T;
+    // cppcheck-suppress simplifyUsing - TODO: fix this
     using cloner_type = decltype(&cloner<T>::apply);
 
     ValuePtr() : mPtr(nullptr), mClone() {}
@@ -52,12 +53,12 @@ class CPPCHECKLIB ValuePtr {
             mPtr.reset(mClone(rhs.get()));
         }
     }
-    ValuePtr(ValuePtr&& rhs) NOEXCEPT : mPtr(std::move(rhs.mPtr)), mClone(std::move(rhs.mClone)) {}
+    ValuePtr(ValuePtr&& rhs) noexcept : mPtr(std::move(rhs.mPtr)), mClone(std::move(rhs.mClone)) {}
 
-    T* get() NOEXCEPT {
+    T* get() noexcept {
         return mPtr.get();
     }
-    const T* get() const NOEXCEPT {
+    const T* get() const noexcept {
         return mPtr.get();
     }
 
@@ -68,14 +69,14 @@ class CPPCHECKLIB ValuePtr {
         return *get();
     }
 
-    T* operator->() NOEXCEPT {
+    T* operator->() noexcept {
         return get();
     }
-    const T* operator->() const NOEXCEPT {
+    const T* operator->() const noexcept {
         return get();
     }
 
-    void swap(ValuePtr& rhs) NOEXCEPT {
+    void swap(ValuePtr& rhs) noexcept {
         using std::swap;
         swap(mPtr, rhs.mPtr);
         swap(mClone, rhs.mClone);
@@ -87,7 +88,7 @@ class CPPCHECKLIB ValuePtr {
     }
 
     // NOLINTNEXTLINE(google-explicit-constructor)
-    operator bool() const NOEXCEPT {
+    operator bool() const noexcept {
         return !!mPtr;
     }
 
diff --git a/lib/version.h b/lib/version.h
index 47d11531e08..6d25dd4c158 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,26 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// For a release version x.y.z the MAJOR should be x and both MINOR and DEVMINOR should be y.
-// After a release the DEVMINOR is incremented. MAJOR=x MINOR=y, DEVMINOR=y+1
 
 #ifndef versionH
 #define versionH
 
-#define CPPCHECK_MAJOR_VERSION 2
-#define CPPCHECK_MINOR_VERSION 17
-#define CPPCHECK_DEVMINOR_VERSION 18
-#define CPPCHECK_BUGFIX_VERSION 99
+#define CPPCHECK_VERSION_STRING "2.22 dev"
+#define CPPCHECK_VERSION 2,21,99,0
 
-#define STRINGIFY(x) STRING(x)
-#define STRING(VER) #VER
-#if CPPCHECK_BUGFIX_VERSION < 99
-#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_MINOR_VERSION) "." STRINGIFY(CPPCHECK_BUGFIX_VERSION)
-#define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,CPPCHECK_BUGFIX_VERSION,0
-#else
-#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_DEVMINOR_VERSION) " dev"
-#define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,99,0
-#endif
-#define LEGALCOPYRIGHT L"Copyright (C) 2007-2024 Cppcheck team."
+#define LEGALCOPYRIGHT L"Copyright (C) 2007-2026 Cppcheck team."
 
 #endif
diff --git a/lib/vf_analyzers.cpp b/lib/vf_analyzers.cpp
index 5b8bd4aa1ec..cc4a6a820cf 100644
--- a/lib/vf_analyzers.cpp
+++ b/lib/vf_analyzers.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -115,33 +115,36 @@ struct ValueFlowAnalyzer : Analyzer {
 
     ConditionState analyzeCondition(const Token* tok, int depth = 20) const
     {
-        ConditionState result;
         if (!tok)
-            return result;
+            return {};
         if (depth < 0)
-            return result;
+            return {};
         depth--;
         if (analyze(tok, Direction::Forward).isRead()) {
+            ConditionState result;
             result.dependent = true;
             result.unknown = false;
             return result;
         }
         if (tok->hasKnownIntValue() || tok->isLiteral()) {
+            ConditionState result;
             result.dependent = false;
             result.unknown = false;
             return result;
         }
         if (Token::Match(tok, "%cop%")) {
             if (isLikelyStream(tok->astOperand1())) {
+                ConditionState result;
                 result.dependent = false;
                 return result;
             }
             ConditionState lhs = analyzeCondition(tok->astOperand1(), depth - 1);
-            if (lhs.isUnknownDependent())
+            if (lhs.isUnknownDependent() || !tok->astOperand2())
                 return lhs;
             ConditionState rhs = analyzeCondition(tok->astOperand2(), depth - 1);
             if (rhs.isUnknownDependent())
                 return rhs;
+            ConditionState result;
             if (Token::Match(tok, "%comp%"))
                 result.dependent = lhs.dependent && rhs.dependent;
             else
@@ -154,6 +157,7 @@ struct ValueFlowAnalyzer : Analyzer {
             if (Token::Match(tok->tokAt(-2), ". %name% (")) {
                 args.push_back(tok->tokAt(-2)->astOperand1());
             }
+            ConditionState result;
             result.dependent = std::any_of(args.cbegin(), args.cend(), [&](const Token* arg) {
                 ConditionState cs = analyzeCondition(arg, depth - 1);
                 return cs.dependent;
@@ -167,6 +171,7 @@ struct ValueFlowAnalyzer : Analyzer {
         }
 
         std::unordered_map<nonneg int, const Token*> symbols = getSymbols(tok);
+        ConditionState result;
         result.dependent = false;
         for (auto&& p : symbols) {
             const Token* arg = p.second;
@@ -202,12 +207,11 @@ struct ValueFlowAnalyzer : Analyzer {
     }
 
     virtual Action isModified(const Token* tok) const {
-        const Action read = Action::Read;
         const ValueFlow::Value* value = getValue(tok);
         if (value) {
             // Moving a moved value won't change the moved value
             if (value->isMovedValue() && isMoveOrForward(tok) != ValueFlow::Value::MoveKind::NonMovedVariable)
-                return read;
+                return Action::Read;
             // Inserting elements to container won't change the lifetime
             if (astIsContainer(tok) && value->isLifetimeValue() &&
                 contains({Library::Container::Action::PUSH,
@@ -215,16 +219,16 @@ struct ValueFlowAnalyzer : Analyzer {
                           Library::Container::Action::APPEND,
                           Library::Container::Action::CHANGE_INTERNAL},
                          astContainerAction(tok, getSettings().library)))
-                return read;
+                return Action::Read;
         }
         bool inconclusive = false;
-        if (isVariableChangedByFunctionCall(tok, getIndirect(tok), getSettings(), &inconclusive))
-            return read | Action::Invalid;
+        if (isVariableChangedByFunctionCall(tok, getIndirect(tok), getSettings().library, &inconclusive))
+            return Action::Read | Action::Invalid;
         if (inconclusive)
-            return read | Action::Inconclusive;
+            return Action::Read | Action::Inconclusive;
         if (isVariableChanged(tok, getIndirect(tok), getSettings())) {
             if (Token::Match(tok->astParent(), "*|[|.|++|--"))
-                return read | Action::Invalid;
+                return Action::Read | Action::Invalid;
             // Check if its assigned to the same value
             if (value && !value->isImpossible() && Token::simpleMatch(tok->astParent(), "=") && astIsLHS(tok) &&
                 astIsIntegral(tok->astParent()->astOperand2(), false)) {
@@ -234,7 +238,7 @@ struct ValueFlowAnalyzer : Analyzer {
             }
             return Action::Invalid;
         }
-        return read;
+        return Action::Read;
     }
 
     virtual Action isAliasModified(const Token* tok, int indirect = -1) const {
@@ -351,7 +355,7 @@ struct ValueFlowAnalyzer : Analyzer {
             /* Truncate value */
             const ValueType *dst = tok->valueType();
             if (dst) {
-                const size_t sz = ValueFlow::getSizeOf(*dst, settings);
+                const size_t sz = dst->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
                 if (sz > 0 && sz < sizeof(MathLib::biguint)) {
                     MathLib::bigint newvalue = ValueFlow::truncateIntValue(value->intvalue, sz, dst->sign);
 
@@ -602,6 +606,8 @@ struct ValueFlowAnalyzer : Analyzer {
             for (const ValueFlow::Value& v:ref->astOperand1()->values()) {
                 if (!v.isLocalLifetimeValue())
                     continue;
+                if (v.conditional)
+                    continue;
                 if (lifeTok)
                     return Action::None;
                 lifeTok = v.tokvalue;
@@ -641,7 +647,8 @@ struct ValueFlowAnalyzer : Analyzer {
         if (invalid())
             return Action::Invalid;
         // Follow references
-        auto refs = followAllReferences(tok);
+        // TODO: avoid copy
+        auto refs = tok->refs();
         const bool inconclusiveRefs = refs.size() != 1;
         if (std::none_of(refs.cbegin(), refs.cend(), [&](const ReferenceToken& ref) {
             return tok == ref.token;
@@ -666,21 +673,25 @@ struct ValueFlowAnalyzer : Analyzer {
     }
 
     template<class F>
-    std::vector<MathLib::bigint> evaluateInt(const Token* tok, F getProgramMemory) const
+    std::vector<MathLib::bigint> evaluateInt(const Token* tok, F getProgramMemoryFunc) const
     {
         if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT))
-            return {static_cast<int>(v->intvalue)};
+            return {v->intvalue};
         std::vector<MathLib::bigint> result;
-        ProgramMemory pm = getProgramMemory();
+        // Pass the tracked values so a cached program-memory value that depends on one (e.g. 'h(p)'
+        // after 'p' was reassigned) is re-evaluated rather than served stale. The memory is built
+        // from the same state, so compute it once and hand it to the builder.
+        const ProgramState vars = getProgramState();
+        ProgramMemory pm = getProgramMemoryFunc(vars);
         if (Token::Match(tok, "&&|%oror%")) {
-            if (conditionIsTrue(tok, pm, getSettings()))
+            if (conditionIsTrue(tok, pm, getSettings(), vars))
                 result.push_back(1);
-            if (conditionIsFalse(tok, std::move(pm), getSettings()))
+            if (conditionIsFalse(tok, std::move(pm), getSettings(), vars))
                 result.push_back(0);
         } else {
             MathLib::bigint out = 0;
             bool error = false;
-            execute(tok, pm, &out, &error, getSettings());
+            execute(tok, pm, &out, &error, getSettings(), vars);
             if (!error)
                 result.push_back(out);
         }
@@ -689,16 +700,16 @@ struct ValueFlowAnalyzer : Analyzer {
 
     std::vector<MathLib::bigint> evaluateInt(const Token* tok) const
     {
-        return evaluateInt(tok, [&] {
-            return ProgramMemory{getProgramState()};
+        return evaluateInt(tok, [](const ProgramState& vars) {
+            return ProgramMemory{vars};
         });
     }
 
     std::vector<MathLib::bigint> evaluate(Evaluate e, const Token* tok, const Token* ctx = nullptr) const override
     {
         if (e == Evaluate::Integral) {
-            return evaluateInt(tok, [&] {
-                return pms.get(tok, ctx, getProgramState());
+            return evaluateInt(tok, [&](const ProgramState& vars) {
+                return pms.get(tok, ctx, vars);
             });
         }
         if (e == Evaluate::ContainerEmpty) {
@@ -710,36 +721,49 @@ struct ValueFlowAnalyzer : Analyzer {
             ProgramMemory pm = pms.get(tok, ctx, getProgramState());
             MathLib::bigint out = 0;
             if (pm.getContainerEmptyValue(tok->exprId(), out))
-                return {static_cast<int>(out)};
+                return {out};
             return {};
         }
         return {};
     }
 
-    void assume(const Token* tok, bool state, unsigned int flags) override {
-        // Update program state
-        pms.removeModifiedVars(tok);
-        pms.addState(tok, getProgramState());
-        pms.assume(tok, state, flags & Assume::ContainerEmpty);
-
+    void assume(const Token* tok, bool state, unsigned int flags) override
+    {
         bool isCondBlock = false;
         const Token* parent = tok->astParent();
         if (parent) {
             isCondBlock = Token::Match(parent->previous(), "if|while (");
         }
 
+        const Token* endBlock = nullptr;
         if (isCondBlock) {
             const Token* startBlock = parent->link()->next();
             if (Token::simpleMatch(startBlock, ";") && Token::simpleMatch(parent->tokAt(-2), "} while ("))
                 startBlock = parent->linkAt(-2);
-            const Token* endBlock = startBlock->link();
-            if (state) {
-                pms.removeModifiedVars(endBlock);
-                pms.addState(endBlock->previous(), getProgramState());
-            } else {
-                if (Token::simpleMatch(endBlock, "} else {"))
-                    pms.addState(endBlock->linkAt(2)->previous(), getProgramState());
-            }
+            endBlock = startBlock->link();
+        }
+
+        // Without Pending the 'then' block has been traversed and control is leaving it, so anchor
+        // the assumed state at the block end instead of the condition. That keeps assumptions on
+        // variables modified inside the block (e.g. an 'if' narrowing a value computed there) from
+        // being discarded as "modified" once control leaves the block.
+        const bool scopeEnd = !(flags & Assume::Pending) && state && endBlock;
+        const Token* anchor = scopeEnd ? endBlock : tok;
+        const Token* origin = scopeEnd ? endBlock : nullptr;
+
+        // Update program state
+        pms.removeModifiedVars(anchor);
+        pms.addState(anchor, getProgramState());
+        pms.assume(tok, state, flags & Assume::ContainerEmpty, origin);
+
+        // The false path (the true path uses scopeEnd above): record the assumed state where control
+        // continues - the end of the else block, or the closing brace when there is no else - so it
+        // reaches the enclosing scope.
+        if (isCondBlock && !(flags & Assume::Pending) && !state) {
+            if (Token::simpleMatch(endBlock, "} else {"))
+                pms.addState(endBlock->linkAt(2)->previous(), getProgramState());
+            else
+                pms.addState(endBlock, getProgramState());
         }
 
         if (!(flags & Assume::Quiet)) {
@@ -832,6 +856,8 @@ static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, cons
         const Variable* var = tok->variable();
         if (!var)
             return false;
+        if (!var->isLocal() && !var->isArgument())
+            return false;
         const Token* start = var->declEndToken();
         if (!start)
             return false;
@@ -935,8 +961,11 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
     MultiValueFlowAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const Settings& set)
         : ValueFlowAnalyzer(set) {
         for (const auto& p:args) {
-            values[p.first->declarationId()] = p.second;
-            vars[p.first->declarationId()] = p.first;
+            const auto declId = p.first->declarationId();
+            if (declId == 0)
+                continue; // TODO: should never happen?
+            values[declId] = p.second;
+            vars[declId] = p.first;
         }
     }
 
@@ -1069,6 +1098,7 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
             const Variable* var = vars.at(p.first);
             if (!var)
                 continue;
+            assert(var->nameToken());
             ps[var->nameToken()] = p.second;
         }
         return ps;
@@ -1185,18 +1215,40 @@ struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
 
     bool stopOnCondition(const Token* condTok) const override
     {
-        if (value.isNonValue())
-            return false;
         if (value.isImpossible())
             return false;
-        if (isConditional() && !value.isKnown() && !value.isImpossible())
+        // lifetime values must keep flowing to properly track aliases
+        if (value.isLifetimeValue())
+            return false;
+        // 'conditional' flag (uninit, or lowered after a modifying branch): may depend on a
+        // condition that doesn't mention the variable -> stop
+        if (value.conditional && !value.isKnown())
             return true;
-        if (value.isSymbolicValue())
+        if (value.isNonValue())
             return false;
+        if (value.isSymbolicValue())
+            return isConditional() && !value.isKnown();
+        // conditional via the originating 'condition' (e.g. possible null after 'if (p && ...)'): only flow
+        // if the condition references the value, else a correlation we can't follow (e.g.
+        // 'bool ok = (p != nullptr); if (!ok)') could make a later deref safe -> stop
+        if (value.condition && !value.isKnown() && !conditionReferencesValue(condTok))
+            return true;
         ConditionState cs = analyzeCondition(condTok);
         return cs.isUnknownDependent();
     }
 
+    // Does the condition mention the tracked value, either directly or through a symbolic alias?
+    bool conditionReferencesValue(const Token* condTok) const
+    {
+        return findAstNode(condTok, [&](const Token* tok) {
+            if (match(tok))
+                return true;
+            return std::any_of(tok->values().cbegin(), tok->values().cend(), [&](const ValueFlow::Value& v) {
+                return v.isSymbolicValue() && !v.isImpossible() && v.tokvalue && match(v.tokvalue);
+            });
+        }) != nullptr;
+    }
+
     bool updateScope(const Token* endBlock, bool /*modified*/) const override {
         const Scope* scope = endBlock->scope();
         if (!scope)
@@ -1220,6 +1272,7 @@ struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
         return false;
     }
 
+private:
     ValuePtr<Analyzer> reanalyze(Token* tok, const std::string& msg) const override {
         ValueFlow::Value newValue = value;
         newValue.errorPath.emplace_back(tok, msg);
@@ -1246,6 +1299,12 @@ struct ExpressionAnalyzer : SingleValueFlowAnalyzer {
             dependOnThis |= exprDependsOnThis(value.tokvalue);
             setupExprVarIds(value.tokvalue);
         }
+        if (value.isContainerSizeValue() && value.container) {
+            // a container size tracked through another expression (e.g. a pointer obtained from
+            // data()) is invalidated by writes to the container it belongs to
+            dependOnThis |= exprDependsOnThis(value.container);
+            setupExprVarIds(value.container);
+        }
         uniqueExprId =
             expr->isUniqueExprId() && (Token::Match(expr, "%cop%") || !isVariableChanged(expr, 0, s));
     }
@@ -1418,6 +1477,7 @@ struct SubExpressionAnalyzer : ExpressionAnalyzer {
         partialReads->emplace_back(tok, v);
     }
 
+private:
     // No reanalysis for subexpression
     ValuePtr<Analyzer> reanalyze(Token* /*tok*/, const std::string& /*msg*/) const override {
         return {};
@@ -1449,15 +1509,22 @@ ValuePtr<Analyzer> makeMemberExpressionAnalyzer(std::string varname, const Token
 struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
     ContainerExpressionAnalyzer(const Token* expr, ValueFlow::Value val, const Settings& s)
         : ExpressionAnalyzer(expr, std::move(val), s)
-    {}
+    {
+        // The size of a container expression belongs to that expression. Through a pointer the
+        // size keeps belonging to the container the pointer was obtained from.
+        if (astIsContainer(expr) && !astIsPointer(expr))
+            value.container = expr;
+    }
 
     bool match(const Token* tok) const override {
-        return tok->exprId() == expr->exprId() || (astIsIterator(tok) && isAliasOf(tok, expr->exprId()));
+        return tok->exprId() == expr->exprId() || isIteratorOf(tok, expr->exprId());
     }
 
     Action isWritable(const Token* tok, Direction /*d*/) const override
     {
-        if (astIsIterator(tok))
+        // only writes to the container itself change its size - not writes through an iterator
+        // or to a default-inserted element
+        if (tok->exprId() != expr->exprId())
             return Action::None;
         if (!getValue(tok))
             return Action::None;
@@ -1483,7 +1550,12 @@ struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
             const Library::Container::Action action = container->getAction(tok->astParent()->strAt(1));
             if (action == Library::Container::Action::PUSH || action == Library::Container::Action::POP || action == Library::Container::Action::APPEND) { // TODO: handle more actions?
                 std::vector<const Token*> args = getArguments(tok->tokAt(3));
-                if (args.size() < 2 || action == Library::Container::Action::APPEND)
+                bool isVariadic = false;
+                if (const Library::Function* libFunc = settings.library.getFunction(tok->tokAt(2))) {
+                    const auto& argChecks = libFunc->argumentChecks;
+                    isVariadic = argChecks.find(-1) != argChecks.end() && argChecks.at(-1).variadic;
+                }
+                if (args.size() < 2 || action == Library::Container::Action::APPEND || isVariadic)
                     return Action::Read | Action::Write | Action::Incremental;
             }
         }
@@ -1527,7 +1599,7 @@ struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
             case Library::Container::Action::APPEND: {
                 std::vector<const Token*> args = getArguments(tok->astParent()->tokAt(2));
                 if (args.size() == 1) // TODO: handle overloads
-                    n = ValueFlow::valueFlowGetStrLength(tok->astParent()->tokAt(3));
+                    n = ValueFlow::valueFlowGetStrLength(tok->astParent()->tokAt(3), settings.library);
                 if (n == 0) // TODO: handle known empty append
                     val->setPossible();
                 break;
@@ -1551,17 +1623,16 @@ struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
     }
 
     Action isModified(const Token* tok) const override {
-        Action read = Action::Read;
         // An iterator won't change the container size
         if (astIsIterator(tok))
-            return read;
+            return Action::Read;
         if (Token::Match(tok->astParent(), "%assign%") && astIsLHS(tok))
             return Action::Invalid;
         if (isLikelyStreamRead(tok->astParent()))
             return Action::Invalid;
         if (astIsContainer(tok) && ValueFlow::isContainerSizeChanged(tok, getIndirect(tok), getSettings()))
-            return read | Action::Invalid;
-        return read;
+            return Action::Read | Action::Invalid;
+        return Action::Read;
     }
 };
 
diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
index 0c4f3028451..f9eecc20fb9 100644
--- a/lib/vf_common.cpp
+++ b/lib/vf_common.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,6 +19,7 @@
 #include "vf_common.h"
 
 #include "astutils.h"
+#include "library.h"
 #include "mathlib.h"
 #include "path.h"
 #include "platform.h"
@@ -26,7 +27,6 @@
 #include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
-#include "valueflow.h"
 #include "vfvalue.h"
 
 #include "vf_settokenvalue.h"
@@ -102,7 +102,7 @@ namespace ValueFlow
             return value;
 
         const MathLib::biguint unsignedMaxValue = std::numeric_limits<MathLib::biguint>::max() >> ((sizeof(unsignedMaxValue) - value_size) * 8);
-        const MathLib::biguint signBit = 1ULL << (value_size * 8 - 1);
+        const MathLib::biguint signBit = 1ULL << ((value_size * 8) - 1);
         value &= unsignedMaxValue;
         if (dst_sign == ValueType::Sign::SIGNED && (value & signBit))
             value |= ~unsignedMaxValue;
@@ -114,7 +114,7 @@ namespace ValueFlow
     {
         const ValueType &valueType = ValueType::parseDecl(typeTok, settings);
 
-        return getSizeOf(valueType, settings);
+        return valueType.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
     }
 
     // Handle various constants..
@@ -124,7 +124,9 @@ namespace ValueFlow
             try {
                 MathLib::bigint signedValue = MathLib::toBigNumber(tok);
                 const ValueType* vt = tok->valueType();
-                if (vt && vt->sign == ValueType::UNSIGNED && signedValue < 0 && getSizeOf(*vt, settings) < sizeof(MathLib::bigint)) {
+                if (vt && vt->sign == ValueType::UNSIGNED && signedValue < 0
+                    && vt->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer)
+                    < sizeof(MathLib::bigint)) {
                     MathLib::bigint minValue{}, maxValue{};
                     if (getMinMaxValues(tok->valueType(), settings.platform, minValue, maxValue))
                         signedValue += maxValue + 1;
@@ -148,17 +150,25 @@ namespace ValueFlow
             if (!tok->isTemplateArg())
                 value.setKnown();
             setTokenValue(tok, std::move(value), settings);
-        } else if (tok->str() == "NULL" || (tok->isCpp() && tok->str() == "nullptr")) {
+        } else if (tok->str() == "NULL" || ((tok->isCpp() || settings.standards.c >= Standards::C23) && tok->str() == "nullptr")) {
             Value value(0);
             if (!tok->isTemplateArg())
                 value.setKnown();
             setTokenValue(tok, std::move(value), settings);
+        } else if ((tok->isCpp() || settings.standards.c >= Standards::C23) && (tok->isName() && tok->varId() == 0 && Token::Match(tok, "%bool%"))) {
+            Value value(tok->str() == "true");
+            if (!tok->isTemplateArg())
+                value.setKnown();
+            setTokenValue(tok, std::move(value), settings);
         } else if (Token::simpleMatch(tok, "sizeof (")) {
-            if (tok->next()->astOperand2() && !tok->next()->astOperand2()->isLiteral() && tok->next()->astOperand2()->valueType() &&
-                (tok->next()->astOperand2()->valueType()->pointer == 0 || // <- TODO this is a bailout, abort when there are array->pointer conversions
-                 (tok->next()->astOperand2()->variable() && !tok->next()->astOperand2()->variable()->isArray())) &&
-                !tok->next()->astOperand2()->valueType()->isEnum()) { // <- TODO this is a bailout, handle enum with non-int types
-                const size_t sz = getSizeOf(*tok->next()->astOperand2()->valueType(), settings);
+            const Token* const obj = tok->next()->astOperand2();
+            if (obj && !obj->isLiteral() && obj->valueType() &&
+                (obj->valueType()->pointer == 0 || // <- TODO this is a bailout, abort when there are array->pointer conversions
+                 (obj->variable() && !obj->variable()->isArray())) &&
+                !obj->valueType()->isEnum() && // <- TODO this is a bailout, handle enum with non-int types
+                !(obj->valueType()->container && obj->valueType()->container->startPattern == "std :: array <")) {
+                const auto ptrPointee = obj->valueType()->pointer > 0 ? ValueType::SizeOf::Pointer : ValueType::SizeOf::Pointee;
+                const size_t sz = obj->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ptrPointee);
                 if (sz) {
                     Value value(sz);
                     value.setKnown();
@@ -177,7 +187,8 @@ namespace ValueFlow
             }
             if (Token::simpleMatch(tok, "sizeof ( *")) {
                 const ValueType *vt = tok->tokAt(2)->valueType();
-                const size_t sz = vt ? getSizeOf(*vt, settings) : 0;
+                const size_t sz = vt ? vt->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer)
+                                     : 0;
                 if (sz > 0) {
                     Value value(sz);
                     if (!tok2->isTemplateArg() && settings.platform.type != Platform::Type::Unspecified)
@@ -228,9 +239,7 @@ namespace ValueFlow
                     setTokenValue(tok->tokAt(4), std::move(value), settings);
                 }
             } else if (Token::Match(tok2, "%var% )")) {
-                const Variable *var = tok2->variable();
-                // only look for single token types (no pointers or references yet)
-                if (var && var->typeStartToken() == var->typeEndToken()) {
+                if (const Variable *var = tok2->variable()) {
                     // find the size of the type
                     size_t size = 0;
                     if (var->isEnumType()) {
@@ -238,7 +247,12 @@ namespace ValueFlow
                         if (var->type()->classScope && var->type()->classScope->enumType)
                             size = getSizeOfType(var->type()->classScope->enumType, settings);
                     } else if (var->valueType()) {
-                        size = getSizeOf(*var->valueType(), settings);
+                        if (var->valueType()->container && var->valueType()->container->startPattern == "std :: array <") {
+                            const ValueType vtElement = ValueType::parseDecl(var->valueType()->containerTypeToken, settings);
+                            size = vtElement.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                        }
+                        else
+                            size = var->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
                     } else if (!var->type()) {
                         size = getSizeOfType(var->typeStartToken(), settings);
                     }
@@ -287,7 +301,7 @@ namespace ValueFlow
                 }
             } else if (!tok2->type()) {
                 const ValueType& vt = ValueType::parseDecl(tok2, settings);
-                size_t sz = getSizeOf(vt, settings);
+                size_t sz = vt.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
                 const Token* brac = tok2->astParent();
                 while (Token::simpleMatch(brac, "[")) {
                     const Token* num = brac->astOperand2();
@@ -321,7 +335,7 @@ namespace ValueFlow
             if (!tok->isTemplateArg())
                 value.setKnown();
             setTokenValue(tok->next(), std::move(value), settings);
-        } else if (Token::simpleMatch(tok, "= { } ;")) {
+        } else if (Token::simpleMatch(tok, "= { }")) {
             const Token* lhs = tok->astOperand1();
             if (lhs && lhs->valueType() && (lhs->valueType()->isIntegral() || lhs->valueType()->pointer > 0)) {
                 Value value(0);
@@ -384,18 +398,24 @@ namespace ValueFlow
         v.debugPath.emplace_back(tok, std::move(s));
     }
 
-    MathLib::bigint valueFlowGetStrLength(const Token* tok)
+    MathLib::bigint valueFlowGetStrLength(const Token* tok, const Library& library)
     {
         if (tok->tokType() == Token::eString)
             return Token::getStrLength(tok);
         if (astIsGenericChar(tok) || tok->tokType() == Token::eChar)
             return 1;
-        if (const Value* v = tok->getKnownValue(Value::ValueType::CONTAINER_SIZE))
-            return v->intvalue;
+        if (const Value* v = tok->getKnownValue(Value::ValueType::CONTAINER_SIZE)) {
+            // on a pointer the size is the number of elements in the buffer (possibly including
+            // a null terminator), not the length of the string
+            if (!astIsPointer(tok))
+                return v->intvalue;
+        }
         if (const Value* v = tok->getKnownValue(Value::ValueType::TOK)) {
             if (v->tokvalue != tok)
-                return valueFlowGetStrLength(v->tokvalue);
+                return valueFlowGetStrLength(v->tokvalue, library);
         }
+        if (const Token* cont = library.getContainerFromYield(tok, Library::Container::Yield::BUFFER_NT))
+            return valueFlowGetStrLength(cont, library);
         return 0;
     }
 }
diff --git a/lib/vf_common.h b/lib/vf_common.h
index 7f3e1c17615..aca438a0dff 100644
--- a/lib/vf_common.h
+++ b/lib/vf_common.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -30,6 +30,7 @@
 class Token;
 class Settings;
 class Platform;
+class Library;
 
 namespace ValueFlow
 {
@@ -53,7 +54,7 @@ namespace ValueFlow
                            const Token* tok,
                            SourceLocation local = SourceLocation::current());
 
-    MathLib::bigint valueFlowGetStrLength(const Token* tok);
+    MathLib::bigint valueFlowGetStrLength(const Token* tok, const Library& library);
 }
 
 #endif // vfCommonH
diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
index b4c2c921559..9f56b57db0a 100644
--- a/lib/vf_settokenvalue.cpp
+++ b/lib/vf_settokenvalue.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -47,7 +47,7 @@
 
 namespace ValueFlow
 {
-    static Library::Container::Yield getContainerYield(Token* tok, const Settings& settings, Token*& parent)
+    static Library::Container::Yield getContainerYield(Token* tok, const Library& library, Token*& parent)
     {
         if (Token::Match(tok, ". %name% (") && tok->astParent() == tok->tokAt(2) && tok->astOperand1() &&
             tok->astOperand1()->valueType()) {
@@ -57,7 +57,7 @@ namespace ValueFlow
         }
         if (Token::Match(tok->previous(), "%name% (")) {
             parent = tok;
-            if (const Library::Function* f = settings.library.getFunction(tok->previous())) {
+            if (const Library::Function* f = library.getFunction(tok->previous())) {
                 return f->containerYield;
             }
         }
@@ -72,7 +72,7 @@ namespace ValueFlow
             return value;
         if (!parent->isBinaryOp())
             return value;
-        if (!parent->isConstOp())
+        if (!parent->isConstOp() && !parent->isAssignmentOp())
             return value;
         if (!astIsIntegral(parent->astOperand1(), false))
             return value;
@@ -83,19 +83,19 @@ namespace ValueFlow
         // If the sign is the same there is no truncation
         if (vt1->sign == vt2->sign)
             return value;
-        const size_t n1 = getSizeOf(*vt1, settings);
-        const size_t n2 = getSizeOf(*vt2, settings);
+        const size_t n1 = vt1->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+        const size_t n2 = vt2->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
         ValueType::Sign sign = ValueType::Sign::UNSIGNED;
         if (n1 < n2)
             sign = vt2->sign;
-        else if (n1 > n2)
+        else // (n1 >= n2)
             sign = vt1->sign;
         Value v = castValue(value, sign, std::max(n1, n2) * 8);
         v.wideintvalue = value.intvalue;
         return v;
     }
 
-    static const Token *getCastTypeStartToken(const Token *parent, const Settings& settings)
+    static const Token *getCastTypeStartToken(const Token *parent, const Library& library)
     {
         // TODO: This might be a generic utility function?
         if (!Token::Match(parent, "{|("))
@@ -114,7 +114,7 @@ namespace ValueFlow
                 ftok = ftok->next();
             while (Token::Match(ftok, "%name% ::"))
                 ftok = ftok->tokAt(2);
-            if (settings.library.isNotLibraryFunction(ftok))
+            if (library.isNotLibraryFunction(ftok))
                 return parent->next();
         }
         if (parent->astOperand2() && Token::Match(parent->astOperand1(), "const_cast|dynamic_cast|reinterpret_cast|static_cast <"))
@@ -126,32 +126,31 @@ namespace ValueFlow
         return value.isIntValue() || value.isFloatValue();
     }
 
-    static void setTokenValueCast(Token *parent, const ValueType &valueType, const Value &value, const Settings &settings)
+    static void setTokenValueCast(Token *parent, const ValueType &valueType, Value value, const Settings &settings)
     {
         if (valueType.pointer || value.isImpossible())
-            setTokenValue(parent,value,settings);
+            setTokenValue(parent,std::move(value),settings);
         else if (valueType.type == ValueType::Type::CHAR)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.char_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.char_bit), settings);
         else if (valueType.type == ValueType::Type::SHORT)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.short_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.short_bit), settings);
         else if (valueType.type == ValueType::Type::INT)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.int_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.int_bit), settings);
         else if (valueType.type == ValueType::Type::LONG)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.long_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.long_bit), settings);
         else if (valueType.type == ValueType::Type::LONGLONG)
-            setTokenValue(parent, castValue(value, valueType.sign, settings.platform.long_long_bit), settings);
+            setTokenValue(parent, castValue(std::move(value), valueType.sign, settings.platform.long_long_bit), settings);
         else if (valueType.isFloat() && isNumeric(value)) {
-            Value floatValue = value;
-            floatValue.valueType = Value::ValueType::FLOAT;
             if (value.isIntValue())
-                floatValue.floatValue = static_cast<double>(value.intvalue);
-            setTokenValue(parent, std::move(floatValue), settings);
+                value.floatValue = static_cast<double>(value.intvalue);
+            value.valueType = Value::ValueType::FLOAT;
+            setTokenValue(parent, std::move(value), settings);
         } else if (value.isIntValue()) {
             const long long charMax = settings.platform.signedCharMax();
             const long long charMin = settings.platform.signedCharMin();
             if (charMin <= value.intvalue && value.intvalue <= charMax) {
                 // unknown type, but value is small so there should be no truncation etc
-                setTokenValue(parent,value,settings);
+                setTokenValue(parent,std::move(value),settings);
             }
         }
     }
@@ -224,13 +223,19 @@ namespace ValueFlow
                        SourceLocation loc)
     {
         // Skip setting values that are too big since its ambiguous
-        if (!value.isImpossible() && value.isIntValue() && value.intvalue < 0 && astIsUnsigned(tok) &&
-            getSizeOf(*tok->valueType(), settings) >= sizeof(MathLib::bigint))
+        if (!value.isImpossible() && value.isIntValue() && value.intvalue < 0 && astIsUnsigned(tok)
+            && tok->valueType()->getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer)
+            >= sizeof(MathLib::bigint))
             return;
 
         if (!value.isImpossible() && value.isIntValue())
             value = truncateImplicitConversion(tok->astParent(), value, settings);
 
+        // a container size value on a container expression belongs to that expression, while a
+        // pointer or an iterator only transports the size of the container it was obtained from
+        if (value.isContainerSizeValue() && !astIsPointer(tok) && astIsContainer(tok))
+            value.container = tok;
+
         if (settings.debugnormal)
             setSourceLocation(value, loc, tok);
 
@@ -291,37 +296,55 @@ namespace ValueFlow
 
                         combineValueProperties(value1, value2, result);
 
-                        if (Token::simpleMatch(parent, "==") && result.intvalue)
+                        if (Token::simpleMatch(parent, "==") && result.intvalue && !(value1.intvalue == 0 && value2.intvalue == 0))
                             continue;
-                        if (Token::simpleMatch(parent, "!=") && !result.intvalue)
+                        if (Token::simpleMatch(parent, "!=") && !result.intvalue && !(value1.intvalue == 0 && value2.intvalue == 0))
                             continue;
 
                         setTokenValue(parent, std::move(result), settings);
                     }
                 }
             }
+            // an empty associative container implies that its default-inserted elements are empty as well
+            if (Token::simpleMatch(parent, "[") && astIsLHS(tok) && astIsContainer(parent) &&
+                tok->valueType()->container && tok->valueType()->container->stdAssociativeLike &&
+                !value.isImpossible() && value.intvalue == 0)
+                setTokenValue(parent, value, settings);
             Token* next = nullptr;
-            const Library::Container::Yield yields = getContainerYield(parent, settings, next);
+            const Library::Container::Yield yields = getContainerYield(parent, settings.library, next);
             if (yields == Library::Container::Yield::SIZE) {
                 value.valueType = Value::ValueType::INT;
+                value.container = nullptr;
+                setTokenValue(next, std::move(value), settings);
+            } else if (contains({Library::Container::Yield::BUFFER,
+                                 Library::Container::Yield::BUFFER_NT,
+                                 Library::Container::Yield::START_ITERATOR,
+                                 Library::Container::Yield::END_ITERATOR,
+                                 Library::Container::Yield::ITERATOR},
+                                yields)) {
+                // The returned pointer or iterator has as many elements available as the container
+                if (yields == Library::Container::Yield::BUFFER_NT)
+                    value.intvalue += 1; // ..plus the null terminator
                 setTokenValue(next, std::move(value), settings);
             } else if (yields == Library::Container::Yield::EMPTY) {
-                Value v(value);
-                v.valueType = Value::ValueType::INT;
-                v.bound = Value::Bound::Point;
+                const Value::Bound bound = value.bound;
+                const long long intvalue = value.intvalue;
+                value.valueType = Value::ValueType::INT;
+                value.container = nullptr;
+                value.bound = Value::Bound::Point;
                 if (value.isImpossible()) {
-                    if (value.intvalue == 0)
-                        v.setKnown();
-                    else if ((value.bound == Value::Bound::Upper && value.intvalue > 0) ||
-                             (value.bound == Value::Bound::Lower && value.intvalue < 0)) {
-                        v.intvalue = 0;
-                        v.setKnown();
+                    if (intvalue == 0)
+                        value.setKnown();
+                    else if ((bound == Value::Bound::Upper && intvalue > 0) ||
+                             (bound == Value::Bound::Lower && intvalue < 0)) {
+                        value.intvalue = 0;
+                        value.setKnown();
                     } else
-                        v.setPossible();
+                        value.setPossible();
                 } else {
-                    v.intvalue = !v.intvalue;
+                    value.intvalue = !value.intvalue;
                 }
-                setTokenValue(next, std::move(v), settings);
+                setTokenValue(next, std::move(value), settings);
             }
             return;
         }
@@ -345,45 +368,45 @@ namespace ValueFlow
                 setTokenValue(parent, std::move(value), settings);
                 return;
             }
-            Value pvalue = value;
             if (!value.subexpressions.empty() && Token::Match(parent, ". %var%")) {
                 if (contains(value.subexpressions, parent->strAt(1)))
-                    pvalue.subexpressions.clear();
+                    value.subexpressions.clear();
                 else
                     return;
             }
             if (parent->isUnaryOp("&")) {
-                pvalue.indirect++;
-                setTokenValue(parent, std::move(pvalue), settings);
+                value.indirect++;
+                setTokenValue(parent, std::move(value), settings);
             } else if (Token::Match(parent, ". %var%") && parent->astOperand1() == tok && parent->astOperand2()) {
-                if (parent->originalName() == "->" && pvalue.indirect > 0)
-                    pvalue.indirect--;
-                setTokenValue(parent->astOperand2(), std::move(pvalue), settings);
+                if (parent->originalName() == "->" && value.indirect > 0)
+                    value.indirect--;
+                setTokenValue(parent->astOperand2(), std::move(value), settings);
             } else if (Token::Match(parent->astParent(), ". %var%") && parent->astParent()->astOperand1() == parent) {
-                if (parent->astParent()->originalName() == "->" && pvalue.indirect > 0)
-                    pvalue.indirect--;
-                setTokenValue(parent->astParent()->astOperand2(), std::move(pvalue), settings);
-            } else if (parent->isUnaryOp("*") && pvalue.indirect > 0) {
-                pvalue.indirect--;
-                setTokenValue(parent, std::move(pvalue), settings);
+                if (parent->astParent()->originalName() == "->" && value.indirect > 0)
+                    value.indirect--;
+                setTokenValue(parent->astParent()->astOperand2(), std::move(value), settings);
+            } else if (parent->isUnaryOp("*") && value.indirect > 0) {
+                value.indirect--;
+                setTokenValue(parent, std::move(value), settings);
             }
             return;
         }
 
         // cast..
-        if (const Token *castType = getCastTypeStartToken(parent, settings)) {
+        if (const Token *castType = getCastTypeStartToken(parent, settings.library)) {
             if (contains({Value::ValueType::INT, Value::ValueType::SYMBOLIC}, value.valueType) &&
                 Token::simpleMatch(parent->astOperand1(), "dynamic_cast"))
                 return;
             const ValueType &valueType = ValueType::parseDecl(castType, settings);
-            if (value.isImpossible() && value.isIntValue() && value.intvalue < 0 && astIsUnsigned(tok) &&
-                valueType.sign == ValueType::SIGNED && tok->valueType() &&
-                getSizeOf(*tok->valueType(), settings) >= getSizeOf(valueType, settings))
+            if (value.isImpossible() && value.isIntValue() && value.intvalue < 0
+                && astIsUnsigned(tok) && valueType.sign == ValueType::SIGNED && tok->valueType()
+                && tok->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer)
+                >= valueType.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer))
                 return;
-            setTokenValueCast(parent, valueType, value, settings);
+            setTokenValueCast(parent, valueType, std::move(value), settings);
         }
 
-        else if (parent->str() == ":") {
+        else if (parent->str() == ":" && Token::simpleMatch(parent->astParent(), "?")) {
             setTokenValue(parent,std::move(value),settings);
         }
 
@@ -404,7 +427,6 @@ namespace ValueFlow
                 }
             } else if (!value.isImpossible()) {
                 // is condition only depending on 1 variable?
-                // cppcheck-suppress[variableScope] #8541
                 nonneg int varId = 0;
                 bool ret = false;
                 visitAstNodes(parent->astOperand1(),
@@ -420,11 +442,10 @@ namespace ValueFlow
                 if (ret)
                     return;
 
-                Value v(std::move(value));
-                v.conditional = true;
-                v.changeKnownToPossible();
+                value.conditional = true;
+                value.changeKnownToPossible();
 
-                setTokenValue(parent, std::move(v), settings);
+                setTokenValue(parent, std::move(value), settings);
             }
         }
 
@@ -484,17 +505,15 @@ namespace ValueFlow
                             continue;
                         result.valueType = Value::ValueType::FLOAT;
                     }
-                    const double floatValue1 = value1.isFloatValue() ? value1.floatValue : static_cast<double>(value1.intvalue);
-                    const double floatValue2 = value2.isFloatValue() ? value2.floatValue : static_cast<double>(value2.intvalue);
                     const bool isFloat = value1.isFloatValue() || value2.isFloatValue();
+                    if (isFloat && Token::Match(parent, "&|^|%|<<|>>|==|!=|%or%"))
+                        continue;
                     const auto intValue1 = [&]() -> MathLib::bigint {
                         return value1.isFloatValue() ? static_cast<MathLib::bigint>(value1.floatValue) : value1.intvalue;
                     };
                     const auto intValue2 = [&]() -> MathLib::bigint {
                         return value2.isFloatValue() ? static_cast<MathLib::bigint>(value2.floatValue) : value2.intvalue;
                     };
-                    if ((value1.isFloatValue() || value2.isFloatValue()) && Token::Match(parent, "&|^|%|<<|>>|==|!=|%or%"))
-                        continue;
                     if (Token::Match(parent, "==|!=")) {
                         if ((value1.isIntValue() && value2.isTokValue()) || (value1.isTokValue() && value2.isIntValue())) {
                             if (parent->str() == "==")
@@ -549,6 +568,8 @@ namespace ValueFlow
                         }
                         bool error = false;
                         if (isFloat) {
+                            const double floatValue1 = value1.isFloatValue() ? value1.floatValue : static_cast<double>(value1.intvalue);
+                            const double floatValue2 = value2.isFloatValue() ? value2.floatValue : static_cast<double>(value2.intvalue);
                             auto val = calculate(parent->str(), floatValue1, floatValue2, &error);
                             if (result.isFloatValue()) {
                                 result.floatValue = val;
@@ -614,7 +635,7 @@ namespace ValueFlow
         }
 
         // unary minus
-        else if (parent->isUnaryOp("-")) {
+        else if (parent->isUnaryOp("-") && !astIsUnsigned(parent)) {
             for (const Value &val : tok->values()) {
                 if (!val.isIntValue() && !val.isFloatValue())
                     continue;
@@ -641,7 +662,7 @@ namespace ValueFlow
                     if (v.isIntValue() || v.isSymbolicValue()) {
                         const ValueType *dst = tok->valueType();
                         if (dst) {
-                            const size_t sz = ValueFlow::getSizeOf(*dst, settings);
+                            const size_t sz = dst->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
                             MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue + 1, sz, dst->sign);
                             if (v.bound != ValueFlow::Value::Bound::Point) {
                                 if (newvalue < v.intvalue) {
@@ -671,7 +692,7 @@ namespace ValueFlow
                     if (v.isIntValue() || v.isSymbolicValue()) {
                         const ValueType *dst = tok->valueType();
                         if (dst) {
-                            const size_t sz = ValueFlow::getSizeOf(*dst, settings);
+                            const size_t sz = dst->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
                             MathLib::bigint newvalue = ValueFlow::truncateIntValue(v.intvalue - 1, sz, dst->sign);
                             if (v.bound != ValueFlow::Value::Bound::Point) {
                                 if (newvalue > v.intvalue) {
@@ -712,15 +733,13 @@ namespace ValueFlow
             std::vector<const Token*> args = getArguments(value.tokvalue);
             if (const Library::Function* f = settings.library.getFunction(parent->previous())) {
                 if (f->containerYield == Library::Container::Yield::SIZE) {
-                    Value v(std::move(value));
-                    v.valueType = Value::ValueType::INT;
-                    v.intvalue = args.size();
-                    setTokenValue(parent, std::move(v), settings);
+                    value.valueType = Value::ValueType::INT;
+                    value.intvalue = args.size();
+                    setTokenValue(parent, std::move(value), settings);
                 } else if (f->containerYield == Library::Container::Yield::EMPTY) {
-                    Value v(std::move(value));
-                    v.intvalue = args.empty();
-                    v.valueType = Value::ValueType::INT;
-                    setTokenValue(parent, std::move(v), settings);
+                    value.intvalue = args.empty();
+                    value.valueType = Value::ValueType::INT;
+                    setTokenValue(parent, std::move(value), settings);
                 }
             }
         }
diff --git a/lib/vfvalue.cpp b/lib/vfvalue.cpp
index cf1e07e65a3..308b42b91d1 100644
--- a/lib/vfvalue.cpp
+++ b/lib/vfvalue.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,9 +18,9 @@
 
 #include "vfvalue.h"
 
-#include "errortypes.h"
 #include "mathlib.h"
 #include "token.h"
+#include "utils.h"
 
 #include <sstream>
 #include <string>
@@ -129,7 +129,7 @@ namespace ValueFlow {
             return result;
         }
         }
-        throw InternalError(nullptr, "Invalid ValueFlow Value type");
+        cppcheck::unreachable();
     }
 
     const char *Value::toString(MoveKind moveKind) {
diff --git a/lib/vfvalue.h b/lib/vfvalue.h
index 8a473143b68..ce33f022e58 100644
--- a/lib/vfvalue.h
+++ b/lib/vfvalue.h
@@ -322,6 +322,10 @@ namespace ValueFlow
         /** token value - the token that has the value. this is used for pointer aliases, strings, etc. */
         const Token* tokvalue{};
 
+        /** For CONTAINER_SIZE values: the container the size belongs to, when the value is
+         * attached to a token that is not the container itself (an iterator or a pointer) */
+        const Token* container = nullptr;
+
         /** float value */
         double floatValue{};
 
diff --git a/lib/xml.h b/lib/xml.h
index 8b45c837a7c..e5591fafbfd 100644
--- a/lib/xml.h
+++ b/lib/xml.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
diff --git a/man/checkers/algorithmOutOfBounds.md b/man/checkers/algorithmOutOfBounds.md
new file mode 100644
index 00000000000..8e446f82895
--- /dev/null
+++ b/man/checkers/algorithmOutOfBounds.md
@@ -0,0 +1,69 @@
+# algorithmOutOfBounds
+
+**Message**: The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available.<br/>
+**Category**: Correctness<br/>
+**Severity**: Error<br/>
+**Language**: C++
+
+## Description
+
+Many STL algorithms take an iterator that denotes the beginning of a second range (typically an output range) and
+assume that this range is large enough. If it is not, the algorithm writes or reads past the end of the container,
+which is undefined behavior.
+
+This checker uses the ValueFlow analysis to compare the number of elements an algorithm accesses with the number of
+elements that are actually available through the iterator, and warns when the access is out of bounds. Three groups
+of algorithms are checked:
+
+- Algorithms that access exactly `last1 - first1` elements through the other iterator: `std::copy`, `std::move`,
+  `std::swap_ranges`, `std::transform`, `std::replace_copy`, `std::replace_copy_if`, `std::reverse_copy`,
+  `std::equal`, `std::mismatch`, `std::is_permutation`, `std::partial_sum`, `std::adjacent_difference` and
+  `std::inner_product`.
+- Algorithms that access at most `last1 - first1` elements, depending on the values in the input range:
+  `std::copy_if`, `std::remove_copy`, `std::remove_copy_if` and `std::unique_copy`. Since the actual number of
+  accessed elements is not known, these are only reported as inconclusive warnings (with `--inconclusive`).
+- Count-based algorithms that access as many elements as the count argument says: `std::copy_n`, `std::fill_n` and
+  `std::generate_n`.
+
+The severity is `error` when the out of bounds access always happens. When the analysis depends on an earlier
+condition in the code, the severity is `warning` and the message has the form "Either the condition 'v.size()==3'
+is redundant or the algorithm ... ".
+
+The checker does not warn when:
+
+- The second range is given with both a begin and an end iterator (for example the two-range overloads of
+  `std::equal`, `std::mismatch` and `std::is_permutation`), since such overloads do not access the second range out
+  of bounds.
+- An iterator adaptor such as `std::back_inserter` or `std::inserter` is used, since those grow the container as
+  needed.
+- The proof would rely on "possible" (non-known) values on both the accessed and the available side.
+
+## How to fix
+
+Make sure the destination range is large enough before calling the algorithm, or use an iterator adaptor such as
+`std::back_inserter` that grows the container as needed.
+
+Before:
+```cpp
+void f(const std::vector<int>& v0) {
+    std::vector<int> v1(3);
+    // If v0 has more than 3 elements, this writes past the end of v1
+    std::copy(v0.begin(), v0.end(), v1.begin());
+}
+```
+
+After:
+```cpp
+void f(const std::vector<int>& v0) {
+    std::vector<int> v1(v0.size());
+    std::copy(v0.begin(), v0.end(), v1.begin());
+}
+```
+
+Or let the container grow:
+```cpp
+void f(const std::vector<int>& v0) {
+    std::vector<int> v1;
+    std::copy(v0.begin(), v0.end(), std::back_inserter(v1));
+}
+```
diff --git a/man/checkers/constParameterPointer.md b/man/checkers/constParameterPointer.md
new file mode 100644
index 00000000000..82e649d8844
--- /dev/null
+++ b/man/checkers/constParameterPointer.md
@@ -0,0 +1,85 @@
+# constParameterPointer
+
+**Message**: Parameter 'x' can be declared as pointer to const<br/>
+**Category**: Robustness<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+This checker identifies function parameters that are pointers which are never used to modify the data they point to. Such parameters can be declared as "pointer to const" to improve code clarity and prevent accidental modifications.
+
+The checker analyzes pointer parameters and detects when:
+- The pointer is dereferenced only for reading values (not writing)
+- The pointer is used in comparisons or logical operations
+- The pointer is passed to functions that expect const pointers
+- The pointer arithmetic is performed without modifying the pointed-to data
+
+This warning helps improve code quality by:
+- Making the intent clear that the function will not modify the pointed-to data
+- Enabling compiler optimizations
+- Preventing accidental modifications
+- Improving const-correctness
+
+## Motivation
+
+This checker improves const-correctness. Const-correct code is more robust and easier to understand.
+
+## How to fix
+
+Add the `const` keyword to the parameter declaration to indicate that the pointed-to data will not be modified.
+
+Before:
+```cpp
+void printValue(int* p) {
+    printf("%d\n", *p);  // Only reading the value
+}
+
+int findMax(int* arr, size_t size) {
+    int max = arr[0];
+    for (size_t i = 1; i < size; i++) {
+        if (arr[i] > max) {  // Only reading array elements
+            max = arr[i];
+        }
+    }
+    return max;
+}
+
+bool isEqual(char* str1, char* str2) {
+    return strcmp(str1, str2) == 0;  // Only reading strings
+}
+```
+
+After:
+```cpp
+void printValue(const int* p) {
+    printf("%d\n", *p);  // Clearly indicates read-only access
+}
+
+int findMax(const int* arr, size_t size) {
+    int max = arr[0];
+    for (size_t i = 1; i < size; i++) {
+        if (arr[i] > max) {
+            max = arr[i];
+        }
+    }
+    return max;
+}
+
+bool isEqual(const char* str1, const char* str2) {
+    return strcmp(str1, str2) == 0;  // Standard library functions expect const char*
+}
+```
+
+## Related checkers
+
+- `constParameter` - for non-pointer parameters that can be const
+- `constParameterReference` - for reference parameters that can be const
+- `constParameterCallback` - for callback function parameters that can be const
+- `constVariablePointer` - for local pointer variables that can be const
+
+## Notes
+
+- This check is disabled for virtual functions and callback functions where changing the signature might break polymorphism or function pointer compatibility
+- The checker may suggest callback-specific warnings when a function is used as a callback, indicating that const-ification might require casting function pointers
+- Template functions are handled carefully to avoid false positives in generic code
\ No newline at end of file
diff --git a/man/checkers/cstyleCast.md b/man/checkers/cstyleCast.md
new file mode 100644
index 00000000000..f05a192ced8
--- /dev/null
+++ b/man/checkers/cstyleCast.md
@@ -0,0 +1,54 @@
+
+# cstyleCast
+
+**Message**: C-style pointer casting<br/>
+**Category**: Modernization<br/>
+**Severity**: Style<br/>
+**Language**: C++, not applicable for C code
+
+## Description
+
+Many developers feel that it's best to replace C casts with C++ casts.
+
+There are several advantages with C++ casts:
+ * they permit only certain conversions
+ * they express the intent
+ * they are easy to identify
+
+This checker is about C casts that converts to/from a pointer or reference.
+
+**Note:** More "noisy" warnings exists that warn about all C casts. For instance Clang has
+`-Wold-style-cast` and there is also such checking in Misra C++.
+
+Dangerous conversions are covered by other warnings so this ID `cstyleCast` is primarily about
+writing warnings for casts that are currently safe.
+
+# Motivation
+
+The motivation of this checker is to modernize c++ code.
+
+## How to fix
+
+You can use C++ casts such as `static_cast` to fix these warnings.
+
+The `dynamic_cast` should rarely be used to fix these warnings because dangerousTypeCast is
+reported when that can be a good idea.
+
+Before:
+```cpp
+struct Base{};
+struct Derived: public Base {};
+void foo(Base* base) {
+    Base *p = (Base*)derived; // <- cstyleCast, cast from derived object to base object is safe now
+}
+```
+
+After:
+```cpp
+struct Base{};
+struct Derived: public Base {};
+void foo(Base* base) {
+    Derived *p = static_cast<Derived*>(base);
+}
+```
+The `static_cast` ensures that there will not be loss of constness in the future.
diff --git a/man/checkers/dangerousTypeCast.md b/man/checkers/dangerousTypeCast.md
new file mode 100644
index 00000000000..79538103db5
--- /dev/null
+++ b/man/checkers/dangerousTypeCast.md
@@ -0,0 +1,43 @@
+
+# dangerousTypeCast
+
+**Message**: Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast<br/>
+**Category**: Type Safety<br/>
+**Severity**: Warning<br/>
+**Language**: C++, not applicable for C code
+
+## Motivation
+
+C style casts can be dangerous in many ways:
+ * loss of precision
+ * loss of sign
+ * loss of constness
+ * invalid type conversion
+
+## Philosophy
+
+This checker warns about old style C casts that perform type conversions that can be invalid.
+
+This checker is not about readability. It is about safety.
+
+## How to fix
+
+You can use `dynamic_cast` or `static_cast` to fix these warnings.
+
+Before:
+```cpp
+struct Base{};
+struct Derived: public Base {};
+void foo(Base* base) {
+    Derived *p = (Derived*)base; // <- can be invalid
+}
+```
+
+After:
+```cpp
+struct Base{};
+struct Derived: public Base {};
+void foo(Base* base) {
+    Derived *p = dynamic_cast<Derived*>(base);
+}
+```
diff --git a/man/checkers/duplicateExpressionTernary.md b/man/checkers/duplicateExpressionTernary.md
new file mode 100644
index 00000000000..706ad85e2ac
--- /dev/null
+++ b/man/checkers/duplicateExpressionTernary.md
@@ -0,0 +1,65 @@
+# duplicateExpressionTernary
+
+**Message**: Same expression in both branches of ternary operator<br/>
+**Category**: Logic<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+This checker detects when syntactically identical expressions appear in both the true and false branches of a ternary operator (`condition ? true_expr : false_expr`).
+
+The warning is triggered when:
+- The second and third operands of a ternary operator are syntactically identical expressions
+- This includes cases where variables are referenced through aliases that resolve to the same expression
+
+## Motivation
+
+The same expression indicates that there might be some logic error or copy-paste mistake.
+
+## Examples
+
+### Problematic code
+
+```cpp
+// Same expression in both branches
+int result = condition ? x : x;  // Warning: duplicateExpressionTernary
+
+// Same variable referenced through alias
+const int c = a;
+int result = condition ? a : c;  // Warning: duplicateExpressionTernary
+```
+
+### Fixed code
+
+```cpp
+// Different expressions in branches
+int result = condition ? x : y;  // OK
+```
+
+## How to fix
+
+1. **Check for copy-paste errors**: Verify that both branches are supposed to have the same expression
+2. **Use different expressions**: If the branches should differ, update one of them
+3. **Simplify the code**: If both branches are intentionally the same, remove the ternary operator entirely
+
+Before:
+```cpp
+int getValue(bool flag) {
+    return flag ? computeValue() : computeValue();  // Same computation in both branches
+}
+```
+
+After:
+```cpp
+int getValue(bool flag) {
+    return computeValue();  // Simplified - condition doesn't matter
+}
+```
+
+Or if the branches should differ:
+```cpp
+int getValue(bool flag) {
+    return flag ? computeValue() : computeAlternativeValue();  // Different computations
+}
+```
diff --git a/man/checkers/duplicateValueTernary.md b/man/checkers/duplicateValueTernary.md
new file mode 100644
index 00000000000..06e9f8e9be7
--- /dev/null
+++ b/man/checkers/duplicateValueTernary.md
@@ -0,0 +1,77 @@
+# duplicateValueTernary
+
+**Message**: Same value in both branches of ternary operator<br/>
+**Category**: Logic<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+This checker detects when both branches of a ternary operator (`condition ? true_expr : false_expr`) evaluate to the same value, even though the expressions themselves may be syntactically different.
+
+The warning is triggered when:
+- The second and third operands of a ternary operator evaluate to the same constant value
+- The expressions are constant statements that don't change during evaluation
+- The expressions have different syntax but equivalent values
+
+However, no warning is generated when:
+- The expressions have different values on different platforms
+- Variables are modified between evaluations
+- The expressions involve non-constant computations
+
+## Motivation
+
+The same value indicates that there might be some logic error or copy-paste mistake.
+
+## Examples
+
+### Problematic code
+
+```cpp
+// Different expressions, same value
+int result = condition ? (int)1 : 1;  // Warning: duplicateValueTernary
+
+// Different cast syntax, same value
+int result = condition ? 1 : (int)1;  // Warning: duplicateValueTernary
+```
+
+### Fixed code
+
+```cpp
+// Different values in branches
+int result = condition ? 1 : 2;  // OK
+
+// Simplified - condition doesn't matter
+int result = 1;  // OK - removed unnecessary ternary
+
+// Platform-dependent values are allowed
+int size = is_64bit ? sizeof(long) : sizeof(int);  // OK - may differ on platforms
+```
+
+## How to fix
+
+1. **Check for logic errors**: Verify if both branches should actually have the same value
+2. **Simplify the code**: If both branches always have the same value, remove the ternary operator
+3. **Use different values**: If the branches should differ, update one of them
+4. **Remove unnecessary casts**: If the difference is only in casting, consider if the cast is needed
+
+Before:
+```cpp
+int getValue(bool flag) {
+    return flag ? (int)42 : 42;  // Same value, different expressions
+}
+```
+
+After (simplified):
+```cpp
+int getValue(bool flag) {
+    return 42;  // Simplified - condition doesn't affect result
+}
+```
+
+Or (if branches should differ):
+```cpp
+int getValue(bool flag) {
+    return flag ? 42 : 0;  // Different values for different conditions
+}
+```
diff --git a/man/checkers/fcloseInLoopCondition.md b/man/checkers/fcloseInLoopCondition.md
new file mode 100644
index 00000000000..db7f0a584c6
--- /dev/null
+++ b/man/checkers/fcloseInLoopCondition.md
@@ -0,0 +1,40 @@
+# fcloseInLoopCondition
+
+**Message**: fclose() used as loop condition may skip loop body or double-close file handle.<br/>
+**Category**: Resource Management<br/>
+**Severity**: Warning<br/>
+**Language**: C and C++
+
+## Description
+
+Using `fclose()` as a loop condition leads to two unwanted outcomes:
+
+- On **success**, the condition is false and the loop body never executes. The intent was likely to process the file inside the loop, but it is already closed.
+- On **failure**, the condition is true and the loop body executes but `fclose()` is called again on the already-closed file handle on the next iteration, which is undefined behaviour.
+
+This pattern is almost always a misunderstanding of what `fclose()` returns, or confusion with a function that reads/processes data incrementally (like `fgets` or `fread`). Unlike those functions, `fclose()` is a one-shot teardown operation and has no meaningful retry or loop-until-done semantic.
+
+## How to fix
+
+Call `fclose()` outside the loop condition. If you need to check whether the close succeeded, store the return value and test it separately.
+
+Before:
+```c
+FILE *fp = fopen("data.txt", "r");
+while (fclose(fp)) {
+    /* process file */
+}
+```
+
+After:
+```c
+FILE *fp = fopen("data.txt", "r");
+/* process file */
+if (fclose(fp) != 0) {
+    /* handle close error */
+}
+```
+
+## Related checkers
+
+- `useClosedFile` - for using a file handle that has already been closed
diff --git a/man/checkers/ftellTextModeFile.md b/man/checkers/ftellTextModeFile.md
new file mode 100644
index 00000000000..6ca6653a6f2
--- /dev/null
+++ b/man/checkers/ftellTextModeFile.md
@@ -0,0 +1,56 @@
+# ftellModeTextFile
+
+**Message**: ftell() result is unspecified when file is opened in mode "t".<br/>
+**Category**: Portability<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+This checker detects the use of ftell() on a file open in text (or translate) mode. The text mode is not consistent
+ in between Linux and Windows system and may cause ftell() to return the wrong offset inside a text file.
+
+See section 7.21.9.4p2 of the C11 standard regarding the ftell function states for a text stream:
+
+- For a text stream, its file position indicator contains unspecified information, usable by the fseek function for returning the file position indicator for the stream to its position at the time of the ftell call; the difference between two such return values is not necessarily a meaningful measure of the number of characters written or read.
+
+This warning helps improve code quality by:
+- Making the intent clear that the use of ftell() in "t" mode may cause portability problem.
+
+## Motivation
+
+This checker improves portability accross system.
+
+## How to fix
+
+According to C11, the file must be opened in binary mode 'b' to prevent this problem.
+
+Before:
+```cpp
+     FILE *f = fopen("Example.txt", "rt");
+     if (f)
+     {
+        fseek(f, 0, SEEK_END);
+        printf( "File size %d\n", ftell(f));
+        fclose(f);
+     }
+
+```
+
+After:
+```cpp
+
+     FILE *f = fopen("Example.txt", "rb");
+     if (f)
+     {
+        fseek(f, 0, SEEK_END);
+        printf( "File size %d\n", ftell(f));
+        fclose(f);
+     }
+
+```
+
+## Notes
+
+See https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/fopen-wfopen?view=msvc-170
+
diff --git a/man/checkers/functionConst.md b/man/checkers/functionConst.md
new file mode 100644
index 00000000000..acbc0e1dfd4
--- /dev/null
+++ b/man/checkers/functionConst.md
@@ -0,0 +1,101 @@
+# functionConst
+
+**Message**: Technically the member function 'x' can be const<br/>
+**Category**: Robustness<br/>
+**Severity**: Style (Inconclusive)<br/>
+**Language**: C++
+
+## Description
+
+This checker identifies member functions that do not modify any member variables and therefore could be declared as `const`. A const member function promises not to modify the object's state and enables the function to be called on const objects.
+
+The danger is that a const member function is allowed to have side effects outside the object. If you create a member function that formats the hard drive using
+system calls it might be technically possible to make the function const, but is it "correct"? Using a const object is not supposed to have side effects.
+
+For methods that has no side effects whatsoever; making them const is recommended.
+
+The checker analyzes member functions and detects when:
+- The function only reads member variables (never writes to them)
+- The function only calls other const member functions
+- The function only modifies parameters passed by reference or pointer (not member variables)
+- The function performs operations that don't change the object's logical state
+
+This warning is marked as **inconclusive** because while the function can technically be made const, it may not always be "correct".
+
+This warning helps improve code quality by:
+- Making the function's non-modifying nature explicit
+- Enabling the function to be called on const objects
+- Improving const-correctness throughout the codebase
+- Helping with compiler optimizations
+- Making code intentions clearer to other developers
+
+## Motivation
+
+The motivation of this checker is to improve robustness by making the code more const-correct.
+
+## How to fix
+
+Add the `const` keyword after the function signature to indicate that the function does not modify the object's state.
+
+Before:
+```cpp
+class Rectangle {
+    int width, height;
+public:
+    int getWidth() { return width; }
+    int getHeight() { return height; }
+    int getArea() { return width * height; }
+
+    void printInfo() {
+        std::cout << "Width: " << width << ", Height: " << height << std::endl;
+    }
+
+    bool isSquare() {
+        return width == height;
+    }
+
+    void copyDataTo(Rectangle& other) {
+        other.width = width;
+        other.height = height;
+    }
+};
+```
+
+After:
+```cpp
+class Rectangle {
+    int width, height;
+public:
+    int getWidth() const { return width; }
+    int getHeight() const { return height; }
+    int getArea() const { return width * height; }
+
+    void printInfo() const {
+        std::cout << "Width: " << width << ", Height: " << height << std::endl;
+    }
+
+    bool isSquare() const {
+        return width == height;
+    }
+
+    void copyDataTo(Rectangle& other) const {
+        other.width = width;
+        other.height = height;
+    }
+};
+```
+
+## Related checkers
+
+- `functionStatic` - for member functions that can be declared static
+- `constParameter` - for function parameters that can be const
+- `constParameterReference` - for reference parameters that can be const
+- `constParameterPointer` - for pointer parameters that can be const
+- `constVariable` - for local variables that can be const
+- `constVariableReference` - for local reference variables that can be const
+
+## Notes
+
+- This check is marked as **inconclusive** because the decision to make a function const should also consider the conceptual design
+- Virtual functions should be carefully considered before making them const, as this affects the entire inheritance hierarchy
+- Think about whether the function's purpose is to query state (should be const) or to perform an action (may not need to be const)
diff --git a/man/checkers/functionStatic.md b/man/checkers/functionStatic.md
new file mode 100644
index 00000000000..896dd2c936e
--- /dev/null
+++ b/man/checkers/functionStatic.md
@@ -0,0 +1,64 @@
+# functionStatic
+
+**Message**: The member function 'x' can be static<br/>
+**Category**: Readability<br/>
+**Severity**: Style<br/>
+**Language**: C++
+
+## Description
+
+This checker identifies member functions that do not access any non-static member variables or call any non-static member functions. Such functions can be declared as `static` to indicate that they don't require an object instance to operate.
+
+This warning helps improve code quality by:
+- Making the function's independence from object state explicit
+- Enabling the function to be called without creating an object instance
+- Clarifying the function's scope and dependencies
+
+## Motivation
+
+The motivation of this checker is to improve readability.
+
+## How to fix
+
+Add the `static` keyword to the function declaration to indicate that it doesn't require an object instance.
+
+Before:
+```cpp
+class Calculator {
+public:
+    int add(int a, int b) {
+        return a + b;  // Only uses parameters
+    }
+
+    void printMessage() {
+        std::cout << "Hello World" << std::endl;  // Uses no instance data
+    }
+
+    bool isValidNumber(int num) {
+        return num > 0 && num < 1000;  // Pure function
+    }
+};
+```
+
+After:
+```cpp
+class Calculator {
+public:
+    static int add(int a, int b) {
+        return a + b;  // Can be called as Calculator::add(5, 3)
+    }
+
+    static void printMessage() {
+        std::cout << "Hello World" << std::endl;  // Can be called without instance
+    }
+
+    static bool isValidNumber(int num) {
+        return num > 0 && num < 1000;  // Clearly indicates no state dependency
+    }
+};
+```
+
+## Related checkers
+
+- `functionConst` - for member functions that can be declared const
+
diff --git a/man/checkers/premium-misra-config.md b/man/checkers/premium-misra-config.md
new file mode 100644
index 00000000000..367e45a2b44
--- /dev/null
+++ b/man/checkers/premium-misra-config.md
@@ -0,0 +1,50 @@
+# premium-misra-config
+
+**Message**: Unknown constant x, please review cppcheck options<br/>
+**Category**: Configuration<br/>
+**Severity**: Information<br/>
+**Language**: C and C++
+
+## Description
+
+The `premium-misra-config` message indicates that MISRA checking cannot be performed properly due to missing type information or incomplete code analysis. This typically occurs when the Cppcheck configuration is insufficient for proper code understanding.
+
+These warnings from Cppcheck do not indicate a bug in your code. These warnings indicate that the Cppcheck configuration is not working properly for MISRA analysis.
+
+When MISRA checking requires complete type information to analyze code compliance, missing includes, defines, or other configuration issues can prevent the checker from understanding the code structure needed for accurate MISRA rule evaluation.
+
+## How to fix
+
+The warning is typically reported when MISRA checking encounters code that cannot be properly analyzed due to configuration issues:
+
+```cpp
+// Missing type information may prevent MISRA analysis
+typedef some_unknown_type my_type_t;  // If some_unknown_type is not defined
+my_type_t variable;                   // MISRA rules cannot be properly checked
+```
+
+Identify which identifier name the warning is about. The warning message will complain about a specific name.
+
+Determine where Cppcheck should find the declaration/definition of that identifier name.
+
+### Missing includes
+
+Check if the necessary header(s) are included. You can add `--enable=missingInclude` to get warnings about missing includes.
+```bash
+cppcheck --enable=missingInclude file.c
+```
+
+Ensure all include directories are specified:
+
+```bash
+cppcheck -I/path/to/includes file.c
+```
+
+### Preprocessor defines
+
+If the code depends on preprocessor macros that are not defined:
+
+```bash
+cppcheck -DMISSING_MACRO=value file.c
+```
+
diff --git a/man/checkers/truncLongCast.md b/man/checkers/truncLongCast.md
new file mode 100644
index 00000000000..f6ecd6ea77c
--- /dev/null
+++ b/man/checkers/truncLongCast.md
@@ -0,0 +1,50 @@
+# truncLongCastAssignment and truncLongCastReturn
+
+**Message**: int result is assigned to long variable. If the variable is long to avoid loss of information, then you have loss of information.<br/>
+**Category**: Type Safety<br/>
+**Severity**: Style<br/>
+**Language**: C/C++
+
+## Description
+
+This checker warns when a calculation has type 'int' and it could potentially overflow that and the result is implicitly or explicitly converted to a larger
+integer type after the loss of information has already occurred.
+
+## Motivation
+
+The motivation of this checker is to catch bugs. Unintentional loss of information.
+
+## How to fix
+
+You can fix these warnings by:
+1. Add explicit cast to avoid loss of information
+2. Explicitly truncate the result
+3. Change type of assigned variable
+
+Before:
+```cpp
+void foo(int32_t y) {
+    int64_t x = y * y; // <- warning
+}
+```
+
+After (explicit cast):
+```cpp
+void foo(int32_t y) {
+    int64_t x = (int64_t)y * y; // <- 64-bit multiplication
+}
+```
+
+After (explicitly truncate the result):
+```cpp
+void foo(int32_t y) {
+    int64_t x = (int32_t)(y * y); // redundant cast makes it explicit that your intention is to truncate the result to 32-bit
+}
+```
+
+After (change type of assigned variable):
+```cpp
+void foo(int32_t y) {
+    int32_t x = y * y;
+}
+```
\ No newline at end of file
diff --git a/man/checkers/unknownMacro.md b/man/checkers/unknownMacro.md
new file mode 100644
index 00000000000..52599215d89
--- /dev/null
+++ b/man/checkers/unknownMacro.md
@@ -0,0 +1,68 @@
+
+# unknownMacro
+
+**Message**: There is an unknown macro here somewhere. Configuration is required. If AAA is a macro then please configure it. [unknownMacro]
+<br/>
+**Category**: Configuration<br/>
+**Severity**: Error<br/>
+**Language**: C and C++
+
+## Description
+
+Cppcheck has found code that is confusing and does not know how to analyze it. This is a critical
+error, the analysis of the whole translation unit is aborted. Such error in a header file can mean
+that analysis of many source files are aborted.
+
+Your code is probably OK but you need to configure Cppcheck to make Cppcheck understand the code
+better.
+
+## How to fix
+
+Review the configuration.
+
+If Cppcheck warns about a macro that is defined in a 3rd party library, and there is a cfg file for
+that, then a `--library=` option may be a proper solution.
+
+If Cppcheck warns about a macro that is defined in a header that should be included, make sure that
+this header is included properly. Cppcheck must have the include path.
+
+If Cppcheck warns about a compiler keyword add a `-D` that defines this keyword somehow. I.e. if
+cppcheck should just ignore the keyword then an `-DKEYWORD=` option is suggested.
+
+## Example
+
+### Example code 1
+```
+    fprintf(stderr, "Generating up to " F_U64 " sequences and up to " F_U64 " bases.\n", nSeqs, nBases);
+```
+
+Warning:
+
+canu-2.2/src/seqrequester/src/seqrequester/generate.H:72:41: error: There is an unknown macro here somewhere. Configuration is required. If F_U64 is a macro then please configure it. [unknownMacro]
+
+Fix:
+
+Somehow `F_U64` must be specified for Cppcheck to be able to analyse this properly. Either:
+ * Add `-DF_U64="x"` to explicitly tell Cppcheck what it should replace F_U64 with. Or;
+ * Add `-I..` so that headers are included properly.
+ * If the symbol is defined in a 3rd party library adding a corresponding `--library=` might solve such issue.
+
+### Example code 2
+```
+BOTAN_FUNC_ISA("crypto")
+void AES_128::hw_aes_encrypt_n(const uint8_t in[], uint8_t out[], size_t blocks) const
+```
+
+Warning:
+
+botan-2.19.5+dfsg/src/lib/block/aes/aes_power8/aes_power8.cpp:103:1: error: There is an unknown macro here somewhere. Configuration is required. If BOTAN_FUNC_ISA is a macro then please configure it. [unknownMacro]
+
+Fix:
+
+Somehow `BOTAN_FUNC_ISA` must be specified for Cppcheck to be able to analyse this properly. Either:
+ * Add `-DBOTAN_FUNC_ISA(X)=` to explicitly tell Cppcheck that BOTAN_FUNC_ISA("crypto") should be ignored. Or;
+ * Add `-I..` so that headers are included properly.
+ * If the symbol is defined in a 3rd party library adding a corresponding `--library=` might solve such issue.
+
+
+
diff --git a/man/checkers/wrongfeofUsage.md b/man/checkers/wrongfeofUsage.md
new file mode 100644
index 00000000000..9a3d0bbf5f6
--- /dev/null
+++ b/man/checkers/wrongfeofUsage.md
@@ -0,0 +1,42 @@
+# wrongfeofUsage
+
+**Message**: Using feof() as a loop condition causes the last line to be processed twice.<br/>
+**Category**: Correctness<br/>
+**Severity**: Warning<br/>
+**Language**: C/C++
+
+## Description
+
+`feof()` returns non-zero only after a read operation has failed because the end of file was reached. When used as the sole condition of a loop, the loop body executes one extra time after the last successful read: the read fails silently (or returns partial data), and only then does `feof()` return true and terminate the loop.
+
+This checker matches `while (!feof(fp))` and `do { ... } while (!feof(fp))` loops and warns when all of the following are true:
+
+- The loop body contains at least one file-read call (`fgets`, `fgetc`, `getc`, `fread`, or `fscanf`) on the same file pointer.
+- The destination (return value or output buffer) of the **last** file-read call in the loop is used after that call within the same loop iteration.
+
+The checker skips loops that contain a control-flow statement (`return`, `break`, `goto`, `continue`, `throw`) as those are too complex to analyze reliably, and loops where the file pointer appears in a context other than a recognised I/O function (`fgets`, `fgetc`, `getc`, `fread`, `fscanf`, `fprintf`, `fwrite`, `fputs`, `fputc`, `putc`).
+
+## How to fix
+
+Check the return value of the read function directly in the loop condition.
+
+Before:
+```c
+void process(FILE *fp) {
+    char line[256];
+    while (!feof(fp)) {          /* wrong: processes last line twice */
+        fgets(line, sizeof(line), fp);
+        puts(line);
+    }
+}
+```
+
+After:
+```c
+void process(FILE *fp) {
+    char line[256];
+    while (fgets(line, sizeof(line), fp) != NULL) {
+        puts(line);
+    }
+}
+```
\ No newline at end of file
diff --git a/man/cppcheck.1.xml b/man/cppcheck.1.xml
index 1265e0f3511..8579d375bdf 100644
--- a/man/cppcheck.1.xml
+++ b/man/cppcheck.1.xml
@@ -117,6 +117,9 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <arg choice="opt">
         <option>--errorlist</option>
       </arg>
+      <arg choice="opt">
+        <option>--exitcode-suppress=&lt;spec&gt;</option>
+      </arg>
       <arg choice="opt">
         <option>--exitcode-suppressions=&lt;file&gt;</option>
       </arg>
@@ -343,6 +346,14 @@ Example: '-UDEBUG'</para>
           <para>Print a list of all possible error messages in XML format.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--exitcode-suppress=&lt;spec&gt;</option>
+        </term>
+        <listitem>
+          <para>Used to specify an error ID which should not result in a non-zero exitcode.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>--exitcode-suppressions=&lt;file&gt;</option>
@@ -594,6 +605,7 @@ There are false positives with this option. Each result must be carefully invest
               <glossentry><glossterm>cert-cpp-2016</glossterm><glossdef><para>Cert C++ 2016</para></glossdef></glossentry>
               <glossentry><glossterm>misra-c-2012</glossterm><glossdef><para>Misra C 2012</para></glossdef></glossentry>
               <glossentry><glossterm>misra-c-2023</glossterm><glossdef><para>Misra C 2023</para></glossdef></glossentry>
+              <glossentry><glossterm>misra-c-2025</glossterm><glossdef><para>Misra C 2025</para></glossdef></glossentry>
               <glossentry><glossterm>misra-cpp-2008</glossterm><glossdef><para>Misra C++ 2008</para></glossdef></glossentry>
               <glossentry><glossterm>misra-cpp-2023</glossterm><glossdef><para>Misra C++ 2023</para></glossdef></glossentry>
             </glosslist>
@@ -629,7 +641,6 @@ There are false positives with this option. Each result must be carefully invest
               <glossentry><glossterm>summary</glossterm><glossdef><para>Show a summary at the end</para></glossdef></glossentry>
               <glossentry><glossterm>top5_file</glossterm><glossdef><para>Show the top 5 for each processed file</para></glossdef></glossentry>
               <glossentry><glossterm>top5_summary</glossterm><glossdef><para>Show the top 5 summary at the end</para></glossdef></glossentry>
-              <glossentry><glossterm>top5</glossterm><glossdef><para>Alias for top5_file (deprecated)</para></glossdef></glossentry>
             </glosslist>
           </para>
         </listitem>
diff --git a/man/manual-ja.docbook b/man/manual-ja.docbook
index 1c13d3d0526..0b2a39cc59e 100644
--- a/man/manual-ja.docbook
+++ b/man/manual-ja.docbook
@@ -1702,11 +1702,11 @@ Checking unusedvar.cpp...
 
         <itemizedlist>
           <listitem>
-            <para>Cppcheck プロジェクトはいくつかのアドオンを以下の場所で提供しています。: <uri>http://github.com/danmar/cppcheck/blob/master/addons</uri></para>
+            <para>Cppcheck プロジェクトはいくつかのアドオンを以下の場所で提供しています。: <uri>http://github.com/cppcheck-opensource/cppcheck/blob/master/addons</uri></para>
           </listitem>
 
           <listitem>
-            <para>ublinterは規格で定義されていない未定義動作に注力した&quot;lint&quot;です。: <uri>http://github.com/danmar/ublinter</uri></para>
+            <para>ublinterは規格で定義されていない未定義動作に注力した&quot;lint&quot;です。: <uri>http://github.com/cppcheck-opensource/ublinter</uri></para>
           </listitem>
         </itemizedlist>
 
diff --git a/man/manual-premium.md b/man/manual-premium.md
index dce551b3568..9175ef47c8a 100644
--- a/man/manual-premium.md
+++ b/man/manual-premium.md
@@ -7,8 +7,8 @@ documentclass: report
 
 # Introduction
 
-Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting 
-undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate 
+Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting
+undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate
 as few false positives (wrongly reported warnings) as possible. Cppcheck is designed to analyze your C/C++ code even
 if it has non-standard syntax, as is common in for example embedded projects.
 
@@ -16,7 +16,7 @@ Supported code and platforms:
 
 - Cppcheck checks non-standard code that contains various compiler extensions, inline assembly code, etc.
 - Cppcheck should be compilable by any compiler that supports C++11 or later.
-- Cppcheck is cross platform and is used in various posix/windows/etc environments.
+- Cppcheck is cross-platform and is used in various posix/windows/etc environments.
 
 The checks in Cppcheck are not perfect. There are bugs that should be found, that Cppcheck fails to detect.
 
@@ -29,11 +29,11 @@ The kinds of bugs that you can find with static analysis are:
 - Coding style
 
 There are many bugs that you can not find with static analysis. Static analysis tools do not have human knowledge about
-what your program is intended to do. If the output from your program is valid but unexpected then in most cases this is
-not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello"
+what your program is intended to do. If the output from your program is valid but unexpected, then in most cases this is
+not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello",
 it is unlikely that any tool will complain about that.
 
-Static analysis should be used as a complement in your quality assurance. It does not replace any of;
+Static analysis should be used as a complement in your quality assurance. It does not replace any of:
 
 - Careful design
 - Testing
@@ -69,7 +69,7 @@ Here is some simple code:
         return 0;
     }
 
-If you save that into file1.c and execute:
+If you save that into `file1.c` and execute:
 
     cppcheck file1.c
 
@@ -84,7 +84,7 @@ Normally a program has many source files. Cppcheck can check all source files in
 
     cppcheck path
 
-If "path" is a folder, then Cppcheck will recursively check all source files in this folder:
+If `path` is a folder, then Cppcheck will recursively check all source files in this folder:
 
     Checking path/file1.cpp...
     1/2 files checked 50% done
@@ -93,43 +93,62 @@ If "path" is a folder, then Cppcheck will recursively check all source files in
 
 ### Check files manually or use project file
 
-With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build 
+With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build
 environment, such as CMake or Visual Studio.
 
-We don't know which approach (project file or manual configuration) will give you the best results. It is recommended 
-that you try both. It is possible that you will get different results so that to find the largest amount of bugs you 
+We don't know which approach (project file or manual configuration) will give you the best results. It is recommended
+that you try both. It is possible that you will get different results so that to find the largest amount of bugs you
 need to use both approaches. Later chapters will describe this in more detail.
 
 ### Check files matching a given file filter
 
-With `--file-filter=<str>` you can set a file filter and only those files matching the filter will be checked.
+With `--file-filter=<str>` you can configure file filter(s) and then only those files matching the filter will be checked.
 
-For example: if you want to check only those files and folders starting from a subfolder src/ that start with "test" 
-you have to type:
+You can use `**`, `*` and `?` in the file filter pattern.
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
+
+For example, this command below means that `src/test1.cpp` could be checked, but `src/file2.cpp` and `src/test/file1.cpp` will not be checked:
 
     cppcheck src/ --file-filter=src/test*
 
-Cppcheck first collects all files in src/ and will apply the filter after that. So the filter must start with the given 
-start folder. 
+Cppcheck first collects all files in the specified directory, then applies the filter. Therefore, the filter pattern
+must include the directory path you specified.
+
+A common use case for `--file-filter` is to check a project, but only check certain files:
+
+    cppcheck --project=compile_commands.json --file-filter=src/*.c
+
+Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `--file-filter=src/*.c` would mean that:
+
+- a file with relative path `test1.c` is not checked.
+- a file with relative path `src/test2.c` can be checked.
+- a file with relative path `src/test3.cpp` is not checked.
+
+### Ignore files matching a given pattern
 
-### Excluding a file or folder from checking
+With `-i <str>` you can configure filename/directory patterns that should be ignored.
 
-To exclude a file or folder, there are two options. The first option is to only provide the paths and files you want to 
-check:
+A file that is ignored will not be checked directly (the complete translation unit is skipped). Any header `#include`'d from a source file which is not ignored is checked indirectly, regardless if the header is ignored.
 
-    cppcheck src/a src/b
+> *Note*: If you want to filter out warnings for a header file, then `-i` will not work. Use suppressions instead.
 
-All files under src/a and src/b are then checked.
+You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.
 
-The second option is to use -i, which specifies the files/paths to ignore. With this command no files in src/c are 
-checked:
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
-    cppcheck -isrc/c src
+A use case for `-i` is to check a project, but exclude certain files/folders:
 
-This option is only valid when supplying an input directory. To ignore multiple directories supply the -i flag for each 
-directory individually. The following command ignores both the src/b and src/c directories:
+    cppcheck --project=compile_commands.json -itest
 
-    cppcheck -isrc/b -isrc/c
+Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `-itest` would mean that:
+
+- a file with relative path `test1.cpp` can be checked.
+- a file with relative path `test/somefile.cpp` is not checked
 
 ### Clang parser (experimental)
 
@@ -137,10 +156,10 @@ By default Cppcheck uses an internal C/C++ parser. However there is an experimen
 
 Install `clang`. Then use Cppcheck option `--clang`.
 
-Technically, Cppcheck will execute `clang` with its `-ast-dump` option. The Clang output is then imported and converted into 
-the normal Cppcheck format. And then normal Cppcheck analysis is performed on that.
+Cppcheck executes clang with the -ast-dump option, imports the output, converts it to Cppcheck's internal format, and then
+performs standard analysis.
 
-You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it 
+You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it
 with a path. On Windows it will append the `.exe` extension unless you use a path.
 
 ## Severities
@@ -161,26 +180,25 @@ stylistic issues, such as unused functions, redundant code, constness, operator
 
 **performance**
 
-run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference 
+run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference
 will be achieved by fixing these messages.
 
 **portability**
 
-portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works 
+portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works
 "as you want", etc.
 
 **information**
 
-configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could 
+configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could
 be improved.
 
 ## Possible speedup analysis of template code
 
 Cppcheck instantiates the templates in your code.
 
-If your templates are recursive this can lead to slow analysis that uses a lot
-of memory. Cppcheck will write information messages when there are potential
-problems.
+If your templates are recursive, this can lead to slow analysis and high memory usage. Cppcheck will write information
+messages when there are potential problems.
 
 Example code:
 
@@ -206,7 +224,7 @@ Cppcheck output:
 As you can see Cppcheck has instantiated `a<i+1>` until `a<101>` was reached
 and then it bails out.
 
-To limit template recursion you can:
+To limit template recursion, you can:
 
 - add template specialisation
 - configure Cppcheck, which can be done in the GUI project file dialog
@@ -230,14 +248,13 @@ Example code with template specialisation:
 
 You can pass `-D__cppcheck__` when checking this code.
 
-
 # Cppcheck build folder
 
 Using a Cppcheck build folder is not mandatory but it is recommended.
 
 Cppcheck save analyzer information in that folder.
 
-The advantages are;
+The advantages are:
 
 - It speeds up the analysis as it makes incremental analysis possible. Only changed files are analyzed when you recheck.
 - Whole program analysis also when multiple threads are used.
@@ -264,36 +281,44 @@ You can import and use Cppcheck GUI project files in the command line tool:
 
     cppcheck --project=foobar.cppcheck
 
-The Cppcheck GUI has a few options that are not available in the command line directly. To use these options you can import a GUI project file. 
+The Cppcheck GUI has a few options that are not available in the command line directly. To use these options, you can import a GUI project file.
 The command line tool usage is kept intentionally simple and the options are therefore limited.
 
-To ignore certain folders in the project you can use `-i`. This will skip the analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip the analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.cppcheck -ifoo
 
-## CMake
+## Compilation database (CMake etc.)
 
-Generate a compile database:
+Many build systems can generate a compilation database (a JSON file containing compilation commands for each source file).
+Example `cmake` command to generate the file:
 
     cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .
 
-The file `compile_commands.json` is created in the current folder. Now run Cppcheck like this:
+When you have a `compile_commands.json` file, you can run Cppcheck like this:
 
     cppcheck --project=compile_commands.json
 
+By default only 1 configuration is checked because that is consistent with the compilation. If you want to check more configurations, you can use `--max-configs` or `--force`. For example:
+
+    cppcheck --project=compile_commands.json --force
+
 To ignore certain folders you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=compile_commands.json -ifoo
 
-
 ## Visual Studio
 
-You can run Cppcheck on individual project files (\*.vcxproj) or on a whole solution (\*.sln)
+You can run Cppcheck on individual project files (`*.vcxproj`) or on a whole solution (`*.sln`) or (`*.slnx`).
 
 Running Cppcheck on an entire Visual Studio solution:
 
     cppcheck --project=foobar.sln
 
+Running Cppcheck on an entire Visual Studio 2026 solution:
+
+    cppcheck --project=foobar.slnx
+
 Running Cppcheck on a Visual Studio project:
 
     cppcheck --project=foobar.vcxproj
@@ -305,7 +330,7 @@ Limiting on a single configuration:
 
 In the `Cppcheck GUI` you have the option to only analyze a single debug configuration. If you want to use this option on the command line, then create a `Cppcheck GUI` project with this activated and then import the GUI project file on the command line.
 
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.vcxproj -ifoo
 
@@ -315,25 +340,28 @@ Running Cppcheck on a C++ Builder 6 project:
 
     cppcheck --project=foobar.bpr
 
-
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.bpr -ifoo
 
 ## Other
 
-If you can generate a compile database, then it is possible to import that in Cppcheck.
+If you generate a compilation database, then it is possible to import that in Cppcheck.
+
+### Makefile
 
-In Linux you can use for instance the `bear` (build ear) utility to generate a compile database from arbitrary build tools:
+In Linux you can convert a Makefile to a `compile_commands.json` using for instance `bear` (build ear) utility:
 
     bear -- make
 
-# Preprocessor Settings
+If you don't use Linux, there are Python scripts that converts a Makefile into a compilation database.
 
-If you use `--project` then Cppcheck will automatically use the preprocessor settings in the imported project file and
+# Preprocessor settings
+
+If you use `--project`, then Cppcheck will automatically use the preprocessor settings in the imported project file and
 likely you don't have to configure anything extra.
 
-If you don't use `--project` then a bit of manual preprocessor configuration might be required. However Cppcheck has
+If you don't use `--project`, then a bit of manual preprocessor configuration might be required. However Cppcheck has
 automatic configuration of defines.
 
 ## Automatic configuration of preprocessor defines
@@ -341,7 +369,7 @@ automatic configuration of defines.
 Cppcheck automatically test different combinations of preprocessor defines to achieve as high coverage in the analysis
 as possible.
 
-Here is a file that has 3 bugs (when x,y,z are assigned).
+Here is a file that has 3 bugs (when `x`, `y`, `z` are assigned).
 
     #ifdef A
         x=100/0;
@@ -356,9 +384,12 @@ Here is a file that has 3 bugs (when x,y,z are assigned).
     #error C must be defined
     #endif
 
+The flag `-D` tells Cppcheck that a name is defined. Cppcheck will only analyze configurations that
+contain this define.
+
+The flag `-U` tells Cppcheck that a name is not defined. Cppcheck will only analyze configurations
+that does not contain this define.
 
-The flag `-D` tells Cppcheck that a name is defined. There will be no Cppcheck analysis without this define.
-The flag `-U` tells Cppcheck that a name is not defined. There will be no Cppcheck analysis with this define.
 The flag `--force` and `--max-configs` is used to control how many combinations are checked. When `-D` is used,
 Cppcheck will only check 1 configuration unless these are used.
 
@@ -369,14 +400,14 @@ Example:
     cppcheck test.c
 
     # only test configuration "-DA"
-    # No bug is found (#error)
+    # No bug is found; because C is not defined the #error will cause a preprocessor error
     cppcheck -DA test.c
 
     # only test configuration "-DA -DC"
     # The first bug is found
     cppcheck -DA -DC test.c
 
-    # The configuration "-DC" is tested
+    # Test all configurations that does not define "A"
     # The last bug is found
     cppcheck -UA test.c
 
@@ -384,20 +415,27 @@ Example:
     # The two first bugs are found
     cppcheck --force -DA test.c
 
+    # only test 1 valid configuration
+    # Bug(s) will be found
+    cppcheck --max-configs=1 test.c
+
+    # test 2 valid configurations with "X" defined.
+    # Bug(s) will be found
+    cppcheck --max-configs=2 -DX test.c
 
 ## Include paths
 
-To add an include path, use `-I`, followed by the path.
+To add an include path, use `-I` followed by the path.
 
-Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors 
-stop working when they encounter a missing header, Cppcheck will just print an information message and continues 
+Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors
+stop working when they encounter a missing header, Cppcheck will just print an information message and continues
 parsing the code.
 
-The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code. 
-Actually, it is recommended to not give all include paths. 
-While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members, 
-passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking 
-time. For such cases, .cfg files are the preferred way to provide information about the implementation of functions and 
+The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code.
+Actually, it is recommended to not give all include paths.
+While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members,
+passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking
+time. For such cases, `.cfg` files are the preferred way to provide information about the implementation of functions and
 types to Cppcheck, see below for more information.
 
 # Platform
@@ -428,7 +466,7 @@ You can also create your own custom platform configuration in a XML file. Here i
       </sizeof>
     </platform>
 
-# C/C++ Standard
+# C/C++ standard
 
 Use `--std` on the command line to specify a C/C++ standard.
 
@@ -457,14 +495,15 @@ the GUI, the build dir is configured in the project options.
 Rechecking code will be much faster. Cppcheck does not analyse unchanged code. The old warnings are
 loaded from the build dir and reported again.
 
-Whole program analysis does not work when multiple threads are used; unless you use a cppcheck
+Whole program analysis does not work when multiple threads are used unless you use a Cppcheck
 build dir. For instance, the unusedFunction warnings require whole program analysis.
 
 # Suppressions
 
 If you want to filter out certain errors from being generated, then it is possible to suppress these.
 
-If you encounter a false positive, then please report it to the Cppcheck team so that it can be fixed.
+If you encounter a false positive, please report it to the Cppcheck team so that the issue can be
+fixed.
 
 ## Plain text suppressions
 
@@ -474,19 +513,23 @@ The format for an error suppression is one of:
     [error id]:[filename2]
     [error id]
 
-The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal cppcheck text output. The suppression `error id` may contain \* to match any sequence of tokens.
+The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal Cppcheck text output.
 
-The filename may include the wildcard characters \* or ?, which matches any sequence of characters or any single character respectively.
-It is recommended to use forward-slash `/` as path separator on all operating systems. The filename must match the filename in the reported warning exactly.
-For instance, if the warning contains a relative path, then the suppression must match that relative path.
+The `error id` and `filename` patterns may contain `**`, `*` or `?`.
 
-## Command line suppression
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
+
+It is recommended to use forward-slash `/` in the filename pattern as path separator on all operating systems.
+
+### Command line suppression
 
 The `--suppress=` command line option is used to specify suppressions on the command line. Example:
 
     cppcheck --suppress=memleak:src/file1.cpp src/
 
-## Suppressions in a file
+### Suppressions in a file
 
 You can create a suppressions file for example as follows:
 
@@ -517,15 +560,49 @@ You can specify suppressions in a XML file, for example as follows:
       </suppress>
     </suppressions>
 
+The `id` and `fileName` patterns may contain `**`, `*` or `?`.
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
+
 The XML format is extensible and may be extended with further attributes in the future.
 
 The usage of the suppressions file is as follows:
 
     cppcheck --suppress-xml=suppressions.xml src/
 
+### The `<hash>` element
+
+Cppcheck calculates a unique ID for each error, called the hash. The hash depends on the code that
+is related to the error, not on where that code is located. This means that the hash for an error
+stays the same even when unrelated code elsewhere in the file is added, removed or moved, shifting
+the line numbers around. The hash only changes if the related code itself is modified.
+
+This makes hash-based suppressions more robust than line-based suppressions: once you have
+reviewed and suppressed a specific warning, the suppression keeps working even after the file is
+edited, as long as the offending code is not changed.
+
+The hash for an error is included as the `hash` attribute in the [XML output](#the-error-element).
+You can copy that value into a `<hash>` element in a suppressions XML file:
+
+    <?xml version="1.0"?>
+    <suppressions>
+      <suppress>
+        <id>uninitvar</id>
+        <fileName>src/file1.c</fileName>
+        <hash>12345678</hash>
+      </suppress>
+    </suppressions>
+
+A suppression can use `<hash>` on its own, without `<id>`, to suppress a specific error regardless
+of its id. It is also possible to combine `<hash>` with `<id>`, `<fileName>`, `<lineNumber>` and
+`<symbolName>`; when several of these are specified, all of them must match for the suppression to
+apply.
+
 ## Inline suppressions
 
-Suppressions can also be added directly in the code by adding comments that contain special keywords. 
+Suppressions can also be added directly in the code by adding comments that contain special keywords.
 Note that adding comments sacrifices the readability of the code somewhat.
 
 This code will normally generate an error message:
@@ -550,7 +627,7 @@ You can suppress a warning `aaaa` with:
 
     // cppcheck-suppress aaaa
 
-Suppressing multiple ids in one comment by using []:
+Suppressing multiple ids in one comment by using `[]`:
 
     // cppcheck-suppress [aaaa, bbbb]
 
@@ -581,7 +658,6 @@ Suppressing warnings `aaaa` where macro is used:
     ...
     x = MACRO; // <- aaaa warnings are suppressed here
 
-
 Suppressing multiple ids where macro is used:
 
     // cppcheck-suppress-macro [aaaa, bbbb]
@@ -610,7 +686,21 @@ Or at the same line as the code:
         arr[10] = 0;  // cppcheck-suppress arrayIndexOutOfBounds
     }
 
-In this example there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
+The suppression comment and the line of code may be separated by additional comments or empty lines:
+
+    void f() {
+        char arr[5];
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+
+        arr[10] = 0;
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+        // Set the tenth element of arr to zero
+        arr[10] = 0;
+    }
+
+In the example below there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
 
     void f() {
         a = b + c; // cppcheck-suppress abc
@@ -657,7 +747,6 @@ Suppression comment on the same line as the code:
         arr[10] = arr[10] / 0;  // cppcheck-suppress[arrayIndexOutOfBounds,zerodiv]
     }
 
-
 ### Symbol name
 
 You can specify that the inline suppression only applies to a specific symbol:
@@ -757,7 +846,7 @@ If you want to reformat the output so that it looks different, then you can use
 
 ## Predefined output formats
 
-To get Visual Studio compatible output you can use --template=vs:
+To get Visual Studio compatible output, you can use `--template=vs`:
 
     cppcheck --template=vs samples/arrayIndexOutOfBounds/bad.c
 
@@ -767,7 +856,7 @@ This output will look like this:
     samples/arrayIndexOutOfBounds/bad.c(6): error: Array
     'a[2]' accessed at index 2, which is out of bounds.
 
-To get gcc compatible output you can use --template=gcc:
+To get GCC-compatible output, you can use `--template=gcc`:
 
     cppcheck --template=gcc samples/arrayIndexOutOfBounds/bad.c
 
@@ -805,7 +894,7 @@ The output will look like this:
     samples/arrayIndexOutOfBounds/bad.c,6,error,arrayIndexOutOfBounds,
     Array 'a[2]' accessed at index 2, which is out of bounds.
 
-## User defined output format (multi line)
+## User defined output format (multi-line)
 
 Many warnings have multiple locations. Example code:
 
@@ -821,9 +910,9 @@ Many warnings have multiple locations. Example code:
         return 0;
     }
 
-There is a possible null pointer dereference at line 3. 
-Cppcheck can show how it came to that conclusion by showing extra location information. 
-You need to use both --template and --template-location at the command line, for example:
+There is a possible null pointer dereference at line 3.
+Cppcheck can show how it came to that conclusion by showing extra location information.
+You need to use both `--template` and `--template-location` at the command line, for example:
 
     cppcheck \
     --template="{file}:{line}: {severity}: {message}\n{code}" \
@@ -845,13 +934,13 @@ The output from Cppcheck is:
         *p = 3;
          ^
 
-The first line in the warning is formatted by the --template format.
+The first line in the warning is formatted by the `--template` format.
 
-The other lines in the warning are formatted by the --template-location format.
+The other lines in the warning are formatted by the `--template-location` format.
 
-### Format specifiers for --template
+### Format specifiers for `--template`
 
-The available specifiers for --template are:
+The available specifiers for `--template` are:
 
 **{file}**
 
@@ -867,11 +956,11 @@ Column number
 
 **{callstack}**
 
-Write all locations. Each location is written in [{file}:{line}] format and the locations are separated by ->. For instance it might look like: [multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]
+Write all locations. Each location is written in `[{file}:{line}]` format and the locations are separated by `->`. For instance it might look like: `[multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]`
 
 **{inconclusive:text}**
 
-If warning is inconclusive, then the given text is written. The given text can be any text that does not contain }. Example: {inconclusive:inconclusive,}
+If warning is inconclusive, then the given text is written. The given text can be any text that does not contain `}`. Example: `{inconclusive:inconclusive,}`
 
 **{severity}**
 
@@ -905,7 +994,7 @@ Newline
 
 Carriage return
 
-### Format specifiers for --template-location
+### Format specifiers for `--template-location`
 
 The available specifiers for `--template-location` are:
 
@@ -957,7 +1046,7 @@ Example code:
         int x = 0;
     }
 
-In Cppcheck text output the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
+In Cppcheck text output, the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
 
     $ ./cppcheck --enable=style \
     --template="{file}:{line}: {message} [{id}]\\n{remark}" test1.c
@@ -966,12 +1055,12 @@ In Cppcheck text output the remarks are not shown by default, you can use `--tem
     test1.c:4: Variable 'x' is assigned a value that is never used. [unreadVariable]
     Initialize x with 0
 
-In xml output the comment text is provided in a "remark" attribute:
+In XML output, the comment text is provided in a `remark` attribute:
 
     $ ./cppcheck --enable=style --xml test1.c
-    ....
+    ...
     remark="Initialize x with 0"
-    ....
+    ...
 
 # Addons
 
@@ -981,52 +1070,51 @@ Cppcheck is distributed with a few addons which are listed below.
 
 ## Supported addons
 
-### namingng.py
+### `namingng.py`
 
-[namingng.py](https://github.com/danmar/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
+[`namingng.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
 
 You need to have a configuration file that defines your naming conventions. By default the filename `namingng.config.json` is used but there is an option so you can use any filename you want.
 
 Example configuration of naming conventions:
-```
-{
-   "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
-   "RE_PRIVATE_MEMBER_VARIABLE": null,
-   "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
-   "_comment": "comments can be added to the config with underscore-prefixed keys",
-   "include_guard": {
-       "input": "path",
-       "prefix": "GUARD_",
-       "case": "upper",
-       "max_linenr": 5,
-       "RE_HEADERFILE": "[^/].*\\.h\\Z",
-       "required": true
-   },
-   "var_prefixes": {"uint32_t": "ui32"},
-   "function_prefixes": {"uint16_t": "ui16",
-                         "uint32_t": "ui32"}
-}
-```
-
-### threadsafety.py
-
-[threadsafety.py](https://github.com/danmar/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
-
-### y2038.py
-
-[y2038.py](https://github.com/danmar/cppcheck/blob/main/addons/y2038.py) checks Linux systems for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety. This required [modified environment](https://github.com/3adev/y2038). See complete description [here](https://github.com/danmar/cppcheck/blob/main/addons/doc/y2038.txt).
-
-## Running Addons
+
+    {
+        "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
+        "RE_PRIVATE_MEMBER_VARIABLE": null,
+        "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
+        "_comment": "comments can be added to the config with underscore-prefixed keys",
+        "include_guard": {
+            "input": "path",
+            "prefix": "GUARD_",
+            "case": "upper",
+            "max_linenr": 5,
+            "RE_HEADERFILE": "[^/].*\\.h\\Z",
+            "required": true
+        },
+        "var_prefixes": {"uint32_t": "ui32"},
+        "function_prefixes": {"uint16_t": "ui16",
+                              "uint32_t": "ui32"}
+    }
+
+### `threadsafety.py`
+
+[`threadsafety.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
+
+### `y2038.py`
+
+[`y2038.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/y2038.py) checks source code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety.
+
+## Running addons
 
 Addons can be executed with the `--addon` option:
 
     cppcheck --addon=namingng.py somefile.c
 
-Likewise, if you have created your own script you can execute that:
+Likewise, if you have created your own script, you can execute that:
 
     cppcheck --addon=mychecks.py somefile.c
 
-You can configure how you want to execute an addon in a json file. For example:
+You can configure how you want to execute an addon in a JSON file. For example:
 
     {
         "script": "mychecks.py",
@@ -1036,7 +1124,7 @@ You can configure how you want to execute an addon in a json file. For example:
         "ctu": false
     }
 
-To use that json file to execute your addon use the --addon option:
+To use that JSON file to execute your addon, use the `--addon` option:
 
     cppcheck --addon=mychecks.json somefile.c
 
@@ -1046,74 +1134,74 @@ Cppcheck search for addons in the local folder first and then in the installatio
 
 # Library configuration
 
-When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc, Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
-
-Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, std.cfg, is always loaded by cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the cppcheck project.
-
-## Using a .cfg file
-
-To use a .cfg file shipped with cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
-| .cfg file         | Library       | Comment       |
-| ----------------- | ------------- | ------------- |
-| avr.cfg           |               |               |
-| bento4.cfg        | [Bento4](http://www.bento4.com/) | |
-| boost.cfg         | [Boost](http://www.boost.org/) | |
-| bsd.cfg           | [BSD](https://www.freebsd.org/) | |
-| cairo.cfg         | [cairo](https://www.cairographics.org/) | |
-| cppcheck-lib.cfg  | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of |
-|                   |               |the Cppcheck code base |
-| cppunit.cfg       | [CppUnit](https://sourceforge.net/projects/cppunit/) |
-| dpdk.cfg          |               |               |
-| embedded_sql.cfg  |               |               |
-| emscripten.cfg | | |
-| ginac.cfg | | |
-| gnu.cfg | [GNU](https://www.gnu.org/) | |
-| googletest.cfg | [GoogleTest](https://github.com/google/googletest) | |
-| gtk.cfg | [GTK](https://www.gtk.org/) | |
-| icu.cfg | | |
-| kde.cfg | [KDE](https://kde.org/) | |
-| libcerror.cfg | [libcerror](https://github.com/libyal/libcerror) | |
-| libcurl.cfg | [libcurl](https://curl.se/libcurl/) | |
-| libsigc++.cfg | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
-| lua.cfg | | |
-| mfc.cfg | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
-| microsoft_atl.cfg | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
-| microsoft_sal.cfg | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
-| microsoft_unittest.cfg | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
-| motif.cfg | | |
-| nspr.cfg | | |
-| ntl.cfg | | |
-| opencv2.cfg | [OpenCV](https://opencv.org/) | |
-| opengl.cfg | [OpenGL](https://opengl.org/) | |
-| openmp.cfg | [OpenMP](https://www.openmp.org/) | |
-| openssl.cfg | [OpenSSL](https://www.openssl.org/) | |
-| pcre.cfg | [PCRE](https://pcre.org/) | |
-| posix.cfg | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
-| python.cfg | | |
-| qt.cfg | [Qt](https://doc.qt.io/qt.html) | |
-| ruby.cfg | | |
-| sdl.cfg | | |
-| sfml.cfg | | |
-| sqlite3.cfg | [SQLite](https://www.sqlite.org/) | |
-| std.cfg | C/C++ standard library | Loaded by default
-| tinyxml2.cfg | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
-| vcl.cfg | | |
-| windows.cfg | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
-| wxsqlite3.cfg | | |
-| wxsvg.cfg | | |
-| wxwidgets.cfg | [wxWidgets](https://www.wxwidgets.org/) | |
-| zephyr.cfg | | |
-| zlib.cfg | [zlib](https://www.zlib.net) | |
-
-## Creating a custom .cfg file
-
-You can create and use your own .cfg files for your projects. Use `--check-library` to get hints about what you should configure.
+When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc., Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
+
+Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, `std.cfg`, is always loaded by Cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the Cppcheck project.
+
+## Using a `.cfg` file
+
+To use a `.cfg` file shipped with Cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
+
+| `.cfg` file | Library | Comment |
+| --- | --- | --- |
+| `avr.cfg` | | |
+| `bento4.cfg` | [Bento4](http://www.bento4.com/) | |
+| `boost.cfg` | [Boost](http://www.boost.org/) | |
+| `bsd.cfg` | [BSD](https://www.freebsd.org/) | |
+| `cairo.cfg` | [cairo](https://www.cairographics.org/) | |
+| `cppcheck-lib.cfg` | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of the Cppcheck code base |
+| `cppunit.cfg` | [CppUnit](https://sourceforge.net/projects/cppunit/) | |
+| `dpdk.cfg` | | |
+| `embedded_sql.cfg` | | |
+| `emscripten.cfg` | | |
+| `ginac.cfg` | | |
+| `gnu.cfg` | [GNU](https://www.gnu.org/) | |
+| `googletest.cfg` | [GoogleTest](https://github.com/google/googletest) | |
+| `gtk.cfg` | [GTK](https://www.gtk.org/) | |
+| `icu.cfg` | | |
+| `kde.cfg` | [KDE](https://kde.org/) | |
+| `libcerror.cfg` | [libcerror](https://github.com/libyal/libcerror) | |
+| `libcurl.cfg` | [libcurl](https://curl.se/libcurl/) | |
+| `libsigc++.cfg` | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
+| `lua.cfg` | | |
+| `mfc.cfg` | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
+| `microsoft_atl.cfg` | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
+| `microsoft_sal.cfg` | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
+| `microsoft_unittest.cfg` | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
+| `motif.cfg` | | |
+| `nspr.cfg` | | |
+| `ntl.cfg` | | |
+| `opencv2.cfg` | [OpenCV](https://opencv.org/) | |
+| `opengl.cfg` | [OpenGL](https://opengl.org/) | |
+| `openmp.cfg` | [OpenMP](https://www.openmp.org/) | |
+| `openssl.cfg` | [OpenSSL](https://www.openssl.org/) | |
+| `pcre.cfg` | [PCRE](https://pcre.org/) | |
+| `posix.cfg` | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
+| `python.cfg` | | |
+| `qt.cfg` | [Qt](https://doc.qt.io/qt.html) | |
+| `ruby.cfg` | | |
+| `sdl.cfg` | | |
+| `sfml.cfg` | | |
+| `sqlite3.cfg` | [SQLite](https://www.sqlite.org/) | |
+| `std.cfg` | C/C++ standard library | Loaded by default |
+| `tinyxml2.cfg` | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
+| `vcl.cfg` | | |
+| `windows.cfg` | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
+| `wxsqlite3.cfg` | | |
+| `wxsvg.cfg` | | |
+| `wxwidgets.cfg` | [wxWidgets](https://www.wxwidgets.org/) | |
+| `zephyr.cfg` | | |
+| `zlib.cfg` | [zlib](https://www.zlib.net) | |
+
+## Creating a custom `.cfg` file
+
+You can create and use your own `.cfg` files for your projects. Use `--check-library` to get hints about what you should configure.
 
 You can use the `Library Editor` in the `Cppcheck GUI` to edit configuration files. It is available in the `View` menu.
 
-The .cfg file format is documented in the `Reference: Cppcheck .cfg format` (https://cppcheck.sourceforge.io/reference-cfg-format.pdf) document.
+The `.cfg` file format is documented in the `Reference: Cppcheck .cfg format` (<https://cppcheck.sourceforge.io/reference-cfg-format.pdf>) document.
 
-# HTML Report
+# HTML report
 
 You can convert the XML output from Cppcheck into a HTML report. You'll need Python and the pygments module (<http://pygments.org/>) for this to work. In the Cppcheck source tree there is a folder htmlreport that contains a script that transforms a Cppcheck XML file into HTML output.
 
@@ -1131,21 +1219,50 @@ The output screen says:
                        Default is reading from stdin.
        --report-dir=REPORT_DIR
                        The directory where the html report content is written.
-       --source-dir=SOURCE_DIR
-                       Base directory where source code files can be found.
+       --source-dir=SOURCE_DIR|URL
+                       Base directory where source code files can be found, or
+                       a URL to a remote GitHub/GitLab repository including a
+                       branch, e.g.:
+                         --source-dir=https://github.com/<username>/<repo>/blob/<branch>/
 
 Example usage:
 
     cppcheck gui/test.cpp --xml 2> err.xml
     cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.
 
-# Check Level
+or
+
+    cppcheck gui/test.cpp --xml 2> err.xml
+    cppcheck-htmlreport --file=err.xml --report-dir=test1 \
+         --source-dir=https://github.com/<username>/<repo>/blob/<branch>/
+
+## Choosing between local annotated HTML and remote repository links
+
+`cppcheck-htmlreport` supports two modes for linking to source files:
+
+- Local annotated HTML files (default when `--source-dir` is a filesystem path)
+- Remote GitHub/GitLab links (when `--source-dir` is a URL)
+
+Pointing `--source-dir` to a filesystem path generates local annotated HTML files.
+This is useful when you need a fully self-contained report that works offline,
+includes inline annotations, and is ideal for small or medium projects where
+generation is fast.
+Using a remote GitHub/GitLab URL avoids generating per-file HTML and keeps the
+summary report lightweight and fast to produce. This mode is ideal when the
+source is already hosted online and local duplication is unnecessary.
+Remote mode is especially helpful when the HTML report may be public or widely
+distributed but the source code should remain private, since access control is
+handled by the hosting service.
+In general, local mode fits air-gapped environments, while remote mode works
+best for CI workflows and large or private repositories.
+
+# Check level
 
 ## Reduced
 
 The "reduced" check level performs a limited data flow analysis. If developers
-want to run cppcheck directly during development and require faster results
-than "normal" provides then this reduced checking can be an option.
+want to run Cppcheck directly during development and require faster results
+than "normal" provides, then this reduced checking can be an option.
 
 ## Normal
 
@@ -1155,7 +1272,7 @@ The "normal" check level should be useful during active development:
 
 - checking files while you edit them.
 - block changes to the repo
-- etc
+- etc.
 
 ## Exhaustive
 
@@ -1164,7 +1281,7 @@ When you can wait longer for the results you can enable the "exhaustive" checkin
 Exhaustive checking level should be useful for scenarios where you can wait for results. For instance:
 
 - nightly builds
-- etc
+- etc.
 
 # Speeding up analysis
 
@@ -1172,18 +1289,17 @@ Exhaustive checking level should be useful for scenarios where you can wait for
 
 For performance reasons it might be a good idea to limit preprocessor configurations to check.
 
-## Limit ValueFlow: max if count
+## Limit ValueFlow: max `if` count
 
-The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of if in a function.
+The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of `if` in a function.
 
-When that limit is exceeded there is a limitation of data flow in that function. It is not drastic:
+When that limit is exceeded, there is a limitation of data flow in that function. It is not drastic:
 
 - Analysis of other functions are not affected.
 - It's only for some specific data flow analysis, we have data flow analysis that is always executed.
 - All checks are always executed. There can still be plenty of warnings in the limited function.
 
-There is data flow analysis that slows down exponentially when number of if increase. And the limit is intended to avoid that
-analysis time explodes.
+There is data flow analysis that slows down exponentially when number of `if` increase. And the limit is intended to avoid that analysis time explodes.
 
 ## GUI options
 
@@ -1194,13 +1310,13 @@ In the GUI:
 - Open the project dialog.
 - In the "Analysis" tab there are several options.
 
-If you want to use these limitations on the command line also you can import the GUI project file with --project.
+If you want to use these limitations on the command line too, you can import the GUI project file with `--project`.
 
 # Cppcheck Premium
 
 ## Bug hunting
 
-This is analysis that is more noisy than normal analysis. Most warnings will be false positives (cppcheck will wrongly claim that there are bugs). The design goal is to not have more than roughly 5 - 10 false positives in each file.
+This is analysis that is more noisy than normal analysis. Most warnings will be false positives (Cppcheck will wrongly claim that there are bugs). The design goal is to not have more than roughly 5 to 10 false positives in each file.
 
 It is not intended to be used in normal CI or regular static analysis by developers. The noise makes it useless for that.
 
@@ -1208,7 +1324,7 @@ It is intended to be used when you are looking for bugs and you really can accep
 
 - You have developed a brand new feature and want to ensure that there are no bugs.
 - Maybe as part of release testing your product you can run bug hunting on modified files.
-- Etc
+- Etc.
 
 Technically, analysis that is "sound" will detect all bugs. Analysis that is "soundy" has the goal to detect most bugs and it tries to keep the noise at an reasonable level.
 
@@ -1216,49 +1332,62 @@ The Cppcheck bug hunting analysis is "soundy".
 
 Command:
 
-    cppcheck --premium=bughunting ....
+    cppcheck --premium=bughunting ...
 
 ## Coding standards
 
 Command to activate Autosar checkers:
 
-    cppcheck --premium=autosar ....
+    cppcheck --premium=autosar ...
 
 Command to activate Cert C checkers:
 
-    cppcheck --premium=cert-c ....
+    cppcheck --premium=cert-c ...
 
 Command to activate Cert C++ checkers:
 
-    cppcheck --premium=cert-c++ ....
+    cppcheck --premium=cert-c++ ...
 
 Command to activate Misra C 2012 checkers:
 
-    cppcheck --premium=misra-c-2012 ....
+    cppcheck --premium=misra-c-2012 ...
 
 Command to activate Misra C 2023 checkers:
 
-    cppcheck --premium=misra-c-2023 ....
+    cppcheck --premium=misra-c-2023 ...
+
+Command to activate Misra C 2025 checkers:
+
+    cppcheck --premium=misra-c-2025 ...
 
 Command to activate Misra C++ 2008 checkers:
 
-    cppcheck --premium=misra-c++-2008 ....
+    cppcheck --premium=misra-c++-2008 ...
 
 Command to activate Misra C++ 2023 checkers:
 
-    cppcheck --premium=misra-c++-2023 ....
+    cppcheck --premium=misra-c++-2023 ...
 
-## Compliance report
+### Checking all C and C++ files
+
+The `cert-c` and `misra-c-*` coding standards target C and therefore the checkers only check C files by default.
+
+The `autosar`, `cert-c++` and `misra-c++-*` coding standards target C++ and therefore the checkers only check C++ files by default.
+
+If you want to check all files, you can append `:all` to the coding standard. Example:
 
-### Graphical user interface
+    # Misra C checkers are executed on C files, not on C++ files
+    cppcheck --premium=misra-c-2025 path
 
-Run a analysis with some coding standards enabled. After that you can click on
-the `Compliance report...` in the `File` menu.
+    # Misra C checkers are executed on C and C++ files
+    cppcheck --premium=misra-c-2025:all path
+
+## Compliance report
 
 ### Command line
 
 There is a tool `compliance-report` that is distributed with Cppcheck Premium. To see
-all available options run `compliance-report` in a terminal with no options.
+all available options, run `compliance-report` in a terminal with no options.
 
 Below is example usage to generate a Misra C 2012 compliance report.
 
@@ -1271,26 +1400,77 @@ Description of the options:
 - `--misra-c-2012`: Generate a compliance report for misra-c-2012
 - `--project-name`: The name of the project
 - `--project-version`: The version of the project
-- `--output-file`: html filename that the report should be written to
-- `results.xml`: The xml output from cppcheck
+- `--output-file`: HTML filename that the report should be written to
+- `results.xml`: The XML output from Cppcheck
+
+## Metrics
+
+To generate metrics, add option `--premium=metrics`. The metrics are saved in the XML v3 report.
+Example:
+
+    cppcheck --premium=metrics test.c --xml-version=3 2> res.xml
+
+We provide a small simple python script that creates a metrics report in CSV format:
+
+    python3 HISReport.py -f res.xml -j path/to/cppcheck-id-mapping.json -o test.csv
+
+The `cppcheck-id-mapping.json` is provided in the Cppcheck premium installation folder, i.e.
+`/opt/cppcheckpremium` or `C:\Program Files\Cppcheck Premium`.
+
+We do not have a ready-made solution to generate a HTML/pdf report. You can easily tweak our
+`HISReport.py` script so that it generates HTML and get the report exactly as you want.
 
 ## Licenses
 
-### Individual license
+### Commercial terms
+
+Information about Cppcheck Premium licenses:
+<https://www.cppcheck.com/plans-pricing>
+
+### Installation / registration
+
+This is described on the Cppcheck Premium website:
+<https://www.cppcheck.com>
+
+### License file path
+
+There are predefined paths where the premium addon search for license files. If you want to
+provide an arbitrary license file path on the command line, you can use the option
+`--premium-license-file`. Example:
+
+    cppcheck --premium-license-file=path/to/file.lic test.cpp
+
+If an explicit path is provided like this, then premium addon does not search for license
+files in the predefined paths.
+
+### Troubleshooting
+
+#### Step 1: check `premiumaddon` debug output
+
+If your license does not work, you can get some details about the license validation by executing
+`premiumaddon` binary with the `--debug` option.
+
+Windows:
+
+    premiumaddon.exe --debug
+
+Linux/Mac:
+
+    premiumaddon --debug
 
-A license that is connected to your computer.
+These commands can be executed from an arbitrary folder.
 
-After installing you run a register tool that will create a license file
-which is locked to your computer.
+#### Step 2: clean up Cppcheck build dir
 
-### Enterprise license
+Command line:
+If you use `--cppcheck-build-dir`, then remove all files in the specified folder and recheck.
 
-You receive a license file. Copy that to one of these paths:
+Cppcheck GUI:
+The GUI normally by default creates a Cppcheck build dir. Clear all results and recheck.
+You can clear all results by clicking on the brush icon in the toolbar. Or by open `Edit` menu and selecting menu item `Clear results`.
 
-- Windows:
-  - C:\\ProgramData\\Cppcheck Solutions AB\\
+#### Step 3: remove `cppcheck-premium-loc` files
 
-- Linux:
-  - /etc/cppcheckpremium/
-  - ~/.cppcheckpremium/
+If you have `cppcheck-premium-loc` files in your project folders, those should be removed.
 
+If such files are generated during analysis, then review your scripts to check why those files are generated.
diff --git a/man/manual.md b/man/manual.md
index cdc692552d0..93d67e8f402 100644
--- a/man/manual.md
+++ b/man/manual.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck manual
-subtitle: Version 2.17.99
+subtitle: Version 2.22 dev
 author: Cppcheck team
 lang: en
 documentclass: report
@@ -8,8 +8,8 @@ documentclass: report
 
 # Introduction
 
-Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting 
-undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate 
+Cppcheck is an analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting
+undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code, and generate
 as few false positives (wrongly reported warnings) as possible. Cppcheck is designed to analyze your C/C++ code even
 if it has non-standard syntax, as is common in for example embedded projects.
 
@@ -17,7 +17,7 @@ Supported code and platforms:
 
 - Cppcheck checks non-standard code that contains various compiler extensions, inline assembly code, etc.
 - Cppcheck should be compilable by any compiler that supports C++11 or later.
-- Cppcheck is cross platform and is used in various posix/windows/etc environments.
+- Cppcheck is cross-platform and is used in various posix/windows/etc environments.
 
 The checks in Cppcheck are not perfect. There are bugs that should be found, that Cppcheck fails to detect.
 
@@ -30,11 +30,11 @@ The kinds of bugs that you can find with static analysis are:
 - Coding style
 
 There are many bugs that you can not find with static analysis. Static analysis tools do not have human knowledge about
-what your program is intended to do. If the output from your program is valid but unexpected then in most cases this is
-not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello"
+what your program is intended to do. If the output from your program is valid but unexpected, then in most cases this is
+not detected by static analysis tools. For instance, if your small program writes "Helo" on the screen instead of "Hello",
 it is unlikely that any tool will complain about that.
 
-Static analysis should be used as a complement in your quality assurance. It does not replace any of;
+Static analysis should be used as a complement in your quality assurance. It does not replace any of:
 
 - Careful design
 - Testing
@@ -70,7 +70,7 @@ Here is some simple code:
         return 0;
     }
 
-If you save that into file1.c and execute:
+If you save that into `file1.c` and execute:
 
     cppcheck file1.c
 
@@ -85,7 +85,7 @@ Normally a program has many source files. Cppcheck can check all source files in
 
     cppcheck path
 
-If "path" is a folder, then Cppcheck will recursively check all source files in this folder:
+If `path` is a folder, then Cppcheck will recursively check all source files in this folder:
 
     Checking path/file1.cpp...
     1/2 files checked 50% done
@@ -94,43 +94,62 @@ If "path" is a folder, then Cppcheck will recursively check all source files in
 
 ### Check files manually or use project file
 
-With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build 
+With Cppcheck you can check files manually by specifying files/paths to check and settings. Or you can use a build
 environment, such as CMake or Visual Studio.
 
-We don't know which approach (project file or manual configuration) will give you the best results. It is recommended 
-that you try both. It is possible that you will get different results so that to find the largest amount of bugs you 
+We don't know which approach (project file or manual configuration) will give you the best results. It is recommended
+that you try both. It is possible that you will get different results so that to find the largest amount of bugs you
 need to use both approaches. Later chapters will describe this in more detail.
 
 ### Check files matching a given file filter
 
-With `--file-filter=<str>` you can set a file filter and only those files matching the filter will be checked.
+With `--file-filter=<str>` you can configure file filter(s) and then only those files matching the filter will be checked.
 
-For example: if you want to check only those files and folders starting from a subfolder src/ that start with "test" 
-you have to type:
+You can use `**`, `*` and `?` in the file filter pattern.
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
+
+For example, this command below means that `src/test1.cpp` could be checked, but `src/file2.cpp` and `src/test/file1.cpp` will not be checked:
 
     cppcheck src/ --file-filter=src/test*
 
-Cppcheck first collects all files in src/ and will apply the filter after that. So the filter must start with the given 
-start folder. 
+Cppcheck first collects all files in the specified directory, then applies the filter. Therefore, the filter pattern
+must include the directory path you specified.
+
+A common use case for `--file-filter` is to check a project, but only check certain files:
+
+    cppcheck --project=compile_commands.json --file-filter=src/*.c
+
+Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `--file-filter=src/*.c` would mean that:
 
-### Excluding a file or folder from checking
+- a file with relative path `test1.c` is not checked.
+- a file with relative path `src/test2.c` can be checked.
+- a file with relative path `src/test3.cpp` is not checked.
 
-To exclude a file or folder, there are two options. The first option is to only provide the paths and files you want to 
-check:
+### Ignore files matching a given pattern
 
-    cppcheck src/a src/b
+With `-i <str>` you can configure filename/directory patterns that should be ignored.
 
-All files under src/a and src/b are then checked.
+A file that is ignored will not be checked directly (the complete translation unit is skipped). Any header `#include`'d from a source file which is not ignored is checked indirectly, regardless if the header is ignored.
 
-The second option is to use -i, which specifies the files/paths to ignore. With this command no files in src/c are 
-checked:
+> *Note*: If you want to filter out warnings for a header file, then `-i` will not work. Use suppressions instead.
 
-    cppcheck -isrc/c src
+You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.
 
-This option is only valid when supplying an input directory. To ignore multiple directories supply the -i flag for each 
-directory individually. The following command ignores both the src/b and src/c directories:
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
-    cppcheck -isrc/b -isrc/c
+A use case for `-i` is to check a project, but exclude certain files/folders:
+
+    cppcheck --project=compile_commands.json -itest
+
+Typically a `compile_commands.json` contains absolute paths. However no matter if `compile_commands.json` contains absolute paths or relative paths, the option `-itest` would mean that:
+
+- a file with relative path `test1.cpp` can be checked.
+- a file with relative path `test/somefile.cpp` is not checked
 
 ### Clang parser (experimental)
 
@@ -138,10 +157,10 @@ By default Cppcheck uses an internal C/C++ parser. However there is an experimen
 
 Install `clang`. Then use Cppcheck option `--clang`.
 
-Technically, Cppcheck will execute `clang` with its `-ast-dump` option. The Clang output is then imported and converted into 
-the normal Cppcheck format. And then normal Cppcheck analysis is performed on that.
+Cppcheck executes clang with the -ast-dump option, imports the output, converts it to Cppcheck's internal format, and then
+performs standard analysis.
 
-You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it 
+You can also pass a custom Clang executable to the option by using for example `--clang=clang-10`. You can also pass it
 with a path. On Windows it will append the `.exe` extension unless you use a path.
 
 ## Severities
@@ -162,26 +181,25 @@ stylistic issues, such as unused functions, redundant code, constness, operator
 
 **performance**
 
-run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference 
+run time performance suggestions based on common knowledge, though it is not certain any measurable speed difference
 will be achieved by fixing these messages.
 
 **portability**
 
-portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works 
+portability warnings. Implementation defined behavior. 64-bit portability. Some undefined behavior that probably works
 "as you want", etc.
 
 **information**
 
-configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could 
+configuration problems, which does not relate to the syntactical correctness, but the used Cppcheck configuration could
 be improved.
 
 ## Possible speedup analysis of template code
 
 Cppcheck instantiates the templates in your code.
 
-If your templates are recursive this can lead to slow analysis that uses a lot
-of memory. Cppcheck will write information messages when there are potential
-problems.
+If your templates are recursive, this can lead to slow analysis and high memory usage. Cppcheck will write information
+messages when there are potential problems.
 
 Example code:
 
@@ -207,7 +225,7 @@ Cppcheck output:
 As you can see Cppcheck has instantiated `a<i+1>` until `a<101>` was reached
 and then it bails out.
 
-To limit template recursion you can:
+To limit template recursion, you can:
 
 - add template specialisation
 - configure Cppcheck, which can be done in the GUI project file dialog
@@ -231,14 +249,13 @@ Example code with template specialisation:
 
 You can pass `-D__cppcheck__` when checking this code.
 
-
 # Cppcheck build folder
 
 Using a Cppcheck build folder is not mandatory but it is recommended.
 
 Cppcheck save analyzer information in that folder.
 
-The advantages are;
+The advantages are:
 
 - It speeds up the analysis as it makes incremental analysis possible. Only changed files are analyzed when you recheck.
 - Whole program analysis also when multiple threads are used.
@@ -265,36 +282,44 @@ You can import and use Cppcheck GUI project files in the command line tool:
 
     cppcheck --project=foobar.cppcheck
 
-The Cppcheck GUI has a few options that are not available in the command line directly. To use these options you can import a GUI project file. 
+The Cppcheck GUI has a few options that are not available in the command line directly. To use these options, you can import a GUI project file.
 The command line tool usage is kept intentionally simple and the options are therefore limited.
 
-To ignore certain folders in the project you can use `-i`. This will skip the analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip the analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.cppcheck -ifoo
 
-## CMake
+## Compilation database (CMake etc.)
 
-Generate a compile database:
+Many build systems can generate a compilation database (a JSON file containing compilation commands for each source file).
+Example `cmake` command to generate the file:
 
     cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .
 
-The file `compile_commands.json` is created in the current folder. Now run Cppcheck like this:
+When you have a `compile_commands.json` file, you can run Cppcheck like this:
 
     cppcheck --project=compile_commands.json
 
+By default only 1 configuration is checked because that is consistent with the compilation. If you want to check more configurations, you can use `--max-configs` or `--force`. For example:
+
+    cppcheck --project=compile_commands.json --force
+
 To ignore certain folders you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=compile_commands.json -ifoo
 
-
 ## Visual Studio
 
-You can run Cppcheck on individual project files (\*.vcxproj) or on a whole solution (\*.sln)
+You can run Cppcheck on individual project files (`*.vcxproj`) or on a whole solution (`*.sln`) or (`*.slnx`).
 
 Running Cppcheck on an entire Visual Studio solution:
 
     cppcheck --project=foobar.sln
 
+Running Cppcheck on an entire Visual Studio 2026 solution:
+
+    cppcheck --project=foobar.slnx
+
 Running Cppcheck on a Visual Studio project:
 
     cppcheck --project=foobar.vcxproj
@@ -306,7 +331,7 @@ Limiting on a single configuration:
 
 In the `Cppcheck GUI` you have the option to only analyze a single debug configuration. If you want to use this option on the command line, then create a `Cppcheck GUI` project with this activated and then import the GUI project file on the command line.
 
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.vcxproj -ifoo
 
@@ -316,25 +341,28 @@ Running Cppcheck on a C++ Builder 6 project:
 
     cppcheck --project=foobar.bpr
 
-
-To ignore certain folders in the project you can use `-i`. This will skip analysis of source files in the `foo` folder.
+To ignore certain folders in the project, you can use `-i`. This will skip analysis of source files in the `foo` folder.
 
     cppcheck --project=foobar.bpr -ifoo
 
 ## Other
 
-If you can generate a compile database, then it is possible to import that in Cppcheck.
+If you generate a compilation database, then it is possible to import that in Cppcheck.
 
-In Linux you can use for instance the `bear` (build ear) utility to generate a compile database from arbitrary build tools:
+### Makefile
+
+In Linux you can convert a Makefile to a `compile_commands.json` using for instance `bear` (build ear) utility:
 
     bear -- make
 
-# Preprocessor Settings
+If you don't use Linux, there are Python scripts that converts a Makefile into a compilation database.
+
+# Preprocessor settings
 
-If you use `--project` then Cppcheck will automatically use the preprocessor settings in the imported project file and
+If you use `--project`, then Cppcheck will automatically use the preprocessor settings in the imported project file and
 likely you don't have to configure anything extra.
 
-If you don't use `--project` then a bit of manual preprocessor configuration might be required. However Cppcheck has
+If you don't use `--project`, then a bit of manual preprocessor configuration might be required. However Cppcheck has
 automatic configuration of defines.
 
 ## Automatic configuration of preprocessor defines
@@ -342,7 +370,7 @@ automatic configuration of defines.
 Cppcheck automatically test different combinations of preprocessor defines to achieve as high coverage in the analysis
 as possible.
 
-Here is a file that has 3 bugs (when x,y,z are assigned).
+Here is a file that has 3 bugs (when `x`, `y`, `z` are assigned).
 
     #ifdef A
         x=100/0;
@@ -357,9 +385,12 @@ Here is a file that has 3 bugs (when x,y,z are assigned).
     #error C must be defined
     #endif
 
+The flag `-D` tells Cppcheck that a name is defined. Cppcheck will only analyze configurations that
+contain this define.
+
+The flag `-U` tells Cppcheck that a name is not defined. Cppcheck will only analyze configurations
+that does not contain this define.
 
-The flag `-D` tells Cppcheck that a name is defined. There will be no Cppcheck analysis without this define.
-The flag `-U` tells Cppcheck that a name is not defined. There will be no Cppcheck analysis with this define.
 The flag `--force` and `--max-configs` is used to control how many combinations are checked. When `-D` is used,
 Cppcheck will only check 1 configuration unless these are used.
 
@@ -370,14 +401,14 @@ Example:
     cppcheck test.c
 
     # only test configuration "-DA"
-    # No bug is found (#error)
+    # No bug is found; because C is not defined the #error will cause a preprocessor error
     cppcheck -DA test.c
 
     # only test configuration "-DA -DC"
     # The first bug is found
     cppcheck -DA -DC test.c
 
-    # The configuration "-DC" is tested
+    # Test all configurations that does not define "A"
     # The last bug is found
     cppcheck -UA test.c
 
@@ -385,20 +416,27 @@ Example:
     # The two first bugs are found
     cppcheck --force -DA test.c
 
+    # only test 1 valid configuration
+    # Bug(s) will be found
+    cppcheck --max-configs=1 test.c
+
+    # test 2 valid configurations with "X" defined.
+    # Bug(s) will be found
+    cppcheck --max-configs=2 -DX test.c
 
 ## Include paths
 
-To add an include path, use `-I`, followed by the path.
+To add an include path, use `-I` followed by the path.
 
-Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors 
-stop working when they encounter a missing header, Cppcheck will just print an information message and continues 
+Cppcheck's preprocessor basically handles includes like any other preprocessor. However, while other preprocessors
+stop working when they encounter a missing header, Cppcheck will just print an information message and continues
 parsing the code.
 
-The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code. 
-Actually, it is recommended to not give all include paths. 
-While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members, 
-passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking 
-time. For such cases, .cfg files are the preferred way to provide information about the implementation of functions and 
+The purpose of this behaviour is that Cppcheck is meant to work without necessarily seeing the entire code.
+Actually, it is recommended to not give all include paths.
+While it is useful for Cppcheck to see the declaration of a class when checking the implementation of its members,
+passing standard library headers is discouraged, because the analysis will not work fully and lead to a longer checking
+time. For such cases, `.cfg` files are the preferred way to provide information about the implementation of functions and
 types to Cppcheck, see below for more information.
 
 # Platform
@@ -429,7 +467,7 @@ You can also create your own custom platform configuration in a XML file. Here i
       </sizeof>
     </platform>
 
-# C/C++ Standard
+# C/C++ standard
 
 Use `--std` on the command line to specify a C/C++ standard.
 
@@ -458,14 +496,15 @@ the GUI, the build dir is configured in the project options.
 Rechecking code will be much faster. Cppcheck does not analyse unchanged code. The old warnings are
 loaded from the build dir and reported again.
 
-Whole program analysis does not work when multiple threads are used; unless you use a cppcheck
+Whole program analysis does not work when multiple threads are used unless you use a Cppcheck
 build dir. For instance, the unusedFunction warnings require whole program analysis.
 
 # Suppressions
 
 If you want to filter out certain errors from being generated, then it is possible to suppress these.
 
-If you encounter a false positive, then please report it to the Cppcheck team so that it can be fixed.
+If you encounter a false positive, please report it to the Cppcheck team so that the issue can be
+fixed.
 
 ## Plain text suppressions
 
@@ -475,19 +514,23 @@ The format for an error suppression is one of:
     [error id]:[filename2]
     [error id]
 
-The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal cppcheck text output. The suppression `error id` may contain \* to match any sequence of tokens.
+The `error id` is the id that you want to suppress. The id of a warning is shown in brackets in the normal Cppcheck text output.
+
+The `error id` and `filename` patterns may contain `**`, `*` or `?`.
 
-The filename may include the wildcard characters \* or ?, which matches any sequence of characters or any single character respectively.
-It is recommended to use forward-slash `/` as path separator on all operating systems. The filename must match the filename in the reported warning exactly.
-For instance, if the warning contains a relative path, then the suppression must match that relative path.
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
 
-## Command line suppression
+It is recommended to use forward-slash `/` in the filename pattern as path separator on all operating systems.
+
+### Command line suppression
 
 The `--suppress=` command line option is used to specify suppressions on the command line. Example:
 
     cppcheck --suppress=memleak:src/file1.cpp src/
 
-## Suppressions in a file
+### Suppressions in a file
 
 You can create a suppressions file for example as follows:
 
@@ -518,15 +561,49 @@ You can specify suppressions in a XML file, for example as follows:
       </suppress>
     </suppressions>
 
+The `id` and `fileName` patterns may contain `**`, `*` or `?`.
+
+- `**` matches zero or more characters, including path separators.
+- `*` matches zero or more characters, excluding path separators.
+- `?` matches any single character except path separators.
+
 The XML format is extensible and may be extended with further attributes in the future.
 
 The usage of the suppressions file is as follows:
 
     cppcheck --suppress-xml=suppressions.xml src/
 
+### The `<hash>` element
+
+Cppcheck calculates a unique ID for each error, called the hash. The hash depends on the code that
+is related to the error, not on where that code is located. This means that the hash for an error
+stays the same even when unrelated code elsewhere in the file is added, removed or moved, shifting
+the line numbers around. The hash only changes if the related code itself is modified.
+
+This makes hash-based suppressions more robust than line-based suppressions: once you have
+reviewed and suppressed a specific warning, the suppression keeps working even after the file is
+edited, as long as the offending code is not changed.
+
+The hash for an error is included as the `hash` attribute in the [XML output](#the-error-element).
+You can copy that value into a `<hash>` element in a suppressions XML file:
+
+    <?xml version="1.0"?>
+    <suppressions>
+      <suppress>
+        <id>uninitvar</id>
+        <fileName>src/file1.c</fileName>
+        <hash>12345678</hash>
+      </suppress>
+    </suppressions>
+
+A suppression can use `<hash>` on its own, without `<id>`, to suppress a specific error regardless
+of its id. It is also possible to combine `<hash>` with `<id>`, `<fileName>`, `<lineNumber>` and
+`<symbolName>`; when several of these are specified, all of them must match for the suppression to
+apply.
+
 ## Inline suppressions
 
-Suppressions can also be added directly in the code by adding comments that contain special keywords. 
+Suppressions can also be added directly in the code by adding comments that contain special keywords.
 Note that adding comments sacrifices the readability of the code somewhat.
 
 This code will normally generate an error message:
@@ -551,7 +628,7 @@ You can suppress a warning `aaaa` with:
 
     // cppcheck-suppress aaaa
 
-Suppressing multiple ids in one comment by using []:
+Suppressing multiple ids in one comment by using `[]`:
 
     // cppcheck-suppress [aaaa, bbbb]
 
@@ -582,7 +659,6 @@ Suppressing warnings `aaaa` where macro is used:
     ...
     x = MACRO; // <- aaaa warnings are suppressed here
 
-
 Suppressing multiple ids where macro is used:
 
     // cppcheck-suppress-macro [aaaa, bbbb]
@@ -611,7 +687,21 @@ Or at the same line as the code:
         arr[10] = 0;  // cppcheck-suppress arrayIndexOutOfBounds
     }
 
-In this example there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
+The suppression comment and the line of code may be separated by additional comments or empty lines:
+
+    void f() {
+        char arr[5];
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+
+        arr[10] = 0;
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+        // Set the tenth element of arr to zero
+        arr[10] = 0;
+    }
+
+In the example below there are 2 lines with code and 1 suppression comment. The suppression comment only applies to 1 line: `a = b + c;`.
 
     void f() {
         a = b + c; // cppcheck-suppress abc
@@ -658,7 +748,6 @@ Suppression comment on the same line as the code:
         arr[10] = arr[10] / 0;  // cppcheck-suppress[arrayIndexOutOfBounds,zerodiv]
     }
 
-
 ### Symbol name
 
 You can specify that the inline suppression only applies to a specific symbol:
@@ -758,7 +847,7 @@ If you want to reformat the output so that it looks different, then you can use
 
 ## Predefined output formats
 
-To get Visual Studio compatible output you can use --template=vs:
+To get Visual Studio compatible output, you can use `--template=vs`:
 
     cppcheck --template=vs samples/arrayIndexOutOfBounds/bad.c
 
@@ -768,7 +857,7 @@ This output will look like this:
     samples/arrayIndexOutOfBounds/bad.c(6): error: Array
     'a[2]' accessed at index 2, which is out of bounds.
 
-To get gcc compatible output you can use --template=gcc:
+To get GCC-compatible output, you can use `--template=gcc`:
 
     cppcheck --template=gcc samples/arrayIndexOutOfBounds/bad.c
 
@@ -806,7 +895,7 @@ The output will look like this:
     samples/arrayIndexOutOfBounds/bad.c,6,error,arrayIndexOutOfBounds,
     Array 'a[2]' accessed at index 2, which is out of bounds.
 
-## User defined output format (multi line)
+## User defined output format (multi-line)
 
 Many warnings have multiple locations. Example code:
 
@@ -822,9 +911,9 @@ Many warnings have multiple locations. Example code:
         return 0;
     }
 
-There is a possible null pointer dereference at line 3. 
-Cppcheck can show how it came to that conclusion by showing extra location information. 
-You need to use both --template and --template-location at the command line, for example:
+There is a possible null pointer dereference at line 3.
+Cppcheck can show how it came to that conclusion by showing extra location information.
+You need to use both `--template` and `--template-location` at the command line, for example:
 
     cppcheck \
     --template="{file}:{line}: {severity}: {message}\n{code}" \
@@ -846,13 +935,13 @@ The output from Cppcheck is:
         *p = 3;
          ^
 
-The first line in the warning is formatted by the --template format.
+The first line in the warning is formatted by the `--template` format.
 
-The other lines in the warning are formatted by the --template-location format.
+The other lines in the warning are formatted by the `--template-location` format.
 
-### Format specifiers for --template
+### Format specifiers for `--template`
 
-The available specifiers for --template are:
+The available specifiers for `--template` are:
 
 **{file}**
 
@@ -868,11 +957,11 @@ Column number
 
 **{callstack}**
 
-Write all locations. Each location is written in [{file}:{line}] format and the locations are separated by ->. For instance it might look like: [multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]
+Write all locations. Each location is written in `[{file}:{line}]` format and the locations are separated by `->`. For instance it might look like: `[multiline.c:8] -> [multiline.c:9] -> [multiline.c:3]`
 
 **{inconclusive:text}**
 
-If warning is inconclusive, then the given text is written. The given text can be any text that does not contain }. Example: {inconclusive:inconclusive,}
+If warning is inconclusive, then the given text is written. The given text can be any text that does not contain `}`. Example: `{inconclusive:inconclusive,}`
 
 **{severity}**
 
@@ -906,7 +995,7 @@ Newline
 
 Carriage return
 
-### Format specifiers for --template-location
+### Format specifiers for `--template-location`
 
 The available specifiers for `--template-location` are:
 
@@ -958,7 +1047,7 @@ Example code:
         int x = 0;
     }
 
-In Cppcheck text output the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
+In Cppcheck text output, the remarks are not shown by default, you can use `--template` option `{remark}` to show remarks:
 
     $ ./cppcheck --enable=style \
     --template="{file}:{line}: {message} [{id}]\\n{remark}" test1.c
@@ -967,12 +1056,12 @@ In Cppcheck text output the remarks are not shown by default, you can use `--tem
     test1.c:4: Variable 'x' is assigned a value that is never used. [unreadVariable]
     Initialize x with 0
 
-In xml output the comment text is provided in a "remark" attribute:
+In XML output, the comment text is provided in a `remark` attribute:
 
     $ ./cppcheck --enable=style --xml test1.c
-    ....
+    ...
     remark="Initialize x with 0"
-    ....
+    ...
 
 # Addons
 
@@ -982,11 +1071,11 @@ Cppcheck is distributed with a few addons which are listed below.
 
 ## Supported addons
 
-### misra.py
+### `misra.py`
 
-[misra.py](https://github.com/danmar/cppcheck/blob/main/addons/misra.py) is used to verify compliance with MISRA C 2012, a proprietary set of guidelines to avoid questionable code, developed for embedded systems.
+[`misra.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/misra.py) is used to verify compliance with MISRA C 2012, a proprietary set of guidelines to avoid questionable code, developed for embedded systems.
 
-The misra.py script does not provide rule texts, those should be downloaded from [MISRA](https://gitlab.com/MISRA/MISRA-C/MISRA-C-2012/tools)
+The `misra.py` script does not provide rule texts, those should be downloaded from [MISRA](https://gitlab.com/MISRA/MISRA-C/MISRA-C-2012/tools).
 
 To load the rule texts, create a configuration file. Example `misra.json`:
 
@@ -1004,52 +1093,51 @@ To use that `misra.json` in Cppcheck analysis, use option `--addon=misra.json`:
 
 Misra checkers in open source Cppcheck only cover MISRA rules partially and for full coverage use Cppcheck Premium.
 
-### namingng.py
+### `namingng.py`
 
-[namingng.py](https://github.com/danmar/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
+[`namingng.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/namingng.py) allows you to configure and check naming conventions.
 
 You need to have a configuration file that defines your naming conventions. By default the filename `namingng.config.json` is used but there is an option so you can use any filename you want.
 
 Example configuration of naming conventions:
-```
-{
-   "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
-   "RE_PRIVATE_MEMBER_VARIABLE": null,
-   "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
-   "_comment": "comments can be added to the config with underscore-prefixed keys",
-   "include_guard": {
-       "input": "path",
-       "prefix": "GUARD_",
-       "case": "upper",
-       "max_linenr": 5,
-       "RE_HEADERFILE": "[^/].*\\.h\\Z",
-       "required": true
-   },
-   "var_prefixes": {"uint32_t": "ui32"},
-   "function_prefixes": {"uint16_t": "ui16",
-                         "uint32_t": "ui32"}
-}
-```
-
-### threadsafety.py
-
-[threadsafety.py](https://github.com/danmar/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
-
-### y2038.py
-
-[y2038.py](https://github.com/danmar/cppcheck/blob/main/addons/y2038.py) checks Linux systems for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety. This required [modified environment](https://github.com/3adev/y2038). See complete description [here](https://github.com/danmar/cppcheck/blob/main/addons/doc/y2038.txt).
-
-## Running Addons
+
+    {
+        "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
+        "RE_PRIVATE_MEMBER_VARIABLE": null,
+        "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
+        "_comment": "comments can be added to the config with underscore-prefixed keys",
+        "include_guard": {
+            "input": "path",
+            "prefix": "GUARD_",
+            "case": "upper",
+            "max_linenr": 5,
+            "RE_HEADERFILE": "[^/].*\\.h\\Z",
+            "required": true
+        },
+        "var_prefixes": {"uint32_t": "ui32"},
+        "function_prefixes": {"uint16_t": "ui16",
+                              "uint32_t": "ui32"}
+    }
+
+### `threadsafety.py`
+
+[`threadsafety.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/threadsafety.py) analyses Cppcheck dump files to locate thread safety issues like static local objects used by multiple threads.
+
+### `y2038.py`
+
+[`y2038.py`](https://github.com/cppcheck-opensource/cppcheck/blob/main/addons/y2038.py) checks source code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety.
+
+## Running addons
 
 Addons can be executed with the `--addon` option:
 
     cppcheck --addon=namingng.py somefile.c
 
-Likewise, if you have created your own script you can execute that:
+Likewise, if you have created your own script, you can execute that:
 
     cppcheck --addon=mychecks.py somefile.c
 
-You can configure how you want to execute an addon in a json file. For example:
+You can configure how you want to execute an addon in a JSON file. For example:
 
     {
         "script": "mychecks.py",
@@ -1059,7 +1147,7 @@ You can configure how you want to execute an addon in a json file. For example:
         "ctu": false
     }
 
-To use that json file to execute your addon use the --addon option:
+To use that JSON file to execute your addon, use the `--addon` option:
 
     cppcheck --addon=mychecks.json somefile.c
 
@@ -1069,74 +1157,75 @@ Cppcheck search for addons in the local folder first and then in the installatio
 
 # Library configuration
 
-When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc, Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
-
-Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, std.cfg, is always loaded by cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the cppcheck project.
-
-## Using a .cfg file
-
-To use a .cfg file shipped with cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
-| .cfg file         | Library       | Comment       |
-| ----------------- | ------------- | ------------- |
-| avr.cfg           |               |               |
-| bento4.cfg        | [Bento4](http://www.bento4.com/) | |
-| boost.cfg         | [Boost](http://www.boost.org/) | |
-| bsd.cfg           | [BSD](https://www.freebsd.org/) | |
-| cairo.cfg         | [cairo](https://www.cairographics.org/) | |
-| cppcheck-lib.cfg  | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of |
-|                   |               |the Cppcheck code base |
-| cppunit.cfg       | [CppUnit](https://sourceforge.net/projects/cppunit/) |
-| dpdk.cfg          |               |               |
-| embedded_sql.cfg  |               |               |
-| emscripten.cfg | | |
-| ginac.cfg | | |
-| gnu.cfg | [GNU](https://www.gnu.org/) | |
-| googletest.cfg | [GoogleTest](https://github.com/google/googletest) | |
-| gtk.cfg | [GTK](https://www.gtk.org/) | |
-| icu.cfg | | |
-| kde.cfg | [KDE](https://kde.org/) | |
-| libcerror.cfg | [libcerror](https://github.com/libyal/libcerror) | |
-| libcurl.cfg | [libcurl](https://curl.se/libcurl/) | |
-| libsigc++.cfg | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
-| lua.cfg | | |
-| mfc.cfg | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
-| microsoft_atl.cfg | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
-| microsoft_sal.cfg | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
-| microsoft_unittest.cfg | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
-| motif.cfg | | |
-| nspr.cfg | | |
-| ntl.cfg | | |
-| opencv2.cfg | [OpenCV](https://opencv.org/) | |
-| opengl.cfg | [OpenGL](https://opengl.org/) | |
-| openmp.cfg | [OpenMP](https://www.openmp.org/) | |
-| openssl.cfg | [OpenSSL](https://www.openssl.org/) | |
-| pcre.cfg | [PCRE](https://pcre.org/) | |
-| posix.cfg | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
-| python.cfg | | |
-| qt.cfg | [Qt](https://doc.qt.io/qt.html) | |
-| ruby.cfg | | |
-| sdl.cfg | | |
-| sfml.cfg | | |
-| sqlite3.cfg | [SQLite](https://www.sqlite.org/) | |
-| std.cfg | C/C++ standard library | Loaded by default
-| tinyxml2.cfg | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
-| vcl.cfg | | |
-| windows.cfg | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
-| wxsqlite3.cfg | | |
-| wxsvg.cfg | | |
-| wxwidgets.cfg | [wxWidgets](https://www.wxwidgets.org/) | |
-| zephyr.cfg | | |
-| zlib.cfg | [zlib](https://www.zlib.net) | |
-
-## Creating a custom .cfg file
-
-You can create and use your own .cfg files for your projects. Use `--check-library` to get hints about what you should configure.
+When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc., Cppcheck has no information about functions, types, or macros contained in those libraries. Cppcheck then fails to detect various problems in the code, or might even abort the analysis. But this can be fixed by using the appropriate configuration files.
+
+Cppcheck already contains configurations for several libraries. They can be loaded as described below. Note that the configuration for the standard libraries of C and C++, `std.cfg`, is always loaded by Cppcheck. If you create or update a configuration file for a popular library, we would appreciate if you supplied it to the Cppcheck project.
+
+## Using a `.cfg` file
+
+To use a `.cfg` file shipped with Cppcheck, pass the `--library=<lib>` option. The table below shows the currently existing libraries:
+
+| `.cfg` file | Library | Comment |
+| --- | --- | --- |
+| `avr.cfg` | | |
+| `bento4.cfg` | [Bento4](http://www.bento4.com/) | |
+| `boost.cfg` | [Boost](http://www.boost.org/) | |
+| `bsd.cfg` | [BSD](https://www.freebsd.org/) | |
+| `cairo.cfg` | [cairo](https://www.cairographics.org/) | |
+| `cppcheck-lib.cfg` | [Cppcheck](http://cppcheck.net/) | Used in selfcheck of the Cppcheck code base |
+| `cppunit.cfg` | [CppUnit](https://sourceforge.net/projects/cppunit/) | |
+| `dpdk.cfg` | | |
+| `embedded_sql.cfg` | | |
+| `emscripten.cfg` | | |
+| `ginac.cfg` | | |
+| `gnu.cfg` | [GNU](https://www.gnu.org/) | |
+| `googletest.cfg` | [GoogleTest](https://github.com/google/googletest) | |
+| `gtk.cfg` | [GTK](https://www.gtk.org/) | |
+| `icu.cfg` | | |
+| `kde.cfg` | [KDE](https://kde.org/) | |
+| `libcerror.cfg` | [libcerror](https://github.com/libyal/libcerror) | |
+| `libcurl.cfg` | [libcurl](https://curl.se/libcurl/) | |
+| `libsigc++.cfg` | [libsigc++](https://github.com/libsigcplusplus/libsigcplusplus) | |
+| `lua.cfg` | | |
+| `mfc.cfg` | [MFC](https://learn.microsoft.com/en-us/cpp/mfc/mfc-desktop-applications) | |
+| `microsoft_atl.cfg` | [ATL](https://learn.microsoft.com/en-us/cpp/atl/active-template-library-atl-concepts) | |
+| `microsoft_gsl.cfg` | [Microsoft.GSL](https://github.com/microsoft/gsl) | |
+| `microsoft_sal.cfg` | [SAL annotations](https://learn.microsoft.com/en-us/cpp/c-runtime-library/sal-annotations) | |
+| `microsoft_unittest.cfg` | [CppUnitTest](https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference) | |
+| `motif.cfg` | | |
+| `nspr.cfg` | | |
+| `ntl.cfg` | | |
+| `opencv2.cfg` | [OpenCV](https://opencv.org/) | |
+| `opengl.cfg` | [OpenGL](https://opengl.org/) | |
+| `openmp.cfg` | [OpenMP](https://www.openmp.org/) | |
+| `openssl.cfg` | [OpenSSL](https://www.openssl.org/) | |
+| `pcre.cfg` | [PCRE](https://pcre.org/) | |
+| `posix.cfg` | [POSIX](https://pubs.opengroup.org/onlinepubs/9699919799/) | |
+| `python.cfg` | | |
+| `qt.cfg` | [Qt](https://doc.qt.io/qt.html) | |
+| `ruby.cfg` | | |
+| `sdl.cfg` | | |
+| `sfml.cfg` | | |
+| `sqlite3.cfg` | [SQLite](https://www.sqlite.org/) | |
+| `std.cfg` | C/C++ standard library | Loaded by default |
+| `tinyxml2.cfg` | [TinyXML-2](https://github.com/leethomason/tinyxml2) | |
+| `vcl.cfg` | | |
+| `windows.cfg` | [Win32 API](https://learn.microsoft.com/en-us/windows/win32/) | |
+| `wxsqlite3.cfg` | | |
+| `wxsvg.cfg` | | |
+| `wxwidgets.cfg` | [wxWidgets](https://www.wxwidgets.org/) | |
+| `zephyr.cfg` | | |
+| `zlib.cfg` | [zlib](https://www.zlib.net) | |
+
+## Creating a custom `.cfg` file
+
+You can create and use your own `.cfg` files for your projects. Use `--check-library` to get hints about what you should configure.
 
 You can use the `Library Editor` in the `Cppcheck GUI` to edit configuration files. It is available in the `View` menu.
 
-The .cfg file format is documented in the `Reference: Cppcheck .cfg format` (https://cppcheck.sourceforge.io/reference-cfg-format.pdf) document.
+The `.cfg` file format is documented in the `Reference: Cppcheck .cfg format` (<https://cppcheck.sourceforge.io/reference-cfg-format.pdf>) document.
 
-# HTML Report
+# HTML report
 
 You can convert the XML output from Cppcheck into a HTML report. You'll need Python and the pygments module (<http://pygments.org/>) for this to work. In the Cppcheck source tree there is a folder htmlreport that contains a script that transforms a Cppcheck XML file into HTML output.
 
@@ -1154,21 +1243,50 @@ The output screen says:
                        Default is reading from stdin.
        --report-dir=REPORT_DIR
                        The directory where the html report content is written.
-       --source-dir=SOURCE_DIR
-                       Base directory where source code files can be found.
+       --source-dir=SOURCE_DIR|URL
+                       Base directory where source code files can be found, or
+                       a URL to a remote GitHub/GitLab repository including a
+                       branch, e.g.:
+                         --source-dir=https://github.com/<username>/<repo>/blob/<branch>/
 
 Example usage:
 
     cppcheck gui/test.cpp --xml 2> err.xml
     cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.
 
-# Check Level
+or
+
+    cppcheck gui/test.cpp --xml 2> err.xml
+    cppcheck-htmlreport --file=err.xml --report-dir=test1 \
+         --source-dir=https://github.com/<username>/<repo>/blob/<branch>/
+
+## Choosing between local annotated HTML and remote repository links
+
+`cppcheck-htmlreport` supports two modes for linking to source files:
+
+- Local annotated HTML files (default when `--source-dir` is a filesystem path)
+- Remote GitHub/GitLab links (when `--source-dir` is a URL)
+
+Pointing `--source-dir` to a filesystem path generates local annotated HTML files.
+This is useful when you need a fully self-contained report that works offline,
+includes inline annotations, and is ideal for small or medium projects where
+generation is fast.
+Using a remote GitHub/GitLab URL avoids generating per-file HTML and keeps the
+summary report lightweight and fast to produce. This mode is ideal when the
+source is already hosted online and local duplication is unnecessary.
+Remote mode is especially helpful when the HTML report may be public or widely
+distributed but the source code should remain private, since access control is
+handled by the hosting service.
+In general, local mode fits air-gapped environments, while remote mode works
+best for CI workflows and large or private repositories.
+
+# Check level
 
 ## Reduced
 
 The "reduced" check level performs a limited data flow analysis. If developers
-want to run cppcheck directly during development and require faster results
-than "normal" provides then this reduced checking can be an option.
+want to run Cppcheck directly during development and require faster results
+than "normal" provides, then this reduced checking can be an option.
 
 ## Normal
 
@@ -1178,7 +1296,7 @@ The "normal" check level should be useful during active development:
 
 - checking files while you edit them.
 - block changes to the repo
-- etc
+- etc.
 
 ## Exhaustive
 
@@ -1187,7 +1305,7 @@ When you can wait longer for the results you can enable the "exhaustive" checkin
 Exhaustive checking level should be useful for scenarios where you can wait for results. For instance:
 
 - nightly builds
-- etc
+- etc.
 
 # Speeding up analysis
 
@@ -1195,18 +1313,17 @@ Exhaustive checking level should be useful for scenarios where you can wait for
 
 For performance reasons it might be a good idea to limit preprocessor configurations to check.
 
-## Limit ValueFlow: max if count
+## Limit ValueFlow: max `if` count
 
-The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of if in a function.
+The command line option `--performance-valueflow-max-if-count` adjusts the max count for number of `if` in a function.
 
-When that limit is exceeded there is a limitation of data flow in that function. It is not drastic:
+When that limit is exceeded, there is a limitation of data flow in that function. It is not drastic:
 
 - Analysis of other functions are not affected.
 - It's only for some specific data flow analysis, we have data flow analysis that is always executed.
 - All checks are always executed. There can still be plenty of warnings in the limited function.
 
-There is data flow analysis that slows down exponentially when number of if increase. And the limit is intended to avoid that
-analysis time explodes.
+There is data flow analysis that slows down exponentially when number of `if` increase. And the limit is intended to avoid that analysis time explodes.
 
 ## GUI options
 
@@ -1217,4 +1334,4 @@ In the GUI:
 - Open the project dialog.
 - In the "Analysis" tab there are several options.
 
-If you want to use these limitations on the command line also you can import the GUI project file with --project.
+If you want to use these limitations on the command line too, you can import the GUI project file with `--project`.
diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md
index 5ced0b065a4..f426057ab47 100644
--- a/man/reference-cfg-format.md
+++ b/man/reference-cfg-format.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck .cfg format
-subtitle: Version 2.17.99
+subtitle: Version 2.22 dev
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/writing-addons.md b/man/writing-addons.md
index ef097840227..2627671fa87 100644
--- a/man/writing-addons.md
+++ b/man/writing-addons.md
@@ -1,6 +1,6 @@
 ---
 title: Writing addons
-subtitle: Version 2.17.99
+subtitle: Version 2.22 dev
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
index 69a7147e895..e6966747958 100644
--- a/oss-fuzz/Makefile
+++ b/oss-fuzz/Makefile
@@ -1,6 +1,6 @@
 # This file is generated by dmake, do not edit.
 
-# make CXX=clang++ MATCHCOMPILER=yes CXXFLAGS="-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -DHAVE_BOOST" LIB_FUZZING_ENGINE="-fsanitize=fuzzer" oss-fuzz-client
+# make CXX=clang++ MATCHCOMPILER=yes CXXOPTS="-O1 -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -fsanitize-address-use-after-scope" CPPOPTS="-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DHAVE_BOOST" LIB_FUZZING_ENGINE="-fsanitize=fuzzer" oss-fuzz-client
 
 MATCHCOMPILER=yes
 ifndef MATCHCOMPILER
@@ -31,7 +31,13 @@ else
 endif
 
 INCS=-I../lib -isystem../externals/simplecpp -isystem../externals/tinyxml2 -isystem../externals/picojson
-CPPFLAGS=-std=c++11 -g -w $(INCS)
+
+override CXXFLAGS+=-std=c++11 -g -w
+override CPPFLAGS+=$(INCS)
+
+override CXXFLAGS += $(CXXOPTS)
+override CPPFLAGS += $(CPPOPTS)
+override LDFLAGS += $(LDOPTS)
 
 LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/tokenize.o \
@@ -39,7 +45,6 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/addoninfo.o \
               $(libcppdir)/analyzerinfo.o \
               $(libcppdir)/astutils.o \
-              $(libcppdir)/check.o \
               $(libcppdir)/check64bit.o \
               $(libcppdir)/checkassert.o \
               $(libcppdir)/checkautovariables.o \
@@ -52,6 +57,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checkersreport.o \
               $(libcppdir)/checkexceptionsafety.o \
               $(libcppdir)/checkfunctions.o \
+              $(libcppdir)/checkimpl.o \
               $(libcppdir)/checkinternal.o \
               $(libcppdir)/checkio.o \
               $(libcppdir)/checkleakautovar.o \
@@ -59,6 +65,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/checknullpointer.o \
               $(libcppdir)/checkother.o \
               $(libcppdir)/checkpostfixoperator.o \
+              $(libcppdir)/checks.o \
               $(libcppdir)/checksizeof.o \
               $(libcppdir)/checkstl.o \
               $(libcppdir)/checkstring.o \
@@ -87,7 +94,9 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/platform.o \
               $(libcppdir)/preprocessor.o \
               $(libcppdir)/programmemory.o \
+              $(libcppdir)/regex.o \
               $(libcppdir)/reverseanalyzer.o \
+              $(libcppdir)/sarifreport.o \
               $(libcppdir)/settings.o \
               $(libcppdir)/standards.o \
               $(libcppdir)/summaries.o \
@@ -106,10 +115,10 @@ EXTOBJ =      simplecpp.o \
               tinyxml2.o
 
 oss-fuzz-client: $(EXTOBJ) $(LIBOBJ) main.o type2.o
-	${CXX} $(CPPFLAGS) ${CXXFLAGS} -o $@ $^ ${LIB_FUZZING_ENGINE}
+	${CXX} ${CXXFLAGS} -o $@ $^ ${LIB_FUZZING_ENGINE}
 
 no-fuzz: $(EXTOBJ) $(LIBOBJ) main_nofuzz.o type2.o
-	${CXX} $(CPPFLAGS) ${CXXFLAGS} -o $@ $^
+	${CXX} ${CXXFLAGS} -o $@ $^
 
 translate: translate.o type2.o
 	${CXX} -std=c++11 -g ${CXXFLAGS} -o $@ type2.cpp translate.cpp
@@ -144,13 +153,13 @@ simplecpp.o: ../externals/simplecpp/simplecpp.cpp ../externals/simplecpp/simplec
 tinyxml2.o: ../externals/tinyxml2/tinyxml2.cpp ../externals/tinyxml2/tinyxml2.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -w -D_LARGEFILE_SOURCE -c -o $@ ../externals/tinyxml2/tinyxml2.cpp
 
-$(libcppdir)/valueflow.o: ../lib/valueflow.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/check.h ../lib/checkers.h ../lib/checkuninitvar.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/forwardanalyzer.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/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_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/valueflow.o: ../lib/valueflow.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkuninitvar.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/forwardanalyzer.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/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_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
 
-$(libcppdir)/tokenize.o: ../lib/tokenize.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/tokenize.o: ../lib/tokenize.cpp ../externals/simplecpp/simplecpp.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenize.cpp
 
-$(libcppdir)/symboldatabase.o: ../lib/symboldatabase.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/symboldatabase.o: ../lib/symboldatabase.cpp ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/symboldatabase.cpp
 
 $(libcppdir)/addoninfo.o: ../lib/addoninfo.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/config.h ../lib/json.h ../lib/path.h ../lib/standards.h ../lib/utils.h
@@ -159,31 +168,28 @@ $(libcppdir)/addoninfo.o: ../lib/addoninfo.cpp ../externals/picojson/picojson.h
 $(libcppdir)/analyzerinfo.o: ../lib/analyzerinfo.cpp ../externals/tinyxml2/tinyxml2.h ../lib/analyzerinfo.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/utils.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
 
-$(libcppdir)/astutils.o: ../lib/astutils.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/astutils.o: ../lib/astutils.cpp ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/astutils.cpp
 
-$(libcppdir)/check.o: ../lib/check.cpp ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
-	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check.cpp
-
-$(libcppdir)/check64bit.o: ../lib/check64bit.cpp ../lib/addoninfo.h ../lib/check.h ../lib/check64bit.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/check64bit.o: ../lib/check64bit.cpp ../lib/check.h ../lib/check64bit.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/check64bit.cpp
 
-$(libcppdir)/checkassert.o: ../lib/checkassert.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkassert.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkassert.o: ../lib/checkassert.cpp ../lib/astutils.h ../lib/check.h ../lib/checkassert.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkassert.cpp
 
-$(libcppdir)/checkautovariables.o: ../lib/checkautovariables.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkautovariables.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkautovariables.o: ../lib/checkautovariables.cpp ../lib/astutils.h ../lib/check.h ../lib/checkautovariables.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkautovariables.cpp
 
-$(libcppdir)/checkbool.o: ../lib/checkbool.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkbool.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkbool.o: ../lib/checkbool.cpp ../lib/astutils.h ../lib/check.h ../lib/checkbool.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbool.cpp
 
-$(libcppdir)/checkbufferoverrun.o: ../lib/checkbufferoverrun.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkbufferoverrun.h ../lib/checkers.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/checkbufferoverrun.o: ../lib/checkbufferoverrun.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/checkbufferoverrun.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbufferoverrun.cpp
 
-$(libcppdir)/checkclass.o: ../lib/checkclass.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/checkclass.o: ../lib/checkclass.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/checkclass.h ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkclass.cpp
 
-$(libcppdir)/checkcondition.o: ../lib/checkcondition.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkcondition.h ../lib/checkers.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkcondition.o: ../lib/checkcondition.cpp ../lib/astutils.h ../lib/check.h ../lib/checkcondition.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkcondition.cpp
 
 $(libcppdir)/checkers.o: ../lib/checkers.cpp ../lib/checkers.h ../lib/config.h
@@ -192,73 +198,79 @@ $(libcppdir)/checkers.o: ../lib/checkers.cpp ../lib/checkers.h ../lib/config.h
 $(libcppdir)/checkersidmapping.o: ../lib/checkersidmapping.cpp ../lib/checkers.h ../lib/config.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersidmapping.cpp
 
-$(libcppdir)/checkersreport.o: ../lib/checkersreport.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/checkersreport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/utils.h
+$(libcppdir)/checkersreport.o: ../lib/checkersreport.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/checkersreport.h ../lib/config.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkersreport.cpp
 
-$(libcppdir)/checkexceptionsafety.o: ../lib/checkexceptionsafety.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkexceptionsafety.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkexceptionsafety.o: ../lib/checkexceptionsafety.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkexceptionsafety.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkexceptionsafety.cpp
 
-$(libcppdir)/checkfunctions.o: ../lib/checkfunctions.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkfunctions.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkfunctions.o: ../lib/checkfunctions.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkfunctions.h ../lib/checkimpl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkfunctions.cpp
 
-$(libcppdir)/checkinternal.o: ../lib/checkinternal.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkinternal.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkimpl.o: ../lib/checkimpl.cpp ../lib/checkers.h ../lib/checkimpl.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkimpl.cpp
+
+$(libcppdir)/checkinternal.o: ../lib/checkinternal.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkinternal.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkinternal.cpp
 
-$(libcppdir)/checkio.o: ../lib/checkio.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkio.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkio.o: ../lib/checkio.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkio.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkio.cpp
 
-$(libcppdir)/checkleakautovar.o: ../lib/checkleakautovar.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkleakautovar.h ../lib/checkmemoryleak.h ../lib/checknullpointer.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkleakautovar.o: ../lib/checkleakautovar.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkleakautovar.h ../lib/checkmemoryleak.h ../lib/checknullpointer.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkleakautovar.cpp
 
-$(libcppdir)/checkmemoryleak.o: ../lib/checkmemoryleak.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkmemoryleak.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkmemoryleak.o: ../lib/checkmemoryleak.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkmemoryleak.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkmemoryleak.cpp
 
-$(libcppdir)/checknullpointer.o: ../lib/checknullpointer.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checknullpointer.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checknullpointer.o: ../lib/checknullpointer.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checknullpointer.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checknullpointer.cpp
 
-$(libcppdir)/checkother.o: ../lib/checkother.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkother.o: ../lib/checkother.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkother.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkother.cpp
 
-$(libcppdir)/checkpostfixoperator.o: ../lib/checkpostfixoperator.cpp ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/checkpostfixoperator.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkpostfixoperator.o: ../lib/checkpostfixoperator.cpp ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkpostfixoperator.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkpostfixoperator.cpp
 
-$(libcppdir)/checksizeof.o: ../lib/checksizeof.cpp ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/checksizeof.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checks.o: ../lib/checks.cpp ../lib/check.h ../lib/check64bit.h ../lib/checkassert.h ../lib/checkautovariables.h ../lib/checkbool.h ../lib/checkbufferoverrun.h ../lib/checkclass.h ../lib/checkcondition.h ../lib/checkexceptionsafety.h ../lib/checkfunctions.h ../lib/checkimpl.h ../lib/checkinternal.h ../lib/checkio.h ../lib/checkleakautovar.h ../lib/checkmemoryleak.h ../lib/checknullpointer.h ../lib/checkother.h ../lib/checkpostfixoperator.h ../lib/checks.h ../lib/checksizeof.h ../lib/checkstl.h ../lib/checkstring.h ../lib/checktype.h ../lib/checkuninitvar.h ../lib/checkunusedvar.h ../lib/checkvaarg.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/standards.h ../lib/vfvalue.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checks.cpp
+
+$(libcppdir)/checksizeof.o: ../lib/checksizeof.cpp ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checksizeof.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checksizeof.cpp
 
-$(libcppdir)/checkstl.o: ../lib/checkstl.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checknullpointer.h ../lib/checkstl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/pathanalysis.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkstl.o: ../lib/checkstl.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checknullpointer.h ../lib/checkstl.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/pathanalysis.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstl.cpp
 
-$(libcppdir)/checkstring.o: ../lib/checkstring.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkstring.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkstring.o: ../lib/checkstring.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkstring.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstring.cpp
 
-$(libcppdir)/checktype.o: ../lib/checktype.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checktype.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checktype.o: ../lib/checktype.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checktype.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checktype.cpp
 
-$(libcppdir)/checkuninitvar.o: ../lib/checkuninitvar.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checknullpointer.h ../lib/checkuninitvar.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkuninitvar.o: ../lib/checkuninitvar.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checknullpointer.h ../lib/checkuninitvar.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkuninitvar.cpp
 
-$(libcppdir)/checkunusedfunctions.o: ../lib/checkunusedfunctions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/checkunusedfunctions.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/checkunusedfunctions.o: ../lib/checkunusedfunctions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/analyzerinfo.h ../lib/astutils.h ../lib/checkers.h ../lib/checkunusedfunctions.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedfunctions.cpp
 
-$(libcppdir)/checkunusedvar.o: ../lib/checkunusedvar.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkunusedvar.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/checkunusedvar.o: ../lib/checkunusedvar.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkunusedvar.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedvar.cpp
 
-$(libcppdir)/checkvaarg.o: ../lib/checkvaarg.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkvaarg.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/checkvaarg.o: ../lib/checkvaarg.cpp ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkimpl.h ../lib/checkvaarg.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: ../lib/clangimport.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/clangimport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/clangimport.o: ../lib/clangimport.cpp ../lib/clangimport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/clangimport.cpp
 
 $(libcppdir)/color.o: ../lib/color.cpp ../lib/color.h ../lib/config.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/color.cpp
 
-$(libcppdir)/cppcheck.o: ../lib/cppcheck.cpp ../externals/picojson/picojson.h ../externals/simplecpp/simplecpp.h ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/check.h ../lib/checkers.h ../lib/checkunusedfunctions.h ../lib/clangimport.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/version.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/cppcheck.o: ../lib/cppcheck.cpp ../externals/picojson/picojson.h ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/check.h ../lib/checkers.h ../lib/checks.h ../lib/checkunusedfunctions.h ../lib/clangimport.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/regex.h ../lib/rule.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/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/version.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
 
-$(libcppdir)/ctu.o: ../lib/ctu.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/ctu.o: ../lib/ctu.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/check.h ../lib/config.h ../lib/ctu.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/ctu.cpp
 
-$(libcppdir)/errorlogger.o: ../lib/errorlogger.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/check.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/errorlogger.o: ../lib/errorlogger.cpp ../externals/tinyxml2/tinyxml2.h ../lib/check.h ../lib/checkers.h ../lib/color.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errorlogger.cpp
 
 $(libcppdir)/errortypes.o: ../lib/errortypes.cpp ../lib/config.h ../lib/errortypes.h ../lib/utils.h
@@ -267,25 +279,25 @@ $(libcppdir)/errortypes.o: ../lib/errortypes.cpp ../lib/config.h ../lib/errortyp
 $(libcppdir)/findtoken.o: ../lib/findtoken.cpp ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/library.h ../lib/mathlib.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/findtoken.cpp
 
-$(libcppdir)/forwardanalyzer.o: ../lib/forwardanalyzer.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/forwardanalyzer.o: ../lib/forwardanalyzer.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp
 
-$(libcppdir)/fwdanalysis.o: ../lib/fwdanalysis.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/fwdanalysis.o: ../lib/fwdanalysis.cpp ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/fwdanalysis.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: ../lib/importproject.cpp ../externals/picojson/picojson.h ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/filesettings.h ../lib/importproject.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/importproject.o: ../lib/importproject.cpp ../externals/picojson/picojson.h ../externals/tinyxml2/tinyxml2.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/filesettings.h ../lib/importproject.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/pathmatch.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
-$(libcppdir)/infer.o: ../lib/infer.cpp ../lib/calculate.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/mathlib.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/infer.o: ../lib/infer.cpp ../lib/calculate.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/mathlib.h ../lib/smallvector.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/infer.cpp
 
 $(libcppdir)/keywords.o: ../lib/keywords.cpp ../lib/config.h ../lib/keywords.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/keywords.cpp
 
-$(libcppdir)/library.o: ../lib/library.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/library.o: ../lib/library.cpp ../externals/tinyxml2/tinyxml2.h ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/library.cpp
 
-$(libcppdir)/mathlib.o: ../lib/mathlib.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/mathlib.o: ../lib/mathlib.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/smallvector.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/mathlib.cpp
 
 $(libcppdir)/path.o: ../lib/path.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/path.h ../lib/standards.h ../lib/utils.h
@@ -294,58 +306,64 @@ $(libcppdir)/path.o: ../lib/path.cpp ../externals/simplecpp/simplecpp.h ../lib/c
 $(libcppdir)/pathanalysis.o: ../lib/pathanalysis.cpp ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/pathanalysis.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathanalysis.cpp
 
-$(libcppdir)/pathmatch.o: ../lib/pathmatch.cpp ../lib/config.h ../lib/path.h ../lib/pathmatch.h ../lib/standards.h ../lib/utils.h
+$(libcppdir)/pathmatch.o: ../lib/pathmatch.cpp ../lib/config.h ../lib/path.h ../lib/pathmatch.h ../lib/standards.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/pathmatch.cpp
 
-$(libcppdir)/platform.o: ../lib/platform.cpp ../externals/tinyxml2/tinyxml2.h ../lib/config.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/xml.h
+$(libcppdir)/platform.o: ../lib/platform.cpp ../externals/tinyxml2/tinyxml2.h ../lib/config.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/utils.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/platform.cpp
 
-$(libcppdir)/preprocessor.o: ../lib/preprocessor.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/utils.h
+$(libcppdir)/preprocessor.o: ../lib/preprocessor.cpp ../externals/simplecpp/simplecpp.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/standards.h ../lib/suppressions.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/preprocessor.cpp
 
-$(libcppdir)/programmemory.o: ../lib/programmemory.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/programmemory.o: ../lib/programmemory.cpp ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/programmemory.cpp
 
-$(libcppdir)/reverseanalyzer.o: ../lib/reverseanalyzer.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
+$(libcppdir)/regex.o: ../lib/regex.cpp ../lib/config.h ../lib/regex.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/regex.cpp
+
+$(libcppdir)/reverseanalyzer.o: ../lib/reverseanalyzer.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
 
-$(libcppdir)/settings.o: ../lib/settings.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/summaries.h ../lib/suppressions.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/sarifreport.o: ../lib/sarifreport.cpp ../externals/picojson/picojson.h ../lib/check.h ../lib/checkers.h ../lib/config.h ../lib/cppcheck.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/sarifreport.h ../lib/settings.h ../lib/standards.h ../lib/utils.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/sarifreport.cpp
+
+$(libcppdir)/settings.o: ../lib/settings.cpp ../externals/picojson/picojson.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/json.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/rule.h ../lib/settings.h ../lib/standards.h ../lib/summaries.h ../lib/suppressions.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/settings.cpp
 
 $(libcppdir)/standards.o: ../lib/standards.cpp ../externals/simplecpp/simplecpp.h ../lib/config.h ../lib/standards.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/standards.cpp
 
-$(libcppdir)/summaries.o: ../lib/summaries.cpp ../lib/addoninfo.h ../lib/analyzerinfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/summaries.o: ../lib/summaries.cpp ../lib/analyzerinfo.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/summaries.cpp
 
-$(libcppdir)/suppressions.o: ../lib/suppressions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
+$(libcppdir)/suppressions.o: ../lib/suppressions.cpp ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/filesettings.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/pathmatch.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/suppressions.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
-$(libcppdir)/templatesimplifier.o: ../lib/templatesimplifier.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/templatesimplifier.o: ../lib/templatesimplifier.cpp ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/templatesimplifier.cpp
 
-$(libcppdir)/timer.o: ../lib/timer.cpp ../lib/config.h ../lib/timer.h ../lib/utils.h
+$(libcppdir)/timer.o: ../lib/timer.cpp ../lib/config.h ../lib/timer.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/timer.cpp
 
-$(libcppdir)/token.o: ../lib/token.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/tokenrange.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
+$(libcppdir)/token.o: ../lib/token.cpp ../externals/simplecpp/simplecpp.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/tokenrange.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/token.cpp
 
-$(libcppdir)/tokenlist.o: ../lib/tokenlist.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/tokenlist.o: ../lib/tokenlist.cpp ../externals/simplecpp/simplecpp.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/keywords.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenlist.cpp
 
 $(libcppdir)/utils.o: ../lib/utils.cpp ../lib/config.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
 
-$(libcppdir)/vf_analyzers.o: ../lib/vf_analyzers.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/vf_analyzers.o: ../lib/vf_analyzers.cpp ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/programmemory.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyzers.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_analyzers.cpp
 
-$(libcppdir)/vf_common.o: ../lib/vf_common.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/vf_common.o: ../lib/vf_common.cpp ../lib/astutils.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_common.cpp
 
-$(libcppdir)/vf_settokenvalue.o: ../lib/vf_settokenvalue.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
+$(libcppdir)/vf_settokenvalue.o: ../lib/vf_settokenvalue.cpp ../lib/astutils.h ../lib/calculate.h ../lib/checkers.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_common.h ../lib/vf_settokenvalue.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_settokenvalue.cpp
 
-$(libcppdir)/vfvalue.o: ../lib/vfvalue.cpp ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/vfvalue.o: ../lib/vfvalue.cpp ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/smallvector.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
 
 
diff --git a/oss-fuzz/main.cpp b/oss-fuzz/main.cpp
index f7bad77adb9..e1bd5952966 100644
--- a/oss-fuzz/main.cpp
+++ b/oss-fuzz/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -43,6 +43,7 @@ class DummyErrorLogger : public ErrorLogger {
     void reportProgress(const std::string& /*filename*/,
                         const char /*stage*/[],
                         const std::size_t /*value*/) override {}
+    void reportMetric(const std::string & /*metric*/) override {}
 };
 
 static Settings create_settings()
@@ -59,11 +60,11 @@ static const Settings s_settings = create_settings();
 static DummyErrorLogger s_errorLogger;
 static const FileWithDetails s_file("test.cpp", Standards::Language::CPP, 0);
 
-static void doCheck(const std::string& code)
+static void doCheck(const uint8_t *data, size_t dataSize)
 {
     Suppressions supprs;
-    CppCheck cppcheck(s_settings, supprs, s_errorLogger, false, nullptr);
-    cppcheck.check(s_file, code);
+    CppCheck cppcheck(s_settings, supprs, s_errorLogger, nullptr, false, nullptr);
+    cppcheck.checkBuffer(s_file, reinterpret_cast<const char*>(data), dataSize);
 }
 
 #ifndef NO_FUZZ
@@ -73,7 +74,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize)
 {
     if (dataSize < 10000) {
         const std::string code = generateCode2(data, dataSize);
-        doCheck(code);
+        doCheck(reinterpret_cast<const unsigned char*>(code.data()), code.size());
     }
     return 0;
 }
@@ -97,7 +98,7 @@ int main(int argc, char * argv[])
 
     const std::string code = oss.str();
     for (int i = 0; i < cnt; ++i)
-        doCheck(code);
+        doCheck(reinterpret_cast<const unsigned char*>(code.data()), code.size());
 
     return EXIT_SUCCESS;
 }
diff --git a/platforms/unix32-unsigned.xml b/platforms/riscv32.xml
similarity index 84%
rename from platforms/unix32-unsigned.xml
rename to platforms/riscv32.xml
index b2a56502ef7..1ba1f7e431d 100644
--- a/platforms/unix32-unsigned.xml
+++ b/platforms/riscv32.xml
@@ -10,9 +10,9 @@
     <long-long>8</long-long>
     <float>4</float>
     <double>8</double>
-    <long-double>12</long-double>
+    <long-double>16</long-double>
     <pointer>4</pointer>
     <size_t>4</size_t>
-    <wchar_t>2</wchar_t>
+    <wchar_t>4</wchar_t>
   </sizeof>
 </platform>
diff --git a/platforms/unix64-unsigned.xml b/platforms/riscv64.xml
similarity index 100%
rename from platforms/unix64-unsigned.xml
rename to platforms/riscv64.xml
diff --git a/readme.md b/readme.md
index 41ad4010925..6671fdd4827 100644
--- a/readme.md
+++ b/readme.md
@@ -1,9 +1,10 @@
-# **Cppcheck** 
+# **Cppcheck**
+
+NOTE: This repository was recently moved from https://github.com/danmar/cppcheck to https://github.com/cppcheck-opensource/cppcheck. Please make sure to update all your references to it accordingly.
 
 |release-windows|OSS-Fuzz|Coverity Scan Build Status|include-what-you-use|License|
 |:--:|:--:|:--:|:--:|:--:|
-|[![release-windows](https://github.com/danmar/cppcheck/actions/workflows/release-windows.yml/badge.svg?branch=main)](https://github.com/danmar/cppcheck/actions/workflows/release-windows.yml)|[![OSS-Fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/cppcheck.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:cppcheck)|[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512)|[![include-what-you-use](https://github.com/danmar/cppcheck/actions/workflows/iwyu.yml/badge.svg?branch=main)](https://github.com/danmar/cppcheck/actions/workflows/iwyu.yml)|[![License](https://img.shields.io/badge/license-GPL3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)
-
+|[![release-windows](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/release-windows.yml/badge.svg?branch=main)](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/release-windows.yml)|[![OSS-Fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/cppcheck.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:cppcheck)|[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512)|[![include-what-you-use](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/iwyu.yml/badge.svg?branch=main)](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/iwyu.yml)|[![License](https://img.shields.io/badge/license-GPL3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)|
 
 ## About the name
 
@@ -17,172 +18,108 @@ A manual is available [online](https://cppcheck.sourceforge.io/manual.pdf).
 
 ## Donate CPU
 
-Cppcheck is a hobby project with limited resources. You can help us by donating CPU (1 core or as many as you like). It is simple:
+Cppcheck is a hobby project with limited resources. You can help us by donating CPU (1 core, which is the default, or as many as you like. Use the `-j` flag to use more cores). It is simple:
 
  1. Download (and extract) Cppcheck source code.
- 2. Run:
-    ```
+ 2. Run (Linux/MacOS example):
+
+    ```shell
     cd cppcheck/
-    virtualenv .env
-    .env/bin/pip install -r tools/donate-cpu-requirements.txt
-    .env/bin/python tools/donate-cpu.py
+    python3 -m venv .venv
+    source .venv/bin/activate
+
+    pip install -r tools/donate-cpu-requirements.txt
+    ./tools/donate-cpu.py
     ```
 
-The script will analyse debian source code and upload the results to a cppcheck server. We need these results both to improve Cppcheck and to detect regressions.
+The script will analyse Debian source code and upload the results to a Cppcheck server. We need these results both to improve Cppcheck and to detect regressions.
 
-You can stop the script whenever you like with Ctrl C.
+You can stop the script whenever you like with Ctrl+C.
 
 ## Compiling
 
-Cppcheck requires a C++ compiler with (partial) C++11 support. Minimum required versions are GCC 5.1 / Clang 3.5 / Visual Studio 2015.
+Cppcheck requires a C++ compiler with (partial) C++11 support. Minimum required versions are GCC 5.1 / Clang 3.5 / AppleClang 6.0 / Visual Studio 2015.
 
 To build the GUI application, you need to use the CMake build system.
 
 When building the command line tool, [PCRE](http://www.pcre.org/) is optional. It is used if you build with rules.
 
 There are multiple compilation choices:
+
 * CMake - cross platform build tool
-* Windows: Visual Studio
-* Windows: Qt Creator + MinGW
-* GNU make
-* GCC (g++)
-* Clang (clang++)
+* (Windows) Visual Studio
+* (Windows) Qt Creator + MinGW
+* GNU compilers - via make or directly
 
-The minimum required Python version is 3.6.
+The minimum required Python version is 3.7.
 
 ### CMake
 
-The minimum required version is CMake 3.13.
+The minimum required version is CMake 3.22.
 
 Example, compiling Cppcheck with cmake:
 
 ```shell
-mkdir build
-cd build
-cmake ..
-cmake --build .
+cmake -S . -B build
+cmake --build build
 ```
 
 If you want to compile the GUI you can use the flag.
--DBUILD_GUI=ON
+`-DBUILD_GUI=ON`
 
 For rules support (requires pcre) use the flag.
--DHAVE_RULES=ON
+`-DHAVE_RULES=ON`
 
 For release builds it is recommended that you use:
--DUSE_MATCHCOMPILER=ON
+`-DUSE_MATCHCOMPILER=ON`
 
 For building the tests use the flag.
--DBUILD_TESTS=ON
+`-DBUILD_TESTING=ON`
 
-Using cmake you can generate project files for Visual Studio,XCode,etc.
+Using CMake you can generate project files for Visual Studio, XCode, etc.
 
 #### Building a specific configuration
 
-For single-configuration generators (like "Unix Makefiles") you can generate and build a specific configuration (e.g. "RelWithDebInfo") using:
+For single-configuration generators (like "Unix Makefiles") you can generate and build a specific configuration (e.g. "`RelWithDebInfo`") using:
 
 ```shell
-mkdir build_RelWithDebInfo
-cd build_RelWithDebInfo
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
-cmake --build . --config RelWithDebInfo
+cmake -S . -B build_RelWithDebInfo -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake --build build_RelWithDebInfo --config RelWithDebInfo
 ```
 
 For multi-configuration generators (like "Visual Studio 17 2022") the same is achieved using:
 
 ```shell
-mkdir build
-cd build
-cmake ..
-cmake --build . --config RelWithDebInfo
+cmake -S . -B build
+cmake --build build --config RelWithDebInfo
 ```
 
 ### Visual Studio
 
-Use the cppcheck.sln file. The file is configured for Visual Studio 2019, but the platform toolset can be changed easily to older or newer versions. The solution contains platform targets for both x86 and x64.
+Use the `cppcheck.sln` file. The file is configured for Visual Studio 2019, but the platform toolset can be changed easily to older or newer versions. The solution contains platform targets for both x86 and x64.
 
-To compile with rules, select "Release-PCRE" or "Debug-PCRE" configuration. pcre.lib (pcre64.lib for x64 builds) and pcre.h are expected to be in /externals then. A current version of PCRE for Visual Studio can be obtained using [vcpkg](https://github.com/microsoft/vcpkg).
+To compile with rules, select "`Release-PCRE`" or "`Debug-PCRE`" configuration. `pcre.lib` (`pcre64.lib` for x64 builds) and `pcre.h` are expected to be in `/externals` then. A current version of PCRE for Visual Studio can be obtained using [vcpkg](https://github.com/microsoft/vcpkg).
 
 ### Visual Studio (from command line)
 
-If you do not wish to use the Visual Studio IDE, you can compile cppcheck from the command line the following command.
+If you do not wish to use the Visual Studio IDE, you can compile Cppcheck from the command line the following command.
 
 ```shell
 msbuild cppcheck.sln
 ```
 
-### VS Code (on Windows)
+### VS Code
 
-Install MSYS2 to get GNU toolchain with g++ and gdb (https://www.msys2.org/).
-Create a settings.json file in the .vscode folder with the following content (adjust path as necessary):
-
-```
-{
-    "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
-    "terminal.integrated.shellArgs.windows": [
-        "--login",
-    ],
-    "terminal.integrated.env.windows": {
-        "CHERE_INVOKING": "1",
-        "MSYSTEM": "MINGW64",
-    }
-}
-```
-
-Run "make" in the terminal to build cppcheck.
-
-For debugging create a launch.json file in the .vscode folder with the following content, which covers configuration for debugging cppcheck and misra.py:
-
-```
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "cppcheck",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/cppcheck.exe",
-            "args": [
-                "--dump",
-                "${workspaceFolder}/addons/test/misra/misra-test.c"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "miDebuggerPath": "C:/msys64/mingw64/bin/gdb.exe",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        },
-        {
-            "name": "misra.py",
-            "type": "python",
-            "request": "launch",
-            "program": "${workspaceFolder}/addons/misra.py",
-            "console": "integratedTerminal",
-            "args": [
-                "${workspaceFolder}/addons/test/misra/misra-test.c.dump"
-            ]
-        }
-    ]
-}
-```
+Cppcheck Official is an extension officially supported by the cppcheck team allowing you to easily use cppcheck in VS Code. You can find it in VS Code Marketplace through the extension tab in your IDE. For instructions on how to set it up and use it, see the readme on the github page: <https://github.com/cppchecksolutions/vscode-cppcheck-official>
 
 ### Qt Creator + MinGW
 
 The PCRE dll is needed to build the CLI. It can be downloaded here:
-http://software-download.name/pcre-library-windows/
+<http://software-download.name/pcre-library-windows/>
+
+### GNU compilers
 
-### GNU make
+#### GNU make
 
 Simple, unoptimized build (no dependencies):
 
@@ -190,39 +127,41 @@ Simple, unoptimized build (no dependencies):
 make
 ```
 
+You can use `CXXOPTS`, `CPPOPTS` and `LDOPTS` to append to the existing `CXXFLAGS`, `CPPFLAGS` and `LDFLAGS` instead of overriding them.
+
 The recommended release build is:
 
 ```shell
-make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"
+make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXOPTS="-O2" CPPOPTS="-DNDEBUG"
 ```
 
-Flags:
+#### g++ (for experts)
 
-1.  `MATCHCOMPILER=yes`
-    Python is used to optimise cppcheck. The Token::Match patterns are converted into C++ code at compile time.
+If you just want to build Cppcheck without dependencies then you can use this command:
 
-2.  `FILESDIR=/usr/share/cppcheck`
-    Specify folder where cppcheck files are installed (addons, cfg, platform)
+```shell
+g++ -o cppcheck -std=c++11 -Iexternals -Iexternals/simplecpp -Iexternals/tinyxml2 -Iexternals/picojson -Ilib -Ifrontend frontend/*.cpp cli/*.cpp lib/*.cpp externals/simplecpp/simplecpp.cpp externals/tinyxml2/tinyxml2.cpp
+```
 
-3.  `HAVE_RULES=yes`
-    Enable rules (PCRE is required if this is used)
+#### Flags
 
-4.  `CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"`
-    Enables most compiler optimizations, disables cppcheck-internal debugging code and enables basic compiler warnings.
+* `MATCHCOMPILER=yes`
+   Several `Token` matching patterns are converted into more efficient C++ code at compile time (requires Python to be installed).
 
-### g++ (for experts)
+* `FILESDIR=/usr/share/cppcheck`
+   Specifies the folder where Cppcheck files (addons, cfg, platform) are installed to.
 
-If you just want to build Cppcheck without dependencies then you can use this command:
+* `HAVE_RULES=yes`
+   Enables rules (requires PCRE to be installed).
 
-```shell
-g++ -o cppcheck -std=c++11 -Iexternals -Iexternals/simplecpp -Iexternals/tinyxml2 -Iexternals/picojson -Ilib cli/*.cpp lib/*.cpp externals/simplecpp/simplecpp.cpp externals/tinyxml2/*.cpp
-```
+* `CXXOPTS="-O2"`
+   Enables most compiler optimizations.
 
-If you want to use `--rule` and `--rule-file` then dependencies are needed:
+* `CPPOPTS="-DNDEBUG"`
+   Disables assertions.
 
-```shell
-g++ -o cppcheck -std=c++11 -lpcre -DHAVE_RULES -Ilib -Iexternals -Iexternals/simplecpp -Iexternals/tinyxml2 cli/*.cpp lib/*.cpp externals/simplecpp/simplecpp.cpp externals/tinyxml2/*.cpp
-```
+* `HAVE_BOOST=yes`
+   Enables usage of more efficient container from Boost (requires Boost to be installed).
 
 ### MinGW
 
@@ -232,7 +171,7 @@ mingw32-make
 
 If you encounter the following error with `MATCHCOMPILER=yes` you need to specify your Python interpreter via `PYTHON_INTERPRETER`.
 
-```
+```text
 process_begin: CreateProcess(NULL, which python3, ...) failed.
 makefile:24: pipe: No error
 process_begin: CreateProcess(NULL, which python, ...) failed.
@@ -240,10 +179,10 @@ makefile:27: pipe: No error
 makefile:30: *** Did not find a Python interpreter.  Stop.
 ```
 
-### Other Compiler/IDE
+### Other compiler/IDE
 
 1. Create an empty project file / makefile.
-2. Add all cpp files in the cppcheck cli and lib folders to the project file / makefile.
+2. Add all cpp files in the Cppcheck cli and lib folders to the project file / makefile.
 3. Add all cpp files in the externals folders to the project file / makefile.
 4. Compile.
 
@@ -257,35 +196,41 @@ mv cppcheck cppcheck.exe
 
 ## Packages
 
-Besides building yourself on the platform of your choice there are also several ways to obtain pre-built packages.<br/>
+Besides building yourself on the platform of your choice there are also several ways to obtain pre-built packages.
+
+### Official
+
+Official packages are maintained by the Cppcheck team.
+
+* (Windows) An official Windows installer is available via the official Cppcheck SourceForge page: <https://cppcheck.sourceforge.io>.
+* (Windows) Official builds of the current development versions are available via the [release-windows](https://github.com/cppcheck-opensource/cppcheck/actions/workflows/release-windows.yml) workflow. They are built nightly for the `main` branch and for each commit for release branches. As these are development versions please refrain from using these in production environments!
+  * A portable package (i.e. does not require installation) is available as the `portable` artifact. This is still a work-in-progress - see <https://trac.cppcheck.net/ticket/10771> for details.
+  * An installer is available via the `installer` artifact.
+* (Multi-Platform) A premium version with additional features provided by the original author of Cppcheck is available for purchase via <https://www.cppcheck.com>.
+
+### Third-party
 
-Official packages maintained by the Cppcheck team:
-- (Windows) An official Windows installer is available via the official Cppcheck SourceForge page: https://cppcheck.sourceforge.io.
-- (Windows) Official builds of the current development versions are available via the [release-windows](https://github.com/danmar/cppcheck/actions/workflows/release-windows.yml) workflow. They are built nightly for the `main` branch and for each commit for release branches. As these are development versions please refrain from using these in production environments!
-  - A portable package (i.e. does not require installation) is available as the `portable` artifact. This is still a work-in-progress - see https://trac.cppcheck.net/ticket/10771 for details.
-  - An installer is available via the `installer` artifact.
-- (Multi-Platform) A premium version with additional features provided by the original author of Cppcheck is available for purchase via https://www.cppcheck.com.
+Third-party packages are ***not*** maintained by the Cppcheck team but their respective packagers.
 
-Unofficial packages *not* maintained by the Cppcheck team but their respective packagers:
-- (Windows / Outdated) A portable package is available via https://portableapps.com/apps/development/cppcheck-portable.
-- (Windows / Outdated) A package is available via https://community.chocolatey.org/packages/cppcheck.
-- (Windows / Outdated) A package is available via https://winget.run/pkg/Cppcheck/Cppcheck.
-- (Windows / Outdated) A package is available via https://osdn.net/projects/sfnet_cppcheck.
-- (Windows) A package is available via https://scoop.sh/#/apps?q=cppcheck.
-- (Linux/Unix) Many major distros offer Cppcheck packages via their integrated package managers (`yum`, `apt`, `pacman`, etc.). See https://pkgs.org/search/?q=cppcheck or https://repology.org/project/cppcheck for an overview.
-- (Linux/Unix) Unless you are using a "rolling" distro, it is likely that they are not carrying the latest version. There are several external (mainly unsupported) repositories like AUR (ArchLinux), PPA (ubuntu), EPEL (CentOS/Fedora) etc. which might provide up-to-date packages. 
-- (Linux/Unix / Outdated) The Canonical Snapcraft packages (https://snapcraft.io/cppcheck / https://snapcraft.io/cppcheckgui) are unmaintained and contain very old (development) versions. Please refrain from using them! See https://trac.cppcheck.net/ticket/11641 for more details.
-- (MacOS) A package is available via Homebrew (`brew`). See https://formulae.brew.sh/formula/cppcheck.
-- (MacOS) A package is available via https://ports.macports.org/port/cppcheck
-- (Multi-Platform) A package is available via https://anaconda.org/conda-forge/cppcheck.
-- Packages are also available from various download portals (mainly the Windows installer - sometimes re-packaged).
+*Note:* The following list is purely informational and listed in no particular order.
 
-*Note:* This is list is purely informational and listed in no particular order.
+*Note:* Please always try to obtain the package from the primary official source of your operating system/distro first and make sure you are getting the latest released/tagged version (see <https://github.com/cppcheck-opensource/cppcheck/tags>). Some packages might not carry the latest patch version though.
 
-*Note:* Please always try to obtain the package from the primary official source of your operating system/distro first and make sure you are getting the latest released version.
+*Note:* Some issues might be related to additional patches carried by the builds in these packages or by the packaging itself. Please try to verify the issue with an official build before reporting it upstream. Otherwise you might need toreport it to the respective maintainer of the package.
 
-*Note:* Some issues might be related to additional patches carried by the builds in these packages or the packaging itself. In that case issues might need to be reported to the respective project.
+* (Windows / Outdated) A portable package is available via <https://portableapps.com/apps/development/cppcheck-portable>.
+* (Windows / Outdated) A package is available via <https://community.chocolatey.org/packages/cppcheck>.
+* (Windows / Outdated) A package is available via <https://winget.run/pkg/Cppcheck/Cppcheck>.
+* (Windows) A package is available via <https://scoop.sh/#/apps?q=cppcheck>.
+* (Linux/Unix) Many major distros offer Cppcheck packages via their integrated package managers (`yum`, `apt`, `pacman`, etc.). See <https://pkgs.org/search/?q=cppcheck> or <https://repology.org/project/cppcheck> for an overview.
+* (Linux/Unix) Unless you are using a "rolling" distro, it is likely that they are not carrying the latest version. There are several external (mainly unsupported) repositories like AUR (ArchLinux), PPA (Ubuntu), EPEL (CentOS/Fedora) etc. which might provide up-to-date packages.
+* (Linux/Unix / Outdated) The Canonical Snapcraft packages (<https://snapcraft.io/cppcheck> / <https://snapcraft.io/cppcheckgui>) are unmaintained and contain very old (development) versions. Please refrain from using them! See <https://trac.cppcheck.net/ticket/11641> for more details.
+* (MacOS) A package is available via Homebrew (`brew`). See <https://formulae.brew.sh/formula/cppcheck>.
+* (MacOS) A package is available via <https://ports.macports.org/port/cppcheck>.
+* (Multi-Platform) A package is available via <https://anaconda.org/conda-forge/cppcheck>.
+* (Multi-Platform) A package is available via <https://conan.io/center/recipes/cppcheck>.
+* Packages are also available from various download portals (mainly the Windows installer - sometimes re-packaged).
 
 ## Webpage
 
-https://cppcheck.sourceforge.io/
+<https://cppcheck.sourceforge.io/>
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index 6d99d199d4f..00000000000
--- a/readme.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-=========
-Cppcheck
-=========
-
-
-About
-
-    The original name of this program is "C++check" but it was later changed to "cppcheck".
-
-Manual
-
-    A manual is available online:
-    https://cppcheck.sourceforge.io/manual.pdf
-
-Compiling
-
-    Any C++11 compiler should work. For compilers with partial C++11 support it may work. If
-    your compiler has the C++11 features that are available in Visual Studio 2013 / GCC 4.8
-    then it will work.
-
-    To build the GUI, you need Qt.
-
-    While building the command line tool, PCRE is optional. It is used if you build with rules.
-
-    There are multiple compilation choices:
-      * cmake - cross platform build tool
-      * Windows: Visual Studio
-      * Windows: Qt Creator + mingw
-      * gnu make
-      * g++ 4.8 (or later)
-      * clang++
-
-    cmake
-    =====
-        Example, compiling Cppcheck with cmake:
-            mkdir build
-            cd build
-            cmake ..
-            cmake --build .
-
-        If you want to compile the GUI you can use the flag
-        -DBUILD_GUI=ON
-
-        For rules support (requires pcre) use the flag
-        -DHAVE_RULES=ON
-
-        For release builds it is recommended that you use:
-        -DUSE_MATCHCOMPILER=ON
-
-    Visual Studio
-    =============
-        Use the cppcheck.sln file. The file is configured for Visual Studio 2019, but the platform
-        toolset can be changed easily to older or newer versions. The solution contains platform
-        targets for both x86 and x64.
-
-        To compile with rules, select "Release-PCRE" or "Debug-PCRE" configuration.
-        pcre.lib (pcre64.lib for x64 builds) and pcre.h are expected to be in /externals then.
-        A current version of PCRE for Visual Studio can be obtained using vcpkg:
-        https://github.com/microsoft/vcpkg
-
-    Qt Creator + mingw
-    ==================
-        The PCRE dll is needed to build the CLI. It can be downloaded here:
-            http://software-download.name/pcre-library-windows/
-
-    gnu make
-    ========
-        Simple build (no dependencies):
-            make
-
-        The recommended release build is:
-            make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes
-
-        Flags:
-        MATCHCOMPILER=yes               : Python is used to optimise cppcheck at compile time
-        FILESDIR=/usr/share/cppcheck    : Specify folder where cppcheck files are installed
-        HAVE_RULES=yes                  : Enable rules (pcre is required if this is used)
-
-    g++ (for experts)
-    =================
-        If you just want to build Cppcheck without dependencies then you can use this command:
-            g++ -o cppcheck -std=c++11 -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 -Ilib cli/*.cpp lib/*.cpp externals/simplecpp/simplecpp.cpp externals/tinyxml2/*.cpp
-
-        If you want to use --rule and --rule-file then dependencies are needed:
-            g++ -o cppcheck -std=c++11 -lpcre -DHAVE_RULES -Ilib -Iexternals -Iexternals/picojson -Iexternals/simplecpp -Iexternals/tinyxml2 cli/*.cpp lib/*.cpp externals/simplecpp/simplecpp.cpp externals/tinyxml2/*.cpp
-
-    mingw
-    =====
-        The "LDFLAGS=-lshlwapi" is needed when building with mingw
-            mingw32-make LDFLAGS=-lshlwapi
-
-    other compilers/ide
-    ===================
-
-        1. Create a empty project file / makefile.
-        2. Add all cpp files in the cppcheck cli and lib folders to the project file / makefile.
-        3. Add all cpp files in the externals folders to the project file / makefile.
-        4. Compile.
-
-    Cross compiling Win32 (CLI) version of Cppcheck in Linux
-
-        sudo apt-get install mingw32
-        make CXX=i586-mingw32msvc-g++ LDFLAGS="-lshlwapi"
-        mv cppcheck cppcheck.exe
-
-Packages
-
-    You can install Cppcheck with yum/apt/brew/etc.
-
-    The official rpms are built with these files:
-    https://src.fedoraproject.org/rpms/cppcheck/tree/master
-
-Webpage
-
-    https://cppcheck.sourceforge.io/
diff --git a/readmeja.md b/readmeja.md
index e731873ba3e..7299d61745c 100644
--- a/readmeja.md
+++ b/readmeja.md
@@ -2,7 +2,7 @@
 
 | Linux ビルド状態 | Windows ビルド状態 | Coverity Scan Build 状態 |
 |:--:|:--:|:--:|
-| [![Linux ビルド状態](https://img.shields.io/travis/danmar/cppcheck/master.svg?label=Linux%20build)](https://travis-ci.org/danmar/cppcheck) | [![Windows ビルド状態](https://img.shields.io/appveyor/ci/danmar/cppcheck/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/danmar/cppcheck/branch/master) | [![Coverity Scan Build 状態](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512) |
+| [![Linux ビルド状態](https://img.shields.io/travis/cppcheck-opensource/cppcheck/master.svg?label=Linux%20build)](https://travis-ci.org/cppcheck-opensource/cppcheck) | [![Windows ビルド状態](https://img.shields.io/appveyor/ci/cppcheck-opensource/cppcheck/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/cppcheck-opensource/cppcheck/branch/master) | [![Coverity Scan Build 状態](https://img.shields.io/coverity/scan/512.svg)](https://scan.coverity.com/projects/512) |
 
 ## 名前について
 
@@ -72,7 +72,7 @@ make
 推奨するリリースビルド方法:
 
 ```shell
-make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"
+make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXOPTS="-O2 -DNDEBUG"
 ```
 
 フラグ:
@@ -86,7 +86,7 @@ cppcheckの設定ファイル(addon や cfg や platform)を置くディレク
 3. `HAVE_RULES=yes`
 ルール機能の有効化 (ルール機能には PCRE が必要です)設定です。
 
-4. `CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"`
+4. `CXXOPTS="-O2 -DNDEBUG"`
 ほとんどのコンパイラの最適化オプション、cppcheckの内部デバッグコードの無効化、基本的なコンパイラ警告の有効化
 
 ### g++ (エキスパート向け)
diff --git a/releasenotes.txt b/releasenotes.txt
index 28ed742ea86..4b3ef047c5c 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,9 +1,15 @@
-Release Notes for Cppcheck 2.18
 
-New checks:
+Release Notes for Cppcheck 2.22
+
+Major bug fixes & crashes:
 -
 
-Improved checking:
+New checks:
+- Warn when feof() is used as a while loop condition (wrongfeofUsage).
+- ftell() result is unspecified when file is opened in mode "t".
+- Detect when an STL algorithm such as std::copy, std::equal, std::transform, etc. accesses more elements through an iterator than are available in the container (algorithmOutOfBounds).
+
+C/C++ support:
 -
 
 GUI:
@@ -12,17 +18,8 @@ GUI:
 Changed interface:
 -
 
-Deprecations:
-- Support for building with Qt 5 will be removed in Cppcheck 2.19.
+Infrastructure & dependencies:
 -
 
 Other:
-- Updated Qt to 6.9.0 (official Windows release only).
-- added CMake target `run-clang-tidy-csa` to run Clang Static Analyzer
-- added CMake option `ENABLE_CSA_ALPHA` to enable the Clang Static Analyzer alpha checkers
-- Updated TinyXML-2 to v11.0.0
-- The minimum supported Python version has been bumped to 3.7.
-- CMake will now unconditionally use Boost.Containers if available. If CMake option `USE_BOOST` is specified it will now bail out when it is not found.
-- Fix checking a project that contains several project file entries for the same file.
-- Fixed --file-filter matching of looked up files in provided paths.
--
+- Added configuration file for Microsoft.GSL (Guideline Support Library).
diff --git a/runformat b/runformat
index 60ad1b2abe1..f823229ecc7 100755
--- a/runformat
+++ b/runformat
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# uncrustify-0.72 is used to format cppcheck source code.
+# uncrustify-0.80.1 is used to format cppcheck source code.
 #
-# 1. Download source code: https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-0.72.0.zip
+# 1. Download source code: https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-0.80.1.zip
 #    It's important that all Cppcheck developers use the exact same version so we don't get a "format battle".
 # 2. Building:
 #    - Linux: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make
@@ -11,7 +11,7 @@
 #    - you can put uncrustify in your PATH
 #    - you can create an environment variable UNCRUSTIFY that has the full path of the binary
 
-UNCRUSTIFY_VERSION="0.72.0"
+UNCRUSTIFY_VERSION="0.80.1"
 UNCRUSTIFY="${UNCRUSTIFY-uncrustify}"
 
 DETECTED_VERSION=$("$UNCRUSTIFY" --version 2>&1 | grep -o -E '[0-9.]+')
@@ -44,11 +44,13 @@ function formatCplusplus {
 
 }
 
-formatCplusplus cli/
-formatCplusplus democlient/
-formatCplusplus gui/
-formatCplusplus lib/
-formatCplusplus oss-fuzz/
-formatCplusplus test/
-formatCplusplus tools/
-formatCplusplus samples/
+ls */*.cpp */*.h | xargs -n 1 -P $CPUCOUNT -I{} -t $UNCRUSTIFY -c .uncrustify.cfg -l CPP --no-backup --replace {}
+
+#formatCplusplus cli/
+#formatCplusplus democlient/
+#formatCplusplus gui/
+#formatCplusplus lib/
+#formatCplusplus oss-fuzz/
+#formatCplusplus test/
+#formatCplusplus tools/
+#formatCplusplus samples/
diff --git a/samples/unreadVariable/out.txt b/samples/unreadVariable/out.txt
index 2b1c295a8c6..1797e13dbbe 100644
--- a/samples/unreadVariable/out.txt
+++ b/samples/unreadVariable/out.txt
@@ -1,6 +1,3 @@
 samples\unreadVariable\bad.cpp:5:34: style: Variable 's2' is assigned a value that is never used. [unreadVariable]
     std::string s1 = "test1", s2 = "test2";
                                  ^
-samples\unreadVariable\bad.cpp:5:31: style: Variable 's2' is assigned a value that is never used. [unreadVariable]
-    std::string s1 = "test1", s2 = "test2";
-                              ^
diff --git a/selfcheck.sh b/selfcheck.sh
new file mode 100755
index 00000000000..e9a39ec43cb
--- /dev/null
+++ b/selfcheck.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+cmake_output=cmake.output
+selfcheck_options_extra="$1"
+
+cppcheck_bin=./cppcheck
+
+selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
+selfcheck_options="$selfcheck_options $selfcheck_options_extra"
+cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
+qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_MOC_HAS_STRINGDATA"  # TODO: use 69 as revision
+naming_options="--addon-python=$(command -v python) --addon=naming.json"
+
+mkdir_cmd=$(command -v mkdir)
+rm_cmd=$(command -v rm)
+
+# clear PATH to prevent unintentional process invocations
+export PATH=
+
+ec=0
+
+$cppcheck_bin $selfcheck_options \
+  externals \
+  || ec=1
+
+$mkdir_cmd b1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 \
+  frontend \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 \
+  -Ifrontend \
+  cli \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --cppcheck-build-dir=b1 --enable=internal \
+  lib \
+  || ec=1
+
+$mkdir_cmd b2
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
+  --cppcheck-build-dir=b2 \
+  -DQT_CHARTS_LIB \
+  -I$cmake_output/gui -Ifrontend -Igui \
+  gui/*.cpp $cmake_output/gui \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Ifrontend -Icli \
+  test/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Icli \
+  tools/dmake/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $qt_options \
+  -I$cmake_output/tools/triage -Igui \
+  tools/triage/*.cpp $cmake_output/tools/triage \
+  || ec=1
+
+$rm_cmd -rf b2
+$rm_cmd -rf b1
+
+exit $ec
\ No newline at end of file
diff --git a/selfcheck_san.sh b/selfcheck_san.sh
new file mode 100755
index 00000000000..92e34ba6e4f
--- /dev/null
+++ b/selfcheck_san.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+cmake_output="$1"
+selfcheck_options_extra="$2"
+
+cppcheck_bin=$cmake_output/bin/cppcheck
+
+selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=file-total -D__GNUC__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=gnu --inconclusive --enable=style,performance,portability,warning,missingInclude,information --exception-handling --debug-warnings --check-level=exhaustive"
+selfcheck_options="$selfcheck_options $selfcheck_options_extra"
+cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
+qt_options="--library=qt -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_MOC_HAS_STRINGDATA"
+qt_options="$qt_options --suppress=autoNoType:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
+naming_options="--addon-python=$(command -v python) --addon=naming.json"
+
+# clear PATH to prevent unintentional process invocations
+export PATH=
+
+ec=0
+
+$cppcheck_bin $selfcheck_options \
+  externals \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  frontend \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  -Ifrontend \
+  cli \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options \
+  --enable=internal \
+  lib \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $naming_options $qt_options \
+  --suppress=constVariablePointer:*/moc_*.cpp \
+  -DQT_CHARTS_LIB \
+  -I$cmake_output/gui -Ifrontend -Igui \
+  gui/*.cpp $cmake_output/gui \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Ifrontend -Icli \
+  test/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options \
+  -Icli \
+  tools/dmake/*.cpp \
+  || ec=1
+
+$cppcheck_bin $selfcheck_options $cppcheck_options $qt_options \
+  -I$cmake_output/tools/triage -Igui \
+  tools/triage/*.cpp $cmake_output/tools/triage \
+  || ec=1
+
+exit $ec
\ No newline at end of file
diff --git a/snap/gui/cppcheck-gui.desktop b/snap/gui/cppcheck-gui.desktop
deleted file mode 100644
index bd540376da2..00000000000
--- a/snap/gui/cppcheck-gui.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Cppcheck
-Comment=A tool for static C/C++ code analysis
-Exec=cppcheck-gui
-Icon=${SNAP}/meta/gui/cppcheck-gui.png
-Terminal=true
-StartupNotify=true
-Categories=Development;Debugger;Qt;
diff --git a/snap/gui/cppcheck-gui.png b/snap/gui/cppcheck-gui.png
deleted file mode 100644
index 25d7aef5f31..00000000000
Binary files a/snap/gui/cppcheck-gui.png and /dev/null differ
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index 030a2048afe..00000000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name:               cppcheckgui
-version:            '1.81.99'
-summary:            A tool for static C/C++ code analysis
-description:        |
-  A tool for static C/C++ code analysis
-grade:              stable
-confinement:        strict
-icon:               snap/gui/cppcheck-gui.png
-type:               app
-
-apps:
-  cppcheckgui:
-    command:        desktop-launch ${SNAP}/bin/cppcheck-gui
-    plugs:          [home, unity7, x11, network-bind, network-control]
-
-parts:
-  cppcheckgui:
-    source-type:    git
-    plugin:         cmake
-    configflags:
-      - -DBUILD_GUI=ON
-    after:          [desktop-qt5]
-    build-packages:
-      # A list of Ubuntu packages to be installed on the host to aid in building the part.
-      # These packages will not go into the final snap.
-      - build-essential
-      - qt5-default
-      - qtbase5-dev
-      - dpkg-dev
-      # For Qt5LinguistTools
-      - qttools5-dev
-      - qttools5-dev-tools
-  desktop-qt5:
-    stage-packages:
-      # A set of Ubuntu packages to be downloaded and unpacked to join the part before it’s built.
-      # Note that these packages are not installed on the host.
-      # Like the rest of the part, all files from these packages will make it into the final snap unless filtered out via the prime keyword.
-      - libqt5gui5
-      - libqt5svg5 # for loading icon themes which are svg
-      - libtiff5-dev
-      - libjpeg8-dev
-      - libxkbcommon0
-      - ttf-ubuntu-font-family
-      - dmz-cursor-theme
-      - light-themes
-      - shared-mime-info
-      - libgdk-pixbuf2.0-0
-      - locales-all
-      - xcb
-      - libxcb1
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3b516f38965..f1e59e17daf 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,28 +1,13 @@
-if (BUILD_TESTS)
+if (BUILD_TESTING)
     add_subdirectory(signal)
     add_subdirectory(seh)
 
     file(GLOB hdrs "*.h")
     file(GLOB srcs "*.cpp")
-    list(APPEND testrunner_SOURCES ${hdrs} ${srcs} $<TARGET_OBJECTS:cli_objs>)
-    if (NOT BUILD_CORE_DLL)
-        list(APPEND testrunner_SOURCES $<TARGET_OBJECTS:cppcheck-core> $<TARGET_OBJECTS:simplecpp_objs>)
-        if(USE_BUNDLED_TINYXML2)
-            list(APPEND testrunner_SOURCES $<TARGET_OBJECTS:tinyxml2_objs>)
-        endif()
-    endif()
+    list(APPEND testrunner_SOURCES ${hdrs} ${srcs})
 
     add_executable(testrunner ${testrunner_SOURCES})
-    target_include_directories(testrunner PRIVATE ${PROJECT_SOURCE_DIR}/lib/ ${PROJECT_SOURCE_DIR}/cli/)
-    if(USE_BUNDLED_TINYXML2)
-        target_externals_include_directories(testrunner PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2)
-    else()
-        target_include_directories(testrunner SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-    endif()
-    target_externals_include_directories(testrunner PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
-    if (HAVE_RULES)
-        target_link_libraries(testrunner ${PCRE_LIBRARY})
-    endif()
+    target_link_libraries(testrunner cppcheck-core tinyxml2 picojson simplecpp frontend cli)
     if (WIN32 AND NOT BORLAND)
         if(NOT MINGW)
             target_link_libraries(testrunner Shlwapi.lib)
@@ -30,14 +15,7 @@ if (BUILD_TESTS)
             target_link_libraries(testrunner shlwapi)
         endif()
     endif()
-    if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(testrunner ${tinyxml2_LIBRARIES})
-    endif()
     target_link_libraries(testrunner ${CMAKE_THREAD_LIBS_INIT})
-    if (BUILD_CORE_DLL)
-        target_compile_definitions(testrunner PRIVATE CPPCHECKLIB_IMPORT SIMPLECPP_IMPORT)
-        target_link_libraries(testrunner cppcheck-core)
-    endif()
     if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         # (void) in ASSERT_THROW* macros might trigger this
         target_compile_options_safe(testrunner -Wno-useless-cast)
@@ -69,6 +47,8 @@ if (BUILD_TESTS)
     if (REGISTER_TESTS)
         # CMAKE_MATCH_<n> usage for if (MATCHES) requires CMake 3.9
 
+        add_subdirectory(addon)
+
         find_package(Threads REQUIRED)
         include(ProcessorCount)
         ProcessorCount(N)
@@ -101,7 +81,7 @@ if (BUILD_TESTS)
             set(oneValueArgs PLATFORM NAME)
             set(multiValueArgs ADD_LIBRARY)
 
-            cmake_parse_arguments(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+            cmake_parse_arguments(PARSE "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
             get_filename_component(LIBRARY ${CFG_TEST} NAME_WE)
             # TODO: get rid of this
             if(PARSE_ADD_LIBRARY)
diff --git a/test/addon/CMakeLists.txt b/test/addon/CMakeLists.txt
new file mode 100644
index 00000000000..bb04afb6c51
--- /dev/null
+++ b/test/addon/CMakeLists.txt
@@ -0,0 +1,41 @@
+if (NOT Python_Interpreter_FOUND)
+    message(WARNING "Python interpreter not found - skipping addon tests.")
+    return()
+endif()
+
+# creating a virtual environment needs the venv and ensurepip modules - some
+# distributions ship them separately from the interpreter (e.g. the Debian/Ubuntu
+# python3-venv package)
+execute_process(COMMAND ${Python_EXECUTABLE} -c "import venv, ensurepip"
+        RESULT_VARIABLE PYTHON_VENV_RESULT
+        OUTPUT_QUIET
+        ERROR_QUIET)
+if (NOT PYTHON_VENV_RESULT EQUAL 0)
+    message(WARNING "Python venv module not available (e.g. install the python3-venv package) - skipping addon tests.")
+    return()
+endif()
+
+set(VENV_DIR ${CMAKE_CURRENT_BINARY_DIR}/venv)
+if (WIN32)
+    set(VENV_PYTHON ${VENV_DIR}/Scripts/python.exe)
+else()
+    set(VENV_PYTHON ${VENV_DIR}/bin/python)
+endif()
+
+# fixture: create a virtual environment and install the python dependencies into it
+add_test(NAME addon-venv-create
+        COMMAND ${Python_EXECUTABLE} -m venv ${VENV_DIR})
+set_tests_properties(addon-venv-create PROPERTIES
+        FIXTURES_SETUP addon-venv-dir)
+
+add_test(NAME addon-venv-install
+        COMMAND ${VENV_PYTHON} -m pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt)
+set_tests_properties(addon-venv-install PROPERTIES
+        FIXTURES_REQUIRED addon-venv-dir
+        FIXTURES_SETUP addon-venv
+        TIMEOUT 300)
+
+add_test(NAME addon-cppcheckdata
+        COMMAND ${VENV_PYTHON} -m pytest --cppcheck-binary=$<TARGET_FILE:cppcheck> ${CMAKE_CURRENT_SOURCE_DIR})
+set_tests_properties(addon-cppcheckdata PROPERTIES
+        FIXTURES_REQUIRED addon-venv)
diff --git a/test/addon/conftest.py b/test/addon/conftest.py
new file mode 100644
index 00000000000..87012983951
--- /dev/null
+++ b/test/addon/conftest.py
@@ -0,0 +1,201 @@
+"""pytest configuration for the addon tests.
+
+The tests exercise addons/cppcheckdata.py against dump files that are
+generated on the fly with the cppcheck binary given by --cppcheck-binary.
+"""
+import os
+import shutil
+import subprocess
+import sys
+
+import pytest
+
+# Make 'import cppcheckdata' resolve to <repo>/addons/cppcheckdata.py
+_ADDONS_DIR = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'addons'))
+if _ADDONS_DIR not in sys.path:
+    sys.path.insert(0, _ADDONS_DIR)
+
+
+def pytest_addoption(parser):
+    parser.addoption('--cppcheck-binary',
+                     default='cppcheck',
+                     help='path to the cppcheck binary used to generate dump files '
+                          '(default: cppcheck found in PATH)')
+
+
+@pytest.fixture(scope='session')
+def cppcheck_binary(request):
+    binary = request.config.getoption('--cppcheck-binary')
+    resolved = shutil.which(binary)
+    if resolved is None:
+        pytest.fail("cppcheck binary '%s' not found - point --cppcheck-binary at a cppcheck executable" % binary)
+    return os.path.abspath(resolved)
+
+
+class DumpFactory:
+    """Runs 'cppcheck --dump' on a source snippet and parses the result."""
+
+    def __init__(self, binary, tmp_path_factory):
+        self.binary = binary
+        self.tmp_path_factory = tmp_path_factory
+
+    def create(self, code, filename='test.c', extra_args=()):
+        """Write the code to a file, dump it and return the dump file path."""
+        directory = self.tmp_path_factory.mktemp('cppcheckdata')
+        path = directory / filename
+        path.write_text(code)
+        cmd = [self.binary, '--dump', '--quiet', str(path)] + list(extra_args)
+        proc = subprocess.run(cmd,
+                              stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE,
+                              check=True,
+                              universal_newlines=True)
+        assert proc.returncode == 0, \
+            'cppcheck failed with exit code %d:\n%s\n%s' % (proc.returncode, proc.stdout, proc.stderr)
+        return str(path) + '.dump'
+
+    def parse(self, code, filename='test.c', extra_args=()):
+        """Write the code to a file, dump it and return the parsed CppcheckData."""
+        import cppcheckdata
+        return cppcheckdata.parsedump(self.create(code, filename, extra_args))
+
+
+@pytest.fixture(scope='session')
+def dump_factory(cppcheck_binary, tmp_path_factory):
+    return DumpFactory(cppcheck_binary, tmp_path_factory)
+
+
+SAMPLE_C = """#define ANSWER 42
+static int add(int a, int b)
+{
+    return a + b;
+}
+
+double half(double d)
+{
+    return d / 2.0;
+}
+
+int main(void)
+{
+    int x = ANSWER;
+    int arr[10];
+    arr[0] = add(x, 1);
+    int neg = -x;
+    return arr[0] + neg;
+}
+"""
+
+SAMPLE_CPP = """namespace ns {
+    int twice(int v) { return 2 * v; }
+}
+
+class Shape {
+public:
+    virtual ~Shape() {}
+    virtual double area() const = 0;
+protected:
+    double mScale;
+};
+
+enum Color { RED, GREEN };
+
+const int limit = 5;
+bool flag = true;
+const char *msg = "hello";
+char ch = 'x';
+
+int run()
+{
+    Color color = RED;
+    if (flag && limit > 1) {
+        return ns::twice(21);
+    }
+    return static_cast<int>(color);
+}
+"""
+
+MULTI_CFG_C = """typedef int myint;
+typedef float myfloat;
+#if defined(FOO) && FOO > 1
+int foo(void) { return 1; }
+#endif
+myint bar(void) { myint y = 3; return y; }
+"""
+
+MATCH_C = """struct Point {
+    int x;
+    int y;
+};
+
+int calc(int a, int b)
+{
+    int bit_or = a | b;
+    int log_or = a || b;
+    int mod = a % b;
+    int mul = a * b;
+    int not_a = !a;
+    int neq = a != b;
+    int arr[3];
+    arr[0] = a;
+    a += 1;
+    if (a > b) {
+        return a;
+    }
+    return calc(a, b);
+}
+"""
+
+MATCH_CPP = """class Widget {};
+
+bool use(int i, int j)
+{
+    std::vector<int> v;
+    bool less = i < j;
+    return less && v.empty();
+}
+"""
+
+
+@pytest.fixture(scope='session')
+def sample_data(dump_factory):
+    """Parsed dump of the canonical C sample."""
+    return dump_factory.parse(SAMPLE_C, filename='sample.c')
+
+
+@pytest.fixture(scope='session')
+def sample_cfg(sample_data):
+    cfgs = sample_data.configurations
+    assert len(cfgs) == 1
+    return cfgs[0]
+
+
+@pytest.fixture(scope='session')
+def sample_cpp_data(dump_factory):
+    """Parsed dump of the canonical C++ sample."""
+    return dump_factory.parse(SAMPLE_CPP, filename='sample.cpp')
+
+
+@pytest.fixture(scope='session')
+def sample_cpp_cfg(sample_cpp_data):
+    cfgs = sample_cpp_data.configurations
+    assert len(cfgs) == 1
+    return cfgs[0]
+
+
+@pytest.fixture(scope='session')
+def multi_cfg_data(dump_factory):
+    """Parsed dump of a file with two preprocessor configurations."""
+    return dump_factory.parse(MULTI_CFG_C, filename='multi.c')
+
+
+@pytest.fixture(scope='session')
+def match_cfg(dump_factory):
+    """Configuration of a C sample covering the match() pattern syntax."""
+    return dump_factory.parse(MATCH_C, filename='match.c').configurations[0]
+
+
+@pytest.fixture(scope='session')
+def match_cpp_cfg(dump_factory):
+    """Configuration of a C++ sample with linked '<' tokens for match()."""
+    return dump_factory.parse(MATCH_CPP, filename='match.cpp').configurations[0]
diff --git a/test/addon/requirements.txt b/test/addon/requirements.txt
new file mode 100644
index 00000000000..e079f8a6038
--- /dev/null
+++ b/test/addon/requirements.txt
@@ -0,0 +1 @@
+pytest
diff --git a/test/addon/test_cppcheckdata.py b/test/addon/test_cppcheckdata.py
new file mode 100644
index 00000000000..0ff3f31a89d
--- /dev/null
+++ b/test/addon/test_cppcheckdata.py
@@ -0,0 +1,915 @@
+"""Unit tests for addons/cppcheckdata.py
+
+Most tests parse dump files generated with the cppcheck binary
+(see conftest.py); tests of pure helper classes construct the
+objects directly from dicts (which provide the same .get() API
+as the XML elements).
+"""
+import json
+import sys
+
+import pytest
+
+import cppcheckdata
+
+
+def find_tokens(cfg, token_str):
+    return [tok for tok in cfg.tokenlist if tok.str == token_str]
+
+
+def find_token(cfg, token_str, skip=0):
+    tokens = find_tokens(cfg, token_str)
+    assert len(tokens) > skip, "token '%s' (skip=%d) not found" % (token_str, skip)
+    return tokens[skip]
+
+
+def find_function(cfg, name):
+    for function in cfg.functions:
+        if function.name == name:
+            return function
+    assert False, "function '%s' not found" % name
+
+
+def find_scope(cfg, scope_type, className=None):
+    for scope in cfg.scopes:
+        if scope.type == scope_type and (className is None or scope.className == className):
+            return scope
+    assert False, "scope '%s' not found" % scope_type
+
+
+def find_variable(cfg, name):
+    for variable in cfg.variables:
+        if variable.nameToken and variable.nameToken.str == name:
+            return variable
+    assert False, "variable '%s' not found" % name
+
+
+class TestCppcheckData:
+    def test_language(self, sample_data, sample_cpp_data):
+        assert sample_data.language == 'c'
+        assert sample_cpp_data.language == 'cpp'
+
+    def test_platform(self, sample_data):
+        platform = sample_data.platform
+        assert platform.name
+        assert platform.char_bit == 8
+        assert platform.short_bit >= 16
+        assert platform.int_bit >= 16
+        assert platform.long_bit >= 32
+        assert platform.long_long_bit >= 64
+        assert platform.pointer_bit > 0
+        assert 'char_bit=8' in repr(platform)
+
+    def test_files(self, sample_data):
+        assert len(sample_data.files) == 1
+        assert sample_data.files[0].endswith('sample.c')
+
+    def test_rawtokens(self, sample_data):
+        raw = sample_data.rawTokens
+        # the not yet preprocessed code contains the directive tokens
+        assert [tok.str for tok in raw[:4]] == ['#', 'define', 'ANSWER', '42']
+        assert raw[-1].str == '}'
+        assert raw[0].file.endswith('sample.c')
+        assert raw[0].linenr == 1
+        # next/previous chain
+        assert raw[0].previous is None
+        assert raw[-1].next is None
+        for i in range(len(raw) - 1):
+            assert raw[i].next is raw[i + 1]
+            assert raw[i + 1].previous is raw[i]
+
+    def test_configurations(self, sample_data):
+        cfgs = sample_data.configurations
+        assert len(cfgs) == 1
+        assert cfgs[0].name == ''
+
+    def test_iterconfigurations(self, multi_cfg_data):
+        it = multi_cfg_data.iterconfigurations()
+        cfgs = list(it)
+        assert len(cfgs) == 2
+        assert cfgs[0].name == ''
+        assert 'FOO' in cfgs[1].name
+        # 'foo()' is only tokenized in the FOO configuration
+        assert not find_tokens(cfgs[0], 'foo')
+        assert find_tokens(cfgs[1], 'foo')
+
+    def test_standards(self, sample_cfg, sample_cpp_cfg):
+        assert sample_cfg.standards.c.startswith('c')
+        assert sample_cpp_cfg.standards.cpp.startswith('c++')
+        assert sample_cfg.standards.posix is False
+        assert 'c=' in repr(sample_cfg.standards)
+
+
+class TestToken:
+    def test_tokenlist(self, sample_cfg):
+        code = ' '.join(tok.str for tok in sample_cfg.tokenlist)
+        assert 'static int add ( int a , int b )' in code
+        # the macro has been expanded
+        assert 'x = 42' in code
+
+    def test_next_previous(self, sample_cfg):
+        tokens = sample_cfg.tokenlist
+        assert tokens[0].previous is None
+        assert tokens[-1].next is None
+        for i in range(len(tokens) - 1):
+            assert tokens[i].next is tokens[i + 1]
+            assert tokens[i + 1].previous is tokens[i]
+
+    def test_location(self, sample_cfg):
+        tok = sample_cfg.tokenlist[0]
+        assert tok.str == 'static'
+        assert tok.file.endswith('sample.c')
+        assert tok.linenr == 2
+        assert tok.column == 1
+
+    def test_link(self, sample_cfg):
+        parenthesis = find_token(sample_cfg, '(')
+        assert parenthesis.link.str == ')'
+        assert parenthesis.link.link is parenthesis
+        bracket = find_token(sample_cfg, '[')
+        assert bracket.link.str == ']'
+        brace = find_token(sample_cfg, '{')
+        assert brace.link.str == '}'
+
+    def test_scope(self, sample_cfg):
+        assert sample_cfg.tokenlist[0].scope.type == 'Global'
+        return_tok = find_token(sample_cfg, 'return')
+        assert return_tok.scope.type == 'Function'
+        assert return_tok.scope.className == 'add'
+
+    def test_name_number_flags(self, sample_cfg):
+        name_tok = find_token(sample_cfg, 'main')
+        assert name_tok.isName
+        assert not name_tok.isNumber
+        num_tok = find_token(sample_cfg, '42')
+        assert num_tok.isNumber
+        assert num_tok.isInt
+        assert not num_tok.isFloat
+        float_tok = find_token(sample_cfg, '2.0')
+        assert float_tok.isNumber
+        assert float_tok.isFloat
+
+    def test_operator_flags(self, sample_cfg, sample_cpp_cfg):
+        plus = find_token(sample_cfg, '+')
+        assert plus.isOp
+        assert plus.isArithmeticalOp
+        assign = find_token(sample_cfg, '=')
+        assert assign.isOp
+        assert assign.isAssignmentOp
+        logical = find_token(sample_cpp_cfg, '&&')
+        assert logical.isOp
+        assert logical.isLogicalOp
+        comparison = find_token(sample_cpp_cfg, '>')
+        assert comparison.isOp
+        assert comparison.isComparisonOp
+
+    def test_string_char(self, sample_cpp_cfg):
+        string_tok = find_token(sample_cpp_cfg, '"hello"')
+        assert string_tok.isString
+        assert string_tok.strlen == 5
+        char_tok = find_token(sample_cpp_cfg, "'x'")
+        assert char_tok.isChar
+
+    @pytest.mark.xfail(strict=False,
+                       reason='Tokenizer::dump checks Token::isName() before Token::isBoolean() and '
+                              'eBoolean tokens are names, so type="boolean" is never dumped')
+    def test_boolean(self, sample_cpp_cfg):
+        bool_tok = find_token(sample_cpp_cfg, 'true')
+        assert bool_tok.isBoolean
+
+    def test_cast(self, sample_cpp_cfg):
+        # static_cast<int>(...) is simplified to a C-style cast
+        assert any(tok.isCast for tok in sample_cpp_cfg.tokenlist)
+
+    def test_macro_expansion(self, sample_cfg):
+        tok = find_token(sample_cfg, '42')
+        assert tok.isExpandedMacro
+        assert tok.macroName == 'ANSWER'
+
+    def test_removed_void_parameter(self, sample_cfg):
+        main_tok = find_token(sample_cfg, 'main')
+        assert main_tok.next.isRemovedVoidParameter
+
+    def test_splitted_var_decl(self, sample_cfg):
+        # 'int x = ANSWER;' is simplified to 'int x ; x = 42 ;'
+        assert any(tok.isSplittedVarDeclEq for tok in sample_cfg.tokenlist)
+
+    def test_variable_and_var_id(self, sample_cfg):
+        x_decl = find_token(sample_cfg, 'x')
+        assert x_decl.varId
+        assert x_decl.variable.nameToken is x_decl
+        # all 'x' tokens refer to the same variable and varId
+        for tok in find_tokens(sample_cfg, 'x'):
+            assert tok.varId == x_decl.varId
+            assert tok.variable is x_decl.variable
+
+    def test_function(self, sample_cfg):
+        add_call = find_token(sample_cfg, 'add', skip=1)
+        assert add_call.function
+        assert add_call.function.name == 'add'
+
+    def test_value_type(self, sample_cfg):
+        x_tok = find_token(sample_cfg, 'x')
+        assert x_tok.valueType.type == 'int'
+        assert x_tok.valueType.sign == 'signed'
+        assert x_tok.valueType.pointer == 0
+        assert x_tok.valueType.isIntegral()
+        assert not x_tok.valueType.isFloat()
+        assert not x_tok.valueType.isEnum()
+        d_tok = find_token(sample_cfg, 'd')
+        assert d_tok.valueType.type == 'double'
+        assert d_tok.valueType.isFloat()
+        # in 'arr[0] = ...' the array decays to a pointer
+        arr_use = find_token(sample_cfg, 'arr', skip=1)
+        assert arr_use.valueType.pointer == 1
+
+    def test_value_type_enum(self, sample_cpp_cfg):
+        color_tok = find_token(sample_cpp_cfg, 'color')
+        assert color_tok.valueType.isEnum()
+        assert color_tok.valueType.typeScope.className == 'Color'
+
+    def test_ast(self, sample_cfg):
+        plus = find_token(sample_cfg, '+')
+        assert plus.astOperand1.str == 'a'
+        assert plus.astOperand2.str == 'b'
+        assert plus.astParent.str == 'return'
+        assert plus.isBinaryOp()
+        assert not plus.isUnaryOp('+')
+
+    def test_ast_unary_op(self, sample_cfg):
+        # the '-' in 'int neg = -x;'
+        minus = find_token(sample_cfg, '-')
+        assert minus.isUnaryOp('-')
+        assert not minus.isBinaryOp()
+        assert minus.astOperand1.str == 'x'
+        assert minus.astOperand2 is None
+
+    def test_ast_parents_top(self, sample_cfg):
+        a_tok = find_token(sample_cfg, 'a', skip=1)  # the 'a' in 'return a + b;'
+        assert [tok.str for tok in a_tok.astParents()] == ['+', 'return']
+        assert a_tok.astTop().str == 'return'
+
+    def test_values(self, sample_cfg):
+        # 'x' has the known value 42 when it is used
+        x_use = find_token(sample_cfg, 'x', skip=2)
+        assert x_use.getKnownIntValue() == 42
+        value = x_use.getValue(42)
+        assert value.intvalue == 42
+        assert value.isKnown()
+        assert not value.isPossible()
+        assert x_use.getValue(43) is None
+        assert 'intvalue=42' in repr(value)
+
+    def test_values_possible(self, sample_cfg):
+        # inside add() the argument 'a' has the possible value 42
+        a_use = find_token(sample_cfg, 'a', skip=1)
+        assert a_use.getKnownIntValue() is None
+        value = a_use.getValue(42)
+        assert value is not None
+        assert value.isPossible()
+
+    def test_impossible_values(self, sample_cfg):
+        # impossible values are separated from the possible/known ones
+        arr_tokens = find_tokens(sample_cfg, 'arr')
+        impossible = [v for tok in arr_tokens for v in tok.impossible_values]
+        assert impossible
+        assert all(v.isImpossible() for v in impossible)
+        possible_or_known = [v for tok in arr_tokens for v in tok.values]
+        assert all(not v.isImpossible() for v in possible_or_known)
+
+    def test_forward_backward(self, sample_cfg):
+        add_def = find_token(sample_cfg, 'add')
+        strs = [tok.str for tok in add_def.forward()]
+        assert strs[:4] == ['add', '(', 'int', 'a']
+        end = add_def.tokAt(2)
+        assert [tok.str for tok in add_def.forward(end=end)] == ['add', '(']
+        strs = [tok.str for tok in add_def.backward()]
+        assert strs[:3] == ['add', 'int', 'static']
+        start = sample_cfg.tokenlist[0]
+        assert [tok.str for tok in add_def.backward(start=start)] == ['add', 'int']
+
+    def test_tokAt_linkAt(self, sample_cfg):
+        add_def = find_token(sample_cfg, 'add')
+        assert add_def.tokAt(0) is add_def
+        assert add_def.tokAt(1).str == '('
+        assert add_def.tokAt(-1).str == 'int'
+        assert add_def.linkAt(1).str == ')'
+
+    def test_repr(self, sample_cfg):
+        tok = sample_cfg.tokenlist[0]
+        assert "str='static'" in repr(tok)
+
+
+class TestScope:
+    def test_scopes(self, sample_cfg):
+        types = [scope.type for scope in sample_cfg.scopes]
+        assert types.count('Global') == 1
+        assert types.count('Function') == 3
+
+    def test_global_scope(self, sample_cfg):
+        global_scope = find_scope(sample_cfg, 'Global')
+        assert global_scope.nestedIn is None
+        assert not global_scope.isExecutable
+        assert len(global_scope.nestedList) == 3
+
+    def test_function_scope(self, sample_cfg):
+        scope = find_scope(sample_cfg, 'Function', className='add')
+        assert scope.bodyStart.str == '{'
+        assert scope.bodyEnd.str == '}'
+        assert scope.bodyStart.link is scope.bodyEnd
+        assert scope.nestedIn.type == 'Global'
+        assert scope.function.name == 'add'
+        assert scope.isExecutable
+
+    def test_varlist(self, sample_cfg):
+        scope = find_scope(sample_cfg, 'Function', className='main')
+        names = [var.nameToken.str for var in scope.varlist]
+        assert names == ['x', 'arr', 'neg']
+
+    def test_cpp_scopes(self, sample_cpp_cfg):
+        types = {scope.type for scope in sample_cpp_cfg.scopes}
+        assert {'Global', 'Namespace', 'Class', 'Enum', 'Function', 'If'} <= types
+        assert find_scope(sample_cpp_cfg, 'Namespace', className='ns')
+        assert find_scope(sample_cpp_cfg, 'Class', className='Shape')
+        if_scope = find_scope(sample_cpp_cfg, 'If')
+        assert if_scope.isExecutable
+        class_scope = find_scope(sample_cpp_cfg, 'Class')
+        assert not class_scope.isExecutable
+
+
+class TestFunction:
+    def test_functions(self, sample_cfg):
+        names = {function.name for function in sample_cfg.functions}
+        assert names == {'add', 'half', 'main'}
+
+    def test_arguments(self, sample_cfg):
+        add = find_function(sample_cfg, 'add')
+        assert sorted(add.argument.keys()) == [1, 2]
+        assert add.argument[1].nameToken.str == 'a'
+        assert add.argument[2].nameToken.str == 'b'
+        main = find_function(sample_cfg, 'main')
+        assert main.argument == {}
+
+    def test_attributes(self, sample_cfg):
+        add = find_function(sample_cfg, 'add')
+        assert add.isStatic
+        assert add.type == 'Function'
+        assert add.tokenDef.str == 'add'
+        assert add.token.str == 'add'
+        assert add.nestedIn.type == 'Global'
+        main = find_function(sample_cfg, 'main')
+        assert not main.isStatic
+
+    def test_virtual(self, sample_cpp_cfg):
+        area = find_function(sample_cpp_cfg, 'area')
+        assert area.hasVirtualSpecifier
+        twice = find_function(sample_cpp_cfg, 'twice')
+        assert not twice.hasVirtualSpecifier
+        assert twice.nestedIn.className == 'ns'
+
+
+class TestVariable:
+    def test_local(self, sample_cfg):
+        x = find_variable(sample_cfg, 'x')
+        assert x.access == 'Local'
+        assert x.isLocal
+        assert not x.isArgument
+        assert not x.isGlobal
+        assert not x.isArray
+        assert x.typeStartToken.str == 'int'
+        assert x.typeEndToken.str == 'int'
+        assert x.scope.className == 'main'
+
+    def test_argument(self, sample_cfg):
+        a = find_variable(sample_cfg, 'a')
+        assert a.access == 'Argument'
+        assert a.isArgument
+        assert not a.isLocal
+
+    def test_array(self, sample_cfg):
+        arr = find_variable(sample_cfg, 'arr')
+        assert arr.isArray
+        assert not arr.isPointer
+
+    def test_global_const(self, sample_cpp_cfg):
+        limit = find_variable(sample_cpp_cfg, 'limit')
+        assert limit.access == 'Global'
+        assert limit.isGlobal
+        assert limit.isConst
+        assert not limit.isStatic
+
+    def test_pointer(self, sample_cpp_cfg):
+        msg = find_variable(sample_cpp_cfg, 'msg')
+        assert msg.isPointer
+        assert not msg.isArray
+
+    def test_class_member(self, sample_cpp_cfg):
+        member = find_variable(sample_cpp_cfg, 'mScale')
+        assert member.access == 'Protected'
+        assert member.isClass is False
+
+
+class TestPreprocessor:
+    def test_directives(self, sample_cfg):
+        directives = sample_cfg.directives
+        assert len(directives) == 1
+        assert directives[0].str == '#define ANSWER 42'
+        assert directives[0].file.endswith('sample.c')
+        assert directives[0].linenr == 1
+        assert "#define ANSWER 42" in repr(directives[0])
+
+    def test_macro_usage(self, sample_cfg):
+        macros = sample_cfg.macro_usage
+        assert len(macros) == 1
+        macro = macros[0]
+        assert macro.name == 'ANSWER'
+        assert macro.usefile.endswith('sample.c')
+        assert int(macro.useline) == 14
+        assert macro.isKnownValue
+        assert "name='ANSWER'" in repr(macro)
+
+    def test_if_conditions(self, multi_cfg_data):
+        cfgs = multi_cfg_data.configurations
+        for cfg in cfgs:
+            assert len(cfg.preprocessor_if_conditions) == 1
+            assert cfg.preprocessor_if_conditions[0].linenr == 3
+        assert cfgs[0].preprocessor_if_conditions[0].result == 0
+        assert cfgs[1].preprocessor_if_conditions[0].result == 1
+        assert 'result=' in repr(cfgs[0].preprocessor_if_conditions[0])
+
+    def test_typedef_info(self, multi_cfg_data):
+        cfg = multi_cfg_data.configurations[0]
+        typedefs = {info.name: info for info in cfg.typedefInfo}
+        assert set(typedefs.keys()) == {'myint', 'myfloat'}
+        assert typedefs['myint'].used
+        assert not typedefs['myfloat'].used
+        assert typedefs['myint'].linenr == 1
+
+
+class TestHelperFunctions:
+    def test_getArguments(self, sample_cfg):
+        add_call = find_token(sample_cfg, 'add', skip=1)
+        args = cppcheckdata.getArguments(add_call)
+        assert [tok.str for tok in args] == ['x', '1']
+
+    def test_getArguments_no_call(self, sample_cfg):
+        int_tok = find_token(sample_cfg, 'int')
+        assert cppcheckdata.getArguments(int_tok) is None
+
+    def test_get_function_call_name_args(self, sample_cfg):
+        add_call = find_token(sample_cfg, 'add', skip=1)
+        name, args = cppcheckdata.get_function_call_name_args(add_call)
+        assert name == 'add'
+        assert [tok.str for tok in args] == ['x', '1']
+
+    def test_get_function_call_name_args_namespace(self, sample_cpp_cfg):
+        twice_call = find_token(sample_cpp_cfg, 'twice', skip=1)
+        name, args = cppcheckdata.get_function_call_name_args(twice_call)
+        assert name == 'ns::twice'
+        assert [tok.str for tok in args] == ['21']
+
+    def test_get_function_call_name_args_not_a_call(self, sample_cfg):
+        # the function definition is not a call
+        add_def = find_token(sample_cfg, 'add')
+        name, args = cppcheckdata.get_function_call_name_args(add_def)
+        assert name is None
+        assert args is None
+
+    def test_astIsFloat(self, sample_cfg):
+        division = find_token(sample_cfg, '/')
+        assert cppcheckdata.astIsFloat(division)
+        plus = find_token(sample_cfg, '+')  # a + b with int operands
+        assert not cppcheckdata.astIsFloat(plus)
+        assert not cppcheckdata.astIsFloat(None)
+
+
+class TestMatch:
+    """Tests for the cppcheckdata.match()/simpleMatch() pattern matching."""
+
+    def test_simpleMatch(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        assert cppcheckdata.simpleMatch(calc_def, 'calc')
+        assert cppcheckdata.simpleMatch(calc_def, 'calc ( int a , int b )')
+        assert not cppcheckdata.simpleMatch(calc_def, 'calc ( int b')
+        assert not cppcheckdata.simpleMatch(None, 'calc')
+
+    def test_literal_sequence(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        assert cppcheckdata.match(calc_def, 'calc ( int')
+        assert cppcheckdata.match(calc_def, 'calc ( int a , int b )')
+        assert not cppcheckdata.match(calc_def, 'calc ( char')
+        # the match is anchored at the given token
+        assert not cppcheckdata.match(calc_def, 'int calc')
+
+    def test_empty_pattern_and_no_token(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        assert not cppcheckdata.match(calc_def, '')
+        assert not cppcheckdata.match(None, 'calc')
+
+    def test_end(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        res = cppcheckdata.match(calc_def, 'calc')
+        assert res.end is calc_def
+        res = cppcheckdata.match(calc_def, 'calc ( int')
+        assert res.end.str == 'int'
+
+    # ---- literal operator tokens ----
+
+    def test_literal_bitwise_or(self, match_cfg):
+        # a literal '|' in the pattern matches a '|' token ...
+        bit_or = find_token(match_cfg, '|')
+        assert cppcheckdata.match(bit_or, '|')
+        assert cppcheckdata.match(bit_or.previous, '%var% | %var% ;')
+        # ... but not a '||' token, and it is not an either-or alternation
+        log_or = find_token(match_cfg, '||')
+        assert not cppcheckdata.match(log_or, '|')
+
+    def test_literal_logical_or(self, match_cfg):
+        log_or = find_token(match_cfg, '||')
+        assert cppcheckdata.match(log_or, '||')
+        assert cppcheckdata.match(log_or.previous, '%var% || %var% ;')
+        bit_or = find_token(match_cfg, '|')
+        assert not cppcheckdata.match(bit_or, '||')
+
+    def test_literal_not(self, match_cfg):
+        not_tok = find_token(match_cfg, '!')
+        assert cppcheckdata.match(not_tok, '! %var% ;')
+        assert not cppcheckdata.match(find_token(match_cfg, '!='), '!')
+
+    def test_literal_not_equal(self, match_cfg):
+        neq = find_token(match_cfg, '!=')
+        assert cppcheckdata.match(neq, '!=')
+        assert cppcheckdata.match(neq.previous, '%var% != %var% ;')
+        assert not cppcheckdata.match(find_token(match_cfg, '='), '!=')
+        assert not cppcheckdata.match(neq, '=')
+
+    def test_literal_star(self, match_cfg):
+        mul = find_token(match_cfg, '*')
+        assert cppcheckdata.match(mul, '*')
+        assert cppcheckdata.match(mul.previous, '%var% * %var% ;')
+
+    def test_literal_percent(self, match_cfg):
+        mod = find_token(match_cfg, '%')
+        assert cppcheckdata.match(mod, '%')
+        assert cppcheckdata.match(mod.previous, '%var% % %var% ;')
+
+    def test_literal_parentheses(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        assert cppcheckdata.match(calc_call, 'calc ( %var% , %var% ) ;')
+
+    # ---- %keyword% patterns ----
+
+    def test_any(self, match_cfg):
+        for token_str in ('calc', '(', '3', ';', '|', '{'):
+            assert cppcheckdata.match(find_token(match_cfg, token_str), '%any%')
+        plus_assign = find_token(match_cfg, '+=')
+        assert cppcheckdata.match(plus_assign, '%assign% %any% ;')
+
+    def test_assign(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '='), '%assign%')
+        assert cppcheckdata.match(find_token(match_cfg, '+='), '%assign%')
+        assert not cppcheckdata.match(find_token(match_cfg, '!='), '%assign%')
+        assert not cppcheckdata.match(find_token(match_cfg, '|'), '%assign%')
+
+    def test_comp(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '>'), '%comp%')
+        assert cppcheckdata.match(find_token(match_cfg, '!='), '%comp%')
+        assert not cppcheckdata.match(find_token(match_cfg, '='), '%comp%')
+        assert not cppcheckdata.match(find_token(match_cfg, '|'), '%comp%')
+
+    def test_name(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, 'calc'), '%name%')
+        assert cppcheckdata.match(find_token(match_cfg, 'int'), '%name%')
+        assert not cppcheckdata.match(find_token(match_cfg, '3'), '%name%')
+        assert not cppcheckdata.match(find_token(match_cfg, '('), '%name%')
+
+    def test_op(self, match_cfg):
+        for op in ('|', '||', '*', '%', '!=', '>', '=', '+='):
+            assert cppcheckdata.match(find_token(match_cfg, op), '%op%'), op
+        assert not cppcheckdata.match(find_token(match_cfg, ';'), '%op%')
+        assert not cppcheckdata.match(find_token(match_cfg, 'calc'), '%op%')
+
+    def test_or(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '|'), '%or%')
+        assert not cppcheckdata.match(find_token(match_cfg, '||'), '%or%')
+
+    def test_oror(self, match_cfg):
+        assert cppcheckdata.match(find_token(match_cfg, '||'), '%oror%')
+        assert not cppcheckdata.match(find_token(match_cfg, '|'), '%oror%')
+
+    def test_var(self, match_cfg):
+        a_use = find_token(match_cfg, 'a', skip=1)
+        assert cppcheckdata.match(a_use, '%var%')
+        # a function name is a %name% but not a %var%
+        assert not cppcheckdata.match(find_token(match_cfg, 'calc'), '%var%')
+        assert not cppcheckdata.match(find_token(match_cfg, '3'), '%var%')
+
+    # ---- link patterns ----
+
+    def test_link_parentheses(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call.next, '(*)')
+        assert res
+        assert res.end.str == ')'
+        assert res.end is calc_call.next.link
+        # the pattern continues after the linked token
+        assert cppcheckdata.match(calc_call, '%name% (*) ;')
+        # '(*)' only matches at a '(' token
+        assert not cppcheckdata.match(calc_call, '(*)')
+
+    def test_link_brackets(self, match_cfg):
+        arr_decl = find_token(match_cfg, 'arr')
+        assert cppcheckdata.match(arr_decl, 'arr [*] ;')
+        arr_use = find_token(match_cfg, 'arr', skip=1)
+        res = cppcheckdata.match(arr_use, '%name% [*] %assign% %var% ;')
+        assert res
+
+    def test_link_braces(self, match_cfg):
+        if_scope = find_scope(match_cfg, 'If')
+        res = cppcheckdata.match(if_scope.bodyStart, '{*}')
+        assert res
+        assert res.end is if_scope.bodyEnd
+
+    def test_link_combined(self, match_cfg):
+        if_tok = find_token(match_cfg, 'if')
+        res = cppcheckdata.match(if_tok, 'if (*) {*}')
+        assert res
+        assert res.end.str == '}'
+
+    def test_link_angle_brackets(self, match_cpp_cfg):
+        # the '<' of 'std::vector<int>' is linked to the '>'
+        template_lt = find_token(match_cpp_cfg, '<')
+        assert template_lt.link
+        res = cppcheckdata.match(template_lt, '<*>')
+        assert res
+        assert res.end.str == '>'
+        assert cppcheckdata.match(template_lt.previous, 'vector <*> %var%')
+        # the '<' in 'i < j' is a comparison without a link
+        comparison_lt = find_token(match_cpp_cfg, '<', skip=1)
+        assert comparison_lt.link is None
+        assert not cppcheckdata.match(comparison_lt, '<*>')
+
+    # ---- either-or alternation ----
+
+    def test_alternatives(self, match_cfg):
+        struct_tok = find_token(match_cfg, 'struct')
+        assert cppcheckdata.match(struct_tok, 'struct|class %name% {')
+        assert not cppcheckdata.match(struct_tok, 'union|enum %name% {')
+
+    def test_alternatives_cpp(self, match_cpp_cfg):
+        class_tok = find_token(match_cpp_cfg, 'class')
+        assert cppcheckdata.match(class_tok, 'struct|class %name% {')
+
+    def test_alternatives_with_keyword(self, match_cfg):
+        struct_tok = find_token(match_cfg, 'struct')
+        assert cppcheckdata.match(struct_tok, '%op%|struct')
+        assert not cppcheckdata.match(struct_tok, '%op%|%comp%')
+
+    # ---- negation ----
+
+    def test_negation(self, match_cfg):
+        struct_tok = find_token(match_cfg, 'struct')
+        assert cppcheckdata.match(struct_tok, 'struct !!;')
+        assert not cppcheckdata.match(struct_tok, 'struct !!Point')
+
+    def test_negation_keyword(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        assert cppcheckdata.match(calc_call, '%name% !!%op%')
+        assert not cppcheckdata.match(calc_call, '%name% !!(')
+
+    @pytest.mark.xfail(strict=False,
+                       reason='in the C++ Token::Match a negation also matches when there is no token, '
+                              'in match() it does not')
+    def test_negation_no_token(self, match_cfg):
+        last = match_cfg.tokenlist[-1]
+        assert last.str == '}'
+        assert cppcheckdata.match(last, '} !!x')
+
+    # ---- bindings ----
+
+    def test_bindings(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call, '%name%@ftok (*)')
+        assert res
+        assert res.ftok is calc_call
+        assert res.ftok.str == 'calc'
+        assert res.end.str == ')'
+
+    def test_multiple_bindings(self, match_cfg):
+        bit_or_lhs = find_token(match_cfg, 'bit_or', skip=1)
+        res = cppcheckdata.match(bit_or_lhs, '%var%@lhs = %var%@op1 | %var%@op2 ;')
+        assert res
+        assert res.lhs.str == 'bit_or'
+        assert res.op1.str == 'a'
+        assert res.op2.str == 'b'
+
+    def test_binding_on_link_pattern(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        # the binding is the '(' token, end is behind the linked ')'
+        res = cppcheckdata.match(calc_call, '%name% (*)@paren')
+        assert res
+        assert res.paren.str == '('
+        assert res.paren.link is res.end
+
+    def test_bindings_on_failure(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call, '%name%@ftok [*]@brackets')
+        assert not res
+        # all bindings (including 'end') read as None on a failed match
+        assert res.ftok is None
+        assert res.brackets is None
+        assert res.end is None
+
+    def test_unknown_binding_raises(self, match_cfg):
+        calc_call = find_token(match_cfg, 'calc', skip=1)
+        res = cppcheckdata.match(calc_call, '%name%@ftok (*)')
+        assert res
+        with pytest.raises(AttributeError):
+            res.nosuchbinding # pylint: disable=W0104
+        res = cppcheckdata.match(calc_call, '%name%@ftok [*]')
+        assert not res
+        with pytest.raises(AttributeError):
+            res.nosuchbinding # pylint: disable=W0104
+
+    # ---- '**' forward search ----
+
+    def test_find_forward(self, match_cfg):
+        calc_def = find_token(match_cfg, 'calc')
+        # '**' searches forward, skipping linked groups: the '{' found here
+        # is the function body, not a '{' inside the parameter list
+        res = cppcheckdata.match(calc_def, 'calc **{')
+        assert res
+        assert res.end.str == '{'
+        assert not cppcheckdata.match(calc_def, 'calc **nosuchtoken')
+
+
+class TestSuppressions:
+    def make_suppression(self, **kwargs):
+        return cppcheckdata.Suppression(kwargs)
+
+    def test_line_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv', lineNumber='5')
+        assert supp.isMatch('a.c', '5', 'msg', 'zerodiv')
+        assert not supp.isMatch('a.c', '5', 'msg', 'nullPointer')
+
+    @pytest.mark.xfail(strict=False,
+                       reason='the "other suppression" fallback in Suppression.isMatch() does not check '
+                              'that lineNumber is unset, so a line suppression matches every line')
+    def test_line_suppression_other_line(self):
+        supp = self.make_suppression(errorId='zerodiv', lineNumber='5')
+        assert not supp.isMatch('a.c', '6', 'msg', 'zerodiv')
+
+    def test_wildcard_errorId(self):
+        supp = self.make_suppression(errorId='*', lineNumber='5')
+        assert supp.isMatch('a.c', '5', 'msg', 'anything')
+
+    def test_file_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv', fileName='a.c', type='file')
+        assert supp.isMatch('a.c', '1', 'msg', 'zerodiv')
+        assert supp.isMatch('a.c', '99', 'msg', 'zerodiv')
+        assert not supp.isMatch('b.c', '1', 'msg', 'zerodiv')
+
+    def test_block_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv', type='block', lineBegin='3', lineEnd='7')
+        assert supp.isMatch('a.c', '5', 'msg', 'zerodiv')
+        assert not supp.isMatch('a.c', '3', 'msg', 'zerodiv')
+        assert not supp.isMatch('a.c', '7', 'msg', 'zerodiv')
+
+    def test_global_suppression(self):
+        supp = self.make_suppression(errorId='zerodiv')
+        assert supp.isMatch('a.c', '1', 'msg', 'zerodiv')
+        assert supp.isMatch('b.c', '99', 'other', 'zerodiv')
+
+    def test_symbolName(self):
+        supp = self.make_suppression(errorId='zerodiv', symbolName='xyz')
+        assert supp.isMatch('a.c', '1', 'error on xyz here', 'zerodiv')
+        assert not supp.isMatch('a.c', '1', 'other message', 'zerodiv')
+
+    def test_dumpfile_suppressions(self, dump_factory):
+        code = ('void f(void)\n'
+                '{\n'
+                '    int a;\n'
+                '    // cppcheck-suppress uninitvar\n'
+                '    a++;\n'
+                '}\n')
+        data = dump_factory.parse(code, extra_args=['--inline-suppr'])
+        assert len(data.suppressions) == 1
+        supp = data.suppressions[0]
+        assert supp.errorId == 'uninitvar'
+        assert supp.fileName.endswith('test.c')
+        assert int(supp.lineNumber) == 5
+        # parsedump() also sets the suppressions used by is_suppressed()
+        location = cppcheckdata.Location({'file': supp.fileName, 'line': '5', 'column': '5'})
+        assert cppcheckdata.is_suppressed(location, 'msg', 'uninitvar')
+        assert not cppcheckdata.is_suppressed(location, 'msg', 'nullPointer')
+        # NOTE: a non-matching line is not checked here - see test_line_suppression_other_line
+
+
+class TestPureHelpers:
+    """Tests that construct objects from dicts and do not need a dump file."""
+
+    def test_location(self):
+        loc = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        assert loc.file == 'a.c'
+        assert loc.linenr == 3
+        assert loc.column == 7
+
+    def test_location_defaults(self):
+        loc = cppcheckdata.Location({'file': 'a.c'})
+        assert loc.linenr == 0
+        assert loc.column == 0
+
+    def test_location_linenr_alias(self):
+        loc = cppcheckdata.Location({'file': 'a.c', 'linenr': '4'})
+        assert loc.linenr == 4
+
+    def test_value_kinds(self):
+        known = cppcheckdata.Value({'intvalue': '42', 'known': 'true'})
+        assert known.intvalue == 42
+        assert known.isKnown()
+        assert not known.isPossible()
+        possible = cppcheckdata.Value({'intvalue': '1', 'possible': 'true'})
+        assert possible.isPossible()
+        impossible = cppcheckdata.Value({'intvalue': '0', 'impossible': 'true'})
+        assert impossible.isImpossible()
+        inconclusive = cppcheckdata.Value({'intvalue': '2', 'inconclusive': 'true'})
+        assert inconclusive.isInconclusive()
+
+    def test_value_condition(self):
+        value = cppcheckdata.Value({'intvalue': '1', 'possible': 'true', 'condition-line': '12'})
+        assert value.condition == 12
+
+    def test_argument_parser(self):
+        parser = cppcheckdata.ArgumentParser()
+        args = parser.parse_args(['a.dump', 'b.ctu-info', '--cli', '-q'])
+        assert args.dumpfile == ['a.dump', 'b.ctu-info']
+        assert args.cli
+        assert args.quiet
+        assert args.file_list is None
+        assert '{severity}' in args.template
+
+    def test_get_files(self, tmp_path):
+        file_list = tmp_path / 'files.txt'
+        file_list.write_text('c.dump\nd.ctu-info\n')
+        parser = cppcheckdata.ArgumentParser()
+        args = parser.parse_args(['a.dump', 'b.ctu-info', '--file-list', str(file_list)])
+        dump_files, ctu_info_files = cppcheckdata.get_files(args)
+        assert dump_files == ['a.dump', 'c.dump']
+        assert ctu_info_files == ['b.ctu-info', 'd.ctu-info']
+
+
+class TestReporting:
+    def test_reportError_cli(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py', '--cli'])
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'error', 'the message', 'myaddon', 'myid', extra='extra info')
+        msg = json.loads(capsys.readouterr().out)
+        assert msg == {'file': 'a.c',
+                       'linenr': 3,
+                       'column': 7,
+                       'severity': 'error',
+                       'message': 'the message',
+                       'addon': 'myaddon',
+                       'errorId': 'myid',
+                       'extra': 'extra info'}
+
+    def test_reportError_cli_column_override(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py', '--cli'])
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'error', 'the message', 'myaddon', 'myid', columnOverride=42)
+        msg = json.loads(capsys.readouterr().out)
+        assert msg['column'] == 42
+
+    def test_reportError_stderr(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py'])
+        monkeypatch.setattr(cppcheckdata, 'current_dumpfile_suppressions', [])
+        monkeypatch.setattr(cppcheckdata, 'EXIT_CODE', 0)
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'style', 'the message', 'myaddon', 'myid')
+        stderr = capsys.readouterr().err
+        assert stderr == '[a.c:3] (style) the message [myaddon-myid]\n'
+        assert cppcheckdata.EXIT_CODE == 1
+
+    def test_reportError_stderr_suppressed(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py'])
+        suppression = cppcheckdata.Suppression({'errorId': 'myaddon-myid'})
+        monkeypatch.setattr(cppcheckdata, 'current_dumpfile_suppressions', [suppression])
+        monkeypatch.setattr(cppcheckdata, 'EXIT_CODE', 0)
+        location = cppcheckdata.Location({'file': 'a.c', 'line': '3', 'column': '7'})
+        cppcheckdata.reportError(location, 'style', 'the message', 'myaddon', 'myid')
+        assert capsys.readouterr().err == ''
+        assert cppcheckdata.EXIT_CODE == 0
+
+    def test_log_checker_cli(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py', '--cli'])
+        cppcheckdata.log_checker('SomeChecker', 'myaddon')
+        msg = json.loads(capsys.readouterr().out)
+        assert msg == {'addon': 'myaddon',
+                       'severity': 'none',
+                       'message': 'SomeChecker',
+                       'errorId': 'logChecker'}
+
+    def test_log_checker_no_cli(self, monkeypatch, capsys):
+        monkeypatch.setattr(sys, 'argv', ['myaddon.py'])
+        cppcheckdata.log_checker('SomeChecker', 'myaddon')
+        assert capsys.readouterr().out == ''
diff --git a/test/cfg/boost.cpp b/test/cfg/boost.cpp
index ecdedea5ec2..27fae71b499 100644
--- a/test/cfg/boost.cpp
+++ b/test/cfg/boost.cpp
@@ -9,15 +9,21 @@
 
 // cppcheck-suppress-file valueFlowBailout
 
-#include <boost/config.hpp>
+#include <cstdio>
+#include <new>
+#include <tuple>
+
+#include <boost/config.hpp> // IWYU pragma: keep
 #include <boost/math/special_functions/round.hpp>
-#include <boost/endian/conversion.hpp>
+#include <boost/endian/conversion.hpp> // IWYU pragma: keep
 #include <boost/bind/bind.hpp>
-#include <boost/function.hpp>
+#include <boost/function.hpp> // IWYU pragma: keep
 #include <boost/smart_ptr/scoped_array.hpp>
-#include <boost/thread/mutex.hpp>
+#include <boost/thread/mutex.hpp> // IWYU pragma: keep
 #include <boost/thread/lock_guard.hpp>
-#include <boost/test/unit_test.hpp>
+#include <boost/test/unit_test.hpp> // IWYU pragma: keep
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/data/monomorphic.hpp>
 #include <boost/core/scoped_enum.hpp>
 #include <boost/foreach.hpp>
 
@@ -151,6 +157,7 @@ void test_BOOST_FOREACH_5()
 {
     std::set<int> data;
     BOOST_FOREACH(const int& i, get_data())
+        // cppcheck-suppress useStlAlgorithm
         data.insert(i);
 }
 
@@ -195,3 +202,46 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(my_tuple_test, T, test_types_w_tuples)
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+
+// https://www.boost.org/doc/libs/latest/libs/test/doc/html/boost_test/tests_organization/test_cases/test_case_generation/datasets.html
+namespace bdata = boost::unit_test::data;
+
+// Dataset generating a Fibonacci sequence
+struct fibonacci_dataset {
+    // the type of the samples is deduced
+    // cppcheck-suppress unusedStructMember // FP #14795, used in template is_dataset
+    static const int arity = 1;
+
+    struct iterator {
+        int operator*() const { return b; }
+        void operator++() {
+            a = a + b;
+            std::swap(a, b);
+        }
+    private:
+        int a = 1;
+        int b = 1; // b is the output
+    };
+
+    // size is infinite
+    bdata::size_t size() const { return bdata::BOOST_TEST_DS_INFINITE_SIZE; }
+
+    // iterator
+    static iterator begin() { return iterator(); }
+};
+
+namespace boost { namespace unit_test { namespace data { namespace monomorphic {
+  // registering fibonacci_dataset as a proper dataset
+  template <>
+  struct is_dataset<fibonacci_dataset> : boost::mpl::true_ {};
+}}}}
+
+// Creating a test-driven dataset, the zip is for checking
+BOOST_DATA_TEST_CASE(
+    test1,
+    fibonacci_dataset() ^ bdata::make( { 1, 2, 3, 5, 8, 13, 21, 35, 56 } ),
+    fib_sample, exp)
+{
+      // cppcheck-suppress valueFlowBailoutIncompleteVar // TODO: fib_sample declared in test case
+      BOOST_TEST(fib_sample == exp);
+}
diff --git a/test/cfg/cairo.c b/test/cfg/cairo.c
index a081a8fe52c..b8c518225a0 100644
--- a/test/cfg/cairo.c
+++ b/test/cfg/cairo.c
@@ -9,6 +9,9 @@
 
 #include <cairo.h>
 
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 2, 3)
+#endif
+
 void validCode(cairo_surface_t *target)
 {
     cairo_t * cairo1 = cairo_create(target);
diff --git a/test/cfg/cppunit.cpp b/test/cfg/cppunit.cpp
index d7129855d23..b5e9826a25d 100644
--- a/test/cfg/cppunit.cpp
+++ b/test/cfg/cppunit.cpp
@@ -8,6 +8,10 @@
 
 // cppcheck-suppress-file valueFlowBailout
 
+#include <string>
+
+#include <cppunit/Exception.h>
+#include <cppunit/Portability.h>
 #include <cppunit/TestAssert.h>
 
 void cppunit_assert_equal(int x, double y)
diff --git a/test/cfg/gnu.c b/test/cfg/gnu.c
index d000b2c1007..14dfcc7700f 100644
--- a/test/cfg/gnu.c
+++ b/test/cfg/gnu.c
@@ -16,8 +16,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <netdb.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <sys/mman.h>
@@ -36,7 +34,11 @@
 #include <netdb.h>
 #if !defined(__APPLE__)
 #include <byteswap.h>
+#include <features.h>
 #endif
+#include <sys/socket.h>
+#include <time.h>
+#include <stddef.h>
 
 #ifdef __gnu_linux__
 void unreachableCode_error(void) // #11197
@@ -58,6 +60,7 @@ int deallocuse_backtrace(int size) {
     return numEntries;
 }
 
+#if !defined(__APPLE__)
 void leakReturnValNotUsed_get_current_dir_name(void)
 {
     // cppcheck-suppress leakReturnValNotUsed
@@ -114,7 +117,6 @@ int nullPointer_gethostbyname_r(const char* name, struct hostent* ret, const cha
     return gethostbyname_r(name, ret, buf, buflen, result, h_errnop);
 }
 
-
 int nullPointer_gethostbyaddr_r(const void* addr, socklen_t len, int type, struct hostent* ret, const char* buf, size_t buflen, struct hostent** result, const int* h_errnop)
 {
     // cppcheck-suppress nullPointer
@@ -129,6 +131,7 @@ int nullPointer_gethostbyaddr_r(const void* addr, socklen_t len, int type, struc
     (void) gethostbyaddr_r(addr, len, type, ret, buf, buflen, result, NULL);
     return gethostbyaddr_r(addr, len, type, ret, buf, buflen, result, h_errnop);
 }
+#endif
 
 int nullPointer_getopt_long(int argc, char **argv, const char *optstring,
                             const struct option *longopts, int *longindex)
@@ -154,6 +157,7 @@ int nullPointer_getopt_long_only(int argc, char* const* argv, const char* optstr
     return getopt_long_only(argc, argv, optstring, longopts, longindex);
 }
 
+#if !defined(__APPLE__)
 int nullPointer_getservent_r(struct servent *restrict result_buf, const char *restrict buf, size_t buflen, struct servent **restrict result)
 {
     // cppcheck-suppress nullPointer
@@ -173,6 +177,7 @@ void *bufferAccessOutOfBounds_memrchr(const void *s, int c, size_t n)
     (void)memrchr(buf,c,43);
     return memrchr(s,c,n);
 }
+#endif
 
 void knownConditionTrueFalse_ffsl(long i)
 {
@@ -192,6 +197,7 @@ void knownConditionTrueFalse_ffsll(long long i)
     if (ffsll(i) == 0) {}
 }
 
+#if !defined(__APPLE__)
 int nullPointer_semtimedop(int semid, struct sembuf *sops, size_t nsops, const struct timespec *timeout)
 {
     (void) semtimedop(semid, sops, nsops, NULL); // If the timeout argument is NULL, then semtimedop() behaves exactly like semop().
@@ -227,8 +233,10 @@ int uninitvar_getpw(uid_t uid, char *buf)
     // cppcheck-suppress uninitvar
     return getpw(someUid, buf);
 }
+#endif
 
 // Declaration necessary because there is no specific / portable header.
+// https://www.eyrie.org/~eagle/software/rra-c-util/xmalloc.html
 extern void *xcalloc(size_t nmemb, size_t size);
 extern void *xmalloc(size_t size);
 extern void *xrealloc(void *block, size_t newsize);
@@ -294,8 +302,10 @@ void valid_code(int argInt1, va_list valist_arg, const int * parg)
 
     if (__builtin_expect(argInt1, 0)) {}
     if (__builtin_expect_with_probability(argInt1 + 1, 2, 0.5)) {}
+#ifdef __GLIBC__
     if (__glibc_unlikely(argInt1 != 0)) {}
     if (__glibc_likely(parg != NULL)) {}
+#endif
     const void *ax1 = __builtin_assume_aligned(parg, 16);
     printf("%p", ax1);
     const void *ax2 = __builtin_assume_aligned(parg, 32, 8);
@@ -489,6 +499,7 @@ void bufferAccessOutOfBounds()
     free(pAlloc2);
 }
 
+#if !defined(__APPLE__)
 void leakReturnValNotUsed()
 {
     // cppcheck-suppress [unreadVariable, constVariablePointer]
@@ -508,6 +519,7 @@ void leakReturnValNotUsed()
     if (42 == __builtin_expect(42, 0))
         return;
 }
+#endif
 
 #if !defined(__CYGWIN__) && !defined(__APPLE__)
 int nullPointer_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index 0454ad8e7d6..b923135e2d9 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -7,12 +7,20 @@
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-#include <stdlib.h>
-#include <gtk/gtk.h>
+#include <stdio.h>
 #include <glib.h>
+#include <glib/gtypes.h>
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 
+#if GLIB_CHECK_VERSION(2, 3, 4)
+#endif
+#if GTK_CHECK_VERSION(4, 5, 6)
+#endif
+#if ATK_CHECK_VERSION(2, 3, 6)
+#endif
+
 void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_table)
 {
     g_assert_cmpint(4 + 1, >=, 5);
@@ -36,6 +44,7 @@ void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_t
         // cppcheck-suppress checkLibraryNoReturn
         g_assert_not_reached();
     }
+    // cppcheck-suppress constVariablePointer
     gpointer p = GINT_TO_POINTER(1);
     int i = GPOINTER_TO_INT(p);
     // cppcheck-suppress knownConditionTrueFalse
@@ -50,6 +59,14 @@ void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_t
     g_string_free(pGStr1, TRUE);
 
     gchar * pGchar1 = g_strconcat("a", "b", NULL);
+
+    // g_str_has_prefix and g_str_has_suffix can have side effects because they use
+    // g_return_val_if_fail, which logs to the console upon failure
+    // cppcheck-suppress assertWithSideEffect
+    g_assert_true(g_str_has_prefix(pGchar1, "a"));
+    // cppcheck-suppress assertWithSideEffect
+    g_assert_true(g_str_has_suffix(pGchar1, "b"));
+
     printf("%s", pGchar1);
     g_free(pGchar1);
 
@@ -73,6 +90,10 @@ void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_t
         // cppcheck-suppress valueFlowBailout // TODO: caused by <pure/>?
         printf("%s", str);
     g_free(str);
+
+    // transfer none functions: return value should not be unreffed
+    const GApplication *app = g_application_get_default();
+    printf("%p\n", app);
 }
 
 void g_malloc_test()
@@ -292,7 +313,6 @@ void g_new_if_test()
     };
 
     const struct a * pNew3;
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     if (pNew3 = g_new(struct a, 6)) {
         printf("%p", pNew3);
     }
@@ -305,7 +325,6 @@ void g_new0_test()
         int b;
     };
     // valid
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     struct a * pNew1 = g_new0(struct a, 5);
     printf("%p", pNew1);
     g_free(pNew1);
@@ -324,7 +343,6 @@ void g_try_new_test()
         int b;
     };
     // valid
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     struct a * pNew1 = g_try_new(struct a, 5);
     printf("%p", pNew1);
     g_free(pNew1);
@@ -342,7 +360,6 @@ void g_try_new0_test()
         int b;
     };
     // valid
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     struct a * pNew1 = g_try_new0(struct a, 5);
     printf("%p", pNew1);
     g_free(pNew1);
@@ -360,7 +377,7 @@ void g_renew_test()
     struct a {
         int b;
     };
-    // cppcheck-suppress [leakReturnValNotUsed,valueFlowBailoutIncompleteVar]
+    // cppcheck-suppress leakReturnValNotUsed
     g_renew(struct a, NULL, 1);
 
     struct a * pNew = g_new(struct a, 1);
@@ -375,7 +392,7 @@ void g_try_renew_test()
     struct a {
         int b;
     };
-    // cppcheck-suppress [leakReturnValNotUsed,valueFlowBailoutIncompleteVar]
+    // cppcheck-suppress leakReturnValNotUsed
     g_try_renew(struct a, NULL, 1);
 
     struct a * pNew = g_try_new(struct a, 1);
@@ -397,6 +414,7 @@ void g_error_new_test()
     g_error_new(1, -2, "a %d", 1);
 
     const GError * pNew2 = g_error_new(1, -2, "a %d", 1);
+    g_assert_true(g_error_matches(pNew2, 1, -2));
     printf("%p", pNew2);
     // cppcheck-suppress memleak
 }
@@ -521,6 +539,16 @@ void g_variant_test() {
     // cppcheck-suppress memleak
 }
 
+void g_list_test() {
+    GList *list1 = NULL;
+    gchar *c = "c";
+
+    list1 = g_list_append(list1, c);
+    g_assert_true(g_list_find(list1, c) != NULL);
+
+    g_list_free(list1);
+}
+
 void g_queue_test() {
     // cppcheck-suppress leakReturnValNotUsed
     g_queue_new();
@@ -575,4 +603,55 @@ void g_tree_test() {
     const GTree *tree2 = g_tree_new((GCompareFunc)g_strcmp0);
     printf("%p\n", tree2);
     // cppcheck-suppress memleak
-}
\ No newline at end of file
+}
+
+void gtk_widget_destroy_test() {
+    GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_widget_show(widget);
+    // cppcheck-suppress memleak
+
+    widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_widget_show(widget);
+    // cppcheck-suppress mismatchAllocDealloc
+    g_object_unref(widget);
+}
+
+void g_return_if_fail_test(const char *s) {
+    // cppcheck-suppress valueFlowBailout
+    g_return_if_fail(s);
+
+    if (*s)
+        // cppcheck-suppress valueFlowBailout
+        g_return_if_fail(*s == 'a');
+    else
+        g_info("Test the else branch can be parsed");
+}
+
+int g_return_val_if_fail_test(const char *s) {
+    // cppcheck-suppress valueFlowBailout
+    g_return_val_if_fail(s, 1);
+
+    if (*s)
+        // cppcheck-suppress valueFlowBailout
+        g_return_val_if_fail(*s == 'a', 1);
+    else
+        g_info("Test the else branch can be parsed");
+
+    return 0;
+}
+
+void g_return_if_reached_test(const char *s) {
+    if (s)
+        g_return_if_reached();
+    else
+        g_info("Test the else branch can be parsed");
+}
+
+int g_return_val_if_reached_test(const char *s) {
+    if (s)
+        g_return_val_if_reached(1);
+    else
+        g_info("Test the else branch can be parsed");
+
+    return 0;
+}
diff --git a/test/cfg/libcurl.c b/test/cfg/libcurl.c
index 07fd26b031f..f5faadbd0d1 100644
--- a/test/cfg/libcurl.c
+++ b/test/cfg/libcurl.c
@@ -12,6 +12,16 @@
 #include <curl/curl.h>
 #include <stdio.h>
 
+struct S_WriteHeader {
+    int x;
+};
+
+size_t cb_WriteHeader(void * /*ptr*/, size_t size, size_t nmemb, void *p) {
+    // cppcheck-suppress constVariablePointer
+    struct S_WriteHeader *s = (struct S_WriteHeader *)p;
+    return s->x ? size * nmemb : 0;
+}
+
 void validCode()
 {
     CURL *curl = curl_easy_init();
@@ -19,6 +29,9 @@ void validCode()
         CURLcode res;
         // cppcheck-suppress valueFlowBailoutIncompleteVar
         curl_easy_setopt(curl, CURLOPT_URL, "http://example.com");
+        curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, cb_WriteHeader);
+        struct S_WriteHeader s;
+        curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &s); // #14692
         res = curl_easy_perform(curl);
         if (res != CURLE_OK) {
             printf("error");
diff --git a/test/cfg/libsigc++.cpp b/test/cfg/libsigc++.cpp
index 5dea445125b..499e36d839a 100644
--- a/test/cfg/libsigc++.cpp
+++ b/test/cfg/libsigc++.cpp
@@ -7,7 +7,10 @@
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-#include <sigc++/sigc++.h>
+#include <sigc++/sigc++.h> // IWYU pragma: keep
+#include <sigc++/functors/mem_fun.h>
+#include <sigc++/functors/slot.h>
+#include <sigc++/trackable.h>
 
 struct struct1 : public sigc::trackable {
     void func1(int) const {}
diff --git a/test/cfg/microsoft_gsl.cpp b/test/cfg/microsoft_gsl.cpp
new file mode 100644
index 00000000000..4241cce045d
--- /dev/null
+++ b/test/cfg/microsoft_gsl.cpp
@@ -0,0 +1,72 @@
+// Test library configuration for microsoft_gsl.cfg
+//
+// Usage:
+// $ cppcheck --check-library --library=microsoft_gsl --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr --suppress=autoNoType test/cfg/microsoft_gsl.cpp
+// =>
+// No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
+//
+
+// C++ Standard Library
+#include <vector>
+
+// Guideline Support Library
+#include <gsl/gsl>
+
+struct owner_type
+{
+  owner_type() = default;
+  owner_type(const owner_type &) = delete;
+  owner_type(owner_type &&) = default;
+
+  ~owner_type() { delete ptr_; }
+
+  auto operator=(const owner_type &) -> owner_type & = delete;
+  auto operator=(owner_type &&) -> owner_type & = default;
+
+private:
+  gsl::owner<int *> ptr_{new int(42)};
+};
+
+auto pre_and_post_condition_test(int i) -> int
+{
+  Expects(i > 0);
+
+  const auto result{i * 2};
+
+  Ensures(result > 0);
+  return result;
+}
+
+auto suppress_macro_test(std::span<int> s) -> int
+{
+  GSL_SUPPRESS("bounds.1")
+  return s[0];
+}
+
+auto iterate_over_container_test(const std::vector<int> &v) -> int
+{
+  int sum{0};
+
+  for (gsl::index i{0}; i < v.size(); ++i)
+  {
+    sum += v[i];
+  }
+  return sum;
+}
+
+void not_null_test(gsl::not_null<int *> p)
+{
+  Expects(p != nullptr);
+  *p = 42;
+}
+
+void strict_not_null_test(gsl::strict_not_null<int *> p)
+{
+  Expects(p != nullptr);
+  *p = 42;
+}
+
+auto byte_test(gsl::byte b) -> gsl::byte
+{
+  return b | 0x81;
+}
diff --git a/test/cfg/openssl.c b/test/cfg/openssl.c
index 9b06e9bdace..edfc4dd04a8 100644
--- a/test/cfg/openssl.c
+++ b/test/cfg/openssl.c
@@ -7,8 +7,10 @@
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-#include <openssl/ssl.h>
 #include <openssl/bio.h>
+#include <openssl/evp.h>
+//#include <openssl/types.h>
+#include <stdio.h>
 #include <string.h>
 
 void valid_code(BIO * bio)
diff --git a/test/cfg/posix.c b/test/cfg/posix.c
index a8075b21bcd..82cfd950792 100644
--- a/test/cfg/posix.c
+++ b/test/cfg/posix.c
@@ -33,11 +33,11 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <stdbool.h>
-#include <time.h>
 #include <string.h>
 #include <strings.h>
 #if defined(__APPLE__)
 #include <xlocale.h>
+#include <limits.h>
 #endif
 #if !defined(__APPLE__)
 #include <mqueue.h>
@@ -47,6 +47,7 @@
 #include <wchar.h>
 #include <sys/stat.h>
 #include <utime.h>
+#include <stddef.h>
 
 
 #if !defined(__APPLE__)
@@ -144,6 +145,7 @@ void nullPointer_pthread_attr_setstack(const pthread_attr_t *attr) {
     (void) pthread_attr_setstack(NULL, NULL, 0);
     (void) pthread_attr_setstack(attr, NULL, 0);
     // cppcheck-suppress nullPointer
+    // cppcheck-suppress intToPointerCast
     (void) pthread_attr_setstack(NULL, (void*) 1, 0);
 }
 
@@ -224,6 +226,7 @@ int nullPointer_getpwnam_r(const char *name, struct passwd *pwd, char *buffer, s
     return getpwnam_r(name, pwd, buffer, bufsize, result);
 }
 
+#if !defined(__APPLE__)
 int nullPointer_fgetpwent_r(FILE *restrict stream, const struct passwd *restrict pwbuf, char *restrict buf, size_t buflen, struct passwd **restrict pwbufp)
 {
     // cppcheck-suppress nullPointer
@@ -247,6 +250,7 @@ int nullPointer_getpwent_r(const struct passwd *restrict pwbuf, char *restrict b
     (void) getpwent_r(pwbuf, buf, buflen, NULL);
     return getpwent_r(pwbuf, buf, buflen, pwbufp);
 }
+#endif
 
 int nullPointer_getgrgid_r(gid_t gid, struct group *restrict grp, char *restrict buf, size_t buflen, struct group **restrict result)
 {
@@ -1309,7 +1313,7 @@ void uninitvar(int fd)
     pthread_mutex_t mutex, mutex1, mutex2, mutex3;
     // cppcheck-suppress uninitvar
     write(x1,"ab",2);
-    // TODO cppcheck-suppress uninitvar
+    // cppcheck-suppress uninitvar
     write(fd,buf,2); // #6325
     // cppcheck-suppress uninitvar
     write(fd,"ab",x2);
@@ -1405,7 +1409,7 @@ void timet_h(const struct timespec* ptp1)
     clock_settime(clk_id2, ptp1);
 
     struct timespec tp;
-    // FIXME cppcheck-suppress uninitvar
+    // cppcheck-suppress uninitvar
     clock_settime(CLOCK_REALTIME, &tp); // #6577 - false negative
     // cppcheck-suppress uninitvar
     clock_settime(clk_id3, &tp);
@@ -1505,3 +1509,101 @@ void invalidFunctionArg_nice(int inc)
     // cppcheck-suppress invalidFunctionArg
     nice(+20);
 }
+
+void pthread_cond_wait_test(pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+    (void)pthread_cond_wait(cond, mutex);
+}
+
+void pthread_cond_timedwait_test(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime)
+{
+    // cppcheck-suppress nullPointer
+    (void)pthread_cond_timedwait(cond, mutex, NULL);
+    (void)pthread_cond_timedwait(cond, mutex, abstime);
+}
+
+void pthread_cond_init_test(pthread_cond_t *cond, const pthread_condattr_t *attr)
+{
+    // cppcheck-suppress nullPointer
+    (void)pthread_cond_init(cond, NULL);
+    (void)pthread_cond_init(cond, attr);
+}
+
+void pthread_cond_destroy_test(const pthread_cond_t *cond)
+{
+    (void)pthread_cond_destroy(cond);
+}
+
+void pthread_cleanup_push_test(void (*routine)(void *), void *arg)
+{
+    pthread_cleanup_push(routine, arg);
+    pthread_cleanup_pop(0);
+}
+
+void pthread_mutexattr_init_test(pthread_mutexattr_t *attr)
+{
+    (void)pthread_mutexattr_init(attr);
+}
+
+void pthread_mutexattr_destroy_test(pthread_mutexattr_t *attr)
+{
+    (void)pthread_mutexattr_destroy(attr);
+}
+
+void pthread_mutexattr_settype_test(const pthread_mutexattr_t *attr, int type)
+{
+    (void)pthread_mutexattr_settype(attr, type);
+}
+
+void pthread_mutexattr_gettype_test(const pthread_mutexattr_t *attr, int *type)
+{
+    (void)pthread_mutexattr_gettype(attr, type);
+}
+
+void pthread_setcancelstate_test(int state, int *oldstate)
+{
+    (void)pthread_setcancelstate(state, oldstate);
+}
+
+void pthread_setcanceltype_test(int type, int *oldtype)
+{
+    (void)pthread_setcanceltype(type, oldtype);
+}
+
+void pthread_cancel_test(pthread_t thread)
+{
+    (void)pthread_cancel(thread);
+}
+
+void pthread_define_test()
+{
+    PTHREAD_STACK_MIN;
+    PTHREAD_CANCEL_ASYNCHRONOUS;
+    PTHREAD_CANCEL_ENABLE;
+    PTHREAD_CANCEL_DEFERRED;
+    PTHREAD_CANCEL_DISABLE;
+    PTHREAD_CANCELED;
+    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+    (void)cond;
+    PTHREAD_CREATE_DETACHED;
+    PTHREAD_CREATE_JOINABLE;
+    PTHREAD_EXPLICIT_SCHED;
+    PTHREAD_INHERIT_SCHED;
+    PTHREAD_MUTEX_DEFAULT;
+    PTHREAD_MUTEX_ERRORCHECK;
+    PTHREAD_MUTEX_NORMAL;
+    pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+    (void)mutex;
+    PTHREAD_MUTEX_RECURSIVE;
+    pthread_once_t once_block = PTHREAD_ONCE_INIT;
+    (void)once_block;
+    PTHREAD_PRIO_INHERIT;
+    PTHREAD_PRIO_NONE;
+    PTHREAD_PRIO_PROTECT;
+    PTHREAD_PROCESS_SHARED;
+    PTHREAD_PROCESS_PRIVATE;
+    pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
+    (void)rwlock;
+    PTHREAD_SCOPE_PROCESS;
+    PTHREAD_SCOPE_SYSTEM;
+}
\ No newline at end of file
diff --git a/test/cfg/python.c b/test/cfg/python.c
index 72e4ecb0e99..165afd4744f 100644
--- a/test/cfg/python.c
+++ b/test/cfg/python.c
@@ -10,6 +10,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h> // should be the first include
 #include <stdio.h>
+#include <stdlib.h>
 
 void validCode(PyObject * pPyObjArg)
 {
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 97c6f2d949f..34f6cc8c957 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -15,7 +15,6 @@
 #include <QStack>
 #include <QByteArray>
 #include <QList>
-#include <QLinkedList>
 #include <QMap>
 #include <QMultiMap>
 #include <QQueue>
@@ -33,6 +32,13 @@
 #include <QPointF>
 #include <QRegion>
 #include <QTransform>
+#include <QDir>
+#include <QTimer>
+
+// TODO: this is actually available via Core5Compat but I could not get it to work with pkg-config
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+#include <QLinkedList>
+#endif
 
 #include <cstdio>
 
@@ -50,6 +56,33 @@ int ignoredReturnValue_QSize_width(const QSize &s)
     return s.width();
 }
 
+
+void ignoredReturnValue_QDir(const QString& dirname)
+{
+    QDir dir(dirname);
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.exists("abc");
+
+    // cppcheck-suppress ignoredReturnErrorCode
+    dir.mkdir("abc");
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.count();
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.filePath("abc");
+
+    // cppcheck-suppress ignoredReturnValue
+    dir.entryList();
+}
+
+void assertWithSideEffect_QDir_exists(const char *path) { // #14720
+    QDir dir(path);
+    assert(dir.exists());
+    (void)dir;
+}
+
 void unusedVariable_QTransform()
 {
     // cppcheck-suppress unusedVariable
@@ -323,6 +356,7 @@ QList<int>::iterator QList3()
     return it;
 }
 
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 void QLinkedList1()
 {
     // cppcheck-suppress unreadVariable
@@ -359,6 +393,7 @@ QLinkedList<int>::iterator QLinkedList3()
     // cppcheck-suppress returnDanglingLifetime
     return it;
 }
+#endif
 
 void QStringList1(QStringList stringlistArg)
 {
@@ -569,11 +604,13 @@ void MacroTest2_test()
     QByteArray ba = str.toLatin1();
     printf(ba.data());
 
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 #ifndef QT_NO_DEPRECATED
     str = MacroTest2::trUtf8("test2");
     ba = str.toLatin1();
     printf(ba.data());
 #endif
+#endif
 }
 
 void MacroTest3()
@@ -617,7 +654,7 @@ void validCode(int * pIntPtr, QString & qstrArg, double d)
         if (qstr1.length() == 1) {}
     }
     if (qstr1.length() == 1) {} else {
-        qstr1.remove(1);
+        qstr1.remove(1, 0);
         if (qstr1.length() == 1) {}
     }
 }
@@ -692,6 +729,7 @@ namespace {
     private:
         int m_value;
     };
+    // cppcheck-suppress shadowFunction
     void Counter1::setValue(int value) {
         if (value != m_value) {
             m_value = value;
@@ -715,6 +753,7 @@ namespace {
     private:
         int m_value;
     };
+    // cppcheck-suppress shadowFunction
     void Counter2::setValue(int value) {
         if (value != m_value) {
             m_value = value;
@@ -799,6 +838,27 @@ void constVariablePointer_QVector(QVector<int*>& qv, int* p)
     qv.push_back(p); // #12661
 }
 
+void constParameterPointer_QHash_insert(QHash<int*, int*>& qh, int* k, int* v)
+{
+    qh.insert(k, v); // #13902
+}
+
+bool constParameterPointer_QHash_find(const QHash<int*, int*>& qh, int* k)
+{
+    auto it = qh.find(k);
+    return it != qh.end();
+}
+
+bool constParameterPointer_QHash_contains(const QHash<int*, int*>& qh, int* k)
+{
+    return qh.contains(k);
+}
+
+int constParameterPointer_QHash_count(const QHash<int*, int*>& qh, int* k)
+{
+    return qh.count(k);
+}
+
 const QString& unassignedVariable_static_QString() // #12935
 {
     static QString qs;
@@ -825,4 +885,28 @@ namespace {
 
     // cppcheck-suppress functionStatic
     void TestUnusedFunction::doStuff() {} // Should not warn here with unusedFunction
-}
\ No newline at end of file
+}
+
+int qdateIsValid()
+{
+    QDate qd(1,1,2025);
+    Q_ASSERT(qd.isValid()); // Should not warn here with assertWithSideEffect
+    return qd.month(); 
+}
+
+void qAssertX()
+{
+    const char *where = "test";
+    const char *what = "assertion failed";
+    Q_ASSERT_X(false, where, what);
+}
+
+struct S_QTimer_connect : QObject { // #13846
+    S_QTimer_connect() {
+        // cppcheck-suppress checkLibraryFunction - timeout() is a signal from QTimer
+        QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(update()));
+    }
+    QTimer timer;
+private slots:
+    bool update();
+};
diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index bfc5e8f04f3..4cf17b3a9df 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -44,7 +44,9 @@ CPPCHECK_OPT=(
 CXX=g++
 CXX_OPT=("-fsyntax-only" "-w" "-std=c++2a")
 CC=gcc
-CC_OPT=("-fsyntax-only" "-w" "-Wno-implicit-function-declaration" "-std=c11") # TODO: remove -Wno-implicit-function-declaration when warnings are fixed on MacOS
+CC_OPT=("-fsyntax-only" "-w" "-std=c11")
+
+IWYU_OPTS=("-Xiwyu" "--no_fwd_decls" "-Xiwyu" "--update_comments")
 
 function get_pkg_config_cflags {
     # TODO: get rid of the error enabling/disabling?
@@ -63,25 +65,61 @@ function get_pkg_config_cflags {
     echo "$PKGCONFIG"
 }
 
+function iwyu_run {
+    # TODO: convert -I includes provided by pkg-config to -isystem so IWYU does not produce warnings for system headers
+    ${IWYU} "${IWYU_OPTS[@]}" "${IWYU_CLANG_INC}" "$@"
+}
+
+function cc_syntax {
+    if [ -z "$IWYU" ]; then
+        ${CC} "${CC_OPT[@]}" "$@"
+    else
+        iwyu_run "${CC_OPT[@]}" "$@"
+    fi
+}
+
+function cxx_syntax {
+    if [ -z "$IWYU" ]; then
+        ${CXX} "${CXX_OPT[@]}" "$@"
+    else
+        iwyu_run "${CXX_OPT[@]}" "$@"
+    fi
+}
+
+function cppcheck_run {
+    if [ -z "$IWYU" ]; then
+        "${CPPCHECK}" "${CPPCHECK_OPT[@]}" "$@"
+    fi
+}
+
 # posix.c
 function posix_fn {
     echo "POSIX assumed to be present, checking syntax with ${CC} now."
-    ${CC} "${CC_OPT[@]}" ${DIR}posix.c
+    cc_syntax ${DIR}posix.c
 }
 
 # gnu.c
 function gnu_fn {
     echo "GNU assumed to be present, checking syntax with ${CC} now."
-    ${CC} "${CC_OPT[@]}" ${DIR}gnu.c
+    cc_syntax ${DIR}gnu.c
 }
 
 # qt.cpp
 function qt_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
-        QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test Qt5Gui)
-        if [ -n "$QTCONFIG" ]; then
+        # TODO: check syntax with Qt5 and Qt6?
+        QTCONFIG=$(get_pkg_config_cflags Qt6Core Qt6Test Qt6Gui)
+        if [ -z "$QTCONFIG" ]; then
+          QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test Qt5Gui)
+          if [ -n "$QTCONFIG" ]; then
             QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test Qt5Gui)
             [[ $QTBUILDCONFIG =~ (^|[[:space:]])reduce_relocations($|[[:space:]]) ]] && QTCONFIG="${QTCONFIG} -fPIC"
+          fi
+        else
+          QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt6Core Qt6Test Qt6Gui)
+          QTCONFIG="${QTCONFIG} -fPIC"
+        fi
+        if [ -n "$QTCONFIG" ]; then
             # TODO: get rid of the error enabling/disabling?
             set +e
             echo -e "#include <QString>" | ${CXX} "${CXX_OPT[@]}" ${QTCONFIG} -x c++ -
@@ -92,7 +130,7 @@ function qt_fn {
                 exit_if_strict
             else
                 echo "Qt found and working, checking syntax with ${CXX} now."
-                ${CXX} "${CXX_OPT[@]}" ${QTCONFIG} ${DIR}qt.cpp
+                cxx_syntax ${QTCONFIG} ${DIR}qt.cpp
             fi
         else
             echo "Qt not present, skipping syntax check with ${CXX}."
@@ -110,19 +148,19 @@ function bsd_fn {
 # std.c
 function std_c_fn {
     echo "C standard library assumed to be present, checking syntax with ${CC} now."
-    ${CC} "${CC_OPT[@]}" "${DIR}"std.c
+    cc_syntax "${DIR}"std.c
 }
 
 # std.cpp
 function std_cpp_fn {
     echo "C++ standard library assumed to be present, checking syntax with ${CXX} now."
-    ${CXX} "${CXX_OPT[@]}" "${DIR}"std.cpp
+    cxx_syntax "${DIR}"std.cpp
 }
 
 # windows.cpp
 function windows_fn {
     # TODO: Syntax check via g++ does not work because it can not find a valid windows.h
-    #${CXX} "${CXX_OPT[@]}" ${DIR}windows.cpp
+    #cxx_syntax ${DIR}windows.cpp
     true
 }
 
@@ -153,7 +191,7 @@ function wxwidgets_fn {
             exit_if_strict
         else
             echo "wxWidgets found, checking syntax with ${CXX} now."
-            ${CXX} "${CXX_OPT[@]}" ${WXCONFIG} -Wno-deprecated-declarations "${DIR}"wxwidgets.cpp
+            cxx_syntax ${WXCONFIG} -Wno-deprecated-declarations "${DIR}"wxwidgets.cpp
         fi
     fi
 }
@@ -172,14 +210,14 @@ function gtk_fn {
             GTKCHECK_RETURNCODE=$?
             set -e
             if [ $GTKCHECK_RETURNCODE -ne 0 ]; then
-                echo "GTK+ not completely present or not working, skipping syntax check with ${CXX}."
+                echo "GTK+ not completely present or not working, skipping syntax check with ${CC}."
                 exit_if_strict
             else
-                echo "GTK+ found and working, checking syntax with ${CXX} now."
-                ${CC} "${CC_OPT[@]}" ${GTKCONFIG} "${DIR}"gtk.c
+                echo "GTK+ found and working, checking syntax with ${CC} now."
+                cc_syntax ${GTKCONFIG} "${DIR}"gtk.c
             fi
         else
-            echo "GTK+ not present, skipping syntax check with ${CXX}."
+            echo "GTK+ not present, skipping syntax check with ${CC}."
             exit_if_strict
         fi
     fi
@@ -189,7 +227,7 @@ function gtk_fn {
 function boost_fn {
     # TODO: get rid of the error enabling/disabling?
     set +e
-    echo -e "#include <boost/config.hpp>" | ${CXX} "${CXX_OPT[@]}"  -x c++ -
+    echo -e "#include <boost/config.hpp>" | ${CXX} "${CXX_OPT[@]}" -x c++ -
     BOOSTCHECK_RETURNCODE=$?
     set -e
     if [ ${BOOSTCHECK_RETURNCODE} -ne 0 ]; then
@@ -197,7 +235,7 @@ function boost_fn {
         exit_if_strict
     else
         echo "Boost found and working, checking syntax with ${CXX} now."
-        ${CXX} "${CXX_OPT[@]}" "${DIR}"boost.cpp
+        cxx_syntax "${DIR}"boost.cpp
     fi
 }
 
@@ -216,7 +254,7 @@ function sqlite3_fn {
                 exit_if_strict
             else
                 echo "SQLite3 found and working, checking syntax with ${CC} now."
-                ${CC} "${CC_OPT[@]}" ${SQLITE3CONFIG} "${DIR}"sqlite3.c
+                cc_syntax ${SQLITE3CONFIG} "${DIR}"sqlite3.c
             fi
         else
             echo "SQLite3 not present, skipping syntax check with ${CC}."
@@ -227,10 +265,11 @@ function sqlite3_fn {
 
 # openmp.c
 function openmp_fn {
+    # TODO: omp.h not found with IWYU
     # MacOS compiler has no OpenMP by default
     if ! command -v sw_vers; then
       echo "OpenMP assumed to be present, checking syntax with ${CC} now."
-      ${CC} "${CC_OPT[@]}" -fopenmp ${DIR}openmp.c
+      cc_syntax -fopenmp ${DIR}openmp.c
     fi
 }
 
@@ -249,7 +288,7 @@ function python_fn {
                 exit_if_strict
             else
                 echo "Python 3 found and working, checking syntax with ${CC} now."
-                ${CC} "${CC_OPT[@]}" ${PYTHON3CONFIG} "${DIR}"python.c
+                cc_syntax ${PYTHON3CONFIG} "${DIR}"python.c
             fi
         else
             echo "Python 3 not present, skipping syntax check with ${CC}."
@@ -261,7 +300,10 @@ function python_fn {
 # lua.c
 function lua_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
-        LUACONFIG=$(get_pkg_config_cflags lua-5.3)
+        LUACONFIG=$(get_pkg_config_cflags lua)
+        if [ -z "$LUACONFIG" ]; then
+            LUACONFIG=$(get_pkg_config_cflags lua-5.3)
+        fi
         if [ -n "$LUACONFIG" ]; then
             # TODO: get rid of the error enabling/disabling?
             set +e
@@ -273,7 +315,7 @@ function lua_fn {
                 exit_if_strict
             else
                 echo "Lua found and working, checking syntax with ${CC} now."
-                ${CC} "${CC_OPT[@]}" ${LUACONFIG} "${DIR}"lua.c
+                cc_syntax ${LUACONFIG} "${DIR}"lua.c
             fi
         else
             echo "Lua not present, skipping syntax check with ${CC}."
@@ -297,7 +339,7 @@ function libcurl_fn {
                 exit_if_strict
             else
                 echo "libcurl found and working, checking syntax with ${CC} now."
-                ${CC} "${CC_OPT[@]}" ${LIBCURLCONFIG} "${DIR}"libcurl.c
+                cc_syntax ${LIBCURLCONFIG} "${DIR}"libcurl.c
             fi
         else
             echo "libcurl not present, skipping syntax check with ${CC}."
@@ -321,7 +363,7 @@ function cairo_fn {
                 exit_if_strict
             else
                 echo "cairo found and working, checking syntax with ${CC} now."
-                ${CC} "${CC_OPT[@]}" ${CAIROCONFIG} "${DIR}"cairo.c
+                cc_syntax ${CAIROCONFIG} "${DIR}"cairo.c
             fi
         else
             echo "cairo not present, skipping syntax check with ${CC}."
@@ -354,7 +396,7 @@ function kde_fn {
         else
             # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <KDE/KGlobal>\n" | ${CXX} "${CXX_OPT[@]}" -I${KDECONFIG} ${KDEQTCONFIG} -x c++ -
+            echo -e "#include <KDE/KGlobal>\n" | ${CXX} "${CXX_OPT[@]}" -isystem${KDECONFIG} ${KDEQTCONFIG} -x c++ -
             KDECHECK_RETURNCODE=$?
             set -e
             if [ $KDECHECK_RETURNCODE -ne 0 ]; then
@@ -362,7 +404,7 @@ function kde_fn {
                 exit_if_strict
             else
                 echo "KDE found, checking syntax with ${CXX} now."
-                ${CXX} "${CXX_OPT[@]}" -I${KDECONFIG} ${KDEQTCONFIG} "${DIR}"kde.cpp
+                cxx_syntax -isystem${KDECONFIG} ${KDEQTCONFIG} "${DIR}"kde.cpp
             fi
         fi
     fi
@@ -383,7 +425,7 @@ function libsigcpp_fn {
                 exit_if_strict
             else
                 echo "libsigc++ found and working, checking syntax with ${CXX} now."
-                ${CXX} "${CXX_OPT[@]}" ${LIBSIGCPPCONFIG} "${DIR}"libsigc++.cpp
+                cxx_syntax ${LIBSIGCPPCONFIG} "${DIR}"libsigc++.cpp
             fi
         else
             echo "libsigc++ not present, skipping syntax check with ${CXX}."
@@ -407,7 +449,7 @@ function openssl_fn {
                 exit_if_strict
             else
                 echo "OpenSSL found and working, checking syntax with ${CC} now."
-                ${CC} "${CC_OPT[@]}" ${OPENSSLCONFIG} "${DIR}"openssl.c
+                cc_syntax ${OPENSSLCONFIG} "${DIR}"openssl.c
             fi
         else
             echo "OpenSSL not present, skipping syntax check with ${CC}."
@@ -431,7 +473,7 @@ function opencv2_fn {
                 exit_if_strict
             else
                 echo "OpenCV found and working, checking syntax with ${CXX} now."
-                ${CXX} "${CXX_OPT[@]}" ${OPENCVCONFIG} "${DIR}"opencv2.cpp
+                cxx_syntax ${OPENCVCONFIG} "${DIR}"opencv2.cpp
             fi
         else
             echo "OpenCV not present, skipping syntax check with ${CXX}."
@@ -448,7 +490,7 @@ function cppunit_fn {
             exit_if_strict
         else
             echo "cppunit found, checking syntax with ${CXX} now."
-            ${CXX} "${CXX_OPT[@]}" -Wno-deprecated-declarations "${DIR}"cppunit.cpp
+            cxx_syntax -Wno-deprecated-declarations "${DIR}"cppunit.cpp
         fi
     fi
 }
@@ -456,7 +498,7 @@ function cppunit_fn {
 # emscripten.cpp
 function emscripten_fn {
     # TODO: Syntax check via g++ does not work because it can not find a valid emscripten.h
-    # ${CXX} "${CXX_OPT[@]}" ${DIR}emscripten.cpp
+    # cxx_syntax ${DIR}emscripten.cpp
     true
 }
 
@@ -472,109 +514,112 @@ function check_file {
     case $f in
         boost.cpp)
             boost_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         bsd.c)
             bsd_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         cairo.c)
             cairo_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         cppunit.cpp)
             cppunit_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         emscripten.cpp)
             emscripten_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         gnu.c)
             gnu_fn
             # TODO: posix needs to specified first or it has a different mmap() config
             # TODO: get rid of posix dependency
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library=posix,"$lib" "${DIR}"gnu.c
+            cppcheck_run --library=posix,"$lib" "${DIR}"gnu.c
             ;;
         googletest.cpp)
             googletest_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         gtk.c)
             gtk_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         kde.cpp)
             # TODO: "kde-4config" is no longer commonly available in recent distros
             #kde_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" --library=qt "${DIR}""$f"
+            cppcheck_run --library="$lib" --library=qt "${DIR}""$f"
             ;;
         libcurl.c)
             libcurl_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         libsigc++.cpp)
             libsigcpp_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         lua.c)
             lua_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
+            ;;
+        microsoft_gsl.cpp)
+            cppcheck_run --suppress=autoNoType --library="$lib" "${DIR}""$f"
             ;;
         mfc.cpp)
             mfc_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win64 --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win64 --library="$lib" "${DIR}""$f"
             ;;
         opencv2.cpp)
             # TODO: "opencv.pc" is not commonly available in distros
             #opencv2_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         openmp.c)
             openmp_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         openssl.c)
             openssl_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         posix.c)
             posix_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         python.c)
             python_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         qt.cpp)
             qt_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         selinux.c)
             selinux_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         sqlite3.c)
             sqlite3_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         std.c)
             std_c_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" "${DIR}""$f"
+            cppcheck_run "${DIR}""$f"
             ;;
         std.cpp)
             std_cpp_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" "${DIR}""$f"
+            cppcheck_run "${DIR}""$f"
             ;;
         windows.cpp)
             windows_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win32A --library="$lib" "${DIR}""$f"
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win32W --library="$lib" "${DIR}""$f"
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --platform=win64  --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win32A --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win32W --library="$lib" "${DIR}""$f"
+            cppcheck_run --platform=win64  --library="$lib" "${DIR}""$f"
             ;;
         wxwidgets.cpp)
             wxwidgets_fn
-            "${CPPCHECK}" "${CPPCHECK_OPT[@]}" --library="$lib" "${DIR}""$f"
+            cppcheck_run --library="$lib" "${DIR}""$f"
             ;;
         *)
           echo "Unhandled file $f"
diff --git a/test/cfg/std.c b/test/cfg/std.c
index d616f35b407..997f8204f73 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -7,7 +7,7 @@
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-// cppcheck-suppress-file valueFlowBailout
+// cppcheck-suppress-file [valueFlowBailout,purgedConfiguration]
 
 #include <string.h>
 #include <stdio.h>
@@ -24,18 +24,30 @@
 #define __STDC_WANT_LIB_EXT1__ 1
 #include <time.h>
 #include <stdbool.h>
-#include <stdint.h>
 #ifndef __STDC_NO_THREADS__
 #include <threads.h>
 #endif
 #include <inttypes.h>
 #include <float.h>
 #include <stdarg.h>
-#include <sys/types.h>
 #include <assert.h>
 #include <alloca.h>
 #include <locale.h>
 #include <signal.h>
+#include <complex.h>
+#include <math.h>
+#include <stddef.h>
+
+void test_int32_min() {
+    // cppcheck-suppress shiftNegativeLHS
+    // cppcheck-suppress shiftTooManyBits ; tests that INT32_MIN is a 32-bit expression (not 64-bit expression)
+    (void)(INT32_MIN >> 40);
+}
+
+void test_int64_min() {
+    // TODO cppcheck-suppress knownConditionTrueFalse // #13814
+    if (INT64_MIN < 0) {}
+}
 
 size_t invalidFunctionArgStr_wcslen(void)
 {
@@ -275,6 +287,13 @@ char* nullPointer_fgets(char *buffer, int n, FILE *stream)
     return fgets(buffer, n, stream);
 }
 
+void nullPointer_fseek(void) { // #10948
+    FILE *p = fopen("foo", "r");
+    // cppcheck-suppress nullPointerOutOfResources
+    fseek(p, 1, SEEK_SET);
+    fclose(p);
+}
+
 void memleak_aligned_alloc(void)
 {
     // cppcheck-suppress [unusedAllocatedMemory, unreadVariable, constVariablePointer]
@@ -3500,6 +3519,13 @@ void invalidFunctionArg_strchr(const char *cs, int c)
     (void)strchr(cs, 256);
 }
 
+void constParameterPointer_strchr(char *str) // #14453
+{
+	char *sep = strchr(str, ':');
+	if (sep)
+		*sep = '\0';
+}
+
 void invalidFunctionArg_log10(float f, double d, const long double ld)
 {
     // cppcheck-suppress invalidFunctionArg
@@ -5035,7 +5061,6 @@ void invalidPrintfArgType_printf(void)
     // #7016
     uint8_t n = 7;
     // TODO cppcheck-suppress invalidPrintfArgType_uint
-    // cppcheck-suppress valueFlowBailoutIncompleteVar
     printf("%" PRIi16 "\n", n);
 }
 
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 04216867f00..e4753a09f7c 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -9,7 +9,8 @@
 
 // cppcheck-suppress-file valueFlowBailout
 
-#include <algorithm>
+#include <algorithm> // IWYU pragma: keep
+#include <array>
 #include <bitset>
 #include <cassert>
 #include <cctype>
@@ -27,6 +28,7 @@
 #define __STDC_WANT_LIB_EXT1__ 1
 #include <ctime>
 #include <cwchar>
+#include <cwctype>
 #include <deque>
 #include <exception>
 #include <filesystem>
@@ -36,26 +38,31 @@
     #include <threads.h>
 #endif
 #include <iomanip>
-#include <ios>
+#include <ios> // IWYU pragma: keep
 #include <iostream>
-#include <istream>
+#include <istream> // IWYU pragma: keep
 #include <iterator>
-#include <list>
+#include <list> // IWYU pragma: keep
+#include <locale>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <numeric>
 #include <queue>
 #include <set>
-#include <streambuf>
+#include <sstream>
+#include <stdexcept>
+#include <streambuf> // IWYU pragma: keep
+#include <string>
 #include <string_view>
+#include <system_error>
 #include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <variant>
 #include <vector>
-#include <version>
+#include <version> // IWYU pragma: keep
 #ifdef __cpp_lib_span
 #include <span>
 #endif
@@ -579,7 +586,6 @@ void bufferAccessOutOfBounds_std_ofstream_write(std::ofstream &os, const char* s
     (void)os.write(s,n);
 }
 
-// cppcheck-suppress constParameterReference // TODO: FP
 void bufferAccessOutOfBounds_std_ifstream_get(std::ifstream& in, std::streambuf& sb)
 {
     char cBuf[10];
@@ -863,7 +869,7 @@ char * overlappingWriteFunction_strncat(const char *src, char *dest, const std::
     // cppcheck-suppress overlappingWriteFunction
     (void)strncat(dest, dest+1, 2);
     char buffer[] = "strncat";
-    // cppcheck-suppress overlappingWriteFunction
+    // cppcheck-suppress [overlappingWriteFunction,returnDanglingLifetime]
     return strncat(buffer, buffer + 1, 3);
 }
 
@@ -876,7 +882,7 @@ wchar_t * overlappingWriteFunction_wcsncat(const wchar_t *src, wchar_t *dest, co
     // cppcheck-suppress overlappingWriteFunction
     (void)wcsncat(dest, dest+1, 2);
     wchar_t buffer[] = L"strncat";
-    // cppcheck-suppress overlappingWriteFunction
+    // cppcheck-suppress [overlappingWriteFunction,returnDanglingLifetime]
     return wcsncat(buffer, buffer + 1, 3);
 }
 
@@ -911,8 +917,8 @@ char * overlappingWriteFunction_strncpy(char *buf, const std::size_t count)
 
 void * overlappingWriteFunction_memmove(void)
 {
-    // No warning shall be shown:
     char str[] = "memmove handles overlapping data well";
+    // cppcheck-suppress returnDanglingLifetime
     return memmove(str,str+3,4);
 }
 
@@ -1052,7 +1058,7 @@ void returnValue_std_isgreater(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreater(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreater(4.0f,2.0f) == 0) {}
 }
 
@@ -1060,7 +1066,7 @@ void returnValue_std_isgreaterequal(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreaterequal(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreaterequal(4.0f,2.0f) == 0) {}
 }
 
@@ -1068,7 +1074,7 @@ void returnValue_std_isless(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::isless(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::isless(4.0f,2.0f) == 0) {}
 }
 
@@ -1076,7 +1082,7 @@ void returnValue_std_islessequal(void)
 {
     // cppcheck-suppress knownConditionTrueFalse
     if (std::islessequal(4,2) == 0) {}
-    // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
     if (std::islessequal(4.0f,2.0f) == 0) {}
 }
 
@@ -1087,8 +1093,10 @@ void returnValue_std_islessgreater(void)
     // cppcheck-suppress knownConditionTrueFalse
     if (std::islessgreater(2,4) == 0) {}
 
-    if (std::islessgreater(4.0f,2.0f) == 0) {} // @todo support floats
-    if (std::islessgreater(2.0f,4.0f) == 0) {} // @todo support floats
+    // cppcheck-suppress knownConditionTrueFalse
+    if (std::islessgreater(4.0f,2.0f) == 0) {}
+    // cppcheck-suppress knownConditionTrueFalse
+    if (std::islessgreater(2.0f,4.0f) == 0) {}
 }
 
 void bufferAccessOutOfBounds(void)
@@ -2739,7 +2747,6 @@ void bool_isfinite(float f)
 {
     // cppcheck-suppress compareBoolExpressionWithInt
     // cppcheck-suppress compareValueOutOfTypeRangeError
-    // cppcheck-suppress knownConditionTrueFalse
     if (std::isfinite(f)==123) {}
 }
 
@@ -2762,7 +2769,6 @@ void bool_isgreater(float f1, float f2)
 {
     // cppcheck-suppress compareBoolExpressionWithInt
     // cppcheck-suppress compareValueOutOfTypeRangeError
-    // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreater(f1,f2)==123) {}
 }
 
@@ -2785,7 +2791,6 @@ void bool_isgreaterequal(float f1, float f2)
 {
     // cppcheck-suppress compareBoolExpressionWithInt
     // cppcheck-suppress compareValueOutOfTypeRangeError
-    // cppcheck-suppress knownConditionTrueFalse
     if (std::isgreaterequal(f1, f2)==123) {}
 }
 
@@ -2808,7 +2813,6 @@ void bool_isinf(float f)
 {
     // cppcheck-suppress compareBoolExpressionWithInt
     // cppcheck-suppress compareValueOutOfTypeRangeError
-    // cppcheck-suppress knownConditionTrueFalse
     if (std::isinf(f)==123) {}
 }
 
@@ -4978,6 +4982,18 @@ std::span<const int> returnDanglingLifetime_std_span1() {
 }
 #endif
 
+void* returnDanglingLifetime_memcpy() { // #14833
+    char a[4];
+    // cppcheck-suppress returnDanglingLifetime
+    return memcpy(a, "abc", 4);
+}
+
+wchar_t* returnDanglingLifetime_wcscat() {
+    wchar_t a[10]{L"abc"};
+    // cppcheck-suppress returnDanglingLifetime
+    return wcscat(a, L"def");
+}
+
 void beginEnd()
 {
     std::vector<int> v;
@@ -5000,7 +5016,7 @@ void beginEnd()
     //cppcheck-suppress ignoredReturnValue
     std::crend(v);
 
-    // cppcheck-suppress constVariable
+    // TODO cppcheck-suppress constVariable
     int arr[4];
 
     //cppcheck-suppress ignoredReturnValue
@@ -5022,6 +5038,44 @@ void beginEnd()
     std::crend(arr);
 }
 
+struct S_constParameter_std_begin { // #11617
+    int a[2];
+};
+
+struct T_constParameter_std_begin {
+    std::vector<int> v;
+};
+
+struct U_constParameter_std_begin {
+    std::vector<int> v[1][1];
+};
+
+void f(S_constParameter_std_begin& s) {
+    std::for_each(std::begin(s.a), std::end(s.a), [](int& i) { ++i; });
+}
+
+void f(T_constParameter_std_begin& t) {
+    std::for_each(std::begin(t.v), std::end(t.v), [](int& i) { ++i; });
+}
+
+void f(U_constParameter_std_begin& u) {
+    std::for_each(std::begin(u.v[0][0]), std::end(u.v[0][0]), [](int& i) { ++i; });
+}
+
+void g_constVariable_std_begin(int* p) { *p = 0; }
+
+int f_constVariable_std_begin() {
+    int arr[1];
+    g_constVariable_std_begin(std::begin(arr));
+    *std::begin(arr) = 1;
+    return arr[0];
+}
+
+std::size_t uninitvar_std_size() { // #14976
+    int a[3];
+    return std::size(a);
+}
+
 void smartPtr_get()
 {
     std::unique_ptr<int> p;
@@ -5163,6 +5217,20 @@ void constVariablePointer_push_back(std::vector<T*>& d, const std::vector<T*>& s
     }
 }
 
+struct S_constVariablePointer_wstring { // #14575
+    std::wstring m;
+    const std::wstring& get() const { return m; }
+};
+
+S_constVariablePointer_wstring* g_constVariablePointer_wstring();
+
+void h_constVariablePointer_wstring(const wchar_t*);
+
+void f_constVariablePointer_wstring() {
+    S_constVariablePointer_wstring* s = g_constVariablePointer_wstring(); // cppcheck-suppress constVariablePointer
+    h_constVariablePointer_wstring(s->get().c_str());
+}
+
 std::streampos constParameterPointer_istream_tellg(std::istream* p) { // #13801
     return p->tellg();
 }
@@ -5304,3 +5372,25 @@ void containerOutOfBounds_std_string(std::string &var) { // #11403
     // TODO cppcheck-suppress containerOutOfBounds
     var+= s5[3];
 }
+
+int containerOutOfBounds_std_initializer_list_access(const std::vector<int>& v) {
+    // cppcheck-suppress containerOutOfBounds
+    return v[2];
+}
+
+int containerOutOfBounds_std_initializer_list() { // #14340
+    std::initializer_list<int> x{ 1, 2 };
+    // cppcheck-suppress derefInvalidIterator
+    int i = *x.end();
+    return i + containerOutOfBounds_std_initializer_list_access(x);
+}
+
+int* missingReturn_std_throw_with_nested() { // #14374
+    try {
+        int* p = new int();
+        return p;
+    }
+    catch (...) {
+        std::throw_with_nested(std::runtime_error("xyz"));
+    }
+}
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index c43bbfeb747..37c580a0134 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -11,6 +11,7 @@
 
 #include <Windows.h>
 #include <WinCon.h>
+#include <SetupAPI.h>
 #include <cstdio>
 #include <direct.h>
 #include <evntrace.h>
@@ -22,6 +23,7 @@
 #include <wchar.h>
 #include <atlstr.h>
 #include <string>
+#include <locale.h>
 
 bool UpdateTraceACalled(TRACEHANDLE traceHandle, LPCSTR loggerName, EVENT_TRACE_PROPERTIES* pProperties)
 {
@@ -54,6 +56,13 @@ void invalid_socket()
     // cppcheck-suppress resourceLeak
 }
 
+void invalid_socket_noleak(int a, int t, int p) { // #14155
+    SOCKET s = socket(a, t, p);
+    if (s == INVALID_SOCKET)
+        return;
+    closesocket(s);
+}
+
 void resourceLeak_OpenThread(const DWORD dwDesiredAccess, const BOOL bInheritHandle, const DWORD dwThreadId)
 {
     HANDLE proc = OpenThread(dwDesiredAccess, bInheritHandle, dwThreadId);
@@ -85,6 +94,10 @@ std::string constVariable_GetModuleFileName(void) {
     return std::string{path};
 }
 
+const TCHAR* constVariable_MAKEINTRESOURCE() { // #14564
+    return MAKEINTRESOURCE(5 - 1);
+}
+
 int stringCompare_mbscmp(const unsigned char *string1, const unsigned char *string2)
 {
     // cppcheck-suppress stringCompare
@@ -603,6 +616,27 @@ void memleak_malloca()
     // cppcheck-suppress memleak
 }
 
+void memleak_create_locale()
+{
+    // cppcheck-suppress-begin valueFlowBailoutIncompleteVar
+    _locale_t locale = _create_locale(LC_ALL, "C");
+    _locale_t wlocale = _wcreate_locale(LC_ALL, L"C");
+    (void) locale;
+    (void) wlocale;
+    // cppcheck-suppress-end valueFlowBailoutIncompleteVar
+    // cppcheck-suppress memleak
+}
+
+void no_memleak_create_locale()
+{
+    // cppcheck-suppress-begin valueFlowBailoutIncompleteVar
+    _locale_t locale = _create_locale(LC_ALL, "C");
+    _locale_t wlocale = _wcreate_locale(LC_ALL, L"C");
+    _free_locale(locale);
+    _free_locale(wlocale);
+    // cppcheck-suppress-end valueFlowBailoutIncompleteVar
+}
+
 void memleak_AllocateAndInitializeSid()
 {
     PSID pEveryoneSID = NULL;
@@ -825,7 +859,7 @@ void invalidFunctionArg()
     CloseHandle(hMutex);
 
     //Incorrect: 2. parameter to LoadLibraryEx() must be NULL
-    // cppcheck-suppress [invalidFunctionArg, cstyleCast]
+    // cppcheck-suppress [invalidFunctionArg, intToPointerCast]
     HINSTANCE hInstLib = LoadLibraryEx(L"My.dll", HANDLE(1), 0);
     FreeLibrary(hInstLib);
 
@@ -1216,3 +1250,13 @@ void SEH_unusedLabel() { // #13233
     __finally {
     }
 }
+
+HWND constParameterPointer_CreateWindow(void* param) { // #14560
+    return CreateWindow(L"MessageWnd", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, param);
+}
+
+void constParameterPointer_SetupDiGetDeviceInstanceId(HDEVINFO info, SP_DEVINFO_DATA *data) {
+    const DWORD buffer_size = 256;
+    TCHAR buffer[buffer_size];
+    SetupDiGetDeviceInstanceId(info, data, buffer, buffer_size, NULL);
+}
diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp
index 2949f671941..c25dfa8e1b4 100644
--- a/test/cfg/wxwidgets.cpp
+++ b/test/cfg/wxwidgets.cpp
@@ -972,6 +972,10 @@ void ignoredReturnValue_wxDC_GetSizeMM(const wxDC &dc, wxCoord *width, wxCoord *
     (void)dc.GetSizeMM();
 }
 
+void ignoredReturnValue_wxPanel_Layout(wxPanel* panel) { // #14403
+    panel->Layout();
+}
+
 wxSizerItem* invalidFunctionArgBool_wxSizer_Add(wxSizer *sizer, wxWindow * window, const wxSizerFlags &flags)
 {
     // No warning is expected for
@@ -1200,7 +1204,7 @@ void deprecatedFunctions([[maybe_unused]] wxApp &a,
 #if wxCHECK_VERSION(3, 1, 0)  // wxWidets-3.1.0 or higher:
     // Some functions are not available anymore in newer versions
 
-    // @todo cppcheck-suppress ShowPopupCalled
+    // cppcheck-suppress ShowPopupCalled
     comboCtrl.ShowPopup();
 #else
     // cppcheck-suppress InsertCalled
diff --git a/test/cli/QML-Samples-TableView/main.cpp b/test/cli/QML-Samples-TableView/main.cpp
index 1c57799425c..21d72bf21e8 100644
--- a/test/cli/QML-Samples-TableView/main.cpp
+++ b/test/cli/QML-Samples-TableView/main.cpp
@@ -4,10 +4,6 @@
 
 int main(int argc, char *argv[])
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
diff --git a/test/cli/clang-import_test.py b/test/cli/clang-import_test.py
index f55f80f0837..e4ec19a5ada 100644
--- a/test/cli/clang-import_test.py
+++ b/test/cli/clang-import_test.py
@@ -47,8 +47,8 @@ def __check_symbol_database(tmpdir, code):
     testfile = os.path.join(tmpdir, 'test.cpp')
     with open(testfile, 'w+t') as f:
         f.write(code)
-    ret1, stdout1, _ = cppcheck(['--clang', '--debug-symdb', testfile])
-    ret2, stdout2, _ = cppcheck(['--debug-symdb', testfile])
+    ret1, stdout1, _ = cppcheck(['-q', '--clang', '--debug-symdb', testfile])
+    ret2, stdout2, _ = cppcheck(['-q', '--debug-symdb', testfile])
     assert 0 == ret1, stdout1
     assert 0 == ret2, stdout2
     assert __get_debug_section('### Symbol database', stdout1) == __get_debug_section('### Symbol database', stdout2)
@@ -58,8 +58,8 @@ def __check_ast(tmpdir, code):
     testfile = os.path.join(tmpdir, 'test.cpp')
     with open(testfile, 'w+t') as f:
         f.write(code)
-    ret1, stdout1, _ = cppcheck(['--clang', '--debug-ast', testfile])
-    ret2, stdout2, _ = cppcheck(['--debug-ast', testfile])
+    ret1, stdout1, _ = cppcheck(['-q', '--clang', '--debug-ast', testfile])
+    ret2, stdout2, _ = cppcheck(['-q', '--debug-ast', testfile])
     assert 0 == ret1, stdout1
     assert 0 == ret2, stdout1
     assert __get_debug_section('##AST', stdout1) == __get_debug_section('##AST', stdout2)
diff --git a/test/cli/dumpfile_test.py b/test/cli/dumpfile_test.py
index 6e52b3cebcc..932c4363a30 100644
--- a/test/cli/dumpfile_test.py
+++ b/test/cli/dumpfile_test.py
@@ -119,3 +119,16 @@ def test_duplicate_file_entries(tmpdir):  #13333
     assert os.path.isfile(test_file + '.dump')
     assert os.path.isfile(test_file + '.1.dump')
 
+
+def test_container_methods(tmpdir):
+    test_file = str(tmpdir / 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('std::string s;\n')
+
+    exitcode, _, stderr = cppcheck(['--dump', '.'], cwd=str(tmpdir))
+    assert exitcode == 0, stderr
+
+    dumpfile = test_file + '.dump'
+    with open(dumpfile, 'rt') as f:
+        dump = f.read()
+    assert '<f name="emplace" action="push" yield="iterator"/>' in dump
diff --git a/test/cli/exclude/DebugX64.cpp b/test/cli/exclude/DebugX64.cpp
new file mode 100644
index 00000000000..cfb1fce687a
--- /dev/null
+++ b/test/cli/exclude/DebugX64.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+
+int foo()
+{
+	std::cout << "DebugX64\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/exclude/ReleaseX64.cpp b/test/cli/exclude/ReleaseX64.cpp
new file mode 100644
index 00000000000..8fa6e6d0f82
--- /dev/null
+++ b/test/cli/exclude/ReleaseX64.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+
+int foo()
+{
+	std::cout << "ReleaseX64\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/exclude/exclude.cppcheck b/test/cli/exclude/exclude.cppcheck
new file mode 100644
index 00000000000..50d7da84486
--- /dev/null
+++ b/test/cli/exclude/exclude.cppcheck
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <builddir>exclude-cppcheck-build-dir</builddir>
+    <importproject>exclude.slnx</importproject>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+    <check-headers>true</check-headers>
+    <check-unused-templates>true</check-unused-templates>
+    <inline-suppression>true</inline-suppression>
+    <max-ctu-depth>2</max-ctu-depth>
+    <max-template-recursion>100</max-template-recursion>
+    <vs-configurations>
+        <config>Debug</config>
+    </vs-configurations>
+    <check-level-normal/>
+    <project-name>exclude</project-name>
+</project>
diff --git a/test/cli/exclude/exclude.slnx b/test/cli/exclude/exclude.slnx
new file mode 100644
index 00000000000..837662784ac
--- /dev/null
+++ b/test/cli/exclude/exclude.slnx
@@ -0,0 +1,6 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="exclude.vcxproj" Id="c9d1dca1-d8ff-4c05-9159-f00816645319" />
+</Solution>
diff --git a/test/cli/exclude/exclude.vcxproj b/test/cli/exclude/exclude.vcxproj
new file mode 100644
index 00000000000..cc326aaec2f
--- /dev/null
+++ b/test/cli/exclude/exclude.vcxproj
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>18.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{c9d1dca1-d8ff-4c05-9159-f00816645319}</ProjectGuid>
+    <RootNamespace>exclude</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="DebugX64.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="ReleaseX64.cpp">
+     <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="foo.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/test/cli/exclude/foo.h b/test/cli/exclude/foo.h
new file mode 100644
index 00000000000..5d5f8f0c9e7
--- /dev/null
+++ b/test/cli/exclude/foo.h
@@ -0,0 +1 @@
+int foo();
diff --git a/test/cli/exclude_test.py b/test/cli/exclude_test.py
new file mode 100644
index 00000000000..4f674aac34e
--- /dev/null
+++ b/test/cli/exclude_test.py
@@ -0,0 +1,20 @@
+
+# python -m pytest exclude_test.py
+
+import os
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'exclude')
+
+def test_exclude():
+    args = [
+        '--template=cppcheck1',
+        '--project=exclude/exclude.cppcheck',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename = os.path.join('exclude', 'DebugX64.cpp')
+    assert ret == 0, stdout
+    assert stderr == '[%s:6]: (error) Division by zero.\n' % filename
diff --git a/test/cli/fuzz-crash/crash-039028704ca27187fc3228e9fa01ca30a8434e7a b/test/cli/fuzz-crash/crash-039028704ca27187fc3228e9fa01ca30a8434e7a
new file mode 100644
index 00000000000..7dab9f7d28a
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-039028704ca27187fc3228e9fa01ca30a8434e7a
@@ -0,0 +1 @@
+_ 1p;
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-0400fbfed5c89e368e436dbac630db0f80db94bd b/test/cli/fuzz-crash/crash-0400fbfed5c89e368e436dbac630db0f80db94bd
new file mode 100644
index 00000000000..d6e9b32be37
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-0400fbfed5c89e368e436dbac630db0f80db94bd
@@ -0,0 +1 @@
+typedef i(*const type2)();typedef t(ty)();(v ty)type2()
diff --git a/test/cli/fuzz-crash/crash-04f8bc02d0683e12579485090f4a2cbc55d3c955 b/test/cli/fuzz-crash/crash-04f8bc02d0683e12579485090f4a2cbc55d3c955
new file mode 100644
index 00000000000..1e6a05d0ae6
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-04f8bc02d0683e12579485090f4a2cbc55d3c955
@@ -0,0 +1 @@
+b f(){using e}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-17be2b85446aeb0c7722bedfad4b0e4af27fae3d b/test/cli/fuzz-crash/crash-17be2b85446aeb0c7722bedfad4b0e4af27fae3d
new file mode 100644
index 00000000000..0f06807b7ba
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-17be2b85446aeb0c7722bedfad4b0e4af27fae3d
@@ -0,0 +1 @@
+{for([]{});}
diff --git a/test/cli/fuzz-crash/crash-1c67200986f8cd9788ccf3dbb764d49cb67819b1 b/test/cli/fuzz-crash/crash-1c67200986f8cd9788ccf3dbb764d49cb67819b1
new file mode 100644
index 00000000000..06055955e6b
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-1c67200986f8cd9788ccf3dbb764d49cb67819b1
@@ -0,0 +1 @@
+e U U,i
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-3de394576af6f9f7ca95bdd282075d06f980252f b/test/cli/fuzz-crash/crash-3de394576af6f9f7ca95bdd282075d06f980252f
new file mode 100644
index 00000000000..7122cb87302
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-3de394576af6f9f7ca95bdd282075d06f980252f
@@ -0,0 +1 @@
+t o(){for(u*e,:c)t c=e;}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-41fefbc326c326d02c9e1fe315280ddd326e8a5b b/test/cli/fuzz-crash/crash-41fefbc326c326d02c9e1fe315280ddd326e8a5b
new file mode 100644
index 00000000000..b090d2bf345
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-41fefbc326c326d02c9e1fe315280ddd326e8a5b
@@ -0,0 +1 @@
+#if<
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-42dad53b40278386e4ebd224813e26541cc725f1 b/test/cli/fuzz-crash/crash-42dad53b40278386e4ebd224813e26541cc725f1
new file mode 100644
index 00000000000..3a9abbf229f
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-42dad53b40278386e4ebd224813e26541cc725f1
@@ -0,0 +1 @@
+using C=C*;C{{}}
diff --git a/test/cli/fuzz-crash/crash-4ad024d4f64dfd58d73a3296173fe13860fb8b70 b/test/cli/fuzz-crash/crash-4ad024d4f64dfd58d73a3296173fe13860fb8b70
new file mode 100644
index 00000000000..7aaf95a8378
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-4ad024d4f64dfd58d73a3296173fe13860fb8b70
@@ -0,0 +1 @@
+n f(){auto x=i->o x}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-5ac13e244448ff767f6596c220edb9ef7b61fa6d b/test/cli/fuzz-crash/crash-5ac13e244448ff767f6596c220edb9ef7b61fa6d
new file mode 100644
index 00000000000..7bbc08cfd6d
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-5ac13e244448ff767f6596c220edb9ef7b61fa6d
@@ -0,0 +1 @@
+template<>struct t<>();
diff --git a/test/cli/fuzz-crash/crash-60d6b7bc43d21f6a8ad8eb8cca551e45c31c6a32 b/test/cli/fuzz-crash/crash-60d6b7bc43d21f6a8ad8eb8cca551e45c31c6a32
new file mode 100644
index 00000000000..4a60eb05b88
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-60d6b7bc43d21f6a8ad8eb8cca551e45c31c6a32
@@ -0,0 +1 @@
+t
i(){using S};
diff --git a/test/cli/fuzz-crash/crash-68f8e0ba3d73255e879027ffd2dd39bf8cc34120 b/test/cli/fuzz-crash/crash-68f8e0ba3d73255e879027ffd2dd39bf8cc34120
new file mode 100644
index 00000000000..fd4f065e79c
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-68f8e0ba3d73255e879027ffd2dd39bf8cc34120
@@ -0,0 +1 @@
+v f(){B?1::s:t}
diff --git a/test/cli/fuzz-crash/crash-6d019f821f348d758d8d88bd7de692af6f9b07f4 b/test/cli/fuzz-crash/crash-6d019f821f348d758d8d88bd7de692af6f9b07f4
new file mode 100644
index 00000000000..cd0cc97f0fb
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-6d019f821f348d758d8d88bd7de692af6f9b07f4
@@ -0,0 +1 @@
+#error\

\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-793c09dbb007b0e1a295f592813f40f8d6d449d1 b/test/cli/fuzz-crash/crash-793c09dbb007b0e1a295f592813f40f8d6d449d1
new file mode 100644
index 00000000000..706fe52b407
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-793c09dbb007b0e1a295f592813f40f8d6d449d1
@@ -0,0 +1 @@
+enum{A=s(u)0&=s};
diff --git a/test/cli/fuzz-crash/crash-7c3e963c9c28dab506696d0dbe8aaf8772d5302f b/test/cli/fuzz-crash/crash-7c3e963c9c28dab506696d0dbe8aaf8772d5302f
new file mode 100644
index 00000000000..ff8d3a2d0ac
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-7c3e963c9c28dab506696d0dbe8aaf8772d5302f
@@ -0,0 +1 @@
+h>teu<""e<>;template<F=F>teu=d
diff --git a/test/cli/fuzz-crash/crash-7d409757e9b94fc2eb23758b655e056ec3dd9d09 b/test/cli/fuzz-crash/crash-7d409757e9b94fc2eb23758b655e056ec3dd9d09
new file mode 100644
index 00000000000..8b8929bc573
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-7d409757e9b94fc2eb23758b655e056ec3dd9d09
@@ -0,0 +1 @@
+_asm
diff --git a/test/cli/fuzz-crash/crash-9054eec11c4eb2cccf3ae02cdc3469fae5f8d9ae b/test/cli/fuzz-crash/crash-9054eec11c4eb2cccf3ae02cdc3469fae5f8d9ae
new file mode 100644
index 00000000000..5a088af4bda
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-9054eec11c4eb2cccf3ae02cdc3469fae5f8d9ae
@@ -0,0 +1 @@
+(c*8s){}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-9eb2c9e545b361a17d74ccd4e8c933ca65542b12 b/test/cli/fuzz-crash/crash-9eb2c9e545b361a17d74ccd4e8c933ca65542b12
new file mode 100644
index 00000000000..8d7829b6343
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-9eb2c9e545b361a17d74ccd4e8c933ca65542b12
@@ -0,0 +1 @@
+{template<>i}template<>fact2(){fact2<3>()}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-a03d001b1336e191debffcde652ce5fb63d0a7d6 b/test/cli/fuzz-crash/crash-a03d001b1336e191debffcde652ce5fb63d0a7d6
new file mode 100644
index 00000000000..0a3ef8a3bb2
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-a03d001b1336e191debffcde652ce5fb63d0a7d6
@@ -0,0 +1 @@
+(c[?=3:4])p
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d b/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d
new file mode 100644
index 00000000000..e7b11b223da
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-b4bd9ce1af8a423d15d034f42c7b99dc0f8a0a7d
@@ -0,0 +1 @@
+d o(n c){do if(c){}while(0)n}
diff --git a/test/cli/fuzz-crash/crash-be54fe1da04e7a624214b58f3b572b87082a2e93 b/test/cli/fuzz-crash/crash-be54fe1da04e7a624214b58f3b572b87082a2e93
new file mode 100644
index 00000000000..e263f9d8c66
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-be54fe1da04e7a624214b58f3b572b87082a2e93
@@ -0,0 +1 @@
+(({}namespace d=n));
diff --git a/test/cli/fuzz-crash/crash-c36b9a5f7fce91031cb578ef591f90d48d95a7f4 b/test/cli/fuzz-crash/crash-c36b9a5f7fce91031cb578ef591f90d48d95a7f4
new file mode 100644
index 00000000000..094721301b9
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-c36b9a5f7fce91031cb578ef591f90d48d95a7f4
@@ -0,0 +1 @@
+c<a<s>s=t,{;{}}>l
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-c540e04fe675639b7ead821efc2f5c037b6c89e0 b/test/cli/fuzz-crash/crash-c540e04fe675639b7ead821efc2f5c037b6c89e0
new file mode 100644
index 00000000000..f2fb80ecd28
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-c540e04fe675639b7ead821efc2f5c037b6c89e0
@@ -0,0 +1 @@
+o o(){i n;for(i x:v)n=n+<1;}
diff --git a/test/cli/fuzz-crash/crash-cd91802f0554ab425b82191389c9db2be0d50040 b/test/cli/fuzz-crash/crash-cd91802f0554ab425b82191389c9db2be0d50040
new file mode 100644
index 00000000000..b2a885a35d3
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-cd91802f0554ab425b82191389c9db2be0d50040
@@ -0,0 +1 @@
+{f F<{enum{E=1};}>}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-def181ea7bf444e7a9d0f85b3ad264c31a0b90e4 b/test/cli/fuzz-crash/crash-def181ea7bf444e7a9d0f85b3ad264c31a0b90e4
new file mode 100644
index 00000000000..3b609c62362
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-def181ea7bf444e7a9d0f85b3ad264c31a0b90e4
@@ -0,0 +1 @@
+enum
f:{};
diff --git a/test/cli/fuzz-crash/crash-ef635709a2489083534cd422e6a089daab23ec64 b/test/cli/fuzz-crash/crash-ef635709a2489083534cd422e6a089daab23ec64
new file mode 100644
index 00000000000..6274e3a27a1
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-ef635709a2489083534cd422e6a089daab23ec64
@@ -0,0 +1 @@
+#pragma asm
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-fb09b3314f55a502c8dd27f3f114122c71dd207e b/test/cli/fuzz-crash/crash-fb09b3314f55a502c8dd27f3f114122c71dd207e
new file mode 100644
index 00000000000..3a017fdb2e0
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-fb09b3314f55a502c8dd27f3f114122c71dd207e
@@ -0,0 +1 @@
+;namespace b=i;;namespace b={}
diff --git a/test/cli/fuzz-crash_c/14742 b/test/cli/fuzz-crash_c/14742
new file mode 100644
index 00000000000..a645277c405
--- /dev/null
+++ b/test/cli/fuzz-crash_c/14742
@@ -0,0 +1 @@
+i(){b?8:{}!$}
diff --git a/test/cli/fuzz-crash_c/crash-18b7d7437e79f7e1b843b676e0c3beaf4929d043 b/test/cli/fuzz-crash_c/crash-18b7d7437e79f7e1b843b676e0c3beaf4929d043
new file mode 100644
index 00000000000..6a015200e02
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-18b7d7437e79f7e1b843b676e0c3beaf4929d043
@@ -0,0 +1 @@
+v(){p?1:p..}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-24c217c96d177b8dff4028bce639756d6a8c6088 b/test/cli/fuzz-crash_c/crash-24c217c96d177b8dff4028bce639756d6a8c6088
new file mode 100644
index 00000000000..161962b6fe4
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-24c217c96d177b8dff4028bce639756d6a8c6088
@@ -0,0 +1 @@
+f(S=n){n*,n&&}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-401f925d3c6fd78f864ffd7bf0531bd6a76bb832 b/test/cli/fuzz-crash_c/crash-401f925d3c6fd78f864ffd7bf0531bd6a76bb832
new file mode 100644
index 00000000000..a778e6e2823
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-401f925d3c6fd78f864ffd7bf0531bd6a76bb832
@@ -0,0 +1 @@
+i(){!!:!=!&&d}
diff --git a/test/cli/fuzz-crash_c/crash-493bda132c00d17406b5e661e034867029a1fac1 b/test/cli/fuzz-crash_c/crash-493bda132c00d17406b5e661e034867029a1fac1
new file mode 100644
index 00000000000..1cff3b66c8d
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-493bda132c00d17406b5e661e034867029a1fac1
@@ -0,0 +1 @@
+v(){union{a i;for(i=0;!i;);};}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-8367ada820697bc89f56262df59bdf457b62c808 b/test/cli/fuzz-crash_c/crash-8367ada820697bc89f56262df59bdf457b62c808
new file mode 100644
index 00000000000..08345550d64
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-8367ada820697bc89f56262df59bdf457b62c808
@@ -0,0 +1 @@
+i(){s a;for(;;)y{for(;;);};}
diff --git a/test/cli/fuzz-crash_c/crash-85cab41781812453dfc8e74e1f0b915225f7a0a1 b/test/cli/fuzz-crash_c/crash-85cab41781812453dfc8e74e1f0b915225f7a0a1
new file mode 100644
index 00000000000..a2e58c69ea7
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-85cab41781812453dfc8e74e1f0b915225f7a0a1
@@ -0,0 +1 @@
+n(f=n){n&&,n}
diff --git a/test/cli/fuzz-crash_c/crash-8a4f047728c598ad00d835c16e7fbef5e43e8489 b/test/cli/fuzz-crash_c/crash-8a4f047728c598ad00d835c16e7fbef5e43e8489
new file mode 100644
index 00000000000..3b81bf6f322
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-8a4f047728c598ad00d835c16e7fbef5e43e8489
@@ -0,0 +1 @@
+n(S=n){n*,+&&n}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-9feb09f580c0cf101456c6c650ab4193b1009d07 b/test/cli/fuzz-crash_c/crash-9feb09f580c0cf101456c6c650ab4193b1009d07
new file mode 100644
index 00000000000..8577d6ccb7f
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-9feb09f580c0cf101456c6c650ab4193b1009d07
@@ -0,0 +1 @@
+d(){e?&d=d++++F:a}
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/oom-6fd8356f0baeb3bb43463298803b94ac8ea93cac b/test/cli/fuzz-timeout/oom-6fd8356f0baeb3bb43463298803b94ac8ea93cac
new file mode 100644
index 00000000000..29e36cf8c55
--- /dev/null
+++ b/test/cli/fuzz-timeout/oom-6fd8356f0baeb3bb43463298803b94ac8ea93cac
@@ -0,0 +1 @@
+typedef struct D{itoftor;}tor tor;
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-242e02017d15d072fd7a230de22faeef0816693d b/test/cli/fuzz-timeout/timeout-242e02017d15d072fd7a230de22faeef0816693d
new file mode 100644
index 00000000000..c269baf1efe
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-242e02017d15d072fd7a230de22faeef0816693d
@@ -0,0 +1 @@
+typedef const v*v,*;
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-5225c0e6e895cdd05a15c388547d13a78a2574e2 b/test/cli/fuzz-timeout/timeout-5225c0e6e895cdd05a15c388547d13a78a2574e2
new file mode 100644
index 00000000000..71e751bb201
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-5225c0e6e895cdd05a15c388547d13a78a2574e2
@@ -0,0 +1 @@
+template<t>struct e<j><;
diff --git a/test/cli/fuzz-timeout/timeout-5e798df7f1bc86caef9901d6662319a4d636f269 b/test/cli/fuzz-timeout/timeout-5e798df7f1bc86caef9901d6662319a4d636f269
new file mode 100644
index 00000000000..35e56badcc8
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-5e798df7f1bc86caef9901d6662319a4d636f269
@@ -0,0 +1 @@
+typedef consted e,{}
diff --git a/test/cli/fuzz_test.py b/test/cli/fuzz_test.py
index b8cf09a5657..f1dbcd2983e 100644
--- a/test/cli/fuzz_test.py
+++ b/test/cli/fuzz_test.py
@@ -11,9 +11,9 @@ def test_fuzz_crash():
 
     fuzz_crash_dir = os.path.join(__script_dir, 'fuzz-crash')
     for f in os.listdir(fuzz_crash_dir):
-        ret, stdout, _ = cppcheck(['-q', '--language=c++', '--enable=all', '--inconclusive', f], cwd=fuzz_crash_dir)
+        ret, stdout, stderr = cppcheck(['-q', '--language=c++', '--enable=all', '--inconclusive', f], cwd=fuzz_crash_dir)
         if ret != 0:
-            failures[f] = stdout
+            failures[f] = stdout + stderr
 
     assert failures == {}
 
@@ -26,9 +26,9 @@ def test_fuzz_crash_c():
     if not os.path.exists(fuzz_crash_dir):
         return
     for f in os.listdir(fuzz_crash_dir):
-        ret, stdout, _ = cppcheck(['-q', '--language=c', '--enable=all', '--inconclusive', f], cwd=fuzz_crash_dir)
+        ret, stdout, stderr = cppcheck(['-q', '--language=c', '--enable=all', '--inconclusive', f], cwd=fuzz_crash_dir)
         if ret != 0:
-            failures[f] = stdout
+            failures[f] = stdout + stderr
 
     assert failures == {}
 
diff --git a/test/cli/helloworld/helloworld.slnx b/test/cli/helloworld/helloworld.slnx
new file mode 100644
index 00000000000..ae14b4c329b
--- /dev/null
+++ b/test/cli/helloworld/helloworld.slnx
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="helloworld.vcxproj" />
+</Solution>
diff --git a/test/cli/helloworld/helloworld_slnx.cppcheck b/test/cli/helloworld/helloworld_slnx.cppcheck
new file mode 100644
index 00000000000..cf0bff648cc
--- /dev/null
+++ b/test/cli/helloworld/helloworld_slnx.cppcheck
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <root name="."/>
+    <importproject>helloworld.slnx</importproject>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+</project>
diff --git a/test/cli/helloworld_test.py b/test/cli/helloworld_test.py
index cd7dd16aee4..65c0e4921a0 100644
--- a/test/cli/helloworld_test.py
+++ b/test/cli/helloworld_test.py
@@ -107,7 +107,7 @@ def test_addon_relative_path():
     filename = os.path.join('helloworld', 'main.c')
     assert ret == 0, stdout
     assert stdout == ('Checking %s ...\n'
-                      'Checking %s: SOME_CONFIG...\n' % (filename, filename))
+                      'Checking %s: SOME_CONFIG=SOME_CONFIG...\n' % (filename, filename))
     assert stderr == ('[%s:5]: (error) Division by zero.\n'
                       '[%s:4]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
 
@@ -123,7 +123,10 @@ def test_addon_with_gui_project(tmp_path):
     ret, stdout, stderr = cppcheck(args, cwd=tmp_path)
     filename = os.path.join('helloworld', 'main.c')
     assert ret == 0, stdout
-    assert stdout == 'Checking %s ...\n' % filename
+    assert stdout.strip().split('\n') == [
+        'Checking %s ...' % filename,
+        'Checking %s: SOME_CONFIG=SOME_CONFIG...' % filename
+    ]
     assert stderr == ('[%s:5]: (error) Division by zero.\n'
                       '[%s:4]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
 
@@ -220,11 +223,12 @@ def test_cppcheck_project_local_path_select_one_multiple():
 def test_cppcheck_project_local_path_analyze_all():
     __test_cppcheck_project_local_path(['--analyze-all-vs-configs'], 'Debug|Win32 Debug|x64 Release|Win32 Release|x64')
 
-def test_cppcheck_project_relative_path():
+@pytest.mark.parametrize("project_file", ["helloworld.cppcheck", "helloworld_slnx.cppcheck"])
+def test_cppcheck_project_relative_path(project_file):
     args = [
         '--template=cppcheck1',
         '--platform=win64',
-        '--project=' + os.path.join('helloworld', 'helloworld.cppcheck')
+        '--project=' + os.path.join('helloworld', project_file)
     ]
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     filename = os.path.join('helloworld', 'main.c')
@@ -232,11 +236,12 @@ def test_cppcheck_project_relative_path():
     assert __getVsConfigs(stdout, filename) == 'Debug|x64'
     assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
 
-def test_cppcheck_project_absolute_path():
+@pytest.mark.parametrize("project_file", ["helloworld.cppcheck", "helloworld_slnx.cppcheck"])
+def test_cppcheck_project_absolute_path(project_file):
     args = [
         '--template=cppcheck1',
         '--platform=win64',
-        '--project=' + os.path.join(__proj_dir, 'helloworld.cppcheck')
+        '--project=' + os.path.join(__proj_dir, project_file)
     ]
     ret, stdout, stderr = cppcheck(args)
     filename = os.path.join(__proj_dir, 'main.c')
@@ -293,11 +298,12 @@ def test_suppress_project_absolute(tmp_path):
     assert ret == 0, stdout
     assert stderr == ''
 
-def test_exclude():
+@pytest.mark.parametrize("project_file", ["helloworld.cppcheck", "helloworld_slnx.cppcheck"])
+def test_exclude(project_file):
     args = [
         '-i' + 'helloworld',
         '--platform=win64',
-        '--project=' + os.path.join('helloworld', 'helloworld.cppcheck')
+        '--project=' + os.path.join('helloworld', project_file)
     ]
     ret, stdout, _ = cppcheck(args, cwd=__script_dir)
     assert ret == 1
@@ -357,7 +363,7 @@ def test_missing_include_system():  # #11283
     ]
 
     _, _, stderr = cppcheck(args, cwd=__script_dir)
-    assert stderr.replace('\\', '/') == 'helloworld/main.c:1:0: information: Include file: <stdio.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n'
+    assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n'
 
 
 def test_sarif():
@@ -373,9 +379,13 @@ def test_sarif():
     assert res['runs'][0]['results'][0]['ruleId'] == 'zerodiv'
     assert res['runs'][0]['tool']['driver']['rules'][0]['id'] == 'zerodiv'
     assert res['runs'][0]['tool']['driver']['rules'][0]['properties']['precision'] == 'high'
-    assert res['runs'][0]['tool']['driver']['rules'][0]['properties']['security-severity'] > 9.5
+    assert res['runs'][0]['tool']['driver']['rules'][0]['properties']['security-severity'] == '9.9'
     assert 'security' in res['runs'][0]['tool']['driver']['rules'][0]['properties']['tags']
     assert re.match(r'[0-9]+(.[0-9]+)+', res['runs'][0]['tool']['driver']['semanticVersion'])
+    assert 'level' in res['runs'][0]['tool']['driver']['rules'][0]['defaultConfiguration'] # #13885
+    assert res['runs'][0]['tool']['driver']['rules'][0]['shortDescription']['text'] == ''
+    assert res['runs'][0]['results'][0]['message']['text'] == 'Division by zero.'
+    assert res['runs'][0]['tool']['driver']['rules'][0]['properties']['problem.severity'] == 'error'
 
 
 def test_xml_checkers_report():
diff --git a/test/cli/inline-suppress-polyspace_test.py b/test/cli/inline-suppress-polyspace_test.py
new file mode 100644
index 00000000000..ad7e7df3b55
--- /dev/null
+++ b/test/cli/inline-suppress-polyspace_test.py
@@ -0,0 +1,63 @@
+
+# python -m pytest inline-suppress-polyspace_test.py
+
+import os
+from testutils import assert_cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_unmatched_polyspace_suppression(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('int f(void); /* polyspace MISRA2012:8.2 */\n')
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = ['test.c:1:14: information: Unmatched suppression: misra-c2012-8.2 [unmatchedPolyspaceSuppression]']
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
+
+
+def test_1(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('int f(); /* polyspace MISRA2012:8.2 */\n')
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = []
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
+
+
+def test_block(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('/* polyspace +1 MISRA2012:8.2 */\n'
+                'int f();\n' # <- suppression applies to this line
+                'int g();\n') # <- suppression does not apply to this line
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = ['test.c:3:6: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-8.2]']
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
+
+
+def test_begin_end(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('/* polyspace-begin MISRA2012:8.2 */\n'
+                'int f();\n'
+                '/* polyspace-end MISRA2012:8.2 */\n')
+
+    args = ['--addon=misra', '--template=simple', '--enable=style,information', '--inline-suppr', 'test.c']
+
+    out_exp = ['Checking test.c ...']
+    err_exp = []
+
+    assert_cppcheck(args, ec_exp=0, err_exp=err_exp, out_exp=out_exp, cwd=str(tmp_path))
diff --git a/test/cli/inline-suppress_test.py b/test/cli/inline-suppress_test.py
index ebb182ea08c..065a59f5067 100644
--- a/test/cli/inline-suppress_test.py
+++ b/test/cli/inline-suppress_test.py
@@ -1,10 +1,11 @@
 
-# python -m pytest test-inline-suppress.py
+# python -m pytest inline-suppress_test.py
 
 import json
 import os
 import pytest
 import sys
+import time
 from testutils import cppcheck
 
 __script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -55,6 +56,20 @@ def test_2():
     assert ret == 0, stdout
 
 
+def test_xml():
+    args = [
+        '-q',
+        '--template=simple',
+        '--inline-suppr',
+        '--xml-version=3',
+        'proj-inline-suppress'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert '<suppression errorId="some_warning_id" fileName="proj-inline-suppress/2.c" lineNumber="2" inline="true" comment="there should be a unmatchedSuppression warning about this" />' in stderr
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
 def test_unmatched_suppression():
     args = [
         '-q',
@@ -67,7 +82,7 @@ def test_unmatched_suppression():
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     lines = stderr.splitlines()
     assert lines == [
-        '{}2.c:2:0: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}2.c:2:1: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 1, stdout
@@ -85,7 +100,7 @@ def test_unmatched_suppression_path_with_extra_stuff():
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     lines = stderr.splitlines()
     assert lines == [
-        '{}2.c:2:0: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}2.c:2:1: information: Unmatched suppression: some_warning_id [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 1, stdout
@@ -135,7 +150,7 @@ def __test_compile_commands_unused_function(tmpdir, use_j):
     proj_path_sep = os.path.join(__script_dir, 'proj-inline-suppress-unusedFunction') + os.path.sep
     lines = stderr.splitlines()
     assert lines == [
-        "{}B.cpp:6:0: style: The function 'unusedFunctionTest' is never used. [unusedFunction]".format(proj_path_sep)
+        "{}B.cpp:6:9: style: The function 'unusedFunctionTest' is never used. [unusedFunction]".format(proj_path_sep)
     ]
     assert stdout == ''
     assert ret == 1, stdout
@@ -234,6 +249,59 @@ def test_build_dir(tmpdir):
     assert ret == 0, stdout
 
 
+def test_build_dir_include(tmpdir):
+    args = [
+        '-q',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(tmpdir),
+        '--enable=all',
+        '--inline-suppr',
+        '{}5.cpp'.format(__proj_inline_suppres_path)
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_build_dir_jobs_suppressions(tmpdir): #14064
+    args = [
+        '-q',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(tmpdir),
+        '--enable=style',
+        '--inline-suppr',
+        '-j4',
+        'reanalysis'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+    a1Path = os.path.join(tmpdir, 'd.a1')
+    assert os.path.exists(a1Path)
+    mtimeOld = os.path.getmtime(a1Path)
+
+    time.sleep(1)
+
+    for _ in range(1, 10):
+        cppcheck(args, cwd=__script_dir)
+
+    mtimeNew = os.path.getmtime(a1Path)
+    assert mtimeOld == mtimeNew
+
+
 def __test_build_dir_unused_template(tmpdir, extra_args):
     args = [
         '-q',
@@ -387,8 +455,8 @@ def __test_unused_function_unmatched(tmpdir, extra_args):
     lines = stderr.splitlines()
     lines.sort()
     assert lines == [
-        '{}unusedFunctionUnmatched.cpp:5:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path),
-        '{}unusedFunctionUnmatched.cpp:5:0: information: Unmatched suppression: unusedFunction [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: unusedFunction [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
@@ -434,7 +502,7 @@ def test_unused_function_disabled_unmatched():
 
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     assert stderr.splitlines() == [
-        '{}unusedFunctionUnmatched.cpp:5:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
@@ -452,8 +520,65 @@ def test_unmatched_cfg():
 
     ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
     assert stderr.splitlines() == [
-        '{}cfg.c:10:0: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
-        '{}cfg.c:14:0: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+        '{}cfg.c:5:5: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+        '{}cfg.c:9:5: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+# do not report unmatched unusedFunction inline suppressions when unusedFunction check is disabled
+# unusedFunction is disabled when -j2 is specified without a builddir
+def test_unused_function_disabled_unmatched_j():
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=warning,information',
+        '--inline-suppr',
+        '-j2',
+        '--no-cppcheck-build-dir',
+        'proj-inline-suppress/unusedFunctionUnmatched.cpp'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert stderr.splitlines() == [
+        '{}unusedFunctionUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+# do not report unmatched misra-* inline suppressions when misra is not provided
+def test_misra_disabled_unmatched():  #14232
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=warning,information',
+        '--inline-suppr',
+        'proj-inline-suppress/misraUnmatched.c'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert stderr.splitlines() == [
+        '{}misraUnmatched.c:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+# do not report unmatched premium-* inline suppressions when application is not premium
+def test_premium_disabled_unmatched():  #13663
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=warning,information',
+        '--inline-suppr',
+        'proj-inline-suppress/premiumUnmatched.cpp'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert stderr.splitlines() == [
+        '{}premiumUnmatched.cpp:5:1: information: Unmatched suppression: uninitvar [unmatchedSuppression]'.format(__proj_inline_suppres_path)
     ]
     assert stdout == ''
     assert ret == 0, stdout
\ No newline at end of file
diff --git a/test/cli/lookup_test.py b/test/cli/lookup_test.py
new file mode 100644
index 00000000000..5ff4f8d7d22
--- /dev/null
+++ b/test/cli/lookup_test.py
@@ -0,0 +1,1203 @@
+import os
+import sys
+import pytest
+import shutil
+import json
+
+from testutils import cppcheck_ex, cppcheck, __lookup_cppcheck_exe
+
+def __remove_std_lookup_log(l : list, exepath):
+    l.remove("looking for library 'std.cfg'")
+    l.remove("looking for library '{}/std.cfg'".format(exepath))
+    l.remove("looking for library '{}/cfg/std.cfg'".format(exepath))
+    return l
+
+
+def __create_gui_project(tmpdir):
+    file_name = 'test.c'
+    test_file = os.path.join(tmpdir, file_name)
+    with open(test_file, 'wt'):
+        pass
+
+    project_file = os.path.join(tmpdir, 'project.cppcheck')
+    with open(project_file, 'wt') as f:
+        f.write(
+"""<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <paths>
+        <dir name="{}"/>
+    </paths>
+</project>""".format(test_file)
+        )
+
+    return project_file, test_file
+
+
+def __create_compdb(tmpdir):
+    file_name = 'test.c'
+    test_file = os.path.join(tmpdir, file_name)
+    with open(test_file, 'wt'):
+        pass
+
+    compilation_db = [
+        {
+            "directory": str(tmpdir),
+            "command": "c++ -o {}.o -c {}".format(os.path.basename(file_name), file_name),
+            "file": file_name,
+            "output": "{}.o".format(os.path.basename(file_name))
+        }
+    ]
+
+    compile_commands = os.path.join(tmpdir, 'compile_commands.json')
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    return compile_commands, test_file
+
+
+def test_lib_lookup(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=gnu', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'gnu.cfg'",
+        "looking for library '{}/gnu.cfg'".format(exepath),
+        "looking for library '{}/cfg/gnu.cfg'".format(exepath),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_lib_lookup_ext(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=gnu.cfg', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'gnu.cfg'",
+        "looking for library '{}/gnu.cfg'".format(exepath),
+        "looking for library '{}/cfg/gnu.cfg'".format(exepath),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_lib_lookup_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library=none', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        # TODO: specify which folder is actually used for lookup here
+        "looking for library 'none.cfg'",
+        "looking for library '{}/none.cfg'".format(exepath),
+        "looking for library '{}/cfg/none.cfg'".format(exepath),
+        "library not found: 'none'",
+        "cppcheck: Failed to load library configuration file 'none'. File not found"
+    ]
+
+
+def test_lib_lookup_notfound_project(tmpdir):  # #13938
+    project_file, _ = __create_gui_project(tmpdir)
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library=none', '--project={}'.format(project_file)])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        # TODO: needs to look relative to the project first
+        # TODO: specify which folder is actually used for lookup here
+        "looking for library 'none.cfg'",
+        "looking for library '{}/none.cfg'".format(exepath),
+        "looking for library '{}/cfg/none.cfg'".format(exepath),
+        "library not found: 'none'",
+        "cppcheck: Failed to load library configuration file 'none'. File not found"
+    ]
+
+
+def test_lib_lookup_notfound_compdb(tmpdir):
+    compdb_file, _ = __create_compdb(tmpdir)
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library=none', '--project={}'.format(compdb_file)])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        # TODO: specify which folder is actually used for lookup here
+        "looking for library 'none.cfg'",
+        "looking for library '{}/none.cfg'".format(exepath),
+        "looking for library '{}/cfg/none.cfg'".format(exepath),
+        "library not found: 'none'",
+        "cppcheck: Failed to load library configuration file 'none'. File not found"
+    ]
+
+
+def test_lib_lookup_ext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=none.cfg', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'none.cfg'",
+        "looking for library '{}/none.cfg'".format(exepath),
+        "looking for library '{}/cfg/none.cfg'".format(exepath),
+        "library not found: 'none.cfg'",
+        "cppcheck: Failed to load library configuration file 'none.cfg'. File not found"
+    ]
+
+
+def test_lib_lookup_relative_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=config/gnu.xml', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'config/gnu.xml'",
+        "looking for library '{}/config/gnu.xml'".format(exepath),
+        "looking for library '{}/cfg/config/gnu.xml'".format(exepath),
+        "library not found: 'config/gnu.xml'",
+        "cppcheck: Failed to load library configuration file 'config/gnu.xml'. File not found"
+    ]
+
+
+def test_lib_lookup_relative_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=config/gnu', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'config/gnu'",
+        "looking for library '{}/config/gnu'".format(exepath),
+        "looking for library '{}/cfg/config/gnu'".format(exepath),
+        "library not found: 'config/gnu'",
+        "cppcheck: Failed to load library configuration file 'config/gnu'. File not found"
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_lib_lookup_relative_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=config/gnu/', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'config/gnu/'",
+        "looking for library '{}/config/gnu/'".format(exepath),
+        "looking for library '{}/cfg/config/gnu/'".format(exepath),
+        "library not found: 'config/gnu/'",
+        "cppcheck: Failed to load library configuration file 'config/gnu/'. File not found"
+    ]
+
+
+def test_lib_lookup_absolute(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cfg_file = os.path.join(tmpdir, 'test.cfg')
+    with open(cfg_file, 'wt') as f:
+        f.write('''
+<?xml version="1.0"?>
+<def format="2">
+</def>
+        ''')
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file), test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library '{}'".format(cfg_file),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_lib_lookup_absolute_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cfg_file = os.path.join(tmpdir, 'test.cfg')
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file), test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library '{}'".format(cfg_file),
+        "library not found: '{}'".format(cfg_file),
+        "cppcheck: Failed to load library configuration file '{}'. File not found".format(cfg_file)
+    ]
+
+
+def test_lib_lookup_absolute_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cfg_file = os.path.join(tmpdir, 'test')
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file), test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library '{}'".format(cfg_file),
+        "library not found: '{}'".format(cfg_file),
+        "cppcheck: Failed to load library configuration file '{}'. File not found".format(cfg_file)
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_lib_lookup_absolute_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cfg_file = os.path.join(tmpdir, 'test')
+    cfg_file_trail = cfg_file + os.path.sep
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file_trail), test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library '{}'".format(cfg_file_trail),
+        "library not found: '{}'".format(cfg_file_trail),
+        "cppcheck: Failed to load library configuration file '{}'. File not found".format(cfg_file_trail)
+    ]
+
+
+def test_lib_lookup_nofile(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    # make sure we do not produce an error when the attempted lookup path is a directory and not a file
+    gtk_cfg_dir = os.path.join(tmpdir, 'gtk.cfg')
+    os.mkdir(gtk_cfg_dir)
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=gtk', test_file], cwd=tmpdir)
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'gtk.cfg'",
+        "looking for library '{}/gtk.cfg'".format(exepath),
+        "looking for library '{}/cfg/gtk.cfg'".format(exepath),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+# make sure we bail out when we encounter an invalid file
+def test_lib_lookup_invalid(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    gnu_cfg_file = os.path.join(tmpdir, 'gnu.cfg')
+    with open(gnu_cfg_file, 'wt') as f:
+        f.write('''{}''')
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=gnu', test_file], cwd=tmpdir)
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'gnu.cfg'",
+        "library not found: 'gnu'",
+        "Error=XML_ERROR_PARSING_TEXT ErrorID=8 (0x8) Line number=1",  # TODO: log the failure before saying the library was not found
+        "cppcheck: Failed to load library configuration file 'gnu'. Bad XML"
+    ]
+
+
+def test_lib_lookup_multi(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=posix,gnu', test_file])
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
+    assert lines == [
+        "looking for library 'posix.cfg'",
+        "looking for library '{}/posix.cfg'".format(exepath),
+        "looking for library '{}/cfg/posix.cfg'".format(exepath),
+        "looking for library 'gnu.cfg'",
+        "looking for library '{}/gnu.cfg'".format(exepath),
+        "looking for library '{}/cfg/gnu.cfg'".format(exepath),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_platform_lookup_builtin(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform=unix64', test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    # built-in platform are not being looked up
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+@pytest.mark.skip  # TODO: fails when not run from the root folder
+def test_platform_lookup(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform=avr8', test_file])
+    cwd = os.getcwd()
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'avr8'",
+        "try to load platform file '{}/avr8.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/avr8.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/avr8.xml' ... Success".format(cwd),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+@pytest.mark.skip  # TODO: fails when not run from the root folder
+def test_platform_lookup_ext(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform=avr8.xml', test_file])
+    cwd = os.getcwd()
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'avr8.xml'",
+        "try to load platform file '{}/avr8.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/avr8.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/avr8.xml' ... Success".format(cwd),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_platform_lookup_path(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cppcheck = 'cppcheck' # No path
+    path = os.path.dirname(__lookup_cppcheck_exe())
+    env = os.environ.copy()
+    env['PATH'] = path
+    exitcode, stdout, stderr, _ = cppcheck_ex(args=['--debug-lookup=platform', '--platform=avr8.xml', test_file], cppcheck_exe=cppcheck, cwd=str(tmpdir), env=env)
+    assert exitcode == 0, stdout if stdout else stderr
+    def format_path(p):
+        return p.replace('\\', '/').replace('"', '\'')
+    def try_fail(f):
+        f = format_path(f)
+        return "try to load platform file '{}' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}".format(f, f)
+    def try_success(f):
+        f = format_path(f)
+        return "try to load platform file '{}' ... Success".format(f)
+    lines = stdout.replace('\\', '/').replace('"', '\'').splitlines()
+    assert lines == [
+        "looking for platform 'avr8.xml'",
+        try_fail(os.path.join(tmpdir, 'avr8.xml')),
+        try_fail(os.path.join(tmpdir, 'platforms', 'avr8.xml')),
+        try_fail(os.path.join(path, 'avr8.xml')),
+        try_success(os.path.join(path, 'platforms', 'avr8.xml')),
+        'Checking {} ...'.format(format_path(test_file))
+    ]
+
+
+def test_platform_lookup_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=none', test_file])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'none'",
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(exepath, exepath),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'none'."
+    ]
+
+
+# TODO: test with invalid file in project path
+# TODO: test with non-file in project path
+def test_platform_lookup_notfound_project(tmpdir):  # #13939
+    project_file, _ = __create_gui_project(tmpdir)
+    project_path = os.path.dirname(project_file)
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=none', '--project={}'.format(project_file)])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+        project_path = project_path.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'none'",
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(project_path, project_path),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(project_path, project_path),
+        # TODO: the following lookups are in CWD - is this intended?
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(exepath, exepath),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'none'."
+    ]
+
+
+def test_platform_lookup_notfound_compdb(tmpdir):
+    compdb_file, _ = __create_compdb(tmpdir)
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=none', '--project={}'.format(compdb_file)])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'none'",
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(exepath, exepath),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'none'."
+    ]
+
+
+def test_platform_lookup_ext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=none.xml', test_file])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'none.xml'",
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none.xml".format(exepath, exepath),
+        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'none.xml'."
+    ]
+
+
+def test_platform_lookup_relative_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=platform/none.xml', test_file])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'platform/none.xml'",
+        "try to load platform file '{}/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none.xml".format(cwd, cwd),
+        "try to load platform file '{}/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none.xml".format(exepath, exepath),
+        "try to load platform file '{}/platforms/platform/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none.xml".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'platform/none.xml'."
+    ]
+
+
+def test_platform_lookup_relative_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=platform/none', test_file])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'platform/none'",
+        "try to load platform file '{}/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none".format(cwd, cwd),
+        "try to load platform file '{}/platforms/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none".format(cwd, cwd),
+        "try to load platform file '{}/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none".format(exepath, exepath),
+        "try to load platform file '{}/platforms/platform/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'platform/none'."
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_platform_lookup_relative_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=platform/none/', test_file])
+    cwd = os.getcwd()
+    exepath = os.path.dirname(exe)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+        exepath = exepath.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'platform/none/'",
+        "try to load platform file '{}/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none/".format(cwd, cwd),
+        "try to load platform file '{}/platforms/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none/".format(cwd, cwd),
+        "try to load platform file '{}/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platform/none/".format(exepath, exepath),
+        "try to load platform file '{}/platforms/platform/none/' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/platform/none/".format(exepath, exepath),
+        "cppcheck: error: unrecognized platform: 'platform/none/'."
+    ]
+
+
+def test_platform_lookup_absolute(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    platform_file = os.path.join(tmpdir, 'test.xml')
+    with open(platform_file, 'wt') as f:
+        f.write('''
+<platform format="2"/>
+        ''')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform={}'.format(platform_file), test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform '{}'".format(platform_file),
+        "try to load platform file '{}' ... Success".format(platform_file),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_platform_lookup_absolute_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    platform_file = os.path.join(tmpdir, 'test.xml')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform={}'.format(platform_file), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform '{}'".format(platform_file),
+        "try to load platform file '{}' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}".format(platform_file, platform_file),
+        "cppcheck: error: unrecognized platform: '{}'.".format(platform_file)
+    ]
+
+
+def test_platform_lookup_absolute_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    platform_file = os.path.join(tmpdir, 'test')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform={}'.format(platform_file), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform '{}'".format(platform_file),
+        "try to load platform file '{}' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}".format(platform_file, platform_file),
+        "cppcheck: error: unrecognized platform: '{}'.".format(platform_file)
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_platform_lookup_absolute_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    platform_file = os.path.join(tmpdir, 'test')
+    platform_file_trail = platform_file + os.path.sep
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform={}'.format(platform_file_trail), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform '{}'".format(platform_file_trail),
+        "try to load platform file '{}' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}".format(platform_file_trail, platform_file_trail),
+        "cppcheck: error: unrecognized platform: '{}'.".format(platform_file_trail)
+    ]
+
+
+@pytest.mark.skip  # TODO: fails when not run from the root folder
+def test_platform_lookup_nofile(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    # make sure we do not produce an error when the attempted lookup path is a directory and not a file
+    avr8_cfg_dir = os.path.join(tmpdir, 'avr8.xml')
+    os.mkdir(avr8_cfg_dir)
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform=avr8', test_file])
+    cwd = os.getcwd()
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'avr8'",
+        "try to load platform file '{}/avr8.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/avr8.xml".format(cwd, cwd),
+        "try to load platform file '{}/platforms/avr8.xml' ... Success".format(cwd),
+        'Checking {}1 ...'.format(test_file)
+    ]
+
+
+def test_platform_lookup_invalid(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    avr8_file = os.path.join(tmpdir, 'avr8.xml')
+    with open(avr8_file, 'wt') as f:
+        f.write('''{}''')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform=avr8', test_file], cwd=tmpdir)
+    cwd = str(tmpdir)
+    if sys.platform == 'win32':
+        cwd = cwd.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for platform 'avr8'",
+        "try to load platform file '{}/avr8.xml' ... Error=XML_ERROR_PARSING_TEXT ErrorID=8 (0x8) Line number=1".format(cwd),
+        "cppcheck: error: unrecognized platform: 'avr8'."
+    ]
+
+
+def test_addon_lookup(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'misra.py'",
+        "looking for addon '{}misra.py'".format(exepath_sep),
+        "looking for addon '{}addons/misra.py'".format(exepath_sep),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_addon_lookup_ext(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra.py', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'misra.py'",
+        "looking for addon '{}misra.py'".format(exepath_sep),
+        "looking for addon '{}addons/misra.py'".format(exepath_sep),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_addon_lookup_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'none.py'",
+        "looking for addon '{}none.py'".format(exepath_sep),
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
+        'Did not find addon none.py'
+    ]
+
+
+def test_addon_lookup_notfound_project(tmpdir):  # #13940 / #13941
+    project_file, _ = __create_gui_project(tmpdir)
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none', '--project={}'.format(project_file)])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        # TODO: needs to look relative to the project file first
+        "looking for addon 'none.py'",
+        "looking for addon '{}none.py'".format(exepath_sep),
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
+        'Did not find addon none.py'
+    ]
+
+
+def test_addon_lookup_notfound_compdb(tmpdir):
+    compdb_file, _ = __create_compdb(tmpdir)
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none', '--project={}'.format(compdb_file)])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'none.py'",
+        "looking for addon '{}none.py'".format(exepath_sep),
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
+        'Did not find addon none.py'
+    ]
+
+
+def test_addon_lookup_ext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none.py', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'none.py'",
+        "looking for addon '{}none.py'".format(exepath_sep),
+        "looking for addon '{}addons/none.py'".format(exepath_sep),
+        'Did not find addon none.py'
+    ]
+
+
+def test_addon_lookup_relative_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=addon/misra.py', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'addon/misra.py'",
+        "looking for addon '{}addon/misra.py'".format(exepath_sep),
+        "looking for addon '{}addons/addon/misra.py'".format(exepath_sep),
+        'Did not find addon addon/misra.py'
+    ]
+
+
+# FIXME: an addon requires a file extension as we need to differentiate between .py and .json addons
+def test_addon_lookup_relative_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=addon/misra', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'addon/misra.py'",
+        "looking for addon '{}addon/misra.py'".format(exepath_sep),
+        "looking for addon '{}addons/addon/misra.py'".format(exepath_sep),
+        'Did not find addon addon/misra.py'
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_addon_lookup_relative_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=addon/misra/', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout
+    lines = stdout.splitlines()
+    assert lines == [
+        # TODO: should not append extension
+        "looking for addon 'addon/misra/.py'",
+        "looking for addon '{}addon/misra/.py'".format(exepath_sep),
+        "looking for addon '{}addons/addon/misra/.py'".format(exepath_sep),
+        'Did not find addon addon/misra/.py'
+    ]
+
+
+def test_addon_lookup_absolute(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    addon_file = os.path.join(tmpdir, 'test.py')
+    with open(addon_file, 'wt') as f:
+        f.write('''''')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=addon', '--addon={}'.format(addon_file), test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon '{}'".format(addon_file),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_addon_lookup_absolute_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    addon_file = os.path.join(tmpdir, 'test.py')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=addon', '--addon={}'.format(addon_file), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon '{}'".format(addon_file),
+        'Did not find addon {}'.format(addon_file)
+    ]
+
+
+# FIXME: an addon requires a file extension as we need to differentiate between .py and .json addons
+def test_addon_lookup_absolute_noext_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    addon_file = os.path.join(tmpdir, 'test')
+    addon_file_py = os.path.join(tmpdir, 'test.py')  # TODO: do not add extension
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=addon', '--addon={}'.format(addon_file), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon '{}'".format(addon_file_py),
+        'Did not find addon {}'.format(addon_file_py)
+    ]
+
+
+# TODO: this can never be found - bail out early?
+def test_addon_lookup_absolute_noext_trailing_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    addon_file = os.path.join(tmpdir, 'test')
+    addon_file_trail = addon_file + os.path.sep
+    addon_file_trail_py = addon_file_trail + '.py'  # TODO: do not add extension
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=addon', '--addon={}'.format(addon_file_trail), test_file])
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon '{}'".format(addon_file_trail_py),
+        'Did not find addon {}'.format(addon_file_trail_py)
+    ]
+
+
+def test_addon_lookup_nofile(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    # make sure we do not produce an error when the attempted lookup path is a directory and not a file
+    misra_dir = os.path.join(tmpdir, 'misra')
+    os.mkdir(misra_dir)
+    misra_cfg_dir = os.path.join(tmpdir, 'misra.py')
+    os.mkdir(misra_cfg_dir)
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    if sys.platform == 'win32':
+        exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'misra.py'",
+        "looking for addon '{}misra.py'".format(exepath_sep),
+        "looking for addon '{}addons/misra.py'".format(exepath_sep),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+# make sure we bail out when we encounter an invalid file
+def test_addon_lookup_invalid(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    misra_py_file = os.path.join(tmpdir, 'misra.py')
+    with open(misra_py_file, 'wt') as f:
+        f.write('''<def/>''')
+
+    exitcode, stdout, stderr = cppcheck(['--debug-lookup=addon', '--addon=misra', test_file], cwd=tmpdir)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for addon 'misra.py'",
+        'Checking {} ...'.format(test_file)  # TODO: should bail out
+    ]
+
+
+def test_config_lookup(tmpdir):
+    cppcheck_exe = __lookup_cppcheck_exe()
+    bin_dir = os.path.dirname(cppcheck_exe)
+    tmp_cppcheck_exe = shutil.copy2(cppcheck_exe, tmpdir)
+    if sys.platform == 'win32':
+        shutil.copy2(os.path.join(bin_dir, 'cppcheck-core.dll'), tmpdir)
+    shutil.copytree(os.path.join(bin_dir, 'cfg'), os.path.join(tmpdir, 'cfg'))
+
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    config_file = os.path.join(tmpdir, 'cppcheck.cfg')
+    with open(config_file, 'wt') as f:
+        f.write('{}')
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=config', test_file], cwd=tmpdir, cppcheck_exe=tmp_cppcheck_exe)
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for '{}cppcheck.cfg'".format(exepath_sep),
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_config_lookup_notfound(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=config', test_file])
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for '{}cppcheck.cfg'".format(exepath_sep),
+        'no configuration found',
+        'Checking {} ...'.format(test_file)
+    ]
+
+
+def test_config_invalid(tmpdir):
+    cppcheck_exe = __lookup_cppcheck_exe()
+    bin_dir = os.path.dirname(cppcheck_exe)
+    tmp_cppcheck_exe = shutil.copy2(cppcheck_exe, tmpdir)
+    if sys.platform == 'win32':
+        shutil.copy2(os.path.join(bin_dir, 'cppcheck-core.dll'), tmpdir)
+    shutil.copytree(os.path.join(bin_dir, 'cfg'), os.path.join(tmpdir, 'cfg'))
+
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    config_file = os.path.join(tmpdir, 'cppcheck.cfg')
+    with open(config_file, 'wt'):
+        pass
+
+    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=config', test_file], cwd=tmpdir, cppcheck_exe=tmp_cppcheck_exe)
+    exepath = os.path.dirname(exe)
+    exepath_sep = exepath + os.path.sep
+    exepath_sep = exepath_sep.replace('\\', '/')
+    assert exitcode == 1, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        "looking for '{}cppcheck.cfg'".format(exepath_sep),
+        'cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 1 near: '
+    ]
+
+# TODO: test with FILESDIR
+
+@pytest.mark.parametrize("type,file", [("addon", "misra.py"), ("config", "cppcheck.cfg"), ("library", "gnu.cfg"), ("platform", "avr8.xml")])
+def test_lookup_path(tmpdir, type, file):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt'):
+        pass
+
+    cppcheck = 'cppcheck' # No path
+    path = os.path.dirname(__lookup_cppcheck_exe())
+    env = os.environ.copy()
+    env['PATH'] = path + (';' if sys.platform == 'win32' else ':') + env.get('PATH', '')
+    if type == 'config':
+        with open(os.path.join(path, "cppcheck.cfg"), 'wt') as f:
+            f.write('{}')
+        exitcode, stdout, stderr, _ = cppcheck_ex(args=[f'--debug-lookup={type}', test_file], cppcheck_exe=cppcheck, cwd=str(tmpdir), env=env)
+        os.remove(os.path.join(path, "cppcheck.cfg")) # clean up otherwise other tests may fail
+    else:
+        exitcode, stdout, stderr, _ = cppcheck_ex(args=[f'--debug-lookup={type}', f'--{type}={file}', test_file], cppcheck_exe=cppcheck, cwd=str(tmpdir), env=env)
+    assert exitcode == 0, stdout if stdout else stderr
+    def format_path(p):
+        return p.replace('\\', '/').replace('"', '\'')
+    lines = format_path(stdout).splitlines()
+
+    if type == 'addon':
+        def try_fail(f):
+            return f"looking for {type} '{format_path(f)}'"
+        def try_success(f):
+            return f"looking for {type} '{format_path(f)}'"
+        assert lines == [
+            f"looking for {type} '{file}'",
+            try_fail(os.path.join(path, file)),
+            try_success(os.path.join(path, 'addons', file)),
+            f'Checking {format_path(test_file)} ...'
+        ]
+    elif type == 'config':
+        def try_success(f):
+            return f"looking for '{format_path(f)}'"
+        assert lines == [
+            try_success(os.path.join(path, file)),
+            f'Checking {format_path(test_file)} ...'
+        ]
+    elif type == 'platform':
+        def try_fail(f):
+            f = format_path(f)
+            return f"try to load {type} file '{f}' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={f}"
+        def try_success(f):
+            f = format_path(f)
+            return f"try to load {type} file '{f}' ... Success"
+        assert lines == [
+            f"looking for {type} '{file}'",
+            try_fail(os.path.join(tmpdir, file)),
+            try_fail(os.path.join(tmpdir, 'platforms', file)),
+            try_fail(os.path.join(path, file)),
+            try_success(os.path.join(path, 'platforms', file)),
+            f'Checking {format_path(test_file)} ...'
+        ]
+    elif type == 'library':
+        def try_fail(f):
+            return f"looking for {type} '{format_path(f)}'"
+        def try_success(f):
+            return f"looking for {type} '{format_path(f)}'"
+        assert lines == [
+            f"looking for {type} 'std.cfg'",
+            try_fail(os.path.join(path, 'std.cfg')),
+            try_success(os.path.join(path, 'cfg', 'std.cfg')),
+            f"looking for {type} '{file}'",
+            try_fail(os.path.join(path, file)),
+            try_success(os.path.join(path, 'cfg', file)),
+            f'Checking {format_path(test_file)} ...'
+        ]
+    else:
+        assert False, type + " not tested properly"
\ No newline at end of file
diff --git a/test/cli/metrics_test.py b/test/cli/metrics_test.py
new file mode 100644
index 00000000000..6f5c7041dab
--- /dev/null
+++ b/test/cli/metrics_test.py
@@ -0,0 +1,78 @@
+# python -m pytest metrics_test.py
+
+import os
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__addon_output = """
+{"metric":{"fileName":"1.cpp","function":"write","id":"HISCall","lineNumber":6,"value":2}}
+{"metric":{"fileName":"1.cpp","function":"write","id":"HISGoto","lineNumber":6,"value":0}}
+{"metric":{"fileName":"1.cpp","function":"write","id":"HISLevel","lineNumber":6,"value":2}}
+{"metric":{"fileName":"1.cpp","function":"write","id":"HISParam","lineNumber":6,"value":2}}
+{"metric":{"fileName":"1.cpp","function":"write","id":"HISPath","lineNumber":6,"value":3}}
+{"metric":{"fileName":"1.cpp","function":"write","id":"HISReturn","lineNumber":6,"value":0}}
+{"metric":{"fileName":"1.cpp","function":"write","id":"HISStmt","lineNumber":6,"value":15}}
+{"metric":{"fileName":"1.cpp","function":"write","id":"cyclomaticComplexity","lineNumber":6,"value":3}}
+"""
+__addon_source = f'print("""{__addon_output}""")'
+__expected_xml = [
+    '<metric fileName="1.cpp" function="write" id="HISCall" lineNumber="6" value="2"/>',
+    '<metric fileName="1.cpp" function="write" id="HISGoto" lineNumber="6" value="0"/>',
+    '<metric fileName="1.cpp" function="write" id="HISLevel" lineNumber="6" value="2"/>',
+    '<metric fileName="1.cpp" function="write" id="HISParam" lineNumber="6" value="2"/>',
+    '<metric fileName="1.cpp" function="write" id="HISPath" lineNumber="6" value="3"/>',
+    '<metric fileName="1.cpp" function="write" id="HISReturn" lineNumber="6" value="0"/>',
+    '<metric fileName="1.cpp" function="write" id="HISStmt" lineNumber="6" value="15"/>',
+    '<metric fileName="1.cpp" function="write" id="cyclomaticComplexity" lineNumber="6" value="3"/>'
+]
+
+def __create_addon(tmpdir):
+    path = os.path.join(tmpdir, 'addon.py')
+    with open(path, 'w') as file:
+        file.write(__addon_source)
+    return path
+
+def __create_source_file(tmpdir):
+    path = os.path.join(tmpdir, 'test.c')
+    with open(path, 'w') as _:
+        pass
+    return path
+
+def test_dummy_metrics_xml_report(tmpdir):
+    output_file = os.path.join(tmpdir, "results.xml")
+    source_path = __create_source_file(tmpdir)
+    addon_path = __create_addon(tmpdir)
+    args = [
+        f'--output-file={output_file}',
+        f'--addon={addon_path}',
+        '--xml-version=3',
+        source_path
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stderr == ''
+    assert stdout == f'Checking {source_path} ...\n'
+
+    with open(output_file, 'r') as file:
+        xml = file.read()
+
+    for expected in __expected_xml:
+        assert xml.find(expected) >= 0
+
+def test_dummy_metrics_stdout(tmpdir):
+    source_path = __create_source_file(tmpdir)
+    addon_path = __create_addon(tmpdir)
+    args = [
+        f'--addon={addon_path}',
+        '--xml-version=3',
+        source_path
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stdout == f'Checking {source_path} ...\n'
+
+    for expected in __expected_xml:
+        assert stderr.find(expected) >= 0
+
diff --git a/test/cli/more-projects_test.py b/test/cli/more-projects_test.py
index 51290a7d6a3..98304bbe8aa 100644
--- a/test/cli/more-projects_test.py
+++ b/test/cli/more-projects_test.py
@@ -173,7 +173,6 @@ def test_project_empty_fields(tmpdir):
   </libraries>
   <suppressions/>
   <suppressions>
-    <suppression/>
   </suppressions>
   <vs-configurations/>
   <vs-configurations>
@@ -258,7 +257,7 @@ def test_project_std(tmpdir):
 
 
 
-@pytest.mark.skip() # clang-tidy is not available in all cases
+@pytest.mark.skip() # clang-tidy is not available in all cases - TODO: enable conditionally
 def test_clang_tidy(tmpdir):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
@@ -295,7 +294,13 @@ def test_clang_tidy(tmpdir):
     assert stderr == ''
 
 
-def test_project_file_filter(tmpdir):
+@pytest.mark.parametrize("file_filter", [
+    ['--file-filter=test.cpp'],
+    ['--file-filter=*.cpp'],
+    ['--file-filter=+', 'test.cpp'],
+    ['--file-filter=+', '*.cpp'],
+])
+def test_project_file_filter(tmpdir, file_filter):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
         pass
@@ -310,7 +315,7 @@ def test_project_file_filter(tmpdir):
     </paths>
 </project>""".format(test_file))
 
-    args = ['--file-filter=*.cpp', '--project={}'.format(project_file)]
+    args = file_filter + ['--project={}'.format(project_file)]
     out_lines = [
         'Checking {} ...'.format(test_file)
     ]
@@ -318,7 +323,11 @@ def test_project_file_filter(tmpdir):
     assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
 
 
-def test_project_file_filter_2(tmpdir):
+@pytest.mark.parametrize("file_filter", [
+    ['--file-filter=*.cpp'],
+    ['--file-filter=+', '*.cpp'],
+])
+def test_project_file_filter_cpp(tmpdir, file_filter):
     test_file_1 = os.path.join(tmpdir, 'test.cpp')
     with open(test_file_1, 'wt') as f:
         pass
@@ -337,7 +346,7 @@ def test_project_file_filter_2(tmpdir):
     </paths>
 </project>""".format(test_file_1, test_file_2))
 
-    args = ['--file-filter=*.cpp', '--project={}'.format(project_file)]
+    args = file_filter + ['--project={}'.format(project_file)]
     out_lines = [
         'Checking {} ...'.format(test_file_1)
     ]
@@ -345,7 +354,11 @@ def test_project_file_filter_2(tmpdir):
     assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
 
 
-def test_project_file_filter_3(tmpdir):
+@pytest.mark.parametrize("file_filter", [
+    ['--file-filter=*.c'],
+    ['--file-filter=+', '*.c'],
+])
+def test_project_file_filter_c(tmpdir, file_filter):
     test_file_1 = os.path.join(tmpdir, 'test.cpp')
     with open(test_file_1, 'wt') as f:
         pass
@@ -364,7 +377,7 @@ def test_project_file_filter_3(tmpdir):
     </paths>
 </project>""".format(test_file_1, test_file_2))
 
-    args = ['--file-filter=*.c', '--project={}'.format(project_file)]
+    args = file_filter + ['--project={}'.format(project_file)]
     out_lines = [
         'Checking {} ...'.format(test_file_2)
     ]
@@ -372,6 +385,137 @@ def test_project_file_filter_3(tmpdir):
     assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
 
 
+def test_project_relpath_file_filter_abspath(tmpdir):
+    """
+    relative paths in project file, absolute path in file filter
+    """
+    test_file_cpp = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file_cpp, 'wt') as f:
+        pass
+    test_file_c = os.path.join(tmpdir, 'test.c')
+    with open(test_file_c, 'wt') as f:
+        pass
+
+    project_file = os.path.join(tmpdir, 'test.cppcheck')
+    with open(project_file, 'wt') as f:
+        f.write(
+            """<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <paths>
+        <dir name="test.cpp"/>
+        <dir name="test.c"/>
+    </paths>
+</project>""")
+
+    out_lines = [
+        'Checking test.c ...'
+    ]
+
+    args = ['--file-filter={}'.format(test_file_c), '--project=test.cppcheck']
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines, cwd=tmpdir)
+
+
+def test_project_abspath_file_filter_relpath(tmpdir):
+    """
+    absolute paths in project file, relative path in file filter
+    """
+    test_file_cpp = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file_cpp, 'wt') as f:
+        pass
+    test_file_c = os.path.join(tmpdir, 'test.c')
+    with open(test_file_c, 'wt') as f:
+        pass
+
+    project_file = os.path.join(tmpdir, 'test.cppcheck')
+    with open(project_file, 'wt') as f:
+        f.write(
+            """<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <paths>
+        <dir name="{}"/>
+        <dir name="{}"/>
+    </paths>
+</project>""".format(test_file_c, test_file_cpp))
+
+    out_lines = [
+        'Checking {} ...'.format(test_file_c)
+    ]
+
+    args = ['--file-filter=test.c', '--project=test.cppcheck']
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines, cwd=tmpdir)
+
+
+def test_project_pathmatch_other_cwd(tmpdir):
+    """
+    mixed relative and absolute paths in project file and on command line, executed in a different directory
+    """
+    test_root = tmpdir
+    test_cwd = os.path.join(test_root, 'cwd')
+    test_dir_1 = os.path.join(test_root, 'a')
+    test_dir_2 = os.path.join(test_root, 'b')
+    test_dir_3 = os.path.join(test_cwd, 'b')
+
+    os.mkdir(test_cwd)
+    os.mkdir(test_dir_1)
+    os.mkdir(test_dir_2)
+    os.mkdir(test_dir_3)
+
+    test_file_1 = os.path.join(test_dir_1, 'a-abs.c')
+    with open(test_file_1, 'wt') as f:
+        pass
+
+    test_file_2 = os.path.join(test_dir_1, 'a-rel.c')
+    with open(test_file_2, 'wt') as f:
+        pass
+
+    test_file_3 = os.path.join(test_dir_2, 'b-abs.c')
+    with open(test_file_3, 'wt') as f:
+        pass
+
+    test_file_4 = os.path.join(test_dir_2, 'b-rel.c')
+    with open(test_file_4, 'wt') as f:
+        pass
+
+    test_file_5 = os.path.join(test_dir_3, 'b-abs.c')
+    with open(test_file_5, 'wt') as f:
+        pass
+
+    test_file_6 = os.path.join(test_dir_3, 'b-rel.c')
+    with open(test_file_6, 'wt') as f:
+        pass
+
+    project_file = os.path.join(test_root, 'test.cppcheck')
+    with open(project_file, 'wt') as f:
+        f.write(
+            """<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <exclude>
+        <path name="./?/"/>
+    </exclude>
+    <paths>
+        <dir name="{}"/>
+        <dir name="a/a-rel.c"/>
+        <dir name="{}"/>
+        <dir name="b/b-rel.c"/>
+        <dir name="{}"/>
+        <dir name="cwd/b/b-rel.c"/>
+    </paths>
+</project>""".format(test_file_1, test_file_3, test_file_5))
+
+    out_lines = [
+        'Checking {} ...'.format(test_file_5),
+        'Checking {} ...'.format(os.path.join("..", "cwd", "b", "b-rel.c")),
+    ]
+
+    args = ['--file-filter={}/*/?/**.c*'.format(test_root), '--project=../test.cppcheck']
+    exitcode, stdout, stderr = cppcheck(args, cwd=test_cwd)
+    stdout_lines = stdout.splitlines()
+    assert 0 == exitcode
+    assert '' == stderr
+    assert 4 == len(stdout_lines)
+    assert set(out_lines) <= set(stdout_lines)
+
+
 def test_project_file_filter_no_match(tmpdir):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
@@ -389,7 +533,7 @@ def test_project_file_filter_no_match(tmpdir):
 
     args = ['--file-filter=*.c', '--project={}'.format(project_file)]
     out_lines = [
-        'cppcheck: error: could not find any files matching the filter.'
+        'cppcheck: error: could not find any files matching the filter:*.c'
     ]
 
     assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
@@ -429,13 +573,13 @@ def test_project_file_order(tmpdir):
     lines = stdout.splitlines()
     assert lines == [
         'Checking {} ...'.format(test_file_c),
-        '1/4 files checked 0% done',
+        '1/4 files checked 25% done',
         'Checking {} ...'.format(test_file_d),
-        '2/4 files checked 0% done',
+        '2/4 files checked 50% done',
         'Checking {} ...'.format(test_file_b),
-        '3/4 files checked 0% done',
+        '3/4 files checked 75% done',
         'Checking {} ...'.format(test_file_a),
-        '4/4 files checked 0% done'
+        '4/4 files checked 100% done'
     ]
     assert stderr == ''
 
@@ -503,16 +647,16 @@ def test_project_file_duplicate_2(tmpdir):
     lines = stdout.splitlines()
     assert lines == [
         'Checking {} ...'.format(test_file_c),
-        '1/3 files checked 0% done',
+        '1/3 files checked 33% done',
         'Checking {} ...'.format(test_file_a),
-        '2/3 files checked 0% done',
+        '2/3 files checked 66% done',
         'Checking {} ...'.format(test_file_b),
-        '3/3 files checked 0% done'
+        '3/3 files checked 100% done'
     ]
     assert stderr == ''
 
 
-def test_project_file_duplicate_3(tmpdir):
+def test_project_file_duplicate_3(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -542,33 +686,18 @@ def test_project_file_duplicate_3(tmpdir):
 </project>""".format(in_file_a, in_file_b, in_file_c, in_file_d, in_file_e, in_file_f, tmpdir))
 
     args = ['--project={}'.format(project_file)]
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
-    if sys.platform == 'win32':
-        assert lines == [
-            'Checking {} ...'.format(test_file_a),
-            '1/3 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '2/3 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '3/3 files checked 0% done'
-        ]
-    else:
-        assert lines == [
-            'Checking {} ...'.format(test_file_a),
-            '1/2 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '2/2 files checked 0% done'
-        ]
+    assert lines == [
+        'Checking {} ...'.format(test_file_a)
+    ]
     assert stderr == ''
 
 
 @pytest.mark.skipif(sys.platform != 'win32', reason="requires Windows")
-def test_project_file_duplicate_4(tmpdir):
+def test_project_file_duplicate_4(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -611,19 +740,12 @@ def test_project_file_duplicate_4(tmpdir):
                      args2[0], args2[1], args2[2], args2[3], args2[4], args2[5], args2[6]))
 
     args = ['--project={}'.format(project_file)]
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
     assert lines == [
-        'Checking {} ...'.format(test_file_a),
-        '1/3 files checked 0% done',
-        'Checking {} ...'.format(test_file_a),
-        '2/3 files checked 0% done',
-        'Checking {} ...'.format(test_file_a),
-        '3/3 files checked 0% done'
+        'Checking {} ...'.format(test_file_a)
     ]
     assert stderr == ''
 
@@ -705,7 +827,6 @@ def test_project_file_ignore_3(tmpdir):
     assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
 
 
-@pytest.mark.xfail(strict=True)
 def test_json_file_ignore(tmpdir):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
@@ -896,4 +1017,60 @@ def test_project_file_nested(tmp_path):
         'cppcheck: error: nested Cppcheck GUI projects are not supported.'
     ]
 
-    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
\ No newline at end of file
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_project_file_no_analyze_all_vs_configs(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt'):
+        pass
+
+    project_path = tmp_path / 'project.cppcheck'
+    with open(project_path, 'wt') as f:
+        f.write(
+"""<project>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+    <paths>
+        <dir name="."/>
+    </paths>
+</project>""")
+
+    ret, stdout, stderr = cppcheck(['--project=' + str(project_path)])
+    assert ret == 0, stdout
+    assert stderr == ''
+
+
+@pytest.mark.parametrize("j,executor", [
+    (1, "thread"),
+    (2, "thread"),
+    (2, "process"),
+])
+def test_project_progress(tmp_path, j, executor):
+    if sys.platform == 'win32' and executor == "process":
+        pytest.skip("process executor not supported on Windows")
+
+    code = 'x = 1;'
+    with open(tmp_path / 'test1.c', 'wt') as f:
+        f.write(code)
+    with open(tmp_path / 'test2.c', 'wt') as f:
+        f.write(code)
+
+    compilation_db = [
+        {"directory": str(tmp_path),
+         "command": "gcc -c test1.c",
+         "file": "test1.c",
+         "output": "test1.o"},
+        {"directory": str(tmp_path),
+         "command": "gcc -c test2.c",
+         "file": "test2.c",
+         "output": "test2.o"},
+    ]
+
+    project_file = tmp_path / 'compile_commands.json'
+
+    with open(project_file, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    _, stdout, _ = cppcheck([f'--project={project_file}', f'-j{j}', f'--executor={executor}'])
+    assert '1/2 files checked 50% done' in stdout
+    assert '2/2 files checked 100% done' in stdout
diff --git a/test/cli/other_test.py b/test/cli/other_test.py
index 0d792b90b98..567b214ede1 100644
--- a/test/cli/other_test.py
+++ b/test/cli/other_test.py
@@ -1,21 +1,23 @@
-
 # python -m pytest test-other.py
 
 import os
 import sys
 import pytest
+import glob
 import json
 import subprocess
+import shutil
 
-from testutils import cppcheck, assert_cppcheck, cppcheck_ex
+from testutils import cppcheck, assert_cppcheck, cppcheck_ex, __lookup_cppcheck_exe, create_compile_commands
 from xml.etree import ElementTree
 
 
-def __remove_std_lookup_log(l : list, exepath):
-    l.remove("looking for library 'std.cfg'")
-    l.remove("looking for library '{}/std.cfg'".format(exepath))
-    l.remove("looking for library '{}/cfg/std.cfg'".format(exepath))
-    return l
+try:
+    # TODO: handle exitcode?
+    subprocess.call(['clang-tidy', '--version'])
+    __has_clang_tidy = True
+except OSError:
+    __has_clang_tidy = False
 
 
 def __remove_verbose_log(l : list):
@@ -30,13 +32,13 @@ def test_missing_include(tmpdir):  # #11283
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt') as f:
         f.write("""
-                #include "test.h"
-                """)
+#include "test.h"
+""")
 
     args = ['--enable=missingInclude', '--template=simple', test_file]
 
     _, _, stderr = cppcheck(args)
-    assert stderr == '{}:2:0: information: Include file: "test.h" not found. [missingInclude]\n'.format(test_file)
+    assert stderr == '{}:2:2: information: Include file: "test.h" not found. [missingInclude]\n'.format(test_file)
 
 
 def __test_missing_include_check_config(tmpdir, use_j):
@@ -174,9 +176,69 @@ def test_progress(tmpdir):
             "progress: Tokenize (typedef) 62%\n"
             "progress: Tokenize (typedef) 75%\n"
             "progress: Tokenize (typedef) 87%\n"
-            "progress: SymbolDatabase 0%\n"
-            "progress: SymbolDatabase 12%\n"
-            "progress: SymbolDatabase 87%\n"
+            "progress: Tokenize (typedef) 100%\n"
+            "progress: SymbolDatabase (find all scopes) 0%\n"
+            "progress: SymbolDatabase (find all scopes) 12%\n"
+            "progress: SymbolDatabase (find all scopes) 87%\n"
+            "progress: SymbolDatabase (find all scopes) 100%\n"
+            "progress: ValueFlow 0%\n"
+            "progress: ValueFlow::valueFlowImpossibleValues(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowImpossibleValues(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSymbolicOperators(symboldatabase, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSymbolicOperators(symboldatabase, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(SymbolicConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(SymbolicConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowSymbolicInfer(symboldatabase, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSymbolicInfer(symboldatabase, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowArrayBool(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowArrayBool(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowArrayElement(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowArrayElement(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowRightShift(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowRightShift(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(ContainerConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(ContainerConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowAfterAssign(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowAfterAssign(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowAfterSwap(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowAfterSwap(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(SimpleConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(SimpleConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowInferCondition(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowInferCondition(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSwitchVariable(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSwitchVariable(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowForLoop(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowForLoop(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowFunctionReturn(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowFunctionReturn(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowLifetime(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowLifetime(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowFunctionDefaultParameter(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowFunctionDefaultParameter(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowUninit(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowUninit(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowAfterMove(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowAfterMove(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowSmartPointer(tokenlist, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSmartPointer(tokenlist, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowIterators(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowIterators(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowCondition(IteratorConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowCondition(IteratorConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowIteratorInfer(tokenlist, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowIteratorInfer(tokenlist, settings) 1 100%\n"
+            "progress: ValueFlow::valueFlowContainerSize(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 0%\n"
+            "progress: ValueFlow::valueFlowContainerSize(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions) 1 100%\n"
+            "progress: ValueFlow::valueFlowSafeFunctions(tokenlist, symboldatabase, errorLogger, settings) 1 0%\n"
+            "progress: ValueFlow::valueFlowSafeFunctions(tokenlist, symboldatabase, errorLogger, settings) 1 100%\n"
+            "progress: ValueFlow 100%\n"
+            "progress: Run checkers 0%\n"
+            "progress: Run checkers 100%\n"
             )
     assert stderr == ""
 
@@ -250,6 +312,35 @@ def test_execute_addon_failure_json_notexist(tmpdir):
     assert stderr == "{}:0:0: error: Bailing out from analysis: Checking file failed: Failed to execute addon 'addon.json' - exitcode is {} [internalError]\n\n^\n".format(test_file, ec)
 
 
+@pytest.mark.skipif(sys.platform != "win32", reason="Windows specific issue")
+def test_execute_addon_path_with_spaces(tmpdir):
+    addon_json = os.path.join(tmpdir, 'addon.json')
+    addon_dir = os.path.join(tmpdir, 'A Folder')
+    addon_script = os.path.join(addon_dir, 'addon.bat')
+
+    with open(addon_json, 'wt') as f:
+        f.write(json.dumps({'executable': addon_script }))
+
+    os.makedirs(addon_dir, exist_ok=True)
+
+    with open(addon_script, 'wt') as f:
+        f.write('@echo {"file":"1.c","linenr":1,"column":1,"severity":"error","message":"hello world","errorId":"hello","addon":"test"}')
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        pass
+
+    args = [
+        '--addon={}'.format(addon_json),
+        test_file,
+    ]
+
+    _, _, stderr = cppcheck(args)
+
+    # Make sure the full command is used
+    assert '1.c:1:1: error: hello world [test-hello]\n' in stderr
+
+
 def test_execute_addon_failure_json_ctu_notexist(tmpdir):
     # specify non-existent python executable so execution of addon fails
     addon_json = os.path.join(tmpdir, 'addon.json')
@@ -338,7 +429,7 @@ def test_addon_misra(tmpdir):
     assert lines == [
         'Checking {} ...'.format(test_file)
     ]
-    assert stderr == '{}:2:1: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]\ntypedef int MISRA_5_6_VIOLATION;\n^\n'.format(test_file)
+    assert stderr == '{}:2:13: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]\ntypedef int MISRA_5_6_VIOLATION;\n            ^\n'.format(test_file)
 
 
 def test_addon_y2038(tmpdir):
@@ -706,7 +797,7 @@ def test_addon_misc(tmpdir):
         f.write("""
 extern void f()
 {
-    char char* [] = {"a" "b"}
+    const char* c[] = {"a" "b"};
 }
         """)
 
@@ -718,7 +809,7 @@ def test_addon_misc(tmpdir):
     assert lines == [
         'Checking {} ...'.format(test_file)
     ]
-    assert stderr == '{}:4:26: style: String concatenation in array initialization, missing comma? [misc-stringConcatInArrayInit]\n'.format(test_file)
+    assert stderr == '{}:4:28: style: String concatenation in array initialization, missing comma? [misc-stringConcatInArrayInit]\n'.format(test_file)
 
 
 def test_invalid_addon_json(tmpdir):
@@ -865,38 +956,204 @@ class A {
     args += extra_args
 
     _, _, stderr = cppcheck(args)
-    assert stderr == "{}:4:0: style: The function 'f' is never used. [unusedFunction]\n".format(test_h_file)
+    assert stderr == "{}:4:26: style: The function 'f' is never used. [unusedFunction]\n".format(test_h_file)
 
 
 def test_unused_function_include(tmpdir):
     __test_unused_function_include(tmpdir, [])
 
 
-# TODO: test with all other types
-def test_showtime_top5_file(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.cpp')
+# TODO: test with multiple files
+def __test_showtime(tmp_path, showtime, exp_res, exp_last, use_compdb=False, use_addons=False, use_clang_tidy=False, extra_args=None):
+    test_file = tmp_path / 'test.cpp'  # the use of C++ is intentional
     with open(test_file, 'wt') as f:
-        f.write("""
-                int main(int argc)
-                {
-                }
-                """)
+        f.write(
+"""
+void f()
+{
+    (void)(*((int*)0)); // cppcheck-suppress nullPointer
+}
+""")
+
+    args = [
+        f'--showtime={showtime}',
+        '--quiet',
+        '--inline-suppr'
+    ]
+
+    if use_addons:
+        args += ['--addon=misra', '--addon=misc']
+
+    if use_clang_tidy:
+        args += ['--clang-tidy']
+        args += ['--suppress=clang-tidy-misc-use-internal-linkage']
+        args += ['--suppress=clang-tidy-google-readability-casting']
+        args += ['--suppress=clang-tidy-modernize-avoid-c-style-cast']
+        args += ['--suppress=clang-tidy-hicpp-use-nullptr']
+        args += ['--suppress=clang-tidy-modernize-use-nullptr']
+
+    if use_compdb:
+        compdb_file = tmp_path / 'compile_commands.json'
+        create_compile_commands(compdb_file, [test_file])
+
+        args.append(f'--project={compdb_file}')
+    else:
+        args.append(str(test_file))
 
-    args = ['--showtime=top5_file', '--quiet', test_file]
+    if extra_args:
+        args += extra_args
 
     exitcode, stdout, stderr = cppcheck(args)
-    assert exitcode == 0  # TODO: needs to be 1
+    assert exitcode == 0
     lines = stdout.splitlines()
-    assert len(lines) == 7
-    assert lines[0] == ''
-    for i in range(1, 5):
-        if lines[i].startswith('valueFlowLifetime'):
-            assert lines[i].endswith(' - 2 result(s))')
-        elif lines[i].startswith('valueFlowEnumValue'):
-            assert lines[i].endswith(' - 2 result(s))')
-        else:
-            assert lines[i].endswith(' result(s))')
-    assert lines[6].startswith('Overall time:')
+    exp_len = exp_res
+    if 'cppcheck internal API usage' in stdout:
+        exp_len += 1
+    if use_addons:
+        exp_len += 1  # TODO: should have individual entries for each addon and whole program analysis
+    # TODO: add entry for clang-tidy analysis
+    exp_len += 1  # last line
+    assert len(lines) == exp_len
+    for i in range(1, exp_res):
+        assert 'avg.' in lines[i]
+    assert lines[exp_len-1].startswith(exp_last)
+    assert not 'avg.' in lines[exp_len-1]
+    assert stderr == ''
+
+
+def __test_showtime_top5_file(tmp_path, use_compdb=False):
+    __test_showtime(tmp_path, 'top5_file', 5, 'Check time: ', use_compdb=use_compdb)
+
+
+def test_showtime_top5_file(tmp_path):
+    __test_showtime_top5_file(tmp_path)
+
+
+def test_showtime_top5_file_compdb(tmp_path):
+    __test_showtime_top5_file(tmp_path, use_compdb=True)
+
+
+def __test_showtime_top5_summary(tmp_path, use_compdb=False):
+    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', use_compdb=use_compdb)
+
+
+def test_showtime_top5_summary(tmp_path):
+    __test_showtime_top5_summary(tmp_path)
+
+
+def test_showtime_top5_summary_compdb(tmp_path):
+    __test_showtime_top5_summary(tmp_path, use_compdb=True)
+
+
+def __test_showtime_file(tmp_path, use_compdb=False, use_addons=False, use_clang_tidy=False):
+    exp_res = 79
+    # project analysis does not call Preprocessor::getConfig()
+    if use_compdb:
+        exp_res -= 1
+    __test_showtime(tmp_path, 'file', exp_res, 'Check time: ', use_compdb=use_compdb, use_addons=use_addons, use_clang_tidy=use_clang_tidy)
+
+
+def test_showtime_file(tmp_path):
+    __test_showtime_file(tmp_path)
+
+
+def test_showtime_file_compdb(tmp_path):
+    __test_showtime_file(tmp_path, use_compdb=True)
+
+
+def test_showtime_file_addon(tmp_path):
+    __test_showtime_file(tmp_path, use_addons=True)
+
+
+def test_showtime_file_addon_compdb(tmp_path):
+    __test_showtime_file(tmp_path, use_addons=True, use_compdb=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_file_clang_tidy(tmp_path):
+    __test_showtime_file(tmp_path, use_clang_tidy=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_file_clang_tidy_compdb(tmp_path):
+    __test_showtime_file(tmp_path, use_clang_tidy=True, use_compdb=True)
+
+
+def __test_showtime_summary(tmp_path, use_compdb=False, use_addons=False, use_clang_tidy=False):
+    exp_res = 79
+    # project analysis does not call Preprocessor::getConfig()
+    if use_compdb:
+        exp_res -= 1
+    __test_showtime(tmp_path, 'summary', exp_res, 'Overall time: ', use_compdb=use_compdb, use_addons=use_addons, use_clang_tidy=use_clang_tidy)
+
+
+def test_showtime_summary(tmp_path):
+    __test_showtime_summary(tmp_path)
+
+
+def test_showtime_summary_compdb(tmp_path):
+    __test_showtime_summary(tmp_path, use_compdb=True)
+
+
+def test_showtime_summary_addon(tmp_path):
+    __test_showtime_summary(tmp_path, use_addons=True)
+
+
+def test_showtime_summary_addon_compdb(tmp_path):
+    __test_showtime_summary(tmp_path, use_addons=True, use_compdb=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_summary_clang_tidy(tmp_path):
+    __test_showtime_summary(tmp_path, use_clang_tidy=True)
+
+
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
+def test_showtime_summary_clang_tidy_compdb(tmp_path):
+    __test_showtime_summary(tmp_path, use_clang_tidy=True, use_compdb=True)
+
+
+def __test_showtime_file_total(tmp_path, use_compdb=False):
+    __test_showtime(tmp_path, 'file-total', 0, 'Check time: ', use_compdb=use_compdb)
+
+
+def test_showtime_file_total(tmp_path):
+    __test_showtime_file_total(tmp_path)
+
+
+def test_showtime_file_total_compdb(tmp_path):
+    __test_showtime_file_total(tmp_path, True)
+
+
+def test_showtime_unique(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+void f()
+{
+    (void)(*((int*)0)); // cppcheck-suppress nullPointer
+}
+""")
+
+    args = [
+        '--showtime=summary',
+        '--quiet',
+        '--inline-suppr',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    multi_res = []
+    for line in stdout.splitlines():
+        # TODO: remove when we no longer emit empty line
+        if not line:
+            continue
+        if any(i in line for i in ['1 result(s)', 'Overall time:']):
+            continue
+        multi_res.append(line)
+    assert multi_res == []
     assert stderr == ''
 
 
@@ -966,7 +1223,7 @@ def test_file_filter_no_match(tmpdir):
 
     args = ['--file-filter=*.c', test_file]
     out_lines = [
-        'cppcheck: error: could not find any files matching the filter.'
+        'cppcheck: error: could not find any files matching the filter:*.c'
     ]
 
     assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
@@ -993,13 +1250,13 @@ def test_file_order(tmpdir):
     lines = stdout.splitlines()
     assert lines == [
         'Checking {} ...'.format(test_file_c),
-        '1/4 files checked 0% done',
+        '1/4 files checked 25% done',
         'Checking {} ...'.format(test_file_d),
-        '2/4 files checked 0% done',
+        '2/4 files checked 50% done',
         'Checking {} ...'.format(test_file_b),
-        '3/4 files checked 0% done',
+        '3/4 files checked 75% done',
         'Checking {} ...'.format(test_file_a),
-        '4/4 files checked 0% done'
+        '4/4 files checked 100% done'
     ]
     assert stderr == ''
 
@@ -1021,13 +1278,13 @@ def test_markup(tmpdir):
     args = ['--library=qt', test_file_1, test_file_2, test_file_3, test_file_4, '-j1']
     out_lines = [
         'Checking {} ...'.format(test_file_2),
-        '1/4 files checked 0% done',
+        '1/4 files checked 25% done',
         'Checking {} ...'.format(test_file_4),
-        '2/4 files checked 0% done',
+        '2/4 files checked 50% done',
         'Checking {} ...'.format(test_file_1),
-        '3/4 files checked 0% done',
+        '3/4 files checked 75% done',
         'Checking {} ...'.format(test_file_3),
-        '4/4 files checked 0% done'
+        '4/4 files checked 100% done'
     ]
 
     assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
@@ -1052,23 +1309,17 @@ def test_markup_j(tmpdir):
     exitcode, stdout, stderr = cppcheck(args)
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
-    for i in range(1, 5):
-        lines.remove('{}/4 files checked 0% done'.format(i))
-
-    # this test started to fail in the -j2 injection run when using ThreadExecutor although it always specifies -j2.
-    # the order of the files in the output changed so just check for the file extentions
-    assert len(lines) == 4
-    assert lines[0].endswith('.cpp ...')
-    assert lines[1].endswith('.cpp ...')
-    assert lines[2].endswith('.qml ...')
-    assert lines[3].endswith('.qml ...')
-
-    #assert lines == [
-    #    'Checking {} ...'.format(test_file_2),
-    #    'Checking {} ...'.format(test_file_4),
-    #    'Checking {} ...'.format(test_file_1),
-    #    'Checking {} ...'.format(test_file_3)
-    #]
+
+    assert sorted(lines) == [
+        '1/4 files checked 25% done',
+        '2/4 files checked 50% done',
+        '3/4 files checked 75% done',
+        '4/4 files checked 100% done',
+        'Checking {} ...'.format(test_file_1),
+        'Checking {} ...'.format(test_file_2),
+        'Checking {} ...'.format(test_file_3),
+        'Checking {} ...'.format(test_file_4)
+    ]
     assert stderr == ''
 
 
@@ -1110,10 +1361,9 @@ def test_valueflow_debug(tmpdir):
     assert exitcode == 0, stdout if stdout else stderr
     if sys.platform == "win32":
         stdout = stdout.replace('/', '\\')
-    assert stdout == '''Checking {} ...
-
-
-##file {}
+    assert f'Checking {test_file_cpp} ...' in stdout
+    stdout = stdout.replace(f'Checking {test_file_cpp} ...\n', '').strip()
+    assert stdout == '''##file {}
 2: void f2 ( )
 3: {{
 4: int i@var1 ; i@var1 = 0 ;
@@ -1152,8 +1402,8 @@ def test_valueflow_debug(tmpdir):
 File {}
 Line 6
   = always 0
-  0 always 0
-'''.format(test_file_cpp, test_file_h_2, test_file_h, test_file_cpp, test_file_h_2, test_file_h, test_file_cpp)
+  0 always 0'''.format(test_file_h_2, test_file_h, test_file_cpp,
+                       test_file_h_2, test_file_h, test_file_cpp)
     assert stderr == ''
 
 
@@ -1191,16 +1441,16 @@ def test_file_duplicate_2(tmpdir):
     lines = stdout.splitlines()
     assert lines == [
         'Checking {} ...'.format(test_file_c),
-        '1/3 files checked 0% done',
+        '1/3 files checked 33% done',
         'Checking {} ...'.format(test_file_a),
-        '2/3 files checked 0% done',
+        '2/3 files checked 66% done',
         'Checking {} ...'.format(test_file_b),
-        '3/3 files checked 0% done'
+        '3/3 files checked 100% done'
     ]
     assert stderr == ''
 
 
-def test_file_duplicate_3(tmpdir):
+def test_file_duplicate_3(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -1214,43 +1464,18 @@ def test_file_duplicate_3(tmpdir):
     in_file_f = os.path.join(tmpdir, 'dummy', '..', 'a.c')
 
     args = [in_file_a, in_file_b, in_file_c, in_file_d, in_file_e, in_file_f, str(tmpdir)]
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
-    if sys.platform == 'win32':
-        assert lines == [
-            'Checking {} ...'.format('a.c'),
-            '1/6 files checked 0% done',
-            'Checking {} ...'.format('a.c'),
-            '2/6 files checked 0% done',
-            'Checking {} ...'.format('a.c'),
-            '3/6 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '4/6 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '5/6 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '6/6 files checked 0% done'
-        ]
-    else:
-        assert lines == [
-            'Checking {} ...'.format('a.c'),
-            '1/4 files checked 0% done',
-            'Checking {} ...'.format('a.c'),
-            '2/4 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '3/4 files checked 0% done',
-            'Checking {} ...'.format(test_file_a),
-            '4/4 files checked 0% done'
-        ]
+    assert lines == [
+        'Checking {} ...'.format('a.c')
+    ]
     assert stderr == ''
 
 
 @pytest.mark.skipif(sys.platform != 'win32', reason="requires Windows")
-def test_file_duplicate_4(tmpdir):
+def test_file_duplicate_4(tmpdir):  # #12834
     test_file_a = os.path.join(tmpdir, 'a.c')
     with open(test_file_a, 'wt'):
         pass
@@ -1268,25 +1493,12 @@ def test_file_duplicate_4(tmpdir):
     for a in args1:
         args2.append(a.replace('\\', '/'))
     args = args1 + args2
-    args.append('-j1') # TODO: remove when fixed
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 0, stdout if stdout else stderr
     lines = stdout.splitlines()
-    # TODO: only a single file should be checked
     assert lines == [
-        'Checking {} ...'.format('a.c'),
-        '1/6 files checked 0% done',
-        'Checking {} ...'.format('a.c'),
-        '2/6 files checked 0% done',
-        'Checking {} ...'.format('a.c'),
-        '3/6 files checked 0% done',
-        'Checking {} ...'.format(test_file_a),
-        '4/6 files checked 0% done',
-        'Checking {} ...'.format(test_file_a),
-        '5/6 files checked 0% done',
-        'Checking {} ...'.format(test_file_a),
-        '6/6 files checked 0% done'
+        'Checking {} ...'.format('a.c')
     ]
     assert stderr == ''
 
@@ -1554,6 +1766,27 @@ def test_rule(tmpdir):
     ]
 
 
+def test_rule_multiple_files(tmpdir):
+    stderr_exp = []
+    for i in range(10):
+        test_file = os.path.join(tmpdir, f'test_{i}.c')
+        stderr_exp.append("{}:4:0: style: found 'f' [rule]".format(test_file))
+        with open(test_file, 'wt') as f:
+            f.write('''
+#define DEF_1
+#define DEF_2
+void f() { }
+''')
+
+    exitcode, stdout, stderr = cppcheck(['-q', '--template=simple', '--rule=f', str(tmpdir)])
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stdout.splitlines() == []
+    lines = stderr.splitlines()
+    lines.sort()
+    stderr_exp.sort()
+    assert lines == stderr_exp
+
+
 def test_filelist(tmpdir):
     list_dir = os.path.join(tmpdir, 'list-dir')
     os.mkdir(list_dir)
@@ -1620,7 +1853,7 @@ def test_filelist(tmpdir):
     ]
     assert len(expected), len(lines)
     for i in range(1, len(expected)+1):
-        lines.remove('{}/{} files checked 0% done'.format(i, len(expected)))
+        lines.remove('{}/{} files checked {}% done'.format(i, len(expected), int(100 * i // len(expected))))
     assert lines == expected
 
 
@@ -1679,380 +1912,100 @@ def test_cpp_probe_2(tmpdir):
     assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=[])
 
 
-# TODO: test with FILESDIR
-def test_lib_lookup(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=gnu', test_file])
-    exepath = os.path.dirname(exe)
+def test_config_invalid(tmpdir):
+    # cppcheck.cfg needs to be next to executable
+    exe = shutil.copy2(__lookup_cppcheck_exe(), tmpdir)
     if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
-    assert exitcode == 0, stdout if stdout else stderr
-    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
-    assert lines == [
-        "looking for library 'gnu'",
-        "looking for library 'gnu.cfg'",
-        "looking for library '{}/gnu.cfg'".format(exepath),
-        "looking for library '{}/cfg/gnu.cfg'".format(exepath),
-        'Checking {} ...'.format(test_file)
-    ]
-
+        shutil.copy2(os.path.join(os.path.dirname(__lookup_cppcheck_exe()), 'cppcheck-core.dll'), tmpdir)
+    shutil.copytree(os.path.join(os.path.dirname(__lookup_cppcheck_exe()), 'cfg'), os.path.join(tmpdir, 'cfg'))
 
-# TODO: test with FILESDIR
-def test_lib_lookup_notfound(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
         pass
 
-    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library=none', test_file])
-    exepath = os.path.dirname(exe)
-    if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
-    assert exitcode == 1, stdout
-    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
-    assert lines == [
-        # TODO: specify which folder is actually used for lookup here
-        "looking for library 'none'",  # TODO: this could conflict with the platform lookup
-        "looking for library 'none.cfg'",
-        # TODO: lookup of '{exepath}/none' missing - could conflict with the platform lookup though
-        "looking for library '{}/none.cfg'".format(exepath),
-        # TODO: lookup of '{exepath}/cfg/none' missing
-        "looking for library '{}/cfg/none.cfg'".format(exepath),
-        "library not found: 'none'",
-        "cppcheck: Failed to load library configuration file 'none'. File not found"
-    ]
-
-
-def test_lib_lookup_absolute(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
+    config_file = os.path.join(tmpdir, 'cppcheck.cfg')
+    with open(config_file, 'wt'):
         pass
 
-    cfg_file = os.path.join(tmpdir, 'test.cfg')
-    with open(cfg_file, 'wt') as f:
-        f.write('''
-<?xml version="1.0"?>
-<def format="2">
-</def>
-        ''')
-
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file), test_file])
-    exepath = os.path.dirname(exe)
-    if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
-    assert exitcode == 0, stdout if stdout else stderr
-    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
-    assert lines == [
-        "looking for library '{}'".format(cfg_file),
-        'Checking {} ...'.format(test_file)
+    exitcode, stdout, stderr, exe = cppcheck_ex([test_file], cwd=tmpdir, cppcheck_exe=exe)
+    assert exitcode == 1, stdout if stdout else stderr
+    assert stdout.splitlines() == [
+        'cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 1 near: '
     ]
 
 
-def test_lib_lookup_absolute_notfound(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    cfg_file = os.path.join(tmpdir, 'test.cfg')
-
-    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=library', '--library={}'.format(cfg_file), test_file])
-    exepath = os.path.dirname(exe)
+def test_config_override(tmpdir):
+    # cppcheck.cfg needs to be next to executable
+    exe = shutil.copy2(__lookup_cppcheck_exe(), tmpdir)
     if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
-    assert exitcode == 1, stdout
-    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
-    assert lines == [
-        "looking for library '{}'".format(cfg_file),
-        "library not found: '{}'".format(cfg_file),
-        "cppcheck: Failed to load library configuration file '{}'. File not found".format(cfg_file)
-    ]
+        shutil.copy2(os.path.join(os.path.dirname(__lookup_cppcheck_exe()), 'cppcheck-core.dll'), tmpdir)
+    shutil.copytree(os.path.join(os.path.dirname(__lookup_cppcheck_exe()), 'cfg'), os.path.join(tmpdir, 'cfg'))
 
-
-def test_lib_lookup_nofile(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):
         pass
 
-    # make sure we do not produce an error when the attempted lookup path is a directory and not a file
-    gtk_dir = os.path.join(tmpdir, 'gtk')
-    os.mkdir(gtk_dir)
-    gtk_cfg_dir = os.path.join(tmpdir, 'gtk.cfg')
-    os.mkdir(gtk_cfg_dir)
+    config_file = os.path.join(tmpdir, 'cppcheck.cfg')
+    with open(config_file, 'wt') as f:
+        f.write(json.dumps({
+            'safety': False
+        }))
 
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=gtk', test_file], cwd=tmpdir)
-    exepath = os.path.dirname(exe)
-    if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
+    exitcode, stdout, stderr, exe = cppcheck_ex(['-q', '--safety', test_file], cwd=tmpdir, cppcheck_exe=exe, remove_checkers_report=False)
     assert exitcode == 0, stdout if stdout else stderr
-    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
-    assert lines == [
-        "looking for library 'gtk'",
-        "looking for library 'gtk.cfg'",
-        "looking for library '{}/gtk.cfg'".format(exepath),
-        "looking for library '{}/cfg/gtk.cfg'".format(exepath),
-        'Checking {} ...'.format(test_file)
-    ]
+    assert stdout.splitlines() == []
+    assert 'checkersReport' in stderr
 
 
-def test_lib_lookup_multi(tmpdir):
+def test_checkers_report(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=library', '--library=posix,gnu', test_file])
-    exepath = os.path.dirname(exe)
-    if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
+    with open(test_file, 'wt') as f:
+        f.write('x=1;')
+    checkers_report = os.path.join(tmpdir, 'r.txt')
+    exitcode, stdout, stderr = cppcheck(['--enable=all', '--checkers-report=' + checkers_report, test_file], remove_checkers_report=False)
     assert exitcode == 0, stdout if stdout else stderr
-    lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
-    assert lines == [
-        "looking for library 'posix'",
-        "looking for library 'posix.cfg'",
-        "looking for library '{}/posix.cfg'".format(exepath),
-        "looking for library '{}/cfg/posix.cfg'".format(exepath),
-        "looking for library 'gnu'",
-        "looking for library 'gnu.cfg'",
-        "looking for library '{}/gnu.cfg'".format(exepath),
-        "looking for library '{}/cfg/gnu.cfg'".format(exepath),
-        'Checking {} ...'.format(test_file)
-    ]
+    assert 'Active checkers:' in stderr
+    assert '--checkers-report' not in stderr
 
 
-def test_platform_lookup_builtin(tmpdir):
+def test_checkers_report_misra_json(tmpdir):
+    """check that misra checkers are reported properly when --addon=misra.json is used"""
     test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, stderr = cppcheck(['--debug-lookup=platform', '--platform=unix64', test_file])
+    with open(test_file, 'wt') as f:
+        f.write('x=1;')
+    misra_json = os.path.join(tmpdir, 'misra.json')
+    with open(misra_json, 'wt') as f:
+        f.write('{"script":"misra.py"}')
+    exitcode, stdout, stderr = cppcheck('--enable=style --addon=misra.json --xml-version=3 test.c'.split(), cwd=tmpdir)
     assert exitcode == 0, stdout if stdout else stderr
-    lines = stdout.splitlines()
-    # built-in platform are not being looked up
-    assert lines == [
-        'Checking {} ...'.format(test_file)
-    ]
+    assert '<checker id="Misra C 2012: 8.1"/>' in stderr
 
 
-# TODO: behaves differently when using a CMake build
-# TODO: test with FILESDIR
-@pytest.mark.skip
-def test_platform_lookup_external(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
+def __test_ignore_file(tmpdir, ign, append=False, inject_path=False):
+    os.mkdir(os.path.join(tmpdir, 'src'))
+    test_file = os.path.join(tmpdir, 'src', 'test.cpp')
     with open(test_file, 'wt'):
         pass
 
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=avr8', test_file])
-    exepath = os.path.dirname(exe)
-    if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
-    assert exitcode == 0, stdout if stdout else stderr
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for platform 'avr8' in '{}'".format(os.path.join(exepath, 'cppcheck')),  # TODO: this not not the path *of* the executable but the the path *to* the executable
-        "try to load platform file 'avr8' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename=avr8",
-        "try to load platform file 'avr8.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename=avr8.xml",
-        "try to load platform file 'platforms/avr8' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename=platforms/avr8",
-        "try to load platform file 'platforms/avr8.xml' ... Success",
-        'Checking {} ...'.format(test_file)
+    # TODO: this should say that all paths are ignored
+    lines_exp = [
+        'ignored path: {}'.format(test_file),
+        'cppcheck: error: could not find or open any of the paths given.',
+        'cppcheck: Maybe all paths were ignored?'
     ]
 
-
-# TODO: test with FILESDIR
-def test_platform_lookup_external_notfound(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=platform', '--platform=none', test_file])
-    exepath = os.path.dirname(exe)
-    exepath_bin = os.path.join(exepath, 'cppcheck')
-    if sys.platform == 'win32':
-        exepath = exepath.replace('\\', '/')
-        exepath_bin += '.exe'
-    assert exitcode == 1, stdout
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for platform 'none' in '{}'".format(exepath_bin),  # TODO: this is not the path *of* the executable but the the path *to* the executable
-        "try to load platform file 'none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename=none",
-        "try to load platform file 'none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename=none.xml",
-        "try to load platform file 'platforms/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename=platforms/none",
-        "try to load platform file 'platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename=platforms/none.xml",
-        "try to load platform file '{}/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/none".format(exepath, exepath),
-        # TODO: lookup of '{exepath}/none.xml' missing
-        "try to load platform file '{}/platforms/none' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none".format(exepath, exepath),
-        "try to load platform file '{}/platforms/none.xml' ... Error=XML_ERROR_FILE_NOT_FOUND ErrorID=3 (0x3) Line number=0: filename={}/platforms/none.xml".format(exepath, exepath),
-        "cppcheck: error: unrecognized platform: 'none'."
+    args = [
+        '--debug-ignore',
+        test_file
     ]
 
+    if inject_path:
+        ign = ign.replace('$path', str(test_file))
 
-# TODO: test with FILESDIR
-def test_addon_lookup(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra', test_file])
-    exepath = os.path.dirname(exe)
-    exepath_sep = exepath + os.path.sep
-    assert exitcode == 0, stdout if stdout else stderr
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for addon 'misra.py'",
-        "looking for addon '{}misra.py'".format(exepath_sep),
-        "looking for addon '{}addons/misra.py'".format(exepath_sep),  # TODO: mixed separators
-        'Checking {} ...'.format(test_file)
-    ]
-
-
-# TODO: test with FILESDIR
-def test_addon_lookup_ext(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=misra.py', test_file])
-    exepath = os.path.dirname(exe)
-    exepath_sep = exepath + os.path.sep
-    assert exitcode == 0, stdout if stdout else stderr
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for addon 'misra.py'",
-        "looking for addon '{}misra.py'".format(exepath_sep),
-        "looking for addon '{}addons/misra.py'".format(exepath_sep),  # TODO: mixed separators
-        'Checking {} ...'.format(test_file)
-    ]
-
-
-# TODO: test with FILESDIR
-def test_addon_lookup_notfound(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none', test_file])
-    exepath = os.path.dirname(exe)
-    exepath_sep = exepath + os.path.sep
-    assert exitcode == 1, stdout
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for addon 'none.py'",
-        "looking for addon '{}none.py'".format(exepath_sep),
-        "looking for addon '{}addons/none.py'".format(exepath_sep),  # TODO: mixed separators
-        'Did not find addon none.py'
-    ]
-
-
-# TODO: test with FILESDIR
-def test_addon_lookup_ext_notfound(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, _, exe = cppcheck_ex(['--debug-lookup=addon', '--addon=none.py', test_file])
-    exepath = os.path.dirname(exe)
-    exepath_sep = exepath + os.path.sep
-    assert exitcode == 1, stdout
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for addon 'none.py'",
-        "looking for addon '{}none.py'".format(exepath_sep),
-        "looking for addon '{}addons/none.py'".format(exepath_sep),  # TODO: mixed separators
-        'Did not find addon none.py'
-    ]
-
-
-# TODO: test with FILESDIR
-@pytest.mark.skip
-def test_config_lookup(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    # TODO: needs to be in exepath so this is found
-    config_file = os.path.join(tmpdir, 'cppcheck.cfg')
-    with open(config_file, 'wt'):
-        pass
-
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=config', '--addon=misra', test_file], cwd=tmpdir)
-    exepath = os.path.dirname(exe)
-    exepath_sep = exepath + os.path.sep
-    assert exitcode == 0, stdout if stdout else stderr
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for '{}cppcheck.cfg'".format(exepath_sep),
-        'no configuration found',
-        'Checking {} ...'.format(test_file)
-    ]
-
-
-# TODO: test with FILESDIR
-def test_config_lookup_notfound(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt'):
-        pass
-
-    exitcode, stdout, stderr, exe = cppcheck_ex(['--debug-lookup=config', test_file])
-    exepath = os.path.dirname(exe)
-    exepath_sep = exepath + os.path.sep
-    assert exitcode == 0, stdout if stdout else stderr
-    lines = stdout.splitlines()
-    assert lines == [
-        "looking for '{}cppcheck.cfg'".format(exepath_sep),
-        'no configuration found',
-        'Checking {} ...'.format(test_file)
-    ]
-
-
-def test_checkers_report(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt') as f:
-        f.write('x=1;')
-    checkers_report = os.path.join(tmpdir, 'r.txt')
-    exitcode, stdout, stderr = cppcheck(['--enable=all', '--checkers-report=' + checkers_report, test_file], remove_checkers_report=False)
-    assert exitcode == 0, stdout if stdout else stderr
-    assert 'Active checkers:' in stderr
-    assert '--checkers-report' not in stderr
-
-
-def test_checkers_report_misra_json(tmpdir):
-    """check that misra checkers are reported properly when --addon=misra.json is used"""
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt') as f:
-        f.write('x=1;')
-    misra_json = os.path.join(tmpdir, 'misra.json')
-    with open(misra_json, 'wt') as f:
-        f.write('{"script":"misra.py"}')
-    exitcode, stdout, stderr = cppcheck('--enable=style --addon=misra.json --xml-version=3 test.c'.split(), cwd=tmpdir)
-    assert exitcode == 0, stdout if stdout else stderr
-    assert '<checker id="Misra C 2012: 8.1"/>' in stderr
-
-
-def __test_ignore_file(tmpdir, ign, append=False, inject_path=False):
-    os.mkdir(os.path.join(tmpdir, 'src'))
-    test_file = os.path.join(tmpdir, 'src', 'test.cpp')
-    with open(test_file, 'wt'):
-        pass
-
-    # TODO: this should say that all paths are ignored
-    lines_exp = [
-        'ignored path: {}'.format(test_file),
-        'cppcheck: error: could not find or open any of the paths given.',
-        'cppcheck: Maybe all paths were ignored?'
-    ]
-
-    args = [
-        '--debug-ignore',
-        test_file
-    ]
-
-    if inject_path:
-        ign = ign.replace('$path', str(test_file))
-
-    if append:
-        args += ['-i{}'.format(ign)]
-    else:
-        args = ['-i{}'.format(ign)] + args
+    if append:
+        args += ['-i{}'.format(ign)]
+    else:
+        args = ['-i{}'.format(ign)] + args
 
     exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
     assert exitcode == 1, stdout if stdout else stderr
@@ -2067,17 +2020,14 @@ def test_ignore_file_append(tmpdir):
     __test_ignore_file(tmpdir, 'test.cpp', append=True)
 
 
-@pytest.mark.xfail(strict=True)  # TODO: glob syntax is not supported?
 def test_ignore_file_wildcard_back(tmpdir):
     __test_ignore_file(tmpdir, 'test.c*')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: glob syntax is not supported?
 def test_ignore_file_wildcard_front(tmpdir):
     __test_ignore_file(tmpdir, '*test.cpp')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: glob syntax is not supported?
 def test_ignore_file_placeholder(tmpdir):
     __test_ignore_file(tmpdir, 't?st.cpp')
 
@@ -2090,12 +2040,10 @@ def test_ignore_file_relative_backslash(tmpdir):
     __test_ignore_file(tmpdir, 'src\\test.cpp')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: glob syntax is not supported?
 def test_ignore_file_relative_wildcard(tmpdir):
     __test_ignore_file(tmpdir, 'src/test.c*')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: glob syntax is not supported?
 def test_ignore_file_relative_wildcard_backslash(tmpdir):
     __test_ignore_file(tmpdir, 'src\\test.c*')
 
@@ -2108,12 +2056,10 @@ def test_ignore_path_relative_backslash(tmpdir):
     __test_ignore_file(tmpdir, 'src\\')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: glob syntax is not supported?
 def test_ignore_path_relative_wildcard(tmpdir):
     __test_ignore_file(tmpdir, 'src*/')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: glob syntax is not supported?
 def test_ignore_path_relative_wildcard_backslash(tmpdir):
     __test_ignore_file(tmpdir, 'src*\\')
 
@@ -2183,17 +2129,14 @@ def test_ignore_project_file_cli_append(tmpdir):
     __test_ignore_project(tmpdir, ign_proj='test2.cpp', ign_cli='test.cpp', append_cli=True)
 
 
-@pytest.mark.xfail(strict=True)  # TODO: ?
 def test_ignore_project_file_wildcard_back(tmpdir):
     __test_ignore_project(tmpdir, 'test.c*')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: ?
 def test_ignore_project_file_wildcard_front(tmpdir):
     __test_ignore_project(tmpdir, '*test.cpp')
 
 
-@pytest.mark.xfail(strict=True)  # TODO: ?
 def test_ignore_project_file_placeholder(tmpdir):
     __test_ignore_project(tmpdir, 't?st.cpp')
 
@@ -2262,18 +2205,15 @@ def __test_ignore_project_2(tmpdir, extra_args, append=False, inject_path=False)
     assert stdout.splitlines() == lines_exp
 
 
-@pytest.mark.xfail(strict=True)  # TODO: -i appears to be ignored
 def test_ignore_project_2_file(tmpdir):
     __test_ignore_project_2(tmpdir, ['-itest.cpp'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: -i appears to be ignored
 def test_ignore_project_2_file_append(tmpdir):
     # make sure it also matches when specified after project
     __test_ignore_project_2(tmpdir, ['-itest.cpp'], append=True)
 
 
-@pytest.mark.xfail(strict=True)  # TODO: PathMatch lacks wildcard support / -i appears to be ignored
 def test_ignore_project_2_file_wildcard_back(tmpdir):
     __test_ignore_project_2(tmpdir, ['-itest.c*'])
 
@@ -2282,27 +2222,22 @@ def test_ignore_project_2_file_wildcard_front(tmpdir):
     __test_ignore_project_2(tmpdir, ['-i*test.cpp'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: PathMatch lacks wildcard support / -i appears to be ignored
 def test_ignore_project_2_file_placeholder(tmpdir):
     __test_ignore_project_2(tmpdir, ['-it?st.cpp'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: -i appears to be ignored
 def test_ignore_project_2_file_relative(tmpdir):
     __test_ignore_project_2(tmpdir, ['-isrc/test.cpp'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: -i appears to be ignored
 def test_ignore_project_2_file_relative_backslash(tmpdir):
     __test_ignore_project_2(tmpdir, ['-isrc\\test.cpp'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: PathMatch lacks wildcard support / -i appears to be ignored
 def test_ignore_project_2_file_relative_wildcard(tmpdir):
     __test_ignore_project_2(tmpdir, ['-isrc/test.c*'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: PathMatch lacks wildcard support / -i appears to be ignored
 def test_ignore_project_2_file_relative_wildcard_backslash(tmpdir):
     __test_ignore_project_2(tmpdir, ['-isrc\\test.c*'])
 
@@ -2315,12 +2250,10 @@ def test_ignore_project_2_path_relative_backslash(tmpdir):
     __test_ignore_project_2(tmpdir, ['-isrc\\'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: PathMatch lacks wildcard support
 def test_ignore_project_2_path_relative_wildcard(tmpdir):
     __test_ignore_project_2(tmpdir, ['-isrc*/'])
 
 
-@pytest.mark.xfail(strict=True)  # TODO: PathMatch lacks wildcard support
 def test_ignore_project_2_path_relative_wildcard_backslash(tmpdir):
     __test_ignore_project_2(tmpdir, ['-isrc*\\'])
 
@@ -2361,6 +2294,17 @@ def test_builddir_hash_check_level(tmp_path):  # #13376
     build_dir = tmp_path / 'b1'
     os.mkdir(build_dir)
 
+    args = [ # // #14029
+        '--enable=warning',  # to execute the code which generates the normalCheckLevelMaxBranches message
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--template=simple',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stderr == ''
+
     args = [
         '--enable=warning',  # to execute the code which generates the normalCheckLevelMaxBranches message
         '--enable=information',  # to show the normalCheckLevelMaxBranches message
@@ -2376,7 +2320,7 @@ def test_builddir_hash_check_level(tmp_path):  # #13376
     cache_file = (build_dir / 'test.a1')
 
     root = ElementTree.fromstring(cache_file.read_text())
-    hash_1 = root.get('hash')
+    hash_1 = root.findtext('hash')
 
     args += ['--check-level=exhaustive']
 
@@ -2385,7 +2329,7 @@ def test_builddir_hash_check_level(tmp_path):  # #13376
     assert stderr == ''
 
     root = ElementTree.fromstring(cache_file.read_text())
-    hash_2 = root.get('hash')
+    hash_2 = root.findtext('hash')
 
     assert hash_1 != hash_2
 
@@ -2397,7 +2341,7 @@ def test_def_undef(tmp_path):
 void f()
 {
 #ifndef DEF_1
-    {int i = *((int*)0);}
+    (void)(*((int*)0));
 #endif
 }
 """)
@@ -2415,7 +2359,7 @@ def test_def_undef(tmp_path):
         'Checking {}: DEF_1=1...'.format(test_file)  # TODO: should not print DEF_1 - see #13335
     ]
     assert stderr.splitlines() == [
-        '{}:5:16: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:5:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
 
 
@@ -2427,10 +2371,10 @@ def test_def_def(tmp_path):  # #13334
 void f()
 {
 #if DEF_1 == 3
-    {int i = *((int*)0);}
+    (void)(*((int*)0));
 #endif
 #if DEF_1 == 7
-    {int i = *((int*)0);}
+    (void)(*((int*)0));
 #endif
 }
 """)
@@ -2448,7 +2392,7 @@ def test_def_def(tmp_path):  # #13334
         'Checking {}: DEF_1=3;DEF_1=7...'.format(test_file)  # TODO: should not print DEF_1 twice - see #13335
     ]
     assert stderr.splitlines() == [
-        '{}:8:16: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:8:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
 
 
@@ -2460,7 +2404,7 @@ def test_def_undef_def(tmp_path):  # #13334
 void f()
 {
 #ifdef DEF_1
-    {int i = *((int*)0);}
+    (void)(*((int*)0));
 #endif
 }
 """)
@@ -2479,7 +2423,7 @@ def test_def_undef_def(tmp_path):  # #13334
         'Checking {}: DEF_1=1;DEF_1=1...'.format(test_file)  # TODO: should not print DEF_1 twice - see #13335
     ]
     assert stderr.splitlines() == [
-        '{}:5:16: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:5:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
 
 
@@ -2490,7 +2434,7 @@ def test_undef(tmp_path):
 void f()
 {
 #ifndef DEF_1
-    {int i = *((int*)0);}
+    (void)(*((int*)0));
 #endif
 }
 """)
@@ -2506,7 +2450,7 @@ def test_undef(tmp_path):
         'Checking {} ...'.format(test_file)
     ]
     assert stderr.splitlines() == [
-        '{}:5:16: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:5:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
 
 
@@ -2520,7 +2464,7 @@ def test_undef_src(tmp_path):  # #13340
 void f()
 {
 #ifdef DEF_1
-    {int i = *((int*)0);}
+    (void)(*((int*)0));
 #endif
 }
 """)
@@ -2536,7 +2480,7 @@ def test_undef_src(tmp_path):  # #13340
         'Checking {} ...'.format(test_file)
     ]
     assert stderr.splitlines() == [
-        '{}:7:16: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:7:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
 
 
@@ -2587,7 +2531,7 @@ def __test_inline_suppr(tmp_path, extra_args):  # #13087
     assert exitcode == 0, stdout
     assert stdout == ''
     assert stderr.splitlines() == [
-        '{}:4:0: information: Unmatched suppression: memleak [unmatchedSuppression]'.format(test_file)
+        '{}:4:1: information: Unmatched suppression: memleak [unmatchedSuppression]'.format(test_file)
     ]
 
 
@@ -2605,8 +2549,6 @@ def test_inline_suppr_builddir(tmp_path):
     __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
 
 
-# TODO: the suppressions are generated outside of the scope which captures the analysis information
-@pytest.mark.xfail(strict=True)
 def test_inline_suppr_builddir_cached(tmp_path):
     build_dir = tmp_path / 'b1'
     os.mkdir(build_dir)
@@ -2620,8 +2562,6 @@ def test_inline_suppr_builddir_j(tmp_path):
     __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
 
 
-# TODO: the suppressions are generated outside of the scope which captures the analysis information
-@pytest.mark.xfail(strict=True)
 def test_inline_suppr_builddir_j_cached(tmp_path):
     build_dir = tmp_path / 'b1'
     os.mkdir(build_dir)
@@ -2722,19 +2662,55 @@ def test_xml_output(tmp_path):  # #13391 / #13485
     exitcode_1, stdout_1, stderr_1 = cppcheck(args)
     assert exitcode_1 == 0, stdout_1
     assert stdout_1 == ''
+    test_file_exp = str(test_file).replace('\\', '/')
     assert (stderr_1 ==
 '''<?xml version="1.0" encoding="UTF-8"?>
 <results version="2">
     <cppcheck version="{}"/>
     <errors>
-        <error id="nullPointerRedundantCheck" severity="warning" msg="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." verbose="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." cwe="476" file0="{}" remark="boom">
+        <error id="nullPointerRedundantCheck" severity="warning" msg="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." verbose="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." cwe="476" hash="2884341854190588507" file0="{}" remark="boom">
             <location file="{}" line="5" column="12" info="Null pointer dereference"/>
             <location file="{}" line="4" column="8" info="Assuming that condition &apos;p&apos; is not redundant"/>
             <symbol>p</symbol>
         </error>
     </errors>
 </results>
-'''.format(version_str, str(test_file).replace('\\', '/'), test_file, test_file))  # TODO: the slashes are inconsistent
+'''.format(version_str, test_file_exp, test_file_exp, test_file_exp))
+
+
+def test_outputfile(tmp_path): # #14051
+    test_file = tmp_path / 'test.cpp'
+    out_file = tmp_path / 'out.txt'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+int main()
+{
+    int x = 1 / 0;
+}
+""")
+
+    args = [
+        '-q',
+        '--output-file={}'.format(out_file),
+        str(test_file)
+    ]
+
+    out_exp = [
+        '{}:4:15: error: Division by zero. [zerodiv]'.format(test_file),
+        '    int x = 1 / 0;',
+        '              ^',
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout == ''
+    assert stderr == ''
+
+    with open(out_file, 'rt') as f:
+        out_text = f.read()
+
+    assert out_text.splitlines() == out_exp
 
 
 def test_internal_error_loc_int(tmp_path):
@@ -2783,7 +2759,7 @@ def __test_addon_suppr(tmp_path, extra_args):
     assert exitcode == 0, stdout
     assert stdout == ''
     assert stderr.splitlines() == [
-        '{}:4:1: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]'.format(test_file),
+        '{}:4:13: style: misra violation (use --rule-texts=<file> to get proper output) [misra-c2012-2.3]'.format(test_file),
     ]
 
 
@@ -2800,7 +2776,6 @@ def test_addon_suppr_cli_line(tmp_path):
     __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:*:3'])
 
 
-@pytest.mark.xfail(strict=True)  # #13437 - TODO: suppression needs to match the whole input path
 def test_addon_suppr_cli_file_line(tmp_path):
     __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:test.c:3'])
 
@@ -2900,7 +2875,7 @@ def test_debug(tmp_path):
         f.write(
 """void f
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -2926,7 +2901,7 @@ def test_debug_xml(tmp_path):
         f.write(
 """void f
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -2968,7 +2943,7 @@ def test_debug_verbose(tmp_path):
         f.write(
 """void f
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -2995,7 +2970,7 @@ def test_debug_verbose_xml(tmp_path):
         f.write(
 """void f
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -3032,15 +3007,16 @@ def test_debug_verbose_xml(tmp_path):
     assert len(ast_elem) == 1
 
 
+# TODO: remove interaction with --debug?
 # TODO: test with --xml
-def __test_debug_template(tmp_path, verbose):
+def __test_debug_template(tmp_path, verbose=False, debug=False):
     test_file = tmp_path / 'test.cpp'
     with open(test_file, "w") as f:
         f.write(
 """template<class T> class TemplCl;
 void f()
 {
-    (void)*((int*)nullptr);
+    (void)(*((int*)nullptr));
 }
 """)
 
@@ -3053,27 +3029,54 @@ def __test_debug_template(tmp_path, verbose):
 
     if verbose:
         args += ['--verbose']
+    if debug:
+        args += ['--debug']
 
     exitcode, stdout, stderr = cppcheck(args)
     assert exitcode == 0, stdout
-    assert stdout.find('##file ') == -1
-    assert stdout.find('##Value flow') == -1
-    assert stdout.find('### Symbol database ###') == -1
-    assert stdout.find('##AST') == -1
-    assert stdout.find('### Template Simplifier pass ') != -1
+    if debug:
+        assert stdout.find('##file ') != -1
+    else:
+        assert stdout.find('##file ') == -1
+    if debug:
+        assert stdout.find('##Value flow') != -1
+    else:
+        assert stdout.find('##Value flow') == -1
+    if debug and verbose:
+        assert stdout.find('### Symbol database ###') != -1
+    else:
+        assert stdout.find('### Symbol database ###') == -1
+    if debug and verbose:
+        assert stdout.find('##AST') != -1
+    else:
+        assert stdout.find('##AST') == -1
+    if debug:
+        assert stdout.count('### Template Simplifier pass ') == 2
+    else:
+        assert stdout.count('### Template Simplifier pass ') == 1
     assert stderr.splitlines() == [
-        '{}:4:13: error: Null pointer dereference: (int*)nullptr [nullPointer]'.format(test_file)
+        '{}:4:14: error: Null pointer dereference: (int*)nullptr [nullPointer]'.format(test_file)
     ]
     return stdout
 
 
 def test_debug_template(tmp_path):
-    __test_debug_template(tmp_path, False)
+    __test_debug_template(tmp_path, verbose=False)
 
 
 def test_debug_template_verbose_nodiff(tmp_path):
     # make sure --verbose does not change the output
-    assert __test_debug_template(tmp_path, False) == __test_debug_template(tmp_path, True)
+    assert __test_debug_template(tmp_path, verbose=False) == __test_debug_template(tmp_path, verbose=True)
+
+
+def test_debug_template_debug(tmp_path):
+    __test_debug_template(tmp_path, debug=True)
+
+
+@pytest.mark.xfail(strict=True)  # TODO: remove dependency on --verbose
+def test_debug_template_debug_verbose_nodiff(tmp_path):
+    # make sure --verbose does not change the output
+    assert __test_debug_template(tmp_path, debug=True, verbose=False) == __test_debug_template(tmp_path, debug=True, verbose=True)
 
 
 def test_file_ignore_2(tmp_path):  # #13570
@@ -3379,7 +3382,6 @@ class Cl2
     assert stderr.splitlines() == []  # no error since the unused templates are not being checked
 
 
-@pytest.mark.xfail(strict=True)  # TODO: only the first unused templated function is not being checked
 def test_check_unused_templates_func(tmp_path):  # #13714
     test_file_h = tmp_path / 'test.h'
     with open(test_file_h, 'wt') as f:
@@ -3428,13 +3430,6 @@ def test_check_unused_templates_func(tmp_path):  # #13714
     assert stdout.splitlines() == []
     assert stderr.splitlines() == []  # no error since the unused templates are not being checked
 
-try:
-    # TODO: handle exitcode?
-    subprocess.call(['clang-tidy', '--version'])
-    has_clang_tidy = True
-except OSError:
-    has_clang_tidy = False
-
 def __test_clang_tidy(tmpdir, use_compdb):
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
@@ -3465,18 +3460,18 @@ def __test_clang_tidy(tmpdir, use_compdb):
     ]
 
 
-@pytest.mark.skipif(not has_clang_tidy, reason='clang-tidy is not available')
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
 @pytest.mark.xfail(strict=True)  # TODO: clang-tidy is only invoked with FileSettings - see #12053
 def test_clang_tidy(tmpdir):  # #12053
     __test_clang_tidy(tmpdir, False)
 
 
-@pytest.mark.skipif(not has_clang_tidy, reason='clang-tidy is not available')
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
 def test_clang_tidy_project(tmpdir):
     __test_clang_tidy(tmpdir, True)
 
 
-@pytest.mark.skipif(not has_clang_tidy, reason='clang-tidy is not available')
+@pytest.mark.skipif(not __has_clang_tidy, reason='clang-tidy is not available')
 def test_clang_tidy_error_exit(tmp_path):  # #13828 / #13829
     test_file = tmp_path / 'test.cpp'
     with open(test_file, 'wt') as f:
@@ -3541,13 +3536,48 @@ def test_suppress_unmatched_wildcard(tmp_path):  # #13660
     exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
     assert exitcode == 0, stdout
     assert stdout.splitlines() == []
-    # TODO: invalid locations - see #13659
     assert stderr.splitlines() == [
-        'test*.c:-1:0: information: Unmatched suppression: id [unmatchedSuppression]',
-        'test*.c:-1:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
-        'tes?.c:-1:0: information: Unmatched suppression: id2 [unmatchedSuppression]'
+        'test*.c:0:0: information: Unmatched suppression: id [unmatchedSuppression]',
+        'test*.c:0:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
+        'tes?.c:0:0: information: Unmatched suppression: id2 [unmatchedSuppression]'
+    ]
+
+
+def test_suppress_unmatched_wildcard_cached(tmp_path):  # #14585
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+
+    # need to run in the temporary folder because the path of the suppression has to match
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--suppress=nullPointer:test*.c',
+        'test.c'
     ]
 
+    stderr_exp = []
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == stderr_exp
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == stderr_exp
+
 
 def test_suppress_unmatched_wildcard_unchecked(tmp_path):
     # make sure that unmatched wildcards suppressions are reported if files matching the expressions were processesd
@@ -3570,12 +3600,11 @@ def test_suppress_unmatched_wildcard_unchecked(tmp_path):
     exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
     assert exitcode == 0, stdout
     assert stdout.splitlines() == []
-    # TODO: invalid locations - see #13659
     assert stderr.splitlines() == [
-        'test*.c:-1:0: information: Unmatched suppression: id [unmatchedSuppression]',
-        'tes?.c:-1:0: information: Unmatched suppression: id [unmatchedSuppression]',
-        '*:-1:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
-        'test*.c:-1:0: information: Unmatched suppression: * [unmatchedSuppression]'
+        'test*.c:0:0: information: Unmatched suppression: id [unmatchedSuppression]',
+        'tes?.c:0:0: information: Unmatched suppression: id [unmatchedSuppression]',
+        '*:0:0: information: Unmatched suppression: id2 [unmatchedSuppression]',
+        'test*.c:0:0: information: Unmatched suppression: * [unmatchedSuppression]'
     ]
 
 
@@ -3623,6 +3652,34 @@ def test_preprocess_enforced_cpp(tmp_path):  # #10989
     ]
 
 
+def test_preprocess_system_include(tmp_path): # #13928
+    g = glob.glob('/usr/include/c++/*/string')
+    if len(g) != 1:
+        pytest.skip('<string> header file not found')
+
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write('#include <string>\n'
+                ';\n')
+
+    def has_missing_include_string_warning(e):
+        return '<string>' in e
+
+    args = [
+        '--enable=missingInclude',
+        str(test_file)
+    ]
+
+    # include path not provided => missing include warning about <string>
+    _, _, stderr = cppcheck(args)
+    assert has_missing_include_string_warning(stderr), stderr
+
+    # include path provided => no missing include warning about <string>
+    args.append('-I' + os.path.dirname(str(g[0])))
+    _, _, stderr = cppcheck(args)
+    assert not has_missing_include_string_warning(stderr), stderr
+
+
 # TODO: test with --xml
 def __test_debug_normal(tmp_path, verbose):
     test_file = tmp_path / 'test.c'
@@ -3630,7 +3687,7 @@ def __test_debug_normal(tmp_path, verbose):
         f.write(
 """void f()
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -3658,7 +3715,7 @@ def __test_debug_normal(tmp_path, verbose):
         assert stdout.find('##AST') == -1
     assert stdout.find('### Template Simplifier pass ') == -1
     assert stderr.splitlines() == [
-        '{}:3:13: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
     return stdout
 
@@ -3680,7 +3737,7 @@ def __test_debug_simplified(tmp_path, verbose):
         f.write(
 """void f()
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -3702,7 +3759,7 @@ def __test_debug_simplified(tmp_path, verbose):
     assert stdout.find('##AST') == -1
     assert stdout.find('### Template Simplifier pass ') == -1
     assert stderr.splitlines() == [
-        '{}:3:13: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
     return stdout
 
@@ -3723,7 +3780,7 @@ def __test_debug_symdb(tmp_path, verbose):
         f.write(
 """void f()
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -3745,7 +3802,7 @@ def __test_debug_symdb(tmp_path, verbose):
     assert stdout.find('##AST') == -1
     assert stdout.find('### Template Simplifier pass ') == -1
     assert stderr.splitlines() == [
-        '{}:3:13: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
     return stdout
 
@@ -3767,7 +3824,7 @@ def __test_debug_ast(tmp_path, verbose):
         f.write(
 """void f()
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -3789,7 +3846,7 @@ def __test_debug_ast(tmp_path, verbose):
     assert stdout.find('##AST') != -1
     assert stdout.find('### Template Simplifier pass ') == -1
     assert stderr.splitlines() == [
-        '{}:3:13: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
     return stdout
 
@@ -3798,7 +3855,6 @@ def test_debug_ast(tmp_path):
     __test_debug_ast(tmp_path, False)
 
 
-@pytest.mark.xfail(strict=True)  # TODO: remove dependency on --verbose
 def test_debug_ast_verbose_nodiff(tmp_path):
     # make sure --verbose does not change the output
     assert __test_debug_ast(tmp_path, False) == __test_debug_ast(tmp_path, True)
@@ -3811,7 +3867,7 @@ def __test_debug_valueflow(tmp_path, verbose):
         f.write(
 """void f()
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -3833,7 +3889,7 @@ def __test_debug_valueflow(tmp_path, verbose):
     assert stdout.find('##AST') == -1
     assert stdout.find('### Template Simplifier pass ') == -1
     assert stderr.splitlines() == [
-        '{}:3:13: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
     ]
     return stdout
 
@@ -3855,7 +3911,7 @@ def test_debug_syntaxerror_c(tmp_path):
 template<class T> class TemplCl;
 void f()
 {
-    (void)*((int*)0);
+    (void)(*((int*)0));
 }
 """)
 
@@ -3876,3 +3932,933 @@ def test_debug_syntaxerror_c(tmp_path):
     assert stderr.splitlines() == [
         "{}:2:1: error: Code 'template<...' is invalid C code. [syntaxError]".format(test_file)
     ]
+
+
+def test_ast_max_depth(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, "w") as f:
+        f.write(
+"""
+#define PTR1 (* (* (* (*
+#define PTR2 PTR1 PTR1 PTR1 PTR1
+#define PTR3 PTR2 PTR2 PTR2 PTR2
+#define PTR4 PTR3 PTR3 PTR3 PTR3
+
+#define RBR1 ) ) ) )
+#define RBR2 RBR1 RBR1 RBR1 RBR1
+#define RBR3 RBR2 RBR2 RBR2 RBR2
+#define RBR4 RBR3 RBR3 RBR3 RBR3
+
+int PTR4 q4_var RBR4 = 0;
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        '{}:12:5: error: maximum AST depth exceeded [internalAstError]'.format(test_file)
+    ]
+
+
+# do not report unmatched misra-* suppressions when misra is not provided
+def test_misra_disabled_unmatched(tmp_path):  #14232
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w"):
+        pass
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=warning,information',
+        '--suppress=misra-c2012-20.5',
+        '--suppress=uninitvar',
+        str(test_file)
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stderr.splitlines() == [
+        'nofile:0:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+# do not report unmatched premium-* suppressions when application is not premium
+def test_premium_disabled_unmatched(tmp_path):  #13663
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w"):
+        pass
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=warning,information',
+        '--suppress=premium-misra-cpp-2023-12.2.1',
+        '--suppress=uninitvar',
+        str(test_file)
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stderr.splitlines() == [
+        'nofile:0:0: information: Unmatched suppression: uninitvar [unmatchedSuppression]'
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_unmatched_file(tmp_path):  # #14248 / #14249
+    lib_path = tmp_path / 'lib'
+    os.makedirs(lib_path)
+
+    test_file = lib_path / 'test.c'
+    with open(test_file, "w"):
+        pass
+
+    suppr_txt = tmp_path / 'suppr.txt'
+    with open(suppr_txt, "w") as f:
+        f.write('''
+error:lib/test.c
+error2:lib\\test.c
+''')
+
+    suppr_xml = tmp_path / 'suppr.xml'
+    with open(suppr_xml, "w") as f:
+        f.write('''
+<suppressions>
+    <suppress>
+        <id>error3</id>
+        <fileName>lib/test.c</fileName>
+    </suppress>
+    <suppress>
+        <id>error4</id>
+        <fileName>lib\\test.c</fileName>
+    </suppress>
+</suppressions>
+''')
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        f'--suppressions-list={suppr_txt}',
+        f'--suppress-xml={suppr_xml}',
+        '--suppress=error5:lib/test.c',
+        '--suppress=error6:lib\\test.c',
+        str(test_file)
+    ]
+
+    lib_file = 'lib' + os.path.sep + 'test.c'
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f'{lib_file}:0:0: information: Unmatched suppression: error [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error2 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error3 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error4 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error5 [unmatchedSuppression]',
+        f'{lib_file}:0:0: information: Unmatched suppression: error6 [unmatchedSuppression]'
+    ]
+    assert ret == 0, stdout
+
+
+def test_simplecpp_warning(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""
+#define warning "warn msg"
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == []
+
+
+def test_simplecpp_unhandled_char(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w", encoding='utf-8') as f:
+        f.write(
+"""
+int 你=0;
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--emit-duplicates',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        '{}:2:5: error: The code contains unhandled character(s) (character code=228). Neither unicode nor extended ascii is supported. [unhandledChar]'.format(test_file)
+    ]
+
+
+def test_simplecpp_include_nested_too_deeply(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('#include "test.h"')
+
+    test_h = tmp_path / 'test.h'
+    with open(test_h, "w") as f:
+        f.write('#include "test_0.h"')
+
+    for i in range(400):
+        test_h = tmp_path / f'test_{i}.h'
+        with open(test_h, "w") as f:
+            f.write('#include "test_{}.h"'.format(i+1))
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--emit-duplicates',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    test_h = tmp_path / 'test_398.h'
+    assert stderr.splitlines() == [
+        # TODO: should only report the error once
+        '{}:1:2: error: #include nested too deeply [includeNestedTooDeeply]'.format(test_h),
+        '{}:1:2: error: #include nested too deeply [includeNestedTooDeeply]'.format(test_h)
+    ]
+
+
+def test_simplecpp_syntax_error(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('#include ""')
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--emit-duplicates',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        # TODO: should only report the error once
+        '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
+        '{}:1:2: error: No header in #include [syntaxError]'.format(test_file)
+    ]
+
+
+@pytest.mark.parametrize('max_configs,number_of_configs,check_config,expected_warn', [
+    # max configs = default, max configs < number of configs => warn
+    (None, 20, False, True),
+    (None, 20, True, True),
+
+    # max configs != default, max configs < number of configs => warn if --check-config
+    (6, 20, False, False),
+    (6, 20, True, True),
+
+    # max configs >= number of configs => no warning
+    (20, 20, False, False),
+    (20, 20, False, False)
+])
+def test_max_configs(tmp_path, max_configs, number_of_configs, check_config, expected_warn):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, "w") as f:
+        for i in range(1,number_of_configs):
+            dir = 'if' if i == 1 else 'elif'
+            f.write(f'#{dir} defined(X{i})\nx = {i};\n')
+        f.write('#endif\n')
+
+    args = ['--enable=information', '--template=simple', str(test_file)]
+
+    if max_configs is None:
+        max_configs = 12  # default value
+    else:
+        args = [f'--max-configs={max_configs}'] + args
+
+    if check_config:
+        args = ['--check-config'] + args
+
+    # default max configs is set to 12, warn if code contains more configurations than that
+    _, _, stderr = cppcheck(args)
+    if not expected_warn:
+        assert stderr.splitlines() == []
+    else:
+        assert stderr.splitlines() == [
+            '{}:0:0: information: Too many #ifdef configurations - cppcheck only checks {} of {} configurations. Use --force to check all configurations. [toomanyconfigs]'
+            .format(test_file, max_configs, number_of_configs)
+        ]
+
+
+def test_no_valid_configuration(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""#include ""
+#ifdef DEF_1
+#include ""
+#endif
+""")
+
+    args = [
+        '--template=simple',
+        '--emit-duplicates',
+        '--enable=information',
+        '--suppress=checkersReport',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file)
+    ]
+    # TODO: this lacks context about the configuration which encounters these errors
+    # TODO: add message when a configuration is dropped?
+    assert stderr.splitlines() == [
+        # TODO: should only report the error once
+        '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
+        '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
+        '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
+        '{}:0:0: information: This file is not analyzed. No working configuration could be extracted. Use -v for more details. [noValidConfiguration]'.format(test_file)
+    ]
+
+
+# The implementation for "A::a" is missing - so don't check if "A::b" is used or not
+def test_unused_private_function_incomplete_impl(tmpdir):
+    test_inc = os.path.join(tmpdir, 'test.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+"""
+class A
+{
+public:
+    A();
+    void a();
+private:
+    void b();
+};
+""")
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+#include "test.h"
+
+A::A() { }
+void A::b() { }
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=style',
+        '--suppress=functionStatic',  # we do not care about this - this was converted from TestUnusedPrivateFunction
+        test_file
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_unused_private_function_multi_file(tmpdir):  # ticket #2567
+    test_inc = os.path.join(tmpdir, 'test.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+"""
+struct Fred
+{
+    Fred()
+    {
+        Init();
+    }
+private:
+    void Init();
+};
+""")
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+#include "test.h"
+
+void Fred::Init()
+{
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=style',
+        '--suppress=functionStatic',  # we do not care about this - this was converted from TestUnusedPrivateFunction
+        test_file
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_missing_doublequote_include(tmpdir):
+    test_inc = os.path.join(tmpdir, 'abc.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+'''
+#define a
+"
+''')
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+#include "abc.h"
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        test_file
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_inc}:3:1: error: No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]"
+    ]
+    assert ret == 0, stdout
+
+
+def test_no_valid_configuration_check_config(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""#include ""
+#ifdef DEF_1
+#include ""
+#endif
+""")
+
+    args = [
+        '--template=simple',
+        '--emit-duplicates',
+        '--enable=information',
+        '--suppress=checkersReport',
+        '--check-config',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file)
+    ]
+    # TODO: this lacks context about the configuration which encounters these errors
+    # TODO: add message when a configuration is dropped
+    assert stderr.splitlines() == [
+        '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
+        '{}:1:2: error: No header in #include [syntaxError]'.format(test_file)
+    ]
+
+
+def __test_active_checkers(tmp_path, active_cnt, total_cnt, use_misra=False, use_unusedfunction_only=False, checkers_exp=None):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'w') as f:
+        f.write('int i;')
+
+    build_dir = None
+    if checkers_exp is not None:
+        build_dir = tmp_path / 'b1'
+        os.makedirs(build_dir)
+
+    args = [
+        '-q',
+        '--enable=information',
+        '-j1',
+        str(test_file)
+    ]
+
+    if use_misra:
+        args += ['--addon=misra']
+    if build_dir:
+        args += ['--cppcheck-build-dir={}'.format(build_dir)]
+    else:
+        args += ['--no-cppcheck-build-dir']
+
+    env = {}
+    if use_unusedfunction_only:
+        env = {'UNUSEDFUNCTION_ONLY': '1'}
+        args += ['--enable=unusedFunction']
+    exitcode, stdout, stderr, _ = cppcheck_ex(args, remove_checkers_report=False, env=env)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        f'nofile:0:0: information: Active checkers: {active_cnt}/{total_cnt} (use --checkers-report=<filename> to see details) [checkersReport]',
+        ''  # TODO: get rid of extra newline
+    ]
+
+    if build_dir:
+        checkers_file = build_dir / 'checkers.txt'
+        with open(checkers_file, 'r') as f:
+            checkers = f.read().splitlines()
+
+        assert checkers == checkers_exp
+        assert len(checkers) == active_cnt
+
+
+def test_active_unusedfunction_only(tmp_path):
+    __test_active_checkers(tmp_path, 1, 188, use_unusedfunction_only=True)
+
+
+def test_active_unusedfunction_only_builddir(tmp_path):
+    checkers_exp = [
+        'CheckUnusedFunctions::check'
+    ]
+    __test_active_checkers(tmp_path, 1, 188, use_unusedfunction_only=True, checkers_exp=checkers_exp)
+
+
+def test_active_unusedfunction_only_misra(tmp_path):
+    __test_active_checkers(tmp_path, 1, 388, use_unusedfunction_only=True, use_misra=True)
+
+
+def test_active_unusedfunction_only_misra_builddir(tmp_path):
+    checkers_exp = [
+        'CheckUnusedFunctions::check'
+    ]
+    __test_active_checkers(tmp_path, 1, 388, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)
+
+
+def test_analyzerinfo(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+
+    test_a1_file = build_dir / 'test.a1'
+
+    args = [
+        '-q',
+        '--debug-analyzerinfo',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--enable=all',
+        str(test_file)
+    ]
+
+    stderr_exp = [
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file),
+        "{}:1:6: style: The function 'f' is never used. [unusedFunction]".format(test_file)
+    ]
+
+    def run_and_assert_cppcheck(stdout_exp):
+        exitcode, stdout, stderr = cppcheck(args)
+        assert exitcode == 0, stdout
+        assert stdout.splitlines() == stdout_exp
+        assert stderr.splitlines() == stderr_exp
+
+    test_file_s = str(test_file).replace('\\', '/')
+    test_a1_file_s = str(test_a1_file).replace('\\', '/')
+
+    # no cached results
+    run_and_assert_cppcheck([
+        "no cached result '{}' for '{}' found".format(test_a1_file_s, test_file_s)
+    ])
+
+    # cached results
+    run_and_assert_cppcheck([
+        "skipping analysis - loaded 1 cached finding(s) from '{}' for '{}'".format(test_a1_file_s, test_file_s)
+    ])
+
+    # modified file
+    with open(test_file, 'a') as f:
+        f.write('\n#define DEF')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - hash mismatch".format(test_a1_file_s, test_file_s)
+    ])
+
+    # invalid XML
+    with open(test_a1_file, 'a') as f:
+        f.write('.')
+
+    run_and_assert_cppcheck([
+        "discarding cached result - failed to load '{}' for '{}' (XML_ERROR_PARSING_TEXT)".format(test_a1_file_s, test_file_s)
+    ])
+
+    # missing root node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - no root node found".format(test_a1_file_s, test_file_s)
+    ])
+
+    # mismatched root node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?><root/>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - unexpected root node".format(test_a1_file_s, test_file_s)
+    ])
+
+    # missing 'hash' node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?><analyzerinfo/>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - no 'hash' node found".format(test_a1_file_s, test_file_s)
+    ])
+
+    # invalid 'hash' node
+    with open(test_a1_file, 'w') as f:
+        f.write('<?xml version="1.0"?><analyzerinfo><hash>hash</hash></analyzerinfo>')
+
+    run_and_assert_cppcheck([
+        "discarding cached result from '{}' for '{}' - hash mismatch".format(test_a1_file_s, test_file_s)
+    ])
+
+    # TODO:
+    # - invalid error
+    # - internalError
+
+
+def test_ctu_function_call_path_slash(tmp_path):  # #14591
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, "w") as f:
+        f.write(
+"""void g(T* p)
+{
+    *p = 0;
+}
+
+void f(T* p)
+{
+    p = nullptr;
+    g(p);
+}
+""")
+
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        str(test_file)
+    ]
+
+    exitcode, _, _ = cppcheck(args)
+    assert exitcode == 0
+
+    test_a1_file = build_dir / 'test.a1'
+    analyzerinfo = ElementTree.fromstring(test_a1_file.read_text())
+    function_call_paths = analyzerinfo.findall('FileInfo/function-call/path')
+    assert len(function_call_paths) == 1
+    file = function_call_paths[0].attrib['file']
+    assert file
+    assert not '\\' in file  # the path was incorrectly converted to native
+
+
+# TODO: Remove duplication/builddir when 7079 is merged
+def test_inline_block_suppr_builddir_twice(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+// cppcheck-suppress-begin [zerodiv]
+x = 10 / 0;
+// cppcheck-suppress-end [zerodiv]
+""")
+
+    build_dir = tmp_path / 'b'
+    os.mkdir(build_dir)
+
+    args = [
+        '-q',
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--enable=all',
+        '--inline-suppr',
+        str(test_file)
+    ]
+
+    for _ in range(2):
+        exitcode, stdout, stderr = cppcheck(args)
+        assert exitcode == 0
+        assert stdout == ''
+        assert stderr == ''
+
+
+def test_dui_include(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, "w") as f:
+        f.write(
+"""
+void f_i()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        f'--include={inc_file}',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f'{inc_file}:4:14: error: Null pointer dereference: (int*)0 [nullPointer]'
+    ]
+
+
+def test_dui_include_missing(tmp_path):  # #14675
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=missing.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_file}:0:0: error: Can not open include file 'missing.h' that is explicitly included. [missingIncludeExplicit]"
+    ]
+
+
+def test_dui_include_relative(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, "w") as f:
+        f.write(
+"""
+void f_i()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=inc.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        'inc.h:4:14: error: Null pointer dereference: (int*)0 [nullPointer]'
+    ]
+
+
+def test_dui_include_relative_missing(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, "w") as f:
+        f.write(
+"""
+void f_i()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=inc.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args,)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_file}:0:0: error: Can not open include file 'inc.h' that is explicitly included. [missingIncludeExplicit]"
+    ]
+
+
+def test_dui_include_absolute_missing(tmp_path):  # #14675
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--include=/share/include/missing.h',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        f"{test_file}:0:0: error: Can not open include file '/share/include/missing.h' that is explicitly included. [missingIncludeExplicit]"
+    ]
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
+def test_ipc(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--debug-ipc',
+        '-j2',
+        '--executor=process',
+        '--no-cppcheck-build-dir',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout.splitlines() == [
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0'
+    ]
+    assert stderr.splitlines() == []
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
+def test_ipc_suppressions(tmp_path):
+    test1_file = tmp_path / 'test1.c'
+    with open(test1_file, "w") as f:
+        f.write('void f() {}')
+
+    test2_file = tmp_path / 'test2.c'
+    with open(test2_file, "w") as f:
+        f.write('void f() {}')
+
+    test3_file = tmp_path / 'test3.c'
+    with open(test3_file, "w") as f:
+        f.write('void f() {}')
+
+    args = [
+        '-q',
+        '--debug-ipc',
+        '-j2',
+        '--executor=process',
+        '--no-cppcheck-build-dir',
+        '--suppress=id0:test1.c',
+        str(tmp_path)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    # sort the lines since the order is not fixed
+    stdout_exp = [
+        'writeToPipe - 4 - id0:test1.c;0;1;0;',
+        'handleRead - 4 - id0:test1.c;0;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0'
+    ]
+    stdout_exp.sort()
+    stdout_lines = stdout.splitlines()
+    stdout_lines.sort()
+    assert stdout_lines == stdout_exp
+    assert stderr.splitlines() == []
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
+def test_ipc_inline_suppressions(tmp_path):
+    test1_file = tmp_path / 'test1.c'
+    with open(test1_file, "w") as f:
+        f.write('void f() {} // cppcheck-suppress id1')
+
+    test2_file = tmp_path / 'test2.c'
+    with open(test2_file, "w") as f:
+        f.write('void f() {} // cppcheck-suppress id2')
+
+    test3_file = tmp_path / 'test3.c'
+    with open(test3_file, "w") as f:
+        f.write('void f() {} // cppcheck-suppress id3')
+
+    args = [
+        '-q',
+        '--debug-ipc',
+        '-j2',
+        '--executor=process',
+        '--no-cppcheck-build-dir',
+        '--inline-suppr',
+        str(tmp_path)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    # sort the lines since the order is not fixed
+    stdout_exp = [
+        f'writeToPipe - 3 - id1:{test1_file}:1;13;1;0;',
+        f'handleRead - 3 - id1:{test1_file}:1;13;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        f'writeToPipe - 3 - id2:{test2_file}:1;13;1;0;',
+        f'handleRead - 3 - id2:{test2_file}:1;13;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0',
+        f'writeToPipe - 3 - id3:{test3_file}:1;13;1;0;',
+        f'handleRead - 3 - id3:{test3_file}:1;13;1;0;',
+        'writeToPipe - 5 - 0',
+        'handleRead - 5 - 0'
+    ]
+    stdout_exp.sort()
+    stdout_lines = stdout.splitlines()
+    stdout_lines.sort()
+    assert stdout_lines == stdout_exp
+    assert stderr.splitlines() == []
\ No newline at end of file
diff --git a/test/cli/performance_test.py b/test/cli/performance_test.py
index 61367d7a0d0..67ec3be09f6 100644
--- a/test/cli/performance_test.py
+++ b/test/cli/performance_test.py
@@ -1,8 +1,9 @@
 
-# python -m pytest test-other.py
+# python -m pytest performance_test.py
 
 import os
 import sys
+import time
 
 import pytest
 
@@ -146,6 +147,29 @@ def test_slow_exprid(tmpdir):
     my_env["DISABLE_VALUEFLOW"] = "1"
     cppcheck([filename], env=my_env)
 
+@pytest.mark.timeout(35)
+def test_stack_overflow_AST(tmpdir):
+    # 14435
+    filename = os.path.join(tmpdir, 'hang.cpp')
+    with open(filename, 'wt') as f:
+        f.write("""
+#define ROW 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+#define ROW8 ROW ROW ROW ROW ROW ROW ROW ROW
+#define ROW64 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8
+#define ROW512 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64
+#define ROW4096 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512
+#define ROW32768 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096 ROW4096
+void f(std::vector<int>& v) {
+	v = {
+		ROW32768 0
+	};
+}
+        """)
+
+    my_env = os.environ.copy()
+    my_env["DISABLE_VALUEFLOW"] = "1"
+    cppcheck([filename], env=my_env)
+
 
 @pytest.mark.timeout(10)
 def test_slow_initlist_varchanged(tmpdir):
@@ -221,6 +245,7 @@ def test_slow_many_scopes(tmpdir):
                 }""")
     cppcheck([filename]) # should not take more than ~1 second
 
+
 @pytest.mark.skipif(sys.platform == 'darwin', reason='GitHub macOS runners are too slow')
 @pytest.mark.timeout(20)
 def test_crash_array_in_namespace(tmpdir):
@@ -240,3 +265,176 @@ def test_crash_array_in_namespace(tmpdir):
                     };
                 }""")
     cppcheck([filename]) # should not take more than ~5 seconds
+
+
+@pytest.mark.skipif(sys.platform == 'darwin', reason='GitHub macOS runners are too slow')
+@pytest.mark.timeout(30)
+def test_crash_array_in_array(tmpdir):
+    # 12861
+    filename = os.path.join(tmpdir, 'hang.cpp')
+    with open(filename, 'wt') as f:
+        f.write(r"""
+                #define ROW A, A, A, A, A, A, A, A,
+                #define ROW8 ROW ROW ROW ROW ROW ROW ROW ROW
+                #define ROW64 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8 ROW8
+                #define ROW512 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64 ROW64
+                #define ROW4096 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512 ROW512
+                void f() {
+                    static const char A = 'a';
+                    const char a[] = {
+                        ROW4096 ROW4096 ROW4096 ROW4096
+                    };
+                }""")
+    cppcheck([filename])
+
+
+@pytest.mark.timeout(5)
+def test_slow_bifurcate(tmpdir):
+    # #14134
+    filename = os.path.join(tmpdir, 'hang.cpp')
+    with open(filename, 'wt') as f:
+        f.write(r"""
+                class C {
+                public:
+	                enum class Status {
+                		Ok,
+                		Waiting,
+                		Error,
+                	};
+                	void setStatus(Status status, const QString& text);
+                	QColor m_statusColor;
+                };
+
+                template < size_t N, typename T >
+                inline QDataStream& deserialize(QDataStream& in, T& value) {
+                	if constexpr (N == 0) {}
+                	else if constexpr (N == 1) {
+                		auto& [f1] = value;
+                		in >> f1;
+                	}
+                	else if constexpr (N == 2) {
+                		auto& [f1, f2] = value;
+                		in >> f1 >> f2;
+                	}
+                	else if constexpr (N == 3) {
+                		auto& [f1, f2, f3] = value;
+                		in >> f1 >> f2 >> f3;
+                	}
+                	else if constexpr (N == 4) {
+                		auto& [f1, f2, f3, f4] = value;
+                		in >> f1 >> f2 >> f3 >> f4;
+                	}
+                	else if constexpr (N == 5) {
+                		auto& [f1, f2, f3, f4, f5] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5;
+                	}
+                	else if constexpr (N == 6) {
+                		auto& [f1, f2, f3, f4, f5, f6] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6;
+                	}
+                	else if constexpr (N == 7) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7;
+                	}
+                	else if constexpr (N == 8) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8;
+                	}
+                	else if constexpr (N == 9) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9;
+                	}
+                	else if constexpr (N == 10) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10;
+                	}
+                	else if constexpr (N == 11) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11;
+	                }
+                	else if constexpr (N == 12) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12;
+                	}
+                	else if constexpr (N == 13) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13;
+                	}
+                	else if constexpr (N == 14) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13 >> f14;
+                	}
+                	else if constexpr (N == 15) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13 >> f14 >> f15;
+                	}
+                	else if constexpr (N == 16) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13 >> f14 >> f15 >> f16;
+                	}
+                	else if constexpr (N == 17) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13 >> f14 >> f15 >> f16 >> f17;
+                	}
+                	else if constexpr (N == 18) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13 >> f14 >> f15 >> f16 >> f17 >> f18;
+                	}
+                	else if constexpr (N == 19) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13 >> f14 >> f15 >> f16 >> f17 >> f18 >> f19;
+                	}
+                	else if constexpr (N == 20) {
+                		auto& [f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20] = value;
+                		in >> f1 >> f2 >> f3 >> f4 >> f5 >> f6 >> f7 >> f8 >> f9 >> f10 >> f11 >> f12 >> f13 >> f14 >> f15 >> f16 >> f17 >> f18 >> f19 >> f20;
+                	}
+                	else {
+                		static_assert (!sizeof(T), "missing implementation");
+                	}
+                	return in;
+                }
+
+                void C::setStatus(Status status, const QString& text) {
+                	const auto& colors = Config::get().ui().colors;
+                	QColor color;
+                	switch (status) {
+                	case Status::Ok:
+                		color = colors.green;
+                		break;
+                	case Status::Waiting:
+                		color = Qt::black;
+                		break;
+                	case Status::Error:
+                		color = colors.red;
+                		break;
+	                }
+
+                	if (m_statusColor != color) {
+                		m_statusColor = color;
+                	}
+                }""")
+    cppcheck([filename]) # should not take more than ~1 second
+
+
+@pytest.mark.timeout(60)
+def test_slow_many_headers(tmpdir):
+    # 14113
+    c_file = os.path.join(tmpdir, 'source.c')
+    h_file = os.path.join(tmpdir, 'header.h')
+    n_hdr = 128
+    with open(c_file, 'wt') as f:
+        f.write('#include "header.h"\n')
+    with open(h_file, 'wt') as f:
+        for i in range(n_hdr):
+            f.write(f'#ifdef CONFIG{i}\n#include "header{i}.h"\n#endif\n')
+    for i in range(n_hdr):
+        h_file_i = os.path.join(tmpdir, f"header{i}.h")
+        with open(h_file_i, 'wt') as f:
+            for j in range(2048):
+                f.write(f'#define MACRO{j}{(" "+str(j))*128}\n')
+            f.write(f'MACRO{i}\n')
+    # creating the files used for testing can be slow, so we use perf counter here instead
+    start = time.perf_counter_ns()
+    cppcheck(['-DCONFIG0', c_file])
+    end = time.perf_counter_ns()
+    assert end - start < 2 * 10**9 # max 2 sec
diff --git a/test/cli/premium_test.py b/test/cli/premium_test.py
index 12dd7212450..820f7b680e9 100644
--- a/test/cli/premium_test.py
+++ b/test/cli/premium_test.py
@@ -14,6 +14,8 @@
 
 def __copy_cppcheck_premium(tmpdir):
     exe = shutil.copy2(__lookup_cppcheck_exe(), tmpdir)
+    if sys.platform == 'win32':
+        shutil.copy2(os.path.join(os.path.dirname(__lookup_cppcheck_exe()), 'cppcheck-core.dll'), tmpdir)
 
     # add minimum cfg/std.cfg
     test_cfg_folder = tmpdir.mkdir('cfg')
@@ -27,6 +29,7 @@ def __copy_cppcheck_premium(tmpdir):
                     "addons": [],
                     "productName": "NAME",
                     "about": "NAME",
+                    "manualUrl" : "https://files.cppchecksolutions.com/manual.pdf",
                     "safety": true
                 }
                 """.replace('NAME', __PRODUCT_NAME))
@@ -35,10 +38,6 @@ def __copy_cppcheck_premium(tmpdir):
 
 
 def test_misra_c_builtin_style_checks(tmpdir):
-    # FIXME this test does not work in ci-windows.yml (release build)
-    if sys.platform == 'win32':
-        return
-
     test_file = os.path.join(tmpdir, 'test.cpp')
     with open(test_file, 'wt') as f:
         f.write('void foo() { int x; y = 0; }')
@@ -69,7 +68,7 @@ def test_misra_c_builtin_style_checks(tmpdir):
 
     exitcode, _, stderr = cppcheck(['--xml-version=3', '--suppress=foo', test_file], cppcheck_exe=exe)
     assert exitcode == 0
-    assert '<suppression errorId="foo" />' in stderr
+    assert '<suppression errorId="foo" inline="false" />' in stderr
 
 
 def test_build_dir_hash_cppcheck_product(tmpdir):
@@ -89,11 +88,11 @@ def test_build_dir_hash_cppcheck_product(tmpdir):
     assert exitcode == 0
 
     def _get_hash(s:str):
-        i = s.find(' hash="')
+        i = s.find('<hash>')
         if i <= -1:
             return ''
         i += 7
-        return s[i:s.find('"', i)]
+        return s[i:s.find('</hash>', i)]
 
     with open(build_dir.join('test.a1'), 'rt') as f:
         f1 = f.read()
@@ -130,3 +129,73 @@ def test_misra_py(tmpdir):
     _, stdout, _ = cppcheck(['--enable=style', '--premium=misra-c-2012', test_file], cppcheck_exe=exe)
     assert 'misra.py' not in stdout # Did not find misra.py
     assert 'Checking' in stdout
+
+
+def test_invalid_license_retry(tmpdir):
+    # Trac 13832 - cppcheck build dir: do not reuse cached results if there were invalidLicense errors
+    build_dir = os.path.join(tmpdir, 'b')
+    test_file = os.path.join(tmpdir, 'test.c')
+    addon_file = os.path.join(tmpdir, 'premiumaddon.py')
+
+    os.mkdir(build_dir)
+
+    with open(test_file, 'wt') as f:
+        f.write('void foo();\n')
+
+    args = [f"--addon={addon_file}", f"--cppcheck-build-dir={build_dir}", '--xml', '--enable=all', test_file]
+
+    with open(addon_file, 'wt') as f:
+        f.write('print(\'{"addon":"premium","column":0,"errorId":"invalidLicense","extra":"","file":"Cppcheck Premium","linenr":0,"message":"Invalid license: No license file was found, contact sales@cppchecksolutions.com","severity":"error"}\')')
+
+    _, _, stderr = cppcheck(args)
+    assert 'Invalid license' in stderr
+
+    with open(addon_file, 'wt') as f:
+        f.write('')
+
+    _, _, stderr = cppcheck(args)
+    assert 'Invalid license' not in stderr
+
+
+def test_help(tmpdir):
+    exe = __copy_cppcheck_premium(tmpdir)
+
+    exitcode, stdout, _ = cppcheck(['--help'], cppcheck_exe=exe)
+    assert exitcode == 0
+    assert stdout.startswith('Cppcheck ')  # check for product name - TODO: should be "Cppcheck Premium"
+    assert '--premium=' in stdout, stdout  # check for premium option
+    assert 'cppchecksolutions.com' in stdout, stdout  # check for premium help link
+
+
+def test_cwe(tmpdir):
+    # Trac 14323 - addon warnings with cwe
+    test_file = os.path.join(tmpdir, 'test.c')
+    addon_file = os.path.join(tmpdir, 'premiumaddon.py')
+
+    with open(test_file, 'wt') as f:
+        f.write('void foo();\n')
+
+    args = [f"--addon={addon_file}", '--xml', test_file]
+
+    with open(addon_file, 'wt') as f:
+        f.write('print(\'{"addon":"a","column":1,"errorId":"id","extra":"","file":"test.c","cwe":123,"linenr":1,"message":"bug","severity":"error"}\')')
+
+    _, _, stderr = cppcheck(args)
+    assert '<error id="a-id" severity="error" msg="bug" verbose="bug" cwe="123" ' in stderr
+
+
+def test_hash(tmpdir):
+    # Trac 14225 - warnings with hash
+    test_file = os.path.join(tmpdir, 'test.c')
+    addon_file = os.path.join(tmpdir, 'premiumaddon.py')
+
+    with open(test_file, 'wt') as f:
+        f.write('void foo();\n')
+
+    args = [f"--addon={addon_file}", '--xml', test_file]
+
+    with open(addon_file, 'wt') as f:
+        f.write('print(\'{"addon":"a","column":1,"errorId":"id","extra":"","file":"test.c","hash":123,"linenr":1,"message":"bug","severity":"error"}\')')
+
+    _, _, stderr = cppcheck(args)
+    assert '<error id="a-id" severity="error" msg="bug" verbose="bug" hash="123" ' in stderr
diff --git a/test/cli/proj-inline-suppress-unusedFunction/B.hpp b/test/cli/proj-inline-suppress-unusedFunction/B.hpp
index aca79e88167..71fad0ab3fd 100644
--- a/test/cli/proj-inline-suppress-unusedFunction/B.hpp
+++ b/test/cli/proj-inline-suppress-unusedFunction/B.hpp
@@ -2,5 +2,5 @@ class B {
 public:
     B();
 
-    void unusedFunctionTest();
+    static void unusedFunctionTest();
 };
diff --git a/test/cli/proj-inline-suppress/5.cpp b/test/cli/proj-inline-suppress/5.cpp
new file mode 100644
index 00000000000..c2c717ba8b3
--- /dev/null
+++ b/test/cli/proj-inline-suppress/5.cpp
@@ -0,0 +1 @@
+#include "5.h"
diff --git a/test/cli/proj-inline-suppress/5.h b/test/cli/proj-inline-suppress/5.h
new file mode 100644
index 00000000000..63967f45e28
--- /dev/null
+++ b/test/cli/proj-inline-suppress/5.h
@@ -0,0 +1,5 @@
+struct expected
+{
+    // cppcheck-suppress noExplicitConstructor
+    expected(int){}
+};
diff --git a/test/cli/proj-inline-suppress/cfg.c b/test/cli/proj-inline-suppress/cfg.c
index 6db404c5470..42709095dcf 100644
--- a/test/cli/proj-inline-suppress/cfg.c
+++ b/test/cli/proj-inline-suppress/cfg.c
@@ -1,15 +1,10 @@
 void f()
 {
-#if VER_CHECK(3, 1, 6)
-    // cppcheck-suppress id
-    (void)0;
-#endif
-
 #if DEF_1
     // cppcheck-suppress id
-    (void)0;
+    ;
 #endif
 
     // cppcheck-suppress id
-    (void)0;
+    ;
 }
diff --git a/test/cli/proj-inline-suppress/misraUnmatched.c b/test/cli/proj-inline-suppress/misraUnmatched.c
new file mode 100644
index 00000000000..93c81febbbc
--- /dev/null
+++ b/test/cli/proj-inline-suppress/misraUnmatched.c
@@ -0,0 +1,5 @@
+void f()
+{
+    // cppcheck-suppress misra-c2012-20.5
+    // cppcheck-suppress uninitvar
+}
\ No newline at end of file
diff --git a/test/cli/proj-inline-suppress/premiumUnmatched.cpp b/test/cli/proj-inline-suppress/premiumUnmatched.cpp
new file mode 100644
index 00000000000..3be3c1369a7
--- /dev/null
+++ b/test/cli/proj-inline-suppress/premiumUnmatched.cpp
@@ -0,0 +1,5 @@
+void f()
+{
+    // cppcheck-suppress premium-misra-cpp-2023-12.2.1
+    // cppcheck-suppress uninitvar
+}
\ No newline at end of file
diff --git a/test/cli/project-suppressions.py b/test/cli/project-suppressions.py
new file mode 100644
index 00000000000..e2b6ba5e7d6
--- /dev/null
+++ b/test/cli/project-suppressions.py
@@ -0,0 +1,33 @@
+
+# python -m pytest project-suppressions.py
+
+from testutils import create_gui_project_file, assert_cppcheck
+
+def test_cli_and_project_suppressions(tmp_path):
+    # Uninitvar suppressed in project file
+    suppressions = [{ 'id': 'uninitvar' }]
+    project_path = tmp_path / 'project.cppcheck'
+    create_gui_project_file(project_path, root_path=str(tmp_path), suppressions=suppressions)
+
+    # Uninitvar suppressed on command line before import
+    args = ['--suppress=uninitvar', f'--project={project_path}']
+    out_exp = [
+        "cppcheck: error: suppression 'uninitvar' already exists",
+        f"cppcheck: error: failed to load project '{project_path}'. An error occurred."
+    ]
+    assert_cppcheck(args, ec_exp=1, out_exp=out_exp)
+
+def test_multiple_cli_and_project_suppressions(tmp_path):
+    # Uninitvar and unreadVariable suppressed in project file
+    suppressions = [{ 'id': 'uninitvar' }, { 'id': 'unreadVariable' },]
+    project_path = tmp_path / 'project.cppcheck'
+    create_gui_project_file(project_path, root_path=str(tmp_path), suppressions=suppressions)
+
+    # Uninitvar and unreadVariable suppressed on command line before import
+    args = ['--suppress=uninitvar', '--suppress=unreadVariable', f'--project={project_path}']
+    out_exp = [
+        "cppcheck: error: suppression 'uninitvar' already exists",
+        "cppcheck: error: suppression 'unreadVariable' already exists",
+        f"cppcheck: error: failed to load project '{project_path}'. An error occurred."
+    ]
+    assert_cppcheck(args, ec_exp=1, out_exp=out_exp)
diff --git a/test/cli/project_test.py b/test/cli/project_test.py
index e95c1df61e8..64bb406a709 100644
--- a/test/cli/project_test.py
+++ b/test/cli/project_test.py
@@ -7,7 +7,7 @@
 from testutils import cppcheck
 
 
-@pytest.mark.parametrize("project_ext", ["json", "sln", "vcxproj", "bpr", "cppcheck"])
+@pytest.mark.parametrize("project_ext", ["json", "sln", "slnx", "vcxproj", "bpr", "cppcheck"])
 def test_missing_project(project_ext):
     project_file = "file.{}".format(project_ext)
 
@@ -33,6 +33,7 @@ def __test_project_error(tmpdir, ext, content, expected):
 @pytest.mark.parametrize("project_ext, expected", [
     ("json", "compilation database is not a JSON array"),
     ("sln", "Visual Studio solution file is empty"),
+    ("slnx", "Visual Studio solution file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT"),
     ("vcxproj", "Visual Studio project file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT"),
     ("bpr", "Borland project file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT"),
     ("cppcheck", "Cppcheck GUI project file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT")
@@ -49,11 +50,22 @@ def test_json_entry_file_not_found(tmpdir):
          "output": "bug1.o"}
     ]
 
-    expected = "'{}' from compilation database does not exist".format(os.path.join(tmpdir, "bug1.cpp"))
+    project_file = os.path.join(tmpdir, "file.json")
+    missing_file = os.path.join(tmpdir, "bug1.cpp")
+    missing_file_posix = missing_file
+
     if sys.platform == "win32":
-        expected = expected.replace('\\', '/')
+        missing_file_posix = missing_file_posix.replace('\\', '/')
 
-    __test_project_error(tmpdir, "json", json.dumps(compilation_db), expected)
+    with open(project_file, 'w') as f:
+        f.write(json.dumps(compilation_db))
+
+    ret, _, stderr = cppcheck([
+        '--template=simple',
+        "--project=" + str(project_file)
+    ])
+    assert 0 == ret
+    assert stderr == f"{missing_file}:0:0: error: File is missing: {missing_file_posix} [missingFile]\n"
 
 
 def test_json_no_arguments(tmpdir):
@@ -127,6 +139,92 @@ def test_sln_project_file_not_found(tmpdir):
     __test_project_error(tmpdir, "sln", content, expected)
 
 
+def test_slnx_no_xml_root(tmpdir):
+    content = '<?xml version="1.0" encoding="utf-8"?>'
+
+    expected = "Visual Studio solution file has no XML root node"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_invalid_xml_root(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Invalid>\r\n" \
+              "</Invalid>\r\n"
+
+    expected = "Invalid Visual Studio solution file format"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_no_projects(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              "</Solution>\r\n"
+
+    expected = "no projects found in Visual Studio solution file"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_no_projects_in_folder(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              '  <Folder Name="/common/">\r\n' \
+              '  </Folder>\r\n' \
+          "</Solution>\r\n"
+
+    expected = "no projects found in Visual Studio solution file"
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_project_file_not_found(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              '  <Project Path="test.vcxproj" />\r\n' \
+              "</Solution>\r\n"
+
+    expected = "Visual Studio project file is not a valid XML - XML_ERROR_FILE_NOT_FOUND\n" \
+               "cppcheck: error: failed to load '{}' from Visual Studio solution".format(os.path.join(tmpdir, "test.vcxproj"))
+    if sys.platform == "win32":
+        expected = expected.replace('\\', '/')
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
+def test_slnx_project_file_in_folder_not_found(tmpdir):
+    content = '<?xml version="1.0" encoding="UTF-8"?>\r\n' \
+              "<Solution>\r\n" \
+              "  <Configurations>\r\n" \
+              '    <Platform Name="x64" />\r\n' \
+              '    <Platform Name="x86" />\r\n' \
+              "  </Configurations>\r\n" \
+              '  <Folder Name="/common/">\r\n' \
+              '    <Project Path="common/test.vcxproj" />\r\n' \
+              '  </Folder>\r\n' \
+              "</Solution>\r\n"
+
+    expected = "Visual Studio project file is not a valid XML - XML_ERROR_FILE_NOT_FOUND\n" \
+               "cppcheck: error: failed to load '{}' from Visual Studio solution".format(os.path.join(tmpdir, "common/test.vcxproj"))
+    if sys.platform == "win32":
+        expected = expected.replace('\\', '/')
+
+    __test_project_error(tmpdir, "slnx", content, expected)
+
+
 def test_vcxproj_no_xml_root(tmpdir):
     content = '<?xml version="1.0" encoding="utf-8"?>'
 
diff --git a/test/cli/qml_test.py b/test/cli/qml_test.py
index de4a8d900af..5ce7428b0ae 100644
--- a/test/cli/qml_test.py
+++ b/test/cli/qml_test.py
@@ -26,9 +26,9 @@ def __test_unused_functions(extra_args):
     lines.sort()
     # there are unused functions. But fillSampleData is not unused because that is referenced from main.qml
     assert lines == [
-        "{}samplemodel.cpp:15:0: style: The function 'data' is never used. [unusedFunction]".format(__project_dir_sep),
-        "{}samplemodel.cpp:38:0: style: The function 'roleNames' is never used. [unusedFunction]".format(__project_dir_sep),
-        "{}samplemodel.cpp:9:0: style: The function 'rowCount' is never used. [unusedFunction]".format(__project_dir_sep)
+        "{}samplemodel.cpp:15:23: style: The function 'data' is never used. [unusedFunction]".format(__project_dir_sep),
+        "{}samplemodel.cpp:38:37: style: The function 'roleNames' is never used. [unusedFunction]".format(__project_dir_sep),
+        "{}samplemodel.cpp:9:18: style: The function 'rowCount' is never used. [unusedFunction]".format(__project_dir_sep)
     ]
     assert ret == 0, stdout
 
diff --git a/test/cli/reanalysis/a.cpp b/test/cli/reanalysis/a.cpp
new file mode 100644
index 00000000000..aad7e3efa61
--- /dev/null
+++ b/test/cli/reanalysis/a.cpp
@@ -0,0 +1,4 @@
+int main() {
+    int i; // cppcheck-suppress unusedVariable
+}
+
diff --git a/test/cli/reanalysis/b.cpp b/test/cli/reanalysis/b.cpp
new file mode 100644
index 00000000000..cb4df470113
--- /dev/null
+++ b/test/cli/reanalysis/b.cpp
@@ -0,0 +1,2 @@
+int main() {}
+
diff --git a/test/cli/reanalysis/c.cpp b/test/cli/reanalysis/c.cpp
new file mode 100644
index 00000000000..cb4df470113
--- /dev/null
+++ b/test/cli/reanalysis/c.cpp
@@ -0,0 +1,2 @@
+int main() {}
+
diff --git a/test/cli/reanalysis/d.cpp b/test/cli/reanalysis/d.cpp
new file mode 100644
index 00000000000..cb4df470113
--- /dev/null
+++ b/test/cli/reanalysis/d.cpp
@@ -0,0 +1,2 @@
+int main() {}
+
diff --git a/test/cli/sarif_test.py b/test/cli/sarif_test.py
new file mode 100644
index 00000000000..d2fe9396350
--- /dev/null
+++ b/test/cli/sarif_test.py
@@ -0,0 +1,622 @@
+# python -m pytest sarif_test.py
+
+import os
+import json
+import tempfile
+
+import pytest
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+# Test code with various error types
+TEST_CODE = """
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <vector>
+#include <memory>
+
+class TestClass {
+public:
+    TestClass() : value(0) {}
+    ~TestClass() { delete ptr; }
+    
+    void setValue(int v) { value = v; }
+    int getValue() const { return value; }
+    
+private:
+    int value;
+    int* ptr = nullptr;
+};
+
+void testSecurityViolations() {
+    // Null pointer dereference
+    int* ptr = nullptr;
+    *ptr = 5;
+    
+    // Array bounds violation  
+    int array[5];
+    array[10] = 1;
+    
+    // Memory leak
+    int* mem = (int*)malloc(sizeof(int) * 10);
+    // forgot to free mem
+    
+    // Uninitialized variable
+    int x;
+    printf("%d", x);
+    
+    // Double free
+    int* p = (int*)malloc(sizeof(int));
+    free(p);
+    free(p);
+    
+    // Buffer overflow with strcpy
+    char buffer[10];
+    char source[20] = "This is too long";
+    strcpy(buffer, source);
+    
+    // Use after free
+    int* freed = (int*)malloc(sizeof(int));
+    free(freed);
+    *freed = 42;
+}
+
+void testStyleAndPortabilityIssues() {
+    // Redundant assignment
+    int redundant = 5;
+    redundant = redundant;
+    
+    // Unused variable
+    int unused = 42;
+    
+    // Variable scope reduction
+    int i;
+    for (i = 0; i < 10; i++) {
+        // i could be declared in for loop
+    }
+}
+
+int main() {
+    testSecurityViolations();
+    testStyleAndPortabilityIssues();
+    return 0;
+}
+"""
+
+BASIC_TEST_CODE = """
+int main() {
+    int* p = nullptr;
+    *p = 5; // null pointer dereference
+    return 0;
+}
+"""
+
+
+def create_test_file(tmp_path, filename="test.cpp", content=TEST_CODE):
+    """Create a temporary test file with the given content."""
+    filepath = tmp_path / filename
+    filepath.write_text(content)
+    return str(filepath)
+
+
+def run_sarif_check(code, extra_args=None):
+    """Run cppcheck with SARIF output on the given code."""
+    with tempfile.TemporaryDirectory() as tmpdir:
+        tmp_path = os.path.join(tmpdir, "test.cpp")
+        with open(tmp_path, "w") as f:
+            f.write(code)
+
+        args = ["--output-format=sarif", "--enable=all", tmp_path]
+
+        if extra_args:
+            args.extend(extra_args)
+
+        _, _, stderr = cppcheck(args)
+
+        # SARIF output is in stderr
+        try:
+            sarif_data = json.loads(stderr)
+            return sarif_data
+        except json.JSONDecodeError as e:
+            pytest.fail(f"Failed to parse SARIF JSON: {e}\nOutput: {stderr}")
+            return None
+
+
+def test_sarif_basic_structure():
+    """Test that SARIF output has the correct basic structure."""
+    sarif = run_sarif_check(BASIC_TEST_CODE)
+
+    # Check required SARIF fields
+    assert sarif["version"] == "2.1.0"
+    assert "$schema" in sarif
+    assert "sarif-schema" in sarif["$schema"]
+    assert "runs" in sarif
+    assert len(sarif["runs"]) == 1
+
+    run = sarif["runs"][0]
+    assert "tool" in run
+    assert "results" in run
+
+    tool = run["tool"]
+    assert "driver" in tool
+
+    driver = tool["driver"]
+    assert driver["name"] == "Cppcheck"
+    assert "rules" in driver
+    assert "semanticVersion" in driver
+
+
+def test_sarif_null_pointer():
+    """Test SARIF output for null pointer dereference."""
+    sarif = run_sarif_check(BASIC_TEST_CODE)
+
+    run = sarif["runs"][0]
+    results = run["results"]
+
+    # Should have at least one result
+    assert len(results) > 0
+
+    # Find null pointer result
+    null_pointer_results = [r for r in results if r["ruleId"] == "nullPointer"]
+    assert len(null_pointer_results) > 0
+
+    result = null_pointer_results[0]
+    assert result["level"] == "error"
+    assert "message" in result
+    assert "text" in result["message"]
+    assert (
+        "null" in result["message"]["text"].lower()
+        or "nullptr" in result["message"]["text"].lower()
+    )
+
+    # Check location information
+    assert "locations" in result
+    assert len(result["locations"]) > 0
+    location = result["locations"][0]
+    assert "physicalLocation" in location
+    assert "artifactLocation" in location["physicalLocation"]
+    assert "region" in location["physicalLocation"]
+
+    region = location["physicalLocation"]["region"]
+    assert "startLine" in region
+    assert region["startLine"] > 0
+    assert "startColumn" in region
+    assert region["startColumn"] > 0
+
+
+def test_sarif_security_rules():
+    """Test that security-related rules have proper security properties."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    # Check for security-related rules
+    security_rule_ids = [
+        "nullPointer",
+        "arrayIndexOutOfBounds",
+        "memleak",
+        "uninitvar",
+        "doubleFree",
+    ]
+
+    for rule_id in security_rule_ids:
+        matching_rules = [r for r in rules if r["id"] == rule_id]
+        if matching_rules:
+            rule = matching_rules[0]
+            props = rule.get("properties", {})
+
+            # Security rules should have security-severity
+            if "tags" in props and "security" in props["tags"]:
+                assert "security-severity" in props
+                assert float(props["security-severity"]) > 0
+
+            # Should have problem.severity
+            assert "problem.severity" in props
+
+            # Should have precision
+            assert "precision" in props
+
+
+def test_sarif_rule_descriptions():
+    """Test that rule descriptions are properly formatted."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    assert len(rules) > 0
+
+    for rule in rules:
+        # Each rule should have required fields
+        assert "id" in rule
+        assert "name" in rule
+        assert "shortDescription" in rule
+        assert "fullDescription" in rule
+
+        # Descriptions should be empty (allowing GitHub to use instance messages)
+        assert rule["name"] == ""
+        assert rule["shortDescription"]["text"] == ""
+        assert rule["fullDescription"]["text"] == ""
+
+        # Should have properties
+        assert "properties" in rule
+
+
+def test_sarif_cwe_tags():
+    """Test that CWE tags are properly formatted."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    # Find rules with CWE tags
+    rules_with_cwe = []
+    for rule in rules:
+        props = rule.get("properties", {})
+        tags = props.get("tags", [])
+        cwe_tags = [t for t in tags if t.startswith("external/cwe/cwe-")]
+        if cwe_tags:
+            rules_with_cwe.append((rule["id"], cwe_tags))
+
+    # Should have at least some rules with CWE tags
+    assert len(rules_with_cwe) > 0
+
+    # Validate CWE tag format
+    for _, cwe_tags in rules_with_cwe:
+        for tag in cwe_tags:
+            assert tag.startswith("external/cwe/cwe-")
+            cwe_num = tag[17:]  # After 'external/cwe/cwe-'
+            assert cwe_num.isdigit()
+            assert int(cwe_num) > 0
+
+
+def test_sarif_severity_levels():
+    """Test that different severity levels are properly mapped."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    results = run["results"]
+
+    # Collect severity levels
+    levels = set()
+    for result in results:
+        levels.add(result["level"])
+
+    # Should have at least error level
+    assert "error" in levels
+
+    # Valid SARIF levels
+    valid_levels = {"error", "warning", "note", "none"}
+    for level in levels:
+        assert level in valid_levels
+
+
+def test_sarif_instance_specific_messages():
+    """Test that result messages contain instance-specific information."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    results = run["results"]
+
+    # Check that messages are instance-specific
+    found_specific_messages = False
+
+    for result in results:
+        message_text = result["message"]["text"]
+        rule_id = result["ruleId"]
+
+        # Skip system include warnings
+        if rule_id == "missingIncludeSystem":
+            continue
+
+        # Messages should not be empty
+        assert len(message_text) > 0
+
+        # Check for specific variable names or values from our test code
+        if rule_id == "nullPointer" and "ptr" in message_text:
+            found_specific_messages = True
+        elif rule_id == "arrayIndexOutOfBounds" and (
+            "array" in message_text or "10" in message_text
+        ):
+            found_specific_messages = True
+        elif rule_id == "uninitvar" and "x" in message_text:
+            found_specific_messages = True
+        elif rule_id == "memleak" and "mem" in message_text:
+            found_specific_messages = True
+        elif rule_id == "doubleFree" and "p" in message_text:
+            found_specific_messages = True
+
+    assert (
+        found_specific_messages
+    ), "Should find at least some instance-specific messages"
+
+
+def test_sarif_location_info():
+    """Test that location information is correct."""
+    sarif = run_sarif_check(BASIC_TEST_CODE)
+
+    run = sarif["runs"][0]
+    results = run["results"]
+
+    for result in results:
+        assert "locations" in result
+        locations = result["locations"]
+        assert len(locations) > 0
+
+        for location in locations:
+            assert "physicalLocation" in location
+            phys_loc = location["physicalLocation"]
+
+            assert "artifactLocation" in phys_loc
+            assert "uri" in phys_loc["artifactLocation"]
+
+            assert "region" in phys_loc
+            region = phys_loc["region"]
+
+            # SARIF requires line and column numbers >= 1
+            assert "startLine" in region
+            assert region["startLine"] >= 1
+
+            assert "startColumn" in region
+            assert region["startColumn"] >= 1
+
+
+def test_sarif_with_multiple_files(tmp_path):
+    """Test SARIF output with multiple source files."""
+    # Create two test files
+    file1_content = """
+    void test1() {
+        int* p = nullptr;
+        *p = 1;
+    }
+    """
+
+    file2_content = """
+    void test2() {
+        int arr[5];
+        arr[10] = 2;
+    }
+    """
+
+    file1 = tmp_path / "file1.cpp"
+    file2 = tmp_path / "file2.cpp"
+    file1.write_text(file1_content)
+    file2.write_text(file2_content)
+
+    args = ["--output-format=sarif", "--enable=all", str(tmp_path)]
+
+    _, _, stderr = cppcheck(args)
+    sarif = json.loads(stderr)
+
+    run = sarif["runs"][0]
+    results = run["results"]
+
+    # Should have results from both files
+    files = set()
+    for result in results:
+        if "locations" in result:
+            for location in result["locations"]:
+                uri = location["physicalLocation"]["artifactLocation"]["uri"]
+                files.add(os.path.basename(uri))
+
+    assert "file1.cpp" in files or "file2.cpp" in files
+
+
+def test_sarif_default_configuration():
+    """Test that rules have default configuration with level."""
+    sarif = run_sarif_check(BASIC_TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    for rule in rules:
+        # Check for defaultConfiguration.level (#13885)
+        assert "defaultConfiguration" in rule
+        assert "level" in rule["defaultConfiguration"]
+
+        level = rule["defaultConfiguration"]["level"]
+        assert level in ["error", "warning", "note", "none"]
+
+
+def test_sarif_rule_properties():
+    """Test that rules have required properties."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    for rule in rules:
+        assert "properties" in rule
+        props = rule["properties"]
+
+        # Required properties
+        assert "precision" in props
+        assert props["precision"] in ["very-high", "high", "medium", "low"]
+
+        assert "problem.severity" in props
+        assert props["problem.severity"] in [
+            "error",
+            "warning",
+            "style",
+            "performance",
+            "portability",
+            "information",
+            "note",
+        ]
+
+
+def test_sarif_rule_coverage():
+    """Test that a variety of rules are triggered by comprehensive test code."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    # Collect all rule IDs
+    rule_ids = set(rule["id"] for rule in rules)
+
+    # Should have at least 5 different rules triggered
+    assert (
+        len(rule_ids) >= 5
+    ), f"Expected at least 5 rules, found {len(rule_ids)}: {rule_ids}"
+
+    # Check for some specific expected rules from different categories
+    expected_rules = [
+        "nullPointer",  # Security
+        "arrayIndexOutOfBounds",  # Security
+        "memleak",  # Security
+        "uninitvar",  # Security
+        "unusedVariable",  # Style
+        "redundantAssignment",  # Style
+        "unusedFunction",  # Style (if enabled)
+        "constParameter",  # Style/Performance
+        "cstyleCast",  # Style
+        "variableScope",  # Style
+    ]
+
+    found_expected_rules = sum(1 for rule in expected_rules if rule in rule_ids)
+
+    # Should find at least 3 of our expected rules
+    assert (
+        found_expected_rules >= 3
+    ), f"Expected at least 3 known rules, found {found_expected_rules}"
+
+
+def test_sarif_generic_descriptions():
+    """Test that ALL rule descriptions are empty for GitHub integration."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    assert len(rules) > 0, "Should have at least one rule"
+
+    # Verify that ALL rule descriptions are empty so GitHub uses instance-specific messages
+    for rule in rules:
+        rule_id = rule["id"]
+
+        # All rules must have these fields
+        assert "name" in rule, f"Rule {rule_id} missing 'name'"
+        assert "shortDescription" in rule, f"Rule {rule_id} missing 'shortDescription'"
+        assert "fullDescription" in rule, f"Rule {rule_id} missing 'fullDescription'"
+
+        # The key test: ALL descriptions should be empty
+        assert (
+            rule["name"] == ""
+        ), f"Rule {rule_id} name should be empty, got: {rule['name']}"
+        assert (
+            rule["shortDescription"]["text"] == ""
+        ), f"Rule {rule_id} shortDescription should be empty, got: {rule['shortDescription']['text']}"
+        assert (
+            rule["fullDescription"]["text"] == ""
+        ), f"Rule {rule_id} fullDescription should be empty, got: {rule['fullDescription']['text']}"
+
+
+def test_sarif_security_rules_classification():
+    """Test that security classification is correctly based on CWE IDs."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+
+    found_rule_with_cwe = False
+    found_rule_without_cwe = False
+
+    for rule in rules:
+        rule_id = rule["id"]
+        props = rule.get("properties", {})
+        tags = props.get("tags", [])
+
+        # Check if rule has CWE tag
+        cwe_tags = [t for t in tags if t.startswith("external/cwe/")]
+        has_cwe = len(cwe_tags) > 0
+
+        if has_cwe:
+            found_rule_with_cwe = True
+
+            # Rules with CWE should have security-severity and security tag
+            assert (
+                "security-severity" in props
+            ), f"Rule {rule_id} with CWE should have security-severity"
+            assert (
+                float(props["security-severity"]) > 0
+            ), f"Rule {rule_id} security-severity should be positive"
+
+            # Check for security tag
+            assert (
+                "security" in tags
+            ), f"Rule {rule_id} with CWE should have 'security' tag"
+        else:
+            found_rule_without_cwe = True
+
+            # Rules without CWE should NOT have security-severity or security tag
+            assert (
+                "security-severity" not in props
+            ), f"Rule {rule_id} without CWE should not have security-severity"
+            assert (
+                "security" not in tags
+            ), f"Rule {rule_id} without CWE should not have 'security' tag"
+
+        # All rules should still have basic properties
+        assert "precision" in props, f"Rule {rule_id} missing 'precision'"
+        assert "problem.severity" in props, f"Rule {rule_id} missing 'problem.severity'"
+
+    # Should find at least some rules in test data
+    assert (
+        found_rule_with_cwe or found_rule_without_cwe
+    ), "Should find at least some rules with or without CWE"
+
+
+def test_sarif_results_consistency():
+    """Test consistency between rule definitions and results."""
+    sarif = run_sarif_check(TEST_CODE)
+
+    run = sarif["runs"][0]
+    driver = run["tool"]["driver"]
+    rules = driver["rules"]
+    results = run["results"]
+
+    # Collect rule IDs from both rules and results
+    rule_ids_in_rules = set(rule["id"] for rule in rules)
+    rule_ids_in_results = set(result["ruleId"] for result in results)
+
+    # Every rule ID in results should have a corresponding rule definition
+    for result_rule_id in rule_ids_in_results:
+        assert (
+            result_rule_id in rule_ids_in_rules
+        ), f"Result references undefined rule: {result_rule_id}"
+
+    # Verify severity level consistency
+    severity_levels = set()
+    for result in results:
+        level = result["level"]
+        severity_levels.add(level)
+
+        # Valid SARIF levels
+        assert level in [
+            "error",
+            "warning",
+            "note",
+            "none",
+        ], f"Invalid severity level: {level}"
+
+    # Should have at least error level
+    assert "error" in severity_levels, "Should have at least one error"
+
+    # Should have multiple severity levels for comprehensive test
+    assert (
+        len(severity_levels) >= 2
+    ), f"Expected multiple severity levels, found: {severity_levels}"
diff --git a/test/cli/slnx-folders/app/app.cpp b/test/cli/slnx-folders/app/app.cpp
new file mode 100644
index 00000000000..3454c2de254
--- /dev/null
+++ b/test/cli/slnx-folders/app/app.cpp
@@ -0,0 +1,7 @@
+#include "../lib/lib.h"
+
+int main(int argc, char *argv[])
+{
+	int x = 3 / 0; (void)x; // ERROR
+	return foo();
+}
diff --git a/test/cli/slnx-folders/app/app.vcxproj b/test/cli/slnx-folders/app/app.vcxproj
new file mode 100644
index 00000000000..b72ae55c565
--- /dev/null
+++ b/test/cli/slnx-folders/app/app.vcxproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>18.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{0de77c38-881a-4f9f-bdfa-2c429968985e}</ProjectGuid>
+    <RootNamespace>unused</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>..\x64\Debug\</OutDir>
+    <IntDir>x64\Debug\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\x64\Release\</OutDir>
+    <IntDir>x64\Release\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../lib</AdditionalLibraryDirectories>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="app.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lib\lib.vcxproj">
+      <Project>{93BE1430-BE74-35DF-1882-AF70E49C9898}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/test/cli/slnx-folders/lib/lib.cpp b/test/cli/slnx-folders/lib/lib.cpp
new file mode 100644
index 00000000000..b4a89cee1c7
--- /dev/null
+++ b/test/cli/slnx-folders/lib/lib.cpp
@@ -0,0 +1,9 @@
+#include <iostream>
+#include "lib.h"
+
+int foo()
+{
+	std::cout << "hello world\n";
+	int x = 3 / 0; (void)x; // ERROR
+	return 0;
+}
diff --git a/test/cli/slnx-folders/lib/lib.h b/test/cli/slnx-folders/lib/lib.h
new file mode 100644
index 00000000000..cf790ac3eab
--- /dev/null
+++ b/test/cli/slnx-folders/lib/lib.h
@@ -0,0 +1 @@
+extern int foo();
diff --git a/test/cli/slnx-folders/lib/lib.vcxproj b/test/cli/slnx-folders/lib/lib.vcxproj
new file mode 100644
index 00000000000..232c2478e2f
--- /dev/null
+++ b/test/cli/slnx-folders/lib/lib.vcxproj
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>18.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{93BE1430-BE74-35DF-1882-AF70E49C9898}</ProjectGuid>
+    <RootNamespace>unused</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>..\x64\Debug\</OutDir>
+    <IntDir>x64\Debug\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\x64\Release\</OutDir>
+    <IntDir>x64\Release\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../lib</AdditionalLibraryDirectories>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Manifest>
+      <EnableSegmentHeap>true</EnableSegmentHeap>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="lib.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/test/cli/slnx-folders/slnx-folders.cppcheck b/test/cli/slnx-folders/slnx-folders.cppcheck
new file mode 100644
index 00000000000..4fa0c4e7623
--- /dev/null
+++ b/test/cli/slnx-folders/slnx-folders.cppcheck
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <builddir>slnx-folders-cppcheck-build-dir</builddir>
+    <importproject>slnx-folders.slnx</importproject>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+    <check-headers>true</check-headers>
+    <check-unused-templates>true</check-unused-templates>
+    <inline-suppression>true</inline-suppression>
+    <max-ctu-depth>2</max-ctu-depth>
+    <max-template-recursion>100</max-template-recursion>
+    <vs-configurations>
+        <config>Debug</config>
+        <config>Release</config>
+    </vs-configurations>
+    <check-level-normal/>
+    <project-name>slnx-folders</project-name>
+</project>
diff --git a/test/cli/slnx-folders/slnx-folders.slnx b/test/cli/slnx-folders/slnx-folders.slnx
new file mode 100644
index 00000000000..ce6b9014431
--- /dev/null
+++ b/test/cli/slnx-folders/slnx-folders.slnx
@@ -0,0 +1,12 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Folder Name="/Lib/">
+    <File Path="lib/lib.h" />
+    <Project Path="lib\lib.vcxproj" />
+  </Folder>
+  <Folder Name="/App/">
+    <Project Path="app\app.vcxproj" Id="0de77c38-881a-4f9f-bdfa-2c429968985e" />
+  </Folder>
+</Solution>
diff --git a/test/cli/slnx-folders_test.py b/test/cli/slnx-folders_test.py
new file mode 100644
index 00000000000..b9dd5f09c92
--- /dev/null
+++ b/test/cli/slnx-folders_test.py
@@ -0,0 +1,73 @@
+
+# python -m pytest slnx-folders_test.py
+
+import os
+import re
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'slnx-folders')
+
+def get_lines(s):
+    return sorted(s.split('\n'))
+
+# Get Visual Studio configurations checking a file
+# Checking {file} {config}...
+def __getVsConfigs(stdout, filename):
+    ret = []
+    for line in stdout.split('\n'):
+        if not line.startswith('Checking %s ' % filename):
+            continue
+        if not line.endswith('...'):
+            continue
+        res = re.match(r'.* ([A-Za-z0-9|]+)...', line)
+        if res:
+            ret.append(res.group(1))
+    ret.sort()
+    return ' '.join(ret)
+
+def test_relative_path():
+    args = [
+        '--template=cppcheck1',
+        'slnx-folders'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename1 = os.path.join('slnx-folders', 'app', 'app.cpp')
+    filename2 = os.path.join('slnx-folders', 'lib', 'lib.cpp')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:5]: (error) Division by zero.\n'
+        '[%s:7]: (error) Division by zero.\n' % (filename1, filename2)
+    )
+    assert get_lines(stderr) == get_lines(expected)
+
+def test_local_path():
+    args = [
+        '--template=cppcheck1',
+        '.'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__proj_dir)
+    filename1 = os.path.join('app', 'app.cpp')
+    filename2 = os.path.join('lib', 'lib.cpp')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:5]: (error) Division by zero.\n'
+        '[%s:7]: (error) Division by zero.\n' % (filename1, filename2)
+    )
+    assert get_lines(stderr) == get_lines(expected)
+
+def test_absolute_path():
+    args = [
+        '--template=cppcheck1',
+        __proj_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    filename1 = os.path.join(__proj_dir, 'app', 'app.cpp')
+    filename2 = os.path.join(__proj_dir, 'lib', 'lib.cpp')
+    assert ret == 0, stdout
+    expected = (
+        '[%s:5]: (error) Division by zero.\n'
+        '[%s:7]: (error) Division by zero.\n' % (filename1, filename2)
+    )
+    assert get_lines(stderr) == get_lines(expected)
diff --git a/test/cli/testutils.py b/test/cli/testutils.py
index f352af49f15..2140c42205b 100644
--- a/test/cli/testutils.py
+++ b/test/cli/testutils.py
@@ -5,6 +5,7 @@
 import subprocess
 import time
 import tempfile
+import json
 
 # Create Cppcheck project file
 import sys
@@ -45,6 +46,22 @@ def create_gui_project_file(project_file, root_path=None, import_project=None, p
         f.write(cppcheck_xml)
 
 
+def create_compile_commands(compdb_file, files):
+    compdb = []
+    # TODO: bail out on empty list
+    for f in files:
+        compdb.append(
+            {
+                "file": str(f),
+                "directory": os.path.dirname(f),
+                "command": "gcc -c {}".format(os.path.basename(f))
+            }
+        )
+    compdb_j = json.dumps(compdb)
+    with open(compdb_file, 'wt') as f:
+        f.write(compdb_j)
+
+
 def __lookup_cppcheck_exe():
     # path the script is located in
     script_path = os.path.dirname(os.path.realpath(__file__))
diff --git a/test/cli/unused_function_test.py b/test/cli/unused_function_test.py
index 564becb5bc8..591986f1dde 100644
--- a/test/cli/unused_function_test.py
+++ b/test/cli/unused_function_test.py
@@ -44,7 +44,7 @@ def __test_unused_functions(extra_args):
     ret, stdout, stderr = cppcheck(args)
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [
-        "{}3.c:3:0: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
+        "{}3.c:3:6: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
     ]
     assert ret == 0, stdout
 
@@ -103,7 +103,7 @@ def __test_unused_functions_project(extra_args):
     ret, stdout, stderr = cppcheck(args)
     assert stdout.splitlines() == []
     assert [
-        "{}3.c:3:0: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
+        "{}3.c:3:6: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
     ] == stderr.splitlines()
     assert ret == 0, stdout
 
@@ -163,7 +163,7 @@ def __test_unused_functions_compdb(tmpdir, extra_args):
     ret, stdout, stderr = cppcheck(args)
     assert stdout.splitlines() == []
     assert stderr.splitlines() == [
-        "{}3.c:3:0: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
+        "{}3.c:3:6: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
     ]
     assert ret == 0, stdout
 
diff --git a/test/cli/whole-program/odr3.cpp b/test/cli/whole-program/odr3.cpp
new file mode 100644
index 00000000000..a4c555e5b7e
--- /dev/null
+++ b/test/cli/whole-program/odr3.cpp
@@ -0,0 +1,6 @@
+// #10431
+#ifdef X
+struct S { S() {} };
+#else
+struct S {};
+#endif
diff --git a/test/cli/whole-program/odr_cfg1.cpp b/test/cli/whole-program/odr_cfg1.cpp
new file mode 100644
index 00000000000..c50bdda949f
--- /dev/null
+++ b/test/cli/whole-program/odr_cfg1.cpp
@@ -0,0 +1,3 @@
+#ifdef X
+struct S {};
+#endif
diff --git a/test/cli/whole-program/odr_cfg2.cpp b/test/cli/whole-program/odr_cfg2.cpp
new file mode 100644
index 00000000000..2b439177aad
--- /dev/null
+++ b/test/cli/whole-program/odr_cfg2.cpp
@@ -0,0 +1,3 @@
+struct S {
+    S() {}
+};
diff --git a/test/cli/whole-program_test.py b/test/cli/whole-program_test.py
index 01b79a4060c..dfb4e8112d1 100644
--- a/test/cli/whole-program_test.py
+++ b/test/cli/whole-program_test.py
@@ -254,7 +254,8 @@ def __test_checkclass(extra_args):
         '--enable=information,style',
         '--error-exitcode=1',
         'whole-program/odr1.cpp',
-        'whole-program/odr2.cpp'
+        'whole-program/odr2.cpp',
+        'whole-program/odr3.cpp'
     ]
 
     args += extra_args
@@ -336,6 +337,25 @@ def test_checkclass_project_builddir_j(tmpdir):
     os.mkdir(build_dir)
     __test_checkclass_project(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir)])
 
+def test_ctu_odr_config():
+    args = [
+        '-q',
+        '-j1',
+        '--template=simple',
+        '--enable=information,style',
+        '--error-exitcode=1',
+        'whole-program/odr_cfg1.cpp',
+        'whole-program/odr_cfg2.cpp'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == [
+        "whole-program{}odr_cfg1.cpp:2:1: error: The one definition rule is violated, different classes/structs have the same name 'S' [ctuOneDefinitionRuleViolation]".format(os.path.sep)
+    ]
+    assert stdout == ''
+    assert ret == 1, stdout
+
 
 def __test_nullpointer_file0(extra_args):
     args = [
diff --git a/test/fixture.cpp b/test/fixture.cpp
index fc285294a41..de42837a56e 100644
--- a/test/fixture.cpp
+++ b/test/fixture.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,12 +18,12 @@
 
 #include "fixture.h"
 
-#include "cppcheck.h"
 #include "errortypes.h"
 #include "helpers.h"
 #include "library.h"
 #include "options.h"
 #include "redirect.h"
+#include "timer.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -89,36 +89,44 @@ TestFixture::TestFixture(const char * const _name)
     : classname(_name)
 {}
 
+TestFixture::~TestFixture() = default;
 
 bool TestFixture::prepareTest(const char testname[])
 {
-    mVerbose = false;
     mTemplateFormat.clear();
     mTemplateLocation.clear();
-    CppCheck::resetTimerResults();
 
     prepareTestInternal();
 
     // Check if tests should be executed
-    if (testToRun.empty() || testToRun == testname) {
-        // Tests will be executed - prepare them
-        mTestname = testname;
-        ++countTests;
-        if (quiet_tests) {
-            std::putchar('.'); // Use putchar to write through redirection of std::cout/cerr
-            std::fflush(stdout);
-        } else {
-            std::cout << classname << "::" << mTestname << std::endl;
-        }
-        return !dry_run;
+    if (!testsToRun.empty()) {
+        const bool match = testsToRun.count(testname);
+        if ((match && exclude_tests) || (!match && !exclude_tests))
+            return false;
+    }
+
+    // Tests will be executed - prepare them
+    mTestname = testname;
+    ++countTests;
+    std::string fullTestName =  classname + "::" + mTestname;
+    if (quiet_tests) {
+        std::putchar('.'); // Use putchar to write through redirection of std::cout/cerr
+        std::fflush(stdout);
+    } else {
+        std::cout << fullTestName << std::endl;
     }
-    return false;
+    if (timer_results)
+        mTimer.reset(new Timer(fullTestName, timer_results));
+    return !dry_run;
 }
 
 void TestFixture::teardownTest()
 {
     teardownTestInternal();
 
+    if (mTimer)
+        mTimer->stop();
+
     {
         const std::string s = errout_str();
         if (!s.empty())
@@ -349,12 +357,13 @@ void TestFixture::printHelp()
         "    -q                   Do not print the test cases that have run.\n"
         "    -h, --help           Print this help.\n"
         "    -n                   Print no summaries.\n"
-        "    -d                   Do not execute the tests.\n";
+        "    -d                   Do not execute any tests (dry run).\n"
+        "    -x                   Exclude the specified tests.\n";
 }
 
-void TestFixture::run(const std::string &str)
+void TestFixture::run(const std::set<std::string> &tests)
 {
-    testToRun = str;
+    testsToRun = tests;
     try {
         if (quiet_tests) {
             std::cout << '\n' << classname << ':';
@@ -382,7 +391,9 @@ void TestFixture::processOptions(const options& args)
 {
     quiet_tests = args.quiet();
     dry_run = args.dry_run();
+    exclude_tests = args.exclude_tests();
     exename = args.exe();
+    timer_results = args.timer_results();
 }
 
 std::size_t TestFixture::runTests(const options& args)
@@ -390,21 +401,31 @@ std::size_t TestFixture::runTests(const options& args)
     countTests = 0;
     errmsg.str("");
 
+    const auto& which_tests = args.which_tests();
+    const auto exclude_tests = args.exclude_tests();
+
     // TODO: bail out when given class/test is not found?
-    for (std::string classname : args.which_test()) {
-        std::string testname;
-        if (classname.find("::") != std::string::npos) {
-            testname = classname.substr(classname.find("::") + 2);
-            classname.erase(classname.find("::"));
+    for (TestInstance * test : TestRegistry::theInstance().tests())
+    {
+        std::set<std::string> tests;
+        if (!which_tests.empty()) {
+            const auto it = which_tests.find(test->classname);
+            const bool match = it != which_tests.cend();
+            if (match && exclude_tests && it->second.empty()) // only bailout when the whole fixture is excluded
+                continue;
+            if (!match && !exclude_tests)
+                continue;
+            if (match)
+                tests = it->second;
         }
 
-        for (TestInstance * test : TestRegistry::theInstance().tests()) {
-            if (classname.empty() || test->classname == classname) {
-                TestFixture* fixture = test->create();
-                fixture->processOptions(args);
-                fixture->run(testname);
-            }
-        }
+        TestFixture* fixture;
+        const auto f = [&](){
+            fixture = test->create();
+        };
+        Timer::run(test->classname + " - create", args.timer_results(), f);
+        fixture->processOptions(args);
+        fixture->run(tests);
     }
 
     if (args.summary() && !args.dry_run()) {
@@ -439,7 +460,7 @@ void TestFixture::reportErr(const ErrorMessage &msg)
         return;
     std::string errormessage;
     if (!mTemplateFormat.empty()) {
-        errormessage = msg.toString(mVerbose, mTemplateFormat, mTemplateLocation);
+        errormessage = msg.toString(false, mTemplateFormat, mTemplateLocation);
     }
     else {
         if (!msg.callStack.empty()) {
diff --git a/test/fixture.h b/test/fixture.h
index 37a3fadd8cc..c5828033fd7 100644
--- a/test/fixture.h
+++ b/test/fixture.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,6 +24,7 @@
 #include "color.h"
 #include "config.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
@@ -31,8 +32,8 @@
 #include <cstddef>
 #include <cstdint>
 #include <exception>
-#include <list>
 #include <memory>
+#include <set>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -41,8 +42,8 @@
 
 class options;
 class Tokenizer;
-enum class Certainty : std::uint8_t;
-enum class Severity : std::uint8_t;
+class Timer;
+class TimerResultsIntf;
 
 class TestFixture : public ErrorLogger {
 private:
@@ -51,16 +52,17 @@ class TestFixture : public ErrorLogger {
     static std::size_t fails_counter;
     static std::size_t todos_counter;
     static std::size_t succeeded_todos_counter;
-    bool mVerbose{};
     std::string mTemplateFormat;
     std::string mTemplateLocation;
     std::string mTestname;
 
 protected:
     std::string exename;
-    std::string testToRun;
+    std::set<std::string> testsToRun;
     bool quiet_tests{};
     bool dry_run{};
+    bool exclude_tests{};
+    TimerResultsIntf* timer_results{};
     bool mNewTemplate{};
 
     virtual void run() = 0;
@@ -79,8 +81,10 @@ class TestFixture : public ErrorLogger {
     void assertEquals(const char* const filename, const unsigned int linenr, const T& expected, const T& actual, const std::string& msg = "") const {
         if (expected != actual) {
             std::ostringstream expectedStr;
+            // NOLINTNEXTLINE(bugprone-unintended-char-ostream-output) - chars being treated as integers is acceptable here
             expectedStr << expected;
             std::ostringstream actualStr;
+            // NOLINTNEXTLINE(bugprone-unintended-char-ostream-output) - chars being treated as integers is acceptable here
             actualStr << actual;
 
             assertFailure(filename, linenr, expectedStr.str(), actualStr.str(), msg);
@@ -122,10 +126,6 @@ class TestFixture : public ErrorLogger {
     void assertNoThrowFail(const char * filename, unsigned int linenr, bool bailout) const;
     static std::string deleteLineNumber(const std::string &message);
 
-    void setVerbose(bool v) {
-        mVerbose = v;
-    }
-
     void setTemplateFormat(const std::string &templateFormat);
 
     void setMultiline() {
@@ -134,21 +134,13 @@ class TestFixture : public ErrorLogger {
 
     void processOptions(const options& args);
 
-    template<typename T>
-    static T& getCheck()
+    static Check& getCheck(Check& check)
     {
-        for (Check *check : Check::instances()) {
-            //cppcheck-suppress useStlAlgorithm
-            if (T* c = dynamic_cast<T*>(check))
-                return *c;
-        }
-        throw std::runtime_error("instance not found");
+        return check;
     }
 
-    template<typename T>
-    static void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+    static void runChecks(Check& check, const Tokenizer &tokenizer, ErrorLogger& errorLogger)
     {
-        Check& check = getCheck<T>();
         check.runChecks(tokenizer, errorLogger);
     }
 
@@ -160,7 +152,7 @@ class TestFixture : public ErrorLogger {
 
         SettingsBuilder& severity(Severity sev, bool b = true) {
             if (REDUNDANT_CHECK && settings.severity.isEnabled(sev) == b)
-                throw std::runtime_error("redundant setting: severity");
+                throw std::runtime_error("redundant setting: severity - " + severityToString(sev));
             settings.severity.setEnabled(sev, b);
             return *this;
         }
@@ -250,7 +242,7 @@ class TestFixture : public ErrorLogger {
         const TestFixture &fixture;
         Settings settings;
 
-        const bool REDUNDANT_CHECK = false;
+        static constexpr bool REDUNDANT_CHECK = false;
     };
 
     SettingsBuilder settingsBuilder() const {
@@ -288,15 +280,22 @@ class TestFixture : public ErrorLogger {
     std::ostringstream mOutput;
     std::ostringstream mErrout;
 
-    void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
+    std::unique_ptr<Timer> mTimer;
+
+    void reportOut(const std::string &outmsg, Color /*c*/ = Color::Reset) override;
     void reportErr(const ErrorMessage &msg) override;
-    void run(const std::string &str);
+    void reportMetric(const std::string &metric) override
+    {
+        (void) metric;
+    }
+    void run(const std::set<std::string> &tests);
 
 public:
     static void printHelp();
     const std::string classname;
 
     explicit TestFixture(const char * _name);
+    ~TestFixture() override;
 
     static std::size_t runTests(const options& args);
 };
@@ -313,9 +312,10 @@ class TestInstance {
     std::unique_ptr<TestFixture> impl;
 };
 
-#define TEST_CASE( NAME ) do { if (prepareTest(#NAME)) { setVerbose(false); try { NAME(); teardownTest(); } catch (const AssertFailedError&) {} catch (...) { assertNoThrowFail(__FILE__, __LINE__, false); } } } while (false)
+#define TEST_CASE( NAME ) do { if (prepareTest(#NAME)) { try { NAME(); teardownTest(); } catch (const AssertFailedError&) {} catch (...) { assertNoThrowFail(__FILE__, __LINE__, false); } } } while (false)
 
 #define ASSERT( CONDITION ) assert_(__FILE__, __LINE__, (CONDITION))
+#define ASSERT_MSG( CONDITION, MSG ) assert_(__FILE__, __LINE__, (CONDITION), MSG)
 #define ASSERT_LOC( CONDITION, FILE_, LINE_ ) assert_(FILE_, LINE_, (CONDITION))
 #define ASSERT_LOC_MSG( CONDITION, MSG, FILE_, LINE_ ) assert_(FILE_, LINE_, (CONDITION), MSG)
 // *INDENT-OFF*
@@ -330,8 +330,7 @@ class TestInstance {
 #define ASSERT_EQUALS_ENUM_LOC( EXPECTED, ACTUAL, FILE_, LINE_ ) assertEqualsEnum(FILE_, LINE_, (EXPECTED), (ACTUAL))
 #define ASSERT_EQUALS_ENUM_LOC_MSG( EXPECTED, ACTUAL, MSG, FILE_, LINE_ ) assertEqualsEnum(FILE_, LINE_, (EXPECTED), (ACTUAL), MSG)
 #define TODO_ASSERT_EQUALS_ENUM( WANTED, CURRENT, ACTUAL ) todoAssertEqualsEnum(__FILE__, __LINE__, WANTED, CURRENT, ACTUAL)
-#define ASSERT_THROW_EQUALS( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.errorMessage); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
-#define ASSERT_THROW_EQUALS_2( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.what()); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
+#define ASSERT_THROW_EQUALS( CMD, EXCEPTION, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.what()); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
 #define ASSERT_THROW_INTERNAL( CMD, TYPE ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const InternalError& e) { assertEqualsEnum(__FILE__, __LINE__, InternalError::TYPE, e.type); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
 #define ASSERT_THROW_INTERNAL_EQUALS( CMD, TYPE, EXPECTED ) do { try { (void)(CMD); assertThrowFail(__FILE__, __LINE__); } catch (const AssertFailedError&) { throw; } catch (const InternalError& e) { assertEqualsEnum(__FILE__, __LINE__, InternalError::TYPE, e.type); assertEquals(__FILE__, __LINE__, EXPECTED, e.errorMessage); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
 #define ASSERT_NO_THROW( CMD ) do { try { (void)(CMD); } catch (const AssertFailedError&) { throw; } catch (...) { assertNoThrowFail(__FILE__, __LINE__, true); } } while (false)
diff --git a/test/helpers.cpp b/test/helpers.cpp
index 8f9d83dd0d1..06ad0c4c298 100644
--- a/test/helpers.cpp
+++ b/test/helpers.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -30,7 +30,6 @@
 #include <iostream>
 #include <fstream>
 #include <list>
-#include <map>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -46,8 +45,6 @@
 
 #include "xml.h"
 
-class SuppressionList;
-
 const Settings SimpleTokenizer::s_settings;
 
 // TODO: better path-only usage
@@ -87,7 +84,7 @@ ScopedFile::~ScopedFile() {
         // TODO: simplify the function call
         // hack to be able to delete *.plist output files
         std::list<FileWithDetails> files;
-        const std::string res = FileLister::addFiles(files, mPath, {".plist"}, false, PathMatch({}));
+        const std::string res = FileLister::addFiles(files, mPath, {".plist"}, false, PathMatch());
         if (!res.empty()) {
             std::cout << "ScopedFile(" << mPath + ") - generating file list failed (" << res << ")" << std::endl;
         }
@@ -114,67 +111,25 @@ ScopedFile::~ScopedFile() {
     }
 }
 
-// TODO: we should be using the actual Preprocessor implementation
-std::string PreprocessorHelper::getcode(const Settings& settings, ErrorLogger& errorlogger, const std::string &filedata, const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression)
-{
-    std::map<std::string, std::string> cfgcode = getcode(settings, errorlogger, filedata.c_str(), std::set<std::string>{cfg}, filename, inlineSuppression);
-    const auto it = cfgcode.find(cfg);
-    if (it == cfgcode.end())
-        return "";
-    return it->second;
-}
-
-std::map<std::string, std::string> PreprocessorHelper::getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], const std::string &filename, SuppressionList *inlineSuppression)
-{
-    return getcode(settings, errorlogger, code, {}, filename, inlineSuppression);
-}
-
-std::map<std::string, std::string> PreprocessorHelper::getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], std::set<std::string> cfgs, const std::string &filename, SuppressionList *inlineSuppression)
+void SimpleTokenizer2::preprocess(const char* code, std::size_t size, std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger)
 {
+    const Standards &standards = tokenizer.getSettings().standards;
+    const Standards::Language language = tokenizer.isCPP() ? Standards::CPP : Standards::C;
     simplecpp::OutputList outputList;
-    std::vector<std::string> files;
-
-    std::istringstream istr(code);
-    simplecpp::TokenList tokens(istr, files, Path::simplifyPath(filename), &outputList);
-    Preprocessor preprocessor(settings, errorlogger, Path::identify(tokens.getFiles()[0], false));
-    if (inlineSuppression)
-        preprocessor.inlineSuppressions(tokens, *inlineSuppression);
-    preprocessor.removeComments(tokens);
-    preprocessor.simplifyPragmaAsm(tokens);
-
-    preprocessor.reportOutput(outputList, true);
-
-    if (Preprocessor::hasErrors(outputList))
-        return {};
-
-    std::map<std::string, std::string> cfgcode;
-    if (cfgs.empty())
-        cfgs = preprocessor.getConfigs(tokens);
-    for (const std::string & config : cfgs) {
-        try {
-            // TODO: also preserve location information when #include exists - enabling that will fail since #line is treated like a regular token
-            cfgcode[config] = preprocessor.getcode(tokens, config, files, std::string(code).find("#file") != std::string::npos);
-        } catch (const simplecpp::Output &) {
-            cfgcode[config] = "";
-        }
-    }
-
-    return cfgcode;
-}
-
-void SimpleTokenizer2::preprocess(const char code[], std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger)
-{
-    // TODO: get rid of stream
-    std::istringstream istr(code);
-    const simplecpp::TokenList tokens1(istr, files, file0);
+    simplecpp::DUI dui;
+    dui.std = standards.getStdForLanguage(language);
+    simplecpp::TokenList tokens1({code, size}, files, file0, dui, &outputList);
 
-    Preprocessor preprocessor(tokenizer.getSettings(), errorlogger, Path::identify(tokens1.getFiles()[0], false));
-    simplecpp::TokenList tokens2 = preprocessor.preprocess(tokens1, "", files, true);
+    Preprocessor preprocessor(tokens1, tokenizer.getSettings(), errorlogger, Path::identify(tokens1.getFiles()[0], false));
+    (void)preprocessor.loadAllIncludes(files); // TODO: check result
+    simplecpp::TokenList tokens2 = preprocessor.preprocess("", files, outputList);
+    (void)preprocessor.reportOutput(outputList, true);
 
     // Tokenizer..
     tokenizer.list.createTokens(std::move(tokens2));
 
-    std::list<Directive> directives = preprocessor.createDirectives(tokens1);
+    std::list<Directive> directives;
+    preprocessor.createDirectives(directives);
     tokenizer.setDirectives(std::move(directives));
 }
 
diff --git a/test/helpers.h b/test/helpers.h
index b9b19620707..b91fe416045 100644
--- a/test/helpers.h
+++ b/test/helpers.h
@@ -27,15 +27,13 @@
 #include "tokenlist.h"
 
 #include <cstddef>
-#include <map>
-#include <set>
+#include <cstdio>
 #include <stdexcept>
 #include <sstream>
 #include <string>
 #include <vector>
 
 class Token;
-class SuppressionList;
 class ErrorLogger;
 namespace tinyxml2 {
     class XMLDocument;
@@ -61,30 +59,41 @@ class SimpleTokenizer : public Tokenizer {
     template<size_t size>
     bool tokenize(const char (&code)[size])
     {
-        std::istringstream istr(code);
-        return tokenize(istr, std::string(list.isCPP() ? "test.cpp" : "test.c"));
+        return tokenize(code, size-1);
     }
 
     bool tokenize(const std::string& code)
     {
-        std::istringstream istr(code);
-        return tokenize(istr, std::string(list.isCPP() ? "test.cpp" : "test.c"));
+        return tokenize(code.data(), code.size());
+    }
+
+    bool tokenize(const char* code, std::size_t size)
+    {
+        return tokenize(code, size, std::string(list.isCPP() ? "test.cpp" : "test.c"));
     }
 
 private:
     /**
      * Tokenize code
-     * @param istr The code as stream
+     * @param code The code
      * @param filename Indicates if the code is C++
      * @return false if source code contains syntax errors
      */
-    bool tokenize(std::istream& istr,
+    template<size_t size>
+    bool tokenize(const char (&code)[size],
+                  const std::string& filename)
+    {
+        return tokenize(code, size-1, filename);
+    }
+
+    bool tokenize(const char* code,
+                  std::size_t size,
                   const std::string& filename)
     {
         if (list.front())
             throw std::runtime_error("token list is not empty");
         list.appendFileIfNew(filename);
-        if (!list.createTokens(istr))
+        if (!list.createTokensFromBuffer(code, size))
             return false;
 
         return simplifyTokens1("");
@@ -101,8 +110,16 @@ class SimpleTokenList
     explicit SimpleTokenList(const char (&code)[size], Standards::Language lang = Standards::Language::CPP)
         : list{settings, lang}
     {
-        std::istringstream iss(code);
-        if (!list.createTokens(iss))
+        if (!list.createTokensFromString(code))
+            throw std::runtime_error("creating tokens failed");
+    }
+
+    template<size_t size>
+    explicit SimpleTokenList(const char (&code)[size], const std::string& file0, Standards::Language lang = Standards::Language::CPP)
+        : list{settings, lang}
+    {
+        list.appendFileIfNew(file0);
+        if (!list.createTokensFromString(code))
             throw std::runtime_error("creating tokens failed");
     }
 
@@ -114,6 +131,10 @@ class SimpleTokenList
         return list.front();
     }
 
+    const TokenList& get() const {
+        return list;
+    }
+
 private:
     const Settings settings;
     TokenList list;
@@ -145,26 +166,6 @@ class ScopedFile {
     const std::string mFullPath;
 };
 
-class PreprocessorHelper
-{
-public:
-    /**
-     * Get preprocessed code for a given configuration
-     *
-     * Note: for testing only.
-     *
-     * @param filedata file data including preprocessing 'if', 'define', etc
-     * @param cfg configuration to read out
-     * @param filename name of source file
-     * @param inlineSuppression the inline suppressions
-     */
-    static std::string getcode(const Settings& settings, ErrorLogger& errorlogger, const std::string &filedata, const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression = nullptr);
-    static std::map<std::string, std::string> getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], const std::string &filename = "file.c", SuppressionList *inlineSuppression = nullptr);
-
-private:
-    static std::map<std::string, std::string> getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], std::set<std::string> cfgs, const std::string &filename = "file.c", SuppressionList *inlineSuppression = nullptr);
-};
-
 namespace cppcheck {
     template<typename T>
     std::size_t count_all_of(const std::string& str, T sub) {
@@ -231,35 +232,30 @@ struct LibraryHelper
 };
 
 class SimpleTokenizer2 : public Tokenizer {
+    friend class TestSimplifyTypedef; // TODO: get rid of this
 public:
     template<size_t size>
     SimpleTokenizer2(const Settings &settings, ErrorLogger &errorlogger, const char (&code)[size], const std::string& file0)
         : Tokenizer{TokenList{settings, Path::identify(file0, false)}, errorlogger}
     {
-        preprocess(code, mFiles, file0, *this, errorlogger);
-    }
-
-    // TODO: get rid of this
-    SimpleTokenizer2(const Settings &settings, ErrorLogger &errorlogger, const char code[], const std::string& file0)
-        : Tokenizer{TokenList{settings, Path::identify(file0, false)}, errorlogger}
-    {
-        preprocess(code, mFiles, file0, *this, errorlogger);
+        preprocess(code, size-1, mFiles, file0, *this, errorlogger);
     }
 
 private:
-    static void preprocess(const char code[], std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger);
+    static void preprocess(const char* code, std::size_t size, std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger);
 
     std::vector<std::string> mFiles;
 };
 
 struct TokenListHelper
 {
-    static bool createTokens(TokenList& tokenlist, std::istream& istr, const std::string& file)
+    template<size_t size>
+    static bool createTokensFromString(TokenList& tokenlist, const char (&code)[size], const std::string& file)
     {
         if (tokenlist.front())
             throw std::runtime_error("token list is not empty");
         tokenlist.appendFileIfNew(file);
-        return tokenlist.createTokens(istr);
+        return tokenlist.createTokensFromString(code);
     }
 };
 
diff --git a/test/main.cpp b/test/main.cpp
index 571b126922d..e0495583494 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,14 +22,10 @@
 #include "fixture.h"
 
 #include <cstdlib>
+#include <iostream>
 
 int main(int argc, char *argv[])
 {
-    // MS Visual C++ memory leak debug tracing
-#if defined(_MSC_VER) && defined(_DEBUG)
-    _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
-#endif
-
     Preprocessor::macroChar = '$';     // While macroChar is char(1) per default outside test suite, we require it to be a human-readable character here.
     gDisableColors = true;
 
@@ -39,6 +35,13 @@ int main(int argc, char *argv[])
         TestFixture::printHelp();
         return EXIT_SUCCESS;
     }
+    if (!args.errors().empty()) {
+        for (const auto& error : args.errors())
+        {
+            std::cout << "error: " << error << '\n';
+        }
+        return EXIT_FAILURE;
+    }
     const std::size_t failedTestsCount = TestFixture::runTests(args);
     return (failedTestsCount == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/test/options.cpp b/test/options.cpp
index e8b3be139ae..757b6cdff86 100644
--- a/test/options.cpp
+++ b/test/options.cpp
@@ -1,5 +1,5 @@
 // Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2025 Cppcheck team.
+// Copyright (C) 2007-2026 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
@@ -16,24 +16,50 @@
 
 #include "options.h"
 
+#include "timer.h"
+
 options::options(int argc, const char* const argv[])
-    : mWhichTests(argv + 1, argv + argc)
-    ,mQuiet(mWhichTests.count("-q") != 0)
-    ,mHelp(mWhichTests.count("-h") != 0 || mWhichTests.count("--help"))
-    ,mSummary(mWhichTests.count("-n") == 0)
-    ,mDryRun(mWhichTests.count("-d") != 0)
-    ,mExe(argv[0])
+    : mExe(argv[0])
 {
-    for (auto it = mWhichTests.cbegin(); it != mWhichTests.cend();) {
-        if (!it->empty() && (((*it)[0] == '-') || (it->find("::") != std::string::npos && mWhichTests.count(it->substr(0, it->find("::"))))))
-            it = mWhichTests.erase(it);
-        else
-            ++it;
+    const std::set<std::string> args(argv + 1, argv + argc);
+    for (const auto& arg : args) {
+        if (arg.empty())
+            continue; // empty argument
+        if (arg[0] == '-') {
+            if (arg == "-q")
+                mQuiet = true;
+            else if (arg == "-h" || arg == "--help")
+                mHelp = true;
+            else if (arg == "-n")
+                mSummary = false;
+            else if (arg == "-d")
+                mDryRun = true;
+            else if (arg == "-x")
+                mExcludeTests = true;
+            else if (arg == "-t")
+                mTimerResults.reset(new TimerResults);
+            else
+                mErrors.emplace_back("unknown option '" + arg + "'");
+            continue; // command-line switch
+        }
+        const auto pos = arg.find("::");
+        if (pos == std::string::npos) {
+            mWhichTests[arg] = {}; // run whole fixture
+            continue;
+        }
+        const std::string fixture = arg.substr(0, pos);
+        const auto it = mWhichTests.find(fixture);
+        if (it != mWhichTests.cend() && it->second.empty())
+            continue; // whole fixture is already included
+        const std::string test = arg.substr(pos+2);
+        mWhichTests[fixture].emplace(test); // run individual test
     }
+}
 
-    if (mWhichTests.empty()) {
-        mWhichTests.insert("");
-    }
+options::~options()
+{
+    if (mTimerResults)
+        mTimerResults->showResults(10, false);
 }
 
 bool options::quiet() const
@@ -56,7 +82,7 @@ bool options::dry_run() const
     return mDryRun;
 }
 
-const std::set<std::string>& options::which_test() const
+const std::map<std::string, std::set<std::string>>& options::which_tests() const
 {
     return mWhichTests;
 }
@@ -65,3 +91,18 @@ const std::string& options::exe() const
 {
     return mExe;
 }
+
+bool options::exclude_tests() const
+{
+    return mExcludeTests;
+}
+
+TimerResultsIntf* options::timer_results() const
+{
+    return mTimerResults.get();
+}
+
+const std::vector<std::string>& options::errors() const
+{
+    return mErrors;
+}
diff --git a/test/options.h b/test/options.h
index 18df1dd79b2..0bd83cef78b 100644
--- a/test/options.h
+++ b/test/options.h
@@ -1,5 +1,5 @@
 // Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2024 Cppcheck team.
+// Copyright (C) 2007-2026 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
@@ -17,8 +17,14 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
+#include <map>
+#include <memory>
 #include <set>
 #include <string>
+#include <vector>
+
+class TimerResultsIntf;
+class TimerResults;
 
 /**
  * @brief Class to parse command-line parameters for ./testrunner .
@@ -29,6 +35,7 @@ class options {
 public:
     /** Call from main() to populate object */
     options(int argc, const char* const argv[]);
+    ~options();
     /** Don't print the name of each method being tested. */
     bool quiet() const;
     /** Print help. */
@@ -37,8 +44,15 @@ class options {
     bool summary() const;
     /** Perform dry run. */
     bool dry_run() const;
-    /** Which test should be run. Empty string means 'all tests' */
-    const std::set<std::string>& which_test() const;
+    /** Exclude provided lists of tests. */
+    bool exclude_tests() const;
+    /** The timer results. */
+    TimerResultsIntf* timer_results() const;
+    /** Which tests should be run. */
+    const std::map<std::string, std::set<std::string>>& which_tests() const;
+
+    /** Errors encountered during option processing. */
+    const std::vector<std::string>& errors() const;
 
     const std::string& exe() const;
 
@@ -47,11 +61,14 @@ class options {
     options& operator =(const options&) = delete;
 
 private:
-    std::set<std::string> mWhichTests;
-    const bool mQuiet;
-    const bool mHelp;
-    const bool mSummary;
-    const bool mDryRun;
+    std::map<std::string, std::set<std::string>> mWhichTests;
+    std::vector<std::string> mErrors;
+    bool mQuiet{};
+    bool mHelp{};
+    bool mSummary{true};
+    bool mDryRun{};
+    bool mExcludeTests{};
+    std::unique_ptr<TimerResults> mTimerResults;
     std::string mExe;
 };
 
diff --git a/test/redirect.h b/test/redirect.h
index cf0d1d822be..9177beb6819 100644
--- a/test/redirect.h
+++ b/test/redirect.h
@@ -1,5 +1,5 @@
 // Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2024 Cppcheck team.
+// Copyright (C) 2007-2025 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
@@ -43,6 +43,7 @@ class RedirectOutputError {
         std::cerr.rdbuf(_err.rdbuf()); // assign streambuf to cerr
     }
 
+    // TODO: if an assert failed previously this will mask that failure
     /** Revert cout and cerr behaviour */
     ~RedirectOutputError() noexcept(false) {
         std::cout.rdbuf(_oldCout); // restore cout's original streambuf
@@ -51,7 +52,7 @@ class RedirectOutputError {
         {
             const std::string s = _out.str();
             if (!s.empty())
-                throw std::runtime_error("unconsumed stdout: " + s); // cppcheck-suppress exceptThrowInDestructor - FP #11031
+                throw std::runtime_error("unconsumed stdout: " + s);
         }
 
         {
diff --git a/test/scripts/testrunner-single.sh b/test/scripts/testrunner-single.sh
index 072779a2730..3bb63a3c660 100755
--- a/test/scripts/testrunner-single.sh
+++ b/test/scripts/testrunner-single.sh
@@ -5,7 +5,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -n "$1" ]; then
   testrunner_bin=$1
 else
-  make -s -C "$SCRIPT_DIR/../.." -j"$(nproc)" testrunner # CXXFLAGS="-g -O2 -w -DHAVE_BOOST"
+  make -s -C "$SCRIPT_DIR/../.." -j"$(nproc)" testrunner # CXXOPTS="-g -O2 -w" CPPOPTS="-DHAVE_BOOST"
   testrunner_bin=$SCRIPT_DIR/../../testrunner
 fi
 
diff --git a/test/seh/test-sehwrapper.cpp b/test/seh/test-sehwrapper.cpp
index 5c00418fd5b..a92753b8423 100644
--- a/test/seh/test-sehwrapper.cpp
+++ b/test/seh/test-sehwrapper.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#include "config.h" // IWYU pragma: keep
 
 #if defined(USE_WINDOWS_SEH)
 #include "sehwrapper.h"
diff --git a/test/signal/CMakeLists.txt b/test/signal/CMakeLists.txt
index 65fea741d82..0bd186fff20 100644
--- a/test/signal/CMakeLists.txt
+++ b/test/signal/CMakeLists.txt
@@ -8,7 +8,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
     target_compile_options_safe(test-signalhandler -Wno-missing-declarations)
     target_compile_options_safe(test-signalhandler -Wno-missing-prototypes)
     # required for backtrace() to produce function names
-    target_link_options(test-signalhandler PRIVATE -rdynamic)
+    if(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
+        target_link_options(test-signalhandler PRIVATE -rdynamic)
+    endif()
 endif()
 
 add_executable(test-stacktrace
@@ -20,5 +22,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
     target_compile_options_safe(test-stacktrace -Wno-missing-declarations)
     target_compile_options_safe(test-stacktrace -Wno-missing-prototypes)
     # required for backtrace() to produce function names
-    target_link_options(test-stacktrace PRIVATE -rdynamic)
+    if(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
+        target_link_options(test-stacktrace PRIVATE -rdynamic)
+    endif()
 endif()
diff --git a/test/signal/test-signalhandler.cpp b/test/signal/test-signalhandler.cpp
index 335a9426d5f..153ec95f245 100644
--- a/test/signal/test-signalhandler.cpp
+++ b/test/signal/test-signalhandler.cpp
@@ -16,9 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__APPLE__)
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE // required to have feenableexcept()
 #endif
+#endif
 
 #include "config.h"
 
@@ -52,7 +54,7 @@
     ++*static_cast<int*>(nullptr); // NOLINT(clang-analyzer-core.NullDereference)
 }
 
-#if !defined(__APPLE__)
+#if !defined(__APPLE__) && !defined(_AIX)
 /*static*/ int my_fpe() // NOLINT(misc-use-internal-linkage)
 {
     if (feenableexcept(FE_ALL_EXCEPT) == -1)
@@ -78,7 +80,7 @@ int main(int argc, const char * const argv[])
         my_abort();
     else if (strcmp(argv[1], "segv") == 0)
         my_segv();
-#if !defined(__APPLE__)
+#if !defined(__APPLE__) && !defined(_AIX)
     else if (strcmp(argv[1], "fpe") == 0)
         return my_fpe();
 #endif
diff --git a/test/signal/test-signalhandler.py b/test/signal/test-signalhandler.py
index 62ab6d79c02..1ed700d7ec8 100644
--- a/test/signal/test-signalhandler.py
+++ b/test/signal/test-signalhandler.py
@@ -2,6 +2,9 @@
 import os
 import sys
 import pytest
+import platform
+
+from packaging.version import Version
 
 def __lookup_cppcheck_exe(exe_name):
     # path the script is located in
@@ -36,7 +39,7 @@ def test_assert():
     if sys.platform == "darwin":
         assert stderr.startswith("Assertion failed: (false), function my_assert, file test-signalhandler.cpp, line "), stderr
     else:
-        assert stderr.endswith("test-signalhandler.cpp:41: void my_assert(): Assertion `false' failed.\n"), stderr
+        assert stderr.endswith("test-signalhandler.cpp:43: void my_assert(): Assertion `false' failed.\n"), stderr
     lines = stdout.splitlines()
     assert lines[0] == 'Internal error: cppcheck received signal SIGABRT - abort or assertion'
     # no stacktrace of macOS
@@ -64,7 +67,10 @@ def test_segv():
     assert stderr == ''
     lines = stdout.splitlines()
     if sys.platform == "darwin":
-        assert lines[0] == 'Internal error: cppcheck received signal SIGSEGV - SEGV_MAPERR (at 0x0).'
+        if Version(platform.mac_ver()[0]) >= Version('14'):
+            assert lines[0] == 'Internal error: cppcheck received signal SIGSEGV - SEGV_ACCERR (at 0x0).'
+        else:
+            assert lines[0] == 'Internal error: cppcheck received signal SIGSEGV - SEGV_MAPERR (at 0x0).'
     else:
         assert lines[0] == 'Internal error: cppcheck received signal SIGSEGV - SEGV_MAPERR (reading at 0x0).'
     # no stacktrace on macOS
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
index 7a05bf75178..1507f15ec72 100644
--- a/test/test64bit.cpp
+++ b/test/test64bit.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -49,8 +49,7 @@ class Test64BitPortability : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check char variable usage..
-        Check64BitPortability check64BitPortability(&tokenizer, &settings, this);
+        Check64BitPortabilityImpl check64BitPortability(&tokenizer, settings, *this);
         check64BitPortability.pointerassignment();
     }
 
@@ -59,7 +58,7 @@ class Test64BitPortability : public TestFixture {
         check("using CharArray = char[16];\n"
               "void f() {\n"
               "    CharArray foo = \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct T { std::vector<int>*a[2][2]; };\n" // #11560
@@ -67,6 +66,12 @@ class Test64BitPortability : public TestFixture {
               "    t.a[i][j] = new std::vector<int>;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int f();\n" // #11522
+              "void g() {\n"
+              "    int (*fp)() = *(int(*)())f;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void novardecl() {
@@ -74,7 +79,7 @@ class Test64BitPortability : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    a = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -83,65 +88,65 @@ class Test64BitPortability : public TestFixture {
               "{\n"
               "    int a = p;\n"
               "    return a + 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (portability) Assigning a pointer to an integer is not portable. [AssignmentAddressToInteger]\n", errout_str());
 
         check("int foo(int p[])\n"
               "{\n"
               "    int a = p;\n"
               "    return a + 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (portability) Assigning a pointer to an integer is not portable. [AssignmentAddressToInteger]\n", errout_str());
 
         check("int foo(int p[])\n"
               "{\n"
               "    int *a = p;\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n", errout_str());
 
         check("void foo(int x)\n"
               "{\n"
               "    int *p = x;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (portability) Assigning an integer to a pointer is not portable. [AssignmentIntegerToAddress]\n", errout_str());
 
         check("int f(const char *p) {\n" // #4659
               "    return 6 + p[2] * 256;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int *p) {\n" // #6096
               "    bool a = p;\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,2> f();\n"
               "void g() {\n"
               "    std::array<int, 2> a = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,2> f(int x);\n"
               "void g(int i) {\n"
               "    std::array<int, 2> a = f(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("typedef std::array<int, 2> Array;\n"
               "Array f(int x);\n"
               "void g(int i) {\n"
               "    Array a = f(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("typedef std::array<int, 2> Array;\n"
               "Array f();\n"
               "void g(int i) {\n"
               "    Array a = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #9951
@@ -169,7 +174,7 @@ class Test64BitPortability : public TestFixture {
         check("struct Foo { int *p; };\n"
               "void f(struct Foo *foo) {\n"
               "    int i = foo->p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (portability) Assigning a pointer to an integer is not portable. [AssignmentAddressToInteger]\n", errout_str());
 
         check("struct S {\n" // #10145
@@ -187,7 +192,7 @@ class Test64BitPortability : public TestFixture {
         // Ticket #2892
         check("void foo(int *p) {\n"
               "    int a = (p != NULL);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -196,74 +201,74 @@ class Test64BitPortability : public TestFixture {
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = p + x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = x + p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = x * x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (portability) Assigning an integer to a pointer is not portable. [AssignmentIntegerToAddress]\n", errout_str());
 
         check("void foo(int *start, int *end) {\n"
               "    int len;\n"
               "    int len = end + 10 - start;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnIssues() {
         check("void* foo(int i) {\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an integer in a function with pointer return type is not portable. [CastIntegerToAddressAtReturn]\n", errout_str());
 
         check("void* foo(int* i) {\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int i) {\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "\n"
               "int* dostuff(Foo foo) {\n"
               "  return foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(char* c) {\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n", errout_str());
 
         check("int foo(char* c) {\n"
               "    return 1+c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n", errout_str());
 
         check("std::string foo(char* c) {\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(char *a, char *b) {\n" // #4486
               "    return a + 1 - b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct s {\n" // 4642
@@ -271,13 +276,13 @@ class Test64BitPortability : public TestFixture {
               "};\n"
               "int func(struct s *p) {\n"
               " return 1 + p->i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void __iomem *f(unsigned int port_no) {\n"
               "  void __iomem *mmio = hpriv->mmio;\n"
               "  return mmio + (port_no * 0x80);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7247: don't check return statements in nested functions..
@@ -285,7 +290,7 @@ class Test64BitPortability : public TestFixture {
               "  struct {\n"
               "    const char * name() { return \"abc\"; }\n"
               "  } table;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7451: Lambdas
@@ -293,7 +298,7 @@ class Test64BitPortability : public TestFixture {
               "  auto it = std::find_if(outputs.begin(), outputs.end(),\n"
               "     [&](int ele) { return \"test\" == text; });\n"
               "  return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #12159
@@ -307,6 +312,23 @@ class Test64BitPortability : public TestFixture {
               "    return x.get();\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int f(int* p) {\n" // #14294
+              "    return (int)p;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n",
+                      errout_str());
+
+        check("int f(int* p) {\n"
+              "    return reinterpret_cast<int>(p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n",
+                      errout_str());
+
+        check("bool f(const int* p) {\n"
+              "    return p;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp
index f1d94d4af3c..2174f7d4676 100644
--- a/test/testanalyzerinformation.cpp
+++ b/test/testanalyzerinformation.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -18,30 +18,44 @@
 
 
 #include "analyzerinfo.h"
+#include "errorlogger.h"
 #include "filesettings.h"
 #include "fixture.h"
+#include "standards.h"
 
+#include <list>
 #include <sstream>
 
-class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation {
+#include "xml.h"
+
+class TestAnalyzerInformation : public TestFixture {
 public:
     TestAnalyzerInformation() : TestFixture("TestAnalyzerInformation") {}
 
 private:
+    class AnalyzerInformationTest final : public AnalyzerInformation
+    {
+        friend class TestAnalyzerInformation;
+    };
 
     void run() override {
+        TEST_CASE(getAnalyzerInfoFileFromFilesTxt);
         TEST_CASE(getAnalyzerInfoFile);
         TEST_CASE(duplicateFile);
         TEST_CASE(filesTextDuplicateFile);
         TEST_CASE(parse);
+        TEST_CASE(skipAnalysis);
     }
 
-    void getAnalyzerInfoFile() const {
+    void getAnalyzerInfoFileFromFilesTxt() const {
         constexpr char filesTxt[] = "file1.a4:::file1.c\n";
-        std::istringstream f1(filesTxt);
-        ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 0));
-        std::istringstream f2(filesTxt);
-        ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", "", 0));
+        std::istringstream f(filesTxt);
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f, "file1.c", "", 0));
+        f.str(filesTxt);
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f, "./file1.c", "", 0));
+    }
+
+    void getAnalyzerInfoFile() const {
         ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "file1.c", "", 0));
         ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "some/path/file1.c", "", 0));
     }
@@ -49,14 +63,14 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
     void filesTextDuplicateFile() const {
         std::list<FileSettings> fileSettings;
         fileSettings.emplace_back("a.c", Standards::Language::C, 10);
-        fileSettings.back().fileIndex = 0;
+        fileSettings.back().file.setFsFileId(0);
         fileSettings.emplace_back("a.c", Standards::Language::C, 10);
-        fileSettings.back().fileIndex = 1;
+        fileSettings.back().file.setFsFileId(1);
 
         const char expected[] = "a.a1:::a.c\n"
                                 "a.a2::1:a.c\n";
 
-        ASSERT_EQUALS(expected, getFilesTxt({}, "", fileSettings));
+        ASSERT_EQUALS(expected, AnalyzerInformationTest::getFilesTxt({}, fileSettings));
     }
 
     void duplicateFile() const {
@@ -64,9 +78,9 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
         constexpr char filesTxt[] = "file1.a1::1:file1.c\n"
                                     "file1.a2::2:file1.c\n";
         std::istringstream f1(filesTxt);
-        ASSERT_EQUALS("file1.a1", getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 1));
+        ASSERT_EQUALS("file1.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 1));
         std::istringstream f2(filesTxt);
-        ASSERT_EQUALS("file1.a2", getAnalyzerInfoFileFromFilesTxt(f2, "file1.c", "", 2));
+        ASSERT_EQUALS("file1.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "file1.c", "", 2));
     }
 
     void parse() const {
@@ -80,21 +94,186 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
         ASSERT_EQUALS(true, info.parse("a:b::d"));
         ASSERT_EQUALS("a", info.afile);
         ASSERT_EQUALS("b", info.cfg);
-        ASSERT_EQUALS(0, info.fileIndex);
+        ASSERT_EQUALS(0, info.fsFileId);
         ASSERT_EQUALS("d", info.sourceFile);
 
         ASSERT_EQUALS(true, info.parse("e:f:12:g"));
         ASSERT_EQUALS("e", info.afile);
         ASSERT_EQUALS("f", info.cfg);
-        ASSERT_EQUALS(12, info.fileIndex);
+        ASSERT_EQUALS(12, info.fsFileId);
         ASSERT_EQUALS("g", info.sourceFile);
 
         ASSERT_EQUALS(true, info.parse("odr1.a1:::C:/dm/cppcheck-fix-13333/test/cli/whole-program/odr1.cpp"));
         ASSERT_EQUALS("odr1.a1", info.afile);
         ASSERT_EQUALS("", info.cfg);
-        ASSERT_EQUALS(0, info.fileIndex);
+        ASSERT_EQUALS(0, info.fsFileId);
         ASSERT_EQUALS("C:/dm/cppcheck-fix-13333/test/cli/whole-program/odr1.cpp", info.sourceFile);
     }
+
+    void skipAnalysis() const {
+        // Matching hash with license error (don't skip)
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
+                "<error id=\"premium-invalidLicense\" severity=\"error\" msg=\"Invalid license: No license file was found, contact sales@cppchecksolutions.com\" verbose=\"Invalid license: No license file was found, contact sales@cppchecksolutions.com\" file0=\"test.c\">"
+                "<location file=\"Cppcheck Premium\" line=\"0\" column=\"0\"/>"
+                "</error>"
+                "</analyzerinfo>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("'premium-invalidLicense' encountered", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // Matching hash with premium internal error (don't skip)
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
+                "<error id=\"premium-internalError\" severity=\"error\" msg=\"Something went wrong\" verbose=\"Something went wrong\" file0=\"test.c\">"
+                "<location file=\"Cppcheck\" line=\"0\" column=\"0\"/>"
+                "</error>"
+                "</analyzerinfo>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("'premium-internalError' encountered", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // Matching hash with internal error (don't skip)
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
+                "<error id=\"internalError\" severity=\"error\" msg=\"Something went wrong\" verbose=\"Something went wrong\" file0=\"test.c\">"
+                "<location file=\"Cppcheck\" line=\"0\" column=\"0\"/>"
+                "</error>"
+                "</analyzerinfo>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("'internalError' encountered", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // Matching hash with normal error (skip)
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
+                "<error id=\"nullPointer\" severity=\"error\" msg=\"Null pointer dereference: ptr\" verbose=\"Null pointer dereference: ptr\" cwe=\"476\" file0=\"test.c\">"
+                "<location file=\"test.c\" line=\"4\" column=\"3\" info=\"Null pointer dereference\"/>"
+                "<location file=\"test.c\" line=\"3\" column=\"12\" info=\"Assignment &apos;ptr=NULL&apos;, assigned value is 0\"/>"
+                "<symbol>ptr</symbol>"
+                "</error>"
+                "</analyzerinfo>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(1, errorList.size());
+        }
+
+        // Matching hash with no error (skip)
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
+                "</analyzerinfo>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // Different hash with normal error (don't skip)
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo>"
+                "<hash>100</hash>"
+                "<error id=\"nullPointer\" severity=\"error\" msg=\"Null pointer dereference: ptr\" verbose=\"Null pointer dereference: ptr\" cwe=\"476\" file0=\"test.c\">"
+                "<location file=\"test.c\" line=\"4\" column=\"3\" info=\"Null pointer dereference\"/>"
+                "<location file=\"test.c\" line=\"3\" column=\"12\" info=\"Assignment &apos;ptr=NULL&apos;, assigned value is 0\"/>"
+                "<symbol>ptr</symbol>"
+                "</error>"
+                "</analyzerinfo>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("hash mismatch", AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // Empty document (don't skip)
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse("");
+            ASSERT_EQUALS(tinyxml2::XML_ERROR_EMPTY_DOCUMENT, xmlError);
+
+            ASSERT_EQUALS("no root node found", AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // Unexpected root node
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<ainfo/>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("unexpected root node", AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+
+        // No 'hash' node found
+        {
+            std::list<ErrorMessage> errorList;
+            tinyxml2::XMLDocument doc;
+
+            const tinyxml2::XMLError xmlError = doc.Parse(
+                "<?xml version=\"1.0\"?>"
+                "<analyzerinfo/>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS("no 'hash' node found", AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
+    }
 };
 
 REGISTER_TEST(TestAnalyzerInformation)
diff --git a/test/testassert.cpp b/test/testassert.cpp
index 3bf701541bf..c3c271a1bf2 100644
--- a/test/testassert.cpp
+++ b/test/testassert.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,8 +39,8 @@ class TestAssert : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckAssert>(tokenizer, this);
+        CheckAssert check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -61,7 +61,7 @@ class TestAssert : public TestFixture {
             "   if (b) { a = 1+2 };\n"
             "   return a;\n"
             "}\n"
-            "assert(foo() == 3);");
+            "assert(foo() == 3);\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -69,7 +69,7 @@ class TestAssert : public TestFixture {
             "    int b=a+1;\n"
             "    return b;\n"
             "}\n"
-            "assert(foo(1) == 2);");
+            "assert(foo(1) == 2);\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -80,7 +80,7 @@ class TestAssert : public TestFixture {
             "    a = 1+2;\n"
             "    return a;\n"
             "}\n"
-            "assert(foo() == 3);");
+            "assert(foo() == 3);\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (warning) Assert statement calls a function which may have desired side effects: 'foo'. [assertWithSideEffect]\n", errout_str());
 
         //  Ticket #4937 "false positive: Assert calls a function which may have desired side effects"
@@ -92,7 +92,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
@@ -103,7 +103,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:25]: (warning) Assert statement calls a function which may have desired side effects: 'isRank1Or8'. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
@@ -114,7 +114,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:25]: (warning) Assert statement calls a function which may have desired side effects: 'isRank1Or8'. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
@@ -125,7 +125,7 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Geometry {\n"
@@ -136,7 +136,7 @@ class TestAssert : public TestFixture {
               "\n"
               "void Geometry::ReadGeometry() {\n"
               "    assert(empty());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #4811
@@ -147,6 +147,17 @@ class TestAssert : public TestFixture {
               "    assert(g());\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int i;\n" // #14973
+              "bool f() {\n"
+              "    i = 0;\n"
+              "    return true;\n"
+              "}\n"
+              "void g() {\n"
+              "    bool (*fp)() = f;\n"
+              "    assert(fp == f);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void memberFunctionCallInAssert() {
@@ -155,15 +166,15 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo(SquarePack s) {\n"
               "   assert( s.Foo() );\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'. [assertWithSideEffect]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'. If there are no side effects, consider declaring the method const. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
               "   int Foo() const;\n"
               "};\n"
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
@@ -171,14 +182,14 @@ class TestAssert : public TestFixture {
               "};\n"
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
               "};\n"
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -187,54 +198,54 @@ class TestAssert : public TestFixture {
               "    int a; a = 0;\n"
               "    assert(a = 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f(int a) {\n"
               "    assert(a == 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "    assert(a == 2 && (b = 1));\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Assert statement modifies 'b'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a; a = 0;\n"
               "    assert(a += 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a; a = 0;\n"
               "    assert(a *= 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a; a = 0;\n"
               "    assert(a -= 2);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
               "    assert(a--);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
               "    assert(--a);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
@@ -243,19 +254,19 @@ class TestAssert : public TestFixture {
               "                  auto const expected = someOtherValue;\n"
               "                  return tmp == expected;\n"
               "                }));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void crash() {
         check("void foo() {\n"
               "  assert(sizeof(struct { int a[x++]; })==sizeof(int));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #9790
               "  assert(kad_bucket_hash(&(kad_guid) { .bytes = { 0 } }, & (kad_guid){.bytes = { 0 }}) == -1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
index 8ca2412a095..46dde522338 100644
--- a/test/testastutils.cpp
+++ b/test/testastutils.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -62,29 +62,29 @@ class TestAstUtils : public TestFixture {
     void findLambdaEndTokenTest() {
         const Token* nullTok = nullptr;
         ASSERT(nullptr == (::findLambdaEndToken)(nullTok));
-        ASSERT_EQUALS(false, findLambdaEndToken("void f() { }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[]{ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[]{ return 0; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](){ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[&](){ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[&, i](){ }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) mutable { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) constexpr { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> int { return -1; }"));
-        ASSERT_EQUALS(false, findLambdaEndToken("[](void) foo -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int* { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const ** int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * const* int { return x; }"));
-        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} }", "[ ]"));
-        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} }", "[ 2"));
-        ASSERT_EQUALS(false, findLambdaEndToken("shared_ptr<Type *[]> sp{ new Type *[2] {new Type, new Type}, Deleter<Type>{ 2 } };", "[ 2"));
-        ASSERT_EQUALS(true, findLambdaEndToken("int i = 5 * []{ return 7; }();", "[", /*checkNext*/ false));
+        ASSERT_EQUALS(false, findLambdaEndToken("void f() { }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[]{ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[]{ return 0; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[&](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[&, i](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) mutable { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](int a, int b) constexpr { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> int { return -1; }\n"));
+        ASSERT_EQUALS(false, findLambdaEndToken("[](void) foo -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> int* { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) mutable -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const ** int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaEndToken("[](void) constexpr -> const * const* int { return x; }\n"));
+        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} };\n", "[ ]"));
+        ASSERT_EQUALS(false, findLambdaEndToken("int** a[] { new int*[2] { new int, new int} };\n", "[ 2"));
+        ASSERT_EQUALS(false, findLambdaEndToken("shared_ptr<Type *[]> sp{ new Type *[2] {new Type, new Type}, Deleter<Type>{ 2 } };\n", "[ 2"));
+        ASSERT_EQUALS(true, findLambdaEndToken("int i = 5 * []{ return 7; }();\n", "[", /*checkNext*/ false));
     }
 
 #define findLambdaStartToken(...) findLambdaStartToken_(__FILE__, __LINE__, __VA_ARGS__)
@@ -98,25 +98,25 @@ class TestAstUtils : public TestFixture {
 
     void findLambdaStartTokenTest() {
         ASSERT(nullptr == (::findLambdaStartToken)(nullptr));
-        ASSERT_EQUALS(false, findLambdaStartToken("void f() { }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[]{ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[]{ return 0; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](){ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[&](){ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[&, i](){ }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) mutable { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) constexpr { return a + b; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> int { return -1; }"));
-        ASSERT_EQUALS(false, findLambdaStartToken("[](void) foo -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int { return -1; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int* { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> const * int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const ** int { return x; }"));
-        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * const* int { return x; }"));
+        ASSERT_EQUALS(false, findLambdaStartToken("void f() { }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[]{ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[]{ return 0; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[&](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[&, i](){ }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) mutable { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](int a, int b) constexpr { return a + b; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> int { return -1; }\n"));
+        ASSERT_EQUALS(false, findLambdaStartToken("[](void) foo -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int { return -1; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> int* { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) mutable -> const * int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const ** int { return x; }\n"));
+        ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * const* int { return x; }\n"));
     }
 
 #define isNullOperand(...) isNullOperand_(__FILE__, __LINE__, __VA_ARGS__)
@@ -128,16 +128,16 @@ class TestAstUtils : public TestFixture {
     }
 
     void isNullOperandTest() {
-        ASSERT_EQUALS(true, isNullOperand("(void*)0;"));
-        ASSERT_EQUALS(true, isNullOperand("(void*)0U;"));
-        ASSERT_EQUALS(true, isNullOperand("(void*)0x0LL;"));
-        ASSERT_EQUALS(true, isNullOperand("NULL;"));
-        ASSERT_EQUALS(true, isNullOperand("nullptr;"));
-        ASSERT_EQUALS(true, isNullOperand("(void*)NULL;"));
-        ASSERT_EQUALS(true, isNullOperand("static_cast<int*>(0);"));
-        ASSERT_EQUALS(false, isNullOperand("0;"));
-        ASSERT_EQUALS(false, isNullOperand("(void*)0.0;"));
-        ASSERT_EQUALS(false, isNullOperand("(void*)1;"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)0;\n"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)0U;\n"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)0x0LL;\n"));
+        ASSERT_EQUALS(true, isNullOperand("NULL;\n"));
+        ASSERT_EQUALS(true, isNullOperand("nullptr;\n"));
+        ASSERT_EQUALS(true, isNullOperand("(void*)NULL;\n"));
+        ASSERT_EQUALS(true, isNullOperand("static_cast<int*>(0);\n"));
+        ASSERT_EQUALS(false, isNullOperand("0;\n"));
+        ASSERT_EQUALS(false, isNullOperand("(void*)0.0;\n"));
+        ASSERT_EQUALS(false, isNullOperand("(void*)1;\n"));
     }
 
 #define isReturnScope(...) isReturnScope_(__FILE__, __LINE__, __VA_ARGS__)
@@ -152,22 +152,22 @@ class TestAstUtils : public TestFixture {
     }
 
     void isReturnScopeTest() {
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return; } }", -2));
-        ASSERT_EQUALS(true, isReturnScope("int f() { if (a) { return {}; } }", -2));                        // #8891
-        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{}; } }", -2));     // #8891
-        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{\"\"}; } }", -2)); // #8891
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return (ab){0}; } }", -2)); // #7103
-        ASSERT_EQUALS(false, isReturnScope("void f() { if (a) { return (ab){0}; } }", -4)); // #7103
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }", -4)); // #7144
-        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }", -2)); // #7144
-        ASSERT_EQUALS(false, isReturnScope("void f() { [=]() { return data; }; }", -1));
-        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }; }", -1));
-        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }(); }", -1));
-        ASSERT_EQUALS(false, isReturnScope("auto f() { [=]() { return data; }(); }", -1));
-
-        ASSERT_EQUALS(true, isReturnScope("void negativeTokenOffset() { return; }", -1));
-        ASSERT_EQUALS(false, isReturnScope("void zeroTokenOffset() { return; }", 0));
-        ASSERT_EQUALS(true, isReturnScope("void positiveTokenOffset() { return; }", 7));
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return; } }\n", -2));
+        ASSERT_EQUALS(true, isReturnScope("int f() { if (a) { return {}; } }\n", -2));                        // #8891
+        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{}; } }\n", -2));     // #8891
+        ASSERT_EQUALS(true, isReturnScope("std::string f() { if (a) { return std::string{\"\"}; } }\n", -2)); // #8891
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { return (ab){0}; } }\n", -2)); // #7103
+        ASSERT_EQUALS(false, isReturnScope("void f() { if (a) { return (ab){0}; } }\n", -4)); // #7103
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }\n", -4)); // #7144
+        ASSERT_EQUALS(true, isReturnScope("void f() { if (a) { {throw new string(x);}; } }\n", -2)); // #7144
+        ASSERT_EQUALS(false, isReturnScope("void f() { [=]() { return data; }; }\n", -1));
+        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }; }\n", -1));
+        ASSERT_EQUALS(true, isReturnScope("auto f() { return [=]() { return data; }(); }\n", -1));
+        ASSERT_EQUALS(false, isReturnScope("auto f() { [=]() { return data; }(); }\n", -1));
+
+        ASSERT_EQUALS(true, isReturnScope("void negativeTokenOffset() { return; }\n", -1));
+        ASSERT_EQUALS(false, isReturnScope("void zeroTokenOffset() { return; }\n", 0));
+        ASSERT_EQUALS(true, isReturnScope("void positiveTokenOffset() { return; }\n", 7));
     }
 
 #define isSameExpression(...) isSameExpression_(__FILE__, __LINE__, __VA_ARGS__)
@@ -181,33 +181,33 @@ class TestAstUtils : public TestFixture {
     }
 
     void isSameExpressionTestInternal(bool cpp) {
-        ASSERT_EQUALS(true,  isSameExpression("x = 1 + 1;", "1", "1", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x = 1 + 1u;", "1", "1u", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("x = 1.0 + 1.0;", "1.0", "1.0", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x = 1.0f + 1.0;", "1.0f", "1.0", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x = 1L + 1;", "1L", "1", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("x = 0.0f + 0x0p+0f;", "0.0f", "0x0p+0f", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("x < x;", "x", "x", cpp));
-        ASSERT_EQUALS(false, isSameExpression("x < y;", "x", "y", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("(x + 1) < (x + 1);", "+", "+", cpp));
-        ASSERT_EQUALS(false, isSameExpression("(x + 1) < (x + 1L);", "+", "+", cpp));
-        ASSERT_EQUALS(!cpp,  isSameExpression("(1 + x) < (x + 1);", "+", "+", cpp));
-        ASSERT_EQUALS(false, isSameExpression("(1.0l + x) < (1.0 + x);", "+", "+", cpp));
-        ASSERT_EQUALS(!cpp,  isSameExpression("(0.0 + x) < (x + 0x0p+0);", "+", "+", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; (x + y) < (x + 10.0); } ", "+", "+", cpp));
-        ASSERT_EQUALS(!cpp,  isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } ", "+", "+", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; double z = 10.0; (x + y) < (x + z); } ", "+", "+", cpp));
-        ASSERT_EQUALS(true,  isSameExpression("A + A", "A", "A", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x = 1 + 1;\n", "1", "1", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x = 1 + 1u;\n", "1", "1u", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x = 1.0 + 1.0;\n", "1.0", "1.0", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x = 1.0f + 1.0;\n", "1.0f", "1.0", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x = 1L + 1;\n", "1L", "1", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x = 0.0f + 0x0p+0f;\n", "0.0f", "0x0p+0f", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("x < x;\n", "x", "x", cpp));
+        ASSERT_EQUALS(false, isSameExpression("x < y;\n", "x", "y", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("(x + 1) < (x + 1);\n", "+", "+", cpp));
+        ASSERT_EQUALS(false, isSameExpression("(x + 1) < (x + 1L);\n", "+", "+", cpp));
+        ASSERT_EQUALS(!cpp,  isSameExpression("(1 + x) < (x + 1);\n", "+", "+", cpp));
+        ASSERT_EQUALS(false, isSameExpression("(1.0l + x) < (1.0 + x);\n", "+", "+", cpp));
+        ASSERT_EQUALS(!cpp,  isSameExpression("(0.0 + x) < (x + 0x0p+0);\n", "+", "+", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; (x + y) < (x + 10.0); } \n", "+", "+", cpp));
+        ASSERT_EQUALS(!cpp,  isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } \n", "+", "+", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; double z = 10.0; (x + y) < (x + z); } \n", "+", "+", cpp));
+        ASSERT_EQUALS(true,  isSameExpression("A + A\n", "A", "A", cpp));
 
         // the remaining test cases are not valid C code
         if (!cpp)
             return;
 
         //https://trac.cppcheck.net/ticket/9700
-        ASSERT_EQUALS(true, isSameExpression("A::B + A::B;", "::", "::", cpp));
-        ASSERT_EQUALS(false, isSameExpression("A::B + A::C;", "::", "::", cpp));
-        ASSERT_EQUALS(true, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::B(true); }", "new", "new", cpp));
-        ASSERT_EQUALS(false, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::C(true); }", "new", "new", cpp));
+        ASSERT_EQUALS(true, isSameExpression("A::B + A::B;\n", "::", "::", cpp));
+        ASSERT_EQUALS(false, isSameExpression("A::B + A::C;\n", "::", "::", cpp));
+        ASSERT_EQUALS(true, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::B(true); }\n", "new", "new", cpp));
+        ASSERT_EQUALS(false, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::C(true); }\n", "new", "new", cpp));
     }
 
     void isSameExpressionCpp() {
@@ -233,7 +233,7 @@ class TestAstUtils : public TestFixture {
         (void)isVariableChanged("void f() {\n"
                                 "  int b;\n"
                                 "  if (b) { (int)((INTOF(8))result >> b); }\n"
-                                "}", "if", "}");
+                                "}\n", "if", "}");
         // #9235
         ASSERT_EQUALS(false,
                       isVariableChanged("void f() {\n"
@@ -242,13 +242,13 @@ class TestAstUtils : public TestFixture {
                                         "= a",
                                         "}"));
 
-        ASSERT_EQUALS(false, isVariableChanged("void f(const A& a) { a.f(); }", "{", "}"));
+        ASSERT_EQUALS(false, isVariableChanged("void f(const A& a) { a.f(); }\n", "{", "}"));
         ASSERT_EQUALS(true,
                       isVariableChanged("void g(int*);\n"
                                         "void f(int x) { g(&x); }\n",
                                         "{",
                                         "}"));
-        ASSERT_EQUALS(false, isVariableChanged("const int A[] = { 1, 2, 3 };", "[", "]"));
+        ASSERT_EQUALS(false, isVariableChanged("const int A[] = { 1, 2, 3 };\n", "[", "]"));
     }
 
 #define isVariableChangedByFunctionCall(...) isVariableChangedByFunctionCall_( __FILE__, __LINE__, __VA_ARGS__)
@@ -259,7 +259,7 @@ class TestAstUtils : public TestFixture {
         const Token * const argtok = Token::findmatch(tokenizer.tokens(), pattern);
         ASSERT_LOC(argtok, file, line);
         int indirect = (argtok->variable() && argtok->variable()->isArray());
-        return (isVariableChangedByFunctionCall)(argtok, indirect, settingsDefault, inconclusive);
+        return (isVariableChangedByFunctionCall)(argtok, indirect, settingsDefault.library, inconclusive);
     }
 
     void isVariableChangedByFunctionCallTest() {
@@ -267,7 +267,7 @@ class TestAstUtils : public TestFixture {
         { // #8271 - template method
             const char code[] = "void f(int x) {\n"
                                 "  a<int>(x);\n"
-                                "}";
+                                "}\n";
             bool inconclusive = false;
             ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
             ASSERT_EQUALS(true, inconclusive);
@@ -431,8 +431,8 @@ class TestAstUtils : public TestFixture {
 
     void isExpressionChangedTest()
     {
-        ASSERT_EQUALS(true, isExpressionChanged("void f(std::map<int, int>& m) { m[0]; }", "m [", "{", "}"));
-        ASSERT_EQUALS(false, isExpressionChanged("void f(const A& a) { a.f(); }", "a .", "{", "}"));
+        ASSERT_EQUALS(true, isExpressionChanged("void f(std::map<int, int>& m) { m[0]; }\n", "m [", "{", "}"));
+        ASSERT_EQUALS(false, isExpressionChanged("void f(const A& a) { a.f(); }\n", "a .", "{", "}"));
 
         ASSERT_EQUALS(true,
                       isExpressionChanged("void g(int*);\n"
@@ -459,17 +459,17 @@ class TestAstUtils : public TestFixture {
     }
 
     void nextAfterAstRightmostLeafTest() {
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f(int a, int b) { int x = a + b; }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a); }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b]; }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b]); }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b] + a); }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }", "=", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f() { int a; int b; int x = [](int a){}; }", "=", "; }"));
-
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = a + b; }", "+", "; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }", "+", "] ; }"));
-        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a + 1)[b]; }", "+", ") ["));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f(int a, int b) { int x = a + b; }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a); }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b]; }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b]); }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(g(a)[b] + a); }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }\n", "=", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("void f() { int a; int b; int x = [](int a){}; }\n", "=", "; }"));
+
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = a + b; }\n", "+", "; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a)[b + 1]; }\n", "+", "] ; }"));
+        ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a + 1)[b]; }\n", "+", ") ["));
     }
 
     enum class Result : std::uint8_t {False, True, Fail};
@@ -486,37 +486,37 @@ class TestAstUtils : public TestFixture {
     }
 
     void isUsedAsBool() {
-        ASSERT(Result::True == isUsedAsBool("void f() { bool b = true; }", "b"));
-        ASSERT(Result::False ==isUsedAsBool("void f() { int i = true; }", "i"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; while (i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (;i;) {} }", "i ; )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (;;i) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (i;;) {} }", "i ; ; )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (int j=0; i; ++j) {} }", "i ; ++"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == 2) {} }", "i =="));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == true) {} }", "i =="));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i,j; if (i == (j&&f())) {} }", "i =="));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i == 0) {} }", "i =="));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!!i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i && f()) {} }", "i &&"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; int j = i && f(); }", "i &&"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i & f()) {} }", "i &"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (static_cast<bool>(i)) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if ((bool)i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+static_cast<bool>(i)) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+(bool)i) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+static_cast<int>(i)) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+!static_cast<int>(i)) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+(int)i) {} }", "i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i + 2) {} }", "i +"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int i; bool b = i; }", "i ; }"));
-        ASSERT(Result::True == isUsedAsBool("void f(bool b); void f() { int i; f(i); }","i )"));
-        ASSERT(Result::False == isUsedAsBool("void f() { int *i; if (*i) {} }", "i )"));
-        ASSERT(Result::True == isUsedAsBool("void f() { int *i; if (*i) {} }", "* i )"));
-        ASSERT(Result::True == isUsedAsBool("int g(); void h(bool); void f() { h(g()); }", "( ) )"));
-        ASSERT(Result::True == isUsedAsBool("int g(int); void h(bool); void f() { h(g(0)); }", "( 0 ) )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { bool b = true; }\n", "b"));
+        ASSERT(Result::False ==isUsedAsBool("void f() { int i = true; }\n", "i"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; while (i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (;i;) {} }\n", "i ; )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (;;i) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; for (i;;) {} }\n", "i ; ; )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; for (int j=0; i; ++j) {} }\n", "i ; ++"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == 2) {} }\n", "i =="));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i == true) {} }\n", "i =="));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i,j; if (i == (j&&f())) {} }\n", "i =="));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i == 0) {} }\n", "i =="));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (!!i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i && f()) {} }\n", "i &&"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; int j = i && f(); }\n", "i &&"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i & f()) {} }\n", "i &"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (static_cast<bool>(i)) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if ((bool)i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+static_cast<bool>(i)) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+(bool)i) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+static_cast<int>(i)) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; if (1+!static_cast<int>(i)) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (1+(int)i) {} }\n", "i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int i; if (i + 2) {} }\n", "i +"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int i; bool b = i; }\n", "i ; }"));
+        ASSERT(Result::True == isUsedAsBool("void f(bool b); void f() { int i; f(i); }\n","i )"));
+        ASSERT(Result::False == isUsedAsBool("void f() { int *i; if (*i) {} }\n", "i )"));
+        ASSERT(Result::True == isUsedAsBool("void f() { int *i; if (*i) {} }\n", "* i )"));
+        ASSERT(Result::True == isUsedAsBool("int g(); void h(bool); void f() { h(g()); }\n", "( ) )"));
+        ASSERT(Result::True == isUsedAsBool("int g(int); void h(bool); void f() { h(g(0)); }\n", "( 0 ) )"));
     }
 };
 
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index 6785976a3d2..dbec2bae0a0 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -30,10 +30,10 @@ class TestAutoVariables : public TestFixture {
 
 private:
     const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).library("std.cfg").library("qt.cfg").build();
+    const Settings settings_i = settingsBuilder(settings).certainty(Certainty::inconclusive).build();
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool inconclusive = true;
         bool cpp = true;
     };
@@ -41,13 +41,14 @@ class TestAutoVariables : public TestFixture {
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, options.inconclusive).build();
+        const Settings &settings1 = options.inconclusive ? settings_i : settings;
 
         // Tokenize..
         SimpleTokenizer tokenizer(settings1, *this, options.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckAutoVariables>(tokenizer, this);
+        CheckAutoVariables check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -68,6 +69,8 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(testautovar14); // ticket #4776 - assignment of function parameter, goto
         TEST_CASE(testautovar15); // ticket #6538
         TEST_CASE(testautovar16); // ticket #8114
+        TEST_CASE(testautovar17);
+        TEST_CASE(testautovar18);
         TEST_CASE(testautovar_array1);
         TEST_CASE(testautovar_array2);
         TEST_CASE(testautovar_array3);
@@ -78,6 +81,7 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(testautovar_return3);
         TEST_CASE(testautovar_return4);
         TEST_CASE(testautovar_return5);
+        TEST_CASE(testautovar_return6);
         TEST_CASE(testautovar_extern);
         TEST_CASE(testautovar_reassigned);
         TEST_CASE(testinvaliddealloc);
@@ -128,6 +132,7 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(returnReference26);
         TEST_CASE(returnReference27);
         TEST_CASE(returnReference28);
+        TEST_CASE(returnReference29);
         TEST_CASE(returnReferenceFunction);
         TEST_CASE(returnReferenceContainer);
         TEST_CASE(returnReferenceLiteral);
@@ -175,21 +180,21 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    *res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void func1(int **res)\n"
               "{\n"
               "    int num = 2;\n"
               "    res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void func1(int **res)\n"
               "{\n"
               "    int num = 2;\n"
               "    foo.res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -201,7 +206,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    *res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("class Fred {\n"
@@ -211,7 +216,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("class Fred {\n"
@@ -221,7 +226,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num = 2;\n"
               "    foo.res = &num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -230,7 +235,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int x[100];\n"
               "    *p = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -239,7 +244,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static int x[100];\n"
               "    *p = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -248,7 +253,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char a;\n"
               "    ab->a = &a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -257,14 +262,14 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char a[10];\n"
               "    x->str = a;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct X *x)\n"
               "{\n"
               "    char a[10];\n"
               "    x->str = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -274,7 +279,7 @@ class TestAutoVariables : public TestFixture {
               "    struct txt_scrollpane_s * scrollpane;\n"
               "    target->parent = &scrollpane->widget;\n"
               "    return scrollpane;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -282,12 +287,12 @@ class TestAutoVariables : public TestFixture {
         check("void foo(int*& p) {\n"
               "    int i = 0;\n"
               "    p = &i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void foo(std::string& s) {\n"
               "    s = foo;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -298,7 +303,7 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &fn.i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("struct FN {int i;};\n"
@@ -307,7 +312,7 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &p_fp->i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct FN {int i;};\n"
@@ -316,100 +321,100 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &fp.f->i;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar10() { // #2930 - assignment of function parameter
         check("void foo(char* p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    b = foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    b += 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(std::string s) {\n"
               "    s = foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(char* p) {\n" // don't warn for self assignment, there is another warning for this
               "  p = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    if (!p) p = buf;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    if (!p) p = buf;\n"
               "    do_something(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    while (!p) p = buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    p = 0;\n"
               "    asm(\"somecmd\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Foo* p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("class Foo {};\n"
               "void foo(Foo p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Assignment of function parameter has no effect outside the function. [uselessAssignmentArg]\n", errout_str());
 
         check("void foo(Foo p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& p) {\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("double foo(double d) {\n" // #5005
               "    int i = d;\n"
               "    d = i;\n"
-              "    return d;"
-              "}",dinit(CheckOptions, $.inconclusive = false));
+              "    return d;\n"
+              "}\n",dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int* ptr) {\n" // #4793
               "    ptr++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void foo(int* ptr) {\n" // #3177
               "    --ptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? [uselessAssignmentPtrArg]\n", errout_str());
 
         check("void foo(struct S* const x) {\n" // #7839
               "    ++x->n;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -420,7 +425,7 @@ class TestAutoVariables : public TestFixture {
               "void foo(char** p) {\n"
               "    struct A a = bar();\n"
               "    *p = &(*a.data)[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -429,36 +434,36 @@ class TestAutoVariables : public TestFixture {
               "void foo(char** p) {\n"
               "    struct A a = bar();\n"
               "    *p = &a.data[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void f(char **out) {\n"
               "  struct S *p = glob;\n"
               "  *out = &p->data;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4998
         check("void f(s8**out) {\n"
               "  s8 *p;\n"  // <- p is pointer => no error
               "  *out = &p[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(s8**out) {\n"
               "  s8 p[10];\n"  // <- p is array => error
               "  *out = &p[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar12() { // Ticket #5024, #5050 - Crash on invalid input
-        ASSERT_THROW_INTERNAL(check("void f(int* a) { a = }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(check("void f(int* a) { a = }\n"), SYNTAX);
         check("struct custom_type { custom_type(int) {} };\n"
               "void func(int) {}\n"
               "int var;\n"
               "void init() { func(var); }\n"
-              "UNKNOWN_MACRO_EXPANDING_TO_SIGNATURE { custom_type a(var); }");
+              "UNKNOWN_MACRO_EXPANDING_TO_SIGNATURE { custom_type a(var); }\n");
     }
 
     void testautovar13() { // Ticket #5537
@@ -468,7 +473,7 @@ class TestAutoVariables : public TestFixture {
               "  ~FileManager() {\n"
               "    delete &UniqueRealDirs;\n"
               "   }\n"
-              "};");
+              "};\n");
     }
 
     void testautovar14() { // Ticket #4776
@@ -478,7 +483,7 @@ class TestAutoVariables : public TestFixture {
               "    x = x >> 1;\n"
               "    goto label;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -491,7 +496,7 @@ class TestAutoVariables : public TestFixture {
               "    if (lumdiff > 5.0f)\n"
               "        return &darkOutline;\n"
               "    return 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -499,16 +504,36 @@ class TestAutoVariables : public TestFixture {
         check("void f(const void* ptr, bool* result) {\n"
               "  int dummy;\n"
               "  *result = (&dummy < ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
+    void testautovar17() {
+        check("struct S { int* p; };\n" // #14257
+              "int a[10];\n"
+              "void f(int** q) {\n"
+              "    S s;\n"
+              "    s.p = a;\n"
+              "    *q = &s.p[0];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void testautovar18() {
+        check("struct S { int* p; };\n"
+              "void foo(struct S* s) {\n"
+              "    int x;\n"
+              "    s[2].p = &x;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
+    }
+
     void testautovar_array1() {
         check("void func1(int* arr[2])\n"
               "{\n"
               "    int num=2;"
               "    arr[0]=&num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -520,7 +545,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num=2;"
               "    arr[0]=&num;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -557,6 +582,13 @@ class TestAutoVariables : public TestFixture {
               "    *s = &a[0];\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(int* p[]) {\n" // #7167
+              "    int a[4] = { 1, 2, 3 };\n"
+              "    p[0] = a;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
+                      errout_str());
     }
 
     void testautovar_normal() {
@@ -564,7 +596,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    XPoint DropPoint;\n"
               "    ds->location_data = (XtPointer *)&DropPoint;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -572,7 +604,7 @@ class TestAutoVariables : public TestFixture {
         check("void remove_duplicate_matches (char **matches) {\n"
               "  char dead_slot;\n"
               "  matches[0] = (char *)&dead_slot;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
@@ -581,7 +613,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num=2;"
               "    return &num;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26] -> [test.cpp:3:9] -> [test.cpp:3:26]: (error) Returning pointer to local variable 'num' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -593,7 +625,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int num=2;"
               "    return &num;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:26] -> [test.cpp:6:9] -> [test.cpp:6:26]: (error) Returning pointer to local variable 'num' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -603,7 +635,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    void *&value = tls[id];"
               "    return &value;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -612,7 +644,7 @@ class TestAutoVariables : public TestFixture {
         check("void foo() {\n"
               "  int cond2;\n"
               "  dostuff([&cond2]() { return &cond2; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -624,12 +656,32 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void testautovar_return6() { // #14005
+        check("struct S;\n"
+              "struct T { const struct S *s; };\n"
+              "extern struct T factory();\n"
+              "const struct S* f() {\n"
+              "    struct T t = factory();\n"
+              "    return &t.s[0];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S;\n"
+              "struct T { std::vector<struct S> v; };\n"
+              "extern struct T factory();\n"
+              "const struct S* f() {\n"
+              "    struct T t = factory();\n"
+              "    return &t.v[0];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:5:14] -> [test.cpp:6:12]: (error) Returning pointer to local variable 't' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
+    }
+
     void testautovar_extern() {
         check("struct foo *f()\n"
               "{\n"
               "    extern struct foo f;\n"
               "    return &f;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -639,7 +691,7 @@ class TestAutoVariables : public TestFixture {
               "  pcb->root0 = &root0;\n"
               "  dostuff(pcb);\n"
               "  pcb->root0 = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(cb* pcb) {\n"
@@ -648,7 +700,7 @@ class TestAutoVariables : public TestFixture {
               "  dostuff(pcb);\n"
               "  if (condition) return;\n" // <- not reassigned => error
               "  pcb->root0 = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void foo(cb* pcb) {\n"
@@ -657,7 +709,7 @@ class TestAutoVariables : public TestFixture {
               "  dostuff(pcb);\n"
               "  if (condition)\n"
               "    pcb->root0 = 0;\n"  // <- conditional reassign => error
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("struct S { int *p; };\n"
@@ -669,10 +721,9 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    struct S s;\n"
               "    g(&s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n"
-            "[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",   // duplicate
+            "[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
             errout_str());
     }
 
@@ -688,7 +739,7 @@ class TestAutoVariables : public TestFixture {
               "    delete[] (tmp4);\n"
               "    char tmp5[256];\n"
               "    delete[] tmp5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n"
                       "[test.cpp:5:12]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n"
                       "[test.cpp:7:12]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n"
@@ -697,28 +748,28 @@ class TestAutoVariables : public TestFixture {
 
         check("void func1(char * ptr) {\n"
               "    free(ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void func1() {\n"
               "    char* tmp1[256];\n"
               "    init(tmp1);\n"
               "    delete tmp1[34];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void func1() {\n"
               "    static char tmp1[256];\n"
               "    char *p = tmp1;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Deallocation of a static variable (tmp1) results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("char tmp1[256];\n"
               "void func1() {\n"
               "    char *p; if (x) p = tmp1;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Deallocation of a global variable (tmp1) results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("void f()\n"
@@ -729,7 +780,7 @@ class TestAutoVariables : public TestFixture {
               "        abc(0, psz_title);\n"
               "        free(psz_title);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2298 new check: passing stack-address to free()
@@ -737,44 +788,44 @@ class TestAutoVariables : public TestFixture {
               "   int *p = malloc(4);\n"
               "   free(&p);\n"
               "   return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
         check("int main() {\n"
               "   int i;\n"
               "   free(&i);\n"
               "   return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         // #5732
         check("int main() {\n"
               "   long (*pKoeff)[256] = new long[9][256];\n"
               "   delete[] pKoeff;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main() {\n"
               "   long *pKoeff[256];\n"
               "   delete[] pKoeff;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("int main() {\n"
               "   long *pKoeff[256];\n"
               "   free (pKoeff);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("void foo() {\n"
               "   const intPtr& intref = Getter();\n"
               "   delete intref;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "   MyObj& obj = *new MyObj;\n"
               "   delete &obj;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6506
@@ -786,7 +837,7 @@ class TestAutoVariables : public TestFixture {
               "  F().free(c1);\n"
               "  char *c2 = 0;\n"
               "  F().free(&c2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo {\n"
@@ -795,14 +846,14 @@ class TestAutoVariables : public TestFixture {
               "    char **dst_copy = NULL;\n"
               "    free(&dst_copy);\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6551
         check("bool foo( ) {\n"
               "  SwTxtFld * pTxtFld = GetFldTxtAttrAt();\n"
               "  delete static_cast<SwFmtFld*>(&pTxtFld->GetAttr());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8910
@@ -812,14 +863,14 @@ class TestAutoVariables : public TestFixture {
               "    if (data_size > sizeof (stack)) data = malloc (data_size);\n"
               "    else data = (RGNDATA *)stack;\n"
               "    if ((char *)data != stack) free (data);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8923
         check("void f(char **args1, char *args2[]) {\n"
               "    free((char **)args1);\n"
               "    free((char **)args2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10097
@@ -934,7 +985,7 @@ class TestAutoVariables : public TestFixture {
         check("void f(EventPtr *eventP, ActionPtr **actionsP) {\n"
               "    EventPtr event = *eventP;\n"
               "    *actionsP = &event->actions;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -942,7 +993,7 @@ class TestAutoVariables : public TestFixture {
         check("static void function(unsigned long **datap) {\n"
               "    struct my_s *mr = global_structure_pointer;\n"
               "    *datap = &mr->value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -951,7 +1002,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "  int x[10];\n"
               "  p = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:3:7] -> [test.cpp:4:3]: (error) Non-local variable 'p' will use pointer to local variable 'x'. [danglingLifetime]\n", errout_str());
 
         check("int *p;\n"
@@ -959,7 +1010,7 @@ class TestAutoVariables : public TestFixture {
               "  int x[10];\n"
               "  p = x;\n"
               "  p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -968,7 +1019,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "  int x;\n"
               "  p = &x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:3:7] -> [test.cpp:4:3]: (error) Non-local variable 'p' will use pointer to local variable 'x'. [danglingLifetime]\n", errout_str());
 
         check("int *p;\n"
@@ -976,7 +1027,7 @@ class TestAutoVariables : public TestFixture {
               "  int x;\n"
               "  p = &x;\n"
               "  p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -987,7 +1038,7 @@ class TestAutoVariables : public TestFixture {
               "    ptr = &x;\n"
               "  }\n"
               "  int *ptr;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11] -> [test.cpp:3:9] -> [test.cpp:4:5]: (error) Non-local variable 'ptr' will use pointer to local variable 'x'. [danglingLifetime]\n", errout_str());
 
         check("struct A {\n"
@@ -997,7 +1048,7 @@ class TestAutoVariables : public TestFixture {
               "    ptr = 0;\n"
               "  }\n"
               "  int *ptr;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct R {\n" // #11393
@@ -1021,7 +1072,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:12] -> [test.cpp:3:10] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'str' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1031,7 +1082,7 @@ class TestAutoVariables : public TestFixture {
               "    char str[100] = {0};\n"
               "    char *p = str;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:15] -> [test.cpp:3:10] -> [test.cpp:5:12]: (error) Returning pointer to local variable 'str' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1043,7 +1094,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:12] -> [test.cpp:6:10] -> [test.cpp:7:12]: (error) Returning pointer to local variable 'str' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1055,7 +1106,7 @@ class TestAutoVariables : public TestFixture {
               "    char temp[42];\n"
               "    char *tp = temp;\n"
               "    tp = format_reg(tp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1064,7 +1115,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -1074,7 +1125,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char str[100] = {0};\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1084,14 +1135,14 @@ class TestAutoVariables : public TestFixture {
         check("char *foo() {\n"
               "    char q[] = \"AAAAAAAAAAAA\";\n"
               "    return &q[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:2:10] -> [test.cpp:3:12]: (error) Returning pointer to local variable 'q' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("char *foo()\n"
               "{\n"
               "    static char q[] = \"AAAAAAAAAAAA\";\n"
               "    return &q[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *foo()\n"
@@ -1100,7 +1151,7 @@ class TestAutoVariables : public TestFixture {
               "char *p;\n"
               "p = &q[1];\n"
               "return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:3:6] -> [test.cpp:6:8]: (error) Returning pointer to local variable 'q' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -1108,7 +1159,7 @@ class TestAutoVariables : public TestFixture {
         check("char *foo() {\n"
               "    char x[10] = {0};\n"
               "    return x+5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:10] -> [test.cpp:3:13]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1116,7 +1167,7 @@ class TestAutoVariables : public TestFixture {
         check("char *foo(int y) {\n"
               "    char x[10] = {0};\n"
               "    return (x+8)-y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:2:10] -> [test.cpp:3:17]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1126,7 +1177,7 @@ class TestAutoVariables : public TestFixture {
         check("char *foo() {\n"
               "    int x[10] = {0};\n"
               "    return (char *)x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:20] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1137,7 +1188,7 @@ class TestAutoVariables : public TestFixture {
               "    int x = 123;\n"
               "    int p = &x;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
     }
 
@@ -1147,35 +1198,35 @@ class TestAutoVariables : public TestFixture {
               "    int s = 0;\n"
               "    int& x = s;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:5:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::string &foo()\n"
               "{\n"
               "    std::string s;\n"
               "    return s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::vector<int> &foo()\n"
               "{\n"
               "    std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::vector<int> &foo()\n"
               "{\n"
               "    static std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> &foo()\n"
               "{\n"
               "    thread_local std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string hello()\n"
@@ -1186,7 +1237,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &f()\n"
               "{\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         // make sure scope is used in function lookup
@@ -1197,7 +1248,7 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "std::string &f() {\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string hello() {\n"
@@ -1206,7 +1257,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "std::string &f() {\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::string hello() {\n"
@@ -1215,7 +1266,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "std::string &f() {\n"
               "    return hello().substr(1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:26]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Foo;\n"
@@ -1225,7 +1276,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "Foo& f() {\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         // make sure function overloads are handled properly
@@ -1240,7 +1291,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "Foo& f() {\n"
               "    return hello(true);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("Foo hello() {\n"
@@ -1249,7 +1300,7 @@ class TestAutoVariables : public TestFixture {
               "\n"
               "Foo& f() {\n" // Unknown type - might be a reference
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1261,7 +1312,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    std::string s;\n"
               "    return s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("class Fred {\n"
@@ -1271,7 +1322,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("class Fred {\n"
@@ -1281,7 +1332,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static std::vector<int> v;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -1294,7 +1345,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &Fred::f()\n"
               "{\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Fred {\n"
@@ -1308,7 +1359,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &Fred::f()\n"
               "{\n"
               "    return hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Bar;\n"
@@ -1317,7 +1368,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "Bar& bar() {\n"
               "    return foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::map<int, string> foo() {\n"
@@ -1325,7 +1376,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "std::map<int, string>& bar() {\n"
               "    return foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("Bar foo() {\n"
@@ -1333,13 +1384,13 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "Bar& bar() {\n" // Unknown type - might be a typedef to a reference type
               "    return foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         // Don't crash with function in unknown scope (#4076)
-        check("X& a::Bar() {}"
+        check("X& a::Bar() {}\n"
               "X& foo() {"
               "    return Bar();"
-              "}");
+              "}\n");
     }
 
     void returnReference3() {
@@ -1347,7 +1398,7 @@ class TestAutoVariables : public TestFixture {
               "    double ret = getValue();\n"
               "    rd = ret;\n"
               "    return rd;\n"
-              "}", dinit(CheckOptions, $.inconclusive = false));
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1356,7 +1407,7 @@ class TestAutoVariables : public TestFixture {
         check("double a;\n"
               "double & f() {\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1376,7 +1427,7 @@ class TestAutoVariables : public TestFixture {
               "        const A &ra = pb->a;\n"
               "        return ra;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1384,7 +1435,7 @@ class TestAutoVariables : public TestFixture {
         check("Fred & create() {\n"
               "    Fred &fred(*new Fred);\n"
               "    return fred;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1393,14 +1444,14 @@ class TestAutoVariables : public TestFixture {
               "std::string &a(int);\n"
               "std::string &b() {\n"
               "    return a(12);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string &a(int);\n"
               "std::string a();\n"
               "std::string &b() {\n"
               "    return a(12);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1409,14 +1460,14 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int>::iterator it = v.begin();\n"
               "    int& value = *it;\n"
               "    return value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference9() {
         check("int& f(bool b, int& x, int& y) {\n"
               "    return b ? x : y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1425,14 +1476,14 @@ class TestAutoVariables : public TestFixture {
               "int& g() {\n"
               "    A a;\n"
               "    return a.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class A { int& f() const; };\n"
               "int& g() {\n"
               "    A a;\n"
               "    return a.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1440,19 +1491,19 @@ class TestAutoVariables : public TestFixture {
         check("class A { static int f(); };\n"
               "int& g() {\n"
               "    return A::f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class A { static int& f(); };\n"
               "int& g() {\n"
               "    return A::f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace A { int& f(); }\n"
               "int& g() {\n"
               "    return A::f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1460,14 +1511,14 @@ class TestAutoVariables : public TestFixture {
         check("class A { static int& f(); };\n"
               "auto g() {\n"
               "    return &A::f;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A { static int& f(); };\n"
               "auto g() {\n"
               "    auto x = &A::f;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1476,14 +1527,14 @@ class TestAutoVariables : public TestFixture {
               "void* vp = &v;\n"
               "int& foo(size_t i) {\n"
               "    return ((std::vector<int>*)vp)->at(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> v;\n"
               "void* vp = &v;\n"
               "int& foo(size_t i) {\n"
               "    return static_cast<std::vector<int>*>(vp)->at(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1496,7 +1547,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "void* &A::f() {\n"
               "    return g()->m;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1509,7 +1560,7 @@ class TestAutoVariables : public TestFixture {
               "template <class T>\n"
               "const int& f(const T&) {\n"
               "    return f<T>();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T>\n"
@@ -1517,19 +1568,19 @@ class TestAutoVariables : public TestFixture {
               "template <class T>\n"
               "const int& f(const T&) {\n"
               "    return g<T>();\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void returnReference16() {
         check("int& f(std::tuple<int>& x) {\n"
               "    return std::get<0>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(int x) {\n"
               "    return std::get<0>(std::make_tuple(x));\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -1537,7 +1588,7 @@ class TestAutoVariables : public TestFixture {
         check("auto g() -> int&;\n"
               "int& f() {\n"
               "    return g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1546,7 +1597,7 @@ class TestAutoVariables : public TestFixture {
               "auto f(T& x) -> decltype(x);\n"
               "int& g(int* x) {\n"
               "    return f(*x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1554,7 +1605,7 @@ class TestAutoVariables : public TestFixture {
     void returnReference19() {
         check("struct C : B {\n"
               "    const B &f() const { return (const B &)*this; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1565,7 +1616,7 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "int& b() {\n"
               "    return a()();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto a() {\n"
@@ -1576,13 +1627,13 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "const int& c() {\n"
               "    return a()();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::function<int&()> a();\n"
               "int& b() {\n"
               "    return a()();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9889
@@ -1708,6 +1759,19 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void returnReference29()
+    {
+        check("const std::string& f() {\n" // #12548
+              "    return std::string{};\n"
+              "}\n"
+              "const std::string& g() {\n"
+              "    return {};\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (error) Reference to temporary returned. [returnTempReference]\n"
+                      "[test.cpp:5:12]: (error) Reference to temporary returned. [returnTempReference]\n",
+                      errout_str());
+    }
+
     void returnReferenceFunction() {
         check("int& f(int& a) {\n"
               "    return a;\n"
@@ -1715,7 +1779,7 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:14] -> [test.cpp:2:12] -> [test.cpp:6:12] -> [test.cpp:6:13]: (error) Reference to local variable returned. [returnReference]\n",
             errout_str());
@@ -1726,7 +1790,7 @@ class TestAutoVariables : public TestFixture {
               "int* hello() {\n"
               "    int x = 0;\n"
               "    return &f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:14] -> [test.cpp:2:12] -> [test.cpp:6:13] -> [test.cpp:6:12] -> [test.cpp:5:9] -> [test.cpp:6:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -1736,7 +1800,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "int * g(int x) {\n"
               "    return f(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14] -> [test.cpp:5:14] -> [test.cpp:4:13] -> [test.cpp:5:13]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("int* f(int * x) {\n"
@@ -1745,7 +1809,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "int * g(int x) {\n"
               "    return f(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int& a) {\n"
@@ -1754,7 +1818,7 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("int& f(int a) {\n"
@@ -1763,7 +1827,7 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("int f(int a) {\n"
@@ -1772,14 +1836,14 @@ class TestAutoVariables : public TestFixture {
               "int& hello() {\n"
               "    int x = 0;\n"
               "    return f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("template<class T>\n"
               "int& f(int& x, T y) {\n"
               "    x += y;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1787,31 +1851,31 @@ class TestAutoVariables : public TestFixture {
         check("auto& f() {\n"
               "    std::vector<int> x;\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("auto& f() {\n"
               "    std::vector<int> x;\n"
               "    return x.front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:3:19]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("std::vector<int> g();\n"
               "auto& f() {\n"
               "    return g().front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:3:21]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("auto& f() {\n"
               "    return std::vector<int>{1}.front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:32] -> [test.cpp:2:37]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("struct A { int foo; };\n"
               "int& f(std::vector<A> v) {\n"
               "    auto it = v.begin();\n"
               "    return it->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:4:14]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("template <class T, class K, class V>\n"
@@ -1845,7 +1909,7 @@ class TestAutoVariables : public TestFixture {
               "int& f(std::vector<A>& v) {\n"
               "    auto it = v.begin();\n"
               "    return it->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static std::vector<int> A[2];\n"
@@ -1859,18 +1923,18 @@ class TestAutoVariables : public TestFixture {
     void returnReferenceLiteral() {
         check("const std::string &a() {\n"
               "    return \"foo\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("const std::string a() {\n"
               "    return \"foo\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const std::string& f(const std::string& x) { return x; }\n"
               "const std::string &a() {\n"
               "    return f(\"foo\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:42] -> [test.cpp:1:53] -> [test.cpp:3:12] -> [test.cpp:3:13]: (error) Reference to temporary returned. [returnTempReference]\n",
             errout_str());
@@ -1878,59 +1942,59 @@ class TestAutoVariables : public TestFixture {
         check("const char * f(const char * x) { return x; }\n"
               "const std::string &a() {\n"
               "    return f(\"foo\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
     }
 
     void returnReferenceCalculation() {
         check("const std::string &a(const std::string& str) {\n"
               "    return \"foo\" + str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("int& operator<<(int out, int path) {\n"
               "    return out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::ostream& operator<<(std::ostream& out, const std::string& path) {\n"
               "    return out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::ostream& operator<<(std::ostream* out, const std::string& path) {\n"
               "    return *out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("Unknown1& operator<<(Unknown1 out, Unknown2 path) {\n"
               "    return out << path;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& a(int b) {\n"
               "    return 2*(b+1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("const std::string &a(const std::string& str) {\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const std::string &a(int bar) {\n"
               "    return foo(bar + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const std::string a(const std::string& str) {\n"
               "    return \"foo\" + str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& incValue(int& value) {\n"
               "    return ++value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1941,7 +2005,7 @@ class TestAutoVariables : public TestFixture {
               "    [](const Item& lhs, const Item& rhs) {\n"
               "        return false;\n"
               "    });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5844
@@ -1951,13 +2015,13 @@ class TestAutoVariables : public TestFixture {
               "    return var;\n"
               "  }();\n"
               "return s_var;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7583
         check("Command& foo() {\n"
               "  return f([]() -> int { return 1; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1970,16 +2034,16 @@ class TestAutoVariables : public TestFixture {
               "        }\n"
               "    };\n"
               "    return _make(_Wrapper::call, pmf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceRecursive() {
-        check("int& f() { return f(); }");
+        check("int& f() { return f(); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& g(int& i) { return i; }\n"
-              "int& f() { return g(f()); }");
+              "int& f() { return g(f()); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1989,7 +2053,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    const int& x = h();\n"
               "    return [&] { return x; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:5:25] -> [test.cpp:4:16] -> [test.cpp:5:12]: (error) Returning lambda that captures local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("void g(int*);\n"
@@ -1997,7 +2061,7 @@ class TestAutoVariables : public TestFixture {
               "int* f() {\n"
               "    const int& x = h();\n"
               "    return &x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:5:12] -> [test.cpp:4:16] -> [test.cpp:5:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("void g(int*);\n"
@@ -2005,7 +2069,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    int& x = h();\n"
               "    g(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:12] -> [test.cpp:5:7] -> [test.cpp:4:15] -> [test.cpp:5:7]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n"
             "[test.cpp:4:12] -> [test.cpp:5:8]: (error) Using reference to dangling temporary. [danglingTempReference]\n",
@@ -2016,7 +2080,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    const int& x = h();\n"
               "    g(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Data {\n"
@@ -2025,7 +2089,7 @@ class TestAutoVariables : public TestFixture {
               "const char* foo() {\n"
               "    const Data& data = getData();\n"
               "    return data.path.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2034,7 +2098,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static int &r = k;\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:3:17]: (error) Non-local reference variable 'r' to local variable 'k' [danglingReference]\n",
                       errout_str());
 
@@ -2042,7 +2106,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    static int &r = k;\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2210,7 +2274,7 @@ class TestAutoVariables : public TestFixture {
               "   {\n"
               "      pNum = apNum;\n"
               "   }\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -2219,28 +2283,28 @@ class TestAutoVariables : public TestFixture {
         check("int* foo(int y)\n"
               "{\n"
               "  return &y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:1:14] -> [test.cpp:3:10]: (error) Returning pointer to local variable 'y' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("int ** foo(int * y)\n"
               "{\n"
               "  return &y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:1:18] -> [test.cpp:3:10]: (error) Returning pointer to local variable 'y' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("const int * foo(const int & y)\n"
               "{\n"
               "  return &y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
         check("int * foo(int * y)\n"
               "{\n"
               "  return y;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -2250,7 +2314,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    struct s *r = f();\n"
               "    *q = &r->p;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -2261,7 +2325,7 @@ class TestAutoVariables : public TestFixture {
               "  const_tree_iterator& parent() {\n"
               "    return const_tree_iterator(foo);\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
     }
 
@@ -2272,7 +2336,7 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "void opened_cb () {\n"
               "	g_signal_connect (G_CALLBACK (removed_cb));\n"
-              "}");
+              "}\n");
     }
 
     void danglingLifetimeLambda() {
@@ -2280,30 +2344,30 @@ class TestAutoVariables : public TestFixture {
               "    int a = 1;\n"
               "    auto l = [&](){ return a; };\n"
               "    return l;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    int a = 1;\n"
               "    return [&](){ return a; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(int a) {\n"
               "    return [&](){ return a; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26] -> [test.cpp:1:12] -> [test.cpp:2:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(int a) {\n"
               "    auto p = &a;\n"
               "    return [=](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:26] -> [test.cpp:1:12] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto g(int& a) {\n"
               "    int p = a;\n"
               "    return [&](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'p' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
@@ -2311,7 +2375,7 @@ class TestAutoVariables : public TestFixture {
               "        int a = 1;\n"
               "        return [&](){ return a; };\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:30] -> [test.cpp:3:13] -> [test.cpp:4:16]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(int b) {\n"
@@ -2319,30 +2383,30 @@ class TestAutoVariables : public TestFixture {
               "        a += b;\n"
               "        return [&](){ return a; };\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:30] -> [test.cpp:2:20] -> [test.cpp:4:16]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto g(int& a) {\n"
               "    return [&](){ return a; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g(int a) {\n"
               "    auto p = a;\n"
               "    return [=](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g(int& a) {\n"
               "    auto p = a;\n"
               "    return [=](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g(int& a) {\n"
               "    int& p = a;\n"
               "    return [&](){ return p; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class F>\n"
@@ -2350,7 +2414,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    int x;\n"
               "    return g([&]() { return x; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
@@ -2423,28 +2487,28 @@ class TestAutoVariables : public TestFixture {
         check("auto f(const std::vector<int>& x) {\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f() {\n"
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    std::vector<int> x;\n"
               "    auto it = std::begin(x);\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("int* f() {\n"
               "    std::vector<int> x;\n"
               "    auto p = x.data();\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:20] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2453,7 +2517,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> x;\n"
               "    auto p = &x[0];\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:14] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2462,7 +2526,7 @@ class TestAutoVariables : public TestFixture {
               "int* f(std::vector<A> v) {\n"
               "    auto it = v.begin();\n"
               "    return &it->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:4:12] -> [test.cpp:2:23] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2470,14 +2534,14 @@ class TestAutoVariables : public TestFixture {
         check("std::vector<int>::iterator f(std::vector<int> x) {\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22] -> [test.cpp:1:47] -> [test.cpp:3:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return std::next(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:2:22] -> [test.cpp:4:21]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2486,7 +2550,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return it + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:2:22] -> [test.cpp:4:15]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2495,7 +2559,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return std::next(it + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:22] -> [test.cpp:4:25] -> [test.cpp:2:22] -> [test.cpp:4:21]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2505,7 +2569,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int*> v;\n"
               "    v.push_back(&i);\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:17] -> [test.cpp:4:17] -> [test.cpp:2:9] -> [test.cpp:5:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2517,7 +2581,7 @@ class TestAutoVariables : public TestFixture {
               "    v.push_back(&i);\n"
               "    r.assign(v.begin(), v.end());\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:17] -> [test.cpp:5:17] -> [test.cpp:5:5] -> [test.cpp:3:9] -> [test.cpp:7:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2528,7 +2592,7 @@ class TestAutoVariables : public TestFixture {
               "        int i;\n"
               "        v.push_back(&i);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:21] -> [test.cpp:5:21] -> [test.cpp:4:13] -> [test.cpp:5:9]: (error) Non-local variable 'v' will use object that points to local variable 'i'. [danglingLifetime]\n",
             errout_str());
@@ -2540,7 +2604,7 @@ class TestAutoVariables : public TestFixture {
               "        int * p = &i;\n"
               "        v.push_back(p);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:19] -> [test.cpp:6:21] -> [test.cpp:4:13] -> [test.cpp:6:9]: (error) Non-local variable 'v' will use object that points to local variable 'i'. [danglingLifetime]\n",
             errout_str());
@@ -2553,7 +2617,7 @@ class TestAutoVariables : public TestFixture {
               "        v.push_back(&x);\n"
               "        m.insert(m.end(), v.begin(), v.end());\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:6:21] -> [test.cpp:6:21] -> [test.cpp:6:9] -> [test.cpp:4:13] -> [test.cpp:7:9]: (error) Non-local variable 'm' will use object that points to local variable 'x'. [danglingLifetime]\n"
             "[test.cpp:6:21] -> [test.cpp:6:21] -> [test.cpp:6:9] -> [test.cpp:4:13] -> [test.cpp:7:18]: (error) Non-local variable 'm' will use object that points to local variable 'x'. [danglingLifetime]\n", // duplicate
@@ -2564,7 +2628,7 @@ class TestAutoVariables : public TestFixture {
               "        return it;\n"
               "    }\n"
               "    return {};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:26] -> [test.cpp:1:47] -> [test.cpp:3:16]: (error) Returning iterator to local container 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2572,7 +2636,7 @@ class TestAutoVariables : public TestFixture {
         check("const char * f() {\n"
               "   std::string ba(\"hello\");\n"
               "   return ba.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:19] -> [test.cpp:2:16] -> [test.cpp:3:19]: (error) Returning pointer to local variable 'ba' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -2594,7 +2658,7 @@ class TestAutoVariables : public TestFixture {
         check("std::vector<int> g();\n"
               "auto f() {\n"
               "    return g().begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:21] -> [test.cpp:3:21]: (error) Returning iterator that will be invalid when returning. [returnDanglingLifetime]\n",
                       errout_str());
 
@@ -2602,15 +2666,14 @@ class TestAutoVariables : public TestFixture {
               "std::vector<int>::iterator f() {\n"
               "    auto it = g().begin();\n"
               "    return it;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:3:16] -> [test.cpp:4:5]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n"
-                      "[test.cpp:3:24] -> [test.cpp:4:12]: (error) Returning iterator that will be invalid when returning. [returnDanglingLifetime]\n",
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:3:16] -> [test.cpp:4:5]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
 
         check("std::vector<int> g();\n"
               "int& f() {\n"
               "    return *g().begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:3:12]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("struct A {\n"
@@ -2619,7 +2682,7 @@ class TestAutoVariables : public TestFixture {
               "        char s[3];\n"
               "        v.push_back(s);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::string> f() {\n"
@@ -2627,46 +2690,46 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<std::string> v;\n"
               "    v.push_back(s);\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
               "  static std::vector<int> x;\n"
               "  return x.begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string g() {\n"
               "    std::vector<char> v;\n"
               "    return v.data();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f(std::vector<int>* v) {\n"
               "    return v->begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f(std::vector<int>* v) {\n"
               "    std::vector<int>* v = new std::vector<int>();\n"
               "    return v->begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> v) {\n"
               "    return *v.begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> v) {\n"
               "    return v.end() - v.begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("auto g() {\n"
               "    std::vector<char> v;\n"
               "    return {v, [v]() { return v.data(); }};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class F>\n"
@@ -2674,7 +2737,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    std::vector<char> v;\n"
               "    return g([&]() { return v.data(); });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> g();\n"
@@ -2684,7 +2747,7 @@ class TestAutoVariables : public TestFixture {
               "        std::vector<int> v = g();\n"
               "        m.insert(m.end(), v.begin(), v.end());\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -2694,7 +2757,7 @@ class TestAutoVariables : public TestFixture {
               "        v.insert(a, a+1);\n"
               "    }\n"
               "    return v.back() == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -2705,7 +2768,7 @@ class TestAutoVariables : public TestFixture {
               "    struct B {};\n"
               "    std::map< S, B > m1;\n"
               "    std::map< S, B > m2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -2714,33 +2777,33 @@ class TestAutoVariables : public TestFixture {
               "    void f() {\n"
               "        v.push_back(&x);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f(const std::string& x) {\n"
               "    std::string y = \"x\";\n"
               "    return y.find(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string* f();\n"
               "const char* g() {\n"
               "    std::string* var = f();\n"
               "    return var->c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string f() {\n"
               "    std::vector<char> data{};\n"
               "    data.push_back('a');\n"
               "    return std::string{ data.data(), data.size() };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<char*> f() {\n"
               "    char a = 0;\n"
               "    return std::vector<char*>{&a};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:31] -> [test.cpp:3:31] -> [test.cpp:2:10] -> [test.cpp:3:30]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("std::vector<int>* g();\n"
@@ -2875,6 +2938,39 @@ class TestAutoVariables : public TestFixture {
               "    return it;\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:3:44] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning iterator to local container 'x' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
+
+        check("void f(std::vector<int*>& m) {\n"
+              "    int x;\n"
+              "    m.push_back(&x);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17] -> [test.cpp:3:17] -> [test.cpp:2:9] -> [test.cpp:3:5]: (error) Non-local variable 'm' will use object that points to local variable 'x'. [danglingLifetime]\n", errout_str());
+
+        check("struct P {\n"
+              "    int h() const;\n"
+              "    int x;\n"
+              "    int& r;\n"
+              "};\n"
+              "int f(const P& p) {\n"
+              "    return p.h();\n"
+              "}\n"
+              "struct C {\n"
+              "    void g() {\n"
+              "        int i = 1;\n"
+              "        P q(m, i);\n"
+              "        f(q);\n"
+              "    }\n"
+              "    int m;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("std::string to_string(const char* p) {\n" // #14818
+              "    return p;\n"
+              "}\n"
+              "std::string get() {\n"
+              "    std::string s;\n"
+              "    return to_string(s.c_str());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingLifetimeContainerView()
@@ -3102,6 +3198,14 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:10] -> [test.cpp:3:12]: (error) Returning pointer to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
+
+        check("std::string_view f() {\n" // #14465
+              "    std::vector<std::string> v;\n"
+              "    return *v.begin();\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:12] -> [test.cpp:3:12]: (error) Returning object that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
     }
 
     void danglingLifetimeUniquePtr()
@@ -3142,20 +3246,20 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> a;\n"
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:4:26] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(std::vector<int> a) {\n"
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22] -> [test.cpp:3:26] -> [test.cpp:1:25] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("struct e {};\n"
               "e * j() {\n"
               "    e c[20];\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:12] -> [test.cpp:3:7] -> [test.cpp:4:12]: (error) Returning pointer to local variable 'c' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3163,12 +3267,12 @@ class TestAutoVariables : public TestFixture {
         check("auto f(std::vector<int>& a) {\n"
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int * f(int a[]) {\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3176,14 +3280,14 @@ class TestAutoVariables : public TestFixture {
               "        uint32_t f[6];\n"
               "    } d;\n"
               "    uint32_t *a = d.f;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't decay std::array
         check("std::array<char, 1> f() {\n"
               "    std::array<char, 1> x;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3191,7 +3295,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3199,7 +3303,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1]();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3207,7 +3311,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
@@ -3215,7 +3319,7 @@ class TestAutoVariables : public TestFixture {
               "void f() {\n"
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1]();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Crash #8872
@@ -3223,14 +3327,14 @@ class TestAutoVariables : public TestFixture {
               "  void operator()(b c) override {\n"
               "    d(c, [&] { c->e });\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "  void operator()(b c) override {\n"
               "    d(c, [=] { c->e });\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -3239,7 +3343,7 @@ class TestAutoVariables : public TestFixture {
               "a f() {\n"
               "    char c[20];\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -3249,7 +3353,7 @@ class TestAutoVariables : public TestFixture {
               "    char c[20];\n"
               "    a d = c;\n"
               "    return d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3257,14 +3361,14 @@ class TestAutoVariables : public TestFixture {
               "        std::vector<int> v;\n"
               "        auto g() { return v.end(); }\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int * f(std::vector<int>& v) {\n"
               "    for(int & x : v)\n"
               "        return &x;\n"
               "    return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9275
@@ -3276,7 +3380,7 @@ class TestAutoVariables : public TestFixture {
               "    char buf[1024];\n"
               "    const char* msg = buf;\n"
               "    m = msg;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9201
@@ -3284,14 +3388,14 @@ class TestAutoVariables : public TestFixture {
               "    struct a { int m; };\n"
               "    static a b{0};\n"
               "    return &b.m;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9453
         check("int *ptr;\n"
               "void foo(int arr[]) {\n"
               "    ptr = &arr[2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9639
@@ -3302,7 +3406,7 @@ class TestAutoVariables : public TestFixture {
               "const char * f() {\n"
               "  const Fred &fred = getFred();\n"
               "  return fred.s.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9534
@@ -3312,14 +3416,14 @@ class TestAutoVariables : public TestFixture {
               "int* f(int i, std::vector<A>& v) {\n"
               "    A& y = v[i];\n"
               "    return &y.x[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9712
         check("std::string f(const char *str) {\n"
               "    char value[256];\n"
               "    return value;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9770
@@ -3493,7 +3597,7 @@ class TestAutoVariables : public TestFixture {
         check("auto f() {\n"
               "    int a;\n"
               "    return std::ref(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:21] -> [test.cpp:2:9] -> [test.cpp:3:20]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3501,7 +3605,7 @@ class TestAutoVariables : public TestFixture {
         check("auto f() {\n"
               "    int a;\n"
               "    return std::make_tuple(std::ref(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:37] -> [test.cpp:3:36] -> [test.cpp:2:9] -> [test.cpp:3:27]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3513,7 +3617,7 @@ class TestAutoVariables : public TestFixture {
               "auto g() {\n"
               "    std::vector<int> v;\n"
               "    return by_value(v.begin());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:28] -> [test.cpp:7:28] -> [test.cpp:3:12] -> [test.cpp:3:25] -> [test.cpp:6:22] -> [test.cpp:7:20]: (error) Returning object that points to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3536,7 +3640,7 @@ class TestAutoVariables : public TestFixture {
               "auto f() {\n"
               "    int i = 0;\n"
               "    return by_ref(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:12] -> [test.cpp:1:19] -> [test.cpp:2:25] -> [test.cpp:6:19] -> [test.cpp:5:9] -> [test.cpp:6:18]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3554,7 +3658,7 @@ class TestAutoVariables : public TestFixture {
               "    int a;\n"
               "    std::tie(a) = x;\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::pair<std::string, std::string>\n"
@@ -3803,7 +3907,7 @@ class TestAutoVariables : public TestFixture {
               "A f() {\n"
               "    int i = 0;\n"
               "    return A{i, i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:14] -> [test.cpp:6:9] -> [test.cpp:7:13]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3815,7 +3919,7 @@ class TestAutoVariables : public TestFixture {
               "A f() {\n"
               "    int i = 0;\n"
               "    return {i, i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:13] -> [test.cpp:6:9] -> [test.cpp:7:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3828,7 +3932,7 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    A r{i, i};\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:9] -> [test.cpp:6:9] -> [test.cpp:8:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3841,7 +3945,7 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    A r = {i, i};\n"
               "    return r;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:12] -> [test.cpp:6:9] -> [test.cpp:8:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3853,7 +3957,7 @@ class TestAutoVariables : public TestFixture {
               "A f(int& x) {\n"
               "    int i = 0;\n"
               "    return A{i, x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:14] -> [test.cpp:6:9] -> [test.cpp:7:13]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
@@ -3865,7 +3969,7 @@ class TestAutoVariables : public TestFixture {
               "A f(int& x) {\n"
               "    int i = 0;\n"
               "    return A{x, i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -3874,14 +3978,14 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "A f(int& x) {\n"
               "    return A{x, x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; const int& j; };\n"
               "A f(int& x) {\n"
               "    int y = 0;\n"
               "    return A{y, x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -3916,6 +4020,65 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS(
             "[test.cpp:6:30] -> [test.cpp:6:30] -> [test.cpp:6:21] -> [test.cpp:5:21] -> [test.cpp:8:12]: (error) Returning object that points to local variable 'a' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
+
+        check("struct S { const std::string& r; };\n" // #14209
+              "S f() {\n"
+              "    std::string s;\n"
+              "    return S{ s };\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:15] -> [test.cpp:3:17] -> [test.cpp:4:13]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
+
+        check("struct A { int& x; };\n" // #14247
+              "A f() {\n"
+              "    int x = 0;\n"
+              "    A a{.x = x};\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:14] -> [test.cpp:3:9] -> [test.cpp:5:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
+
+        check("struct A { int x; int& r};\n"
+              "A f(int& r) {\n"
+              "    int x = 0;\n"
+              "    A a{.x = x, .r = r};\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int& x; };\n"
+              "A f() {\n"
+              "    int x = 0;\n"
+              "    A a{ .x{x} };\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:13] -> [test.cpp:3:9] -> [test.cpp:5:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
+
+        check("struct A { int x; int& r};\n"
+              "A f(int& r) {\n"
+              "    int x = 0;\n"
+              "    A a{ .x{x}, .r{r} };\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i; bool b; };\n" // #14260
+              "void f() {\n"
+              "    struct S s = { .i = 0, true };\n"
+              "}\n"); // don't crash
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int& r; };\n" // #14772
+              "A* f() {\n"
+              "    int x = 0;\n"
+              "    return new A{ x };\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:19] -> [test.cpp:3:9] -> [test.cpp:4:17]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
     }
 
     void danglingLifetimeInitList() {
@@ -3923,34 +4086,34 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    std::vector<int*> v = {&i, &i};\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:28] -> [test.cpp:3:28] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n"
-            "[test.cpp:3:32] -> [test.cpp:3:32] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", // duplicate
+            "[test.cpp:3:32] -> [test.cpp:3:32] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
         check("std::vector<int*> f() {\n"
               "    int i = 0;\n"
               "    std::vector<int*> v{&i, &i};\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:25] -> [test.cpp:3:25] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n"
-            "[test.cpp:3:29] -> [test.cpp:3:29] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", // duplicate
+            "[test.cpp:3:29] -> [test.cpp:3:29] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
         check("std::vector<int*> f() {\n"
               "    int i = 0;\n"
               "    return {&i, &i};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:3:13] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n"
-            "[test.cpp:3:17] -> [test.cpp:3:17] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", // duplicate
+            "[test.cpp:3:17] -> [test.cpp:3:17] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
         check("std::vector<int*> f(int& x) {\n"
               "    return {&x, &x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::string> f() {\n"
@@ -3958,7 +4121,7 @@ class TestAutoVariables : public TestFixture {
               "    x.insert(\"1\");\n"
               "    x.insert(\"2\");\n"
               "    return { x.begin(), x.end() };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3967,7 +4130,7 @@ class TestAutoVariables : public TestFixture {
               "A f() {\n"
               "   std::string ba(\"hello\");\n"
               "   return ba.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(const char *a); };\n"
@@ -3975,7 +4138,7 @@ class TestAutoVariables : public TestFixture {
               "   std::string ba(\"hello\");\n"
               "   A bp = ba.c_str();\n"
               "   return bp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(const char *a); };\n"
@@ -3984,7 +4147,7 @@ class TestAutoVariables : public TestFixture {
               "   std::vector<A> v;\n"
               "   v.push_back(ba.c_str());\n"
               "   return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& x) {\n"
@@ -3992,7 +4155,7 @@ class TestAutoVariables : public TestFixture {
               "  if (!x.empty())\n"
               "    return x + c;\n"
               "  return \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& x) {\n"
@@ -4000,7 +4163,7 @@ class TestAutoVariables : public TestFixture {
               "  if (!x.empty())\n"
               "    return c + 1;\n"
               "  return \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4023,7 +4186,7 @@ class TestAutoVariables : public TestFixture {
               "void f(int& i) {\n"
               "    int* x = &g(0);\n"
               "    i += *x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:26] -> [test.cpp:2:12] -> [test.cpp:5:15] -> [test.cpp:5:14] -> [test.cpp:5:17] -> [test.cpp:6:11]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
             errout_str());
@@ -4033,7 +4196,7 @@ class TestAutoVariables : public TestFixture {
               "    const char* b = a.toStdString().c_str();\n"
               "    QString c = b;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:42] -> [test.cpp:3:34] -> [test.cpp:4:15]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
 
@@ -4041,7 +4204,7 @@ class TestAutoVariables : public TestFixture {
               "    const char *x = s.substr(1,2).c_str();\n"
               "    auto i = s.substr(4,5).begin();\n"
               "    return *i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:33] -> [test.cpp:3:22] -> [test.cpp:4:13]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
 
@@ -4049,7 +4212,7 @@ class TestAutoVariables : public TestFixture {
               "    std::stringstream tmp;\n"
               "    const std::string &str = tmp.str();\n"
               "    return std::string(str.c_str(), 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int get_value();\n"
@@ -4101,6 +4264,20 @@ class TestAutoVariables : public TestFixture {
         ASSERT_EQUALS("[test.cpp:9:63] -> [test.cpp:9:49] -> [test.cpp:10:11]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
 
+        check("struct A {\n" // #14054
+              "    std::map<int, int> m_;\n"
+              "};\n"
+              "struct B {\n"
+              "    A a_;\n"
+              "};\n"
+              "B func();\n"
+              "void f() {\n"
+              "    const std::map<int, int>::iterator m = func().a_.m_.begin();\n"
+              "    (void)m->first;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:9:62] -> [test.cpp:9:48] -> [test.cpp:10:11]: (error) Using iterator that is a temporary. [danglingTemporaryLifetime]\n",
+                      errout_str());
+
         check("void f(bool b) {\n"
               "  std::vector<int> ints = g();\n"
               "  auto *ptr = &ints;\n"
@@ -4284,6 +4461,99 @@ class TestAutoVariables : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:5:14] -> [test.cpp:5:18] -> [test.cpp:6:7]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
                       errout_str());
+
+        check("struct A { const int* data[2]; };\n"
+              "A g() {\n"
+              "    int x = 0;\n"
+              "    A a;\n"
+              "    a.data[0] = &x;\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:17] -> [test.cpp:3:9] -> [test.cpp:6:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* data[2]; };\n"
+              "A g() {\n"
+              "    int x = 0;\n"
+              "    A a[2];\n"
+              "    a[0].data[0] = &x;\n"
+              "    return a[0];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:20] -> [test.cpp:3:9] -> [test.cpp:6:13]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* data[2]; };\n"
+              "A* g() {\n"
+              "    int x = 0;\n"
+              "    static A arr[2];\n"
+              "    arr[0].data[0] = &x;\n"
+              "    return arr;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:22] -> [test.cpp:3:9] -> [test.cpp:6:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "A g(int i) {\n"
+              "    int x = 0;\n"
+              "    A arr[2];\n"
+              "    arr[i].p = &x;\n"
+              "    return arr[i];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:16] -> [test.cpp:3:9] -> [test.cpp:6:15]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "A* g(int i) {\n"
+              "    int x = 0;\n"
+              "    static A arr[2];\n"
+              "    arr[i].p = &x;\n"
+              "    return arr;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:16] -> [test.cpp:3:9] -> [test.cpp:6:12]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "struct B { A arr[2]; };\n"
+              "B g(int i) {\n"
+              "    int x = 0;\n"
+              "    B b;\n"
+              "    b.arr[i].p = &x;\n"
+              "    return b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:18] -> [test.cpp:4:9] -> [test.cpp:7:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { const int* p; };\n"
+              "A* g() {\n"
+              "    int x = 0;\n"
+              "    static A a;\n"
+              "    A* ap = &a;\n"
+              "    ap->p = &x;\n"
+              "    (*ap).p = &x;\n"
+              "    return ap;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int* a; int* b; };\n"
+              "static A g;\n"
+              "int* f() {\n"
+              "    int x = 0;\n"
+              "    g.a = &x;\n"
+              "    return g.b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:11] -> [test.cpp:4:9] -> [test.cpp:5:6]: (error) Non-local variable 'g.a' will use pointer to local variable 'x'. [danglingLifetime]\n",
+                      errout_str());
+
+        check("struct A { int* a; int* b; };\n"
+              "static A g;\n"
+              "int* f() {\n"
+              "    int x = 0;\n"
+              "    g.a = &x;\n"
+              "    return g.a;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:11] -> [test.cpp:4:9] -> [test.cpp:5:6]: (error) Non-local variable 'g.a' will use pointer to local variable 'x'. [danglingLifetime]\n"
+                      "[test.cpp:5:11] -> [test.cpp:4:9] -> [test.cpp:6:13]: (error) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
     }
 
     void danglingLifetimeClassMemberFunctions()
@@ -4412,7 +4682,7 @@ class TestAutoVariables : public TestFixture {
               "        f = [&]{ return b; };\n"
               "    }\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:25] -> [test.cpp:4:13] -> [test.cpp:7:5]: (error) Using lambda that captures local variable 'b' that is out of scope. [invalidLifetime]\n", errout_str());
 
         check("void f(bool b)  {\n"
@@ -4422,7 +4692,7 @@ class TestAutoVariables : public TestFixture {
               "    x = y;\n"
               "  }\n"
               "  x[3];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:4:9] -> [test.cpp:7:3]: (error) Using pointer to local variable 'y' that is out of scope. [invalidLifetime]\n",
             errout_str());
@@ -4434,7 +4704,7 @@ class TestAutoVariables : public TestFixture {
               "        f = [&]{ return b; };\n"
               "        f();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -4443,7 +4713,7 @@ class TestAutoVariables : public TestFixture {
               "};\n"
               "void a::b() {\n"
               "  c.end()\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void b(char f[], char c[]) {\n"
@@ -4451,7 +4721,7 @@ class TestAutoVariables : public TestFixture {
               "    std::string e;\n"
               "    b(f, e.c_str())\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -4461,11 +4731,11 @@ class TestAutoVariables : public TestFixture {
               "        s = buf;\n"
               "    }\n"
               "    std::cout << s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int &a[];\n"
-              "void b(){int *c = a};");
+              "void b(){int *c = a};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -4479,7 +4749,7 @@ class TestAutoVariables : public TestFixture {
               "            return y.x;\n"
               "        };\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace test {\n"
@@ -4588,6 +4858,21 @@ class TestAutoVariables : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("struct S {\n"
+              "    int* a[1];\n"
+              "    int* b[1][1];\n"
+              "};\n"
+              "void f(S* s) {\n"
+              "    int i = 0;\n"
+              "    s->a[0] = &i;\n"
+              "}\n"
+              "void g(S* s) {\n"
+              "    int i = 0;\n"
+              "    s->b[0][0] = &i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n"
+                      "[test.cpp:11:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
+                      errout_str());
     }
 
     void deadPointer() {
@@ -4598,7 +4883,7 @@ class TestAutoVariables : public TestFixture {
               "    p = &x;\n"
               "  }\n"
               "  *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9] -> [test.cpp:7:4]: (error) Using pointer to local variable 'x' that is out of scope. [invalidLifetime]\n", errout_str());
 
         // FP: don't warn in subfunction
@@ -4615,7 +4900,7 @@ class TestAutoVariables : public TestFixture {
               "  } else {\n"
               "  }\n"
               "  f(tmp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't warn about references (#6399)
@@ -4627,7 +4912,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    if (former_hover != pitem)\n"
               "        dosth();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -4638,7 +4923,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    if (former_hover != pitem)\n"
               "        dosth();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:24] -> [test.cpp:3:47] -> [test.cpp:4:26] -> [test.cpp:7:9]: (error) Using pointer to local variable 'item' that is out of scope. [invalidLifetime]\n",
             errout_str());
@@ -4651,7 +4936,7 @@ class TestAutoVariables : public TestFixture {
               "    };\n"
               "    EventReport * rep = &repData;\n"
               "    rep->setEventType(NDB_LE_Connected);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8785
@@ -4664,8 +4949,10 @@ class TestAutoVariables : public TestFixture {
               "    if(b && a)\n"
               "        return *iPtr;\n"
               "    return 0;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5:16] -> [test.cpp:4:13] -> [test.cpp:8:17]: (error) Using pointer to local variable 'x' that is out of scope. [invalidLifetime]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:16] -> [test.cpp:7:10] -> [test.cpp:4:13] -> [test.cpp:8:17]: (error) Using pointer to local variable 'x' that is out of scope. [invalidLifetime]\n",
+            errout_str());
 
         // #11753
         check("int main(int argc, const char *argv[]) {\n"
diff --git a/test/testbool.cpp b/test/testbool.cpp
index dd43cf9b19a..46365c11af3 100644
--- a/test/testbool.cpp
+++ b/test/testbool.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -78,7 +78,6 @@ class TestBool : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool cpp = true;
     };
 
@@ -89,36 +88,36 @@ class TestBool : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, options.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check...
-        runChecks<CheckBool>(tokenizer, this);
+        CheckBool check;
+        runChecks(check, tokenizer, *this);
     }
 
 
     void assignBoolToPointer() {
         check("void foo(bool *p) {\n"
               "    p = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         check("void foo(bool *p) {\n"
               "    p = (x<y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         check("void foo(bool *p) {\n"
               "    p = (x||y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         check("void foo(bool *p) {\n"
               "    p = (x&&y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // check against potential false positives
         check("void foo(bool *p) {\n"
               "    *p = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #5046 - false positive: Boolean value assigned to pointer
@@ -128,7 +127,7 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    *s.p = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -137,13 +136,13 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    s.p = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #5627 - false positive: template
         check("void f() {\n"
               "    X *p = new ::std::pair<int,int>[rSize];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #6588 (c mode)
@@ -153,7 +152,7 @@ class TestBool : public TestFixture {
               "  const int *rmat = n < 4 ? " /* OK */
               "                       ctx->q_intra_matrix :"
               "                       ctx->q_chroma_intra_matrix;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:19]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #6588 (c++ mode)
@@ -163,7 +162,7 @@ class TestBool : public TestFixture {
               "  const int *rmat = n < 4 ? " /* OK */
               "                       ctx->q_intra_matrix :"
               "                       ctx->q_chroma_intra_matrix;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #6665
@@ -172,37 +171,37 @@ class TestBool : public TestFixture {
               "  char* m1 = compare(a, b) < 0\n"
               "      ? (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a))\n"
               "      : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b));\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // #7381
         check("void foo(bool *p, bool b) {\n"
               "    p = b;\n"
               "    p = &b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
     }
 
     void assignBoolToFloat() {
         check("void foo1() {\n"
               "    double d = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         check("void foo2() {\n"
               "    float d = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         check("void foo3() {\n"
               "    long double d = (2>1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         // stability - don't crash:
         check("void foo4() {\n"
               "    unknown = false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -211,7 +210,7 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    s.p = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         check("struct S {\n"
@@ -220,7 +219,7 @@ class TestBool : public TestFixture {
               "void f() {\n"
               "    S s = {0};\n"
               "    *s.p[0] = true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:13]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
     }
 
@@ -228,91 +227,91 @@ class TestBool : public TestFixture {
         check("void f(int x) {\n"
               "    if ((x && 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x && 0x0f)==0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x || 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x || 0x0f)==0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x & 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x | 0x0f)==6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((5 && x)==3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x)==3 || (8 && x)==9)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:17]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n"
-            "[test.cpp:2:32]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n",   // duplicate
+            "[test.cpp:2:32]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n",
             errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x)!=3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((5 && x) > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) > 0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) < 0)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) < 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) > 1)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
@@ -320,91 +319,91 @@ class TestBool : public TestFixture {
         check("void f(int x) {\n"
               "    if (0 < (5 && x))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (0 > (5 && x))\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > (5 && x))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 < (5 && x))\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x > false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false < x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x < false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false > x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x >= false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false >= x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( x <= false )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(bool x ) {\n"
               "  if ( false <= x )\n"
               "      a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("typedef int (*func)(bool invert);\n"
               "void x(int, func f);\n"
               "void foo(int error) {\n"
               "  if (error == ABC) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f() { return !a+b<c; }"); // #5072
+        check("int f() { return !a+b<c; }\n"); // #5072
         ASSERT_EQUALS("",errout_str());
 
-        check("int f() { return (!a+b<c); }");
+        check("int f() { return (!a+b<c); }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("int f() { return (a+(b<5)<=c); }");
+        check("int f() { return (a+(b<5)<=c); }\n");
         ASSERT_EQUALS("",errout_str());
     }
 
@@ -413,85 +412,85 @@ class TestBool : public TestFixture {
               "    if (!x == 10) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (!x != 10) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x != 10) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 == !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 != !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if (y != !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool y) {\n"
               "    if (y != !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 != x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    return (!y == !x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  return (x()+1 == !a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
-        check("void f() { if (!!a+!!b+!!c>1){} }");
+        check("void f() { if (!!a+!!b+!!c>1){} }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("void f(int a, int b, int c) { if (a != !b || c) {} }");
+        check("void f(int a, int b, int c) { if (a != !b || c) {} }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("void f(int a, int b, int c) { if (1 < !!a + !!b + !!c) {} }");
+        check("void f(int a, int b, int c) { if (1 < !!a + !!b + !!c) {} }\n");
         ASSERT_EQUALS("",errout_str());
 
-        check("void f(int a, int b, int c) { if (1 < !(a+b)) {} }");
+        check("void f(int a, int b, int c) { if (1 < !(a+b)) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:37]: (warning) Comparison of a boolean expression with an integer. [compareBoolExpressionWithInt]\n",errout_str());
     }
 
     void comparisonOfBoolExpressionWithInt3() {
         check("int f(int x) {\n"
               "    return t<0>() && x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -499,48 +498,48 @@ class TestBool : public TestFixture {
         // #5016
         check("void f() {\n"
               "  for(int i = 4; i > -1 < 5 ; --i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return (a > b) < c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return x(a > b) < c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return a > b == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // templates
         check("struct Tokenizer { TokenList list; };\n"
               "void Tokenizer::f() {\n"
               "  std::list<Token*> locationList;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5063 - or
         check("void f() {\n"
               "  return a > b or c < d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "  return (a < b) != 0U;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int f() {\n"
               "  return (a < b) != 0x0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int f() {\n"
               "  return (a < b) != 42U;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
     }
 
@@ -564,7 +563,7 @@ class TestBool : public TestFixture {
               "     }\n"
               "     else\n"
               "         return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n", errout_str());
     }
 
@@ -589,7 +588,7 @@ class TestBool : public TestFixture {
               "  }\n"
               "    else\n"
               "     return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n"
                       "[test.cpp:11:7]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
     }
@@ -601,7 +600,7 @@ class TestBool : public TestFixture {
               "         printf(\"foo\");\n"
               "   }\n"
               "}\n"
-              "bool compare(int temp);");
+              "bool compare(int temp);\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n"
                       "[test.cpp:3:12]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
     }
@@ -627,7 +626,7 @@ class TestBool : public TestFixture {
               " }\n"
               " else\n"
               "     return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
     }
 
@@ -651,7 +650,7 @@ class TestBool : public TestFixture {
               "     }\n"
               "     else\n"
               "         return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n", errout_str());
     }
 
@@ -665,7 +664,7 @@ class TestBool : public TestFixture {
               "    if(compare1(temp) > compare2(temp)){\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace Foo {\n"
@@ -677,7 +676,7 @@ class TestBool : public TestFixture {
               "    if(compare1(temp) > compare2(temp)){\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int compare1(int temp);\n"
@@ -689,7 +688,7 @@ class TestBool : public TestFixture {
               "            printf(\"foo\");\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:20]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
 
         check("int compare1(int temp);\n"
@@ -701,7 +700,7 @@ class TestBool : public TestFixture {
               "            printf(\"foo\");\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool compare1(int temp);\n"
@@ -710,7 +709,7 @@ class TestBool : public TestFixture {
               "    if(foo.compare1(temp) > compare2(temp)){\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -740,7 +739,7 @@ class TestBool : public TestFixture {
               "    if(b > a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
         // op: <
         check("int main(void){\n"
@@ -749,7 +748,7 @@ class TestBool : public TestFixture {
               "    if(b < a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
         // op: >=
         check("int main(void){\n"
@@ -758,7 +757,7 @@ class TestBool : public TestFixture {
               "    if(b >= a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
         // op: <=
         check("int main(void){\n"
@@ -767,7 +766,7 @@ class TestBool : public TestFixture {
               "    if(b <= a){ \n"                             // here warning should be displayed
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
     }
 
@@ -779,7 +778,7 @@ class TestBool : public TestFixture {
               "  if ( eval(argv[1]) > eval(argv[2]) )\n"
               "    return 1;\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -813,96 +812,96 @@ class TestBool : public TestFixture {
     void bitwiseOnBoolean() { // 3062
         check("void f(_Bool a, _Bool b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(_Bool a, _Bool b) {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if(a & !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if(a | !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a & !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("bool a, b;\n"
               "void f() {\n"
               "    if(a | !b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, int b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, bool b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "    if((a > 0) & (b < 0)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style, inconclusive) Boolean expression 'a>0' is used in bitwise operation. Did you mean '&&'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(bool a, int b) {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, bool b) {\n"
               "    if(a | b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("int f(bool a, int b) {\n"
               "    return a | b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool a, int b) {\n"
               "    return a | b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "    if(a & b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    foo(bar, &b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n" // #9405
               "    class C { void foo(bool &b) {} };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
@@ -971,27 +970,27 @@ class TestBool : public TestFixture {
 
     void incrementBoolean() {
         check("bool bValue = true;\n"
-              "void f() { bValue++; }");
+              "void f() { bValue++; }\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(bool test){\n"
               "    test++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(bool* test){\n"
               "    (*test)++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(bool* test){\n"
               "    test[0]++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead. [incrementboolean]\n", errout_str());
 
         check("void f(int test){\n"
               "    test++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1000,51 +999,51 @@ class TestBool : public TestFixture {
               "    if (x < 10) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (10 >= x) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x != 0) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"  // #3356
               "    if (x == 1) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x != 10) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x == 10) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x == 0) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("DensePropertyMap<int, true> visited;"); // #4075
+        check("DensePropertyMap<int, true> visited;\n"); // #4075
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1053,28 +1052,28 @@ class TestBool : public TestFixture {
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x, bool y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x, fooClass y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1083,35 +1082,35 @@ class TestBool : public TestFixture {
               "    if (y > false) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). [comparisonOfBoolWithInvalidComparator]\n", errout_str());
 
         check("void f(int y) {\n"
               "    if (true == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool y) {\n"
               "    if (y == true) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool y) {\n"
               "    if (false < 5) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
     }
 
     void comparisonOfBoolWithInt4() {
         check("void f(int x) {\n"
               "    if (!x == 1) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1119,21 +1118,21 @@ class TestBool : public TestFixture {
         check("void SetVisible(int index, bool visible) {\n"
               "    bool (SciTEBase::*ischarforsel)(char ch);\n"
               "    if (visible != GetVisible(index)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt6() { // #4224 - integer is casted to bool
         check("void SetVisible(bool b, int i) {\n"
               "    if (b == (bool)i) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt7() { // #4846 - (!x==true)
         check("void f(int x) {\n"
               "    if (!x == true) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1143,7 +1142,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
@@ -1151,7 +1150,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool Fun();\n"
@@ -1159,7 +1158,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (5 + expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
@@ -1167,7 +1166,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (5 + expectedResult == res)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
@@ -1175,7 +1174,7 @@ class TestBool : public TestFixture {
               "    auto res = Fun();\n"
               "    if (expectedResult == res + 5)\n"
               "        throw 2;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -1186,7 +1185,7 @@ class TestBool : public TestFixture {
               "        b = !b;\n"
               "    }\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1211,76 +1210,76 @@ class TestBool : public TestFixture {
     void pointerArithBool1() { // #5126
         check("void f(char *p) {\n"
               "    if (p+1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    do {} while (p+1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    while (p-1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    for (int i = 0; p+1; i++) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    if (p && p+1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    if (p+2 || p) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour. [pointerArithBool]\n", errout_str());
     }
 
     void returnNonBool() {
         check("bool f(void) {\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    return 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return 1 + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    int x = 0;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    int x = 10;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return 2 < 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
@@ -1288,7 +1287,7 @@ class TestBool : public TestFixture {
               "    if (a)\n"
               "        ret = 1;\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
@@ -1296,20 +1295,20 @@ class TestBool : public TestFixture {
               "    if (a)\n"
               "        ret = 3;\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    if (a)\n"
               "        return 3;\n"
               "    return 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n"
                       "[test.cpp:4:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1317,42 +1316,42 @@ class TestBool : public TestFixture {
         check("bool f(void) {\n"
               "    auto x = [](void) { return -1; };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) { return -1; };\n"
               "    return 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) -> int { return -1; };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) -> int { return -1; };\n"
               "    return 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
     }
 
     void returnNonBoolLogicalOp() {
         check("bool f(int x) {\n"
               "    return x & 0x4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x, int y) {\n"
               "    return x | y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    return (x & 0x2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1360,7 +1359,7 @@ class TestBool : public TestFixture {
         check("class X {\n"
               "    public:\n"
               "        bool f() { return -1;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f() {\n"
@@ -1369,7 +1368,7 @@ class TestBool : public TestFixture {
               "            int f() { return -1;}\n"
               "    };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
@@ -1378,7 +1377,7 @@ class TestBool : public TestFixture {
               "            int f() { return -1;}\n"
               "    };\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
@@ -1387,7 +1386,7 @@ class TestBool : public TestFixture {
               "            bool f() { return -1;}\n"
               "    };\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n"
                       "[test.cpp:4:24]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
     }
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index c0600bcdf53..7b36dbac035 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -29,59 +29,58 @@
 #include <cstddef>
 #include <list>
 #include <string>
-#include <vector>
 
 class TestBufferOverrun : public TestFixture {
 public:
     TestBufferOverrun() : TestFixture("TestBufferOverrun") {}
 
 private:
-    /*const*/ Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).severity(Severity::portability).build();
+    /*const*/ Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).build();
+    const Settings settings0_i = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
+    const Settings settings0_p = settingsBuilder(settings0).severity(Severity::portability).build();
+    const Settings settings1 = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
 
     struct CheckOptions
     {
-        CheckOptions() = default;
-        const Settings* s = nullptr;
         bool cpp = true;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings = options.s ? *options.s : settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
+        check_(file, line, code, settings0_i, options.cpp);
+    }
 
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this, options.cpp);
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& settings, bool cpp = true) {
+        SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, *this);
     }
 
     // TODO: get rid of this
     void check_(const char* file, int line, const std::string& code) {
-        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
-
         // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
+        SimpleTokenizer tokenizer(settings0_i, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkP_(const char* file, int line, const char code[])
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size])
     {
-        const Settings settings = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
-
-        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
+        SimpleTokenizer2 tokenizer(settings1, *this, code, "test.cpp");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -198,6 +197,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(array_index_function_parameter);
         TEST_CASE(array_index_enum_array); // #8439
         TEST_CASE(array_index_container); // #9386
+        TEST_CASE(array_index_container_data); // pointer from data()/c_str() carries the container size
         TEST_CASE(array_index_two_for_loops);
         TEST_CASE(array_index_new); // #7690
 
@@ -227,11 +227,14 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(buffer_overrun_34); //#11035
         TEST_CASE(buffer_overrun_35); //#2304
         TEST_CASE(buffer_overrun_36);
+        TEST_CASE(buffer_overrun_37);
+        TEST_CASE(buffer_overrun_38);
         TEST_CASE(buffer_overrun_errorpath);
         TEST_CASE(buffer_overrun_bailoutIfSwitch);  // ticket #2378 : bailoutIfSwitch
         TEST_CASE(buffer_overrun_function_array_argument);
         TEST_CASE(possible_buffer_overrun_1); // #3035
         TEST_CASE(buffer_overrun_readSizeFromCfg);
+        TEST_CASE(buffer_overrun_handle_addr_of_var); // ticket #7570 - correctly handle &var
 
         TEST_CASE(valueflow_string); // using ValueFlow string values in checking
 
@@ -271,6 +274,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(terminateStrncpy3);
         TEST_CASE(terminateStrncpy4);
         TEST_CASE(terminateStrncpy5); // #9944
+        TEST_CASE(terminateStrncpy_handle_addr_of_var); // #7570
         TEST_CASE(recursive_long_time);
 
         TEST_CASE(crash1);  // Ticket #1587 - crash
@@ -323,7 +327,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        char str[50];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -345,7 +349,7 @@ class TestBufferOverrun : public TestFixture {
               "void f4(const char str[])\n"
               "{\n"
               "    strcpy(buf, str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -356,7 +360,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char data[1];\n"
               "    return abc.data[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -366,7 +370,7 @@ class TestBufferOverrun : public TestFixture {
         check("static void f() {\n"
               "    char data[100];\n"
               "    const char *p = data + 100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -378,7 +382,7 @@ class TestBufferOverrun : public TestFixture {
               "    snprintf(group, 32, \"%u\", 0);\n"
               "    struct group *gr;\n"
               "    snprintf(group, 32, \"%u\", gr->gr_gid);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -388,14 +392,14 @@ class TestBufferOverrun : public TestFixture {
               "    char str[0x10] = {0};\n"
               "    str[15] = 0;\n"
               "    str[16] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Array 'str[16]' accessed at index 16, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("char f()\n"
               "{\n"
               "    char str[16] = {0};\n"
               "    return str[16];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Array 'str[16]' accessed at index 16, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // test stack array
@@ -405,7 +409,7 @@ class TestBufferOverrun : public TestFixture {
               "   int y;\n"
               "   y = x[ 4 ];\n"
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (error) Array 'x[3]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int f()\n"
@@ -414,15 +418,15 @@ class TestBufferOverrun : public TestFixture {
               "   int y;\n"
               "   y = x[ 2 ];\n"
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int x[5] = {0};\n"
-              "int a = x[10];");
+              "int a = x[10];\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Array 'x[5]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int x[5] = {0};\n"
-              "int a = (x)[10];");
+              "int a = (x)[10];\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Array 'x[5]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -433,21 +437,21 @@ class TestBufferOverrun : public TestFixture {
               "    char *str = new char[0x10];\n"
               "    str[i] = 0;\n"
               "}\n"
-              "void b() { a(16); }");
+              "void b() { a(16); }\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Array 'str[16]' accessed at index 16, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_4() {
-        check("char c = \"abc\"[4];");
+        check("char c = \"abc\"[4];\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (error) Array '\"abc\"[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
-        check("p = &\"abc\"[4];");
+        check("p = &\"abc\"[4];\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("char c = \"\\0abc\"[2];");
+        check("char c = \"\\0abc\"[2];\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("char c = L\"abc\"[4];");
+        check("char c = L\"abc\"[4];\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (error) Array 'L\"abc\"[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -458,7 +462,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i, sum=0;\n"
               "    for (i = 0; i < 100; i++)\n"
               "        sum += val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Array 'val[50]' accessed at index 99, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -467,7 +471,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i, sum=0;\n"
               "    for (i = 1; i < 100; i++)\n"
               "        sum += val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Array 'val[50]' accessed at index 99, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f(int a)\n"
@@ -476,7 +480,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i, sum=0;\n"
               "    for (i = a; i < 100; i++)\n"
               "        sum += val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Array 'val[50]' accessed at index 99, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("typedef struct g g2[3];\n"
@@ -486,21 +490,21 @@ class TestBufferOverrun : public TestFixture {
               "  {\n"
               "    a[i]=0;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int argc)\n"
               "{\n"
               "  char a[2];\n"
               "  for (int i = 4; i < argc; i++){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a[10]) {\n"
               "    for (int i=0;i<50;++i) {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Array 'a[10]' accessed at index 49, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -514,7 +518,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC abc;\n"
               "    abc.str[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:12]: (error) Array 'abc.str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
@@ -526,7 +530,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC abc;\n"
               "    return abc.str[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:19]: (error) Array 'abc.str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // This is not out of bounds because it is a variable length array
@@ -539,7 +543,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[1] = 0;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // This is not out of bounds because it is not a variable length array
@@ -553,7 +557,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[1] = 0;"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is not out of bounds because it is a variable length array
@@ -567,8 +571,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
-              "    x->str[10] = 0;"
-              "}");
+              "    x->str[10] = 0;\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // This is out of bounds because it is outside the memory allocated.
@@ -581,8 +585,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
-              "    x->str[11] = 0;"
-              "}");
+              "    x->str[11] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9]: (error) Array 'str[1]' accessed at index 11, which is out of bounds.\n", "", errout_str());
 
         // This is out of bounds if 'sizeof(ABC)' is 1 (No padding)
@@ -594,8 +598,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(ABC) + 10);\n"
-              "    x->str[11] = 0;"
-              "}");
+              "    x->str[11] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is out of bounds because it is outside the memory allocated
@@ -608,8 +612,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(struct ABC));\n"
-              "    x->str[1] = 0;"
-              "}");
+              "    x->str[1] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9]: (error) Array 'str[1]' accessed at index 1, which is out of bounds.\n", "", errout_str());
 
         // This is out of bounds because it is outside the memory allocated
@@ -622,8 +626,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC* x = malloc(sizeof(ABC));\n"
-              "    x->str[1] = 0;"
-              "}");
+              "    x->str[1] = 0;\n"
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is out of bounds because it is not a variable array
@@ -635,8 +639,8 @@ class TestBufferOverrun : public TestFixture {
               "static void f()\n"
               "{\n"
               "    struct ABC x;\n"
-              "    x.str[1] = 0;"
-              "}");
+              "    x.str[1] = 0;\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (error) Array 'x.str[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct foo\n"
@@ -649,19 +653,19 @@ class TestBufferOverrun : public TestFixture {
               "    foo f;\n"
               "    for ( unsigned int i = 0; i < 64; ++i )\n"
               "        f.str[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:14]: (error) Array 'f.str[10]' accessed at index 63, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct AB { char a[NUM]; char b[NUM]; }\n"
               "void f(struct AB *ab) {\n"
               "    ab->a[0] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("union { char a[1]; int b; } ab;\n"
               "void f() {\n"
               "    ab.a[2] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Array 'ab.a[1]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -675,7 +679,7 @@ class TestBufferOverrun : public TestFixture {
               "static void f(struct ABC *abc)\n"
               "{\n"
               "    abc->str[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:13]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -694,7 +698,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        abc->str[10] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13:17]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -709,7 +713,7 @@ class TestBufferOverrun : public TestFixture {
               "Fred::Fred()\n"
               "{\n"
               "    str[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:8]: (error) Array 'str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("class Fred\n"
@@ -722,7 +726,7 @@ class TestBufferOverrun : public TestFixture {
               "char Fred::c()\n"
               "{\n"
               "    return str[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:15]: (error) Array 'str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -735,7 +739,7 @@ class TestBufferOverrun : public TestFixture {
               "        if (i < 10)\n"
               "            int x = buf[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -745,7 +749,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i+10] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -755,7 +759,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[10+i] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -765,7 +769,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i+1] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -775,7 +779,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i*2] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 18, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -783,7 +787,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[12];\n"
               "    for (int i = 0; i < 12; i+=6)\n"
               "        a[i+5] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -791,21 +795,21 @@ class TestBufferOverrun : public TestFixture {
               "    int a[12];\n"
               "    for (int i = 0; i < 12; i+=6)\n"
               "        a[i+6] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[12]' accessed at index 12, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"  // #4398
               "    int a[2];\n"
               "    for (int i = 0; i < 4; i+=2)\n"
               "        a[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"  // #4398
               "    int a[2];\n"
               "    for (int i = 0; i < 4; i+=2)\n"
               "        do_stuff(a+i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -818,7 +822,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i+=1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -829,7 +833,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -840,7 +844,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        ++i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -851,7 +855,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i=4;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (error) Array 'a[5]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -862,7 +866,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = i;\n"
               "        i+=1;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Buffer overrun\n", "", errout_str());
     }
 
@@ -872,7 +876,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  char a[2];\n"
               "  char *end = &(a[2]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Getting more than one past the end is not legal
@@ -880,7 +884,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  char a[2];\n"
               "  char *end = &(a[3]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Array 'a[2]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -891,7 +895,7 @@ class TestBufferOverrun : public TestFixture {
               " int b[10];\n"
               " for ( int i = 0; i < 9; i++ )\n"
               "  b[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -905,7 +909,7 @@ class TestBufferOverrun : public TestFixture {
               " for(int j=0; j<3; ++j) {\n"
               "  int b = indices[j];\n"
               " }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -913,7 +917,7 @@ class TestBufferOverrun : public TestFixture {
         check("int main() {\n"
               "  size_t indices[2];\n"
               "  int b = indices[2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (error) Array 'indices[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -922,7 +926,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char c[10];\n"
               "    c[1<<23]='a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'c[10]' accessed at index 8388608, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -941,7 +945,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= SCHAR_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[128] = 0;\n"   // 128 > SCHAR_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[128]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[128]' accessed at index 128, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -949,7 +953,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= UCHAR_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[256] = 0;\n"   // 256 > UCHAR_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[256]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[256]' accessed at index 256, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -957,7 +961,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= SHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[32768] = 0;\n" // 32768 > SHRT_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[32768]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[32768]' accessed at index 32768, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -965,7 +969,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= USHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[65536] = 0;\n" // 65536 > USHRT_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[65536]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[65536]' accessed at index 65536, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -973,26 +977,26 @@ class TestBufferOverrun : public TestFixture {
               "    int a[n];\n"     // n <= SHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[32768] = 0;\n" // 32768 > SHRT_MAX
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[32768]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:4:6]: (error) Array 'a[32768]' accessed at index 32768, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f(int n) {\n"
               "    int a[n];\n"     // n <= INT_MAX
               "    a[-1] = 0;\n"    // negative index
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[2147483648]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
 
         check("void f(unsigned int n) {\n"
               "    int a[n];\n"     // n <= UINT_MAX
               "    a[-1] = 0;\n"    // negative index
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[4294967296]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
 
         check("void f(signed int n) {\n"
               "    int a[n];\n"     // n <= INT_MAX
               "    a[-1] = 0;\n"    // negative index
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[2147483648]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -1000,7 +1004,7 @@ class TestBufferOverrun : public TestFixture {
         check("void foo()\n"
               "{\n"
               "   long l[SOME_SIZE];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1010,7 +1014,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[3];\n"
               "    for (int i = 3; 0 <= i; i--)\n"
               "        a[i] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -1018,7 +1022,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[4];\n"
               "    for (int i = 3; 0 <= i; i--)\n"
               "        a[i] = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1028,7 +1032,7 @@ class TestBufferOverrun : public TestFixture {
               "    int a[10];\n"
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i-1] = a[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -1039,7 +1043,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i[2];\n"
               "    int *ip = i + 1;\n"
               "    ip[-10] = 1;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Array ip[-10] out of bounds.\n", "", errout_str());
     }
 
@@ -1051,7 +1055,7 @@ class TestBufferOverrun : public TestFixture {
               "    int *i = iBuf + 9;"
               "    int *ii = i + -5;"
               "    ii[10] = 0;"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Array ii[10] out of bounds.\n", "", errout_str());
     }
 
@@ -1061,7 +1065,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    UINT8 x[2];\n"
               "    x[5] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'x[2]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1078,7 +1082,7 @@ class TestBufferOverrun : public TestFixture {
               "void y() {\n"
               "    struct s1 obj;\n"
               "    x(obj.delay, 123);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct s1 {\n"
@@ -1092,7 +1096,7 @@ class TestBufferOverrun : public TestFixture {
               "void y() {\n"
               "    struct s1 obj;\n"
               "    x(obj.delay, 123);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:6]: (error) Array 'obj.delay[3]' accessed at index 4, which is out of bounds.\n",
                            "",
                            errout_str());
@@ -1103,7 +1107,7 @@ class TestBufferOverrun : public TestFixture {
               "\n"
               "void f() {\n"
               "    struct s1 *obj;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1117,14 +1121,14 @@ class TestBufferOverrun : public TestFixture {
               "       m_x[1] = 0;\n"
               "    }\n"
               "    int m_x[1];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:11]: (error) Array 'm_x[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_33() {
         check("void foo(char bar[][4]) {\n"
               "    baz(bar[5]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1133,7 +1137,7 @@ class TestBufferOverrun : public TestFixture {
               "    int y[2][2][2];\n"
               "    y[0][2][0] = 0;\n"
               "    y[0][0][2] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'y[2][2][2]' accessed at index y[0][2][0], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:4:6]: (error) Array 'y[2][2][2]' accessed at index y[0][0][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -1153,7 +1157,7 @@ class TestBufferOverrun : public TestFixture {
               "    ptest->a[10] = 3;\n"
               "    ptest->b[10][2] = 4;\n"
               "    ptest->b[0][19] = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:11]: (error) Array 'test.a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:10:11]: (error) Array 'test.b[10][5]' accessed at index test.b[10][2], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:11:11]: (error) Array 'test.b[10][5]' accessed at index test.b[0][19], which is out of bounds. [arrayIndexOutOfBounds]\n"
@@ -1174,7 +1178,7 @@ class TestBufferOverrun : public TestFixture {
               "    ptest = &test;\n"
               "    ptest->a[9][5] = 4;\n"
               "    ptest->a[0][50] = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11]: (error) Array 'test.a[10][5]' accessed at index test.a[9][5], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:9:11]: (error) Array 'test.a[10][5]' accessed at index test.a[0][50], which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:12:13]: (error) Array 'ptest->a[10][5]' accessed at index ptest->a[9][5], which is out of bounds. [arrayIndexOutOfBounds]\n"
@@ -1185,21 +1189,21 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    struct Struct { unsigned m_Var[1]; } s;\n"
               "    s.m_Var[1] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Array 's.m_Var[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct Struct { unsigned m_Var[1]; };\n"
               "void f() {\n"
               "    struct Struct s;\n"
               "    s.m_Var[1] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Array 's.m_Var[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct Struct { unsigned m_Var[1]; };\n"
               "void f() {\n"
               "    struct Struct * s = calloc(40);\n"
               "    s->m_Var[1] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1211,7 +1215,7 @@ class TestBufferOverrun : public TestFixture {
               "};\n"
               "Fred::Fred(const Fred & rhs) {\n"
               "    m_b[2] = rhs.m_b[2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (error) Array 'm_b[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:7:21]: (error) Array 'rhs.m_b[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
@@ -1223,7 +1227,7 @@ class TestBufferOverrun : public TestFixture {
               "        for (unsigned int i = 0; i < 15; i++)\n"
               "            i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1242,7 +1246,7 @@ class TestBufferOverrun : public TestFixture {
               "            }\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1251,7 +1255,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char a[10];\n"
               "    a[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1260,7 +1264,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    for (int i = 0; i < 10; ++i)\n"
               "        f2(&a[i + 1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1273,7 +1277,7 @@ class TestBufferOverrun : public TestFixture {
               "\n"
               "void b() {\n"
               "    struct Fred { char data[3]; } fred;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void a() {\n"
@@ -1284,7 +1288,7 @@ class TestBufferOverrun : public TestFixture {
               "void b() {\n"
               "    struct Fred { char data[3]; } fred;\n"
               "    fred.data[4] = 0;\n"  // <- error
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (error) Array 'fred.data[3]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1295,7 +1299,7 @@ class TestBufferOverrun : public TestFixture {
               "  char *p; p = (char *)malloc(10);\n"
               "  p[10] = 7;\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'p[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -1303,7 +1307,7 @@ class TestBufferOverrun : public TestFixture {
               "  float *p; p = (float *)malloc(10 * sizeof(float));\n"
               "  p[10] = 7;\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'p[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -1312,7 +1316,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1321,7 +1325,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  delete [] p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1330,7 +1334,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  delete [] p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1341,11 +1345,11 @@ class TestBufferOverrun : public TestFixture {
               "  }\n"
               "  catch(...){\n"
               "  return;\n"
-              "  }"
+              "  }\n"
               "  p[0] = 0;\n"
               "  p[9] = 9;\n"
               "  delete [] p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1362,7 +1366,7 @@ class TestBufferOverrun : public TestFixture {
               "   var[ 0 ].arr[ 2 ] = 2;\n"
               "   y = var[ 0 ].arr[ 3 ];\n" // <-- array access out of bounds
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:20]: (error) Array 'var[0].arr[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int f( )\n"
@@ -1376,7 +1380,7 @@ class TestBufferOverrun : public TestFixture {
               "   var[ 0 ].arr[ 2 ] = 2;\n"
               "   y = var[ 0 ].arr[ 2 ];\n"
               "   return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -1392,7 +1396,7 @@ class TestBufferOverrun : public TestFixture {
               "var.arr[ 3 ] = 3;\n" // <-- array access out of bounds
               "y=var.arr[ 3 ];\n"   // <-- array access out of bounds
               "return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:8]: (error) Array 'var.arr[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:11:10]: (error) Array 'var.arr[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
@@ -1406,7 +1410,7 @@ class TestBufferOverrun : public TestFixture {
               "var[0].var[ 1 ] = 1;\n"
               "var[0].var[ 2 ] = 2;\n"
               "var[0].var[ 4 ] = 4;\n" // <-- array access out of bounds
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:11]: (error) Array 'var[0].var[3]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f( ) {\n"
@@ -1417,7 +1421,7 @@ class TestBufferOverrun : public TestFixture {
               "var[0].var[ 0 ] = 0;\n"
               "var[0].var[ 1 ] = 1;\n"
               "var[0].var[ 2 ] = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // avoid FPs (modified examples taken from #3838)
@@ -1426,7 +1430,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct AB ab;\n"
               "    int * p = &ab.a[10];\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a[10]; int b[10]; };\n"
@@ -1434,7 +1438,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct AB ab[1];\n"
               "    int * p = &ab[0].a[10];\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a[10]; int b[10]; };\n"
@@ -1442,7 +1446,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct AB ab[1];\n"
               "    int * p = &ab[10].a[0];\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Array 'ab[1]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1456,7 +1460,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        buf[i] = 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1466,7 +1470,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        buf[i] = 2.;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1479,7 +1483,7 @@ class TestBufferOverrun : public TestFixture {
               "void test() {\n"
               "    CHAR buffer[1024];\n"
               "    f(\"%s\", buffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unnamed argument
@@ -1489,7 +1493,7 @@ class TestBufferOverrun : public TestFixture {
               "void test() {\n"
               "    char buffer[1024];\n"
               "    f(buffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1501,7 +1505,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(int i=3; i--;) {\n"
               "        printf(\"files(%i): %s\", 3-i, buffer[3-i]);\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Array 'buffer[3]' accessed at index 3, which is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
@@ -1510,7 +1514,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(i=10; i--;) {\n"
               "        buffer[i] = i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Array 'buffer[9]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // Correct access limits -> i from 9 to 0
@@ -1519,7 +1523,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(unsigned long int i=10; i--;) {\n"
               "        buffer[i] = i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1529,7 +1533,7 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "    for (int i = 2; i < 0; i++)\n"
               "        s[i] = 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1542,7 +1546,7 @@ class TestBufferOverrun : public TestFixture {
               "        printf(\" %i\", i);\n"
               "        array[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:14]: (error) Array 'array[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void test(void)\n"
@@ -1552,7 +1556,7 @@ class TestBufferOverrun : public TestFixture {
               "        scanf(\"%i\", &i);\n"
               "        array[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1566,7 +1570,7 @@ class TestBufferOverrun : public TestFixture {
               "        i++;\n"
               "    }\n"
               "    arr[k];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1578,7 +1582,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    f(\"12345678\");\n"
               "    f(\"12345\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1586,7 +1590,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f(void){\n"
               "    int k=0, dd, d[1U] = {1};\n"
               "    for (dd=d[k]; k<10; dd=d[++k]){;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:29]: (error) Array 'd[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1597,7 +1601,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(int i = 0, j= 11; i < j; ++i)\n"
               "       buf[i] = 0;\n"
               "    return buf[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:11]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -1609,7 +1613,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i < 3; i++)\n"
               "        for (int j = 0; j < 3; j++)\n"
               "             M[i][j]=0.0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:15]: (error) Array 'M[3][1]' accessed at index M[*][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2013,87 +2017,87 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  char a[2][2];\n"
               "  a[1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[1][1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2];\n"
               "  a[2][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2]' accessed at index a[2][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2];\n"
               "  a[1][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2]' accessed at index a[1][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[2][1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2]' accessed at index a[2][1][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[1][2][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2]' accessed at index a[1][2][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2][2];\n"
               "  a[1][2][1][1] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2][2]' accessed at index a[1][2][1][1], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[1][1][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[2][2][2]' accessed at index a[1][1][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[10][10][10];\n"
               "  a[2*3][4*3][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Array 'a[10][10][10]' accessed at index a[6][12][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  char a[10][10][10];\n"
               "  a[6][40][10] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[10][10][10]' accessed at index a[6][40][10], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  char a[1][1][1];\n"
               "  a[2][2][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[1][1][1]' accessed at index a[2][2][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  char a[6][6][6];\n"
               "  a[6][6][2] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[6][6][6]' accessed at index a[6][6][2], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  int a[2][2];\n"
               "  p = &a[2][0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown dim..
@@ -2101,7 +2105,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  int a[2][countof(x)] = {{1,2},{3,4}};\n"
               "  a[0][0] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void draw_quad(float z)  {\n"
@@ -2123,7 +2127,7 @@ class TestBufferOverrun : public TestFixture {
               "        vertices[i][1][2] = 4.0;\n"
               "        vertices[i][1][3] = 5.0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -2132,7 +2136,7 @@ class TestBufferOverrun : public TestFixture {
                   "  const size_t B = 2;\n"
                   "  extern int stuff[A][B];\n"
                   "  return stuff[0][1];\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // TODO: better handling of VLAs in symboldatabase. should be
@@ -2142,7 +2146,7 @@ class TestBufferOverrun : public TestFixture {
                   "  const size_t B = 2;\n"
                   "  extern int stuff[A][B];\n"
                   "  return stuff[0][1];\n"
-                  "}");
+                  "}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
     }
@@ -2163,7 +2167,7 @@ class TestBufferOverrun : public TestFixture {
               "    break;\n"
               "  };\n"
               " }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2181,7 +2185,7 @@ class TestBufferOverrun : public TestFixture {
               "    break;\n"
               "  };\n"
               " }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:12]: (error) Array index out of bounds.\n", "", errout_str());
     }
 
@@ -2193,7 +2197,7 @@ class TestBufferOverrun : public TestFixture {
               "            a[i] = 0;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2203,7 +2207,7 @@ class TestBufferOverrun : public TestFixture {
               "void f(int i) {\n"
               "  if (i >= 0 && i < 10) {}\n"
               "  a[i] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:4:4]: (warning) Either the condition 'i<10' is redundant or the array 'a[10]' is accessed at index 10, which is out of bounds. [arrayIndexOutOfBoundsCond]\n"
                       "[test.cpp:3:9] -> [test.cpp:4:4]: (warning) Either the condition 'i>=0' is redundant or the array 'a[10]' is accessed at index -1, which is out of bounds. [negativeIndex]\n",
                       errout_str());
@@ -2217,7 +2221,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 19; i < 36; ++i) {\n"
               "        data[i/2] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[8]' accessed at index 17, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // #2199 - false negative: array out of bounds in loop when there is calculation
@@ -2227,7 +2231,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 5; ++i) {\n"
               "        arr[i + 7] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'arr[5]' accessed at index 11, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2237,21 +2241,21 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char data[8];\n"
               "    data[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'data[8]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char data[8][4];\n"
               "    data[5][-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'data[8][4]' accessed at index data[*][-1], which is out of bounds. [negativeIndex]\n", errout_str());
 
         // #1614 - negative index is ok for pointers
         check("void foo(char *p)\n"
               "{\n"
               "    p[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -2259,14 +2263,14 @@ class TestBufferOverrun : public TestFixture {
               "    char s[] = \"abc\";\n"
               "    char *p = s + strlen(s);\n"
               "    if (p[-1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1850
         check("int f(const std::map<int, std::map<int,int> > &m)\n"
               "{\n"
               "    return m[0][-1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2275,7 +2279,7 @@ class TestBufferOverrun : public TestFixture {
               "void foo() {\n"
               "    TEST test;\n"
               "    test.a[-1] = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Array 'test.a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2291,7 +2295,7 @@ class TestBufferOverrun : public TestFixture {
               "void g(int i) {\n"
               "    if( i == 0 )\n"
               "        return f(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2398,7 +2402,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 10; i > 0; --i) {\n"
               "        data[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[8]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
@@ -2407,7 +2411,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (unsigned int i = 3; i < 5; --i) {\n"
               "        val[i+1] = val[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2416,7 +2420,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 3; i < 5; --i) {\n"
               "        val[i+1] = val[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'val[5]' accessed at index -9994, which is out of bounds. [negativeIndex]\n"
                       "[test.cpp:5:23]: (error) Array 'val[5]' accessed at index -9995, which is out of bounds. [negativeIndex]\n", errout_str());
     }
@@ -2434,7 +2438,7 @@ class TestBufferOverrun : public TestFixture {
               "    A a;\n"
               "    a.data[3] = 0;\n"
               "    a.b.data[2] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #1586
@@ -2449,7 +2453,7 @@ class TestBufferOverrun : public TestFixture {
               "    A a;\n"
               "    a.data[4] = 0;\n"
               "    a.b.data[3] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:11]: (error) Array 'a.data[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n"
                       "[test.cpp:11:13]: (error) Array 'a.b.data[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
@@ -2463,7 +2467,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; x < 10 && y; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -2472,7 +2476,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; x < 10 || y; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -2481,7 +2485,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; x <= 10 && y; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -2490,7 +2494,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (x = 0; y && x <= 10; x++) {\n"
               "        data[x] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Array 'data[2]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int f() {\n" // #9126
@@ -2502,7 +2506,7 @@ class TestBufferOverrun : public TestFixture {
               "            c++;\n"
               "     }\n"
               "    return c;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2516,7 +2520,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "        a[i - 1] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int maybe();
@@ -2528,7 +2532,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "        a[i - 1] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (error) Array 'a[2]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2541,7 +2545,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // Ticket #2385 - No false positive
@@ -2553,7 +2557,7 @@ class TestBufferOverrun : public TestFixture {
               "            a[i-10] = 0;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3893 - start value out of bounds
@@ -2563,7 +2567,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 10; maybe(); dostuff()) {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // #7686
@@ -2597,7 +2601,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i != 10; ++i) {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[5]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n",
                       errout_str());
     }
@@ -2609,7 +2613,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i != 10; ++i) {\n"
               "        i == 0 ? 0 : a[i-1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2617,7 +2621,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i != 10; ++i) {\n"
               "        some_condition ? 0 : a[i-1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n",
                       errout_str());
 
@@ -2627,7 +2631,7 @@ class TestBufferOverrun : public TestFixture {
               "        i==0 ? 0 : a[i-1];\n"
               "        a[i-1] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2635,7 +2639,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "   char a[10];\n"
               "   for (i=0; i<10; i++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2646,14 +2650,14 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i<7; ++i) {\n"
               "        a[0] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_extern() {
         // Ticket #1684. FP when using 'extern'.
         check("extern char arr[15];\n"
-              "char arr[15] = \"abc\";");
+              "char arr[15] = \"abc\";\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2667,7 +2671,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    int x[2];\n"
               "    f1(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Same type => error
@@ -2677,7 +2681,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char x[2];\n"
               "    f1(x);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:2]: (error) Array 'x[2]' accessed at index 4, which is out of bounds.\n",
                            "",
                            errout_str());
@@ -2687,41 +2691,41 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    const char *str = \"abc\";\n"
               "    bar(str[10]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Array 'str[4]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char *str = \"abc\";\n"
               "    bar(str[4]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Array 'str[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char *str = \"abc\";\n"
               "    bar(str[3]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char *str = \"a\tc\";\n"
               "    bar(str[4]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Array 'str[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n" // #6973
               "    const char *name = \"\";\n"
               "    if ( name[0] == 'U' ? name[1] : 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv) {\n"
               "    char str[6] = \"\\0\";\n"
               "    unsigned short port = 65535;\n"
               "    snprintf(str, sizeof(str), \"%hu\", port);\n"
-              "}", dinit(CheckOptions, $.s = &settings0, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n" // #11020
@@ -2743,7 +2747,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct tt *tt=x;\n"
               "    tt->name;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // detect error
@@ -2754,7 +2758,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct tt *tt=x;\n"
               "    tt->name[22] = 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:13]: (error) Array 'tt->name[21]' accessed at index 22, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2763,7 +2767,7 @@ class TestBufferOverrun : public TestFixture {
               "    char str[3];\n"
               "    str[i] = 0;\n"
               "    if (i==10) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:3:8]: (warning) Either the condition 'i==10' is redundant or the array 'str[3]' is accessed at index 10, which is out of bounds. [arrayIndexOutOfBoundsCond]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -2772,31 +2776,31 @@ class TestBufferOverrun : public TestFixture {
               "    switch (i) {\n"
               "    case 10: break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:3:8]: (warning) Either the switch case 'case 10' is redundant or the array 'str[3]' is accessed at index 10, which is out of bounds. [arrayIndexOutOfBoundsCond]\n", errout_str());
 
         check("void f() {\n"
               "    char str[3];\n"
               "    str[((unsigned char)3) - 1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"  // #5416 FP
               "    char *str[3];\n"
               "    do_something(&str[0][5]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X { static const int x[100]; };\n" // #6070
-              "const int X::x[100] = {0};");
+              "const int X::x[100] = {0};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace { class X { static const int x[100]; };\n" // #6232
-              "const int X::x[100] = {0}; }");
+              "const int X::x[100] = {0}; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class ActorSprite { static ImageSet * targetCursorImages[2][10]; };\n"
-              "ImageSet *ActorSprite::targetCursorImages[2][10];");
+              "ImageSet *ActorSprite::targetCursorImages[2][10];\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::size_t s) {\n" // #10130
@@ -2828,7 +2832,7 @@ class TestBufferOverrun : public TestFixture {
               "  int a[10];\n"
               "  int *p = a;\n"
               "  p[20] = 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Array 'a[10]' accessed at index 20, which is out of bounds.\n", "", errout_str());
 
         {
@@ -2837,14 +2841,14 @@ class TestBufferOverrun : public TestFixture {
                   "  int a[10];\n"
                   "  int *p = a;\n"
                   "  p[10] = 0;\n"
-                  "}");
+                  "}\n");
             TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4:6]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", "", errout_str());
 
             check("void f() {\n"
                   "  int a[10];\n"
                   "  int *p = a;\n"
                   "  dostuff(&p[10]);\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2852,33 +2856,33 @@ class TestBufferOverrun : public TestFixture {
               "  int a[X];\n" // unknown size
               "  int *p = a;\n"
               "  p[20] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int a[2];\n"
               "  char *p = (char *)a;\n" // cast
               "  p[4] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_function_parameter() {
         check("void f(char a[10]) {\n"
               "  a[20] = 0;\n" // <- cppcheck warn here even though it's not a definite access out of bounds
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:4]: (error) Array 'a[10]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f(char a[10]) {\n" // #6353 - reassign 'a'
               "  a += 4;\n"
               "  a[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char a[10]) {\n"
               "  a[0] = 0;\n"
               "  a[-1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
@@ -2887,7 +2891,7 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "    E arrE[] = { e1, e2 };\n"
               "    arrE[sizeof(arrE)] = e1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'arrE[2]' accessed at index 8, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -2895,8 +2899,71 @@ class TestBufferOverrun : public TestFixture {
         check("constexpr int blockLen = 10;\n"
               "void foo(std::array<uint8_t, blockLen * 2>& a) {\n"
               "    a[2] = 2;\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void array_index_container_data()
+    {
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    p[2] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    p[5] = 1;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:6]: (error) Array 'p[3]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    memset(v.data(), 0, 12);\n"
+              "    memset(v.data(), 0, 100);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Buffer is accessed out of bounds: v.data() [bufferAccessOutOfBounds]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    memset(p, 0, 100);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Buffer is accessed out of bounds: p [bufferAccessOutOfBounds]\n",
+                      errout_str());
+
+        // the size is not tracked past changes of the container size
+        check("void f() {\n"
+              "    std::vector<int> v(3);\n"
+              "    v.reserve(100);\n"
+              "    int* p = v.data();\n"
+              "    v.resize(10);\n"
+              "    memset(p, 0, 40);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // ..or when the pointer is reassigned
+        check("void f(int* q) {\n"
+              "    std::vector<int> v(3);\n"
+              "    int* p = v.data();\n"
+              "    p = q;\n"
+              "    memset(p, 0, 100);\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        // the buffer of c_str() includes the null terminator
+        check("void f(char* dst) {\n"
+              "    std::string s = \"abc\";\n"
+              "    memcpy(dst, s.c_str(), 4);\n"
+              "    memcpy(dst, s.c_str(), 5);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:24]: (error) Buffer is accessed out of bounds: s.c_str() [bufferAccessOutOfBounds]\n",
+                      errout_str());
     }
 
     void array_index_two_for_loops() {
@@ -2909,7 +2976,7 @@ class TestBufferOverrun : public TestFixture {
               "        sum += val[i];\n"
               "    if (i < 50)\n"
               "        sum -= val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool b();\n"
@@ -2923,7 +2990,7 @@ class TestBufferOverrun : public TestFixture {
               "        sum -= val[i];\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool b();\n"
@@ -2935,7 +3002,7 @@ class TestBufferOverrun : public TestFixture {
               "        sum += val[i];\n"
               "    for (; i < 50; i++)\n"
               "        sum -= val[i];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3022,7 +3089,7 @@ class TestBufferOverrun : public TestFixture {
               "static void f(struct ABC *abc)\n"
               "{\n"
               "    strcpy( abc->str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc->str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
@@ -3034,7 +3101,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct ABC abc;\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
@@ -3045,7 +3112,7 @@ class TestBufferOverrun : public TestFixture {
               "static void f(struct ABC &abc)\n"
               "{\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("static void f()\n"
@@ -3055,7 +3122,7 @@ class TestBufferOverrun : public TestFixture {
               "        char str[5];\n"
               "    } abc;\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("static void f()\n"
@@ -3067,7 +3134,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    strcpy( abc->str, \"abcdef\" );\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc->str [bufferAccessOutOfBounds]\n", errout_str());
     }
 
@@ -3080,7 +3147,7 @@ class TestBufferOverrun : public TestFixture {
               "    int i;\n"
               "    for (i = 0; i <= 10; ++i)\n"
               "        a[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct S { int b; } static e[1];\n" // #11052
@@ -3095,7 +3162,7 @@ class TestBufferOverrun : public TestFixture {
               "    const char *p[2];\n"
               "    for (int i = 0; i < 8; ++i)\n"
               "        p[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'p[2]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // No false positive
@@ -3104,7 +3171,7 @@ class TestBufferOverrun : public TestFixture {
               "    const char *p[2];\n"
               "    const char *s = y + p[1];\n"
               "    p[1] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // There is no error here
@@ -3116,7 +3183,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "  char s[3];\n"
               "  f1(s,20);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f1(char *s,int size)\n"
@@ -3137,7 +3204,7 @@ class TestBufferOverrun : public TestFixture {
               "    char n[5];\n"
               "    sprintf(n, \"d\");\n"
               "    printf(\"hello!\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3147,21 +3214,21 @@ class TestBufferOverrun : public TestFixture {
               "   char n[5];\n"
               "   strcat(n, \"abc\");\n"
               "   strcat(n, \"def\");\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: n\n", "", errout_str());
 
         check("void f()\n" // #12489
               "{\n"
               "   char d[3] = {};\n"
               "   strcat(d, \"12345678\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Buffer is accessed out of bounds: d [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   char d[3] = \"ab\"; \n"
               "   strcat(d, \"c\");\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:11]: (error) Buffer is accessed out of bounds: d [bufferAccessOutOfBounds]\n", "", errout_str());
     }
 
@@ -3171,7 +3238,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char a[2];\n"
               "    strcpy(a, \"a\\0\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3184,7 +3251,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -3194,7 +3261,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        a[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3208,7 +3275,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = 0;\n"
               "        i += 100;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3221,7 +3288,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "        char b = a[i];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3232,7 +3299,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (float i=0; i<10.0;i=i+0.1)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -3241,7 +3308,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (float i=0; i<10.0;i=0.1+i)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3253,7 +3320,7 @@ class TestBufferOverrun : public TestFixture {
               "void A::f(int i, int ii)\n"
               "{\n"
               "    strcpy(val, \"ab\") ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Buffer is accessed out of bounds: val [bufferAccessOutOfBounds]\n", errout_str());
     }
 
@@ -3262,20 +3329,20 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    struct Foo foo[5];\n"
               "    memset(foo, 0, sizeof(foo));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"  // ticket #2093
               "    gchar x[3];\n"
               "    strcpy(x, \"12\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("extern char a[10];\n"
               "void f() {\n"
               "    char b[25] = {0};\n"
               "    std::memcpy(b, a, 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3289,7 +3356,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i<6; i++) {\n"
               "        b[i] = b[i+1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -3301,7 +3368,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i=0; i<7; i++) {\n"
               "        b[i] = b[i+1];\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) Array 'b[7]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3314,7 +3381,7 @@ class TestBufferOverrun : public TestFixture {
               "\n"
               "A::A() {\n"
               "    memset(buf, 0, 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3325,7 +3392,7 @@ class TestBufferOverrun : public TestFixture {
               "    const char *src = \"AAAAAAAAAAAAAAAAAAAAA\";\n"
               "    for (size_t i = 0; i <= 4; i++)\n"
               "        dst[i] = src[i];\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Array 'dst[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3337,7 +3404,7 @@ class TestBufferOverrun : public TestFixture {
               "   for( int i = 0; i<6; ) {\n"
               "      x += array[i];\n"
               "       i++;  }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // ticket #4096
@@ -3347,7 +3414,7 @@ class TestBufferOverrun : public TestFixture {
               "   for( int i = 0; i<6; ) {\n"
               "      x += array[i++];\n"
               "   }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -3357,7 +3424,7 @@ class TestBufferOverrun : public TestFixture {
               "    char inbuf[1000];\n"
               "    char *f[10];\n"
               "    split(inbuf, f, 10, \"\t\t\");\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3367,7 +3434,7 @@ class TestBufferOverrun : public TestFixture {
               "void main() {\n"
               "struct foobar x[5];\n"
               "abc(x);\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3378,7 +3445,7 @@ class TestBufferOverrun : public TestFixture {
               "int main(){\n"
               "  testChar tc1 = \"\";\n"
               "  tc1[5]='a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3388,14 +3455,14 @@ class TestBufferOverrun : public TestFixture {
         check("struct S { int m[9]; };\n"
               "int f(S * s) {\n"
               "    return s->m[sizeof(s->m)];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Array 's->m[9]' accessed at index 36, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_31() {
         check("void f(WhereInfo *pWInfo, int *aiCur) {\n"
               "  memcpy(aiCur, pWInfo->aiCurOnePass, sizeof(int)*2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3406,7 +3473,7 @@ class TestBufferOverrun : public TestFixture {
               "    char dest[1] = \"a\";\n"
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n"// <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (error) Buffer is accessed out of bounds: dest [bufferAccessOutOfBounds]\n", errout_str());
         // destination size is too small
         check("void f(void) {\n"
@@ -3415,7 +3482,7 @@ class TestBufferOverrun : public TestFixture {
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n"
               "    (void)strxfrm(dest,src,3);\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (error) Buffer is accessed out of bounds: dest [bufferAccessOutOfBounds]\n", errout_str());
         // source size is too small
         check("void f(void) {\n"
@@ -3424,7 +3491,7 @@ class TestBufferOverrun : public TestFixture {
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n"
               "    (void)strxfrm(dest,src,3);\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:24]: (error) Buffer is accessed out of bounds: src [bufferAccessOutOfBounds]\n", errout_str());
         // source size is too small
         check("void f(void) {\n"
@@ -3432,7 +3499,7 @@ class TestBufferOverrun : public TestFixture {
               "    char dest[3] = \"abc\";\n"
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:24]: (error) Buffer is accessed out of bounds: src [bufferAccessOutOfBounds]\n", errout_str());
     }
 
@@ -3443,7 +3510,7 @@ class TestBufferOverrun : public TestFixture {
               "      for (int j=0; j<20; j++)\n"
               "          z[i] = 0;\n"
               "   return z[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'z[16]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3496,20 +3563,119 @@ class TestBufferOverrun : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void buffer_overrun_37() { // #14703
+        check("void f() {\n"
+              "    const char *dst[256];\n"
+              "    static const char * const src[] = {\"a\", \"b\", \"c\"};\n"
+              "    memcpy(dst, src, sizeof(src));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void buffer_overrun_38() { // #9173
+        check("void f() {\n"
+              "    int a[10];\n"
+              "    memset(&a[0], 0, 20 * sizeof(int));\n"
+              "}\n"
+              "void g() {\n"
+              "    int a[10];\n"
+              "    memset(&a[0], 0, 10 * sizeof(int));\n"
+              "}\n"
+              "void h() {\n"
+              "    int a[10];\n"
+              "    memset(&a[5], 0, 5 * sizeof(int));\n"
+              "}\n"
+              "void i() {\n"
+              "    int a[10][10];\n"
+              "    memset(&a[0][0], 0, 100 * sizeof(int));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[0] [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    int a[10];\n"
+              "    memset(&a[5], 0, 10 * sizeof(int));\n"
+              "}\n"
+              "void g() {\n"
+              "    int a[1][1];\n"
+              "    memset(&a[0][0], 0, 10 * sizeof(int));\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[5] [bufferAccessOutOfBounds]\n"
+                           "[test.cpp:7:12]: (error) Buffer is accessed out of bounds: &a[0][0] [bufferAccessOutOfBounds]\n",
+                           "[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &a[5] [bufferAccessOutOfBounds]\n",
+                           errout_str());
+
+        check("void f() {\n" // #14866
+              "    std::vector<char> buf(25);\n"
+              "    std::memset(&buf[0], 0, 25);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #14859
+              "    std::vector<char> buf(25);\n"
+              "    std::memset(&buf[0], 0, 26);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (error) Buffer is accessed out of bounds: &buf[0] [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f(FILE *fp) {\n" // #14929
+              "    std::string s;\n"
+              "    fwrite(&s, 1, 1, fp);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
+        check("void f() {\n" // #14935
+              "    int a[5];\n"
+              "    for (int i = 0; i < 5; ++i)\n"
+              "        memset(&a[i], 0, sizeof(a));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (error) Buffer is accessed out of bounds: &a[i] [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f(const std::vector<uint8_t>& s) {\n" // #14948
+              "    if (s.size() < 4)\n"
+              "        return;\n"
+              "    uint32_t u = 0;\n"
+              "    std::memcpy(&u, &s[0], sizeof(u));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void buffer_overrun_errorpath() {
         setMultiline();
-        const Settings settingsOld = settings0; // TODO: get rid of this
-        settings0.templateLocation = "{file}:{line}:note:{info}";
+        Settings s = settings0;
+        s.templateLocation = "{file}:{line}:note:{info}\n";
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    memset(p, 0, 20);\n"
-              "}");
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:3:12]: error: Buffer is accessed out of bounds: p [bufferAccessOutOfBounds]\n"
                       "[test.cpp:2:13]: note: Assign p, buffer with size 10\n"
                       "[test.cpp:3:12]: note: Buffer overrun\n", errout_str());
 
-        settings0 = settingsOld;
+        check("void f(const std::vector<uint8_t>& s) {\n"
+              "    if (s.size() == 2) {}\n"
+              "    uint32_t u = 0;\n"
+              "    std::memcpy(&u, &s[0], sizeof(u));\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:4:21]: warning: Buffer is accessed out of bounds: &s[0] [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:2:18]: note: Assuming that condition 's.size()==2' is not redundant\n"
+                      "[test.cpp:4:21]: note: Buffer overrun\n", errout_str());
+
+        check("void f(int i) {\n" // #14960
+              "    int a[1];\n"
+              "    if (i != 2) return;\n"
+              "    memset(a, 0, i * sizeof(int));\n"
+              "}"
+              "void g(int i) {\n"
+              "    int a[1];\n"
+              "    if (i != 2) {}\n"
+              "    memset(a, 0, i * sizeof(int));\n"
+              "}", s);
+        ASSERT_EQUALS("[test.cpp:4:12]: warning: Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:3:11]: note: Assuming that condition 'i!=2' is not redundant\n"
+                      "[test.cpp:4:12]: note: Buffer overrun\n"
+                      "[test.cpp:8:12]: warning: Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:7:11]: note: Assuming that condition 'i!=2' is not redundant\n"
+                      "[test.cpp:8:12]: note: Buffer overrun\n", errout_str());
     }
 
     void buffer_overrun_bailoutIfSwitch() {
@@ -3521,7 +3687,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char a[10];\n"
               "    f1(a);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // No false positive
@@ -3533,7 +3699,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char a[10];\n"
               "    f1(a);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // No false negative
@@ -3545,7 +3711,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    char a[10];\n"
               "    f1(a);"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (error) Array 'a[10]' accessed at index 100, which is out of bounds.\n", "", errout_str());
     }
 
@@ -3556,7 +3722,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    char a[2];\n"
               "    f(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: warning: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument [argumentSize]\n"
                       "[test.cpp:4:5]: note: Function 'f' is called\n"
                       "[test.cpp:1:13]: note: Declaration of 1st function argument.\n"
@@ -3567,7 +3733,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    float a[2][3];\n"
               "    f(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: warning: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument [argumentSize]\n"
                       "[test.cpp:4:5]: note: Function 'f' is called\n"
                       "[test.cpp:1:14]: note: Declaration of 1st function argument.\n"
@@ -3578,7 +3744,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    int a[2];\n"
               "    f(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: warning: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument [argumentSize]\n"
                       "[test.cpp:4:5]: note: Function 'f' is called\n"
                       "[test.cpp:1:12]: note: Declaration of 1st function argument.\n"
@@ -3600,7 +3766,7 @@ class TestBufferOverrun : public TestFixture {
               "void foo() {\n"
               "  unsigned char(* tree)[2048][4] = new unsigned char[256][2048][4];\n"
               "  CreateLeafTex(tree);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a[10]) {\n" // #10069
@@ -3628,7 +3794,7 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (warning) Possible buffer overflow if strlen(src) is larger than sizeof(data)-strlen(data).\n", "", errout_str());
 
         check("void foo() {\n"
@@ -3637,19 +3803,19 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(50);\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) Possible buffer overflow if strlen(src) is larger than sizeof(data)-strlen(data).\n", "", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(100);\n"
               "    strcat(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -3658,7 +3824,7 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (warning) Possible buffer overflow if strlen(src) is larger than or equal to sizeof(data).\n", "", errout_str());
 
         check("void foo() {\n"
@@ -3667,19 +3833,19 @@ class TestBufferOverrun : public TestFixture {
               "    memset(src, 'C', 99);\n"
               "    src[99] = '\\0';\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(50);\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) Possible buffer overflow if strlen(src) is larger than or equal to sizeof(data).\n", "", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(100);\n"
               "    strcpy(data, src);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3701,35 +3867,87 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "  u8 str[256];\n"
               "  mystrcpy(str, \"abcd\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  u8 str[2];\n"
               "  mystrcpy(str, \"abcd\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         // The same for structs, where the message comes from a different check
         check("void f() {\n"
               "    struct { u8 str[256]; } ms;\n"
               "    mystrcpy(ms.str, \"abcd\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    struct { u8 str[2]; } ms;\n"
               "    mystrcpy(ms.str, \"abcd\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Buffer is accessed out of bounds: ms.str [bufferAccessOutOfBounds]\n", errout_str());
     }
 
+    void buffer_overrun_handle_addr_of_var() { // #7570
+        check("void f() {\n"
+              "  int i;\n"
+              "  memset(i, 0, 1000);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "  int i;\n"
+              "  memset(&i, 0, 1000);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: &i [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "  int i[2];\n"
+              "  memset(&i, 0, 1000);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: i [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "  int i;\n"
+              "  memset(&i, 0, sizeof(i));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "  int i[10];\n"
+              "  memset(&i[1], 0, 1000);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: &i[1] [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("struct S { int x; };\n" // #8616
+              "void f() {\n"
+              "    S s;\n"
+              "    memset(&s, 0, sizeof(s) * 2);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Buffer is accessed out of bounds: &s [bufferAccessOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    char x;\n"
+              "    memset(&x, 0, 16);\n"
+              "}\n"
+              "void g(char y) {\n"
+              "    char x;\n"
+              "    memcpy(&x, &y, 16);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &x [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:7:12]: (error) Buffer is accessed out of bounds: &x [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:7:16]: (error) Buffer is accessed out of bounds: &y [bufferAccessOutOfBounds]\n",
+                      errout_str());
+    }
+
     void valueflow_string() { // using ValueFlow string values in checking
         check("char f() {\n"
               "  const char *x = s;\n"
               "  if (cond) x = \"abcde\";\n"
               "  return x[20];\n" // <- array index out of bounds when x is "abcde"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Array 'x[6]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3739,40 +3957,40 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char a[10];\n"
               "    char *p = a + 100;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:17]: (portability) Undefined behaviour, pointer arithmetic 'a+100' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("char *f() {\n"
               "    char a[10];\n"
               "    return a + 100;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:14]: (portability) Undefined behaviour, pointer arithmetic 'a+100' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == 123) {}\n"
               "    dostuff(x+i);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:14]: (portability) Undefined behaviour, when 'i' is 123 the pointer arithmetic 'x+i' is out of bounds. [pointerOutOfBoundsCond]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == -1) {}\n"
               "    dostuff(x+i);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:14]: (portability) Undefined behaviour, when 'i' is -1 the pointer arithmetic 'x+i' is out of bounds. [pointerOutOfBoundsCond]\n", errout_str());
 
         check("void f() {\n" // #6350 - fp when there is cast of buffer
               "  wchar_t buf[64];\n"
               "  p = (unsigned char *) buf + sizeof (buf);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", settings0_p, false);
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    const char   d[] = \"0123456789\";\n"
               "    char *cp = d + 3;\n"
               "    return cp - d;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3781,7 +3999,7 @@ class TestBufferOverrun : public TestFixture {
               "    char *p = malloc(10);\n"
               "    p += 100;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         TODO_ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'p+100' is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
@@ -3789,7 +4007,7 @@ class TestBufferOverrun : public TestFixture {
               "    p += 10;\n"
               "    *p = 0;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) p is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
@@ -3798,7 +4016,7 @@ class TestBufferOverrun : public TestFixture {
               "    p -= 10;\n"
               "    *p = 0;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3807,7 +4025,7 @@ class TestBufferOverrun : public TestFixture {
               "    p = p - 1;\n"
               "    *p = 0;\n"
               "    free(p);"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3815,7 +4033,7 @@ class TestBufferOverrun : public TestFixture {
         check("struct S { int a[10]; };\n"
               "void f(struct S *s) {\n"
               "    int *p = s->a + 100;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:19]: (portability) Undefined behaviour, pointer arithmetic 's->a+100' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("template <class T> class Vector\n"
@@ -3831,36 +4049,36 @@ class TestBufferOverrun : public TestFixture {
               "    const T* P2 = PDat + 1;\n"
               "    const T* P1 = P2 - 1;\n"
               "}\n"
-              "Vector<std::array<long, 2>> Foo;\n");
+              "Vector<std::array<long, 2>> Foo;\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
     void pointer_out_of_bounds_4() {
         check("const char* f() {\n"
               "    g(\"Hello\" + 6);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("const char* f() {\n"
               "    g(\"Hello\" + 7);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:2:15]: (portability) Undefined behaviour, pointer arithmetic '\"Hello\"+7' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("const char16_t* f() {\n"
               "    g(u\"Hello\" + 6);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("const char16_t* f() {\n"
               "    g(u\"Hello\" + 7);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:2:16]: (portability) Undefined behaviour, pointer arithmetic 'u\"Hello\"+7' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f() {\n" // #4647
               "    int val = 5;\n"
               "    std::string hi = \"hi\" + val;\n"
               "    std::cout << hi << std::endl;\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:27]: (portability) Undefined behaviour, pointer arithmetic '\"hi\"+val' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f(const char* s, int len) {\n" // #11026
@@ -3870,7 +4088,7 @@ class TestBufferOverrun : public TestFixture {
               "void g() {\n"
               "    f(\"a\", 1);\n"
               "    f(\"bbb\", 3);\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, const char* a) {\n" // #11140
@@ -3883,14 +4101,14 @@ class TestBufferOverrun : public TestFixture {
               "void h() {\n"
               "    for (int i = 0; \"012\"[i]; ++i)\n"
               "        f(i, \"345\");\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
     void pointer_out_of_bounds_5() { // #10227
         check("int foo(char str[6]) {\n"
               "    return !((0 && *(\"STRING\" + 14) == 0) || memcmp(str, \"STRING\", 6) == 0);\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3900,26 +4118,26 @@ class TestBufferOverrun : public TestFixture {
         check("char *f() {\n"
               "    char x[10];\n"
               "    return x-1;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:13]: (portability) Undefined behaviour, pointer arithmetic 'x-1' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == 123) {}\n"
               "    dostuff(x-i);\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:14]: (portability) Undefined behaviour, when 'i' is 123 the pointer arithmetic 'x-i' is out of bounds. [pointerOutOfBoundsCond]\n", errout_str());
 
         check("void f(int i) {\n"
               "    char x[10];\n"
               "    if (i == -20) {}\n"
               "    dostuff(x-i);\n"
-              "}");
+              "}\n", settings0_p);
         TODO_ASSERT_EQUALS("[test.cpp:4]: (portability) Undefined behaviour, when 'i' is -20 the pointer arithmetic 'x-i' is out of bounds.\n", "", errout_str());
 
         check("void f(const char *x[10]) {\n"
               "    return x-4;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3929,7 +4147,7 @@ class TestBufferOverrun : public TestFixture {
               "  struct Foo x = {0};\n"
               "  strcat(x.a, \"aa\");\n"
               "  strcat(x.a, \"aa\");\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
     }
 
@@ -3942,7 +4160,7 @@ class TestBufferOverrun : public TestFixture {
               "        char str[50];\n"
               "        str[30] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3950,7 +4168,7 @@ class TestBufferOverrun : public TestFixture {
         check("struct foo {\n"
               "  void bar() { return; }\n"
               "  type<> member[1];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3960,7 +4178,7 @@ class TestBufferOverrun : public TestFixture {
               "void foo()\n"
               "{\n"
               "    str[3] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Array 'str[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -3969,7 +4187,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char *s; s = new char[10];\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #1670 - false negative when using return
@@ -3977,7 +4195,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    int *s; s = new int[10];\n"
               "    return s[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct Fred { char c[10]; };\n"
@@ -3985,12 +4203,12 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    Fred *f; f = new Fred;\n"
               "    return f->c[10];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (error) Array 'f->c[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("static const size_t MAX_SIZE = UNAVAILABLE_TO_CPPCHECK;\n"
               "struct Thing { char data[MAX_SIZE]; };\n"
-              "char f4(const Thing& t) { return !t.data[0]; }");
+              "char f4(const Thing& t) { return !t.data[0]; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4000,7 +4218,7 @@ class TestBufferOverrun : public TestFixture {
               "  buf = new char[9];\n"
               "  buf[8] = 0;\n"
               "  delete [] buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4010,7 +4228,7 @@ class TestBufferOverrun : public TestFixture {
               "  buf = new char[9];\n"
               "  buf[9] = 0;\n"
               "  delete [] buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (error) Array 'buf[9]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
@@ -4018,7 +4236,7 @@ class TestBufferOverrun : public TestFixture {
               "    enum E { Size = 10 };\n"
               "    char *s; s = new char[Size];\n"
               "    s[Size] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
@@ -4026,7 +4244,7 @@ class TestBufferOverrun : public TestFixture {
               "    enum E { ZERO };\n"
               "    E *e; e = new E[10];\n"
               "    e[10] = ZERO;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:6]: (error) Array 'e[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
@@ -4036,14 +4254,14 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char *s; s = (char *)malloc(10);\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #842
         check("void f() {\n"
               "    int *tab4 = (int *)malloc(20 * sizeof(int));\n"
               "    tab4[20] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #1478
@@ -4052,7 +4270,7 @@ class TestBufferOverrun : public TestFixture {
               "    free(p);\n"
               "    p = (char *)malloc(10);\n"
               "    p[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:6]: (error) Array 'p[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // ticket #1134
@@ -4060,7 +4278,7 @@ class TestBufferOverrun : public TestFixture {
               "    int *x, i;\n"
               "    x = (int *)malloc(10 * sizeof(int));\n"
               "    x[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'x[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
@@ -4070,7 +4288,7 @@ class TestBufferOverrun : public TestFixture {
               "  tab4 = malloc(21 * sizeof(int));\n"
               "  tab4[20] = 0;\n"
               "  free(tab4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -4079,50 +4297,59 @@ class TestBufferOverrun : public TestFixture {
               "  tab4 = realloc(tab4,21 * sizeof(int));\n"
               "  tab4[20] = 0;\n"
               "  free(tab4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum E { Size = 20 };\n"
               "    E *tab4 = (E *)malloc(Size * 4);\n"
               "    tab4[Size] = Size;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    enum E { Size = 20 };\n"
               "    E *tab4 = (E *)malloc(4 * Size);\n"
               "    tab4[Size] = Size;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    enum E { ZERO };\n"
               "    E *tab4 = (E *)malloc(20 * sizeof(E));\n"
               "    tab4[20] = ZERO;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n" // #8721
               "  unsigned char **cache = malloc(32);\n"
               "  cache[i] = malloc(65536);\n"
               "  cache[i][0xFFFF] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int **a = malloc(2 * sizeof(int*));\n"
               "  for (int i = 0; i < 3; i++)\n"
               "    a[i] = NULL;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "  int **a = new int*[2];\n"
               "  for (int i = 0; i < 3; i++)\n"
               "    a[i] = NULL;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
+
+        check("void f(const uint8_t* a) {\n" // 10421
+              "    uint8_t* p = (uint8_t*)malloc(20U * sizeof(uint8_t));\n"
+              "    if (!p) return false;\n"
+              "    for (uint8_t i = 1; i < 30; ++i)\n"
+              "        p[i] = a[i];\n"
+              "    free(p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'p[20]' accessed at index 29, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     // statically allocated buffer
@@ -4131,21 +4358,21 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    const char *s = \"123\";\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[4]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    char *s; s = \"\";\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[1]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void foo() {\n"
               "    const char *s = \"\";\n"
               "    s = y();\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n" // #7718
@@ -4153,7 +4380,7 @@ class TestBufferOverrun : public TestFixture {
               "    std::string s = \"123\";\n"
               "    s.resize(100);\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4163,7 +4390,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char *s = (char *)alloca(10);\n"
               "    s[10] = 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", "", errout_str());
     }
     /*
@@ -4253,19 +4480,20 @@ class TestBufferOverrun : public TestFixture {
                                    "    <arg nr=\"3\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::warning).build();
-        settings.platform.sizeof_wchar_t = 4;
+        // use a platform which has wchar_t with a sizeof 4
+        const Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::warning).platform(Platform::Unix32).build();
+        ASSERT_EQUALS(4, settings.platform.sizeof_wchar_t);
 
         check("void f() {\n"
               "    char c[10];\n"
               "    mymemset(c, 0, 10);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char c[10];\n"
               "    mymemset(c, 0, 11);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct S {\n"
@@ -4274,13 +4502,13 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "    S s;\n"
               "    mymemset(s.a, 0, 10);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:6:15]: (error) Buffer is accessed out of bounds: s.a [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void foo() {\n"
               "    char s[10];\n"
               "    mymemset(s, 0, '*');\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) The size argument is given as a char constant.\n"
                            "[test.cpp:3:14]: (error) Buffer is accessed out of bounds: s [bufferAccessOutOfBounds]\n", "[test.cpp:3:14]: (error) Buffer is accessed out of bounds: s [bufferAccessOutOfBounds]\n", errout_str());
 
@@ -4288,65 +4516,65 @@ class TestBufferOverrun : public TestFixture {
         check("void f(void) {\n"
               "  char a[10];\n"
               "  mymemset(a+5, 0, 10);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n", "", errout_str());
 
         // Ticket #909
         check("void f(void) {\n"
               "    char str[] = \"abcd\";\n"
               "    mymemset(str, 0, 6);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(void) {\n"
               "    char str[] = \"abcd\";\n"
               "    mymemset(str, 0, 5);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "    wchar_t str[] = L\"abcd\";\n"
               "    mymemset(str, 0, 21);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(void) {\n"
               "    wchar_t str[] = L\"abcd\";\n"
               "    mymemset(str, 0, 20);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1659 - overflowing variable when using memcpy
         check("void f(void) {\n"
               "  char c;\n"
               "  mymemset(&c, 0, 4);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
-        TODO_ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", "", errout_str());
+              "}\n", settings);
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: &c [bufferAccessOutOfBounds]\n", errout_str());
 
         // ticket #2121 - buffer access out of bounds when using uint32_t
         check("void f(void) {\n"
               "    unknown_type_t buf[4];\n"
               "    mymemset(buf, 0, 100);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         // #3124 - multidimensional array
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 5 * 6);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 6 * 6);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: b [bufferAccessOutOfBounds]\n", errout_str());
 
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 31);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: b [bufferAccessOutOfBounds]\n", errout_str());
 
         // #4968 - not standard function
@@ -4355,26 +4583,26 @@ class TestBufferOverrun : public TestFixture {
               "    foo.mymemset(str, 0, 100);\n"
               "    foo::mymemset(str, 0, 100);\n"
               "    std::mymemset(str, 0, 100);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:5:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", "", errout_str());
 
         // #5257 - check strings
         check("void f() {\n"
               "  mymemset(\"abc\", 0, 20);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:2]: (error) Buffer is accessed out of bounds.\n",
                            "",
                            errout_str());
 
         check("void f() {\n"
               "  mymemset(temp, \"abc\", 4);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #6816 - fp when array has known string value
               "    char c[10] = \"c\";\n"
               "    mymemset(c, 0, 10);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4396,43 +4624,43 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char c[7];\n"
               "    mystrncpy(c, \"hello\", 7);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               " char c[6];\n"
               " mystrncpy(c,\"hello\",6);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               " char c[5];\n"
               " mystrncpy(c,\"hello\",6);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    char c[6];\n"
               "    mystrncpy(c,\"hello!\",7);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(unsigned int addr) {\n"
               "    memset((void *)addr, 0, 1000);\n"
-              "}", dinit(CheckOptions, $.s = &settings0));
+              "}\n", settings0); // TODO: use settings?
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { char a[10]; };\n"
               "void foo(AB *ab) {\n"
               "    mystrncpy(x, ab->a, 100);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void a(char *p) { mystrncpy(p,\"hello world!\",10); }\n" // #3168
               "void b() {\n"
               "    char buf[5];\n"
               "    a(buf);"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Buffer is accessed out of bounds: buf\n",
                            "",
                            errout_str());
@@ -4458,13 +4686,13 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char str[3];\n"
               "    mysprintf(str, \"test\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"%s\", \"abcde\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("int getnumber();\n"
@@ -4472,51 +4700,51 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char str[5];\n"
               "    mysprintf(str, \"%d: %s\", getnumber(), \"abcde\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"test%s\", \"\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char *str = new char[5];\n"
               "    mysprintf(str, \"abcde\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(int condition) {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"test%s\", condition ? \"12\" : \"34\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int condition) {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"test%s\", condition ? \"12\" : \"345\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("struct Foo { char a[1]; };\n"
               "void f() {\n"
               "  struct Foo x;\n"
               "  mysprintf(x.a, \"aa\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Buffer is accessed out of bounds: x.a [bufferAccessOutOfBounds]\n", errout_str());
 
         // ticket #900
         check("void f() {\n"
               "  char *a = new char(30);\n"
               "  mysprintf(a, \"a\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(char value) {\n"
               "  char *a = new char(value);\n"
               "  mysprintf(a, \"a\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n", errout_str());
 
         // This is out of bounds if 'sizeof(ABC)' is 1 (No padding)
@@ -4524,21 +4752,21 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "  struct Foo *x = malloc(sizeof(Foo));\n"
               "  mysprintf(x->a, \"aa\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error, inconclusive) Buffer is accessed out of bounds: x.a\n", "", errout_str());
 
         check("struct Foo { char a[1]; };\n"
               "void f() {\n"
               "  struct Foo *x = malloc(sizeof(Foo) + 10);\n"
               "  mysprintf(x->a, \"aa\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { char a[1]; };\n"
               "void f() {\n"
               "  struct Foo x;\n"
               "  mysprintf(x.a, \"aa\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Buffer is accessed out of bounds: x.a [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct Foo {\n" // #6668 - unknown size
@@ -4547,8 +4775,43 @@ class TestBufferOverrun : public TestFixture {
               "};"
               "void Foo::f() {\n"
               "  mysprintf(a, \"abcd\");\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #901
+              "    const char b[] = \"b\";\n"
+              "    char a[1];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void g() {\n"
+              "    const char* b = \"b\";\n"
+              "    char a[1];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void h() {\n"
+              "    const std::string b = \"b\";\n"
+              "    char a[1];\n"
+              "    sprintf(a, \"%s\", b.c_str());\n"
+              "}\n"
+              "void i() {\n"
+              "    const char b[] = \"b\";\n"
+              "    char a[2];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void j() {\n"
+              "    const char* b = \"b\";\n"
+              "    char a[2];\n"
+              "    sprintf(a, \"%s\", b);\n"
+              "}\n"
+              "void k() {\n"
+              "    const std::string b = \"b\";\n"
+              "    char a[2];\n"
+              "    sprintf(a, \"%s\", b.c_str());\n"
+              "}\n", settings0);
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:9:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n"
+                      "[test.cpp:14:13]: (error) Buffer is accessed out of bounds: a [bufferAccessOutOfBounds]\n",
+                      errout_str());
     }
 
     void minsize_mul() {
@@ -4568,13 +4831,13 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char c[5];\n"
               "    myfread(c, 1, 5, stdin);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char c[5];\n"
               "    myfread(c, 1, 6, stdin);\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
     }
 
@@ -4584,7 +4847,7 @@ class TestBufferOverrun : public TestFixture {
         check("void f()\n"
               "{\n"
               " UnknownType *a = malloc(4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
     // extracttests.disable
@@ -4596,26 +4859,26 @@ class TestBufferOverrun : public TestFixture {
               "    baz[99] = 0;\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[99] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo ( char *bar ) {\n"
               "    char baz[100];\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[99] = '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo ( char *bar ) {\n"
               "    char baz[100];\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[x+1] = '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test with invalid code that there is no segfault
         check("char baz[100];\n"
-              "strncpy(baz, \"var\", 100)");
+              "strncpy(baz, \"var\", 100)\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test that there are no duplicate error messages
@@ -4624,7 +4887,7 @@ class TestBufferOverrun : public TestFixture {
               "    strncpy(baz, bar, 100);\n"
               "    foo(baz);\n"
               "    foo(baz);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'baz' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
 
@@ -4634,7 +4897,7 @@ class TestBufferOverrun : public TestFixture {
               "    strncpy(baz, bar, 100);\n"
               "    bar[99] = 0;\n"
               "    return strdup(baz);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'baz' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
 
@@ -4657,13 +4920,13 @@ class TestBufferOverrun : public TestFixture {
         check("void bar() {\n"
               "    char buf[4];\n"
               "    strncpy(buf, \"ab\", 4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void bar() {\n"
               "    char buf[4];\n"
               "    strncpy(buf, \"abcde\", 4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'buf' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
 
@@ -4685,6 +4948,20 @@ class TestBufferOverrun : public TestFixture {
     }
     // extracttests.enable
 
+    void terminateStrncpy_handle_addr_of_var() { // #7570
+        check("void foo() {\n"
+              "  char c[6];\n"
+              "  strncpy(&c, \"hello!\", 6);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
+
+        check("void foo() {\n"
+              "  char c[6];\n"
+              "  strncpy(&c, \"hello\\0\", 6);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void recursive_long_time() {
         // Just test that recursive check doesn't take long time
         check("char *f2 ( char *b )\n"
@@ -4709,7 +4986,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    char a[10];\n"
               "    f2(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4725,7 +5002,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    struct A *str;\n"
               "    str = malloc(4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4737,12 +5014,12 @@ class TestBufferOverrun : public TestFixture {
               "void b() {\n"
               "    char arr[64];\n"
               "    a(arr);\n"
-              "}");
+              "}\n");
     }
 
     void crash3() {
         check("struct b { unknown v[0]; };\n"
-              "void d() { struct b *f; f = malloc(108); }");
+              "void d() { struct b *f; f = malloc(108); }\n");
     }
 
     void crash4() { // #8679
@@ -4750,13 +5027,13 @@ class TestBufferOverrun : public TestFixture {
               "int main() { "
               "  thread_local_var = malloc(1337); "
               "  return 0; "
-              "}");
+              "}\n");
 
         check("thread_local void *thread_local_var; "
               "int main() { "
               "  thread_local_var = malloc(1337); "
               "  return 0; "
-              "}");
+              "}\n");
     }
 
     void crash5() { // 8644 - token has varId() but variable() is null
@@ -4764,19 +5041,19 @@ class TestBufferOverrun : public TestFixture {
               "    void b(char **dst) {\n"
               "        *dst = malloc(50);\n"
               "    }\n"
-              "}");
+              "}\n");
     }
 
     void crash6() {
         check("void start(char* name) {\n"
               "char snapname[64] = { 0 };\n"
               "strncpy(snapname, \"snapshot\", arrayLength(snapname));\n"
-              "}");
+              "}\n");
     }
 
     void crash7() { // 9073 - [ has no astParent
         check("char x[10];\n"
-              "void f() { x[10]; }");
+              "void f() { x[10]; }\n");
     }
 
     void insecureCmdLineArgs() {
@@ -4790,7 +5067,7 @@ class TestBufferOverrun : public TestFixture {
               "        free(p);\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char *argv[])\n"
@@ -4803,112 +5080,112 @@ class TestBufferOverrun : public TestFixture {
               "        free(p);\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, char* argv[])\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, const char* argv[])\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, const char* argv[])\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char* argv[])\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, const char *const *const argv, char **envp)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, const char *const *const argv, const char *const *const envp)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, const char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, const char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(const int argc, char **argv, char **envp)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, options[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10] = {'\\0'};\n"
               "    strcat(prog, options[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog, *options);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **options)\n"
               "{\n"
               "    char prog[10];\n"
               "    strcpy(prog+3, *options);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
@@ -4916,7 +5193,7 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10];\n"
               "    if (strlen(argv[0]) < 10)\n"
               "        strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
@@ -4924,7 +5201,7 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10] = {'\\0'};\n"
               "    if (10 > strlen(argv[0]))\n"
               "        strcat(prog, argv[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
@@ -4932,7 +5209,7 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10];\n"
               "    argv[0][0] = '\\0';\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5835
@@ -4940,18 +5217,18 @@ class TestBufferOverrun : public TestFixture {
               "    char prog[10];\n"
               "    strcpy(prog, argv[0]);\n"
               "    strcpy(prog, argv[0]);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer overrun possible for long command line arguments.\n"
                            "[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout_str());
 
         // #7964
         check("int main(int argc, char *argv[]) {\n"
               "  char *strcpy();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int main(int argc, char *argv[]) {\n"
               "  char *strcat();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4959,33 +5236,33 @@ class TestBufferOverrun : public TestFixture {
         check("void f(char *a) {\n"
               "  char *b = new char[strlen(a)];\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = new char[strlen(a) + 1];\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = new char[strlen(a)];\n"
               "  a[0] = '\\0';\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  b = realloc(b, 10000);\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a) {\n"
@@ -4993,31 +5270,31 @@ class TestBufferOverrun : public TestFixture {
               "  {\n"
               "    strcpy(b, a);\n"
               "  }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a) + 1);\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a, char *c) {\n"
               "  char *b = (char *)realloc(c, strlen(a));\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a, char *c) {\n"
               "  char *b = (char *)realloc(c, strlen(a) + 1);\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  strcpy(b, a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
     }
 
@@ -5031,7 +5308,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    X x;\n"
               "    x.buf[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -5043,14 +5320,15 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    A::X x;\n"
               "    x.buf[10] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (error) Array 'x.buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void getErrorMessages() {
         // Ticket #2292: segmentation fault when using --errorlist
-        const Check& c = getCheck<CheckBufferOverrun>();
-        c.getErrorMessages(this, nullptr);
+        CheckBufferOverrun check;
+        const Check& c = getCheck(check);
+        c.getErrorMessages(*this, settingsDefault);
         // we are not interested in the output - just consume it
         ignore_errout();
     }
@@ -5061,68 +5339,68 @@ class TestBufferOverrun : public TestFixture {
         check("void f(const char s[]) {\n"
               "    if (s[i] == 'x' && i < y) {\n"
               "    }"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // No message because i is unknown and thus gets no varid. Avoid an internalError here.
 
         check("void f(const char s[], int i) {\n"
               "    if (s[i] == 'x' && i < y) {\n"
               "    }"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const char s[]) {\n"
               "    for (int i = 0; s[i] == 'x' && i < y; ++i) {\n"
               "    }"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if((a[i] < 2) && (i <= 42)) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if((a[i] < 2) && (42 >= i)) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         // extracttests.start: int elen;
         check("void f(char* e, int y) {\n"
               "    if (e[y] == '/' && elen > y + 1 && e[y + 1] == '?') {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int foo(int); int func(int);
         check("void f(const int a[], unsigned i) {\n"
               "    if(a[i] < func(i) && i <= 42) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if (i <= 42 && a[i] < func(i)) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if (foo(a[i] + 3) < func(i) && i <= 42) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Array index 'i' is used before limits check. [arrayIndexThenCheck]\n", errout_str());
 
         check("void f(int i) {\n" // sizeof
               "  sizeof(a)/sizeof(a[i]) && i < 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: extern int buf[];
         check("void f(int i) {\n" // ?:
               "  if ((i < 10 ? buf[i] : 1) && (i < 5 ? buf[i] : 5)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5145,19 +5423,19 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char c[6];\n"
               "    strncpy(c,\"hello!\",6);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
 
         check("void f() {\n"
               "    char c[6];\n"
               "    memcpy(c,\"hello!\",6);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to memcpy().\n", "", errout_str());
 
         check("void f() {\n"
               "    char c[6];\n"
               "    memmove(c,\"hello!\",6);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to memmove().\n", "", errout_str());
     }
 
@@ -5167,7 +5445,7 @@ class TestBufferOverrun : public TestFixture {
               "   int *a;\n"
               "   a = new int[-1];\n"
               "   delete [] a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", errout_str());
 
         check("void f()\n"
@@ -5175,7 +5453,7 @@ class TestBufferOverrun : public TestFixture {
               "   int *a;\n"
               "   a = (int *)malloc( -10 );\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("void f()\n"
@@ -5183,14 +5461,14 @@ class TestBufferOverrun : public TestFixture {
               "   int *a;\n"
               "   a = (int *)malloc( -10);\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("void f()\n"
               "{\n"
               "   int *a;\n"
               "   a = (int *)alloca( -10 );\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("int* f(int n) {\n" // #11145
@@ -5207,14 +5485,14 @@ class TestBufferOverrun : public TestFixture {
         check("void f(int sz) {\n" // #1760 - VLA
               "   int a[sz];\n"
               "}\n"
-              "void x() { f(-100); }");
+              "void x() { f(-100); }\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (error) Declaration of array 'a' with negative size is undefined behaviour [negativeArraySize]\n", errout_str());
 
         // don't warn for constant sizes -> this is a compiler error so this is used for static assertions for instance
         check("int x, y;\n"
               "int a[-1];\n"
               "int b[x?1:-1];\n"
-              "int c[x?y:-1];");
+              "int c[x?y:-1];\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5222,30 +5500,30 @@ class TestBufferOverrun : public TestFixture {
         check("void f() {\n"
               "    char arr[10];\n"
               "    char *p = arr + 20;\n"
-              "}");
+              "}\n", settings0_p);
         ASSERT_EQUALS("[test.cpp:3:19]: (portability) Undefined behaviour, pointer arithmetic 'arr+20' is out of bounds. [pointerOutOfBounds]\n", errout_str());
 
         check("char(*g())[1];\n" // #7950
               "void f() {\n"
               "    int a[2];\n"
               "    int* b = a + sizeof(*g());\n"
-              "}\n");
+              "}\n", settings0_p);
         ASSERT_EQUALS("", errout_str());
     }
 
-#define ctu(code) ctu_(code, __FILE__, __LINE__)
+#define ctu(...) ctu_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    void ctu_(const char (&code)[size], const char* file, int line) {
+    void ctu_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings0, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
+        const CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check code..
-        std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckBufferOverrun>();
-        fileInfo.push_back(c.getFileInfo(tokenizer, settings0));
+        std::list<const Check::FileInfo*> fileInfo;
+        CheckBufferOverrun check;
+        Check& c = getCheck(check);
+        fileInfo.push_back(c.getFileInfo(tokenizer, settings0, ""));
         c.analyseWholeProgram(*ctu, fileInfo, settings0, *this); // TODO: check result
         while (!fileInfo.empty()) {
             delete fileInfo.back();
@@ -5262,7 +5540,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  char *s = malloc(4);\n"
             "  dostuff(s);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:11] -> [test.cpp:7:10] -> [test.cpp:2:3]: (error) Array index out of bounds; buffer 'p' is accessed at offset -3. [ctuArrayIndex]\n", errout_str());
 
         ctu("void dostuff(char *p) {\n"
@@ -5272,7 +5550,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  char *s = malloc(4);\n"
             "  dostuff(s);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:11] -> [test.cpp:7:10] -> [test.cpp:2:3]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 4. [ctuArrayIndex]\n", errout_str());
 
         ctu("void f(int* p) {\n" // #10415
@@ -5286,6 +5564,15 @@ class TestBufferOverrun : public TestFixture {
             "    f(a);\n"
             "}\n");
         ASSERT_EQUALS("[test.cpp:7:12] -> [test.cpp:9:6] -> [test.cpp:3:12]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 20. [ctuArrayIndex]\n", errout_str());
+
+        ctu("void bar(int *p) { p[4] = 42; }\n" // #13403
+            "void f() {\n"
+            "    int *p = (int*)malloc(4 * sizeof(int));\n"
+            "    if (!p) return;\n"
+            "    bar(p);\n"
+            "    free(p);\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:4:9] -> [test.cpp:5:8] -> [test.cpp:1:20]: (error) Array index out of bounds; 'p' buffer size is 16 and it is accessed at offset 16. [ctuArrayIndex]\n", errout_str());
     }
 
     void ctu_array() {
@@ -5295,7 +5582,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  char str[4];\n"
             "  dostuff(str);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:10] -> [test.cpp:2:5]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 10. [ctuArrayIndex]\n", errout_str());
 
         ctu("static void memclr( char *data )\n"
@@ -5307,7 +5594,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( str );\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:9:11] -> [test.cpp:3:5]: (error) Array index out of bounds; 'data' buffer size is 5 and it is accessed at offset 10. [ctuArrayIndex]\n", errout_str());
 
         ctu("static void memclr( int i, char *data )\n"
@@ -5319,7 +5606,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( 0, str );\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:9:11] -> [test.cpp:3:5]: (error) Array index out of bounds; 'data' buffer size is 5 and it is accessed at offset 10. [ctuArrayIndex]\n", errout_str());
 
         ctu("static void memclr( int i, char *data )\n"
@@ -5331,7 +5618,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( 10, str );\n"
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:3]: (possible error) Array index out of bounds.\n",
                            "", errout_str());
 
@@ -5346,7 +5633,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    char str[5];\n"
             "    memclr( str, 5 );\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2097
@@ -5360,7 +5647,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    int p[3];\n"
             "    foo(p+1);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9112
@@ -5373,7 +5660,7 @@ class TestBufferOverrun : public TestFixture {
             "{\n"
             "    u8 macstrbuf[17] = { 0 };\n"
             "    get_mac_address(macstrbuf);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9788
@@ -5430,7 +5717,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  int x = 4;\n"
             "  dostuff(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:10] -> [test.cpp:2:5]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 40. [ctuArrayIndex]\n", errout_str());
     }
 
@@ -5439,7 +5726,7 @@ class TestBufferOverrun : public TestFixture {
             "int main() {\n"
             "  int x[3];\n"
             "  dostuff(x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:1:28]: (error) Pointer arithmetic overflow; 'p' buffer size is 12 [ctuPointerArith]\n", errout_str());
 
         ctu("void f(const char *p) {\n" // #11361
@@ -5450,13 +5737,26 @@ class TestBufferOverrun : public TestFixture {
             "    f(s);\n"
             "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        setMultiline();
+        ctu("void g(char* p) {\n"
+            "    memset(p + 10, 0, 10);\n"
+            "}\n"
+            "void f() {\n"
+            "    char a[10] = {};\n"
+            "    g(a);\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:12]: error: Pointer arithmetic overflow; 'p' buffer size is 10 [ctuPointerArith]\n"
+                      "[test.cpp:6:6]: note: Calling function g, 1st argument is accessed out of bounds\n"
+                      "[test.cpp:2:12]: note: Using argument p\n",
+                      errout_str());
     }
 
     void objectIndex() {
         check("int f() {\n"
               "    int i;\n"
               "    return (&i)[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:3:16]: (error) The address of variable 'i' is accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5464,7 +5764,7 @@ class TestBufferOverrun : public TestFixture {
         check("int f(int j) {\n"
               "    int i;\n"
               "    return (&i)[j];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13] -> [test.cpp:3:16]: (warning) The address of variable 'i' might be accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5472,34 +5772,34 @@ class TestBufferOverrun : public TestFixture {
         check("int f() {\n"
               "    int i;\n"
               "    return (&i)[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int * i) {\n"
               "    return i[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> i) {\n"
               "    return i[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> i) {\n"
               "    return i.data()[1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::vector<int>& i) {\n"
               "    return &(i[1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; int j; };\n"
               "int f() {\n"
               "    A x;\n"
               "    return (&x.i)[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; int j; };\n"
@@ -5507,7 +5807,7 @@ class TestBufferOverrun : public TestFixture {
               "    A x;\n"
               "    int * i = &x.i;\n"
               "    return i[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5515,7 +5815,7 @@ class TestBufferOverrun : public TestFixture {
               "  std::map<int, int*> m;\n"
               "  m[0] = &x;\n"
               "  m[1] = &x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -5523,7 +5823,7 @@ class TestBufferOverrun : public TestFixture {
               "  std::map<int, int*> m;\n"
               "  m[0] = &x;\n"
               "  return m[0][1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:10] -> [test.cpp:5:14]: (error) The address of variable 'x' is accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5533,7 +5833,7 @@ class TestBufferOverrun : public TestFixture {
               "  std::map<int, int*> m;\n"
               "  m[0] = &x;\n"
               "  return m[0][1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:10] -> [test.cpp:5:14]: (error) The address of variable 'x' is accessed at non-zero index. [objectIndex]\n",
             errout_str());
@@ -5544,7 +5844,7 @@ class TestBufferOverrun : public TestFixture {
               "  m[0] = &x;\n"
               "  m[1] = y;\n"
               "  return m[1][1];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void print(char** test);\n"
@@ -5614,7 +5914,7 @@ class TestBufferOverrun : public TestFixture {
               "void h() {\n"
               "    const uint8_t u = 4;\n"
               "    f(&u, N);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("uint32_t f(uint32_t u) {\n" // #10154
@@ -5674,7 +5974,29 @@ class TestBufferOverrun : public TestFixture {
               "    (void)y[1];\n"
               "    (void)y[2];\n"
               "}\n");
-        TODO_ASSERT_EQUALS("error", "", errout_str());
+        ASSERT_EQUALS("[test.cpp:7:20] -> [test.cpp:9:12]: (error) The address of variable 's.a' is accessed at non-zero index. [objectIndex]\n"
+                      "[test.cpp:7:20] -> [test.cpp:10:12]: (error) The address of variable 's.a' is accessed at non-zero index. [objectIndex]\n",
+                      errout_str());
+
+        check("const int N = 12;\n" // #14887
+              "struct S {\n"
+              "    void f() const;\n"
+              "    int a[N];\n"
+              "};\n"
+              "struct T {\n"
+              "    void f() const;\n"
+              "    S s;\n"
+              "};\n"
+              "int g(const int* p) { return p[5]; }\n"
+              "void S::f() const {\n"
+              "    const int* q = a;\n"
+              "    g(q);\n"
+              "}\n"
+              "void T::f() const {\n"
+              "    const int* q = s.a;\n"
+              "    g(q);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkPipeParameterSize() { // #3521
@@ -5686,7 +6008,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe(pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: pipefd [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(){\n"
@@ -5694,7 +6016,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe(pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(){\n"
@@ -5702,7 +6024,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe((int*)pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: (int*)pipefd [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(){\n"
@@ -5710,7 +6032,7 @@ class TestBufferOverrun : public TestFixture {
               "if (pipe((int*)pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
-              "}", dinit(CheckOptions, $.s = &settings));
+              "}\n", settings);
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
index 624efcff539..0c9c8dd4b5b 100644
--- a/test/testcharvar.cpp
+++ b/test/testcharvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -47,7 +47,7 @@ class TestCharVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
-        CheckOther checkOther(&tokenizer, &settings, this);
+        CheckOtherImpl checkOther(&tokenizer, settings, *this);
         checkOther.checkCharVariable();
     }
 
@@ -57,7 +57,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    unsigned char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
@@ -65,7 +65,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (portability) 'char' type used as array index. [unknownSignCharArrayIndex]\n", errout_str());
 
         check("int buf[256];\n"
@@ -73,7 +73,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    char ch = 0;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
@@ -81,7 +81,7 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    signed char ch = 0;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
@@ -89,67 +89,67 @@ class TestCharVar : public TestFixture {
               "{\n"
               "    char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (portability) 'char' type used as array index. [unknownSignCharArrayIndex]\n", errout_str());
 
         check("int buf[256];\n"
               "void foo(signed char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
               "void foo(char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    char ch = 0x80;"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (portability) 'char' type used as array index. [unknownSignCharArrayIndex]\n", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    char ch = 0;"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    buf['A'] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf, char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int flags[256];\n"
               "void foo(const char* str)\n"
               "{\n"
               "    flags[*str] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int flags[256];\n"
               "void foo(const char* str)\n"
               "{\n"
               "    flags[(unsigned char)*str] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const char str[])\n"
               "{\n"
               "    map[str] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -159,7 +159,7 @@ class TestCharVar : public TestFixture {
               "void bar(int i) {\n"
               "    const char *s = \"abcde\";\n"
               "    foo(s[i]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -167,32 +167,32 @@ class TestCharVar : public TestFixture {
         check("void foo(int *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = a | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (warning) When using 'char' variables in bit operations, sign extension can generate unexpected results. [charBitOp]\n", errout_str());
 
         check("void foo(int *result) {\n"
               "    unsigned char ch = -1;\n"
               "    *result = a | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = a | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 0x03 & ..
         check("void foo(int *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = 0x03 | ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) When using 'char' variables in bit operations, sign extension can generate unexpected results. [charBitOp]\n", errout_str());
 
         check("void foo(int *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = 0x03 & ch;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testcheck.cpp b/test/testcheck.cpp
index 8ea4cef38d8..254519da2eb 100644
--- a/test/testcheck.cpp
+++ b/test/testcheck.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -17,6 +17,7 @@
  */
 
 #include "check.h"
+#include "checks.h"
 #include "fixture.h"
 
 #include <list>
@@ -28,23 +29,12 @@ class TestCheck : public TestFixture {
 
 private:
     void run() override {
-        TEST_CASE(instancesSorted);
         TEST_CASE(classInfoFormat);
     }
 
-    void instancesSorted() const {
-        for (auto i = Check::instances().cbegin(); i != Check::instances().cend(); ++i) {
-            auto j = i;
-            ++j;
-            if (j != Check::instances().cend()) {
-                ASSERT_EQUALS(true, (*i)->name() < (*j)->name());
-            }
-        }
-    }
-
     void classInfoFormat() const {
-        for (auto i = Check::instances().cbegin(); i != Check::instances().cend(); ++i) {
-            const std::string info = (*i)->classInfo();
+        for (const Check * const c : CheckInstances::get()) {
+            const std::string info = c->classInfo();
             if (!info.empty()) {
                 ASSERT('\n' != info[0]);         // No \n in the beginning
                 ASSERT('\n' == info.back());     // \n at end
diff --git a/test/testcheckersreport.cpp b/test/testcheckersreport.cpp
new file mode 100644
index 00000000000..39a6f2a9997
--- /dev/null
+++ b/test/testcheckersreport.cpp
@@ -0,0 +1,56 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+
+#include "addoninfo.h"
+#include "checkersreport.h"
+#include "fixture.h"
+#include "settings.h"
+
+class TestCheckersReport : public TestFixture {
+public:
+    TestCheckersReport() : TestFixture("TestCheckersReport") {}
+
+private:
+    void run() final {
+        // AddonInfo::checkers
+        TEST_CASE(addonInfoCheckers);
+    }
+
+    void addonInfoCheckers() const {
+        AddonInfo a;
+        a.name = "test";
+        a.checkers["abcdefghijklmnopqrstuvwxyz::abcdefghijklmnopqrstuvwxyz"] = "123";
+        Settings s;
+        s.addonInfos.emplace_back(a);
+        const std::set<std::string> activeCheckers;
+        CheckersReport r(s, activeCheckers);
+        const std::string report = r.getReport("");
+        const auto pos = report.rfind("\n\n");
+        ASSERT(pos != std::string::npos);
+
+        const char expected[] =
+            "test checkers\n"
+            "-------------\n"
+            "No   abcdefghijklmnopqrstuvwxyz::abcdefghijklmnopqrstuvwxyz    require:123\n";
+
+        ASSERT_EQUALS(expected, report.substr(pos+2));
+    }
+};
+
+REGISTER_TEST(TestCheckersReport)
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
index a3f3d54a38c..6a39b563982 100644
--- a/test/testclangimport.cpp
+++ b/test/testclangimport.cpp
@@ -1,5 +1,5 @@
 // Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2024 Cppcheck team.
+// Copyright (C) 2007-2026 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
@@ -15,12 +15,15 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "clangimport.h"
+#include "fixture.h"
+#include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
+#include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "fixture.h"
+#include "tokenlist.h"
 
 #include <cstdint>
 #include <list>
@@ -1277,7 +1280,7 @@ class TestClangImport : public TestFixture {
         ASSERT(!!tok);
         tok = tok->next();
         ASSERT(tok->hasKnownIntValue());
-        ASSERT_EQUALS(44, tok->getKnownIntValue());
+        ASSERT_EQUALS(MathLib::bigint(44), tok->getKnownIntValue());
     }
 
     void valueFlow2() {
@@ -1325,7 +1328,7 @@ class TestClangImport : public TestFixture {
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "\"hello\"");
         ASSERT(!!tok);
         ASSERT(!!tok->valueType());
-        ASSERT_EQUALS("const signed char *", tok->valueType()->str());
+        ASSERT_EQUALS("const char *", tok->valueType()->str());
     }
 
     void stdinLoc() {
diff --git a/test/testclass.cpp b/test/testclass.cpp
index 8eeb7eb7696..451502c2164 100644
--- a/test/testclass.cpp
+++ b/test/testclass.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -35,9 +35,12 @@ class TestClass : public TestFixture {
 
 private:
     const Settings settings0 = settingsBuilder().severity(Severity::style).library("std.cfg").build();
+    const Settings settings0_i = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
     const Settings settings1 = settingsBuilder().severity(Severity::warning).library("std.cfg").build();
     const Settings settings2 = settingsBuilder().severity(Severity::style).library("std.cfg").certainty(Certainty::inconclusive).build();
-    const Settings settings3 = settingsBuilder().severity(Severity::style).library("std.cfg").severity(Severity::warning).build();
+    const Settings settings3 = settingsBuilder().severity(Severity::style).library("std.cfg").severity(Severity::warning).library("posix.cfg").build();
+    const Settings settings3_i = settingsBuilder(settings3).certainty(Certainty::inconclusive).build();
+    const Settings settings4 = settingsBuilder().severity(Severity::warning).severity(Severity::portability).library("std.cfg").library("posix.cfg").build();
 
     void run() override {
         mNewTemplate = true;
@@ -59,6 +62,9 @@ class TestClass : public TestFixture {
         TEST_CASE(copyConstructor4); // base class with private constructor
         TEST_CASE(copyConstructor5); // multiple inheritance
         TEST_CASE(copyConstructor6); // array of pointers
+        TEST_CASE(copyConstructor7); // ticket #14954
+        TEST_CASE(copyConstructor8);
+        TEST_CASE(deletedMemberPointer); // deleted member pointer in destructor
         TEST_CASE(noOperatorEq); // class with memory management should have operator eq
         TEST_CASE(noDestructor); // class with memory management should have destructor
 
@@ -189,6 +195,10 @@ class TestClass : public TestFixture {
         TEST_CASE(const96);
         TEST_CASE(const97);
         TEST_CASE(const98);
+        TEST_CASE(const99);
+        TEST_CASE(const100);
+        TEST_CASE(const101);
+        TEST_CASE(const102);
 
         TEST_CASE(const_handleDefaultParameters);
         TEST_CASE(const_passThisToMemberOfOtherClass);
@@ -263,7 +273,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkCopyCtorAndEqOperator)();
     }
 
@@ -272,25 +282,25 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A(const A& other) { }\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
                                    "    A(const A& other) { }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -298,7 +308,7 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A(const A& other) { }\n"
                                    "    int x;\n"
-                                   "};");
+                                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' has 'copy constructor' but lack of 'operator='.\n", "", errout_str());
         // TODO the error message should be clarified. It should say something like 'copy constructor is empty and will not assign i and therefore the behaviour is different to the default assignment operator'
 
@@ -306,7 +316,7 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
                                    "    int x;\n"
-                                   "};");
+                                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' has 'operator=' but lack of 'copy constructor'.\n", "", errout_str());
         // TODO the error message should be clarified. It should say something like 'assignment operator does not assign i and therefore the behaviour is different to the default copy constructor'
 
@@ -314,7 +324,7 @@ class TestClass : public TestFixture {
                                    "{\n"
                                    "    A& operator=(const int &x) { this->x = x; return *this; }\n"
                                    "    int x;\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A {\n"
@@ -334,7 +344,7 @@ class TestClass : public TestFixture {
                                    "    B(const B & b) :A(b) { }\n"
                                    "private:\n"
                                    "    static int i;\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7987 - Don't show warning when there is a move constructor
@@ -345,14 +355,14 @@ class TestClass : public TestFixture {
                                    "    test = std::move(s.test);\n"
                                    "    return *this;\n"
                                    "  }\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8337 - False positive in copy constructor detection
         checkCopyCtorAndEqOperator("struct StaticListNode {\n"
                                    "  StaticListNode(StaticListNode*& prev) : m_next(0) {}\n"
                                    "  StaticListNode* m_next;\n"
-                                   "};");
+                                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -364,7 +374,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClassImpl checkClass(&tokenizer, settings0, *this);
         (checkClass.checkExplicitConstructors)();
     }
 
@@ -376,7 +386,7 @@ class TestClass : public TestFixture {
                                   "    explicit Class(int i) { }\n"
                                   "    explicit Class(const std::string&) { }\n"
                                   "    Class(int a, int b) { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
@@ -384,7 +394,7 @@ class TestClass : public TestFixture {
                                   "    explicit Class(const Class& other) { }\n"
                                   "    explicit Class(Class&& other) { }\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
@@ -392,37 +402,37 @@ class TestClass : public TestFixture {
                                   "    Class(const Class& other) = delete;\n"
                                   "    Class(Class&& other) = delete;\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(int i) { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Class 'Class' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(const Class& other) { }\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(Class&& other) { }\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6585
         checkExplicitConstructors("class Class {\n"
                                   "    private: Class(const Class&);\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    public: Class(const Class&);\n"
                                   "    virtual int i() = 0;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7465: Error properly reported in templates
@@ -433,7 +443,7 @@ class TestClass : public TestFixture {
                                   "int main() {\n"
                                   "  Test <int> test;\n"
                                   "  return 0;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (style) Struct 'Test < int >' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n", errout_str());
 
         // #7465: No error for copy or move constructors
@@ -446,7 +456,7 @@ class TestClass : public TestFixture {
                                   "int main() {\n"
                                   "  Test <int> test;\n"
                                   "  return 0;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8600
@@ -454,12 +464,12 @@ class TestClass : public TestFixture {
                                   "struct A::B {\n"
                                   "    B() = default;\n"
                                   "    B(const B&) {}\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("struct A{"
-                                  "    A(int, int y=2) {}"
-                                  "};");
+                                  "    A(int, int y=2) {}\n"
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:1:14]: (style) Struct 'A' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n", errout_str());
 
         checkExplicitConstructors("struct Foo {\n" // #10515
@@ -503,6 +513,14 @@ class TestClass : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Class 'Color' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n"
                       "[test.cpp:4:5]: (style) Class 'Color' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n",
                       errout_str());
+
+        checkExplicitConstructors("template <typename T>\n" // #13878
+                                  "struct S {\n"
+                                  "    S(std::nullptr_t) {}\n"
+                                  "    explicit S(T* p) : m(p) {}\n"
+                                  "    T* m{};\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 #define checkDuplInheritedMembers(...) checkDuplInheritedMembers_( __FILE__, __LINE__, __VA_ARGS__)
@@ -513,7 +531,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         (checkClass.checkDuplInheritedMembers)();
     }
 
@@ -523,7 +541,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
@@ -532,7 +550,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:6:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'. [duplInheritedMember]\n", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
@@ -541,7 +559,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : public Base {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:6:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'. [duplInheritedMember]\n", errout_str());
 
         checkDuplInheritedMembers("class Base0 {\n"
@@ -552,7 +570,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base0 {\n"
@@ -564,7 +582,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:9:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'. [duplInheritedMember]\n", errout_str());
 
         checkDuplInheritedMembers("class Base0 {\n"
@@ -577,7 +595,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:10:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'. [duplInheritedMember]\n"
                       "[test.cpp:7:8] -> [test.cpp:10:8]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base1'. [duplInheritedMember]\n", errout_str());
 
@@ -586,7 +604,7 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct Derived : Base {\n"
                                   "   int y;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class A {\n"
@@ -594,20 +612,20 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "struct B {\n"
                                   "   int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown 'Base' class
         checkDuplInheritedMembers("class Derived : public UnknownBase {\n"
                                   "  int x;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
                                   "   int x;\n"
                                   "};\n"
                                   "class Derived : public Base {\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6692
@@ -619,7 +637,7 @@ class TestClass : public TestFixture {
                                   "   struct SWibble : public test1::wibble {\n"
                                   "   int Value;\n"
                                   "   };\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9957
@@ -633,12 +651,12 @@ class TestClass : public TestFixture {
                                   "};\n"
                                   "class Derived2 : public Derived1 {\n"
                                   "    int i;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:10:9]: (warning) The class 'Derived2' defines member variable with name 'i' also defined in its parent class 'Base'. [duplInheritedMember]\n", errout_str());
 
         // don't crash on recursive template
         checkDuplInheritedMembers("template<size_t N>\n"
-                                  "struct BitInt : public BitInt<N+1> { };");
+                                  "struct BitInt : public BitInt<N+1> { };\n");
         ASSERT_EQUALS("", errout_str());
 
         // don't crash on recursive template
@@ -653,7 +671,7 @@ class TestClass : public TestFixture {
                                   "    template <typename T>\n"
                                   "    struct fn_traits<decltype(void(&T::operator())), T>\n"
                                   "        : public fn_traits<void, decltype(&T::operator())> {};\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10594
@@ -720,6 +738,13 @@ class TestClass : public TestFixture {
                                   "    void Two() = delete;\n"
                                   "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkDuplInheritedMembers("struct B { void f(); };\n" // #14583
+                                  "struct D : B {\n"
+                                  "    template <typename>\n"
+                                  "    void f();\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 #define checkCopyConstructor(...) checkCopyConstructor_( __FILE__, __LINE__, __VA_ARGS__)
@@ -730,7 +755,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings3, this);
+        CheckClassImpl checkClass(&tokenizer, settings3, *this);
         checkClass.copyconstructors();
     }
 
@@ -751,7 +776,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   F&operator=(const F&);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory.\n", "", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -764,7 +789,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:7]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory. [copyCtorPointerCopying]\n"
                            "[test.cpp:3] -> [test.cpp:7]: (warning) Copy constructor does not allocate memory for member 'p' although memory has been allocated in other constructors.\n",
                            "[test.cpp:4:7]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory. [copyCtorPointerCopying]\n"
@@ -784,7 +809,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory.\n"
                            "[test.cpp:5] -> [test.cpp:10]: (warning) Copy constructor does not allocate memory for member 'p' although memory has been allocated in other constructors.\n",
                            ""
@@ -814,7 +839,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~kalci();\n"
                              "   kalci& operator=(const kalci&kalci);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F\n"
@@ -839,7 +864,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:14] -> [test.cpp:11]: (warning) Copy constructor does not allocate memory for member 'd' although memory has been allocated in other constructors.\n", "", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -853,7 +878,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -867,7 +892,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:4]: (warning) Copy constructor does not allocate memory for member 'd' although memory has been allocated in other constructors.\n", "", errout_str());
 
         checkCopyConstructor("class F\n"
@@ -882,8 +907,8 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
-        TODO_ASSERT_EQUALS("[test.cpp:8]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).\n", "", errout_str());
+                             "};\n");
+        TODO_ASSERT_EQUALS("[test.cpp:8]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource management.\n", "", errout_str());
 
         checkCopyConstructor("class F\n"
                              "{\n"
@@ -906,7 +931,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F : E\n"
@@ -917,7 +942,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class E { E(E&); };\n" // non-copyable
@@ -929,7 +954,7 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class E {};\n"
@@ -940,8 +965,8 @@ class TestClass : public TestFixture {
                              "   }\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
-        ASSERT_EQUALS("[test.cpp:5:7]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s). [noCopyConstructor]\n", errout_str());
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:5:7]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n", errout_str());
 
         checkCopyConstructor("class F {\n"
                              "   char *p;\n"
@@ -951,7 +976,7 @@ class TestClass : public TestFixture {
                              "   F(F& f);\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F {\n"
@@ -959,8 +984,8 @@ class TestClass : public TestFixture {
                              "   F() : p(malloc(100)) {}\n"
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
-                             "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s). [noCopyConstructor]\n", errout_str());
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n", errout_str());
 
         // #7198
         checkCopyConstructor("struct F {\n"
@@ -968,7 +993,7 @@ class TestClass : public TestFixture {
                              "   F() {\n"
                              "      p = malloc(100);\n"
                              "   }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -985,7 +1010,7 @@ class TestClass : public TestFixture {
                              "     ~Vector();\n"
                              "     Vector& operator=(const Vector&v);\n"
                              "    _Tp* _M_finish;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -996,7 +1021,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f) = delete;\n"
                              "   F&operator=(const F &f);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("struct F {\n"
@@ -1005,7 +1030,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f) = default;\n"
                              "   F&operator=(const F &f);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' has dynamic memory/resource allocation(s). The copy constructor is explicitly defaulted but the default copy constructor does not work well. It is recommended to define or delete the copy constructor. [noCopyConstructor]\n", errout_str());
     }
 
@@ -1028,7 +1053,7 @@ class TestClass : public TestFixture {
                              "    ~Foo() { delete m_ptr; }\n"
                              "private:\n"
                              "    int* m_ptr;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1041,7 +1066,7 @@ class TestClass : public TestFixture {
                              "    ~Foo() { delete m_ptr; }\n"
                              "private:\n"
                              "    int* m_ptr;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class Copyable {};\n"
@@ -1052,7 +1077,7 @@ class TestClass : public TestFixture {
                              "    ~Foo() { delete m_ptr; }\n"
                              "private:\n"
                              "    int* m_ptr;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1064,21 +1089,67 @@ class TestClass : public TestFixture {
                              "    }\n"
                              "    char* a[5];\n"
                              "};\n");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning) Struct 'S' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).\n"
-                           "[test.cpp:4]: (warning) Struct 'S' does not have a operator= which is recommended since it has dynamic memory/resource allocation(s).\n"
-                           "[test.cpp:4]: (warning) Struct 'S' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s).\n",
+        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning) Struct 'S' does not have a copy constructor which is recommended since it has dynamic memory/resource management.\n"
+                           "[test.cpp:4]: (warning) Struct 'S' does not have a operator= which is recommended since it has dynamic memory/resource management.\n"
+                           "[test.cpp:4]: (warning) Struct 'S' does not have a destructor which is recommended since it has dynamic memory/resource management.\n",
                            "",
                            errout_str());
     }
 
+    void copyConstructor7() { // ticket #14954
+        checkCopyConstructor("struct S {\n"
+                             "    explicit S(char *name) { m_fd = mkstemp(name); }\n"
+                             "    ~S() { /* close(m_fd); */ }\n"
+                             "    S &operator =(const S&);\n"
+                             "    int m_fd;\n"
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:2:30]: (warning) Struct 'S' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n", errout_str());
+    }
+
+    void copyConstructor8() {
+        checkCopyConstructor("struct S {\n"
+                             "    S() : m_ptr(new int) {}\n"
+                             "    ~S();\n"
+                             "    std::unique_ptr<int> m_ptr;\n"
+                             "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void deletedMemberPointer() {
+
+        // delete ...
+        checkCopyConstructor("struct P {};\n"
+                             "class C {\n"
+                             "    P *p;\n"
+                             "public:\n"
+                             "    explicit C(P *p) : p(p) {}\n"
+                             "    ~C() { delete p; }\n"
+                             "    void f() {}\n"
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:6:19]: (warning) Class 'C' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n"
+                      "[test.cpp:6:19]: (warning) Class 'C' does not have a operator= which is recommended since it has dynamic memory/resource management. [noOperatorEq]\n", errout_str());
+
+        // free(...)
+        checkCopyConstructor("struct P {};\n"
+                             "class C {\n"
+                             "    P *p;\n"
+                             "public:\n"
+                             "    explicit C(P *p) : p(p) {}\n"
+                             "    ~C() { free(p); }\n"
+                             "    void f() {}\n"
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:6:17]: (warning) Class 'C' does not have a copy constructor which is recommended since it has dynamic memory/resource management. [noCopyConstructor]\n"
+                      "[test.cpp:6:17]: (warning) Class 'C' does not have a operator= which is recommended since it has dynamic memory/resource management. [noOperatorEq]\n", errout_str());
+    }
+
     void noOperatorEq() {
         checkCopyConstructor("struct F {\n"
                              "   char* c;\n"
                              "   F() { c = malloc(100); }\n"
                              "   F(const F &f);\n"
                              "   ~F();\n"
-                             "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a operator= which is recommended since it has dynamic memory/resource allocation(s). [noOperatorEq]\n", errout_str());
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a operator= which is recommended since it has dynamic memory/resource management. [noOperatorEq]\n", errout_str());
 
         // defaulted operator=
         checkCopyConstructor("struct F {\n"
@@ -1087,7 +1158,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f) = default;\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' has dynamic memory/resource allocation(s). The operator= is explicitly defaulted but the default operator= does not work well. It is recommended to define or delete the operator=. [noOperatorEq]\n", errout_str());
 
         // deleted operator=
@@ -1097,7 +1168,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f) = delete;\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // base class deletes operator=
@@ -1106,8 +1177,17 @@ class TestClass : public TestFixture {
                              "   F() { c = malloc(100); }\n"
                              "   F(const F &f);\n"
                              "   ~F();\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkCopyConstructor("struct S {\n"
+                             "    explicit S(char *name) { m_fd = mkstemp(name); }\n"
+                             "    S(const S&);\n"
+                             "    ~S() { /* close(m_fd); */ }\n"
+                             "    int m_fd;\n"
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:2:30]: (warning) Struct 'S' does not have a operator= which is recommended since it has dynamic memory/resource management. [noOperatorEq]\n", errout_str());
+
     }
 
     void noDestructor() {
@@ -1116,15 +1196,15 @@ class TestClass : public TestFixture {
                              "   F() { c = malloc(100); }\n"
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
-                             "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s). [noDestructor]\n", errout_str());
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource management. [noDestructor]\n", errout_str());
 
         checkCopyConstructor("struct F {\n"
                              "   C* c;\n"
                              "   F() { c = new C; }\n"
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("struct F {\n"
@@ -1132,8 +1212,8 @@ class TestClass : public TestFixture {
                              "   F() { i = new int(); }\n"
                              "   F(const F &f);\n"
                              "   F& operator=(const F&);"
-                             "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s). [noDestructor]\n", errout_str());
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource management. [noDestructor]\n", errout_str());
 
         checkCopyConstructor("struct Data { int x; int y; };\n"
                              "struct F {\n"
@@ -1141,8 +1221,8 @@ class TestClass : public TestFixture {
                              "   F() { c = new Data; }\n"
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
-                             "};");
-        ASSERT_EQUALS("[test.cpp:4:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s). [noDestructor]\n", errout_str());
+                             "};\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource management. [noDestructor]\n", errout_str());
 
         // defaulted destructor
         checkCopyConstructor("struct F {\n"
@@ -1151,7 +1231,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f);\n"
                              "   ~F() = default;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Struct 'F' has dynamic memory/resource allocation(s). The destructor is explicitly defaulted but the default destructor does not work well. It is recommended to define the destructor. [noDestructor]\n", errout_str());
 
         // deleted destructor
@@ -1161,7 +1241,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F &operator=(const F &f);\n"
                              "   ~F() = delete;\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1174,7 +1254,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClassImpl checkClass(&tokenizer, settings0, *this);
         checkClass.operatorEqRetRefThis();
     }
 
@@ -1184,7 +1264,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1192,7 +1272,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return a; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1201,7 +1281,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1210,7 +1290,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1219,7 +1299,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return a; }");
+            "A & A::operator=(const A &a) { return a; }\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1228,7 +1308,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return a; }");
+            "A & A::operator=(const A &a) { return a; }\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1240,7 +1320,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1252,7 +1332,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return b; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:7:13]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1265,7 +1345,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1278,7 +1358,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return b; }");
+            "A::B & A::B::operator=(const A::B &b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:10:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1288,7 +1368,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  B & operator=(const B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1299,7 +1379,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  B & operator=(const B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1309,7 +1389,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  A::B & operator=(const A::B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1320,7 +1400,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::B & operator=(const A::B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1330,7 +1410,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  B & operator=(const B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1341,7 +1421,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  B & operator=(const B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1351,7 +1431,7 @@ class TestClass : public TestFixture {
             "class A::B\n"
             "{\n"
             "  A::B & operator=(const A::B & b) { return b; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1362,7 +1442,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::B & operator=(const A::B &);\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B & b) { return b; }");
+            "A::B & A::B::operator=(const A::B & b) { return b; }\n");
         ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis( // #11380
@@ -1382,7 +1462,7 @@ class TestClass : public TestFixture {
             "class szp\n"
             "{\n"
             "  szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1390,7 +1470,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other);\n"
             "};\n"
-            "szp &szp::operator =(int *other) {}");
+            "szp &szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:5:11]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1400,7 +1480,7 @@ class TestClass : public TestFixture {
             "class NS::szp\n"
             "{\n"
             "  szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1411,7 +1491,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other);\n"
             "};\n"
-            "NS::szp &NS::szp::operator =(int *other) {}");
+            "NS::szp &NS::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:19]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1421,7 +1501,7 @@ class TestClass : public TestFixture {
             "class NS::szp\n"
             "{\n"
             "  NS::szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1432,7 +1512,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  NS::szp &operator =(int *other);\n"
             "};\n"
-            "NS::szp &NS::szp::operator =(int *other) {}");
+            "NS::szp &NS::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:19]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1442,7 +1522,7 @@ class TestClass : public TestFixture {
             "class A::szp\n"
             "{\n"
             "  szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1453,7 +1533,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other);\n"
             "};\n"
-            "A::szp &A::szp::operator =(int *other) {}");
+            "A::szp &A::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1463,7 +1543,7 @@ class TestClass : public TestFixture {
             "class A::szp\n"
             "{\n"
             "  A::szp &operator =(int *other) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:6:11]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1474,7 +1554,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::szp &operator =(int *other);\n"
             "};\n"
-            "A::szp &A::szp::operator =(int *other) {}");
+            "A::szp &A::szp::operator =(int *other) {}\n");
         ASSERT_EQUALS("[test.cpp:8:17]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
     }
 
@@ -1485,7 +1565,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "  inline A &operator =(int *other) { return (*this); };\n"
             "  inline A &operator =(long *other) { return (*this = 0); };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1495,7 +1575,7 @@ class TestClass : public TestFixture {
             "  A &operator =(long *other);\n"
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
-            "A &A::operator =(long *other) { return (*this = 0); };");
+            "A &A::operator =(long *other) { return (*this = 0); };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1503,7 +1583,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "  inline A &operator =(int *other) { return (*this); };\n"
             "  inline A &operator =(long *other) { return operator = (*(int *)other); };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1513,7 +1593,7 @@ class TestClass : public TestFixture {
             "  A &operator =(long *other);\n"
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
-            "A &A::operator =(long *other) { return operator = (*(int *)other); };");
+            "A &A::operator =(long *other) { return operator = (*(int *)other); };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1523,7 +1603,7 @@ class TestClass : public TestFixture {
             "  A &operator =(long *other);\n"
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
-            "A &A::operator =(long *other) { return this->operator = (*(int *)other); };");
+            "A &A::operator =(long *other) { return this->operator = (*(int *)other); };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis( // #9045
@@ -1535,7 +1615,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1545,7 +1625,7 @@ class TestClass : public TestFixture {
             "P& P::operator = (const P& pc)\n"
             "{\n"
             "  return (P&)(*this += pc);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1555,21 +1635,21 @@ class TestClass : public TestFixture {
             "class A {\n"
             "public:\n"
             "    A & operator=(const A &a) { }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
             "protected:\n"
             "    A & operator=(const A &a) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
             "private:\n"
             "    A & operator=(const A &a) {}\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1579,7 +1659,7 @@ class TestClass : public TestFixture {
             "        rand();\n"
             "        throw std::exception();\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should either return reference to 'this' instance or be declared private and left unimplemented. [operatorEqShouldBeLeftUnimplemented]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1589,7 +1669,7 @@ class TestClass : public TestFixture {
             "        rand();\n"
             "        abort();\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should either return reference to 'this' instance or be declared private and left unimplemented. [operatorEqShouldBeLeftUnimplemented]\n", errout_str());
 
         checkOpertorEqRetRefThis(
@@ -1597,7 +1677,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a);\n"
             "};\n"
-            "A & A :: operator=(const A &a) { }");
+            "A & A :: operator=(const A &a) { }\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
     }
 
@@ -1614,7 +1694,7 @@ class TestClass : public TestFixture {
             "}\n"
             "UString& UString::operator=( const UString& s ) {\n"
             "    return assign( s );\n"
-            "}");
+            "}\n");
     }
 
     void operatorEqRetRefThis7() { // ticket #5782 Endless recursion in CheckClass::checkReturnPtrThis()
@@ -1632,7 +1712,7 @@ class TestClass : public TestFixture {
             "  basic_fbstring& replace() {\n"
             "    return replaceImplDiscr();\n"
             "  }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1645,7 +1725,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.operatorEqToSelf();
     }
 
@@ -1656,7 +1736,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { if (&a != this) { } return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but it is not needed
@@ -1665,7 +1745,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
@@ -1683,7 +1763,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this class needs an assignment test but doesn't have it
@@ -1698,7 +1778,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test has an assignment test but doesn't need it
@@ -1708,7 +1788,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { if (&a != this) { } return *this; }");
+            "A & A::operator=(const A &a) { if (&a != this) { } return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
@@ -1718,7 +1798,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
@@ -1737,7 +1817,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1756,7 +1836,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1775,7 +1855,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1794,7 +1874,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1813,7 +1893,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1832,7 +1912,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1854,7 +1934,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test needs an assignment test and has the inverse test
@@ -1875,7 +1955,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
 
@@ -1892,7 +1972,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(a.s);\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // ticket #1224
@@ -1910,7 +1990,7 @@ class TestClass : public TestFixture {
             "    tree = new CodeTree(b);\n"
             "    delete oldtree;\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -1926,7 +2006,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { if (&b != this) { } return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
@@ -1939,7 +2019,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but has it
@@ -1959,7 +2039,7 @@ class TestClass : public TestFixture {
             "            return *this;\n"
             "        }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but doesn't have it
@@ -1978,7 +2058,7 @@ class TestClass : public TestFixture {
             "            return *this;\n"
             "        }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:8:13]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         // this test has an assignment test but doesn't need it
@@ -1992,7 +2072,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { if (&b != this) { } return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { if (&b != this) { } return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
@@ -2006,7 +2086,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
@@ -2029,7 +2109,7 @@ class TestClass : public TestFixture {
             "        s = strdup(b.s);\n"
             "    }\n"
             "    return *this;\n"
-            " }");
+            " }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but doesn't have it
@@ -2049,7 +2129,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(b.s);\n"
             "    return *this;\n"
-            " }");
+            " }\n");
         ASSERT_EQUALS("[test.cpp:11:14]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
     }
 
@@ -2060,7 +2140,7 @@ class TestClass : public TestFixture {
             "{\n"
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2075,7 +2155,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance so there is no trivial way to test for self assignment but doesn't need it
@@ -2085,7 +2165,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &);\n"
             "};\n"
-            "A & A::operator=(const A &a) { return *this; }");
+            "A & A::operator=(const A &a) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2101,7 +2181,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(a.s);\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2116,7 +2196,7 @@ class TestClass : public TestFixture {
             "    public:\n"
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2135,7 +2215,7 @@ class TestClass : public TestFixture {
             "            return *this;\n"
             "        }\n"
             "    };\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance so there is no trivial way to test for self assignment but doesn't need it
@@ -2149,7 +2229,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &);\n"
             "    };\n"
             "};\n"
-            "A::B & A::B::operator=(const A::B &b) { return *this; }");
+            "A::B & A::B::operator=(const A::B &b) { return *this; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
@@ -2169,7 +2249,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(b.s);\n"
             "    return *this;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2189,7 +2269,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2206,7 +2286,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2223,7 +2303,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2240,7 +2320,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2257,7 +2337,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2274,7 +2354,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2291,7 +2371,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2308,7 +2388,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "        return *this;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2326,7 +2406,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2344,7 +2424,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2362,7 +2442,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2380,7 +2460,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2398,7 +2478,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2416,7 +2496,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2434,7 +2514,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2452,7 +2532,7 @@ class TestClass : public TestFixture {
             "        s = strdup(a.s);\n"
             "    }\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
@@ -2464,7 +2544,7 @@ class TestClass : public TestFixture {
             "    free(s);\n"
             "    s = strdup(a.s);\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2483,7 +2563,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "private:\n"
             "    char * data;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         checkOpertorEqToSelf(
@@ -2500,7 +2580,7 @@ class TestClass : public TestFixture {
             "    data = new char[strlen(a.data) + 1];\n"
             "    strcpy(data, a.data);\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:8:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         checkOpertorEqToSelf(
@@ -2516,7 +2596,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "private:\n"
             "    char * data;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
 
         checkOpertorEqToSelf(
@@ -2533,7 +2613,7 @@ class TestClass : public TestFixture {
             "    data = new char;\n"
             "    *data = *a.data;\n"
             "    return *this;\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("[test.cpp:8:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
     }
 
@@ -2550,7 +2630,7 @@ class TestClass : public TestFixture {
             "    {\n"
             "        return assign(a);\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2569,7 +2649,7 @@ class TestClass : public TestFixture {
             "FMat& FMat::operator=(const FMat& in)\n"
             "{\n"
             "    return copy(in);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2588,13 +2668,12 @@ class TestClass : public TestFixture {
             "Foo& Foo::operator=(Foo& other)\n"
             "{\n"
             "    return Foo::operator=(&other);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     struct CheckVirtualDestructorOptions
     {
-        CheckVirtualDestructorOptions() = default;
         bool inconclusive = false;
     };
 
@@ -2602,14 +2681,14 @@ class TestClass : public TestFixture {
 #define checkVirtualDestructor(...) checkVirtualDestructor_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void checkVirtualDestructor_(const char* file, int line, const char (&code)[size], const CheckVirtualDestructorOptions& options = make_default_obj()) {
-        const Settings s = settingsBuilder(settings0).certainty(Certainty::inconclusive, options.inconclusive).severity(Severity::warning).build();
+        const Settings& s = options.inconclusive ? settings3_i : settings3;
 
         // Tokenize..
         SimpleTokenizer tokenizer(s, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &s, this);
+        CheckClassImpl checkClass(&tokenizer, s, *this);
         checkClass.virtualDestructor();
     }
 
@@ -2618,12 +2697,12 @@ class TestClass : public TestFixture {
 
         checkVirtualDestructor("class Derived : public Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualDestructor("class Derived : Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2631,27 +2710,27 @@ class TestClass : public TestFixture {
         // Base class doesn't have a destructor
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : public Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : public Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : protected Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : protected Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : private Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : private Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualDestructor("class Base { };\n"
-                               "class Derived : Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9104
@@ -2672,7 +2751,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "    Base* p = new Derived();\n"
                                "    delete p;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:7:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("using namespace std;\n"
@@ -2693,7 +2772,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "    Base* p = new Derived();\n"
                                "    delete p;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:8:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2701,21 +2780,21 @@ class TestClass : public TestFixture {
         // Base class has a destructor, but it's not virtual
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : public Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : protected Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : protected Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : private Fred, public Base { public: ~Derived() { (void)11; } };"
+                               "class Derived : private Fred, public Base { public: ~Derived() { (void)11; } };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2723,15 +2802,15 @@ class TestClass : public TestFixture {
         // Derived class doesn't have a destructor => undefined behaviour according to paragraph 3 in [expr.delete]
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { };"
+                               "class Derived : public Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : private Fred, public Base { };"
+                               "class Derived : private Fred, public Base { };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2739,15 +2818,15 @@ class TestClass : public TestFixture {
         // Derived class has empty destructor => undefined behaviour according to paragraph 3 in [expr.delete]
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived() {} };"
+                               "class Derived : public Base { public: ~Derived() {} };\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived(); }; Derived::~Derived() {}"
+                               "class Derived : public Base { public: ~Derived(); }; Derived::~Derived() {}\n"
                                "Base *base = new Derived;\n"
-                               "delete base;");
+                               "delete base;\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2756,7 +2835,7 @@ class TestClass : public TestFixture {
         // points at derived class
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
-                               "class Derived : public Base { public: ~Derived() { (void)11; } };");
+                               "class Derived : public Base { public: ~Derived() { (void)11; } };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2773,7 +2852,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2794,7 +2873,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // class A inherits virtual destructor from struct Base -> no error
@@ -2812,7 +2891,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown Base class -> it could have virtual destructor, so ignore
@@ -2826,7 +2905,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Virtual destructor is inherited -> no error
@@ -2847,7 +2926,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // class A doesn't inherit virtual destructor from class Base -> error
@@ -2866,7 +2945,7 @@ class TestClass : public TestFixture {
                                "{\n"
                                "public:\n"
                                "    ~B() { int a; }\n"
-                               "};");
+                               "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Class 'Base' which is inherited by class 'B' does not have a virtual destructor.\n",
                            "", errout_str());
     }
@@ -2888,7 +2967,7 @@ class TestClass : public TestFixture {
                                " ~B(){int a;}\n"
                                "};\n"
                                "\n"
-                               "AA<double> *p = new B; delete p;");
+                               "AA<double> *p = new B; delete p;\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (error) Class 'AA < double >' which is inherited by class 'B' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
     }
 
@@ -2936,8 +3015,7 @@ class TestClass : public TestFixture {
 #define checkNoMemset(...) checkNoMemset_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void checkNoMemset_(const char* file, int line, const char (&code)[size]) {
-        const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).library("std.cfg").library("posix.cfg").build();
-        checkNoMemset_(file, line, code, settings);
+        checkNoMemset_(file, line, code, settings4);
     }
 
     template<size_t size>
@@ -2947,7 +3025,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         checkClass.checkMemset();
     }
 
@@ -2959,7 +3037,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -2970,7 +3048,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -2981,7 +3059,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -2992,7 +3070,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3003,7 +3081,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred {\n"
@@ -3012,7 +3090,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void Fred::f() {\n"
                       "    memset(this, 0, sizeof(*this));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3022,7 +3100,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3033,7 +3111,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3045,7 +3123,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Pebbles pebbles;\n"
                       "    memset(&pebbles, 0, sizeof(pebbles));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3056,7 +3134,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3067,7 +3145,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    static Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
@@ -3082,7 +3160,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Pebbles pebbles;\n"
                       "    memset(&pebbles, 0, sizeof(pebbles));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:12:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         // Fred not defined in scope
@@ -3096,7 +3174,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Fred with namespace qualifier
@@ -3110,7 +3188,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    n1::Fred fred;\n"
                       "    memset(&fred, 0, sizeof(n1::Fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         // Fred with namespace qualifier
@@ -3124,7 +3202,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    n1::Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class A {\n"
@@ -3135,7 +3213,7 @@ class TestClass : public TestFixture {
                       "  const int N = 10;\n"
                       "  A** arr = new A*[N];\n"
                       "  memset(arr, 0, N * sizeof(A*));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class A {\n" // #5116 - nested class data is mixed in the SymbolDatabase
@@ -3144,7 +3222,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void f(A::B *b) {\n"
                       "  memset(b,0,4);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4461 Warn about memset/memcpy on class with references as members
@@ -3154,7 +3232,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "  A a;\n"
                       "  memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (error) Using 'memset' on class that contains a reference. [memsetClassReference]\n", errout_str());
         checkNoMemset("class A {\n"
                       "  const B&b;\n"
@@ -3162,7 +3240,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "  A a;\n"
                       "  memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (error) Using 'memset' on class that contains a reference. [memsetClassReference]\n", errout_str());
 
         // #7456
@@ -3176,7 +3254,7 @@ class TestClass : public TestFixture {
                       "void func() {\n"
                       "  B b[4];\n"
                       "  memset(b, 0, sizeof(b));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8619
@@ -3231,11 +3309,11 @@ class TestClass : public TestFixture {
                       "      } vid;\n"
                       "    };\n"
                       "  } hdr;\n"
-                      "};"
+                      "};\n"
                       "void parseHeader() {\n"
                       "  ASFStreamHeader strhdr;\n"
                       "  memset(&strhdr, 0, sizeof(strhdr));\n"
-                      "}");
+                      "}\n");
     }
 
     void memsetOnStruct() {
@@ -3246,7 +3324,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3256,7 +3334,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    struct A a;\n"
                       "    memset(&a, 0, sizeof(struct A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3266,14 +3344,14 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    struct A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("void f()\n"
                       "{\n"
                       "    struct sockaddr_in6 fail;\n"
                       "    memset(&fail, 0, sizeof(struct sockaddr_in6));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3286,7 +3364,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       " struct A fail;\n"
                       " memset(&fail, 0, sizeof(struct A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:10:2]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct Fred\n"
@@ -3297,7 +3375,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct Stringy {\n"
@@ -3309,7 +3387,7 @@ class TestClass : public TestFixture {
                       "int main() {\n"
                       "    Foo foo;\n"
                       "    memset(&foo, 0, sizeof(Foo));\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
     }
@@ -3322,7 +3400,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on class that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3332,7 +3410,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3342,7 +3420,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(struct A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3352,7 +3430,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class A\n"
@@ -3362,7 +3440,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on class that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3372,7 +3450,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3382,7 +3460,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(a));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
@@ -3392,7 +3470,7 @@ class TestClass : public TestFixture {
                       "{\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3402,7 +3480,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(a, 0, 100);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str()); // #4460
 
         checkNoMemset("struct C {\n"
@@ -3420,7 +3498,7 @@ class TestClass : public TestFixture {
                       "    memset(*c4, 0, 10);\n"
                       "    memset(c2, 0, 10);\n"
                       "    memset(c3, 0, 10);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n"
                       "[test.cpp:11:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n"
                       "[test.cpp:12:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n"
@@ -3436,7 +3514,7 @@ class TestClass : public TestFixture {
                       "  multilevel_data *d = (multilevel_data *) malloc(sizeof(multilevel_data));\n"
                       "  memset(d, 0, sizeof(multilevel_data));\n"
                       "  return (void*) d;\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:8:3]: (portability) Using memset() on struct which contains a floating point number. [memsetClassFloat]\n", errout_str());
     }
 
@@ -3454,7 +3532,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str()); // std::array is POD (#5481)
 
         checkNoMemset("struct st {\n"
@@ -3465,7 +3543,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "  st s;\n"
                       "  std::memset(&s, 0, sizeof(st));\n"
-                      "}", settings);
+                      "}\n", settings);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3476,7 +3554,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) Using memset() on struct which contains a floating point number. [memsetClassFloat]\n", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3485,7 +3563,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (portability) Using memset() on struct which contains a floating point number. [memsetClassFloat]\n", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3494,7 +3572,7 @@ class TestClass : public TestFixture {
                       "void f(const A& b) {\n"
                       "    A a;\n"
                       "    memcpy(&a, &b, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A {\n"
@@ -3503,7 +3581,7 @@ class TestClass : public TestFixture {
                       "void f() {\n"
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3511,7 +3589,7 @@ class TestClass : public TestFixture {
         checkNoMemset("void clang_tokenize(CXToken **Tokens) {\n"
                       "  *Tokens = (CXToken *)malloc(sizeof(CXToken) * CXTokens.size());\n"
                       "  memmove(*Tokens, CXTokens.data(), sizeof(CXToken) * CXTokens.size());\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3519,49 +3597,49 @@ class TestClass : public TestFixture {
         checkNoMemset("class C { C() {} };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:1:1]: (warning) Memory for class instance allocated with malloc(), but class provides constructors. [mallocOnClassWarning]\n", errout_str());
 
         checkNoMemset("class C { C(int z, Foo bar) { bar(); } };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:1:1]: (warning) Memory for class instance allocated with malloc(), but class provides constructors. [mallocOnClassWarning]\n", errout_str());
 
         checkNoMemset("struct C { C() {} };\n"
                       "void foo(C*& p) {\n"
                       "    p = realloc(p, sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:1:1]: (warning) Memory for class instance allocated with realloc(), but class provides constructors. [mallocOnClassWarning]\n", errout_str());
 
         checkNoMemset("struct C { virtual void bar(); };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:1:1]: (error) Memory for class instance allocated with malloc(), but class contains a virtual function. [mallocOnClassError]\n", errout_str());
 
         checkNoMemset("struct C { std::string s; };\n"
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:1:1]: (error) Memory for class instance allocated with malloc(), but class contains a 'std::string'. [mallocOnClassError]\n", errout_str());
 
         checkNoMemset("class C { };\n" // C-Style class/struct
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct C { C() {} };\n"
                       "void foo(C*& p) {\n"
                       "    p = new C();\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class C { C() {} };\n"
                       "void foo(D*& p) {\n" // Unknown type
                       "    p = malloc(sizeof(C));\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class AutoCloseFD {\n"
@@ -3572,7 +3650,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void f() {\n"
                       "    AutoCloseFD fd = open(\"abc\", O_RDONLY | O_CLOEXEC);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct C {\n" // #12313
@@ -3581,7 +3659,7 @@ class TestClass : public TestFixture {
                       "};\n"
                       "void f() {\n"
                       "    C c = strdup(\"abc\");\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3593,45 +3671,47 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.thisSubtraction();
     }
 
     void this_subtraction() {
-        checkThisSubtraction("; this-x ;");
+        checkThisSubtraction("; this-x ;\n");
         ASSERT_EQUALS("[test.cpp:1:3]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n", errout_str());
 
-        checkThisSubtraction("; *this = *this-x ;");
+        checkThisSubtraction("; *this = *this-x ;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisSubtraction("; *this = *this-x ;\n"
-                             "this-x ;");
+                             "this-x ;\n");
         ASSERT_EQUALS("[test.cpp:2:1]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n", errout_str());
 
         checkThisSubtraction("; *this = *this-x ;\n"
                              "this-x ;\n"
-                             "this-x ;");
+                             "this-x ;\n");
         ASSERT_EQUALS("[test.cpp:2:1]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n"
                       "[test.cpp:3:1]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n", errout_str());
     }
 
     struct CheckConstOptions
     {
-        CheckConstOptions() = default;
-        const Settings *s = nullptr;
         bool inconclusive = true;
     };
 
 #define checkConst(...) checkConst_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void checkConst_(const char* file, int line, const char (&code)[size], const CheckConstOptions& options = make_default_obj()) {
-        const Settings settings = settingsBuilder(options.s ? *options.s : settings0).certainty(Certainty::inconclusive, options.inconclusive).build();
+        const Settings& settings = options.inconclusive ? settings0_i : settings0;
 
-        // Tokenize..
+        checkConst_(file, line, code, settings);
+    }
+
+    template<size_t size>
+    void checkConst_(const char* file, int line, const char (&code)[size], const Settings& settings) {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkConst)();
     }
 
@@ -3639,33 +3719,33 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    int getA() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'Fred::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    const std::string foo() { return \"\"; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:23]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    const std::string & foo() { return \"\"; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:25]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:25]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         // constructors can't be const..
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "public:\n"
                    "    Fred() { }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment through |=..
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    int setA() { a |= true; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // functions with a call to a member function can only be const, if that member function is const, too.. (#1305)
@@ -3674,7 +3754,7 @@ class TestClass : public TestFixture {
                    "    int x;\n"
                    "    void a() { x = 1; }\n"
                    "    void b() { a(); }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
@@ -3682,15 +3762,15 @@ class TestClass : public TestFixture {
                    "    int x;\n"
                    "    int a() const { return x; }\n"
                    "    void b() { a(); }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style, inconclusive) Technically the member function 'Fred::b' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "public:\n"
                    "    int x;\n"
                    "    void b() { a(); }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:4:10]: (performance, inconclusive) Technically the member function 'Fred::b' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'Fred::b' can be static. [functionStatic]\n", errout_str());
 
         // static functions can't be const..
         checkConst("class foo\n"
@@ -3698,13 +3778,13 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    static unsigned get()\n"
                    "    { return 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    const std::string foo() const throw() { return \"\"; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:23]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
     }
 
     void const2() {
@@ -3713,49 +3793,49 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo() { s = \"\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument reference can be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a) { a = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a) { s = a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument references can be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { a = s; b = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { s = a; s = b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { s = a; b = a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b) { a = s; s = b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3764,42 +3844,42 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int s;\n"
                    "    void foo(int * a) { *a = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    int s;\n"
                    "    void foo(int * a) { s = *a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointers can be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { *a = s; *b = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { s = *a; s = *b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { s = *a; *b = s; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b) { *a = s; s = b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3808,15 +3888,15 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    int getA();\n"
                    "};\n"
-                   "int Fred::getA() { return a; }");
+                   "int Fred::getA() { return a; }\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:11]: (style, inconclusive) Technically the member function 'Fred::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::string s;\n"
                    "    const std::string & foo();\n"
                    "};\n"
-                   "const std::string & Fred::foo() { return \"\"; }");
-        ASSERT_EQUALS("[test.cpp:3:25] -> [test.cpp:5:27]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "const std::string & Fred::foo() { return \"\"; }\n");
+        ASSERT_EQUALS("[test.cpp:3:25] -> [test.cpp:5:27]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         // functions with a function call to a non-const member can't be const.. (#1305)
         checkConst("class Fred\n"
@@ -3826,7 +3906,7 @@ class TestClass : public TestFixture {
                    "    void a() { x = 1; }\n"
                    "    void b();\n"
                    "};\n"
-                   "void Fred::b() { a(); }");
+                   "void Fred::b() { a(); }\n");
         ASSERT_EQUALS("", errout_str());
 
         // static functions can't be const..
@@ -3835,7 +3915,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    static unsigned get();\n"
                    "};\n"
-                   "static unsigned Fred::get() { return 0; }");
+                   "static unsigned Fred::get() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable can't be const
@@ -3843,7 +3923,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo();\n"
                    "};\n"
-                   "void Fred::foo() { s = \"\"; }");
+                   "void Fred::foo() { s = \"\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument reference can be const
@@ -3851,7 +3931,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a) { a = s; }");
+                   "void Fred::foo(std::string & a) { a = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable can't be const
@@ -3859,7 +3939,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a) { s = a; }");
+                   "void Fred::foo(std::string & a) { s = a; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument references can be const
@@ -3867,7 +3947,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { a = s; b = s; }");
+                   "void Fred::foo(std::string & a, std::string & b) { a = s; b = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
@@ -3875,7 +3955,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { s = a; s = b; }");
+                   "void Fred::foo(std::string & a, std::string & b) { s = a; s = b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3883,7 +3963,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { s = a; b = a; }");
+                   "void Fred::foo(std::string & a, std::string & b) { s = a; b = a; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3891,7 +3971,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
-                   "void Fred::foo(std::string & a, std::string & b) { a = s; s = b; }");
+                   "void Fred::foo(std::string & a, std::string & b) { a = s; s = b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointer can be const
@@ -3899,7 +3979,7 @@ class TestClass : public TestFixture {
                    "    int s;\n"
                    "    void foo(int * a);\n"
                    "};\n"
-                   "void Fred::foo(int * a) { *a = s; }");
+                   "void Fred::foo(int * a) { *a = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
@@ -3907,7 +3987,7 @@ class TestClass : public TestFixture {
                    "    int s;\n"
                    "    void foo(int * a);\n"
                    "};\n"
-                   "void Fred::foo(int * a) { s = *a; }");
+                   "void Fred::foo(int * a) { s = *a; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointers can be const
@@ -3915,7 +3995,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { *a = s; *b = s; }");
+                   "void Fred::foo(std::string * a, std::string * b) { *a = s; *b = s; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // assignment to variable, can't be const
@@ -3923,7 +4003,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { s = *a; s = *b; }");
+                   "void Fred::foo(std::string * a, std::string * b) { s = *a; s = *b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3931,7 +4011,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { s = *a; *b = s; }");
+                   "void Fred::foo(std::string * a, std::string * b) { s = *a; *b = s; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
@@ -3939,7 +4019,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
-                   "void Fred::foo(std::string * a, std::string * b) { *a = s; s = b; }");
+                   "void Fred::foo(std::string * a, std::string * b) { *a = s; s = b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // check functions with same name
@@ -3949,11 +4029,11 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a);\n"
                    "    void foo(const std::string & a);\n"
                    "};\n"
-                   "void Fred::foo() { }"
-                   "void Fred::foo(std::string & a) { a = s; }"
-                   "void Fred::foo(const std::string & a) { s = a; }");
-        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:7:12]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:4:10] -> [test.cpp:7:32]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
+                   "void Fred::foo() { }\n"
+                   "void Fred::foo(std::string & a) { a = s; }\n"
+                   "void Fred::foo(const std::string & a) { s = a; }\n");
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:7:12]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n"
+                      "[test.cpp:4:10] -> [test.cpp:8:12]: (style, inconclusive) Technically the member function 'Fred::foo' can be const. [functionConst]\n", errout_str());
 
         // check functions with different or missing parameter names
         checkConst("class Fred {\n"
@@ -3968,12 +4048,12 @@ class TestClass : public TestFixture {
                    "void Fred::foo2(int c, int d) { }\n"
                    "void Fred::foo3(int a, int b) { }\n"
                    "void Fred::foo4(int a, int b) { }\n"
-                   "void Fred::foo5(int, int) { }");
-        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:9:12]: (performance, inconclusive) Technically the member function 'Fred::foo1' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:4:10] -> [test.cpp:10:12]: (performance, inconclusive) Technically the member function 'Fred::foo2' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:5:10] -> [test.cpp:11:12]: (performance, inconclusive) Technically the member function 'Fred::foo3' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:6:10] -> [test.cpp:12:12]: (performance, inconclusive) Technically the member function 'Fred::foo4' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:7:10] -> [test.cpp:13:12]: (performance, inconclusive) Technically the member function 'Fred::foo5' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "void Fred::foo5(int, int) { }\n");
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:9:12]: (style) The member function 'Fred::foo1' can be static. [functionStatic]\n"
+                      "[test.cpp:4:10] -> [test.cpp:10:12]: (style) The member function 'Fred::foo2' can be static. [functionStatic]\n"
+                      "[test.cpp:5:10] -> [test.cpp:11:12]: (style) The member function 'Fred::foo3' can be static. [functionStatic]\n"
+                      "[test.cpp:6:10] -> [test.cpp:12:12]: (style) The member function 'Fred::foo4' can be static. [functionStatic]\n"
+                      "[test.cpp:7:10] -> [test.cpp:13:12]: (style) The member function 'Fred::foo5' can be static. [functionStatic]\n", errout_str());
 
         // check nested classes
         checkConst("class Fred {\n"
@@ -3981,7 +4061,7 @@ class TestClass : public TestFixture {
                    "        int a;\n"
                    "        int getA() { return a; }\n"
                    "    };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
@@ -3990,7 +4070,7 @@ class TestClass : public TestFixture {
                    "        int getA();\n"
                    "    };\n"
                    "    int A::getA() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:6:12]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
@@ -3999,7 +4079,7 @@ class TestClass : public TestFixture {
                    "        int getA();\n"
                    "    };\n"
                    "};\n"
-                   "int Fred::A::getA() { return a; }");
+                   "int Fred::A::getA() { return a; }\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:7:14]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const. [functionConst]\n", errout_str());
 
         // check deeply nested classes
@@ -4012,7 +4092,7 @@ class TestClass : public TestFixture {
                    "            int getA() { return a; }\n"
                    "        };\n"
                    "    };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n"
                       , errout_str());
@@ -4028,7 +4108,7 @@ class TestClass : public TestFixture {
                    "        int A::getA() { return a; }\n"
                    "    };\n"
                    "    int B::getB() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:11:12]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17] -> [test.cpp:9:16]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n", errout_str());
 
@@ -4043,7 +4123,7 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "    int B::A::getA() { return a; }\n"
                    "    int B::getB() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:11:12]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17] -> [test.cpp:10:15]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n", errout_str());
 
@@ -4058,7 +4138,7 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "};\n"
                    "int Fred::B::A::getA() { return a; }\n"
-                   "int Fred::B::getB() { return b; }");
+                   "int Fred::B::getB() { return b; }\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:12:14]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const. [functionConst]\n"
                       "[test.cpp:7:17] -> [test.cpp:11:17]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const. [functionConst]\n", errout_str());
     }
@@ -4068,7 +4148,7 @@ class TestClass : public TestFixture {
         checkConst("struct Fred {\n"
                    "    int a;\n"
                    "    bool operator<(const Fred &f) { return a < f.a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::operator<' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4083,7 +4163,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        foo << 123;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Foo {\n"
@@ -4095,7 +4175,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        std::cout << foo << 123;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:10]: (style, inconclusive) Technically the member function 'Fred::x' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4104,13 +4184,13 @@ class TestClass : public TestFixture {
                    "    int array[10];\n"
                    "    int const & operator [] (unsigned int index) const { return array[index]; }\n"
                    "    int & operator [] (unsigned int index) { return array[index]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Fred {\n"
                    "    int array[10];\n"
                    "    int const & operator [] (unsigned int index) { return array[index]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style, inconclusive) Technically the member function 'Fred::operator[]' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4120,14 +4200,14 @@ class TestClass : public TestFixture {
                    "    int c;\n"
                    "public:\n"
                    "    operator int*() { return &c; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator const int*() { return &c; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorconstint*' can be const. [functionConst]\n", errout_str());
 
         // #2375
@@ -4135,14 +4215,14 @@ class TestClass : public TestFixture {
                    "    int array[10];\n"
                    "    typedef int* (Fred::*UnspecifiedBoolType);\n"
                    "    operator UnspecifiedBoolType() { };\n"
-                   "};");
+                   "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::operatorint**' can be const.\n", "", errout_str());
 
         checkConst("struct Fred {\n"
                    "    int array[10];\n"
                    "    typedef int* (Fred::*UnspecifiedBoolType);\n"
                    "    operator UnspecifiedBoolType() { array[0] = 0; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4151,21 +4231,21 @@ class TestClass : public TestFixture {
                    "    int c;\n"
                    "public:\n"
                    "    operator int& () {return c}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator const int& () {return c}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorconstint&' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator int () {return c}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorint' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4173,7 +4253,7 @@ class TestClass : public TestFixture {
         checkConst("class A {\n"
                    "    int c;\n"
                    "    void f() { os >> *this; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4187,7 +4267,7 @@ class TestClass : public TestFixture {
                    "        same = (i == a);\n"
                    "        return same;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4196,15 +4276,15 @@ class TestClass : public TestFixture {
         checkConst("class foo {\n"
                    "public:\n"
                    "};\n"
-                   "void bar() {}");
+                   "void bar() {}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred\n"
                    "{\n"
                    "public:\n"
                    "    void foo() { }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:4:10]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct fast_string\n"
                    "{\n"
@@ -4217,7 +4297,7 @@ class TestClass : public TestFixture {
                    "inline void fast_string::set_type(char t)\n"
                    "{\n"
                    "    buff[10] = t;\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4228,7 +4308,7 @@ class TestClass : public TestFixture {
                    "    void set(int i) { a = i; }\n"
                    "    void set(const foo & f) { *this = f; }\n"
                    "};\n"
-                   "void bar() {}");
+                   "void bar() {}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4240,7 +4320,7 @@ class TestClass : public TestFixture {
                    "    std::string strGetString() { return m_strValue; }\n"
                    "private:\n"
                    "    std::string m_strValue;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:17]: (style, inconclusive) Technically the member function 'A::strGetString' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4251,7 +4331,7 @@ class TestClass : public TestFixture {
                    "    void SetExitCode(wxThread::ExitCode exitcode) { m_exitcode = exitcode; }\n"
                    "private:\n"
                    "    wxThread::ExitCode m_exitcode;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4262,7 +4342,7 @@ class TestClass : public TestFixture {
                    "    int foo() { return x = 0; }\n"
                    "private:\n"
                    "    int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4270,7 +4350,7 @@ class TestClass : public TestFixture {
                    "    int foo() { return x ? x : x = 0; }\n"
                    "private:\n"
                    "    int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4278,7 +4358,7 @@ class TestClass : public TestFixture {
                    "    int foo() { return x ? x = 0 : x; }\n"
                    "private:\n"
                    "    int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4289,7 +4369,7 @@ class TestClass : public TestFixture {
                    "    void set(struct tm time) { m_time = time; }\n"
                    "private:\n"
                    "    struct tm m_time;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4300,7 +4380,7 @@ class TestClass : public TestFixture {
                    "    int foo() { x = 0; }\n"
                    "private:\n"
                    "    mutable int x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4314,7 +4394,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::vector<int> m_vec;\n"
                    "    std::pair<int,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n"
                       "[test.cpp:5:27]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
@@ -4326,7 +4406,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::vector<int> m_vec;\n"
                    "    std::pair<int,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:30]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n"
                       "[test.cpp:5:35]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
     }
@@ -4339,7 +4419,7 @@ class TestClass : public TestFixture {
                    "    std::pair<std::vector<int>,double> GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4348,7 +4428,7 @@ class TestClass : public TestFixture {
                    "    const std::pair<std::vector<int>,double>& GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:47]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4357,7 +4437,7 @@ class TestClass : public TestFixture {
                    "    std::pair<std::vector<int>,double>& GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4368,7 +4448,7 @@ class TestClass : public TestFixture {
                    "    pair<int ,double> GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4378,7 +4458,7 @@ class TestClass : public TestFixture {
                    "    const pair<int ,double> & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4388,7 +4468,7 @@ class TestClass : public TestFixture {
                    "    pair<int ,double> & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4398,7 +4478,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int,std::vector<int> >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4407,7 +4487,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< int,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:47]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4416,7 +4496,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4427,7 +4507,7 @@ class TestClass : public TestFixture {
                    "    pair< vector<int>, int >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4437,7 +4517,7 @@ class TestClass : public TestFixture {
                    "    const pair< vector<int>, int >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:38]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4447,7 +4527,7 @@ class TestClass : public TestFixture {
                    "    pair< vector<int>, int >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4456,7 +4536,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::vector<int>,std::vector<int> >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:53]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4465,7 +4545,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< std::vector<int>,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:60]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4474,7 +4554,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::vector<int>,std::vector<int> >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4485,7 +4565,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::pair < int, char > , int >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:49]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4494,7 +4574,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< std::pair < int, char > , int > & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:56]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4503,7 +4583,7 @@ class TestClass : public TestFixture {
                    "    std::pair< std::pair < int, char > , int > & GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4513,7 +4593,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int , std::pair < int, char > >  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:49]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4522,7 +4602,7 @@ class TestClass : public TestFixture {
                    "    const std::pair< int , std::pair < int, char > >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:56]: (style, inconclusive) Technically the member function 'A::GetPair' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -4531,7 +4611,7 @@ class TestClass : public TestFixture {
                    "    std::pair< int , std::pair < int, char > >&  GetPair() {return m_pair;}\n"
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4542,7 +4622,7 @@ class TestClass : public TestFixture {
                    "    vector<int>  GetVec() {return m_Vec;}\n"
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4552,7 +4632,7 @@ class TestClass : public TestFixture {
                    "    const vector<int>&  GetVec() {return m_Vec;}\n"
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:25]: (style, inconclusive) Technically the member function 'A::GetVec' can be const. [functionConst]\n", errout_str());
 
         checkConst("using namespace std;"
@@ -4562,7 +4642,7 @@ class TestClass : public TestFixture {
                    "    vector<int>&  GetVec() {return m_Vec;}\n"
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4571,7 +4651,7 @@ class TestClass : public TestFixture {
                    "    int * * foo() { return &x; }\n"
                    "private:\n"
                    "    const int * x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -4579,7 +4659,7 @@ class TestClass : public TestFixture {
                    "    const int ** foo() { return &x; }\n"
                    "private:\n"
                    "    const int * x;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4587,7 +4667,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    unsigned long long int a;\n"
                    "    unsigned long long int getA() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (style, inconclusive) Technically the member function 'Fred::getA' can be const. [functionConst]\n", errout_str());
 
         // constructors can't be const..
@@ -4595,14 +4675,14 @@ class TestClass : public TestFixture {
                    "    unsigned long long int a;\n"
                    "public:\n"
                    "    Fred() { }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment through |=..
         checkConst("class Fred {\n"
                    "    unsigned long long int a;\n"
                    "    unsigned long long int setA() { a |= true; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // static functions can't be const..
@@ -4611,7 +4691,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    static unsigned long long int get()\n"
                    "    { return 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4620,7 +4700,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void set(int i) { Fred::a = i; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4631,7 +4711,7 @@ class TestClass : public TestFixture {
                    "    void set(int i, int j) { a[i].k = i; }\n"
                    "private:\n"
                    "    struct { int k; } a[4];\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4640,8 +4720,8 @@ class TestClass : public TestFixture {
                    "static int x;\n"
                    "public:\n"
                    "    void set(int i) { x = i; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:4:10]: (performance, inconclusive) Technically the member function 'Fred::set' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'Fred::set' can be static. [functionStatic]\n", errout_str());
     }
 
     void const19() {
@@ -4652,7 +4732,7 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "public:\n"
                    "    void set(std::string ss) { s = ss; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4662,35 +4742,35 @@ class TestClass : public TestFixture {
                    "    int x : 3;\n"
                    "public:\n"
                    "    void set(int i) { x = i; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    list<int *> x;\n"
                    "public:\n"
                    "    list<int *> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    list<const int *> x;\n"
                    "public:\n"
                    "    list<const int *> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::list<std::string &> x;\n"
                    "public:\n"
                    "    std::list<std::string &> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    std::list<const std::string &> x;\n"
                    "public:\n"
                    "    std::list<const std::string &> get() { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:36]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4706,7 +4786,7 @@ class TestClass : public TestFixture {
                    "        for (int i = 0 ; i < 10; l1[i] = NULL, i++);\n"
                    "    }\n"
                    "    void f1() { l1[0] = \"Hello\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4717,7 +4797,7 @@ class TestClass : public TestFixture {
                    "    B::C * v1;\n"
                    "public:\n"
                    "    void f1() { v1 = 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A\n"
@@ -4726,7 +4806,7 @@ class TestClass : public TestFixture {
                    "    B::C * v1[0];\n"
                    "public:\n"
                    "    void f1() { v1[0] = 0; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4738,7 +4818,7 @@ class TestClass : public TestFixture {
                    "    void set_member(Type2 m) { _m = m; }\n"
                    "private:\n"
                    "    Type2 _m;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4751,7 +4831,7 @@ class TestClass : public TestFixture {
                    "}\n"
                    "private:\n"
                    "    std::map<QString, QString> *m_pSettings;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4766,7 +4846,7 @@ class TestClass : public TestFixture {
                    "{return m_strVal.c_str();}\n"
                    "private:\n"
                    "std::string m_strVal;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A{\n"
@@ -4776,7 +4856,7 @@ class TestClass : public TestFixture {
                    "{return m_strVal.c_str();}\n"
                    "private:\n"
                    "std::string m_strVal;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style, inconclusive) Technically the member function 'A::strGetString' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A{\n"
@@ -4786,7 +4866,7 @@ class TestClass : public TestFixture {
                    "{return m_strVal.c_str();}\n"
                    "private:\n"
                    "std::string m_strVal;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:19]: (style, inconclusive) Technically the member function 'A::strGetString1' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A{\n"
@@ -4796,7 +4876,7 @@ class TestClass : public TestFixture {
                    "{return m_strVec.size();}\n"
                    "private:\n"
                    "std::vector<std::string> m_strVec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (style, inconclusive) Technically the member function 'A::strGetSize' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A{\n"
@@ -4806,7 +4886,7 @@ class TestClass : public TestFixture {
                    "{return m_strVec.empty();}\n"
                    "private:\n"
                    "std::vector<std::string> m_strVec;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (style, inconclusive) Technically the member function 'A::strGetEmpty' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4817,7 +4897,7 @@ class TestClass : public TestFixture {
                    "    std::swap<float>(delays_[index1], delays_[index2]);\n"
                    "}\n"
                    "float delays_[4];\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct DelayBase {\n"
@@ -4825,7 +4905,7 @@ class TestClass : public TestFixture {
                    "        return delays_[index1];\n"
                    "    }\n"
                    "    float delays_[4];\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style, inconclusive) Technically the member function 'DelayBase::swapSpecificDelays' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4843,7 +4923,7 @@ class TestClass : public TestFixture {
                    "    if( m_d != 0 )\n"
                    "        return m_iRealVal / m_d;\n"
                    "    return dRet;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:9:12]: (style, inconclusive) Technically the member function 'A::dGetValue' can be const. [functionConst]\n", errout_str());
     }
 
@@ -4860,7 +4940,7 @@ class TestClass : public TestFixture {
                    "        x=xPos;\n"
                    "        y=yPos;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class AA : public P {\n"
@@ -4870,7 +4950,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        UnknownScope::x = x_;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class AA {\n"
@@ -4880,8 +4960,8 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        UnknownScope::x = x_;\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:4:17]: (performance, inconclusive) Technically the member function 'AA::vSetXPos' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:4:17]: (style) The member function 'AA::vSetXPos' can be static. [functionStatic]\n", errout_str());
 
     }
 
@@ -4905,7 +4985,7 @@ class TestClass : public TestFixture {
                    "char* test::get()\n"
                    "{\n"
                    "  return value_;\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4920,7 +5000,7 @@ class TestClass : public TestFixture {
                    "    int get() {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style, inconclusive) Technically the member function 'Derived::get' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Base1 {\n"
@@ -4939,7 +5019,7 @@ class TestClass : public TestFixture {
                    "    int getB() {\n"
                    "        return b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:11:9]: (style, inconclusive) Technically the member function 'Derived::getA' can be const. [functionConst]\n"
                       "[test.cpp:14:9]: (style, inconclusive) Technically the member function 'Derived::getB' can be const. [functionConst]\n", errout_str());
 
@@ -4953,7 +5033,7 @@ class TestClass : public TestFixture {
                    "    int get() {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style, inconclusive) Technically the member function 'Derived2::get' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Base {\n"
@@ -4968,7 +5048,7 @@ class TestClass : public TestFixture {
                    "    int get() {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:10:9]: (style, inconclusive) Technically the member function 'Derived4::get' can be const. [functionConst]\n", errout_str());
 
         // check for false positives
@@ -4981,7 +5061,7 @@ class TestClass : public TestFixture {
                    "    int get() const {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base1 {\n"
@@ -5000,7 +5080,7 @@ class TestClass : public TestFixture {
                    "    int getB() const {\n"
                    "        return b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base {\n"
@@ -5013,7 +5093,7 @@ class TestClass : public TestFixture {
                    "    int get() const {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base {\n"
@@ -5028,7 +5108,7 @@ class TestClass : public TestFixture {
                    "    int get() const {\n"
                    "        return a;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5038,7 +5118,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    int a;\n"
                    "    int get() { return a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5047,7 +5127,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    std::string a[10];\n"
                    "    void seta() { a[0] = \"\"; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5055,8 +5135,8 @@ class TestClass : public TestFixture {
         checkConst("class derived : public base {\n"
                    "public:\n"
                    "    void f(){}\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Either there is a missing 'override', or the member function 'derived::f' can be static. [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Either there is a missing 'override', or the member function 'derived::f' can be static. [functionStatic]\n", errout_str());
     }
 
     void const34() { // ticket #1964
@@ -5064,7 +5144,7 @@ class TestClass : public TestFixture {
                    "    void init(Foo * foo) {\n"
                    "        foo.bar = this;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5083,7 +5163,7 @@ class TestClass : public TestFixture {
                    "                int getResourceName() { return var; }\n"
                    "                int var;\n"
                    "        };\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("[test.cpp:12:21]: (style, inconclusive) Technically the member function 'N::Derived::getResourceName' can be const. [functionConst]\n", errout_str());
 
         checkConst("namespace N\n"
@@ -5095,7 +5175,7 @@ class TestClass : public TestFixture {
                    "                int var;\n"
                    "        };\n"
                    "}\n"
-                   "int N::Base::getResourceName() { return var; }");
+                   "int N::Base::getResourceName() { return var; }\n");
         ASSERT_EQUALS("[test.cpp:6:21] -> [test.cpp:10:14]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const. [functionConst]\n", errout_str());
 
         checkConst("namespace N\n"
@@ -5110,7 +5190,7 @@ class TestClass : public TestFixture {
                    "namespace N\n"
                    "{\n"
                    "        int Base::getResourceName() { return var; }\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("[test.cpp:6:21] -> [test.cpp:12:19]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const. [functionConst]\n", errout_str());
 
         checkConst("namespace N\n"
@@ -5123,7 +5203,7 @@ class TestClass : public TestFixture {
                    "        };\n"
                    "}\n"
                    "using namespace N;\n"
-                   "int Base::getResourceName() { return var; }");
+                   "int Base::getResourceName() { return var; }\n");
         ASSERT_EQUALS("[test.cpp:6:21] -> [test.cpp:11:11]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5135,7 +5215,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        m_MaxQueueSize = a_MaxQueueSize;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5150,7 +5230,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "private:\n"
                    "    std::string m_str;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (style, inconclusive) Technically the member function 'A::operator+' can be const. [functionConst]\n", errout_str());
 
         checkConst("class Fred\n"
@@ -5164,7 +5244,7 @@ class TestClass : public TestFixture {
                    "    bool isValid() {\n"
                    "        return (x == 0x11224488);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (style, inconclusive) Technically the member function 'Fred::isValid' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5180,7 +5260,7 @@ class TestClass : public TestFixture {
                    "void Foo::MyMethod()\n"
                    "{\n"
                    "    (*oArq) << \"</table>\";\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5200,7 +5280,7 @@ class TestClass : public TestFixture {
                    "int * Foo::f()\n"
                    "{\n"
                    "    return p;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5217,7 +5297,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pView = aView;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5231,7 +5311,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      m_name = name;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5243,7 +5323,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5258,7 +5338,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5275,7 +5355,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5293,7 +5373,7 @@ class TestClass : public TestFixture {
                    "   {\n"
                    "      pNum = apNum;\n"
                    "   }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5307,9 +5387,9 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool Fred::f(Fred::AB * ab)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
-        ASSERT_EQUALS("[test.cpp:5:10] -> [test.cpp:7:12]: (performance, inconclusive) Technically the member function 'Fred::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:10] -> [test.cpp:7:12]: (style) The member function 'Fred::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class Fred\n"
                    "{\n"
@@ -5321,9 +5401,9 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool Fred::f(Fred::AB::CD * cd)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
-        ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:9:12]: (performance, inconclusive) Technically the member function 'Fred::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:9:12]: (style) The member function 'Fred::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("namespace NS {\n"
                    "    class Fred\n"
@@ -5337,9 +5417,9 @@ class TestClass : public TestFixture {
                    "    bool Fred::f(Fred::AB::CD * cd)\n"
                    "    {\n"
                    "    }\n"
-                   "}");
+                   "}\n");
 
-        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:10:16]: (performance, inconclusive) Technically the member function 'NS::Fred::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:10:16]: (style) The member function 'NS::Fred::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("namespace NS {\n"
                    "    class Fred\n"
@@ -5353,9 +5433,9 @@ class TestClass : public TestFixture {
                    "}\n"
                    "bool NS::Fred::f(NS::Fred::AB::CD * cd)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
-        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:11:16]: (performance, inconclusive) Technically the member function 'NS::Fred::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:11:16]: (style) The member function 'NS::Fred::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class Foo {\n"
                    "    class Fred\n"
@@ -5369,9 +5449,9 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool Foo::Fred::f(Foo::Fred::AB::CD * cd)\n"
                    "{\n"
-                   "}");
+                   "}\n");
 
-        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:11:17]: (performance, inconclusive) Technically the member function 'Foo::Fred::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:11:17]: (style) The member function 'Foo::Fred::f' can be static. [functionStatic]\n", errout_str());
     }
 
     void const43() { // ticket 2377
@@ -5384,7 +5464,7 @@ class TestClass : public TestFixture {
                    "void A::foo( AA::BB::CC::DD b )\n"
                    "{\n"
                    "    a = b;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5408,7 +5488,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        a = b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -5428,7 +5508,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        a = b;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5441,7 +5521,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        return 0 != (bOn = bOn);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5458,9 +5538,9 @@ class TestClass : public TestFixture {
                    "        {\n"
                    "        }\n"
                    "    };\n"
-                   "}");
+                   "}\n");
 
-        ASSERT_EQUALS("[test.cpp:8:13]: (performance, inconclusive) Technically the member function 'tools::WorkspaceControl::toGrid' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:13]: (style) The member function 'tools::WorkspaceControl::toGrid' can be static. [functionStatic]\n", errout_str());
     }
 
     void const46() { // ticket 2663
@@ -5473,10 +5553,10 @@ class TestClass : public TestFixture {
                    "    int fun2() {\n"
                    "        b++;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
-        ASSERT_EQUALS("[test.cpp:3:9]: (performance, inconclusive) Technically the member function 'Altren::fun1' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:7:9]: (performance, inconclusive) Technically the member function 'Altren::fun2' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) The member function 'Altren::fun1' can be static. [functionStatic]\n"
+                      "[test.cpp:7:9]: (style) The member function 'Altren::fun2' can be static. [functionStatic]\n", errout_str());
     }
 
     void const47() { // ticket 2670
@@ -5485,18 +5565,18 @@ class TestClass : public TestFixture {
                    "  void foo() { delete this; }\n"
                    "  void foo(int i) const { }\n"
                    "  void bar() { foo(); }\n"
-                   "};");
+                   "};\n");
 
-        ASSERT_EQUALS("[test.cpp:4:8]: (performance, inconclusive) Technically the member function 'Altren::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:8]: (style) The member function 'Altren::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class Altren {\n"
                    "public:\n"
                    "  void foo() { delete this; }\n"
                    "  void foo(int i) const { }\n"
                    "  void bar() { foo(1); }\n"
-                   "};");
+                   "};\n");
 
-        ASSERT_EQUALS("[test.cpp:4:8]: (performance, inconclusive) Technically the member function 'Altren::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
+        ASSERT_EQUALS("[test.cpp:4:8]: (style) The member function 'Altren::foo' can be static. [functionStatic]\n"
                       "[test.cpp:5:8]: (style, inconclusive) Technically the member function 'Altren::bar' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5517,7 +5597,7 @@ class TestClass : public TestFixture {
                    "};\n"
                    "bool TextIterator::setTagColour() {\n"
                    "    mSave = mCurrent;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5532,7 +5612,7 @@ class TestClass : public TestFixture {
                    "         {\n"
                    "             return _hash[key];\n"
                    "         }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5547,7 +5627,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "        if (mTileSize.height > 0) return;\n"
                    "        if (mEmptyView) return;\n"
-                   "}");
+                   "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -5561,7 +5641,7 @@ class TestClass : public TestFixture {
                    "    void SetSection(uint num) { pesdata()[6] = num; }\n"
                    "private:\n"
                    "    unsigned char *_pesdata;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class PESPacket {\n"
@@ -5576,7 +5656,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "public:\n"
                    "    void SetSection(uint num) { pesdata()[6] = num; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5586,8 +5666,8 @@ class TestClass : public TestFixture {
                    "    void DoSomethingElse() { DoSomething(bar); }\n"
                    "private:\n"
                    "    int bar;\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:10]: (performance, inconclusive) Technically the member function 'foo::DoSomething' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'foo::DoSomething' can be static. [functionStatic]\n", errout_str());
     }
 
     void const53() { // ticket 3049
@@ -5602,7 +5682,7 @@ class TestClass : public TestFixture {
                    "  public:\n"
                    "    B() {};\n"
                    "    bool One(bool b = false) { return false; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5610,7 +5690,7 @@ class TestClass : public TestFixture {
         checkConst("class Example {\n"
                    "  public:\n"
                    "    void Clear(void) { Example tmp; (*this) = tmp; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5620,7 +5700,7 @@ class TestClass : public TestFixture {
                    "    MyObject() : tmp(0) {}\n"
                    "public:\n"
                    "    void set(std::stringstream &in) { in >> tmp; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5630,8 +5710,8 @@ class TestClass : public TestFixture {
                    "    void foo(int x) {\n"
                    "    switch (x) { }\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class A\n"
                    "{\n"
@@ -5670,16 +5750,16 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "\n"
                    "    return RET_NOK;\n"
-                   "}");
-        ASSERT_EQUALS("[test.cpp:4:24] -> [test.cpp:9:19]: (performance, inconclusive) Technically the member function 'A::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "}\n");
+        ASSERT_EQUALS("[test.cpp:4:24] -> [test.cpp:9:19]: (style) The member function 'A::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class MyObject {\n"
                    "public:\n"
                    "    void foo(int x) {\n"
                    "    for (int i = 0; i < 5; i++) { }\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
     }
 
     void const57() { // tickets #2669 and #2477
@@ -5703,17 +5783,17 @@ class TestClass : public TestFixture {
                    "  }\n"
                    "private:\n"
                    "  MyGUI::IntCoord mCoordValue;\n"
-                   "};");
-        TODO_ASSERT_EQUALS("[test.cpp:7:13]: (performance, inconclusive) Technically the member function 'MyGUI::types::TCoord::size' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
+                   "};\n");
+        TODO_ASSERT_EQUALS("[test.cpp:7:13]: (style) The member function 'MyGUI::types::TCoord::size' can be static. [functionStatic]\n"
                            "[test.cpp:15]: (style, inconclusive) Technically the member function 'SelectorControl::getSize' can be const.\n",
-                           "[test.cpp:7:13]: (performance, inconclusive) Technically the member function 'MyGUI::types::TCoord::size' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                           "[test.cpp:7:13]: (style) The member function 'MyGUI::types::TCoord::size' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct Foo {\n"
                    "    Bar b;\n"
                    "    void foo(Foo f) {\n"
                    "        b.run();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Bar {\n"
@@ -5725,7 +5805,7 @@ class TestClass : public TestFixture {
                    "    void foo(Foo f) {\n"
                    "        b.run();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Bar {\n"
@@ -5736,8 +5816,8 @@ class TestClass : public TestFixture {
                    "    void foo(Foo f) {\n"
                    "        b.run();\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:10]: (performance, inconclusive) Technically the member function 'Bar::run' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'Bar::run' can be static. [functionStatic]\n"
                       "[test.cpp:6:10]: (style, inconclusive) Technically the member function 'Foo::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5746,22 +5826,22 @@ class TestClass : public TestFixture {
                    "    void foo(Foo f) {\n"
                    "        f.clear();\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:10]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct MyObject {\n"
                    "    int foo(Foo f) {\n"
                    "        return f.length();\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:9]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct MyObject {\n"
                    "    Foo f;\n"
                    "    int foo() {\n"
                    "        return f.length();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct MyObject {\n"
@@ -5769,7 +5849,7 @@ class TestClass : public TestFixture {
                    "    int foo() {\n"
                    "        return f.length();\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'MyObject::foo' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5781,7 +5861,7 @@ class TestClass : public TestFixture {
                    "protected:\n"
                    "    int   re;\n"
                    "    int   im;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5796,7 +5876,7 @@ class TestClass : public TestFixture {
                    "    MyString append( const MyString& str )\n"
                    "    {       return operator+=( str ); }\n"
                    "    char *m_ptr;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
         checkConst("class MyString {\n"
                    "public:\n"
@@ -5805,7 +5885,7 @@ class TestClass : public TestFixture {
                    "    MyString append( const MyString& str )\n"
                    "    {       return operator+=( str ); }\n"
                    "    char *m_ptr;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5816,14 +5896,14 @@ class TestClass : public TestFixture {
                    "};\n"
                    "int MixerParticipant::GetAudioFrame() {\n"
                    "    return 0;\n"
-                   "}");
+                   "}\n");
 
         // this code is invalid so a false negative is OK
         checkConst("class MixerParticipant : public MixerParticipant {\n"
                    "    bool InitializeFileReader() {\n"
                    "       printf(\"music\");\n"
                    "    }\n"
-                   "};");
+                   "};\n");
 
         // Based on an example from SVN source code causing an endless recursion within CheckClass::isConstMemberFunc()
         // A more complete example including a template declaration like
@@ -5842,7 +5922,7 @@ class TestClass : public TestFixture {
                    "      inherited::set(inherited::Key(key));\n"
                    "  }\n"
                    "};\n", dinit(CheckConstOptions, $.inconclusive = false));
-        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:23]: (performance, inconclusive) Either there is a missing 'override', or the member function 'MixerParticipant::GetAudioFrame' can be static. [functionStatic]\n",
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:23]: (style) Either there is a missing 'override', or the member function 'MixerParticipant::GetAudioFrame' can be static. [functionStatic]\n",
                       errout_str());
     }
 
@@ -5856,7 +5936,7 @@ class TestClass : public TestFixture {
                    "         {\n"
                    "             return _hash[key];\n"
                    "         }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5867,7 +5947,7 @@ class TestClass : public TestFixture {
                    "         std::string* p = &s;\n"
                    "         p->clear();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
@@ -5876,7 +5956,7 @@ class TestClass : public TestFixture {
                    "         std::string& r = s;\n"
                    "         r.clear();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
@@ -5885,7 +5965,7 @@ class TestClass : public TestFixture {
                    "         std::string& r = sth; r = s;\n"
                    "         r.clear();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::clear' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct A {\n"
@@ -5894,7 +5974,7 @@ class TestClass : public TestFixture {
                    "         const std::string* p = &s;\n"
                    "         p->somefunction();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::clear' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct A {\n"
@@ -5903,7 +5983,7 @@ class TestClass : public TestFixture {
                    "         const std::string& r = s;\n"
                    "         r.somefunction();\n"
                    "     }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::clear' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5918,7 +5998,7 @@ class TestClass : public TestFixture {
                    "        }\n"
                    "        ::B::D::DKIPtr membervariable;\n"
                    "    };\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5937,7 +6017,7 @@ class TestClass : public TestFixture {
                    "    TemplateClass<int> a;\n"
                    "    TemplateClass<float> b;\n"
                    "    return 0;\n"
-                   "}");
+                   "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5947,7 +6027,7 @@ class TestClass : public TestFixture {
                    "    void f(int v) { g((char *) &v); }\n"
                    "    void g(char *) { n++; }\n"
                    "    int n;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5961,7 +6041,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    const std::list<std::shared_ptr<int>>& get() { return m_test.m_list; }\n"
                    "    TestList<std::shared_ptr<int>> m_test;\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:8:44]: (style, inconclusive) Technically the member function 'Test::get' can be const. [functionConst]\n", errout_str());
     }
 
@@ -5991,7 +6071,7 @@ class TestClass : public TestFixture {
                    "        call();\n"
                    "        call<int>(1, 2, 3);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6004,7 +6084,7 @@ class TestClass : public TestFixture {
                    "    void test() {\n"
                    "        call(1, 2);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6139,7 +6219,7 @@ class TestClass : public TestFixture {
                    "    void bar(void) {\n"
                    "        for(std::vector<std::string>::const_iterator it = m_str.begin(); it != m_str.end(); ++it) {;}\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style, inconclusive) Technically the member function 'A::bar' can be const. [functionConst]\n", errout_str());
 
         // Don't crash
@@ -6161,7 +6241,7 @@ class TestClass : public TestFixture {
                    "        if (N::i) {}\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:4:10]: (performance, inconclusive) Technically the member function 'S::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'S::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int i = 0;\n"
                    "struct S {\n"
@@ -6170,7 +6250,7 @@ class TestClass : public TestFixture {
                    "        if (::i) {}\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:4:10]: (performance, inconclusive) Technically the member function 'S::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'S::f' can be static. [functionStatic]\n", errout_str());
 
         checkConst("namespace N {\n"
                    "    struct S {\n"
@@ -6193,7 +6273,7 @@ class TestClass : public TestFixture {
                    "void S::f(const T* t) {\n"
                    "    const_cast<T*>(t)->e();\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:7:9]: (performance, inconclusive) Technically the member function 'S::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n",
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:7:9]: (style) The member function 'S::f' can be static. [functionStatic]\n",
                       errout_str());
     }
 
@@ -6239,7 +6319,7 @@ class TestClass : public TestFixture {
                    "        return nullptr;\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:3:11]: (performance, inconclusive) Technically the member function 'A::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n",
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) The member function 'A::f' can be static. [functionStatic]\n",
                       errout_str());
     }
 
@@ -6270,10 +6350,10 @@ class TestClass : public TestFixture {
                    "void S::n() {\n"
                    "        this->h();\n"
                    "}\n");
-        ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:11:9]: (performance, inconclusive) Technically the member function 'S::g' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:5:10] -> [test.cpp:14:9]: (performance, inconclusive) Technically the member function 'S::h' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
+        ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:11:9]: (style) The member function 'S::g' can be static. [functionStatic]\n"
+                      "[test.cpp:5:10] -> [test.cpp:14:9]: (style) The member function 'S::h' can be static. [functionStatic]\n"
                       "[test.cpp:6:10] -> [test.cpp:17:9]: (style, inconclusive) Technically the member function 'S::k' can be const. [functionConst]\n"
-                      "[test.cpp:7:10] -> [test.cpp:21:9]: (performance, inconclusive) Technically the member function 'S::m' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n",
+                      "[test.cpp:7:10] -> [test.cpp:21:9]: (style) The member function 'S::m' can be static. [functionStatic]\n",
                       errout_str());
     }
 
@@ -6633,7 +6713,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n"
-                      "[test.cpp:8:9]: (performance, inconclusive) Technically the member function 'S::g' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n",
+                      "[test.cpp:8:9]: (style) The member function 'S::g' can be static. [functionStatic]\n",
                       errout_str());
 
         checkConst("class C {\n" // #11653
@@ -6644,7 +6724,7 @@ class TestClass : public TestFixture {
                    "    if (b)\n"
                    "        f(false);\n"
                    "}\n");
-        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:9]: (performance, inconclusive) Technically the member function 'C::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n",
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:9]: (style) The member function 'C::f' can be static. [functionStatic]\n",
                       errout_str());
     }
 
@@ -6690,6 +6770,7 @@ class TestClass : public TestFixture {
                    "struct S<0> {};\n"
                    "struct D : S<150> {};\n");
         // don't hang
+        ignore_errout();
     }
 
     void const93() { // #12162
@@ -6744,6 +6825,52 @@ class TestClass : public TestFixture {
                    "    B::g(0);\n"
                    "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkConst("struct S {\n" // #14366
+                   "    void f();\n"
+                   "};\n"
+                   "struct T : U {\n"
+                   "    void g(S* s) {\n"
+                   "        s->f();\n"
+                   "    }\n"
+                   "    void h() {\n"
+                   "        S s;\n"
+                   "        s.f();\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Either there is a missing 'override', or the member function 'T::g' can be static. [functionStatic]\n"
+                      "[test.cpp:8:10]: (style) Either there is a missing 'override', or the member function 'T::h' can be static. [functionStatic]\n",
+                      errout_str());
+
+        checkConst("enum E { E0 };\n"
+                   "int f();\n"
+                   "struct S : U {\n"
+                   "    E g() {\n"
+                   "        return E0;\n"
+                   "    }\n"
+                   "    int h() {\n"
+                   "        return f();\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (style) Either there is a missing 'override', or the member function 'S::g' can be static. [functionStatic]\n"
+                      "[test.cpp:7:9]: (style) Either there is a missing 'override', or the member function 'S::h' can be static. [functionStatic]\n",
+                      errout_str());
+
+        checkConst("namespace N {\n" // #14391
+                   "    void f();\n"
+                   "}\n"
+                   "struct S : U {\n"
+                   "    void g() { N::f(); }\n"
+                   "    void h() { ::N::f(); }\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Either there is a missing 'override', or the member function 'S::g' can be static. [functionStatic]\n"
+                      "[test.cpp:6:10]: (style) Either there is a missing 'override', or the member function 'S::h' can be static. [functionStatic]\n",
+                      errout_str());
+
+        checkConst("struct S : U {\n" // #14425
+                   "    void f() { this->g(); }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const97() { // #13301
@@ -6783,6 +6910,22 @@ class TestClass : public TestFixture {
                    "};\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'D::f' can be const. [functionConst]\n",
                       errout_str());
+
+        checkConst("int g(int);\n" // #12162
+                   "struct S {\n"
+                   "    bool has(int i) { return m.find(i) != m.end(); }\n"
+                   "    bool isZero(int i) { return m.at(i) == 0; }\n"
+                   "    bool isZero() { return v.front() == 0; }\n"
+                   "    void f() { g(v.front() + 1); }\n"
+                   "    void set(int i) { m.at(i) = 0; }\n"
+                   "    std::map<int, int> m;\n"
+                   "    std::vector<int> v;\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'S::has' can be const. [functionConst]\n"
+                      "[test.cpp:4:10]: (style, inconclusive) Technically the member function 'S::isZero' can be const. [functionConst]\n"
+                      "[test.cpp:5:10]: (style, inconclusive) Technically the member function 'S::isZero' can be const. [functionConst]\n"
+                      "[test.cpp:6:10]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n",
+                      errout_str());
     }
 
     void const98() { // #13642
@@ -6835,6 +6978,73 @@ class TestClass : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void const99() {
+        checkConst("typedef void (*InitFunc)(void**);\n" // #13953
+                   "struct S {\n"
+                   "    int *m;\n"
+                   "    void f(InitFunc func) {\n"
+                   "        func(reinterpret_cast<void**>(&m));\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void const100() {
+        checkConst("struct S {\n" // #14023
+                   "    void f() { ++i; }\n"
+                   "    void f() const {}\n"
+                   "    int i;\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkConst("struct S {\n" // #14033
+                   "    void f();\n"
+                   "    void f() const {}\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+    }
+
+    void const101() {
+        checkConst("struct error {\n" // #14450
+                   "    error() = default;\n"
+                   "};\n"
+                   "struct S : U {\n"
+                   "    int f() { return this->error(); }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkConst("struct S {\n" // #14702
+                   "    int i;\n"
+                   "    void f() {\n"
+                   "        S& r = *this;\n"
+                   "        r.i = 0;\n"
+                   "    }\n"
+                   "};\n"
+                   "struct T : std::array<int, 5> {\n"
+                   "    void g() {\n"
+                   "        for (int& r : *this)\n"
+                   "            r = 0;\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void const102() {
+        checkConst("struct S {\n" // #14888
+                   "    void f() {\n"
+                   "        int *p = a;\n"
+                   "        *p = 0;\n"
+                   "    }\n"
+                   "    void g() {\n"
+                   "        const int *p = a;\n"
+                   "        if (*p) {}\n"
+                   "    }\n"
+                   "    int a[3];\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:6:10]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n",
+                      errout_str());
+    }
+
     void const_handleDefaultParameters() {
         checkConst("struct Foo {\n"
                    "    void foo1(int i, int j = 0) {\n"
@@ -6864,9 +7074,9 @@ class TestClass : public TestFixture {
                    "    int bar6() {\n"
                    "        return foo3();\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:11:9]: (performance, inconclusive) Technically the member function 'Foo::bar3' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
-                      "[test.cpp:14:9]: (performance, inconclusive) Technically the member function 'Foo::bar4' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:11:9]: (style) The member function 'Foo::bar3' can be static. [functionStatic]\n"
+                      "[test.cpp:14:9]: (style) The member function 'Foo::bar4' can be static. [functionStatic]\n", errout_str());
     }
 
     void const_passThisToMemberOfOtherClass() {
@@ -6875,7 +7085,7 @@ class TestClass : public TestFixture {
                    "        Bar b;\n"
                    "        b.takeFoo(this);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Foo {\n"
@@ -6883,8 +7093,8 @@ class TestClass : public TestFixture {
                    "        Foo f;\n"
                    "        f.foo();\n"
                    "    }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:10]: (performance, inconclusive) Technically the member function 'Foo::foo' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'Foo::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A;\n" // #5839 - operator()
                    "struct B {\n"
@@ -6894,7 +7104,7 @@ class TestClass : public TestFixture {
                    "    void dostuff() {\n"
                    "        B()(this);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6906,7 +7116,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        v = 0;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6918,7 +7128,7 @@ class TestClass : public TestFixture {
                    "    {\n"
                    "        v[0] = \"Happy new year!\";\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6927,50 +7137,50 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return ++a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return --a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a++; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a--; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return ++a; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return --a; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a++; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a--; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct S {\n" // #10077
                    "    int i{};\n"
@@ -6985,152 +7195,152 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a-=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a+=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a*=-1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a/=-2; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
     void constassign2() {
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a-=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a+=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a*=-1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; } s;\n"
                    "class Fred {\n"
                    "    void nextA() { return s.a/=-2; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7139,112 +7349,112 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return ++a[0]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return --a[0]; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]++; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]--; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return ++a[0]; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return --a[0]; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]++; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]--; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
     void constassignarray() {
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]-=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]+=1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]*=-1; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]/=-2; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]-=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]+=1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]*=-1; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]/=-2; }\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
     // return pointer/reference => not const
@@ -7252,8 +7462,8 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    int &getR() { return a; }\n"
-                   "    int *getP() { return &a; }"
-                   "};");
+                   "    int *getP() { return &a; }\n"
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7262,7 +7472,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    int *a;\n"
                    "    void clean() { delete a; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7270,14 +7480,14 @@ class TestClass : public TestFixture {
     void constLPVOID() {
         checkConst("class Fred {\n"
                    "    UNKNOWN a() { return 0; };\n"
-                   "};");
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Fred::a' can be static.\n", "", errout_str());
+                   "};\n");
+        TODO_ASSERT_EQUALS("[test.cpp:2]: (style) The member function 'Fred::a' can be static.\n", "", errout_str());
 
         // #1579 - HDC
         checkConst("class Fred {\n"
                    "    foo bar;\n"
                    "    UNKNOWN a() { return b; };\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7286,8 +7496,8 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "    void f() const { };\n"
                    "    void a() { f(); };\n"
-                   "};");
-        ASSERT_EQUALS("[test.cpp:2:10]: (performance, inconclusive) Technically the member function 'Fred::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'Fred::f' can be static. [functionStatic]\n"
                       "[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::a' can be const. [functionConst]\n", errout_str());
 
         // ticket #1593
@@ -7297,7 +7507,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "   A(){}\n"
                    "   unsigned int GetVecSize()  {return m_v.size();}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:17]: (style, inconclusive) Technically the member function 'A::GetVecSize' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A\n"
@@ -7306,7 +7516,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "   A(){}\n"
                    "   bool GetVecEmpty()  {return m_v.empty();}\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (style, inconclusive) Technically the member function 'A::GetVecEmpty' can be const. [functionConst]\n", errout_str());
     }
 
@@ -7318,7 +7528,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "   B() : b(0) { }\n"
                    "   int func() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:6:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A { };\n"
@@ -7328,7 +7538,7 @@ class TestClass : public TestFixture {
                    "   B() : b(0) { }\n"
                    "   int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("[test.cpp:6:8] -> [test.cpp:8:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         // base class has no virtual function
@@ -7341,7 +7551,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    B() : b(0) { }\n"
                    "    int func() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:9:9]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         checkConst("class A {\n"
@@ -7354,7 +7564,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("[test.cpp:9:9] -> [test.cpp:11:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n", errout_str());
 
         // base class has virtual function
@@ -7367,7 +7577,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    B() : b(0) { }\n"
                    "    int func() { return b; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -7380,7 +7590,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -7393,7 +7603,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int B::func() { return b; }");
+                   "int B::func() { return b; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // base class has no virtual function
@@ -7414,7 +7624,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    C() : c(0) { }\n"
                    "    int func() { return c; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style, inconclusive) Technically the member function 'A::func' can be const. [functionConst]\n"
                       "[test.cpp:11:9]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n"
                       "[test.cpp:17:9]: (style, inconclusive) Technically the member function 'C::func' can be const. [functionConst]\n", errout_str());
@@ -7439,7 +7649,7 @@ class TestClass : public TestFixture {
                    "    C() : c(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int C::func() { return c; }");
+                   "int C::func() { return c; }\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:7:8]: (style, inconclusive) Technically the member function 'A::func' can be const. [functionConst]\n"
                       "[test.cpp:12:9] -> [test.cpp:14:8]: (style, inconclusive) Technically the member function 'B::func' can be const. [functionConst]\n"
                       "[test.cpp:19:9] -> [test.cpp:21:8]: (style, inconclusive) Technically the member function 'C::func' can be const. [functionConst]\n", errout_str());
@@ -7462,7 +7672,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    C() : c(0) { }\n"
                    "    int func() { return c; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
@@ -7485,7 +7695,7 @@ class TestClass : public TestFixture {
                    "    C() : c(0) { }\n"
                    "    int func();\n"
                    "};\n"
-                   "int C::func() { return c; }");
+                   "int C::func() { return c; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1311
@@ -7506,7 +7716,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    Z(int x, int y, int z) : Y(x, y), z(z) { }\n"
                    "    int getZ() { return z; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style, inconclusive) Technically the member function 'X::getX' can be const. [functionConst]\n"
                       "[test.cpp:11:9]: (style, inconclusive) Technically the member function 'Y::getY' can be const. [functionConst]\n"
                       "[test.cpp:17:9]: (style, inconclusive) Technically the member function 'Z::getZ' can be const. [functionConst]\n", errout_str());
@@ -7531,7 +7741,7 @@ class TestClass : public TestFixture {
                    "    Z(int x, int y, int z) : Y(x, y), z(z) { }\n"
                    "    int getZ();\n"
                    "};\n"
-                   "int Z::getZ() { return z; }");
+                   "int Z::getZ() { return z; }\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:7:8]: (style, inconclusive) Technically the member function 'X::getX' can be const. [functionConst]\n"
                       "[test.cpp:12:9] -> [test.cpp:14:8]: (style, inconclusive) Technically the member function 'Y::getY' can be const. [functionConst]\n"
                       "[test.cpp:19:9] -> [test.cpp:21:8]: (style, inconclusive) Technically the member function 'Z::getZ' can be const. [functionConst]\n", errout_str());
@@ -7545,19 +7755,19 @@ class TestClass : public TestFixture {
                             //"        i = 4;\n"
                             //"endif\n"
                             "    }\n"
-                            "};";
+                            "};\n";
 
-        checkConst(code, dinit(CheckConstOptions, $.s = &settings0, $.inconclusive = true));
-        ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'foo::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
+        checkConst(code);
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'foo::f' can be static. [functionStatic]\n", errout_str());
 
-        checkConst(code, dinit(CheckConstOptions, $.s = &settings0, $.inconclusive = false)); // TODO: Set inconclusive to true (preprocess it)
-        ASSERT_EQUALS("", errout_str());
+        checkConst(code, dinit(CheckConstOptions, $.inconclusive = false));
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'foo::f' can be static. [functionStatic]\n", errout_str());
     }
 
     void constFriend() { // ticket #1921
         const char code[] = "class foo {\n"
                             "    friend void f() { }\n"
-                            "};";
+                            "};\n";
         checkConst(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -7572,7 +7782,7 @@ class TestClass : public TestFixture {
                    "    void setf(float x) {\n"
                    "        d.f = x;\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7589,7 +7799,7 @@ class TestClass : public TestFixture {
                    "    T c() {\n"
                    "        return y[1][6];\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:10:7]: (style, inconclusive) Technically the member function 'foo::c' can be const. [functionConst]\n", errout_str());
     }
 
@@ -7609,8 +7819,21 @@ class TestClass : public TestFixture {
                    "        for (decltype(auto) e : array)\n"
                    "            foo(e);\n"
                    "    }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("[test.cpp:8:10]: (style, inconclusive) Technically the member function 'Fred::f2' can be const. [functionConst]\n", errout_str());
+
+        checkConst("struct T {\n" // #14390
+                   "    std::vector<int*> v;\n"
+                   "    void f() {\n"
+                   "        for (const auto& p : v)\n"
+                   "            *p = 0;\n"
+                   "    }\n"
+                   "    void g() {\n"
+                   "        for (auto* p : v)\n"
+                   "            *p = 0;\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const_shared_ptr() { // #8674
@@ -7621,7 +7844,7 @@ class TestClass : public TestFixture {
                    "     std::shared_ptr<Data> data;\n"
                    "};\n"
                    "\n"
-                   "std::shared_ptr<Data> Fred::getData() { return data; }");
+                   "std::shared_ptr<Data> Fred::getData() { return data; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7629,7 +7852,7 @@ class TestClass : public TestFixture {
         checkConst("class Fred {\n"
                    "public:\n"
                    "    const char *const *data;\n"
-                   "    const char *const *getData() { return data; }\n}");
+                   "    const char *const *getData() { return data; }\n}\n");
         ASSERT_EQUALS("[test.cpp:4:24]: (style, inconclusive) Technically the member function 'Fred::getData' can be const. [functionConst]\n", errout_str());
     }
 
@@ -7637,7 +7860,7 @@ class TestClass : public TestFixture {
         checkConst("struct A {\n"
                    "    int x = 1;\n"
                    "    auto get() -> int & { return x; }\n"
-                   "};");
+                   "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7668,7 +7891,7 @@ class TestClass : public TestFixture {
     }
 
     void qualifiedNameMember() { // #10872
-        const Settings s = settingsBuilder().severity(Severity::style).debugwarnings().library("std.cfg").build();
+        const Settings s = settingsBuilder().severity(Severity::style).debugwarnings().library("std.cfg").certainty(Certainty::inconclusive).build();
         checkConst("struct data {};\n"
                    "    struct S {\n"
                    "    std::vector<data> std;\n"
@@ -7676,7 +7899,7 @@ class TestClass : public TestFixture {
                    "};\n"
                    "void S::f() {\n"
                    "    std::vector<data>::const_iterator end = std.end();\n"
-                   "}\n", dinit(CheckConstOptions, $.s = &s));
+                   "}\n", s);
         ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:6:9]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n", errout_str());
     }
 
@@ -7687,7 +7910,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings2, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings2, this);
+        CheckClassImpl checkClass(&tokenizer, settings2, *this);
         checkClass.initializerListOrder();
     }
 
@@ -7696,7 +7919,7 @@ class TestClass : public TestFixture {
                                   "    int a, b, c;\n"
                                   "public:\n"
                                   "    Fred() : c(0), b(0), a(0) { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:4:20] -> [test.cpp:2:12]: (style, inconclusive) Member variable 'Fred::b' is in the wrong place in the initializer list. [initializerList]\n"
                       "[test.cpp:4:26] -> [test.cpp:2:9]: (style, inconclusive) Member variable 'Fred::a' is in the wrong place in the initializer list. [initializerList]\n", errout_str());
 
@@ -7704,14 +7927,14 @@ class TestClass : public TestFixture {
                                   "    int a, b, c;\n"
                                   "public:\n"
                                   "    Fred() : c{0}, b{0}, a{0} { }\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:4:20] -> [test.cpp:2:12]: (style, inconclusive) Member variable 'Fred::b' is in the wrong place in the initializer list. [initializerList]\n"
                       "[test.cpp:4:26] -> [test.cpp:2:9]: (style, inconclusive) Member variable 'Fred::a' is in the wrong place in the initializer list. [initializerList]\n", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : b(a = 1) {}\n"
                                   "    int a, b;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
@@ -7734,7 +7957,7 @@ class TestClass : public TestFixture {
                                   "        : B(\"abc\", s.nRows(), s.nCols())\n"
                                   "        , m_i(_i)\n"
                                   "    {}\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7745,41 +7968,41 @@ class TestClass : public TestFixture {
                                   "    C() : b(&a) {}\n"
                                   "    B b;\n"
                                   "    const A a;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("[test.cpp:4:11] -> [test.cpp:5:7]: (style, inconclusive) Member variable 'C::b' uses an uninitialized argument 'a' due to the order of declarations. [initializerList]\n",
                       errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S(const std::string& f, std::string i, int b, int c) : a(0), b(b), c(c) {}\n"
                                   "    int a, b, c;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : p(a) {}\n"
                                   "    int* p;\n"
                                   "    int a[1];\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : p(&i) {}\n"
                                   "    int* p;\n"
                                   "    int i;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : a(b = 1) {}\n"
                                   "    int a, b;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S() : r(i) {}\n"
                                   "    int& r;\n"
                                   "    int i{};\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct B {\n"
@@ -7788,7 +8011,7 @@ class TestClass : public TestFixture {
                                   "struct D : B {\n"
                                   "    D() : B(), j(b) {}\n"
                                   "    int j;\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
@@ -7796,13 +8019,13 @@ class TestClass : public TestFixture {
                                   "    int a;\n"
                                   "    static int i;\n"
                                   "};\n"
-                                  "int S::i = 0;");
+                                  "int S::i = 0;\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("struct S {\n"
                                   "    S(int b) : a(b) {}\n"
                                   "    int a, b{};\n"
-                                  "};");
+                                  "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializerListOrder("class Foo {\n" // #3524
@@ -7841,7 +8064,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         checkClass.initializationListUsage();
     }
 
@@ -7852,113 +8075,113 @@ class TestClass : public TestFixture {
                                      "    int* b;\n" // No message for pointers: No performance gain
                                      "    Enum c;\n" // No message for enums: No performance gain
                                      "    Fred() { a = 0; b = 0; c = C; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string s;\n"
                                      "    Fred() { a = 0; s = \"foo\"; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:3:21]: (performance) Variable 's' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string& s;\n" // Message is invalid for references, since their initialization in initializer list is required anyway and behaves different from assignment (#5004)
                                      "    Fred(const std::string& s_) : s(s_) { s = \"foo\"; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::vector<int> v;\n"
                                      "    Fred() { v = unknown; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (performance) Variable 'v' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C { std::string s; };\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred() { c = unknown; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred() { c = unknown; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred(Fred const & other) { c = other.c; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:32]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C c;\n"
                                      "    Fred(Fred && other) { c = other.c; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() { initB(); a = b; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() : a(0) { if(b) a = 0; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a[5];\n"
                                      "    Fred() { for(int i = 0; i < 5; i++) a[i] = 0; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a; int b;\n"
                                      "    Fred() : b(5) { a = b; }\n" // Don't issue a message here: You actually could move it to the initialization list, but it would cause problems if you change the order of the variable declarations.
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() { try { a = new int; } catch(...) {} }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string s;\n"
                                      "    Fred() { s = toString((size_t)this); }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string a;\n"
                                      "    std::string foo();\n"
                                      "    Fred() { a = foo(); }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string a;\n"
                                      "    Fred() { a = foo(); }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (performance) Variable 'a' is assigned in constructor body. Consider performing initialization in initialization list. [useInitializationList]\n", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #4332
                                      "    static std::string s;\n"
                                      "    Fred() { s = \"foo\"; }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #5640
@@ -7969,7 +8192,7 @@ class TestClass : public TestFixture {
                                      "        str[1] = 0;\n"
                                      "        s = str;\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class B {\n" // #5640
@@ -7977,7 +8200,7 @@ class TestClass : public TestFixture {
                                      "    B(const B& other) : _d(std::make_shared<A>()) {\n"
                                      "        *_d = *other._d;\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Bar {\n" // #8466
@@ -7986,7 +8209,7 @@ class TestClass : public TestFixture {
                                      "    explicit Bar(const char s) : s{s} {}\n"
                                      "private:\n"
                                      "    char s;\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("unsigned bar(std::string);\n" // #8291
@@ -7995,7 +8218,7 @@ class TestClass : public TestFixture {
                                      "    int a_, b_;\n"
                                      "    Foo(int a, int b) : a_(a), b_(b) {}\n"
                                      "    Foo(int a, const std::string& b) : Foo(a, bar(b)) {}\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #8111
@@ -8005,7 +8228,7 @@ class TestClass : public TestFixture {
                                      "        ostr << x;\n"
                                      "        a = ostr.str();\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: multi line lambda in rhs => do not warn
@@ -8016,7 +8239,7 @@ class TestClass : public TestFixture {
                                      "            return 1;\n"
                                      "        };\n"
                                      "    }\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // don't warn if some other instance's members are assigned to
@@ -8025,7 +8248,7 @@ class TestClass : public TestFixture {
                                      "    C(C& c) : m_i(c.m_i) { c.m_i = (Foo)-1; }\n"
                                      "private:\n"
                                      "    Foo m_i;\n"
-                                     "};");
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class A {\n" // #9821 - delegate constructor
@@ -8038,7 +8261,22 @@ class TestClass : public TestFixture {
                                      "\n"
                                      "private:\n"
                                      "    std::string st;\n"
-                                     "};");
+                                     "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializationListUsage("struct S {\n" // #14189
+                                     "    S() {}\n"
+                                     "    int i{};\n"
+                                     "};\n"
+                                     "struct T { explicit T(const S&); };\n"
+                                     "class C {\n"
+                                     "    C() {\n"
+                                     "        S s;\n"
+                                     "        s.i = 1;\n"
+                                     "        p = std::make_unique<T>(s);\n"
+                                     "    }\n"
+                                     "    std::unique_ptr<T> p;\n"
+                                     "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8050,7 +8288,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings0, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClassImpl checkClass(&tokenizer, settings0, *this);
         (checkClass.checkSelfInitialization)();
     }
 
@@ -8059,14 +8297,14 @@ class TestClass : public TestFixture {
                                 "    int i;\n"
                                 "    Fred() : i(i) {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Member variable 'i' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    int i;\n"
                                 "    Fred() : i{i} {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Member variable 'i' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class Fred {\n"
@@ -8074,7 +8312,7 @@ class TestClass : public TestFixture {
                                 "    Fred();\n"
                                 "};\n"
                                 "Fred::Fred() : i(i) {\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (error) Member variable 'i' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class A {\n" // #10427
@@ -8097,56 +8335,56 @@ class TestClass : public TestFixture {
                                 "    std::string s;\n"
                                 "    Fred() : s(s) {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Member variable 's' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    int x;\n"
                                 "    Fred(int x);\n"
                                 "};\n"
-                                "Fred::Fred(int x) : x(x) { }");
+                                "Fred::Fred(int x) : x(x) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    int x;\n"
                                 "    Fred(int x);\n"
                                 "};\n"
-                                "Fred::Fred(int x) : x{x} { }");
+                                "Fred::Fred(int x) : x{x} { }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    std::string s;\n"
                                 "    Fred(const std::string& s) : s(s) {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    std::string s;\n"
                                 "    Fred(const std::string& s) : s{s} {\n"
                                 "    }\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : Bar {\n"
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : Bar(\"\"), i(i) {}\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : std::Bar {\n" // #6073
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : std::Bar(\"\"), i(i) {}\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : std::Bar {\n" // #6073
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : std::Bar(\"\"), i{i} {}\n"
-                                "};");
+                                "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8160,7 +8398,7 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         checkClass.checkVirtualFunctionCallInConstructor();
     }
 
@@ -8171,21 +8409,21 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{f();}");
+                                 "{f();}\n");
         ASSERT_EQUALS("[test.cpp:7:2] -> [test.cpp:3:17]: (style) Virtual function 'f' is called from constructor 'A()' at line 7. Dynamic binding is not used. [virtualCallInConstructor]\n", errout_str());
 
         checkVirtualFunctionCall("class A {\n"
                                  "    virtual int f();\n"
                                  "    A() {f();}\n"
                                  "};\n"
-                                 "int A::f() { return 1; }");
+                                 "int A::f() { return 1; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:2:17]: (style) Virtual function 'f' is called from constructor 'A()' at line 3. Dynamic binding is not used. [virtualCallInConstructor]\n", errout_str());
 
         checkVirtualFunctionCall("class A : B {\n"
                                  "    int f() override;\n"
                                  "    A() {f();}\n"
                                  "};\n"
-                                 "int A::f() { return 1; }");
+                                 "int A::f() { return 1; }\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:2:9]: (style) Virtual function 'f' is called from constructor 'A()' at line 3. Dynamic binding is not used. [virtualCallInConstructor]\n", errout_str());
 
         checkVirtualFunctionCall("class B {\n"
@@ -8195,14 +8433,14 @@ class TestClass : public TestFixture {
                                  "    int f();\n" // <- not explicitly virtual
                                  "    A() {f();}\n"
                                  "};\n"
-                                 "int A::f() { return 1; }");
+                                 "int A::f() { return 1; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  "{\n"
                                  "    A() { A::f(); }\n"
                                  "    virtual void f() {}\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A : B {\n"
@@ -8288,7 +8526,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{pure();}");
+                                 "{pure();}\n");
         ASSERT_EQUALS("[test.cpp:7:2] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8298,7 +8536,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::A():m(A::pure())\n"
-                                 "{}");
+                                 "{}\n");
         ASSERT_EQUALS("[test.cpp:7:13] -> [test.cpp:3:17]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("namespace N {\n"
@@ -8319,7 +8557,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::~A()\n"
-                                 "{pure();}");
+                                 "{pure();}\n");
         ASSERT_EQUALS("[test.cpp:8:2] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in destructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8330,7 +8568,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure();}");
+                                 "{nonpure();}\n");
         ASSERT_EQUALS("[test.cpp:9:2] -> [test.cpp:5:6] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8342,7 +8580,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::A():m(nonpure())\n"
-                                 "{}");
+                                 "{}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9:2] -> [test.cpp:5:6] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", "", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8354,7 +8592,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::~A()\n"
-                                 "{nonpure();}");
+                                 "{nonpure();}\n");
         ASSERT_EQUALS("[test.cpp:10:2] -> [test.cpp:5:6] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in destructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8363,7 +8601,7 @@ class TestClass : public TestFixture {
                                  "    A(bool b);\n"
                                  "};\n"
                                  "A::A(bool b)\n"
-                                 "{if (b) pure();}");
+                                 "{if (b) pure();}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8373,7 +8611,7 @@ class TestClass : public TestFixture {
                                  "    int m;\n"
                                  "};\n"
                                  "A::~A()\n"
-                                 "{if (b) pure();}");
+                                 "{if (b) pure();}\n");
         ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in destructor. [pureVirtualCall]\n", errout_str());
 
         // #5831
@@ -8381,7 +8619,7 @@ class TestClass : public TestFixture {
                                  "public:\n"
                                  "  virtual ~abc() throw() {}\n"
                                  "  virtual void def(void* g) throw () = 0;\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4992
@@ -8392,7 +8630,7 @@ class TestClass : public TestFixture {
                                  "        m_callback = [this]() { return VirtualMethod(); };\n"
                                  "    }\n"
                                  "    virtual void VirtualMethod() = 0;\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10559
@@ -8411,7 +8649,7 @@ class TestClass : public TestFixture {
                                  "    A(const A & a);\n"
                                  "};\n"
                                  "A::A(const A & a)\n"
-                                 "{a.pure();}");
+                                 "{a.pure();}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8424,7 +8662,7 @@ class TestClass : public TestFixture {
                                  "    virtual void pure()=0;\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{B b; b.pure();}");
+                                 "{B b; b.pure();}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8437,7 +8675,7 @@ class TestClass : public TestFixture {
                                  "A::A()\n"
                                  "{pureWithBody();}\n"
                                  "void A::pureWithBody()\n"
-                                 "{}");
+                                 "{}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8450,7 +8688,7 @@ class TestClass : public TestFixture {
                                  "A::A()\n"
                                  "{nonpure();}\n"
                                  "void A::pureWithBody()\n"
-                                 "{}");
+                                 "{}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -8464,7 +8702,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure(false);}");
+                                 "{nonpure(false);}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8475,7 +8713,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure(false);}");
+                                 "{nonpure(false);}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
@@ -8490,7 +8728,7 @@ class TestClass : public TestFixture {
                                  "    A();\n"
                                  "};\n"
                                  "A::A()\n"
-                                 "{nonpure(false);}");
+                                 "{nonpure(false);}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8505,21 +8743,21 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkOverride)();
     }
 
     void override1() {
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { virtual void f(); };");
+                      "class Derived : Base { virtual void f(); };\n");
         ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:37]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { virtual void f() override; };");
+                      "class Derived : Base { virtual void f() override; };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { virtual void f() final; };");
+                      "class Derived : Base { virtual void f() final; };\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base {\n"
@@ -8531,7 +8769,7 @@ class TestClass : public TestFixture {
                       "public :\n"
                       "    auto foo( ) const -> size_t { return 0; }\n"
                       "    auto bar( ) const -> size_t override { return 0; }\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("[test.cpp:3:18] -> [test.cpp:8:10]: (style) The function 'foo' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("namespace Test {\n"
@@ -8543,7 +8781,7 @@ class TestClass : public TestFixture {
                       "class C : Test::C {\n"
                       "public:\n"
                       "    ~C();\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:9:6]: (style) The destructor '~C' overrides a destructor in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("struct Base {\n"
@@ -8553,7 +8791,7 @@ class TestClass : public TestFixture {
                       "struct Derived: public Base {\n"
                       "   void foo() override;\n"
                       "   void foo(int);\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct B {\n" // #9092
@@ -8677,28 +8915,39 @@ class TestClass : public TestFixture {
                       "};\n");
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:5:6]: (style) The destructor '~D' overrides a destructor in a base class but is not marked with a 'override' specifier. [missingOverride]\n",
                       errout_str());
+
+        checkOverride("struct B {\n" // #14581
+                      "    virtual void f();\n"
+                      "};\n"
+                      "struct D : B {\n"
+                      "    void f() override;\n"
+                      "    template <typename T>\n"
+                      "    void f();\n"
+                      "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void overrideCVRefQualifiers() {
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() const; }");
+                      "class Derived : Base { void f() const; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() volatile; }");
+                      "class Derived : Base { void f() volatile; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() &; }");
+                      "class Derived : Base { void f() &; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
-                      "class Derived : Base { void f() &&; }");
+                      "class Derived : Base { void f() &&; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     #define checkUselessOverride(...) checkUselessOverride_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkUselessOverride_(const char* file, int line, const char code[]) {
+    template<size_t size>
+    void checkUselessOverride_(const char* file, int line, const char (&code)[size]) {
         const Settings settings = settingsBuilder().severity(Severity::style).build();
 
         SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
@@ -8706,7 +8955,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkUselessOverride)();
     }
 
@@ -8714,51 +8963,51 @@ class TestClass : public TestFixture {
         checkUselessOverride("struct B { virtual int f() { return 5; } };\n" // #11757
                              "struct D : B {\n"
                              "    int f() override { return B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:1:24] -> [test.cpp:3:9]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class. [uselessOverride]\n", errout_str());
 
         checkUselessOverride("struct B { virtual void f(); };\n"
                              "struct D : B {\n"
                              "    void f() override { B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:1:25] -> [test.cpp:3:10]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class. [uselessOverride]\n", errout_str());
 
         checkUselessOverride("struct B { virtual int f() = 0; };\n"
                              "int B::f() { return 5; }\n"
                              "struct D : B {\n"
                              "    int f() override { return B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual int f(int i); };\n"
                              "struct D : B {\n"
                              "    int f(int i) override { return B::f(i); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:1:24] -> [test.cpp:3:9]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class. [uselessOverride]\n", errout_str());
 
         checkUselessOverride("struct B { virtual int f(int i); };\n"
                              "struct D : B {\n"
                              "    int f(int i) override { return B::f(i + 1); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual int f(int i, int j); };\n"
                              "struct D : B {\n"
                              "    int f(int i, int j) override { return B::f(j, i); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual int f(); };\n"
                              "struct I { virtual int f() = 0; };\n"
                              "struct D : B, I {\n"
                              "    int f() override { return B::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct S { virtual void f(); };\n"
                              "struct D : S {\n"
                              "    void f() final { S::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct S {\n"
@@ -8768,7 +9017,7 @@ class TestClass : public TestFixture {
                              "struct D : S {\n"
                              "public:\n"
                              "    void f() override { S::f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual void f(int, int, int) const; };\n" // #11799
@@ -8778,7 +9027,7 @@ class TestClass : public TestFixture {
                              "};\n"
                              "void D::f(int a, int b, int c) const {\n"
                              "    B::f(a, b, m);\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n" // #11803
@@ -8789,7 +9038,7 @@ class TestClass : public TestFixture {
                              "    void f() override { B::f(); }\n"
                              "    void f(int i) override;\n"
                              "    void g() { f(); }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual void f(); };\n" // #11808
@@ -8798,7 +9047,7 @@ class TestClass : public TestFixture {
                              "    void f() override {\n"
                              "        B::f();\n"
                              "    }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n"
@@ -8812,7 +9061,7 @@ class TestClass : public TestFixture {
                              "    int g() override { return 7; }\n"
                              "    int h(int j, int i) override { return i + j; }\n"
                              "    int j(int i, int j) override { return i + j; }\n"
-                             "};");
+                             "};\n");
         ASSERT_EQUALS("[test.cpp:3:17] -> [test.cpp:9:9]: (style) The function 'g' overrides a function in a base class but is identical to the overridden function [uselessOverride]\n"
                       "[test.cpp:5:17] -> [test.cpp:11:9]: (style) The function 'j' overrides a function in a base class but is identical to the overridden function [uselessOverride]\n",
                       errout_str());
@@ -8896,12 +9145,12 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkUnsafeClassRefMember)();
     }
 
     void unsafeClassRefMember() {
-        checkUnsafeClassRefMember("class C { C(const std::string &s) : s(s) {} const std::string &s; };");
+        checkUnsafeClassRefMember("class C { C(const std::string &s) : s(s) {} const std::string &s; };\n");
         ASSERT_EQUALS("[test.cpp:1:37]: (warning) Unsafe class: The const reference member 'C::s' is initialized by a const reference constructor argument. You need to be careful about lifetime issues. [unsafeClassRefMember]\n", errout_str());
     }
 
@@ -8914,7 +9163,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         (checkClass.checkThisUseAfterFree)();
     }
 
@@ -8928,7 +9177,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static C *mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:38]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:13]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -8941,7 +9190,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:39]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:29]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -8955,7 +9204,7 @@ class TestClass : public TestFixture {
                               "  static std::shared_ptr<C> mInstance;\n"
                               "  void hello();\n"
                               "  void reset() { mInstance.reset(); }\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:29]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:29]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:7:18]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -8969,7 +9218,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static C *self;\n"
                               "  int x;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:33]: warning: Using member 'x' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:13]: note: Assuming 'self' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'self', invalidating 'this'\n"
@@ -8982,7 +9231,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  static C *self;\n"
                               "  std::map<int,int> x;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:3:33]: warning: Using member 'x' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:5:13]: note: Assuming 'self' is used as 'this'\n"
                       "[test.cpp:3:20]: note: Delete 'self', invalidating 'this'\n"
@@ -8997,7 +9246,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("[test.cpp:4:39]: warning: Calling method 'hello()' when 'this' might be invalid [thisUseAfterFree]\n"
                       "[test.cpp:6:22]: note: Assuming 'mInstance' is used as 'this'\n"
                       "[test.cpp:4:20]: note: Delete 'mInstance', invalidating 'this'\n"
@@ -9011,7 +9260,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  C *self;\n"
                               "  int x;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C {\n"
@@ -9021,7 +9270,7 @@ class TestClass : public TestFixture {
                               "private:\n"
                               "  std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C\n"
@@ -9038,7 +9287,7 @@ class TestClass : public TestFixture {
                               "    static C* instanceSingleton;\n"
                               "};\n"
                               "\n"
-                              "C* C::instanceSingleton;");
+                              "C* C::instanceSingleton;\n");
         ASSERT_EQUALS("", errout_str());
 
         // Avoid false positive when pointer is deleted in lambda
@@ -9054,7 +9303,7 @@ class TestClass : public TestFixture {
                               "    auto done = [this] () { delete p; };\n"
                               "    dostuff();\n"
                               "    done();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C {\n" // #13311
@@ -9070,21 +9319,22 @@ class TestClass : public TestFixture {
                               "    if (self)\n"
                               "        delete self;\n"
                               "    self = new C();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
 
     void ctu(const std::vector<std::string> &code) {
-        Check &check = getCheck<CheckClass>();
+        CheckClass checkClass;
+        Check &check = getCheck(checkClass);
 
         // getFileInfo
-        std::list<Check::FileInfo*> fileInfo;
+        std::list<const Check::FileInfo*> fileInfo;
         for (const std::string& c: code) {
             const std::string filename = std::to_string(fileInfo.size()) + ".cpp";
             SimpleTokenizer tokenizer{settingsDefault, *this, filename};
             ASSERT(tokenizer.tokenize(c));
-            fileInfo.push_back(check.getFileInfo(tokenizer, settingsDefault));
+            fileInfo.push_back(check.getFileInfo(tokenizer, settingsDefault, ""));
         }
 
         // Check code..
@@ -9098,19 +9348,19 @@ class TestClass : public TestFixture {
     }
 
     void ctuOneDefinitionRule() {
-        ctu({"class C { C() { std::cout << 0; } };", "class C { C() { std::cout << 1; } };"});
+        ctu({"class C { C() { std::cout << 0; } };\n", "class C { C() { std::cout << 1; } };\n"});
         ASSERT_EQUALS("[1.cpp:1:1] -> [0.cpp:1:1]: (error) The one definition rule is violated, different classes/structs have the same name 'C' [ctuOneDefinitionRuleViolation]\n", errout_str());
 
-        ctu({"class C { C(); }; C::C() { std::cout << 0; }", "class C { C(); }; C::C() { std::cout << 1; }"});
+        ctu({"class C { C(); }; C::C() { std::cout << 0; }\n", "class C { C(); }; C::C() { std::cout << 1; }\n"});
         ASSERT_EQUALS("[1.cpp:1:1] -> [0.cpp:1:1]: (error) The one definition rule is violated, different classes/structs have the same name 'C' [ctuOneDefinitionRuleViolation]\n", errout_str());
 
         ctu({"class C { C() {} };\n", "class C { C() {} };\n"});
         ASSERT_EQUALS("", errout_str());
 
-        ctu({"class C { C(); }; C::C(){}", "class C { C(); }; C::C(){}"});
+        ctu({"class C { C(); }; C::C(){}\n", "class C { C(); }; C::C(){}\n"});
         ASSERT_EQUALS("", errout_str());
 
-        ctu({"class A::C { C() { std::cout << 0; } };", "class B::C { C() { std::cout << 1; } };"});
+        ctu({"class A::C { C() { std::cout << 0; } };\n", "class B::C { C() { std::cout << 1; } };\n"});
         ASSERT_EQUALS("", errout_str());
 
         // 11435 - template specialisations
@@ -9128,16 +9378,16 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        const Check& c = getCheck<CheckClass>();
-        Check::FileInfo * fileInfo = (c.getFileInfo)(tokenizer, settings1);
+        CheckClass check;
+        const Check& c = getCheck(check);
+        const Check::FileInfo * fileInfo = (c.getFileInfo)(tokenizer, settings1, "");
 
         delete fileInfo;
     }
 
     void testGetFileInfo() {
-        getFileInfo("void foo() { union { struct { }; }; }"); // don't crash
-        getFileInfo("struct sometype { sometype(); }; sometype::sometype() = delete;"); // don't crash
+        getFileInfo("void foo() { union { struct { }; }; }\n"); // don't crash
+        getFileInfo("struct sometype { sometype(); }; sometype::sometype() = delete;\n"); // don't crash
     }
 
 #define checkReturnByReference(...) checkReturnByReference_(__FILE__, __LINE__, __VA_ARGS__)
@@ -9150,7 +9400,7 @@ class TestClass : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings, this);
+        CheckClassImpl checkClass(&tokenizer, settings, *this);
         (checkClass.checkReturnByReference)();
     }
 
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 1d9a7fd2c1c..326b7ad613d 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,6 +22,8 @@
 #include "config.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "filesettings.h"
+#include "fixture.h"
 #include "helpers.h"
 #include "path.h"
 #include "platform.h"
@@ -29,10 +31,13 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "fixture.h"
-#include "timer.h"
 #include "utils.h"
 
+#ifdef HAVE_RULES
+#include "regex.h"
+#include "rule.h"
+#endif
+
 #include <cstdio>
 #include <list>
 #include <memory>
@@ -48,7 +53,7 @@ class TestCmdlineParser : public TestFixture {
     {}
 
 private:
-    class CmdLineLoggerTest : public CmdLineLogger
+    class CmdLineLoggerTest final : public CmdLineLogger
     {
     public:
         CmdLineLoggerTest() = default;
@@ -90,16 +95,25 @@ class TestCmdlineParser : public TestFixture {
         std::string buf;
     };
 
+    class CmdLineParserTest final : public CmdLineParser
+    {
+        friend class TestCmdlineParser;
+    public:
+        CmdLineParserTest(CmdLineLogger &logger, Settings &settings, Suppressions &suppressions)
+            : CmdLineParser(logger, settings, suppressions)
+        {}
+    };
+
     std::unique_ptr<CmdLineLoggerTest> logger;
     std::unique_ptr<Settings> settings;
     std::unique_ptr<Suppressions> supprs;
-    std::unique_ptr<CmdLineParser> parser;
+    std::unique_ptr<CmdLineParserTest> parser;
 
     void prepareTestInternal() override {
         logger.reset(new CmdLineLoggerTest());
         settings.reset(new Settings());
         supprs.reset(new Suppressions());
-        parser.reset(new CmdLineParser(*logger, *settings, *supprs));
+        parser.reset(new CmdLineParserTest(*logger, *settings, *supprs));
     }
 
     void teardownTestInternal() override {
@@ -123,14 +137,17 @@ class TestCmdlineParser : public TestFixture {
 
     void run() override {
         TEST_CASE(nooptions);
+        TEST_CASE(nooptionsWithCfg);
+        TEST_CASE(nooptionsWithInvalidCfg);
         TEST_CASE(helpshort);
         TEST_CASE(helpshortExclusive);
+        TEST_CASE(helpshortWithCfg);
         TEST_CASE(helplong);
         TEST_CASE(helplongExclusive);
+        TEST_CASE(helplongWithCfg);
         TEST_CASE(version);
         TEST_CASE(versionWithCfg);
         TEST_CASE(versionExclusive);
-        TEST_CASE(versionWithInvalidCfg);
         TEST_CASE(checkVersionCorrect);
         TEST_CASE(checkVersionIncorrect);
         TEST_CASE(onefile);
@@ -207,6 +224,8 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(fileFilterFileWithDetailsSimplifiedPath);
         TEST_CASE(fileFilterFileWithDetailsCase);
         TEST_CASE(fileFilterStdin);
+        TEST_CASE(fileFilterPlus);
+        TEST_CASE(fileFilterNoMatch);
         TEST_CASE(fileList);
         TEST_CASE(fileListNoFile);
         TEST_CASE(fileListStdin);
@@ -225,17 +244,25 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(outputFormatText);
         TEST_CASE(outputFormatSarif);
         TEST_CASE(outputFormatXml);
+        TEST_CASE(outputFormatXmlv2);
+        TEST_CASE(outputFormatXmlv3);
         TEST_CASE(outputFormatOther);
         TEST_CASE(outputFormatImplicitPlist);
         TEST_CASE(outputFormatImplicitXml);
         TEST_CASE(outputFormatOverridePlist);
+        TEST_CASE(outputFormatMixed1);
+        TEST_CASE(outputFormatMixed2);
+        TEST_CASE(outputFormatMixed3);
         TEST_CASE(premiumOptions1);
         TEST_CASE(premiumOptions2);
         TEST_CASE(premiumOptions3);
         TEST_CASE(premiumOptions4);
         TEST_CASE(premiumOptions5);
+        TEST_CASE(premiumOptionsAll);
+        TEST_CASE(premiumOptionsMetrics);
         TEST_CASE(premiumOptionsCertCIntPrecision);
         TEST_CASE(premiumOptionsLicenseFile);
+        TEST_CASE(premiumOptionsLicenseFilePathWithSpace);
         TEST_CASE(premiumOptionsInvalid1);
         TEST_CASE(premiumOptionsInvalid2);
         TEST_CASE(premiumSafety);
@@ -270,6 +297,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(platformUnspecified);
         TEST_CASE(platformPlatformFile);
         TEST_CASE(platformUnknown);
+        TEST_CASE(platformEmpty);
         TEST_CASE(plistEmpty);
         TEST_CASE(plistDoesNotExist);
         TEST_CASE(suppressionsOld);
@@ -277,10 +305,14 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(suppressionsNoFile1);
         TEST_CASE(suppressionsNoFile2);
         TEST_CASE(suppressionsNoFile3);
-        TEST_CASE(suppressionSingle);
-        TEST_CASE(suppressionSingleFile);
-        TEST_CASE(suppressionTwo);
-        TEST_CASE(suppressionTwoSeparate);
+        TEST_CASE(suppressSingle);
+        TEST_CASE(suppressSingleFile);
+        TEST_CASE(suppressTwo);
+        TEST_CASE(suppressTwoSeparate);
+        TEST_CASE(exitcodeSuppressSingle);
+        TEST_CASE(exitcodeSuppressSingleFile);
+        TEST_CASE(exitcodeSuppressTwo);
+        TEST_CASE(exitcodeSuppressTwoSeparate);
         TEST_CASE(templates);
         TEST_CASE(templatesGcc);
         TEST_CASE(templatesVs);
@@ -314,7 +346,6 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(errorlist);
         TEST_CASE(errorlistWithCfg);
         TEST_CASE(errorlistExclusive);
-        TEST_CASE(errorlistWithInvalidCfg);
         TEST_CASE(ignorepathsnopath);
 #if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
         TEST_CASE(exceptionhandling);
@@ -371,6 +402,7 @@ class TestCmdlineParser : public TestFixture {
 #ifdef HAVE_RULES
         TEST_CASE(rule);
         TEST_CASE(ruleMissingPattern);
+        TEST_CASE(ruleInvalidPattern);
 #else
         TEST_CASE(ruleNotSupported);
 #endif
@@ -390,6 +422,8 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(ruleFileMissingId);
         TEST_CASE(ruleFileInvalidSeverity1);
         TEST_CASE(ruleFileInvalidSeverity2);
+        TEST_CASE(ruleFileInvalidPattern);
+        TEST_CASE(ruleFileInvalidEngine);
 #else
         TEST_CASE(ruleFileNotSupported);
 #endif
@@ -461,6 +495,16 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(debugSymdb);
         TEST_CASE(debugAst);
         TEST_CASE(debugValueflow);
+        TEST_CASE(debugNormal);
+        TEST_CASE(debugNormalVerbose);
+        TEST_CASE(debug);
+        TEST_CASE(debugVerbose);
+        TEST_CASE(safety);
+        TEST_CASE(safetyOverride);
+        TEST_CASE(noSafety);
+        TEST_CASE(noSafetyOverride);
+        TEST_CASE(debugAnalyzerinfo);
+        TEST_CASE(debugIpc);
 
         TEST_CASE(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -501,6 +545,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(reportTypeCertC);
         TEST_CASE(reportTypeMisraC2012);
         TEST_CASE(reportTypeMisraC2023);
+        TEST_CASE(reportTypeMisraC2025);
         TEST_CASE(reportTypeMisraCpp2008);
         TEST_CASE(reportTypeMisraCpp2023);
         TEST_CASE(invalidReportType);
@@ -514,6 +559,31 @@ class TestCmdlineParser : public TestFixture {
         ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
     }
 
+    void nooptionsWithCfg() {
+        REDIRECT;
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        "{\n"
+                        "\"productName\": \"Cppcheck Premium\","
+                        "\"manualUrl\": \"https://docs.notcppcheck.com/manual.pdf\""
+                        "}\n");
+        const char * const argv[] = {"cppcheck"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
+        const std::string log_str = logger->str();
+        ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
+        ASSERT_MSG(log_str.find("https://docs.notcppcheck.com/manual.pdf") != std::string::npos, "help url");
+    }
+
+    void nooptionsWithInvalidCfg() {
+        REDIRECT;
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        "{\n");
+        const char * const argv[] = {"cppcheck"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 2 near: \n", logger->str());
+    }
+
     void helpshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-h"};
@@ -528,6 +598,22 @@ class TestCmdlineParser : public TestFixture {
         ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
     }
 
+    void helpshortWithCfg() {
+        REDIRECT;
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        "{\n"
+                        "\"productName\": \"Cppcheck Premium\","
+                        "\"manualUrl\": \"https://docs.notcppcheck.com/manual.pdf\""
+                        "}\n");
+        const char * const argv[] = {"cppcheck", "-h"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
+        const std::string log_str = logger->str();
+        ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
+        ASSERT_MSG(log_str.find("https://docs.notcppcheck.com/manual.pdf") != std::string::npos, "help url");
+    }
+
     void helplong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--help"};
@@ -542,6 +628,22 @@ class TestCmdlineParser : public TestFixture {
         ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
     }
 
+    void helplongWithCfg() {
+        REDIRECT;
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        "{\n"
+                        "\"productName\": \"Cppcheck Premium\","
+                        "\"manualUrl\": \"https://docs.notcppcheck.com/manual.pdf\""
+                        "}\n");
+        const char * const argv[] = {"cppcheck", "--help"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
+        const std::string log_str = logger->str();
+        ASSERT_MSG(startsWith(log_str, "Cppcheck - A tool for static C/C++ code analysis"), "header");
+        ASSERT_MSG(log_str.find("https://docs.notcppcheck.com/manual.pdf") != std::string::npos, "help url");
+    }
+
     void version() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--version"};
@@ -557,8 +659,9 @@ class TestCmdlineParser : public TestFixture {
                         "}\n");
         const char * const argv[] = {"cppcheck", "--version"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
-        // TODO: somehow the config is not loaded on some systems
-        (void)logger->str(); //ASSERT_EQUALS("The Product\n", logger->str()); // TODO: include version?
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
+        ASSERT_EQUALS("The Product\n", logger->str()); // TODO: include version?
     }
 
     // TODO: test --version with extraVersion
@@ -570,15 +673,6 @@ class TestCmdlineParser : public TestFixture {
         ASSERT(logger->str().compare(0, 11, "Cppcheck 2.") == 0);
     }
 
-    void versionWithInvalidCfg() {
-        REDIRECT;
-        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
-                        "{\n");
-        const char * const argv[] = {"cppcheck", "--version"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 2 near: \n", logger->str());
-    }
-
     void checkVersionCorrect() {
         REDIRECT;
         const std::string currentVersion = parser->getVersion();
@@ -598,23 +692,23 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames().at(0));
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void onepath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "src"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("src", parser->getPathNames().at(0));
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("src", parser->mPathNames[0]);
     }
 
     void optionwithoutfile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-v"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS(0, parser->getPathNames().size());
+        ASSERT_EQUALS(0, parser->mPathNames.size());
         ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
     }
 
@@ -764,14 +858,14 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::None, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::None, parser->mEnforcedLang);
     }
 
     void enforceLanguage2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::CPP, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::CPP, parser->mEnforcedLang);
     }
 
     void enforceLanguage3() {
@@ -792,14 +886,14 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::CPP, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::CPP, parser->mEnforcedLang);
     }
 
     void enforceLanguage6() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Standards::Language::C, settings->enforcedLang);
+        ASSERT_EQUALS(Standards::Language::C, parser->mEnforcedLang);
     }
 
     void enforceLanguage7() {
@@ -1148,7 +1242,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--error-exitcode=", "file.cpp"};
         // Fails since exit code not given
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void errorExitcodeStr() {
@@ -1156,7 +1250,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--error-exitcode=foo", "file.cpp"};
         // Fails since invalid exit code
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void exitcodeSuppressionsOld() {
@@ -1218,6 +1312,29 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("file2.cpp", settings->fileFilters[1]);
     }
 
+    void fileFilterPlus() {
+        REDIRECT;
+        ScopedFile file("project.cppcheck",
+                        "<project>\n"
+                        "<paths>\n"
+                        "<dir name=\"src\"/>\n"
+                        "</paths>\n"
+                        "</project>");
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "--file-filter=+", "src/file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("src/file.cpp", settings->fileFilters.front());
+    }
+
+    void fileFilterNoMatch() {
+        REDIRECT;
+        RedirectInput input("notexist1.c\nnotexist2.cpp\n");
+        const char * const argv[] = {"cppcheck", "--file-filter=-", "."};
+        ASSERT(!fillSettingsFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: could not find any files matching the filter:notexist1.c\n"
+                      "cppcheck: error: could not find any files matching the filter:notexist2.cpp\n",
+                      logger->str());
+    }
+
     void fileList() {
         REDIRECT;
         ScopedFile file("files.txt",
@@ -1225,8 +1342,8 @@ class TestCmdlineParser : public TestFixture {
                         "file2.cpp\n");
         const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(3, parser->getPathNames().size());
-        auto it = parser->getPathNames().cbegin();
+        ASSERT_EQUALS(3, parser->mPathNames.size());
+        auto it = parser->mPathNames.cbegin();
         ASSERT_EQUALS("file1.c", *it++);
         ASSERT_EQUALS("file2.cpp", *it++);
         ASSERT_EQUALS("file.cpp", *it);
@@ -1244,8 +1361,8 @@ class TestCmdlineParser : public TestFixture {
         RedirectInput input("file1.c\nfile2.cpp\n");
         const char * const argv[] = {"cppcheck", "--file-list=-", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(3, parser->getPathNames().size());
-        auto it = parser->getPathNames().cbegin();
+        ASSERT_EQUALS(3, parser->mPathNames.size());
+        auto it = parser->mPathNames.cbegin();
         ASSERT_EQUALS("file1.c", *it++);
         ASSERT_EQUALS("file2.cpp", *it++);
         ASSERT_EQUALS("file.cpp", *it);
@@ -1284,7 +1401,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "-j", "file.cpp"};
         // Fails since -j is missing thread count
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void jobsInvalid() {
@@ -1292,7 +1409,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "-j", "e", "file.cpp"};
         // Fails since invalid count given for -j
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void jobsNoJobs() {
@@ -1313,7 +1430,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-f", "--max-configs=12", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(12, settings->maxConfigs);
+        ASSERT_EQUALS(12, settings->maxConfigsOption);
         ASSERT_EQUALS(false, settings->force);
     }
 
@@ -1322,7 +1439,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--max-configs=", "file.cpp"};
         // Fails since --max-configs= is missing limit
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void maxConfigsInvalid() {
@@ -1330,7 +1447,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--max-configs=e", "file.cpp"};
         // Fails since invalid count given for --max-configs=
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void maxConfigsTooSmall() {
@@ -1362,11 +1479,27 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
     }
 
+    void outputFormatXmlv2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--output-format=xmlv2", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
+        ASSERT_EQUALS(2, settings->xml_version);
+    }
+
+    void outputFormatXmlv3() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--output-format=xmlv3", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
+        ASSERT_EQUALS(3, settings->xml_version);
+    }
+
     void outputFormatOther() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--output-format=plist", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--output-format=' must be 'text', 'sarif' or 'xml'.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--output-format=' must be 'text', 'sarif', 'xml' (deprecated), 'xmlv2' or 'xmlv3'.\n", logger->str());
     }
 
     void outputFormatImplicitPlist() {
@@ -1392,6 +1525,27 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("", settings->plistOutput);
     }
 
+    void outputFormatMixed1() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--xml", "--output-format=xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: '--output-format' and '--xml...' may not be used in conjunction.\n", logger->str());
+    }
+
+    void outputFormatMixed2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--output-format=xml", "--xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: '--output-format' and '--xml...' may not be used in conjunction.\n", logger->str());
+    }
+
+    void outputFormatMixed3() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--xml-version=2", "--output-format=xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: '--output-format' and '--xml...' may not be used in conjunction.\n", logger->str());
+    }
+
     void premiumOptions1() {
         REDIRECT;
         asPremium();
@@ -1437,6 +1591,34 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::warning));
     }
 
+    void premiumOptionsAll() {
+        REDIRECT;
+        asPremium();
+        const char * const argv[] = {
+            "cppcheck",
+            "--premium=autosar:all",
+            "--premium=cert-c:all",
+            "--premium=cert-c++:all",
+            "--premium=misra-c-2023:all",
+            "--premium=misra-c++-2023:all",
+            "file.c"
+        };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("--autosar:all --cert-c:all --cert-c++:all --misra-c-2023:all --misra-c++-2023:all",
+                      settings->premiumArgs);
+    }
+
+    void premiumOptionsMetrics() {
+        REDIRECT;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=metrics", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("--metrics", settings->premiumArgs);
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::warning));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::portability));
+    }
+
     void premiumOptionsCertCIntPrecision() {
         REDIRECT;
         asPremium();
@@ -1445,6 +1627,14 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("--cert-c-int-precision=12", settings->premiumArgs);
     }
 
+    void premiumOptionsCertCIntPrecisionInvalid() {
+        REDIRECT;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium-cert-c-int-precision=abc", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--premium-cert-c-int-precision=' is not valid - not an integer (invalid_argument).\n", logger->str());
+    }
+
     void premiumOptionsLicenseFile() {
         REDIRECT;
         asPremium();
@@ -1453,6 +1643,14 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("--license-file=file.lic", settings->premiumArgs);
     }
 
+    void premiumOptionsLicenseFilePathWithSpace() {
+        REDIRECT;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium-license-file=license folder/file.lic", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("\"--license-file=license folder/file.lic\"", settings->premiumArgs);
+    }
+
     void premiumOptionsInvalid1() {
         REDIRECT;
         asPremium();
@@ -1496,7 +1694,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--report-progress=", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void reportProgress3() {
@@ -1662,8 +1860,8 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=unix32-unsigned", "file.cpp"};
         ASSERT(settings->platform.set(Platform::Type::Unspecified));
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Platform::Type::Unix32, settings->platform.type);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'unix32-unsigned'.\n", logger->str());
     }
 
     void platformUnix64() {
@@ -1678,8 +1876,8 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=unix64-unsigned", "file.cpp"};
         ASSERT(settings->platform.set(Platform::Type::Unspecified));
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(Platform::Type::Unix64, settings->platform.type);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'unix64-unsigned'.\n", logger->str());
     }
 
     void platformNative() {
@@ -1713,6 +1911,13 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'win128'.\n", logger->str());
     }
 
+    void platformEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: empty platform specified.\n", logger->str());
+    }
+
     void plistEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--plist-output=", "file.cpp"};
@@ -1778,30 +1983,28 @@ class TestCmdlineParser : public TestFixture {
         return e;
     }
 
-    void suppressionSingle() {
+    void suppressSingle() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, supprs->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1)));
     }
 
-    void suppressionSingleFile() {
+    void suppressSingleFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar:file.cpp", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, supprs->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
     }
 
-    void suppressionTwo() {
+    void suppressTwo() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar,noConstructor", "file.cpp"};
-        TODO_ASSERT_EQUALS(static_cast<int>(CmdLineParser::Result::Success), static_cast<int>(CmdLineParser::Result::Fail), static_cast<int>(parseFromArgs(argv)));
-        TODO_ASSERT_EQUALS(true, false, supprs->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
-        TODO_ASSERT_EQUALS(true, false, supprs->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", logger->str());
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", logger->str());
     }
 
-    void suppressionTwoSeparate() {
+    void suppressTwoSeparate() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "--suppress=noConstructor", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
@@ -1809,6 +2012,35 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(true, supprs->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
     }
 
+    void exitcodeSuppressSingle() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("uninitvar", "file.cpp", 1)));
+    }
+
+    void exitcodeSuppressSingleFile() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar:file.cpp", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+    }
+
+    void exitcodeSuppressTwo() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar,noConstructor", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", logger->str());
+    }
+
+    void exitcodeSuppressTwoSeparate() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exitcode-suppress=uninitvar", "--exitcode-suppress=noConstructor", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+        ASSERT_EQUALS(true, supprs->nofail.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
+    }
+
     void templates() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template={file}:{line},{severity},{id},{message}", "--template-location={file}:{line}:{column} {info}", "file.cpp"};
@@ -1962,7 +2194,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--xml", "--xml-version=a", "file.cpp"};
         // FAils since unknown XML format version
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void doc() {
@@ -1983,50 +2215,49 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=summary", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::SUMMARY, settings->showtime);
     }
 
     void showtimeFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=file", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_FILE);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::FILE, settings->showtime);
     }
 
     void showtimeFileTotal() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=file-total", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::FILE_TOTAL, settings->showtime);
     }
 
     void showtimeTop5() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top5", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
-        ASSERT_EQUALS("cppcheck: --showtime=top5 is deprecated and will be removed in Cppcheck 2.14. Please use --showtime=top5_file or --showtime=top5_summary instead.\n", logger->str());
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized --showtime mode: 'top5'. Supported modes: file, file-total, summary, top5_file, top5_summary.\n", logger->str());
     }
 
     void showtimeTop5File() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top5_file", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::TOP5_FILE, settings->showtime);
     }
 
     void showtimeTop5Summary() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top5_summary", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::TOP5_SUMMARY, settings->showtime);
     }
 
     void showtimeNone() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=none", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_NONE);
+        ASSERT_EQUALS_ENUM(Settings::ShowTime::NONE, settings->showtime);
     }
 
     void showtimeEmpty() {
@@ -2040,15 +2271,15 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=top10", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized --showtime mode: 'top10'. Supported modes: file, file-total, summary, top5, top5_file, top5_summary.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: unrecognized --showtime mode: 'top10'. Supported modes: file, file-total, summary, top5_file, top5_summary.\n", logger->str());
     }
 
     void errorlist() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--errorlist"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
-        ASSERT_EQUALS("", logger->str()); // empty since it is logged via ErrorLogger
         const std::string errout_s = GET_REDIRECT_OUTPUT;
+        ASSERT_EQUALS("", logger->str()); // empty since it is logged via ErrorLogger
         ASSERT(startsWith(errout_s, ErrorMessage::getXMLHeader("")));
         ASSERT(endsWith(errout_s, "</results>\n"));
     }
@@ -2059,29 +2290,23 @@ class TestCmdlineParser : public TestFixture {
                         R"({"productName": "The Product"}\n)");
         const char * const argv[] = {"cppcheck", "--errorlist"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        const std::string errout_s = GET_REDIRECT_OUTPUT;
+        ASSERT_EQUALS(1, settings->settingsFiles.size());
+        ASSERT_EQUALS(file.path(), *settings->settingsFiles.cbegin());
         ASSERT_EQUALS("", logger->str()); // empty since it is logged via ErrorLogger
-        ASSERT(startsWith(GET_REDIRECT_OUTPUT, ErrorMessage::getXMLHeader("The Product")));
+        ASSERT(startsWith(errout_s, ErrorMessage::getXMLHeader("The Product")));
     }
 
     void errorlistExclusive() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--library=missing", "--errorlist"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
-        ASSERT_EQUALS("", logger->str()); // empty since it is logged via ErrorLogger
         const std::string errout_s = GET_REDIRECT_OUTPUT;
+        ASSERT_EQUALS("", logger->str()); // empty since it is logged via ErrorLogger
         ASSERT(startsWith(errout_s, ErrorMessage::getXMLHeader("")));
         ASSERT(endsWith(errout_s, "</results>\n"));
     }
 
-    void errorlistWithInvalidCfg() {
-        REDIRECT;
-        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
-                        "{\n");
-        const char * const argv[] = {"cppcheck", "--errorlist"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: could not load cppcheck.cfg - not a valid JSON - syntax error at line 2 near: \n", logger->str());
-    }
-
     void ignorepathsnopath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i"};
@@ -2192,7 +2417,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=seven"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void valueFlowMaxIterationsInvalid3() {
@@ -2220,7 +2445,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
 #ifdef HAS_THREADING_MODEL_FORK
@@ -2242,7 +2467,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l", "one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 #else
     void loadAverageNotSupported() {
@@ -2279,7 +2504,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-ctu-depth=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void performanceValueflowMaxTime() {
@@ -2293,7 +2518,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void performanceValueFlowMaxIfCount() {
@@ -2307,7 +2532,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-if-count=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void templateMaxTime() {
@@ -2321,7 +2546,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void templateMaxTimeInvalid2() {
@@ -2342,7 +2567,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=one", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void typedefMaxTimeInvalid2() {
@@ -2362,8 +2587,8 @@ class TestCmdlineParser : public TestFixture {
                         "</project>");
         const char * const argv[] = {"cppcheck", "--project=project.cppcheck"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        auto it = parser->getPathNames().cbegin();
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        auto it = parser->mPathNames.cbegin();
         ASSERT_EQUALS("dir", *it);
     }
 
@@ -2472,6 +2697,13 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: no rule pattern provided.\n", logger->str());
     }
+
+    void ruleInvalidPattern() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--rule=.*\\", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("cppcheck: error: failed to compile rule pattern '.*\\' (\\ at end of pattern).\n", logger->str());
+    }
 #else
     void ruleNotSupported() {
         REDIRECT;
@@ -2487,6 +2719,7 @@ class TestCmdlineParser : public TestFixture {
         ScopedFile file("rule.xml",
                         "<rules>\n"
                         "<rule>\n"
+                        "<engine>pcre</engine>\n"
                         "<tokenlist>raw</tokenlist>\n"
                         "<pattern>.+</pattern>\n"
                         "<message>\n"
@@ -2509,12 +2742,14 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(2, settings->rules.size());
         auto it = settings->rules.cbegin();
+        ASSERT_EQUALS_ENUM(Regex::Engine::Pcre, it->regex->engine());
         ASSERT_EQUALS("raw", it->tokenlist);
         ASSERT_EQUALS(".+", it->pattern);
         ASSERT_EQUALS_ENUM(Severity::error, it->severity);
         ASSERT_EQUALS("ruleId1", it->id);
         ASSERT_EQUALS("ruleSummary1", it->summary);
         ++it;
+        ASSERT_EQUALS_ENUM(Regex::Engine::Pcre, it->regex->engine());
         ASSERT_EQUALS("define", it->tokenlist);
         ASSERT_EQUALS(".*", it->pattern);
         ASSERT_EQUALS_ENUM(Severity::warning, it->severity);
@@ -2538,6 +2773,7 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(1, settings->rules.size());
         auto it = settings->rules.cbegin();
+        ASSERT_EQUALS_ENUM(Regex::Engine::Pcre, it->regex->engine());
         ASSERT_EQUALS("define", it->tokenlist);
         ASSERT_EQUALS(".+", it->pattern);
         ASSERT_EQUALS_ENUM(Severity::error, it->severity);
@@ -2696,6 +2932,29 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule has an invalid severity.\n", logger->str());
     }
+
+    void ruleFileInvalidPattern() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<pattern>.+\\</pattern>\n"
+                        "</rule>\n");
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - pattern '.+\\' failed to compile (\\ at end of pattern).\n", logger->str());
+    }
+
+    void ruleFileInvalidEngine() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<engine>llvm</engine>\n"
+                        "<pattern>.+</pattern>\n"
+                        "</rule>\n");
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unknown regex engine 'llvm'.\n", logger->str());
+    }
 #else
     void ruleFileNotSupported() {
         REDIRECT;
@@ -2946,16 +3205,16 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--debug-lookup", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(true, settings->debuglookup);
         GET_REDIRECT_OUTPUT; // ignore config lookup output
+        ASSERT_EQUALS(true, settings->debuglookup);
     }
 
     void debugLookupAll() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--debug-lookup=all", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(true, settings->debuglookup);
         GET_REDIRECT_OUTPUT; // ignore config lookup output
+        ASSERT_EQUALS(true, settings->debuglookup);
     }
 
     void debugLookupAddon() {
@@ -2969,8 +3228,8 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--debug-lookup=config", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(true, settings->debuglookupConfig);
         GET_REDIRECT_OUTPUT; // ignore config lookup output
+        ASSERT_EQUALS(true, settings->debuglookupConfig);
     }
 
     void debugLookupLibrary() {
@@ -2998,7 +3257,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-template-recursion=", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-template-recursion=' is not valid - not an integer.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-template-recursion=' is not valid - not an integer (invalid_argument).\n", logger->str());
     }
 
     void emitDuplicates() {
@@ -3039,21 +3298,21 @@ class TestCmdlineParser : public TestFixture {
     void checkHeaders() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--check-headers", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, settings->checkHeaders);
     }
 
     void noCheckHeaders() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--no-check-headers", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(false, settings->checkHeaders);
     }
 
     void noCheckHeaders2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--check-headers", "--no-check-headers", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(false, settings->checkHeaders);
     }
 
@@ -3071,28 +3330,28 @@ class TestCmdlineParser : public TestFixture {
     void checkUnusedTemplates() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--check-unused-templates", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, settings->checkUnusedTemplates);
     }
 
     void noCheckUnusedTemplates() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--no-check-unused-templates", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs( argv));
         ASSERT_EQUALS(false, settings->checkUnusedTemplates);
     }
 
     void noCheckUnusedTemplates2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--check-unused-templates", "--no-check-unused-templates", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(false, settings->checkUnusedTemplates);
     }
 
     void clangTidy() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--clang-tidy", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT(settings->clangTidy);
         ASSERT_EQUALS("clang-tidy", settings->clangTidyExecutable);
     }
@@ -3100,7 +3359,7 @@ class TestCmdlineParser : public TestFixture {
     void clangTidyCustom() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--clang-tidy=clang-tidy-14", "file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT(settings->clangTidy);
         ASSERT_EQUALS("clang-tidy-14", settings->clangTidyExecutable);
     }
@@ -3124,6 +3383,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--analyze-all-vs-configs", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
         ASSERT_EQUALS(true, settings->analyzeAllVsConfigs);
+        ASSERT(parser->mAnalyzeAllVsConfigsSetOnCmdLine);
     }
 
     void noAnalyzeAllVsConfigs() {
@@ -3131,6 +3391,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--no-analyze-all-vs-configs", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: --no-analyze-all-vs-configs has no effect - no Visual Studio project provided.\n", logger->str());
+        ASSERT(parser->mAnalyzeAllVsConfigsSetOnCmdLine);
     }
 
     void noAnalyzeAllVsConfigs2() {
@@ -3138,6 +3399,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "--analyze-all-vs-configs", "--no-analyze-all-vs-configs", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
         ASSERT_EQUALS("cppcheck: error: --no-analyze-all-vs-configs has no effect - no Visual Studio project provided.\n", logger->str());
+        ASSERT(parser->mAnalyzeAllVsConfigsSetOnCmdLine);
     }
 
     void debugSymdb() {
@@ -3161,86 +3423,172 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(true, settings->debugvalueflow);
     }
 
+    void debugNormal() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-normal", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugnormal);
+        ASSERT_EQUALS(false, settings->debugSimplified);
+        ASSERT_EQUALS(true, settings->debugvalueflow);
+        ASSERT_EQUALS(false, settings->debugast);
+        ASSERT_EQUALS(false, settings->debugsymdb);
+    }
+
+    void debugNormalVerbose() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-normal", "--verbose", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugnormal);
+        ASSERT_EQUALS(false, settings->debugSimplified);
+        ASSERT_EQUALS(true, settings->debugvalueflow);
+        ASSERT_EQUALS(true, settings->debugast);
+        ASSERT_EQUALS(true, settings->debugsymdb);
+    }
+
+    void debug() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugnormal);
+        ASSERT_EQUALS(false, settings->debugSimplified);
+        ASSERT_EQUALS(true, settings->debugvalueflow);
+        ASSERT_EQUALS(false, settings->debugast);
+        ASSERT_EQUALS(false, settings->debugsymdb);
+    }
+
+    void debugVerbose() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug", "--verbose", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugnormal);
+        ASSERT_EQUALS(false, settings->debugSimplified);
+        ASSERT_EQUALS(true, settings->debugvalueflow);
+        ASSERT_EQUALS(true, settings->debugast);
+        ASSERT_EQUALS(true, settings->debugsymdb);
+    }
+
+    void safety() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--safety", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->safety);
+    }
+
+    void safetyOverride() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--no-safety", "--safety", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->safety);
+    }
+
+    void noSafety() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--no-safety", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(false, settings->safety);
+    }
+
+    void noSafetyOverride() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--safety", "--no-safety", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(false, settings->safety);
+    }
+
+    void debugAnalyzerinfo() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-analyzerinfo", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugainfo);
+    }
+
+    void debugIpc() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-ipc", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugipc);
+    }
+
     void ignorepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void ignorepaths2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i", "src", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void ignorepaths3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(2, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS("module", parser->getIgnoredPaths()[1]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(2, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS("module", parser->mIgnoredPaths[1]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void ignorepaths4() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(2, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS("module", parser->getIgnoredPaths()[1]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(2, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS("module", parser->mIgnoredPaths[1]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void ignorefilepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("foo.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("foo.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void ignorefilepaths2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src/foo.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src/foo.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void ignorefilepaths3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i", "foo.cpp", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("foo.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("foo.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void ignorefilepaths4() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("foo.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("foo.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
         TODO_ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\n", "cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());
     }
 
@@ -3248,10 +3596,10 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-ifile.cpp", "file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("file.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("file.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
         ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());
     }
 
@@ -3259,10 +3607,10 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc/file.cpp", "src/file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src/file.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("src/file.cpp", parser->mPathNames[0]);
         ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());
     }
 
@@ -3270,10 +3618,10 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc\\file.cpp", "src/file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src/file.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("src/file.cpp", parser->mPathNames[0]);
         ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());
     }
 
@@ -3281,10 +3629,10 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc/file.cpp", "src\\file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src/file.cpp", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("src/file.cpp", parser->mPathNames[0]);
         ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());
     }
 
@@ -3292,10 +3640,10 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc\\", "src\\file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
-        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src/", parser->getIgnoredPaths()[0]);
-        ASSERT_EQUALS(1, parser->getPathNames().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getPathNames()[0]);
+        ASSERT_EQUALS(1, parser->mIgnoredPaths.size());
+        ASSERT_EQUALS("src/", parser->mIgnoredPaths[0]);
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("src/file.cpp", parser->mPathNames[0]);
         ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());
     }
 
@@ -3439,14 +3787,21 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char *const argv[] = { "cppcheck", "--report-type=misra-c-2012", "file.cpp" };
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS_ENUM(ReportType::misraC, settings->reportType);
+        ASSERT_EQUALS_ENUM(ReportType::misraC2012, settings->reportType);
     }
 
     void reportTypeMisraC2023() {
         REDIRECT;
         const char *const argv[] = { "cppcheck", "--report-type=misra-c-2023", "file.cpp" };
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS_ENUM(ReportType::misraC, settings->reportType);
+        ASSERT_EQUALS_ENUM(ReportType::misraC2023, settings->reportType);
+    }
+
+    void reportTypeMisraC2025() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=misra-c-2025", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::misraC2025, settings->reportType);
     }
 
     void reportTypeMisraCpp2008() {
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index 4e19837f37c..6d62b644043 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,9 +24,7 @@
 #include "settings.h"
 
 #include <cstddef>
-#include <limits>
 #include <string>
-#include <vector>
 
 class TestCondition : public TestFixture {
 public:
@@ -35,6 +33,7 @@ class TestCondition : public TestFixture {
 private:
     const Settings settings0 = settingsBuilder().library("qt.cfg").library("std.cfg").severity(Severity::style).severity(Severity::warning).build();
     /*const*/ Settings settings1 = settingsBuilder().severity(Severity::style).severity(Severity::warning).build();
+    const Settings settings2 = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
 
     void run() override {
         const char cfg[] = "<?xml version=\"1.0\"?>\n"
@@ -95,6 +94,8 @@ class TestCondition : public TestFixture {
         TEST_CASE(identicalConditionAfterEarlyExit);
         TEST_CASE(innerConditionModified);
 
+        TEST_CASE(overlappingInnerCondition);
+
         TEST_CASE(clarifyCondition1);     // if (a = b() < 0)
         TEST_CASE(clarifyCondition2);     // if (a & b == c)
         TEST_CASE(clarifyCondition3);     // if (! a & b)
@@ -110,6 +111,8 @@ class TestCondition : public TestFixture {
         TEST_CASE(alwaysTrueContainer);
         TEST_CASE(alwaysTrueLoop);
         TEST_CASE(alwaysTrueTryCatch);
+        TEST_CASE(alwaysTrueSideEffect);
+        TEST_CASE(alwaysTruePremiumMisra);
         TEST_CASE(multiConditionAlwaysTrue);
         TEST_CASE(duplicateCondition);
 
@@ -130,37 +133,37 @@ class TestCondition : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
-        const Settings* s = nullptr;
         bool cpp = true;
-        bool inconclusive = false;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const CheckOptions& options = make_default_obj()) {
-        const Settings settings = settingsBuilder(options.s ? *options.s : settings0).certainty(Certainty::inconclusive, options.inconclusive).build();
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
+        check_(file, line, code, settings0, options.cpp);
+    }
 
-        SimpleTokenizer2 tokenizer(settings, *this, code, options.cpp ? "test.cpp" : "test.c");
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& settings, bool cpp = true) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, cpp ? "test.cpp" : "test.c");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Run checks..
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkP_(const char* file, int line, const char code[])
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size])
     {
-        const Settings settings = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
-
-        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
+        SimpleTokenizer2 tokenizer(settings2, *this, code, "test.cpp");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Run checks..
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, *this);
     }
 
     void assignAndCompare() {
@@ -169,59 +172,59 @@ class TestCondition : public TestFixture {
               "{\n"
               "    int y = x & 4;\n"
               "    if (y == 3);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false. [assignIfError]\n", errout_str());
 
         check("void foo(int x)\n"
               "{\n"
               "    int y = x & 4;\n"
               "    if (y != 3);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'y!=3' is always true. [assignIfError]\n", errout_str());
 
         // |
         check("void foo(int x) {\n"
               "    int y = x | 0x14;\n"
               "    if (y == 0x710);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:8]: (style) Mismatching assignment and comparison, comparison 'y==0x710' is always false. [assignIfError]\n", errout_str());
 
         check("void foo(int x) {\n"
               "    int y = x | 0x14;\n"
               "    if (y == 0x71f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // various simple assignments
         check("void foo(int x) {\n"
               "    int y = (x+1) | 1;\n"
               "    if (y == 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:8]: (style) Mismatching assignment and comparison, comparison 'y==2' is always false. [assignIfError]\n", errout_str());
 
         check("void foo() {\n"
               "    int y = 1 | x();\n"
               "    if (y == 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:8]: (style) Mismatching assignment and comparison, comparison 'y==2' is always false. [assignIfError]\n", errout_str());
 
         // multiple conditions
         check("void foo(int x) {\n"
               "    int y = x & 4;\n"
               "    if ((y == 3) && (z == 1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:9]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false. [assignIfError]\n", errout_str());
 
         check("void foo(int x) {\n"
               "    int y = x & 4;\n"
               "    if ((x==123) || ((y == 3) && (z == 1)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:22]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    int y = x & 7;\n"
               "    if (setvalue(&y) && y != 8);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // recursive checking into scopes
@@ -229,20 +232,20 @@ class TestCondition : public TestFixture {
               "    int y = x & 7;\n"
               "    if (z) y=0;\n"
               "    else { if (y==8); }\n" // always false
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:15]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         // while
         check("void f(int x) {\n"
               "    int y = x & 7;\n"
               "    while (y==8);\n" // local variable => always false
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:11]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    extern int y; y = x & 7;\n"
               "    while (y==8);\n" // non-local variable => no error
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -251,7 +254,7 @@ class TestCondition : public TestFixture {
               "        int y = 16 | a;\n"
               "        while (y != 0) y--;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int x);\n"
@@ -261,7 +264,7 @@ class TestCondition : public TestFixture {
               "        int y = 16 | a;\n"
               "        while (y != 0) g(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:15] -> [test.cpp:6:15]: (style) Mismatching assignment and comparison, comparison 'y!=0' is always true. [assignIfError]\n",
             errout_str());
@@ -273,7 +276,7 @@ class TestCondition : public TestFixture {
               "        int y = 16 | a;\n"
               "        while (y != 0) g(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // calling function
@@ -281,14 +284,14 @@ class TestCondition : public TestFixture {
               "    int y = x & 7;\n"
               "    do_something();\n"
               "    if (y==8);\n" // local variable => always false
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    int y = x & 7;\n"
               "    do_something(&y);\n" // passing variable => no error
               "    if (y==8);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void do_something(int);\n"
@@ -296,14 +299,14 @@ class TestCondition : public TestFixture {
               "    int y = x & 7;\n"
               "    do_something(y);\n"
               "    if (y==8);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:5:8]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false. [assignIfError]\n", errout_str());
 
         check("void f(int x) {\n"
               "    extern int y; y = x & 7;\n"
               "    do_something();\n"
               "    if (y==8);\n" // non-local variable => no error
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4434 : false positive: ?:
@@ -311,28 +314,28 @@ class TestCondition : public TestFixture {
               "    x = x & 1;\n"
               "    x = x & 1 ? 1 : -1;\n"
               "    if(x != -1) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4735
         check("void f() {\n"
               "    int x = *(char*)&0x12345678;\n"
               "    if (x==18) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: no variable info
         check("void foo(int x) {\n"
               "    y = 2 | x;\n"  // y not declared => no error
               "    if(y == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: negative number
         check("void foo(int x) {\n"
               "    int y = -2 | x;\n" // negative number => no error
               "    if (y==1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // bailout: pass variable to function
@@ -340,7 +343,7 @@ class TestCondition : public TestFixture {
               "    int y = 2 | x;\n"
               "    bar(&y);\n"  // pass variable to function => no error
               "    if (y==1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // no crash on unary operator& (#5643)
@@ -348,7 +351,7 @@ class TestCondition : public TestFixture {
         check("SdrObject* ApplyGraphicToObject() {\n"
               "    if (&rHitObject) {}\n"
               "    else if (rHitObject.IsClosedObj() && !&rHitObject) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Condition '&rHitObject' is always true [knownConditionTrueFalse]\n"
                       "[test.cpp:3:42]: (style) Condition '!&rHitObject' is always false [knownConditionTrueFalse]\n",
                       errout_str());
@@ -361,7 +364,7 @@ class TestCondition : public TestFixture {
               "    if (c == 4)\n"
               "      c  = 0;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a) {\n" // #6662
@@ -369,7 +372,7 @@ class TestCondition : public TestFixture {
               "  while (x <= 4) {\n"
               "    if (x != 5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:8]: (style) Mismatching assignment and comparison, comparison 'x!=5' is always true. [assignIfError]\n", errout_str());
 
         check("void f(int a) {\n" // #6662
@@ -377,7 +380,7 @@ class TestCondition : public TestFixture {
               "  while ((x += 4) < 10) {\n"
               "    if (x != 5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -385,7 +388,7 @@ class TestCondition : public TestFixture {
               "    while (x) {\n"
               "        g(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int x);\n"
@@ -394,7 +397,7 @@ class TestCondition : public TestFixture {
               "    while (x) {\n"
               "        g(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void g(int & x);\n"
@@ -403,7 +406,7 @@ class TestCondition : public TestFixture {
               "    while (x) {\n"
               "        g(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -412,13 +415,13 @@ class TestCondition : public TestFixture {
         check("void f(int a) {\n"
               "    int b = a & 0xf0;\n"
               "    b &= 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:5]: (style) Mismatching bitmasks. Result is always 0 (X = Y & 0xf0; Z = X & 0x1; => Z=0). [mismatchingBitAnd]\n", errout_str());
 
         check("void f(int a) {\n"
               "    int b = a & 0xf0;\n"
               "    int c = b & 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:9]: (style) Mismatching bitmasks. Result is always 0 (X = Y & 0xf0; Z = X & 0x1; => Z=0). [mismatchingBitAnd]\n", errout_str());
 
         check("void f(int a) {\n"
@@ -427,67 +430,67 @@ class TestCondition : public TestFixture {
               "    case 1: b &= 1; break;\n"
               "    case 2: b &= 2; break;\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void comparison() {
         // CheckCondition::comparison test cases
         // '=='
-        check("void f(int a) {\n assert( (a & 0x07) == 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) == 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) == 0x8' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & b & 4 & c ) == 3 );\n}");
+        check("void f(int a) {\n assert( (a & b & 4 & c ) == 3 );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (style) Expression '(X & 0x4) == 0x3' is always false. [comparisonError]\n", errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) == 8U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) == 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) == 0x8' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) == 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) == 7U );\n}\n");
         ASSERT_EQUALS("", errout_str());
-        check("void f(int a) {\n assert( (a | 0x01) == -15 );\n}");
+        check("void f(int a) {\n assert( (a | 0x01) == -15 );\n}\n");
         ASSERT_EQUALS("", errout_str());
         // '!='
-        check("void f(int a) {\n assert( (a & 0x07) != 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) != 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) != 0x8' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) != 8U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) != 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) != 0x8' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) != 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) != 7U );\n}\n");
         ASSERT_EQUALS("", errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) != 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) != 7U );\n}\n");
         ASSERT_EQUALS("", errout_str());
         // '>='
-        check("void f(int a) {\n assert( (a & 0x07) >= 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) >= 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) >= 0x8' is always false. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x7) >= 7U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x7) >= 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) >= 0x7' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) >= 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) >= 7U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) >= 8U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) >= 8U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '>'
-        check("void f(int a) {\n assert( (a & 0x07) > 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) > 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) > 0x7' is always false. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x7) > 6U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x7) > 6U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) > 0x6' is always true. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) > 6U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) > 6U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) > 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) > 7U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '<='
-        check("void f(int a) {\n assert( (a & 0x07) <= 7U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) <= 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) <= 0x7' is always true. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x08) <= 7U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x08) <= 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x8) <= 0x7' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) <= 6U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) <= 6U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x08) <= 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x08) <= 7U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '<'
-        check("void f(int a) {\n assert( (a & 0x07) < 8U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) < 8U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X & 0x7) < 0x8' is always true. [comparisonError]\n",errout_str());
-        check("void f(unsigned int a) {\n assert( (a | 0x07) < 7U );\n}");
+        check("void f(unsigned int a) {\n assert( (a | 0x07) < 7U );\n}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Expression '(X | 0x7) < 0x7' is always false. [comparisonError]\n",errout_str());
-        check("void f(int a) {\n assert( (a & 0x07) < 3U );\n}");
+        check("void f(int a) {\n assert( (a & 0x07) < 3U );\n}\n");
         ASSERT_EQUALS("",errout_str());
-        check("void f(int a) {\n assert( (a | 0x07) < 7U );\n}");
+        check("void f(int a) {\n assert( (a | 0x07) < 7U );\n}\n");
         ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
 
         check("void f(int i) {\n" // #11998
@@ -517,20 +520,30 @@ class TestCondition : public TestFixture {
                       errout_str());
     }
 
-#define checkPureFunction(code) checkPureFunction_(code, __FILE__, __LINE__)
+#define checkPureFunction(...) checkPureFunction_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkPureFunction_(const char* file, int line, const char (&code)[size]) {
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        CheckCondition check;
+        runChecks(check, tokenizer, *this);
+    }
+
     void multicompare() {
         check("void foo(int x)\n"
               "{\n"
               "    if (x & 7);\n"
               "    else { if (x == 1); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n", errout_str());
 
         check("void foo(int x)\n"
               "{\n"
               "    if (x & 7);\n"
               "    else { if (x & 1); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n", errout_str());
 
         check("extern int bar() __attribute__((pure));\n"
@@ -538,7 +551,7 @@ class TestCondition : public TestFixture {
               "{\n"
               "    if ( bar() >1 && b) {}\n"
               "    else if (bar() >1 && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (style) Expression is always false because 'else if' condition matches previous condition at line 4. [multiCondition]\n", errout_str());
 
         checkPureFunction("extern int bar();\n"
@@ -546,14 +559,14 @@ class TestCondition : public TestFixture {
                           "{\n"
                           "    if ( bar() >1 && b) {}\n"
                           "    else if (bar() >1 && b) {}\n"
-                          "}");
+                          "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (style) Expression is always false because 'else if' condition matches previous condition at line 4. [multiCondition]\n", errout_str());
 
         // 7284
         check("void foo() {\n"
               "    if (a) {}\n"
               "    else if (!!a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         // #11059
@@ -576,66 +589,57 @@ class TestCondition : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    template<size_t size>
-    void checkPureFunction_(const char (&code)[size], const char* file, int line) {
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
-
-        runChecks<CheckCondition>(tokenizer, this);
-    }
-
     void overlappingElseIfCondition() {
         check("void f(int a, int &b) {\n"
               "    if (a) { b = 1; }\n"
               "    else { if (a) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a) { b = 1; }\n"
               "    else { if (a) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a == 1) { b = 1; }\n"
               "    else { if (a == 2) { b = 2; }\n"
               "    else { if (a == 1) { b = 3; } } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a == 1) { b = 1; }\n"
               "    else { if (a == 2) { b = 2; }\n"
               "    else { if (a == 2) { b = 3; } } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (a++) { b = 1; }\n"
               "    else { if (a++) { b = 2; }\n"
               "    else { if (a++) { b = 3; } } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int &b) {\n"
               "    if (!strtok(NULL, \" \")) { b = 1; }\n"
               "    else { if (!strtok(NULL, \" \")) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
             check("void f(Class &c) {\n"
                   "    if (c.dostuff() == 3) {}\n"
                   "    else { if (c.dostuff() == 3) {} }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             check("void f(const Class &c) {\n"
                   "    if (c.dostuff() == 3) {}\n"
                   "    else { if (c.dostuff() == 3) {} }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:3:28]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
         }
 
@@ -643,13 +647,13 @@ class TestCondition : public TestFixture {
               "   x = x / 2;\n"
               "   if (x < 100) { b = 1; }\n"
               "   else { x = x / 2; if (x < 100) { b = 2; } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int i) {\n"
+        check("void f(int64_t i) {\n"
               "   if(i == 0x02e2000000 || i == 0xa0c6000000)\n"
               "       foo(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket 3689 ( avoid false positive )
@@ -671,13 +675,13 @@ class TestCondition : public TestFixture {
               "            return -1;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(WIDGET *widget) {\n"
               "  if (dynamic_cast<BUTTON*>(widget)){}\n"
               "  else if (dynamic_cast<LABEL*>(widget)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B { virtual void v() {} };\n" // #11037
@@ -694,67 +698,67 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n" // #6482
               "  if (x & 1) {}\n"
               "  else if (x == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 15) {}\n"
               "  else if (x == 40) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x == sizeof(double)) {}\n"
-              "  else { if (x == sizeof(long double)) {} }"
-              "}");
+              "  else { if (x == sizeof(long double)) {} }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 0x08) {}\n"
               "  else if (x & 0xF8) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 0xF8) {}\n"
               "  else if (x & 0x08) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!b && !!a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!b && a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( b && !!a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( b && !(!a)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!b && !(!a)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Expression is always false because 'else if' condition matches previous condition at line 2. [multiCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "   if(a && b){}\n"
               "   else if( !!(b) && !!(a+b)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8168
@@ -766,18 +770,18 @@ class TestCondition : public TestFixture {
               "void TestFunction(int value) {\n"
               "    if ( value & (int)Value1 ) {}\n"
               "    else if ( value & (int)Value2 ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(size_t x) {\n"
               "    if (x == sizeof(int)) {}\n"
-              "    else { if (x == sizeof(long))} {}\n"
+              "    else { if (x == sizeof(long)) {} }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(size_t x) {\n"
               "    if (x == sizeof(long)) {}\n"
-              "    else { if (x == sizeof(long long))} {}\n"
+              "    else { if (x == sizeof(long long)) {} }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
@@ -788,7 +792,7 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "    if (x) {}\n"
               "    else if (!x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: style: Expression is always true because 'else if' condition is opposite to previous condition at line 2. [multiCondition]\n"
                       "[test.cpp:2:9]: note: first condition\n"
                       "[test.cpp:3:14]: note: else if condition is opposite to first condition\n", errout_str());
@@ -797,7 +801,7 @@ class TestCondition : public TestFixture {
               "    int y = x;\n"
               "    if (x) {}\n"
               "    else if (!y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: style: Expression is always true because 'else if' condition is opposite to previous condition at line 3. [multiCondition]\n"
                       "[test.cpp:2:13]: note: 'y' is assigned value 'x' here.\n"
                       "[test.cpp:3:9]: note: first condition\n"
@@ -808,31 +812,31 @@ class TestCondition : public TestFixture {
         check("bool f(int x) {\n"
               "    bool b = x | 0x02;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("bool f(int x) {\n"
               "    bool b = 0x02 | x;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    int b = x | 0x02;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    bool b = x & 0x02;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    if(x | 0x02)\n"
               "        return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("bool f(int x) {\n"
@@ -840,27 +844,27 @@ class TestCondition : public TestFixture {
               "    if(b) y = 0;\n"
               "    if(x | y)\n"
               "        return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    foo(a && (x | 0x02));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    return (x | 0x02) ? 0 : 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    return x ? (x | 0x02) : 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("bool f(int x) {\n"
@@ -868,19 +872,19 @@ class TestCondition : public TestFixture {
               "    return x | 0x02;\n"
               "  }\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("const bool f(int x) {\n"
               "    return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("struct F {\n"
               "  static const bool f(int x) {\n"
               "      return x | 0x02;\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("struct F {\n"
@@ -888,12 +892,12 @@ class TestCondition : public TestFixture {
               "};\n"
               "F::b_t f(int x) {\n"
               "  return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'? [badBitmaskCheck]\n", errout_str());
 
         check("int f(int x) {\n"
               "    return x | 0x02;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void create_rop_masks_4( rop_mask_bits *bits) {\n"
@@ -901,7 +905,7 @@ class TestCondition : public TestFixture {
               "BYTE *and_bits = bits->and;\n"
               "rop_mask *rop_mask;\n"
               "and_bits[mask_offset] |= (rop_mask->and & 0x0f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned a, unsigned b) {\n"
@@ -909,7 +913,7 @@ class TestCondition : public TestFixture {
               "  if (cmd1 | a) {\n"
               "    if (b == 0x0C) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n" // #11082
@@ -937,7 +941,7 @@ class TestCondition : public TestFixture {
               "#if BAR_ENABLED\n"
               "    FEATURE_BAR |\n"
               "#endif\n"
-              "    0;");
+              "    0;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("enum precedence { PC0, UNARY };\n"
@@ -956,84 +960,84 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "    if ((x != 1) || (x != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Logical disjunction always evaluates to true: x != 1 || x != 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 != x || 3 != x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x != 1 || x != 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x<0 && !x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Logical conjunction always evaluates to false: x < 0 && !x. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x==0 && x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Logical conjunction always evaluates to false: x == 0 && x. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n" // ast..
               "    if (y == 1 && x == 1 && x == 7) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (warning) Logical conjunction always evaluates to false: x == 1 && x == 7. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if (x != 1 || y != 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((y == 1) && (x != 1) || (x != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 1) || (x != 3) && (y == 1))\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:2:24]: (style) Condition 'x!=3' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x != 1) && (x != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) || (x == 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 1) || (y != 3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != hotdog) || (y != hotdog))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 5) || (y != 5))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((x != 5) || (x != 6))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Logical disjunction always evaluates to true: x != 5 || x != 6. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(unsigned int a, unsigned int b, unsigned int c) {\n"
@@ -1042,7 +1046,7 @@ class TestCondition : public TestFixture {
               "        return true;\n"
               "    }\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23] -> [test.cpp:2:35]: (style) Condition 'c!=a' is always false [knownConditionTrueFalse]\n", errout_str());
     }
 
@@ -1050,224 +1054,224 @@ class TestCondition : public TestFixture {
         check("void f(float x) {\n"
               "    if ((x == 1) && (x == 1.0))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) && (x == 0x00000001))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:2:24]: (style) Condition 'x==0x00000001' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x == 1 && x == 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: x == 1 && x == 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x == 1.0 && x == 3.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // float comparisons with == and != are not checked right now - such comparison is a bad idea
 
         check("void f(float x) {\n"
               "    if (x == 1 && x == 1.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void bar(float f) {\n" // #5246
               "    if ((f > 0) && (f < 1)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1.0 && x > 1.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Logical conjunction always evaluates to false: x < 1.0 && x > 1.0. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 1.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 1.0. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 1.0 && x <= 1.001)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(float x) {\n"
               "    if (x < 1.0 && x > 3.0)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Logical conjunction always evaluates to false: x < 1.0 && x > 3.0. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > x && 3 < x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 3 && x > 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x < 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x > 3 || x < 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x <= 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x <= 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x < 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x < 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x <= 10)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x > 3 || x <= 10. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x < 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x <= 3)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x <= 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x < 3)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x >= 3 || x < 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x <= 3)\n"
               "        a++;\n"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x > 3 || x <= 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "   if((x==3) && (x!=4))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Redundant condition: The condition 'x != 4' is redundant since 'x == 3' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(const std::string &s) {\n" // #8860
               "    const std::size_t p = s.find(\"42\");\n"
               "    const std::size_t * const ptr = &p;\n"
               "    if(p != std::string::npos && p == 0 && *ptr != 1){;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:36] -> [test.cpp:4:49]: (style) Condition '*ptr!=1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x!=4) && (x==3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Redundant condition: The condition 'x != 4' is redundant since 'x == 3' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x==3) || (x!=4))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Redundant condition: The condition 'x == 3' is redundant since 'x != 4' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x!=4) || (x==3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Redundant condition: The condition 'x == 3' is redundant since 'x != 4' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x==3) && (x!=3))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: x == 3 && x != 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x==6) || (x!=6))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical disjunction always evaluates to true: x == 6 || x != 6. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 10 || x < 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x == 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 5 && x == 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x == 6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x == 6' is sufficient. [redundantCondition]\n", errout_str());
 
         // #3419
         check("void f() {\n"
               "    if ( &q != &a && &q != &b ) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3676
         check("void f(int m_x2, int w, int x) {\n"
               "    if (x + w - 1 > m_x2 || m_x2 < 0 )\n"
               "        m_x2 = x + w - 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x <= 1.0e20 && x >= -1.0e20) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x >= 1.0e20 && x <= 1.0e21) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x <= -1.0e20 && x >= -1.0e21) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1277,7 +1281,7 @@ class TestCondition : public TestFixture {
               "    c = x < 1 && x == 3;\n"
               "    d = x >= 5 && x == 1;\n"
               "    e = x <= 1 && x == 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 5 && x == 1. [incorrectLogicOperator]\n"
                       "[test.cpp:3:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x == 3. [incorrectLogicOperator]\n"
                       "[test.cpp:4:16]: (warning) Logical conjunction always evaluates to false: x >= 5 && x == 1. [incorrectLogicOperator]\n"
@@ -1288,7 +1292,7 @@ class TestCondition : public TestFixture {
         check("#define ZERO 0\n"
               "void f(int x) {\n"
               "  if (x && x != ZERO) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int N) {\n" // #9789
@@ -1303,58 +1307,59 @@ class TestCondition : public TestFixture {
     void incorrectLogicOperator5() { // complex expressions
         check("void f(int x) {\n"
               "  if (x+3 > 2 || x+3 < 10) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical disjunction always evaluates to true: x+3 > 2 || x+3 < 10. [incorrectLogicOperator]\n", errout_str());
     }
 
     void incorrectLogicOperator6() { // char literals
+        const Settings s = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
         check("void f(char x) {\n"
               "  if (x == '1' || x == '2') {}\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char x) {\n"
               "  if (x == '1' && x == '2') {}\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: x == '1' && x == '2'. [incorrectLogicOperator]\n", errout_str());
 
         check("int f(char c) {\n"
               "  return (c >= 'a' && c <= 'z');\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(char c) {\n"
               "  return (c <= 'a' && c >= 'z');\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:20]: (warning, inconclusive) Logical conjunction always evaluates to false: c <= 'a' && c >= 'z'. [incorrectLogicOperator]\n", errout_str());
 
         check("int f(char c) {\n"
               "  return (c <= 'a' && c >= 'z');\n"
-              "}");
+              "}\n"); // TODO: use s?
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:2:25]: (style) Return value 'c>='z'' is always false [knownConditionTrueFalse]\n", errout_str());
     }
 
     void incorrectLogicOperator7() { // opposite expressions
         check("void f(int i) {\n"
               "  if (i || !i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (warning) Logical disjunction always evaluates to true: i || !(i). [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (a>b || a<=b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Logical disjunction always evaluates to true: a > b || a <= b. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (a>b || a<b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6064 False positive incorrectLogicOperator - invalid assumption about template type?
         check("template<typename T> T icdf( const T uniform ) {\n"
               "   if ((0<uniform) && (uniform<1))\n"
               "     {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6081 False positive: incorrectLogicOperator, with close negative comparisons
@@ -1364,14 +1369,14 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    else\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void incorrectLogicOperator8() { // opposite expressions
         check("void f(int i) {\n"
               "  if (!(i!=10) && !(i!=20)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: !(i != 10) && !(i != 20). [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1380,7 +1385,7 @@ class TestCondition : public TestFixture {
               "class OtherType;\n"
               "void foo (OtherType* obj) {\n"
               "    assert((!obj) || dynamic_cast<MyType*>(obj));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1389,21 +1394,21 @@ class TestCondition : public TestFixture {
               "void f(Type_t t) {\n"
               "    if ((t == A) && (t == B))\n"
               "    {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (warning) Logical conjunction always evaluates to false: t == 0 && t == 1. [incorrectLogicOperator]\n", errout_str());
     }
 
     void incorrectLogicOperator11() {
-        check("void foo(int i, const int n) { if ( i < n && i == n ) {} }");
+        check("void foo(int i, const int n) { if ( i < n && i == n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:43]: (warning) Logical conjunction always evaluates to false: i < n && i == n. [incorrectLogicOperator]\n", errout_str());
 
-        check("void foo(int i, const int n) { if ( i > n && i == n ) {} }");
+        check("void foo(int i, const int n) { if ( i > n && i == n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:43]: (warning) Logical conjunction always evaluates to false: i > n && i == n. [incorrectLogicOperator]\n", errout_str());
 
-        check("void foo(int i, const int n) { if ( i == n && i > n ) {} }");
+        check("void foo(int i, const int n) { if ( i == n && i > n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:44]: (warning) Logical conjunction always evaluates to false: i == n && i > n. [incorrectLogicOperator]\n", errout_str());
 
-        check("void foo(int i, const int n) { if ( i == n && i < n ) {} }");
+        check("void foo(int i, const int n) { if ( i == n && i < n ) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:44]: (warning) Logical conjunction always evaluates to false: i == n && i < n. [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1417,7 +1422,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:6:9] -> [test.cpp:8:13]: (warning) Logical conjunction always evaluates to false: a > x && a < y. [incorrectLogicOperator]\n",
             errout_str());
@@ -1431,7 +1436,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(A a, A b) {\n"
@@ -1440,7 +1445,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(A a, A b) {\n"
@@ -1449,7 +1454,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:15] -> [test.cpp:3:15] -> [test.cpp:5:13]: (warning) Logical conjunction always evaluates to false: a > x && a < y. [incorrectLogicOperator]\n",
             errout_str());
@@ -1463,7 +1468,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:8:18]: (style) Condition 'a<y' is always false [knownConditionTrueFalse]\n",
                       errout_str());
@@ -1477,7 +1482,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(A a) {\n"
@@ -1486,7 +1491,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(A a) {\n"
@@ -1495,7 +1500,7 @@ class TestCondition : public TestFixture {
               "  y.f();\n"
               "  if (a > x && a < y)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:5:18]: (style) Condition 'a<y' is always false [knownConditionTrueFalse]\n",
                       errout_str());
@@ -1506,13 +1511,13 @@ class TestCondition : public TestFixture {
         check("void f(const int &v) {\n"
               "    const int x=v;\n"
               "    if ((v == 1) && (x == 2)) {;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:3:18]: (warning) Logical conjunction always evaluates to false: v == 1 && x == 2. [incorrectLogicOperator]\n", errout_str());
 
         check("void f2(const int *v) {\n"
               "    const int *x=v;\n"
               "    if ((*v == 1) && (*x == 2)) {;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:3:19]: (warning) Logical conjunction always evaluates to false: *(v) == 1 && *(x) == 2. [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1719,7 +1724,7 @@ class TestCondition : public TestFixture {
               "      if (f && g)\n"
               "        ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:200:11] -> [test.cpp:200:16]: (style) Condition 'g' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
@@ -1775,31 +1780,31 @@ class TestCondition : public TestFixture {
         check("void f(void) {\n" // #8892
               "    const char c[1] = { \'x\' }; \n"
               "    if(c[0] == \'x\'){;}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Condition 'c[0]=='x'' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x != 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x != 1' is redundant since 'x > 5' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x != 6)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x > 5) && (x != 1))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Redundant condition: The condition 'x != 1' is redundant since 'x > 5' is sufficient. [redundantCondition]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x > 5) && (x != 6))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool& b) {\n"
@@ -1807,7 +1812,7 @@ class TestCondition : public TestFixture {
               "    c = x < 5 || x == 4;\n"
               "    d = x >= 3 || x == 4;\n"
               "    e = x <= 5 || x == 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x > 3' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:15]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x < 5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:16]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x >= 3' is sufficient. [redundantCondition]\n"
@@ -1819,7 +1824,7 @@ class TestCondition : public TestFixture {
               "    c = x < 1 || x != 3;\n"
               "    d = x >= 5 || x != 1;\n"
               "    e = x <= 1 || x != 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x != 1' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:15]: (style) Redundant condition: The condition 'x < 1' is redundant since 'x != 3' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:16]: (style) Redundant condition: The condition 'x >= 5' is redundant since 'x != 1' is sufficient. [redundantCondition]\n"
@@ -1831,7 +1836,7 @@ class TestCondition : public TestFixture {
               "    c = x > 5 || x > 6;\n"
               "    d = x < 6 && x < 5;\n"
               "    e = x < 5 || x < 6;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x > 6' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:15]: (style) Redundant condition: The condition 'x > 6' is redundant since 'x > 5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:15]: (style) Redundant condition: The condition 'x < 6' is redundant since 'x < 5' is sufficient. [redundantCondition]\n"
@@ -1843,7 +1848,7 @@ class TestCondition : public TestFixture {
               "    c = x > 5.5 || x > 6.5;\n"
               "    d = x < 6.5 && x < 5.5;\n"
               "    e = x < 5.5 || x < 6.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Redundant condition: The condition 'x > 5.5' is redundant since 'x > 6.5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:3:17]: (style) Redundant condition: The condition 'x > 6.5' is redundant since 'x > 5.5' is sufficient. [redundantCondition]\n"
                       "[test.cpp:4:17]: (style) Redundant condition: The condition 'x < 6.5' is redundant since 'x < 5.5' is sufficient. [redundantCondition]\n"
@@ -1861,49 +1866,49 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "    if (x < 1 && x > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > x && x > 3)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && 3 < x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 > x && 3 < x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 && x < 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (3 < x && x < 1)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 && 1 > x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if (3 < x && 1 > x)\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
     }
 
@@ -1913,7 +1918,7 @@ class TestCondition : public TestFixture {
               "    b2 = a % c == 100000;\n"
               "    b3 = a % 5 == c;\n"
               "    return a % 5 == 5-p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool& b1, bool& b2, bool& b3, bool& b4, bool& b5) {\n"
@@ -1923,7 +1928,7 @@ class TestCondition : public TestFixture {
               "    b4 = a % 5 != 5;\n"
               "    b5 = a % 5 >= 5;\n"
               "    return a % 5 > 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:16]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
             "[test.cpp:3:16]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
@@ -1937,7 +1942,7 @@ class TestCondition : public TestFixture {
               "    b1 = bar() % 5 < 889;\n"
               "    if(x[593] % 5 <= 5)\n"
               "        b2 = x.a % 5 == 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:20]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
             "[test.cpp:3:19]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
@@ -1947,7 +1952,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "    if (a % 2 + b % 2 == 2)\n"
               "        foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1956,21 +1961,21 @@ class TestCondition : public TestFixture {
               "    if(a==b)\n"
               "        if(a!=b)\n"
               "            cout << a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("bool foo(int a, int b) {\n"
               "    if(a==b)\n"
               "        return a!=b;\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:17]: (warning) Opposite inner 'return' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if(a==b)\n"
               "        if(b!=a)\n"
               "            cout << a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(int a) {\n"
@@ -1980,7 +1985,7 @@ class TestCondition : public TestFixture {
               "        else\n"
               "            cout << 100;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:14]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         // #4186
@@ -1991,7 +1996,7 @@ class TestCondition : public TestFixture {
               "        else\n"
               "            cout << 100;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 4170
@@ -2010,7 +2015,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    void next();\n"
               "    const char *tok;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i)\n"
@@ -2021,7 +2026,7 @@ class TestCondition : public TestFixture {
               "           cout << a;\n"
               "       }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i) {\n"
@@ -2033,7 +2038,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i);\n"
@@ -2044,7 +2049,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i);\n"
@@ -2054,7 +2059,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(const int &i);\n"
@@ -2064,7 +2069,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(int i);\n"
@@ -2075,7 +2080,7 @@ class TestCondition : public TestFixture {
               "        if(i<5) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:6:13]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("class C { void f(int &i) const; };\n" // #7028 - variable is changed by const method
@@ -2084,7 +2089,7 @@ class TestCondition : public TestFixture {
               "    c.f(i);\n"
               "    if (i != 5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // see linux revision 1f80c0cc
@@ -2098,7 +2103,7 @@ class TestCondition : public TestFixture {
               "           err = rc;\n"
               "       }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:11] -> [test.cpp:7:14]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
 
@@ -2109,7 +2114,7 @@ class TestCondition : public TestFixture {
               "    array[0] += 5;\n"
               "    if (array[0] > 2) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6227 - FP caused by simplifications of casts and known variables
@@ -2118,7 +2123,7 @@ class TestCondition : public TestFixture {
               "       B *b = dynamic_cast<B*>(a);\n"
               "       if(!b) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a) {\n"
@@ -2126,7 +2131,7 @@ class TestCondition : public TestFixture {
               "       int b = a;\n"
               "       if(!b) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:2:7] -> [test.cpp:4:11]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void foo(unsigned u) {\n"
@@ -2136,7 +2141,7 @@ class TestCondition : public TestFixture {
               "      u = x;\n"
               "    }\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8186
@@ -2144,7 +2149,7 @@ class TestCondition : public TestFixture {
               "  for (int i=0;i<4;i++) {\n"
               "    if (i==5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:3:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         // #8938
@@ -2153,7 +2158,7 @@ class TestCondition : public TestFixture {
               "        GetActiveCell(&(upperleft.Col), &(upperleft.Row));\n"
               "        if (upperleft.Row == -1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9702
@@ -2166,7 +2171,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    bool IsSet() const { return m_value; }\n"
               "    bool m_value = false;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #12725
@@ -2188,7 +2193,7 @@ class TestCondition : public TestFixture {
               "           err = rc;\n"
               "       }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Fred::f() {\n" // daca: ace
@@ -2196,7 +2201,7 @@ class TestCondition : public TestFixture {
               "    this->next_ = n;\n"
               "    if (this->next_ != map_man_->table_) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(float *f) {\n" // #7405
@@ -2204,13 +2209,13 @@ class TestCondition : public TestFixture {
               "    (*f) += 0.1f;\n"
               "    if(*f<10) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int * f(int * x, int * y) {\n"
               "    if(!x) return x;\n"
               "    return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2222,7 +2227,7 @@ class TestCondition : public TestFixture {
               "    fred.dostuff();\n"
               "    if (!fred.isValid()) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:5:9]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("class Fred { public: bool isValid() const; void dostuff() const; };\n"
@@ -2232,7 +2237,7 @@ class TestCondition : public TestFixture {
               "    fred.dostuff();\n" // <- dostuff() is const, warn
               "    if (!fred.isValid()) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:19] -> [test.cpp:6:9]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void f() {\n"
@@ -2241,7 +2246,7 @@ class TestCondition : public TestFixture {
               "    fred.dostuff();\n"
               "    if (!fred.isValid()) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6385 "crash in Variable::getFlag()"
@@ -2252,14 +2257,14 @@ class TestCondition : public TestFixture {
               "             qApp->removeTranslator(mTranslator);\n"
               "        }\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str()); // just don't crash...
 
         check("bool f(std::ofstream &CFileStream) {\n" // #8198
               "  if(!CFileStream.good()) { return; }\n"
               "  CFileStream << \"abc\";\n"
               "  if (!CFileStream.good()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2270,7 +2275,7 @@ class TestCondition : public TestFixture {
               "       x = do_something();\n"
               "       if (x != -1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5750 - another fp when undeclared variable is used
@@ -2279,7 +2284,7 @@ class TestCondition : public TestFixture {
               "       r += 3;\n"
               "       if (r > w) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6574 - another fp when undeclared variable is used
@@ -2288,7 +2293,7 @@ class TestCondition : public TestFixture {
               "       i++;\n"
               "       if(!i) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // undeclared array
@@ -2297,7 +2302,7 @@ class TestCondition : public TestFixture {
               "    a[x] -= dt;\n"
               "    if (a[x] < 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6313 - false positive: opposite conditions in nested if blocks when condition changed
@@ -2307,7 +2312,7 @@ class TestCondition : public TestFixture {
               "      if(!var){}\n"
               "      else {}\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // daca hyphy
@@ -2316,7 +2321,7 @@ class TestCondition : public TestFixture {
               "    rec.Delete(i);\n"
               "    if (rec.lLength!=0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2330,7 +2335,7 @@ class TestCondition : public TestFixture {
               "    doStuff(&s);\n"
               "    if (hasFailed) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) Condition '!hasFailed' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
@@ -2341,7 +2346,7 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x==5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2349,14 +2354,14 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x!=5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x!=5' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<4) {\n"
               "    if (x>5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2364,7 +2369,7 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x>=5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2372,14 +2377,14 @@ class TestCondition : public TestFixture {
               "  if (x<4) {\n"
               "    if (x<5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<5' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<4) {\n"
               "    if (x<=5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<=5' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -2387,49 +2392,49 @@ class TestCondition : public TestFixture {
               "  if (x<5) {\n"
               "    if (x==4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x!=4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x!=6) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x!=6' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x>4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>4' is always false [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x>=4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x<4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x<=4) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<=4' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // first comparison: >
@@ -2438,35 +2443,35 @@ class TestCondition : public TestFixture {
               "  if (x>4) {\n"
               "    if (x==5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x>5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x>=5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>=5' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x<5) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<5' is always false [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x<=5) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -2474,7 +2479,7 @@ class TestCondition : public TestFixture {
               "  if (x>5) {\n"
               "    if (x==4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2482,21 +2487,21 @@ class TestCondition : public TestFixture {
               "  if (x>5) {\n"
               "    if (x>4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>4' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>5) {\n"
               "    if (x>=4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x>=4' is always true [knownConditionTrueFalse]\n", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>5) {\n"
               "    if (x<4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
         check("void f(int x) {\n"
@@ -2504,7 +2509,7 @@ class TestCondition : public TestFixture {
               "  if (x>5) {\n"
               "    if (x<=4) {}\n" // <- Warning
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
                       errout_str());
 
@@ -2512,62 +2517,62 @@ class TestCondition : public TestFixture {
               "  if (x < 4) {\n"
               "    if (10 < x) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:12]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
     }
 
     void oppositeInnerCondition3() {
-        check("void f3(char c) { if(c=='x') if(c=='y') {}}");
+        check("void f3(char c) { if(c=='x') if(c=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:23] -> [test.cpp:1:34]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f4(char *p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f4(char *p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:25] -> [test.cpp:1:37]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f5(const char * const p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f5(const char * const p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:38] -> [test.cpp:1:50]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f5(const char * const p) { if('x'==*p) if('y'==*p) {}}");
+        check("void f5(const char * const p) { if('x'==*p) if('y'==*p) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:39] -> [test.cpp:1:51]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f6(char * const p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f6(char * const p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:32] -> [test.cpp:1:44]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f7(const char * p) { if(*p=='x') if(*p=='y') {}}");
+        check("void f7(const char * p) { if(*p=='x') if(*p=='y') {}}\n");
         ASSERT_EQUALS("[test.cpp:1:32] -> [test.cpp:1:44]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f8(int i) { if(i==4) if(i==2) {}}");
+        check("void f8(int i) { if(i==4) if(i==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:22] -> [test.cpp:1:31]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f9(int *p) { if (*p==4) if(*p==2) {}}");
+        check("void f9(int *p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:25] -> [test.cpp:1:35]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f10(int * const p) { if (*p==4) if(*p==2) {}}");
+        check("void f10(int * const p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:33] -> [test.cpp:1:43]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f11(const int *p) { if (*p==4) if(*p==2) {}}");
+        check("void f11(const int *p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:32] -> [test.cpp:1:42]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f12(const int * const p) { if (*p==4) if(*p==2) {}}");
+        check("void f12(const int * const p) { if (*p==4) if(*p==2) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:39] -> [test.cpp:1:49]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("struct foo {\n"
               "    int a;\n"
               "    int b;\n"
               "};\n"
-              "void f(foo x) { if(x.a==4) if(x.b==2) {}}");
+              "void f(foo x) { if(x.a==4) if(x.b==2) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct foo {\n"
               "    int a;\n"
               "    int b;\n"
               "};\n"
-              "void f(foo x) { if(x.a==4) if(x.b==4) {}}");
+              "void f(foo x) { if(x.a==4) if(x.b==4) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f3(char a, char b) { if(a==b) if(a==0) {}}");
+        check("void f3(char a, char b) { if(a==b) if(a==0) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { if (x == 1) if (x != 1) {} }");
+        check("void f(int x) { if (x == 1) if (x != 1) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:23] -> [test.cpp:1:35]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
     }
 
@@ -2575,8 +2580,8 @@ class TestCondition : public TestFixture {
         check("void f(int x) {\n"
               "  if (a>3 && x > 100) {\n"
               "    if (x < 10) {}\n"
-              "  }"
-              "}");
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:11]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
         check("void f(bool x, const int a, const int b) {\n"
@@ -2627,57 +2632,69 @@ class TestCondition : public TestFixture {
     }
 
     void oppositeInnerConditionEmpty() {
-        check("void f1(const std::string &s) { if(s.size() > 42) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() > 42) if(s.empty()) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:45] -> [test.cpp:1:61]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() > 0) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() > 0) if(s.empty()) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:45] -> [test.cpp:1:60]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() < 0) if(s.empty()) {}} "); // <- CheckOther reports: checking if unsigned expression is less than zero
+        check("void f1(const std::string &s) { if(s.size() < 0) if(s.empty()) {}} \n"); // <- CheckOther reports: checking if unsigned expression is less than zero
         ASSERT_EQUALS("[test.cpp:1:45] -> [test.cpp:1:60]: (style) Condition 's.empty()' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void f1(const std::string &s) { if(s.empty()) if(s.size() > 42) {}}");
+        check("void f1(const std::string &s) { if(s.empty()) if(s.size() > 42) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:43] -> [test.cpp:1:59]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("template<class T> void f1(const T &s) { if(s.size() > 42) if(s.empty()) {}}");
+        check("template<class T> void f1(const T &s) { if(s.size() > 42) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str()); //We don't know the type of T so we don't know the relationship between size() and empty(). e.g. s might be a 50 tonne truck with nothing in it.
 
-        check("void f2(const std::wstring &s) { if(s.empty()) if(s.size() > 42) {}}");
+        check("void f2(const std::wstring &s) { if(s.empty()) if(s.size() > 42) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:44] -> [test.cpp:1:60]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(QString s) { if(s.isEmpty()) if(s.length() > 42) {}}");
+        check("void f1(QString s) { if(s.isEmpty()) if(s.length() > 42) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:34] -> [test.cpp:1:52]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
 
-        check("void f1(const std::string &s, bool b) { if(s.empty() || ((s.size() == 1) && b)) {}}");
+        check("void f1(const std::string &s, bool b) { if(s.empty() || ((s.size() == 1) && b)) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &x, const std::string &y) { if(x.size() > 42) if(y.empty()) {}}");
+        check("void f1(const std::string &x, const std::string &y) { if(x.size() > 42) if(y.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &x, const std::string &y) { if(y.empty()) if(x.size() > 42) {}}");
+        check("void f1(const std::string &x, const std::string &y) { if(y.empty()) if(x.size() > 42) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string v[10]) { if(v[0].size() > 42) if(v[1].empty()) {}}");
+        check("void f1(const std::string v[10]) { if(v[0].size() > 42) if(v[1].empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() <= 1) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() <= 1) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() <= 2) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() <= 2) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() < 2) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() < 2) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.size() >= 0) if(s.empty()) {}} "); // CheckOther says: Unsigned expression 's.size()' can't be negative so it is unnecessary to test it. [unsignedPositive]
+        check("void f1(const std::string &s) { if(s.size() >= 0) if(s.empty()) {}} \n"); // CheckOther says: Unsigned expression 's.size()' can't be negative so it is unnecessary to test it. [unsignedPositive]
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f1(const std::string &s) { if(42 < s.size()) if(s.empty()) {}}\n");
+        ASSERT_EQUALS("[test.cpp:1:39] -> [test.cpp:1:61]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
+
+        check("void f1(const std::string &s) { if(s.empty()) if(42 < s.size()) {}}\n");
+        ASSERT_EQUALS("[test.cpp:1:43] -> [test.cpp:1:53]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
+
+        check("void f(const std::string& s, int n) {\n" // #14716
+              "    if (s.size() < n)\n"
+              "        if (s.empty()) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: These are identical condition since size cannot be negative
-        check("void f1(const std::string &s) { if(s.size() <= 0) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() <= 0) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: These are identical condition since size cannot be negative
-        check("void f1(const std::string &s) { if(s.size() < 1) if(s.empty()) {}}");
+        check("void f1(const std::string &s) { if(s.size() < 1) if(s.empty()) {}}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2692,7 +2709,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    void bar();\n"
               "    int get() const;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct CD {\n"
@@ -2720,7 +2737,7 @@ class TestCondition : public TestFixture {
               "  bool b = f();\n"
               "  x += 1;\n"
               "  if (!b && f()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(double d) {\n"
@@ -2749,10 +2766,10 @@ class TestCondition : public TestFixture {
     }
 
     void identicalInnerCondition() {
-        check("void f1(int a, int b) { if(a==b) if(a==b) {}}");
+        check("void f1(int a, int b) { if(a==b) if(a==b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:1:38]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
-        check("void f2(int a, int b) { if(a!=b) if(a!=b) {}}");
+        check("void f2(int a, int b) { if(a!=b) if(a!=b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:1:38]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         // #6645 false negative: condition is always false
@@ -2761,38 +2778,38 @@ class TestCondition : public TestFixture {
               "     if(a) {}\n"
               "     else  {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6] -> [test.cpp:3:9]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         check("bool f(int a, int b) {\n"
               "    if(a == b) { return a == b; }\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:2:27]: (warning) Identical inner 'return' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         check("bool f(bool a) {\n"
               "    if(a) { return a; }\n"
               "    return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(int* a, int * b) {\n"
               "    if(a) { return a; }\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::shared_ptr<int> a, std::shared_ptr<int> b) {\n"
               "    if(a.get()) { return a.get(); }\n"
               "    return b.get();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int * x; };\n"
               "int* f(A a, int * b) {\n"
               "    if(a.x) { return a.x; }\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2804,7 +2821,7 @@ class TestCondition : public TestFixture {
               "        get_value (&value);\n"
               "        if ((value >> 28) & 1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define TYPE_1 \"a\"\n" // #13202
@@ -2816,61 +2833,85 @@ class TestCondition : public TestFixture {
                "        if (s == TYPE_2) {}\n"
                "        else if (s == TYPE_3) {}\n"
                "    }\n"
-               "}");
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const int* p, const int* e) {\n" // #14595
+              "    for (; p;) {\n"
+              "        if (p == e) {}\n"
+              "        if (p) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:4:13]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
+
+        check("int f(const int *q, const int *s) {\n" // #14711
+              "    if (*q && *s)\n"
+              "        return *q;\n"
+              "    return 0;\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(int x, int y) {\n"
+              "    int a[] = { x, y };\n"
+              "    if (a[0] == 1) {\n"
+              "        if (a[0] == 1) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:4:18]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n",
+                      errout_str());
     }
 
     void identicalConditionAfterEarlyExit() {
         check("void f(int x) {\n" // #8137
               "  if (x > 100) { return; }\n"
               "  if (x > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("bool f(int x) {\n"
               "  if (x > 100) { return false; }\n"
               "  return x > 100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:12]: (warning) Identical condition and return expression 'x>100', return value is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  if (x > 100 || y > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  if (x > 100 && y > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  if (abc) {}\n"
               "  if (x > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x > 100) { return; }\n"
               "  while (abc) { y = x; }\n"
               "  if (x > 100) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:9]: (warning) Identical condition 'x>100', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         ASSERT_THROW_INTERNAL(check("void f(int x) {\n"  // #8217 - crash for incomplete code
                                     "  if (x > 100) { return; }\n"
                                     "  X(do);\n"
                                     "  if (x > 100) {}\n"
-                                    "}"),
+                                    "}\n"),
                               SYNTAX);
 
         check("void f(const int *i) {\n"
               "  if (!i) return;\n"
               "  if (!num1tok) { *num1 = *num2; }\n"
               "  if (!i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:4:7]: (warning) Identical condition '!i', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void C::f(Tree &coreTree) {\n" // daca
@@ -2878,7 +2919,7 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "  coreTree.dostuff();\n"
               "  if(!coreTree.build()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C { void f(const Tree &coreTree); };\n"
@@ -2887,7 +2928,7 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "  coreTree.dostuff();\n"
               "  if(!coreTree.build()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6] -> [test.cpp:6:6]: (warning) Identical condition '!coreTree.build()', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("void f(int x) {\n" // daca: labplot
@@ -2900,7 +2941,7 @@ class TestCondition : public TestFixture {
               "    else return 4;\n"
               "  }\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static int failed = 0;\n"
@@ -2908,14 +2949,14 @@ class TestCondition : public TestFixture {
               "  if (failed) return;\n"
               "  checkBuffer();\n"
               "  if (failed) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // daca icu
         check("void f(const uint32_t *section, int32_t  start) {\n"
               "  if(10<=section[start]) { return; }\n"
               "  if(++start<100 && 10<=section[start]) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // daca iqtree
@@ -2925,7 +2966,7 @@ class TestCondition : public TestFixture {
               "  if (ch != '|') return;\n"
               "  in >> ch;\n"
               "  if (ch != '|') {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8924
@@ -2936,7 +2977,7 @@ class TestCondition : public TestFixture {
               "        if (this->FileIndex < 0) return;\n"
               "    }\n"
               "    int FileIndex;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:29]: (style) Condition 'this->FileIndex<0' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8858 - #if
@@ -2948,7 +2989,7 @@ class TestCondition : public TestFixture {
               "    ret = bar2();\n"
               "#endif\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10456
@@ -2986,7 +3027,7 @@ class TestCondition : public TestFixture {
               "    x += y;\n"
               "    if (x == 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -2994,7 +3035,7 @@ class TestCondition : public TestFixture {
               "    x += y;\n"
               "    if (x == 1) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int * x, int * y) {\n"
@@ -3002,7 +3043,32 @@ class TestCondition : public TestFixture {
               "    (*y)++;\n"
               "    if (x[*y] == 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(int[]);\n" // #14724
+              "void f(int a[]) {\n"
+              "    if (a[0] == 1) {\n"
+              "        g(a);\n"
+              "        if (a[0] == 1) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void overlappingInnerCondition() {
+        check("void f(int x) {\n"
+              "    if (x == 1) {\n"
+              "        if (x & 7) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:15]: (warning) Overlapping inner 'if' condition is always true. [overlappingInnerCondition]\n", errout_str());
+
+        check("void f(int x) {\n"
+              "    if (x & 7) {\n"
+              "        if (x == 1) {}\n"
+              "    }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3010,102 +3076,102 @@ class TestCondition : public TestFixture {
     void clarifyCondition1() {
         check("void f() {\n"
               "    if (x = b() < 0) {}\n" // don't simplify and verify this code
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Suspicious condition (assignment + comparison); Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f(int i) {\n"
               "    for (i = 0; i < 10; i++) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    x = a<int>(); if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (x = b < 0 ? 1 : 2) {}\n" // don't simplify and verify this code
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int y = rand(), z = rand();\n"
               "    if (y || (!y && z));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant condition: !y. 'y || (!y && z)' is equivalent to 'y || z' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    int y = rand(), z = rand();\n"
               "    if (y || !y && z);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant condition: !y. 'y || (!y && z)' is equivalent to 'y || z' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (!a || a && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Redundant condition: a. '!a || (a && b)' is equivalent to '!a || b' [redundantCondition]\n", errout_str());
 
 
         check("void f(const Token *tok) {\n"
               "    if (!tok->next()->function() ||\n"
               "        (tok->next()->function() && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:34]: (style) Redundant condition: tok->next()->function(). '!A || (A && B)' is equivalent to '!A || B' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (!tok->next()->function() ||\n"
               "        (!tok->next()->function() && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (!tok->next()->function() ||\n"
               "        (!tok2->next()->function() && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const Token *tok) {\n"
               "    if (!tok->next(1)->function(1) ||\n"
               "        (tok->next(1)->function(1) && tok->next(1)->function(1)->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:36]: (style) Redundant condition: tok->next(1)->function(1). '!A || (A && B)' is equivalent to '!A || B' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (!tok->next()->function(1) ||\n"
               "        (tok->next()->function(2) && tok->next()->function()->isConstructor()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int y = rand(), z = rand();\n"
               "   if (y==0 || y!=0 && z);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Redundant condition: y!=0. 'y==0 || (y!=0 && z)' is equivalent to 'y==0 || z' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "  if (x>0 || (x<0 && y)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test Token::expressionString, TODO move this test
         check("void f() {\n"
               "  if (!dead || (dead && (*it).ticks > 0)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Redundant condition: dead. '!dead || (dead && (*it).ticks>0)' is equivalent to '!dead || (*it).ticks>0' [redundantCondition]\n", errout_str());
 
         check("void f() {\n"
               "  if (!x || (x && (2>(y-1)))) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Redundant condition: x. '!x || (x && 2>(y-1))' is equivalent to '!x || 2>(y-1)' [redundantCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if (a || (a && b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Redundant condition: a. 'a || (a && b)' is equivalent to 'a' [redundantCondition]\n", errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    if (a && (a || b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Redundant condition: a. 'a && (a || b)' is equivalent to 'a' [redundantCondition]\n", errout_str());
     }
 
@@ -3113,14 +3179,14 @@ class TestCondition : public TestFixture {
     void clarifyCondition2() {
         check("void f() {\n"
               "    if (x & 3 == 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Suspicious condition (bitwise operator + comparison); Clarify expression with parentheses. [clarifyCondition]\n"
                       "[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n"
                       "[test.cpp:2:11]: (style) Condition 'x&3==2' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    if (a & fred1.x == fred2.y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Suspicious condition (bitwise operator + comparison); Clarify expression with parentheses. [clarifyCondition]\n"
                       "[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n"
                       , errout_str());
@@ -3130,50 +3196,50 @@ class TestCondition : public TestFixture {
     void clarifyCondition3() {
         check("void f(int w) {\n"
               "    if(!w & 0x8000) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f(int w) {\n"
               "    if((!w) & 0x8000) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (x == foo() & 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (2 & x == foo()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
         check("void f() {\n"
               "    if (2 & (x == foo())) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(std::list<int> &ints) { }");
+        check("void f(std::list<int> &ints) { }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { A<x &> a; }");
+        check("void f() { A<x &> a; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a(x<y|z,0); }", dinit(CheckOptions, $.cpp = false));  // language is c => there are never templates
+        check("void f() { a(x<y|z,0); }\n", dinit(CheckOptions, $.cpp = false));  // language is c => there are never templates
         ASSERT_EQUALS("[test.c:1:17]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses. [clarifyCondition]\n", errout_str());
 
-        check("class A<B&,C>;");
+        check("class A<B&,C>;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (result != (char *)&inline_result) { }\n" // don't simplify and verify cast
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8495
         check("void f(bool a, bool b) {\n"
               "    C & a & b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3188,13 +3254,13 @@ class TestCondition : public TestFixture {
               "     {\n"
               "         return left.first < right.first;\n"
               "     }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCondition5() { // ticket #3609 (using | in template instantiation)
         check("template<bool B> struct CWinTraits;\n"
-              "CWinTraits<WS_CHILD|WS_VISIBLE>::GetWndStyle(0);");
+              "CWinTraits<WS_CHILD|WS_VISIBLE>::GetWndStyle(0);\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3203,7 +3269,7 @@ class TestCondition : public TestFixture {
               "SharedPtr& operator=( SharedPtr<Y> const & r ) {\n"
               "    px = r.px;\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3212,7 +3278,7 @@ class TestCondition : public TestFixture {
         check("void f(bool error) {\n"
               "    bool & withoutSideEffects=found.first->second;\n" // Declaring a reference to a boolean; & is no operator at all
               "    execute(secondExpression, &programMemory, &result, &error);\n" // Unary &
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3222,24 +3288,24 @@ class TestCondition : public TestFixture {
         check("bool a();\n"
               "bool f(bool b) {\n"
               "    return (a() & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool *a, bool b) {\n"
               "    return (a[10] & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { bool a; };\n"
               "bool f(struct A a, bool b) {\n"
               "    return (a.a & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { bool a; };\n"
               "bool f(struct A a, bool b) {\n"
               "    return (A::a & b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3247,7 +3313,7 @@ class TestCondition : public TestFixture {
         check("void png_parse(uint64_t init, int buf_size) {\n"
               "    if (init == 0x89504e470d0a1a0a || init == 0x8a4d4e470d0a1a0a)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3256,7 +3322,7 @@ class TestCondition : public TestFixture {
               "void foo() {\n"
               "    if( ( value >= 0x7ff0000000000001ULL )\n"
               "            && ( value <= 0x7fffffffffffffffULL ) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3266,7 +3332,7 @@ class TestCondition : public TestFixture {
               "  int x1 = s->x;\n"
               "  int x2 = s->x;\n"
               "  if (x1 == 10 && x2 == 10) {}\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:4:22]: (style) Condition 'x2==10' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f ()\n"// #8220
@@ -3282,27 +3348,27 @@ class TestCondition : public TestFixture {
               "        a ++;\n"
               "    }\n"
               "    ret = b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:27] -> [test.cpp:8:40]: (style) Condition '8<a' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n" // #4842
               "  int x = 0;\n"
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (!x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Condition '!x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("bool f(int x) {\n"
               "  if(x == 0) { x++; return x == 0; }\n"
               "  return false;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:2:30]: (style) Return value 'x==0' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n" // #6898 (Token::expressionString)
               "  int x = 0;\n"
               "  A(x++ == 1);\n"
               "  A(x++ == 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Condition 'x++==1' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:4:9]: (style) Condition 'x++==2' is always false [knownConditionTrueFalse]\n",
                       errout_str());
@@ -3314,68 +3380,68 @@ class TestCondition : public TestFixture {
               "  if (bar == 2)\n"
               "    ret = true;\n"
               "  return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f1(const std::string &s) { if(s.empty()) if(s.size() == 0) {}}");
+        check("void f1(const std::string &s) { if(s.empty()) if(s.size() == 0) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:43] -> [test.cpp:1:59]: (style) Condition 's.size()==0' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   if( buf != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (style) Condition 'buf!=0' is always true [knownConditionTrueFalse]\n", errout_str()); // #8924
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   if( !buf ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Condition '!buf' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   bool b = buf;\n"
               "   if( b ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (style) Condition 'b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   bool b = buf;\n"
               "   if( !b ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (style) Condition '!b' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   int * p = nullptr;\n"
               "   if( buf == p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Condition 'buf==p' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(bool x) {\n"
               "   int buf[42];\n"
               "   if( buf || x ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Condition 'buf' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int * p) {\n"
               "   int buf[42];\n"
               "   if( buf == p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   int p[42];\n"
               "   if( buf == p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   if( buf == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Avoid FP when condition comes from macro
@@ -3384,7 +3450,7 @@ class TestCondition : public TestFixture {
               "  int x = 0;\n"
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (NOT x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("#define M  x != 0\n"
@@ -3392,27 +3458,27 @@ class TestCondition : public TestFixture {
               "  int x = 0;\n"
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (M) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("#define IF(X)  if (X && x())\n"
               "void f() {\n"
               "  IF(1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Avoid FP for sizeof condition
         check("void f() {\n"
               "  if (sizeof(char) != 123) {}\n"
               "  if (123 != sizeof(char)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x = 123;\n"
               "  if (sizeof(char) != x) {}\n"
               "  if (x != sizeof(char)) {}\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'sizeof(char)!=x' is always true\n"
                            "[test.cpp:4]: (style) Condition 'x!=sizeof(char)' is always true\n", "", errout_str());
 
@@ -3421,7 +3487,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "  int x = 0;\n"
               "  assert(x == 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9363 - do not warn about value passed to function
@@ -3429,7 +3495,7 @@ class TestCondition : public TestFixture {
               "    if (b) {\n"
               "        if (bar(!b)) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -3444,7 +3510,7 @@ class TestCondition : public TestFixture {
               "        assert((int)(0==0));\n"
               "        assert((int)(0==0) && \"bla\");\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7750 char literals in boolean expressions
@@ -3453,7 +3519,7 @@ class TestCondition : public TestFixture {
               "  if(L'b'){}\n"
               "  if(1 && 'c'){}\n"
               "  int x = 'd' ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8206 - knownCondition always false
@@ -3461,26 +3527,26 @@ class TestCondition : public TestFixture {
               "{\n"
               "        if(i > 4)\n"
               "          for( int x = 0; i < 3; ++x){}\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:4:29]: (style) Condition 'i<3' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // Skip literals
-        check("void f() { if(true) {} }");
+        check("void f() { if(true) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(false) {} }");
+        check("void f() { if(false) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(!true) {} }");
+        check("void f() { if(!true) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(!false) {} }");
+        check("void f() { if(!false) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(0) {} }");
+        check("void f() { if(0) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { if(1) {} }");
+        check("void f() { if(1) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
@@ -3489,36 +3555,36 @@ class TestCondition : public TestFixture {
               "    else if (!b && i == 1) {}\n"
               "    if (b)\n"
               "    {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (style) Condition '!b' is always true [knownConditionTrueFalse]\n", errout_str());
 
-        check("bool f() { return nullptr; }");
+        check("bool f() { return nullptr; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("enum E { A };\n"
-              "bool f() { return A; }");
+              "bool f() { return A; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    const int x = 0;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(void){return 1/abs(10);}");
+        check("int f(void){return 1/abs(10);}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    int x = 0;\n"
               "    return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    const int a = 50;\n"
               "    const int b = 52;\n"
               "    return a+b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Return value 'a+b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("int f() {\n"
@@ -3527,7 +3593,7 @@ class TestCondition : public TestFixture {
               "    a++;\n"
               "    b++;\n"
               "    return a+b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool& g();\n"
@@ -3535,7 +3601,7 @@ class TestCondition : public TestFixture {
               "    bool & b = g();\n"
               "    b = false;\n"
               "    return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -3544,13 +3610,13 @@ class TestCondition : public TestFixture {
               "        b = false;\n"
               "        return b;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(long maxtime) {\n"
               "  if (std::time(0) > maxtime)\n"
               "    return std::time(0) > maxtime;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(double param) {\n"
@@ -3560,7 +3626,7 @@ class TestCondition : public TestFixture {
               "  }\n"
               "  if (param<0.)\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i) {\n"
@@ -3570,7 +3636,7 @@ class TestCondition : public TestFixture {
               "  }\n"
               "  if (cond && (42==i))\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 8842 crash
@@ -3580,15 +3646,15 @@ class TestCondition : public TestFixture {
               "  void f() {\n"
               "    if (b) return;\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const char* x, const char* t) {\n"
               "    if (!(strcmp(x, y) == 0)) { return; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const int a[]){ if (a == 0){} }");
+        check("void f(const int a[]){ if (a == 0){} }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -3599,7 +3665,7 @@ class TestCondition : public TestFixture {
               "  bool c = s<s;\n"
               "  if (c) return 0;\n"
               "  else return 42;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("long X::g(bool unknown, int& result) {\n"
@@ -3608,43 +3674,61 @@ class TestCondition : public TestFixture {
               "    f = f || unknown;\n"
               "    f ? result = 42 : ret = -1;\n"
               "    return ret;\n"
-              "}");
-        ASSERT_EQUALS("", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Condition 'f' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (!handle) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:9]: (style) Condition 'handle' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (handle == 0) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Condition 'handle' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (handle != 0) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:9]: (warning) Identical condition 'handle!=0', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (handle != nullptr) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:9]: (warning) Identical condition 'handle!=nullptr', second condition is always false [identicalConditionAfterEarlyExit]\n", errout_str());
 
+        check("void f(const char* p) {\n" // #13716
+              "    if (!p) {}\n"
+              "    if (p == NULL) {}\n"
+              "    if (p == nullptr) {}\n"
+              "    if (p == 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:11]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n",
+                      errout_str());
+
+        check("int f(const char* p) {\n" // #13717
+              "    if (p) {}\n"
+              "    else if (!p) {}\n"
+              "    else if (p == NULL) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:14]: (style) Expression is always true because 'else if' condition is opposite to previous condition at line 2. [multiCondition]\n"
+                      "[test.cpp:4:16]: (style) Expression is always false because 'else if' condition matches previous condition at line 3. [multiCondition]\n",
+                      errout_str());
+
         check("void f(void* x, void* y) {\n"
               "    if (x == nullptr && y == nullptr)\n"
               "        return;\n"
               "    if (x == nullptr || y == nullptr)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* g();\n"
@@ -3655,7 +3739,7 @@ class TestCondition : public TestFixture {
               "            break;\n"
               "    }\n"
               "    if (a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* g();\n"
@@ -3664,26 +3748,26 @@ class TestCondition : public TestFixture {
               "        a = g();\n"
               "    }\n"
               "    if (a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:6:9]: (style) Condition 'a' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int * x, bool b) {\n"
               "    if (!x && b) {}\n"
               "    else if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const std::string x=\"xyz\";\n"
               "    if(!x.empty()){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Condition '!x.empty()' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("std::string g();\n"
               "void f() {\n"
               "    const std::string msg = g();\n"
               "    if(!msg.empty()){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *array, int size ) {\n"
@@ -3692,7 +3776,7 @@ class TestCondition : public TestFixture {
               "            continue;\n"
               "        if(array){}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (style) Condition 'array' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int *array, int size ) {\n"
@@ -3701,7 +3785,7 @@ class TestCondition : public TestFixture {
               "            continue;\n"
               "        else if(array){}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (style) Condition 'array' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9277
@@ -3711,7 +3795,7 @@ class TestCondition : public TestFixture {
               "        return 0;\n"
               "    else\n"
               "        return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9954
@@ -3733,7 +3817,7 @@ class TestCondition : public TestFixture {
               "  bool x = false;\n"
               "  g({0, 1}, x);\n"
               "  if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9318
@@ -3744,7 +3828,7 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "  auto b = dynamic_cast<B*>(x);\n"
               "  if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
@@ -3762,7 +3846,7 @@ class TestCondition : public TestFixture {
         check("bool g();\n"
               "void f(bool x) {\n"
               "    if (x) while(x) x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // isLikelyStream
@@ -3772,7 +3856,7 @@ class TestCondition : public TestFixture {
               "       iss >> x;\n"
               "       if (!iss) break;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9332
@@ -3784,14 +3868,14 @@ class TestCondition : public TestFixture {
               "    void* c = a.g();\n"
               "    if (!c) return;\n"
               "    bool compare = c == b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9361
         check("void f(char c) {\n"
               "    if (c == '.') {}\n"
               "    else if (isdigit(c) != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9351
@@ -3799,7 +3883,7 @@ class TestCondition : public TestFixture {
               "    const bool b = x < 42;\n"
               "    if(b) return b?0:-1;\n"
               "    return 42;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:3:18]: (style) Condition 'b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9362
@@ -3809,7 +3893,7 @@ class TestCondition : public TestFixture {
               "    if((v != 0x00)) {\n"
               "        if( (v & 0x01) == 0x00) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9367
@@ -3818,25 +3902,25 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    if (x % 360L == 0)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a, int b) {\n"
               "    static const int x = 10;\n"
               "    return x == 1 ? a : b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const bool x = false;\n"
               "void f() {\n"
               "    if (x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const bool x = false;\n"
               "void f() {\n"
               "    if (!x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9709
@@ -3847,7 +3931,7 @@ class TestCondition : public TestFixture {
               "    if (r != nullptr)\n"
               "        ok = a != 0;\n"
               "    if (ok) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9816
@@ -4036,7 +4120,7 @@ class TestCondition : public TestFixture {
         check("void foo(unsigned int max) {\n"
               "    unsigned int num = max - 1;\n"
               "    if (num < 0) {}\n" // <- do not report knownConditionTrueFalse
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10297
@@ -4375,7 +4459,7 @@ class TestCondition : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         // #8358
-        check("void f(double d) { if ((d * 0) != 0) {} }");
+        check("void f(double d) { if ((d * 0) != 0) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6870
@@ -4581,11 +4665,7 @@ class TestCondition : public TestFixture {
               "        if (o[1] == '\\0') {}\n"
               "    }\n"
               "}\n");
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS("[test.cpp:6:18]: (style) Condition 'o[1]=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
-        } else {
-            ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (style) Condition 'o[1]=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
-        }
+        ASSERT_EQUALS("[test.cpp:6:18]: (style) Condition 'o[1]=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n" // #11449
               "    int i = x;\n"
@@ -4659,7 +4739,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:18]: (style) Condition 'S::s' is always true [knownConditionTrueFalse]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:18]: (warning) Identical inner 'if' condition is always true. [identicalInnerCondition]\n", errout_str());
 
         check("void f() {\n" // #10811
               "    int i = 0;\n"
@@ -4739,7 +4819,7 @@ class TestCondition : public TestFixture {
               "        return 9;\n"
               " \n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g();\n" // #10561
@@ -4754,7 +4834,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    catch (...) {}\n"
               "    return b ? 1 : 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -4786,6 +4866,111 @@ class TestCondition : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #14392
+              "    bool g() const { return m; }\n"
+              "    bool m{};\n"
+              "};\n"
+              "bool f(S s) {\n"
+              "    if (s.g()) {\n"
+              "        bool b = s.g();\n"
+              "        return b;\n"
+              "    }\n"
+              "    return false;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:7:21]: (style) Assigned value 's.g()' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f(const void* p) {\n" // #11519
+              "    bool b = false;\n"
+              "    if (!p && !b) {}\n"
+              "    if (!b) {}\n"
+              "    (void)b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:15]: (style) Condition '!b' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:9]: (style) Condition '!b' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("struct C {\n" // #12532
+              "    void f() const;\n"
+              "    int a, b;\n"
+              "};\n"
+              "void C::f() const {\n"
+              "    if (a)\n"
+              "        return;\n"
+              "    if (!b) {}\n"
+              "    if (a) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:9] -> [test.cpp:9:9]: (warning) Identical condition 'a', second condition is always false [identicalConditionAfterEarlyExit]\n",
+                      errout_str());
+
+        check("bool b() { return false; }\n" // #10452
+              "void f() {\n"
+              "    if (b()) {}\n"
+              "    if (!b()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Condition 'b()' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:9]: (style) Condition '!b()' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("int g();\n" // a value modified inside a nested branch must be lowered to possible
+              "void f(int outer, int inner) {\n"
+              "    int bits = 0;\n"
+              "    if (outer) {\n"
+              "        if (inner == 1)\n"
+              "            bits = g();\n"
+              "    }\n"
+              "    if (bits > 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int g();\n" // the modifying branch has an escaping sibling - still must be lowered
+              "void f(int t, int u) {\n"
+              "    int v = 0;\n"
+              "    if (t) {\n"
+              "        if (u == 2)\n"
+              "            v = g();\n"
+              "        else\n"
+              "            return;\n"
+              "    }\n"
+              "    if (v > 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int x) {\n" // only the innermost else escapes - x is 0 or >1 afterwards, not known
+              "    if (!x) {}\n"
+              "    else if (x > 1) {}\n"
+              "    else return false;\n"
+              "    return x ? false : true;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int x) {\n" // the branch's fall-through path must clear the escape
+              "    if (x) { if (x > 1) {} else return false; }\n"
+              "    return x ? false : true;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    if (42) {}\n"
+              "    if (42U) {}\n"
+              "    if (42L) {}\n"
+              "    if (42UL) {}\n"
+              "    if (42LL) {}\n"
+              "    if (042) {}\n"
+              "    if (0x42) {}\n"
+              "    if (0b101010) {}\n"
+              "    if (!42) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Condition '42' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:3:9]: (style) Condition '42U' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:9]: (style) Condition '42L' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:5:9]: (style) Condition '42UL' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:6:9]: (style) Condition '42LL' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:7:9]: (style) Condition '042' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:8:9]: (style) Condition '0x42' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:9:9]: (style) Condition '0b101010' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:10:9]: (style) Condition '!42' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
     }
 
     void alwaysTrueSymbolic()
@@ -4805,10 +4990,10 @@ class TestCondition : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:4:14]: (style) Condition 'x==y' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void f(bool a, bool b) {  if (a == b && a && !b){} }");
+        check("void f(bool a, bool b) {  if (a == b && a && !b){} }\n");
         ASSERT_EQUALS("[test.cpp:1:41] -> [test.cpp:1:46]: (style) Condition '!b' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("bool f(bool a, bool b) { if(a && b && (!a)){} }");
+        check("bool f(bool a, bool b) { if(a && b && (!a)){} }\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:1:40]: (style) Condition '!a' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x, int y) {\n"
@@ -5019,6 +5204,52 @@ class TestCondition : public TestFixture {
               "    if (i < 0) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int x; int y; };\n"
+              "void use(int);\n"
+              "void test(A a) {\n"
+              "    int i = a.x;\n"
+              "    int j = a.x;\n"
+              "    use(j);\n"
+              "    if (i == j) {}\n"
+              "    if (i == a.x) {}\n"
+              "    if (j == a.x) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:11]: (style) Condition 'i==j' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:8:11]: (style) Condition 'i==a.x' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:9:11]: (style) Condition 'j==a.x' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("struct S { int i; };\n" // #12795
+              "struct T {\n"
+              "    std::map<std::string, S*> m;\n"
+              "    S* get(const std::string& s) { return m[s]; }\n"
+              "    void modify() { for (const auto& e : m) e.second->i = 0; }\n"
+              "};\n"
+              "void f(T& t) {\n"
+              "    const S* p = t.get(\"abc\");\n"
+              "    const int o = p->i;\n"
+              "    t.modify();\n"
+              "    if (p->i == o) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("",
+                           "[test.cpp:11:14]: (style) Condition 'p->i==o' is always true [knownConditionTrueFalse]\n",
+                           errout_str());
+
+        check("void f(int x) {\n" // #12320
+              "    int a = 0, b = 0, c = 0;\n"
+              "    a = x;\n"
+              "    if (a) b = x;\n"
+              "    if (b) c = x;\n"
+              "    if (c) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int a, int b) {\n" // #11437
+              "    a = a < b ? b : a;\n"
+              "    if (a != b) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueInfer() {
@@ -5027,7 +5258,7 @@ class TestCondition : public TestFixture {
               "        x++;\n"
               "        if (x == 1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:15]: (style) Condition 'x==1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -5035,7 +5266,7 @@ class TestCondition : public TestFixture {
               "        x++;\n"
               "        if (x != 1) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:15]: (style) Condition 'x!=1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #6890
@@ -5047,7 +5278,7 @@ class TestCondition : public TestFixture {
               "        if (x == -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x==-1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5058,7 +5289,7 @@ class TestCondition : public TestFixture {
               "        if (x != -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x!=-1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5069,7 +5300,7 @@ class TestCondition : public TestFixture {
               "        if (x >= -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x>=-1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5080,7 +5311,7 @@ class TestCondition : public TestFixture {
               "        if (x > -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x>-1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5091,7 +5322,7 @@ class TestCondition : public TestFixture {
               "        if (x < -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x<-1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5102,7 +5333,7 @@ class TestCondition : public TestFixture {
               "        if (x <= -1) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x<=-1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5113,7 +5344,7 @@ class TestCondition : public TestFixture {
               "        if (x > 7) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:6:15]: (style) Condition 'x>7' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -5124,7 +5355,7 @@ class TestCondition : public TestFixture {
               "        if (x > 9) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
@@ -5135,7 +5366,7 @@ class TestCondition : public TestFixture {
               "        if (x > 10) {}\n"
               "        else {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11100
@@ -5160,7 +5391,7 @@ class TestCondition : public TestFixture {
               "        if(pos > 0)\n"
               "            --pos;\n"
               "    return pos;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:5:16]: (style) Condition 'pos>0' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9721
@@ -5169,7 +5400,7 @@ class TestCondition : public TestFixture {
               "        if ( (x>255) || (-128>x) )\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:30]: (style) Condition '-128>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8778
@@ -5183,7 +5414,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "    for(int x = 0; x < 3; ++x)\n"
               "        if(x == -5) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Condition 'x==-5' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8407
@@ -5192,7 +5423,7 @@ class TestCondition : public TestFixture {
               "        if(i == 0) return 1; \n" // <<
               "        else return 0;\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Condition 'i==0' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(unsigned int u1, unsigned int u2) {\n"
@@ -5264,7 +5495,7 @@ class TestCondition : public TestFixture {
               "        c2(g );\n"
               "    if ( !g.empty() )\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int flag) {\n"
@@ -5275,7 +5506,7 @@ class TestCondition : public TestFixture {
               "        c2(g );\n"
               "    if ( !g.empty() )\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -5321,11 +5552,7 @@ class TestCondition : public TestFixture {
               "       buffer.back() == '\\n' ||\n"
               "       buffer.back() == '\\0') {}\n"
               "}\n");
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS("[test.cpp:5:22]: (style) Condition 'buffer.back()=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
-        } else {
-            ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (style) Condition 'buffer.back()=='\\0'' is always false\n", errout_str());
-        }
+        ASSERT_EQUALS("[test.cpp:5:22]: (style) Condition 'buffer.back()=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #9353
         check("struct X { std::string s; };\n"
@@ -5490,7 +5717,7 @@ class TestCondition : public TestFixture {
               "            {;}\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:20] -> [test.cpp:7:27]: (style) Condition 'i==1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10863
@@ -5519,7 +5746,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n" // #8192
               "    for (int i = 0; i > 10; ++i) {}\n"
               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'i>10' is always false\n", "", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) Condition 'i>10' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    for (int i = 1000; i < 20; ++i) {}\n"
@@ -5589,12 +5816,38 @@ class TestCondition : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void alwaysTrueSideEffect() {
+        check("bool check(const char* const);\n" // #14416
+              "void create(const char*);\n"
+              "void f(const char* n) {\n"
+              "    if (!check(n)) {\n"
+              "        create(n);\n"
+              "        if (check(n)) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void alwaysTruePremiumMisra() {
+        const char code[] = "void f() {\n"
+                            "  if (3 > 2) {}\n"
+                            "}\n";
+
+        check(code);
+        ASSERT_EQUALS("", errout_str());
+
+        Settings misraSettings;
+        misraSettings.premiumArgs = "--misra-c-2012";
+        check(code, misraSettings);
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Condition '3>2' is always true [knownConditionTrueFalse]\n", errout_str());
+    }
+
     void multiConditionAlwaysTrue() {
         check("void f() {\n"
               "  int val = 0;\n"
               "  if (val < 0) continue;\n"
               "  if (val > 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5602,7 +5855,7 @@ class TestCondition : public TestFixture {
               "  if (val < 0) {\n"
               "    if (val > 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5610,7 +5863,7 @@ class TestCondition : public TestFixture {
               "  if (val < 0) {\n"
               "    if (val < 0) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5618,7 +5871,7 @@ class TestCondition : public TestFixture {
               "  int foo = 0;\n"
               "  if (activate) {}\n"
               "  else if (foo) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Condition 'activate' is always false [knownConditionTrueFalse]\n"
                       "[test.cpp:5:12]: (style) Condition 'foo' is always false [knownConditionTrueFalse]\n", errout_str());
 
@@ -5626,7 +5879,7 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "  const int b[2] = { 1,0 };\n"
               "  if(b[1] == 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'b[1]==2' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #9878
@@ -5643,40 +5896,40 @@ class TestCondition : public TestFixture {
         check("void f(bool x) {\n"
               "    if(x) {}\n"
               "    if(x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:3:8]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n",
                       errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) {}\n"
               "    if(x == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:10]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n",
                       errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) {}\n"
               "    if(x == 2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) {}\n"
               "    if(x != 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"
               "    if(x) {}\n"
               "    g();\n"
               "    if(x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) { x++; }\n"
               "    if(x == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8996
@@ -5688,7 +5941,7 @@ class TestCondition : public TestFixture {
               "  g(d);\n"
               "  if (a) {}\n"
               "  if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9311
@@ -5703,7 +5956,7 @@ class TestCondition : public TestFixture {
               "  g(d);\n"
               "  if (a) {}\n"
               "  if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8993
@@ -5711,7 +5964,7 @@ class TestCondition : public TestFixture {
               "  auto y = x;\n"
               "  if (x.empty()) y = \"1\";\n"
               "  if (y.empty()) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9106
@@ -5719,7 +5972,7 @@ class TestCondition : public TestFixture {
               "void f(A a, int c) {\n"
               "    if (a.b) a.b = c;\n"
               "    if (a.b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -5841,7 +6094,7 @@ class TestCondition : public TestFixture {
               "        ;\n"
               "    if (other.mPA.cols > 0 && other.mPA.rows > 0)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #11202
@@ -5850,32 +6103,67 @@ class TestCondition : public TestFixture {
               "    if (f < 10.0) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(char* s, const char* p) {\n" // #14070
+              "    strcpy(s, p);\n"
+              "}\n"
+              "void g() {\n"
+              "    char s1[10] = \"\";\n"
+              "    char s2[10] = \"\";\n"
+              "    f(s1, \"123\");\n"
+              "    f(s2, \"1234\");\n"
+              "    if (strlen(s1) > 0) {}\n"
+              "    if (strlen(s2) > 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(int*);\n" // #14428
+              "int f(int* const p) {\n"
+              "    int i = 0;\n"
+              "    if (*p == 0)\n"
+              "        g(p);\n"
+              "    if (*p == 0)\n"
+              "        i = 1;\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(const int*);\n"
+              "int f(const int* const p) {\n"
+              "    int i = 0;\n"
+              "    if (*p == 0)\n"
+              "        g(p);\n"
+              "    if (*p == 0)\n"
+              "        i = 1;\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:6:12]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n", errout_str());
     }
 
     void checkInvalidTestForOverflow() {
         check("void f(char *p, unsigned int x) {\n"
               "    assert((p + x) < p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Invalid test for overflow '(p+x)<p'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always false. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(char *p, unsigned int x) {\n"
               "    assert((p + x) >= p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (warning) Invalid test for overflow '(p+x)>=p'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always true. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(char *p, unsigned int x) {\n"
               "    assert(p > (p + x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Invalid test for overflow 'p>(p+x)'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always false. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(char *p, unsigned int x) {\n"
               "    assert(p <= (p + x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Invalid test for overflow 'p<=(p+x)'; pointer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always true. [invalidTestForOverflow]\n", errout_str());
 
         check("void f(signed int x) {\n" // unsigned overflow => don't warn
               "    assert(x + 100U < x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -5883,57 +6171,57 @@ class TestCondition : public TestFixture {
 
 #define MSG(EXPR, RESULT)   "[test.cpp:1:30]: (warning) Invalid test for overflow '" EXPR "'; signed integer overflow is undefined behavior. Some mainstream compilers remove such overflow tests when optimising the code and assume it's always " RESULT ". [invalidTestForOverflow]\n"
 
-        check("int f(int x) { return x + 10 > x; }");
+        check("int f(int x) { return x + 10 > x; }\n");
         ASSERT_EQUALS(MSG("x+10>x", "true"), errout_str());
 
-        check("int f(int x) { return x + 10 >= x; }");
+        check("int f(int x) { return x + 10 >= x; }\n");
         ASSERT_EQUALS(MSG("x+10>=x", "true"), errout_str());
 
-        check("int f(int x) { return x + 10 < x; }");
+        check("int f(int x) { return x + 10 < x; }\n");
         ASSERT_EQUALS(MSG("x+10<x", "false"), errout_str());
 
-        check("int f(int x) { return x + 10 <= x; }");
+        check("int f(int x) { return x + 10 <= x; }\n");
         ASSERT_EQUALS(MSG("x+10<=x", "false"), errout_str());
 
-        check("int f(int x) { return x - 10 > x; }");
+        check("int f(int x) { return x - 10 > x; }\n");
         ASSERT_EQUALS(MSG("x-10>x", "false"), errout_str());
 
-        check("int f(int x) { return x - 10 >= x; }");
+        check("int f(int x) { return x - 10 >= x; }\n");
         ASSERT_EQUALS(MSG("x-10>=x", "false"), errout_str());
 
-        check("int f(int x) { return x - 10 < x; }");
+        check("int f(int x) { return x - 10 < x; }\n");
         ASSERT_EQUALS(MSG("x-10<x", "true"), errout_str());
 
-        check("int f(int x) { return x - 10 <= x; }");
+        check("int f(int x) { return x - 10 <= x; }\n");
         ASSERT_EQUALS(MSG("x-10<=x", "true"), errout_str());
 
         // x + y < x
 #undef MSG
 #define MSG(EXPR, RESULT)   "[test.cpp:1:36]: (warning) Invalid test for overflow '" EXPR "'; signed integer overflow is undefined behavior. Some mainstream compilers removes handling of overflows when optimising the code and change the code to '" RESULT "'. [invalidTestForOverflow]\n"
 
-        check("int f(int x, int y) { return x + y < x; }");
+        check("int f(int x, int y) { return x + y < x; }\n");
         ASSERT_EQUALS(MSG("x+y<x", "y<0"), errout_str());
 
-        check("int f(int x, int y) { return x + y <= x; }");
+        check("int f(int x, int y) { return x + y <= x; }\n");
         ASSERT_EQUALS(MSG("x+y<=x", "y<=0"), errout_str());
 
-        check("int f(int x, int y) { return x + y > x; }");
+        check("int f(int x, int y) { return x + y > x; }\n");
         ASSERT_EQUALS(MSG("x+y>x", "y>0"), errout_str());
 
-        check("int f(int x, int y) { return x + y >= x; }");
+        check("int f(int x, int y) { return x + y >= x; }\n");
         ASSERT_EQUALS(MSG("x+y>=x", "y>=0"), errout_str());
 
         // x - y < x
-        check("int f(int x, int y) { return x - y < x; }");
+        check("int f(int x, int y) { return x - y < x; }\n");
         ASSERT_EQUALS(MSG("x-y<x", "y>0"), errout_str());
 
-        check("int f(int x, int y) { return x - y <= x; }");
+        check("int f(int x, int y) { return x - y <= x; }\n");
         ASSERT_EQUALS(MSG("x-y<=x", "y>=0"), errout_str());
 
-        check("int f(int x, int y) { return x - y > x; }");
+        check("int f(int x, int y) { return x - y > x; }\n");
         ASSERT_EQUALS(MSG("x-y>x", "y<0"), errout_str());
 
-        check("int f(int x, int y) { return x - y >= x; }");
+        check("int f(int x, int y) { return x - y >= x; }\n");
         ASSERT_EQUALS(MSG("x-y>=x", "y<=0"), errout_str());
     }
 
@@ -5942,55 +6230,55 @@ class TestCondition : public TestFixture {
               "    enum states {A,B,C};\n"
               "    const unsigned g_flags = B|C;\n"
               "    if(g_flags & A) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (style) Condition 'g_flags&A' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 5;"
               "    if(a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Condition 'a' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 5;"
               "    while(a + 1) { a--; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 5;"
               "    while(a + 1) { return; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:27]: (style) Condition 'a+1' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
     void alwaysTrueFalseInLogicalOperators() {
         check("bool f();\n"
-              "void foo() { bool x = true; if(x||f()) {}}");
+              "void foo() { bool x = true; if(x||f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { bool x = true; if(x||b) {}}");
+        check("void foo(bool b) { bool x = true; if(x||b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:38]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { if(true||b) {}}");
+        check("void foo(bool b) { if(true||b) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
-              "void foo() { bool x = false; if(x||f()) {}}");
+              "void foo() { bool x = false; if(x||f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:33]: (style) Condition 'x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("bool f();\n"
-              "void foo() { bool x = false; if(x&&f()) {}}");
+              "void foo() { bool x = false; if(x&&f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:33]: (style) Condition 'x' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { bool x = false; if(x&&b) {}}");
+        check("void foo(bool b) { bool x = false; if(x&&b) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (style) Condition 'x' is always false [knownConditionTrueFalse]\n", errout_str());
 
-        check("void foo(bool b) { if(false&&b) {}}");
+        check("void foo(bool b) { if(false&&b) {}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
-              "void foo() { bool x = true; if(x&&f()) {}}");
+              "void foo() { bool x = true; if(x&&f()) {}}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9578
@@ -6005,12 +6293,26 @@ class TestCondition : public TestFixture {
         check("enum E { E1 = 1, E2 = 2 };\n"
               "void f(int i) { if (i == E1 || E2) {} }\n");
         ASSERT_EQUALS("[test.cpp:2:29]: (style) Condition 'i==E1||E2' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f(bool a, bool b) {\n" // #11614
+              "    if (b) {\n"
+              "        bool x = !b || a;\n"
+              "    }\n"
+              "}\n"
+              "void g(bool a, bool b) {\n"
+              "    if (!b) {\n"
+              "        bool x = a || b;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:18]: (style) Condition '!b' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:7:9] -> [test.cpp:8:23]: (style) Condition 'b' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
     }
 
     void pointerAdditionResultNotNull() {
         check("void f(char *ptr) {\n"
               "  if (ptr + 1 != 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Comparison is wrong. Result of 'ptr+1' can't be 0 unless there is pointer overflow, and pointer overflow is undefined behaviour. [pointerAdditionResultNotNull]\n", errout_str());
     }
 
@@ -6020,7 +6322,7 @@ class TestCondition : public TestFixture {
         check("void f(int& x, int y) {\n"
               "    if (x == y)\n"
               "        x = y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: style: Assignment 'x=y' is redundant with condition 'x==y'. [duplicateConditionalAssign]\n"
                       "[test.cpp:2:11]: note: Condition 'x==y'\n"
                       "[test.cpp:3:11]: note: Assignment 'x=y' is redundant\n", errout_str());
@@ -6028,7 +6330,7 @@ class TestCondition : public TestFixture {
         check("void f(int& x, int y) {\n"
               "    if (x != y)\n"
               "        x = y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: style: The statement 'if (x!=y) x=y' is logically equivalent to 'x=y'. [duplicateConditionalAssign]\n"
                       "[test.cpp:3:11]: note: Assignment 'x=y'\n"
                       "[test.cpp:2:11]: note: Condition 'x!=y' is redundant\n", errout_str());
@@ -6038,7 +6340,7 @@ class TestCondition : public TestFixture {
               "        x = y;\n"
               "    else\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: style: Assignment 'x=y' is redundant with condition 'x==y'. [duplicateConditionalAssign]\n"
                       "[test.cpp:2:11]: note: Condition 'x==y'\n"
                       "[test.cpp:3:11]: note: Assignment 'x=y' is redundant\n", errout_str());
@@ -6048,13 +6350,13 @@ class TestCondition : public TestFixture {
               "        x = y;\n"
               "    else\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int& x, int y) {\n"
               "    if (x == y)\n"
               "        x = y + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g();\n"
@@ -6063,7 +6365,7 @@ class TestCondition : public TestFixture {
               "        x = y;\n"
               "        g();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool b) {\n"
@@ -6109,12 +6411,12 @@ class TestCondition : public TestFixture {
     void checkAssignmentInCondition() {
         check("void f(std::string s) {\n"
               "    if (s=\"123\"){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Suspicious assignment in condition. Condition 's=\"123\"' is always true. [assignmentInCondition]\n", errout_str());
 
         check("void f(std::string *p) {\n"
               "    if (p=foo()){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(uint32_t u) {\n" // #2490
@@ -6130,65 +6432,65 @@ class TestCondition : public TestFixture {
 
         check("void f(unsigned char c) {\n"
               "  if (c == 256) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Comparing expression of type 'unsigned char' against value 256. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(unsigned char* b, int i) {\n" // #6372
               "  if (b[i] == 256) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Comparing expression of type 'unsigned char' against value 256. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(unsigned char c) {\n"
               "  if (c == 255) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "  if (b == true) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         // #10372
         check("void f(signed char x) {\n"
               "  if (x == 0xff) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Comparing expression of type 'signed char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(short x) {\n"
               "  if (x == 0xffff) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Comparing expression of type 'signed short' against value 65535. Condition is always false. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(int x) {\n"
               "  if (x == 0xffffffff) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(long x) {\n"
               "  if (x == ~0L) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(long long x) {\n"
               "  if (x == ~0LL) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n"
               "    const int i = 0xFFFFFFFF;\n"
               "    if (x == i) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  char c;\n"
               "  if ((c = foo()) != -1) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x < 3000000000) {}\n"
-              "}", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Comparing expression of type 'signed int' against value 3000000000. Condition is always true. [compareValueOutOfTypeRangeError]\n", errout_str());
 
         check("void f(const signed char i) {\n" // #8545
@@ -6198,7 +6500,7 @@ class TestCondition : public TestFixture {
               "    if (i <  +128) {}\n" // warn
               "    if (i <= +127) {}\n" // warn
               "    if (i <= +126) {}\n"
-              "}\n", dinit(CheckOptions, $.s = &settingsUnix64));
+              "}\n", settingsUnix64);
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Comparing expression of type 'const signed char' against value -129. Condition is always true. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:3:15]: (style) Comparing expression of type 'const signed char' against value -128. Condition is always true. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:5:15]: (style) Comparing expression of type 'const signed char' against value 128. Condition is always true. [compareValueOutOfTypeRangeError]\n"
@@ -6207,31 +6509,62 @@ class TestCondition : public TestFixture {
 
         check("void f(const unsigned char u) {\n"
               "    if (u >  0) {}\n"
-              "    if (u <  0) {}\n" // warn
-              "    if (u >= 0) {}\n" // warn
+              "    if (u <  0) {}\n"
+              "    if (u >= 0) {}\n"
               "    if (u <= 0) {}\n"
               "    if (u >  255) {}\n" // warn
               "    if (u <  255) {}\n"
               "    if (u >= 255) {}\n"
               "    if (u <= 255) {}\n" // warn
               "    if (0   <  u) {}\n"
-              "    if (0   >  u) {}\n" // warn
-              "    if (0   <= u) {}\n" // warn
+              "    if (0   >  u) {}\n"
+              "    if (0   <= u) {}\n"
               "    if (0   >= u) {}\n"
               "    if (255 <  u) {}\n" // warn
               "    if (255 >  u) {}\n"
               "    if (255 <= u) {}\n"
               "    if (255 >= u) {}\n" // warn
-              "}\n", dinit(CheckOptions, $.s = &settingsUnix64));
-        ASSERT_EQUALS("[test.cpp:3:14]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always false. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:4:14]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always true. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:6:14]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n"
+              "}\n", settingsUnix64);
+        ASSERT_EQUALS("[test.cpp:6:14]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:9:14]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always true. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:11:9]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always false. [compareValueOutOfTypeRangeError]\n"
-                      "[test.cpp:12:9]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always true. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:14:9]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false. [compareValueOutOfTypeRangeError]\n"
                       "[test.cpp:17:9]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always true. [compareValueOutOfTypeRangeError]\n",
                       errout_str());
+
+        check("void f(bool b) {\n" // #14037
+              "    if (b != 2) {}\n"
+              "}\n", settingsUnix64);
+        ASSERT_EQUALS("[test.cpp:2:14]: (style) Comparing expression of type 'bool' against value 2. Condition is always true. [compareValueOutOfTypeRangeError]\n",
+                      errout_str());
+
+        check("void f(const std::uint32_t& u) {\n" // #9078
+              "    if (u >= UINT32_MAX) {}\n"
+              "    if (u <= UINT32_MAX) {}\n"
+              "    if (u > UINT32_MAX) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:14]: (style) Comparing expression of type 'const unsigned int &' against value 4294967295. Condition is always true. [compareValueOutOfTypeRangeError]\n"
+                      "[test.cpp:4:13]: (style) Comparing expression of type 'const unsigned int &' against value 4294967295. Condition is always false. [compareValueOutOfTypeRangeError]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    long long ll = 1024 * 1024 * 1024;\n"
+              "    if (ll * 8 < INT_MAX) {}\n"
+              "    if (INT_MAX > ll * 8) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int a, int b) {\n" // #12896
+              "    if (a < INT_MIN && b > INT_MAX)\n"
+              "        return true;\n"
+              "    return false;\n"
+              "}\n"
+              "bool g(int x) {\n" // #6796
+              "    return (x > INT_MAX) ? true : false;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:13]: (style) Comparing expression of type 'signed int' against value -2147483648. Condition is always false. [compareValueOutOfTypeRangeError]\n"
+                      "[test.cpp:2:28]: (style) Comparing expression of type 'signed int' against value 2147483647. Condition is always false. [compareValueOutOfTypeRangeError]\n"
+                      "[test.cpp:7:17]: (style) Comparing expression of type 'signed int' against value 2147483647. Condition is always false. [compareValueOutOfTypeRangeError]\n",
+                      errout_str());
     }
 
     void knownConditionCast() {
@@ -6291,7 +6624,7 @@ class TestCondition : public TestFixture {
             "  }\n"
             "\n"
             "  S1 mS;\n"
-            "};"
+            "};\n"
             );
         ASSERT_EQUALS("[test.cpp:13:11] -> [test.cpp:18:13]: (style) Condition 'mS.b' is always false [knownConditionTrueFalse]\n", errout_str());
     }
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index b57d6d80305..4de49f54311 100644
--- a/test/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,25 +31,28 @@ class TestConstructors : public TestFixture {
 
 private:
     const Settings settings = settingsBuilder().severity(Severity::style).severity(Severity::warning).build();
+    const Settings settings_i = settingsBuilder(settings).certainty(Certainty::inconclusive).build();
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool inconclusive = false;
-        const Settings* s = nullptr;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(options.s ? *options.s : settings).certainty(Certainty::inconclusive, options.inconclusive).build();
+        const Settings settings1 = options.inconclusive ? settings_i : settings;
 
-        // Tokenize..
+        check_(file, line, code, settings1);
+    }
+
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& settings1) {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check class constructors..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.constructors();
     }
 
@@ -89,6 +92,7 @@ class TestConstructors : public TestFixture {
         TEST_CASE(noConstructor13); // #9998
         TEST_CASE(noConstructor14); // #10770
         TEST_CASE(noConstructor15); // #5499
+        TEST_CASE(noConstructor16);
 
         TEST_CASE(forwardDeclaration); // ticket #4290/#3190
 
@@ -119,6 +123,7 @@ class TestConstructors : public TestFixture {
         TEST_CASE(initvar_derived_pod_struct_with_union); // #11101
 
         TEST_CASE(initvar_private_constructor);     // BUG 2354171 - private constructor
+        TEST_CASE(initvar_derived_private_constructor);
         TEST_CASE(initvar_copy_constructor); // ticket #1611
         TEST_CASE(initvar_nested_constructor); // ticket #1375
         TEST_CASE(initvar_nocopy1);            // ticket #2474
@@ -172,6 +177,8 @@ class TestConstructors : public TestFixture {
         TEST_CASE(uninitVar33); // ticket #10295
         TEST_CASE(uninitVar34); // ticket #10841
         TEST_CASE(uninitVar35);
+        TEST_CASE(uninitVar36);
+        TEST_CASE(uninitVar37);
         TEST_CASE(uninitVarEnum1);
         TEST_CASE(uninitVarEnum2); // ticket #8146
         TEST_CASE(uninitVarStream);
@@ -233,21 +240,21 @@ class TestConstructors : public TestFixture {
               "{\n"
               "public:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (style) The class 'Fred' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
 
         check("struct Fred\n"
               "{\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (style) The struct 'Fred' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
     }
 
@@ -260,7 +267,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) : i(other.i) {}\n"
               "    Fred(Fred && other) : i(other.i) {}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -270,7 +277,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) {i=other.i}\n"
               "    Fred(Fred && other) {i=other.i}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -280,7 +287,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) {}\n"
               "    Fred(Fred && other) {}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:6:5]: (warning) Member variable 'Fred::i' is not initialized in the move constructor. [uninitMemberVar]\n", errout_str());
@@ -291,7 +298,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred const & other) {}\n"
               "    Fred(Fred && other) {}\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the move constructor. [uninitMemberVar]\n", errout_str());
@@ -305,7 +312,7 @@ class TestConstructors : public TestFixture {
               "    int i;\n"
               "};\n"
               "Fred::Fred() :i(0)\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -314,7 +321,7 @@ class TestConstructors : public TestFixture {
               "    int i;\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ i = 0; }");
+              "{ i = 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -323,7 +330,7 @@ class TestConstructors : public TestFixture {
               "    int i;\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -358,7 +365,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "private:\n"
               "    int mValue;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -368,7 +375,7 @@ class TestConstructors : public TestFixture {
               "    A<T>(const T & t) { x = t.x; }\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T> struct A {\n"
@@ -376,7 +383,7 @@ class TestConstructors : public TestFixture {
               "    A<T>(const T & t) : x(t.x) { }\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T> struct A {\n"
@@ -385,7 +392,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "    int y;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'A::y' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:3:5]: (warning) Member variable 'A::y' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -394,14 +401,14 @@ class TestConstructors : public TestFixture {
         check("class Fred;\n"
               "struct Fred {\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void simple8() {
         check("struct Fred { int x; };\n"
               "class Barney { Fred fred; };\n"
-              "class Wilma { struct Betty { int x; } betty; };");
+              "class Wilma { struct Betty { int x; } betty; };\n");
         ASSERT_EQUALS("[test.cpp:2:1]: (style) The class 'Barney' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n"
                       "[test.cpp:3:1]: (style) The class 'Wilma' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
     }
@@ -412,7 +419,7 @@ class TestConstructors : public TestFixture {
               "    Fred() : x(0) { }\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -422,7 +429,7 @@ class TestConstructors : public TestFixture {
               "    Fred() = default;\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct S {\n" // #9391
@@ -450,7 +457,7 @@ class TestConstructors : public TestFixture {
               "    int b{1}, c{2};\n"
               "    int d, e{3};\n"
               "    int f{4}, g;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:3:5]: (warning) Member variable 'Fred::g' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -462,7 +469,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "    void Init(int i = 0);\n"
               "};\n"
-              "void Fred::Init(int i) { x = i; }");
+              "void Fred::Init(int i) { x = i; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -472,7 +479,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(0); }\n"
               "    void Init(int i, int j = 0);\n"
               "};\n"
-              "void Fred::Init(int i, int j) { x = i; y = j; }");
+              "void Fred::Init(int i, int j) { x = i; y = j; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -480,7 +487,7 @@ class TestConstructors : public TestFixture {
         check("class Fred {\n"
               "    int x=1;\n"
               "    int *y=0;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -493,7 +500,7 @@ class TestConstructors : public TestFixture {
               "    {}\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred : public Base<A, B> {"
@@ -504,7 +511,7 @@ class TestConstructors : public TestFixture {
               "    {}\n"
               "private:\n"
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -583,7 +590,7 @@ class TestConstructors : public TestFixture {
         check("class Fred\n"
               "{\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:1:1]: (style) The class 'Fred' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
     }
 
@@ -595,7 +602,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "\n"
               "void Fred::foobar()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -604,7 +611,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "private:\n"
               "    static int foobar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -613,7 +620,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "public:\n"
               "    int foobar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -621,7 +628,7 @@ class TestConstructors : public TestFixture {
         check("namespace Foo\n"
               "{\n"
               "    int i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -635,14 +642,14 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    cpucyclesT m_v;\n"
               "    bool m_b;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor7() {
         // ticket #4391
         check("short bar;\n"
-              "class foo;");
+              "class foo;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -650,7 +657,7 @@ class TestConstructors : public TestFixture {
         // ticket #4404
         check("class LineSegment;\n"
               "class PointArray  { };\n"
-              "void* tech_ = NULL;");
+              "void* tech_ = NULL;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -661,7 +668,7 @@ class TestConstructors : public TestFixture {
               " CGreeting() : CGreetingBase<char>(), MessageSet(false) {}\n"
               "private:\n"
               " bool MessageSet;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -681,28 +688,28 @@ class TestConstructors : public TestFixture {
               "    virtual ~A();\n"
               "private:\n"
               "    wxTimer *WxTimer1;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
 
     void noConstructor11() { // #3552
         check("class Fred { int x; };\n"
-              "union U { int y; Fred fred; };");
+              "union U { int y; Fred fred; };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor12() { // #8951
-        check("class Fred { int x{0}; };");
+        check("class Fred { int x{0}; };\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("class Fred { int x=0; };");
+        check("class Fred { int x=0; };\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("class Fred { int x[1]={0}; };"); // #8850
+        check("class Fred { int x[1]={0}; };\n"); // #8850
         ASSERT_EQUALS("", errout_str());
 
-        check("class Fred { int x[1]{0}; };");
+        check("class Fred { int x[1]{0}; };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -752,19 +759,59 @@ class TestConstructors : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'C::i2' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
+    void noConstructor16() {
+        check("struct S {\n" // #14546
+              "    int a = 0, b;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (warning) Member variable 'S::b' has no initializer. [uninitMemberVarNoCtor]\n", errout_str());
+
+        check("struct S {\n"
+              "    int a, b;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    explicit S(int);\n"
+              "    S(const S&);\n"
+              "    int i;\n"
+              "};\n"
+              "struct T {\n"
+              "    S s;\n"
+              "    int j{};\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        const char code[] = "struct S { int i = 0; };\n" // #14697
+                            "struct T {\n"
+                            "    S s;\n"
+                            "    int j;\n"
+                            "};\n"
+                            "struct U {\n"
+                            "    std::string a;\n"
+                            "    int k;\n"
+                            "};\n";
+        const Settings s = settingsBuilder(settings).cpp(Standards::CPP11).build();
+        check(code, s);
+        ASSERT_EQUALS("", errout_str());
+        check(code);
+        ASSERT_EQUALS("[test.cpp:4:9]: (warning) Member variable 'T::j' has no initializer. [uninitMemberVarNoCtor]\n"
+                      "[test.cpp:8:9]: (warning) Member variable 'U::k' has no initializer. [uninitMemberVarNoCtor]\n",
+                      errout_str());
+    }
+
     // ticket #4290 "False Positive: style (noConstructor): The class 'foo' does not have a constructor."
     // ticket #3190 "SymbolDatabase: Parse of sub class constructor fails"
     void forwardDeclaration() {
         check("class foo;\n"
-              "int bar;");
+              "int bar;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo;\n"
-              "class foo;");
+              "class foo;\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo{};\n"
-              "class foo;");
+              "class foo;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -774,7 +821,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    { this->i = 0; }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -789,7 +836,7 @@ class TestConstructors : public TestFixture {
               "            i = 1;\n"
               "    }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -808,7 +855,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    const Fred & operator=(const Fred &fred)\n"
               "    { i = fred.i; return *this; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred {\n"
@@ -819,7 +866,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    const Fred & operator=(const Fred &fred)\n"
               "    { i = fred.i; return *this; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -834,7 +881,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "  int i;\n"
               "  int j;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -845,7 +892,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { i = 0; }\n"
               "    void operator=(const Fred &fred) { }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -857,7 +904,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    void Init() { i = 0; }\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -874,7 +921,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("class Fred\n"
@@ -889,7 +936,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("class Fred\n"
@@ -904,7 +951,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("class Fred\n"
@@ -919,7 +966,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "        return *this\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -934,7 +981,7 @@ class TestConstructors : public TestFixture {
               "        Fred(rhs).swap(*this);\n"
               "        return *this;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -944,7 +991,7 @@ class TestConstructors : public TestFixture {
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",dinit(CheckOptions, $.inconclusive = true));
+              "};\n",dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12]: (warning, inconclusive) Member variable 'Fred::data' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("struct Fred {\n"
@@ -952,7 +999,7 @@ class TestConstructors : public TestFixture {
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",dinit(CheckOptions, $.inconclusive = true));
+              "};\n",dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         check("struct Fred {\n"
@@ -960,7 +1007,7 @@ class TestConstructors : public TestFixture {
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",dinit(CheckOptions, $.inconclusive = true));
+              "};\n",dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12]: (warning, inconclusive) Member variable 'Fred::data' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -1066,7 +1113,7 @@ class TestConstructors : public TestFixture {
               "        int b;\n"
               "        Fred() { b = 0; }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1086,7 +1133,7 @@ class TestConstructors : public TestFixture {
               "        int b;\n"
               "        Fred() { b = 0; }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1106,7 +1153,7 @@ class TestConstructors : public TestFixture {
               "        int b;\n"
               "        Fred() { b = 0; }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1128,7 +1175,7 @@ class TestConstructors : public TestFixture {
               "            Fred() { b = 0; }\n"
               "        };\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -1150,7 +1197,7 @@ class TestConstructors : public TestFixture {
               "            Fred() { }\n"
               "        };\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:7:13]: (warning) Member variable 'Fred::a' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:16:13]: (warning) Member variable 'Fred::b' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
@@ -1170,7 +1217,7 @@ class TestConstructors : public TestFixture {
               "c::c()\n"
               "{\n"
               "    m_iMyInt1 = m_iMyInt2 = 0;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -1203,7 +1250,7 @@ class TestConstructors : public TestFixture {
               "void c::InitInt()\n"
               "{\n"
               "    m_iMyInt = 0;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -1216,7 +1263,7 @@ class TestConstructors : public TestFixture {
               "    Fred();\n"
               "};\n"
               "Fred::Fred() : s(NULL)\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -1225,7 +1272,7 @@ class TestConstructors : public TestFixture {
               "    Fred();\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ s = NULL; }");
+              "{ s = NULL; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
@@ -1234,7 +1281,7 @@ class TestConstructors : public TestFixture {
               "    Fred();\n"
               "};\n"
               "Fred::Fred()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Member variable 'Fred::s' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -1246,7 +1293,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    void update() const;\n"
               "    mutable int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1257,7 +1304,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { }\n"
               "    static void *p;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1270,7 +1317,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "  std::map<int, double> * values_{};\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1288,7 +1335,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        U.a = 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -1302,7 +1349,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Fred::U' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -1313,7 +1360,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { }\n"
               "    A() : A(42) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1322,7 +1369,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { number = n; }\n"
               "    A() : A(42) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -1330,7 +1377,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A() { }\n"
               "    A() {}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning, inconclusive) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1339,7 +1386,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A() { }\n"
               "    A() { number = 42; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -1347,7 +1394,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { }\n"
               "    A() : A{42} {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1356,7 +1403,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) { number = n; }\n"
               "    A() : A{42} {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
@@ -1364,7 +1411,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A{} { }\n"
               "    A() {}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning, inconclusive) Member variable 'A::number' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -1373,7 +1420,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int n) : A{} { }\n"
               "    A() { number = 42; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6675
@@ -1383,7 +1430,7 @@ class TestConstructors : public TestFixture {
               "  int foo_;\n"
               "};\n"
               "Foo::Foo() : Foo(0) {}\n"
-              "Foo::Foo(int foo) : foo_(foo) {}");
+              "Foo::Foo(int foo) : foo_(foo) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Noexcept ctors
@@ -1395,7 +1442,7 @@ class TestConstructors : public TestFixture {
               "    A() noexcept;\n"
               "};\n"
               "\n"
-              "A::A() noexcept: A(0) {}");
+              "A::A() noexcept: A(0) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #8581
@@ -1405,7 +1452,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A(int a) : _a(a) {}\n"
               "    A(float a) : A(int(a)) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #8258
@@ -1417,7 +1464,7 @@ class TestConstructors : public TestFixture {
               "    int _a;\n"
               "    int _b;\n"
               "    F _f;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1441,7 +1488,7 @@ class TestConstructors : public TestFixture {
               "    : a(true)\n"
               "    , b(0)\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1456,7 +1503,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "  Derived() {}\n"
               "  void foo() override;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Member variable 'Base::x' is not initialized in the constructor. Maybe it should be initialized directly in the class Base? [uninitDerivedMemberVar]\n", errout_str());
 
         check("struct A {\n" // #3462
@@ -1543,7 +1590,7 @@ class TestConstructors : public TestFixture {
               "class C : public S {\n"
               "public:\n"
               "    C() { all = 0; tick = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1559,7 +1606,7 @@ class TestConstructors : public TestFixture {
               "class C : public S {\n"
               "public:\n"
               "    C() { flag1 = flag2 = 0; tick = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1575,7 +1622,7 @@ class TestConstructors : public TestFixture {
               "class C : public S {\n"
               "public:\n"
               "    C() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:13:5]: (warning) Member variable 'S::all' is not initialized in the constructor. Maybe it should be initialized directly in the class S? [uninitDerivedMemberVar]\n"
                       "[test.cpp:13:5]: (warning) Member variable 'S::flag1' is not initialized in the constructor. Maybe it should be initialized directly in the class S? [uninitDerivedMemberVar]\n"
                       "[test.cpp:13:5]: (warning) Member variable 'S::flag2' is not initialized in the constructor. Maybe it should be initialized directly in the class S? [uninitDerivedMemberVar]\n", errout_str());
@@ -1591,7 +1638,7 @@ class TestConstructors : public TestFixture {
                   "    Fred();\n"
                   "};\n"
                   "Fred::Fred()\n"
-                  "{ }", dinit(CheckOptions, $.s = &s));
+                  "{ }\n", s);
             ASSERT_EQUALS("[test.cpp:7:7]: (warning) Member variable 'Fred::var' is not initialized in the constructor. [uninitMemberVarPrivate]\n", errout_str());
         }
 
@@ -1604,10 +1651,19 @@ class TestConstructors : public TestFixture {
                   "    Fred();\n"
                   "};\n"
                   "Fred::Fred()\n"
-                  "{ }", dinit(CheckOptions, $.s = &s));
+                  "{ }\n", s);
             ASSERT_EQUALS("", errout_str());
         }
     }
+    void initvar_derived_private_constructor() {
+        check("class B { int i; };\n"
+              "class D : B {\n"
+              "    explicit D(int) {}\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:1:1]: (style) The class 'B' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n"
+                      "[test.cpp:3:14]: (warning) Member variable 'B::i' is not initialized in the constructor. Maybe it should be initialized directly in the class B? [uninitDerivedMemberVarPrivate]\n",
+                      errout_str());
+    }
 
     void initvar_copy_constructor() { // ticket #1611
         check("class Fred\n"
@@ -1617,7 +1673,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { };\n"
               "    Fred(const Fred &) { };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -1627,7 +1683,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { };\n"
               "    Fred(const Fred &) { };\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:7:5]: (warning, inconclusive) Member variable 'Fred::var' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n", errout_str());
 
         check("class Fred\n"
@@ -1675,7 +1731,7 @@ class TestConstructors : public TestFixture {
               "A::A(){}\n"
               "A::B::B(int x){}\n"
               "A::B::C::C(int y){}\n"
-              "A::B::C::D::D(int z){}");
+              "A::B::C::D::D(int z){}\n");
         // Note that the example code is not compilable. The A constructor must
         // explicitly initialize A::b. A warning for A::b is not necessary.
         ASSERT_EQUALS("[test.cpp:20:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -1705,7 +1761,7 @@ class TestConstructors : public TestFixture {
               "A::A(){}\n"
               "A::B::B(int x){}\n"
               "A::B::C::C(int y){}\n"
-              "A::B::C::D::D(const A::B::C::D & d){}");
+              "A::B::C::D::D(const A::B::C::D & d){}\n");
         // Note that the example code is not compilable. The A constructor must
         // explicitly initialize A::b. A warning for A::b is not necessary.
         ASSERT_EQUALS("[test.cpp:20:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -1736,7 +1792,7 @@ class TestConstructors : public TestFixture {
               "A::A(){}\n"
               "A::B::B(int x){}\n"
               "A::B::C::C(int y){}\n"
-              "A::B::C::D::D(const A::B::C::D::E & e){}");
+              "A::B::C::D::D(const A::B::C::D::E & e){}\n");
         // Note that the example code is not compilable. The A constructor must
         // explicitly initialize A::b. A warning for A::b is not necessary.
         ASSERT_EQUALS("[test.cpp:21:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -1758,7 +1814,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1773,7 +1829,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1790,7 +1846,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1806,7 +1862,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A : public std::vector<int>\n"
@@ -1822,7 +1878,7 @@ class TestConstructors : public TestFixture {
               "    B(const B&){}\n"
               "    B(B &&){}\n"
               "    const B& operator=(const B&){return *this;}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:11:5]: (warning, inconclusive) Member variable 'B::a' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n"
                       "[test.cpp:12:5]: (warning, inconclusive) Member variable 'B::a' is not assigned in the move constructor. Should it be moved? [missingMemberCopy]\n"
                       "[test.cpp:13:14]: (warning, inconclusive) Member variable 'B::a' is not assigned a value in 'B::operator='. [operatorEqVarError]\n",
@@ -1842,7 +1898,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:13:5]: (warning) Member variable 'A::m_SemVar' is not initialized in the move constructor. [uninitMemberVar]\n", errout_str());
 
         check("class B\n"
@@ -1860,7 +1916,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1870,7 +1926,7 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1888,7 +1944,7 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -1905,7 +1961,7 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:12:5]: (warning) Member variable 'A::m_SemVar' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:13:5]: (warning) Member variable 'A::m_SemVar' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:14:14]: (warning) Member variable 'A::m_SemVar' is not assigned a value in 'A::operator='. [operatorEqVarError]\n", errout_str());
@@ -1916,14 +1972,14 @@ class TestConstructors : public TestFixture {
               "    B b;\n"
               "    A() {}\n"
               "    A(const A& rhs) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    B b;\n"
               "    A() {}\n"
               "    A(const A& rhs) {}\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) Member variable 'A::b' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n", errout_str());
     }
 
@@ -1939,7 +1995,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "void S::Set(const T& val) {\n"
               "    t = val;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1948,7 +2004,7 @@ class TestConstructors : public TestFixture {
               "  Foo(int m) { this->setMember(m); }\n"
               "  void setMember(int m) { member = m; }\n"
               "  int member;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1960,7 +2016,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() : var(0) {}\n"
               "    ~Fred() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1968,7 +2024,7 @@ class TestConstructors : public TestFixture {
         check("class something {\n"
               "    int * ( something :: * process()) () { return 0; }\n"
               "    something() { process(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1979,7 +2035,7 @@ class TestConstructors : public TestFixture {
               "        int& pa = a;\n"
               "        pa = 4;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1988,7 +2044,7 @@ class TestConstructors : public TestFixture {
               "        int* pa = &a;\n"
               "        *pa = 4;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1998,7 +2054,7 @@ class TestConstructors : public TestFixture {
               "        for (int i = 0; i < 2; i++)\n"
               "            *pa++ = i;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -2007,7 +2063,7 @@ class TestConstructors : public TestFixture {
               "        int* pa = a[1];\n"
               "        *pa = 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'S::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct S {\n"
@@ -2016,7 +2072,7 @@ class TestConstructors : public TestFixture {
               "        int pa = a;\n"
               "        pa = 4;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'S::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2035,7 +2091,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "        Wrapper<dim>::foo(x);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2053,7 +2109,7 @@ class TestConstructors : public TestFixture {
               "        d = rhs.get();\n"
               "    }\n"
               "    double d;\n"
-              "};", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #8485
@@ -2080,14 +2136,14 @@ class TestConstructors : public TestFixture {
               "{ }\n"
               "\n"
               "void Fred::operator=(const Fred &f)\n"
-              "{ }", dinit(CheckOptions, $.inconclusive = true));
+              "{ }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:13:12]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
 
         const Settings s = settingsBuilder().certainty(Certainty::inconclusive).severity(Severity::style).severity(Severity::warning).library("std.cfg").build();
         check("struct S {\n"
               "    S& operator=(const S& s) { return *this; }\n"
               "    std::mutex m;\n"
-              "};\n", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2105,7 +2161,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    ECODES _code;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'Fred::_code' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -2118,7 +2174,7 @@ class TestConstructors : public TestFixture {
               "  B() {}\n"
               "private:\n"
               "  float f;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (warning) Member variable 'B::f' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class C\n"
@@ -2131,7 +2187,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "C::C(FILE *fp) {\n"
               "    C::fp = fp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2142,7 +2198,7 @@ class TestConstructors : public TestFixture {
               "    John() { (*this).i = 0; }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2157,7 +2213,7 @@ class TestConstructors : public TestFixture {
               "        Bar();\n"
               "    };\n"
               "    Bar bars[2];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Using struct that doesn't have constructor
@@ -2170,7 +2226,7 @@ class TestConstructors : public TestFixture {
               "        int x;\n"
               "    };\n"
               "    Bar bars[2];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Foo::bars' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2184,7 +2240,7 @@ class TestConstructors : public TestFixture {
               "        int x;\n"
               "    };\n"
               "    struct Bar bar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2196,7 +2252,7 @@ class TestConstructors : public TestFixture {
               "    Foo &operator=(const Foo &)\n"
               "    { return *this; }\n"
               "    static int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2207,7 +2263,7 @@ class TestConstructors : public TestFixture {
               "    explicit Foo(int i) : Bar(mi=i) { }\n"
               "private:\n"
               "    int mi;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo : public Bar\n"
@@ -2216,7 +2272,7 @@ class TestConstructors : public TestFixture {
               "    explicit Foo(int i) : Bar{mi=i} { }\n"
               "private:\n"
               "    int mi;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2237,7 +2293,7 @@ class TestConstructors : public TestFixture {
               "    Foo copy(rhs);\n"
               "    copy.Swap(*this);\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2254,7 +2310,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11]: (warning) Member variable 'Foo::a' is not assigned a value in 'Foo::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -2268,7 +2324,7 @@ class TestConstructors : public TestFixture {
               "Prefs::Prefs(wxSize size)\n"
               "{\n"
               "    SetMinSize( wxSize( 48,48 ) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:8]: (warning) Member variable 'Prefs::xasd' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2280,7 +2336,7 @@ class TestConstructors : public TestFixture {
               "        int var1;\n"
               "        int var2;\n"
               "};\n"
-              "A::A() : var1(0) { }");
+              "A::A() : var1(0) { }\n");
         ASSERT_EQUALS("[test.cpp:8:4]: (warning) Member variable 'A::var2' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2291,7 +2347,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "        int var;\n"
               "};\n"
-              "A::A(int a) { }");
+              "A::A(int a) { }\n");
         ASSERT_EQUALS("[test.cpp:7:4]: (warning) Member variable 'A::var' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2307,7 +2363,7 @@ class TestConstructors : public TestFixture {
               "        : x(x), y(y)\n"
               "    {}\n"
               "    int x, y;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Point::x' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:4:5]: (warning) Member variable 'Point::y' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -2319,7 +2375,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A()\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'A::ints' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2334,7 +2390,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // single namespace
@@ -2350,7 +2406,7 @@ class TestConstructors : public TestFixture {
               "    Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:10]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor outside namespace
@@ -2366,7 +2422,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor outside namespace
@@ -2382,7 +2438,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "Output::Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:14]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor outside namespace with using, #4792
@@ -2399,7 +2455,7 @@ class TestConstructors : public TestFixture {
               "using namespace Output;"
               "Foo::Foo()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:29]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor in separate namespace
@@ -2418,7 +2474,7 @@ class TestConstructors : public TestFixture {
               "    Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13:10]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor in different separate namespace
@@ -2437,7 +2493,7 @@ class TestConstructors : public TestFixture {
               "    Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor in different separate namespace (won't compile)
@@ -2456,7 +2512,7 @@ class TestConstructors : public TestFixture {
               "    Output::Foo::Foo()\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor in nested separate namespace
@@ -2478,7 +2534,7 @@ class TestConstructors : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:15:14]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor in nested different separate namespace
@@ -2500,7 +2556,7 @@ class TestConstructors : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // constructor in nested different separate namespace
@@ -2522,7 +2578,7 @@ class TestConstructors : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2536,7 +2592,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::~Fred()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2554,7 +2610,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        foo.set(0);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo\n"
@@ -2569,7 +2625,7 @@ class TestConstructors : public TestFixture {
               "    Bar()\n"
               "    {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'Bar::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2586,7 +2642,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        foo[0].a = 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo\n"
@@ -2600,7 +2656,7 @@ class TestConstructors : public TestFixture {
               "    Bar()\n"
               "    {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Bar::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2616,7 +2672,7 @@ class TestConstructors : public TestFixture {
               "    A() { }\n"
               "private:\n"
               "    Altren value;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2640,7 +2696,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "        free(m_str);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2652,7 +2708,7 @@ class TestConstructors : public TestFixture {
               "        std::streamsize dataLength_;\n"
               "        double bitsInData_;\n"
               "    } obj;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct copy_protected;\n"
@@ -2663,7 +2719,7 @@ class TestConstructors : public TestFixture {
               "        std::streamsize dataLength_;\n"
               "        double bitsInData_;\n"
               "    } obj;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n",
             errout_str());
@@ -2676,7 +2732,7 @@ class TestConstructors : public TestFixture {
               "        std::streamsize dataLength_;\n"
               "        double bitsInData_;\n"
               "    } obj;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n",
             errout_str());
@@ -2691,7 +2747,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred() {\n"
               "    a[x::y] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2708,7 +2764,7 @@ class TestConstructors : public TestFixture {
               "Fred & Fred::clone(const Fred & other) {\n"
               "    x = 0;\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
@@ -2722,7 +2778,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "Fred & Fred::clone(const Fred & other) {\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:14]: (warning) Member variable 'Fred::x' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
@@ -2740,7 +2796,7 @@ class TestConstructors : public TestFixture {
               "Fred::Fred(struct C c, D d) { }\n"
               "Fred::Fred(E e, struct F f) { }\n"
               "Fred::Fred(G g, H h) { }\n"
-              "Fred::Fred(struct I i, struct J j) { }");
+              "Fred::Fred(struct I i, struct J j) { }\n");
         ASSERT_EQUALS("[test.cpp:10:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:11:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:12:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -2849,7 +2905,7 @@ class TestConstructors : public TestFixture {
               "    A(int s) {\n"
               "        v = new int [sz = s];\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2860,7 +2916,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "        rtl::math::setNan(&d);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
         check("class A {\n"
               "    double d;\n"
@@ -2868,7 +2924,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "        ::rtl::math::setNan(&d);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2883,7 +2939,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    void foo(int a) { i = a; }\n"
               "    void foo(float a) { f = a; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2915,7 +2971,7 @@ class TestConstructors : public TestFixture {
               "    D() { foo(); }\n"
               "	void foo() { }\n"
               "	void foo() const { i = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:18:5]: (warning) Member variable 'C::i' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:25:5]: (warning) Member variable 'D::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -2932,7 +2988,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "using namespace NS;\n"
               "MyClass::~MyClass() { }\n"
-              "MyClass::MyClass() : SomeVar(false) { }");
+              "MyClass::MyClass() : SomeVar(false) { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2950,7 +3006,7 @@ class TestConstructors : public TestFixture {
               "}\n"
               "void MyClass::Restart() {\n"
               "    m_retCode = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2963,7 +3019,7 @@ class TestConstructors : public TestFixture {
               "   {\n"
               "      if (1) {}\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:4]: (warning) Member variable 'Foo::member' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("class Foo {\n"
               "   friend class Bar;\n"
@@ -2973,7 +3029,7 @@ class TestConstructors : public TestFixture {
               "   {\n"
               "      while (1) {}\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:4]: (warning) Member variable 'Foo::member' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("class Foo {\n"
               "   friend class Bar;\n"
@@ -2983,7 +3039,7 @@ class TestConstructors : public TestFixture {
               "   {\n"
               "      for (;;) {}\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:4]: (warning) Member variable 'Foo::member' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -2995,7 +3051,7 @@ class TestConstructors : public TestFixture {
               "        int x;\n"
               "    };\n"
               "};\n"
-              "app::B::B(void){}");
+              "app::B::B(void){}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (warning) Member variable 'B::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3020,6 +3076,25 @@ class TestConstructors : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void uninitVar36() {
+        check("struct S {\n"
+              "    unsigned int a : 16;\n"
+              "    unsigned int   : 8;\n"
+              "    unsigned int b : 8;\n"
+              "    S() : a(0) {}\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'S::b' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
+    }
+
+    void uninitVar37() {
+        const Settings s = settingsBuilder(settings).library("std.cfg").build();
+        check("struct C {\n" // #13989
+              "    C() = default;\n"
+              "    std::list<int>::const_iterator it;\n"
+              "};\n", s);
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'C::it' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
+    }
+
     void uninitVarArray1() {
         check("class John\n"
               "{\n"
@@ -3028,7 +3103,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'John::name' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class John\n"
@@ -3038,7 +3113,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class John\n"
@@ -3048,7 +3123,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class John\n"
@@ -3057,7 +3132,7 @@ class TestConstructors : public TestFixture {
               "    John() { }\n"
               "\n"
               "    double  operator[](const unsigned long i);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A;\n"
@@ -3066,7 +3141,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    John() { }\n"
               "    A a[5];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A;\n"
@@ -3075,7 +3150,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    John() { }\n"
               "    A (*a)[5];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'John::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3087,7 +3162,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5754
@@ -3098,7 +3173,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char name[255];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3115,7 +3190,7 @@ class TestConstructors : public TestFixture {
               "        memset(a,0,sizeof(a));\n"
               "        memset(b,0,sizeof(b));\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3132,7 +3207,7 @@ class TestConstructors : public TestFixture {
               "        if (snprintf(a,10,\"a\")) { }\n"
               "        if (snprintf(b,10,\"b\")) { }\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3144,7 +3219,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3156,7 +3231,7 @@ class TestConstructors : public TestFixture {
               "    static const char STR[];\n"
               "};\n"
               "const char Foo::STR[] = \"abc\";\n"
-              "Foo::Foo() { }");
+              "Foo::Foo() { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3166,7 +3241,7 @@ class TestConstructors : public TestFixture {
               "    int array[10];\n"
               "public:\n"
               "    Foo() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Foo::array' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class Foo\n"
@@ -3174,7 +3249,7 @@ class TestConstructors : public TestFixture {
               "    int array[10];\n"
               "public:\n"
               "    Foo() { memset(array, 0, sizeof(array)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo\n"
@@ -3182,7 +3257,7 @@ class TestConstructors : public TestFixture {
               "    int array[10];\n"
               "public:\n"
               "    Foo() { ::memset(array, 0, sizeof(array)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3191,7 +3266,7 @@ class TestConstructors : public TestFixture {
               "    char a[10];\n"
               "public:\n"
               "    Foo() { ::ZeroMemory(a); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3202,7 +3277,7 @@ class TestConstructors : public TestFixture {
               "    BaseGDL* eArr[3];\n"
               "public:\n"
               "    IxExprListT() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (warning) Member variable 'IxExprListT::eArr' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct sRAIUnitDefBL {\n"
               "  sRAIUnitDefBL();\n"
@@ -3211,7 +3286,7 @@ class TestConstructors : public TestFixture {
               "struct sRAIUnitDef {\n"
               "  sRAIUnitDef() {}\n"
               "  sRAIUnitDefBL *List[35];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (warning) Member variable 'sRAIUnitDef::List' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3227,7 +3302,7 @@ class TestConstructors : public TestFixture {
               "    std::array<std::string, 2> e;\n"
               "    std::array<U, 2> f;\n"
               "S() {}\n"
-              "};\n", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
 
         ASSERT_EQUALS("[test.cpp:10:1]: (warning) Member variable 'S::a' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:10:1]: (warning) Member variable 'S::b' is not initialized in the constructor. [uninitMemberVar]\n"
@@ -3258,7 +3333,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "private:\n"
               "    char a[2][2];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3269,7 +3344,7 @@ class TestConstructors : public TestFixture {
               "    char a[2][2][2];\n"
               "public:\n"
               "    John() { a[0][0][0] = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3280,7 +3355,7 @@ class TestConstructors : public TestFixture {
               "    Foo()\n"
               "        : bar({\"a\", \"b\"})\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3296,7 +3371,7 @@ class TestConstructors : public TestFixture {
               "    Fred() : f{0, true} { }\n"
               "    float get() const;\n"
               "};\n"
-              "float Fred::get() const { return g; }");
+              "float Fred::get() const { return g; }\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Fred::g' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3312,7 +3387,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -3326,7 +3401,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'A::b' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class A\n"
@@ -3341,7 +3416,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3358,7 +3433,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:11:5]: (warning) Member variable 'Fred::p' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct POINT\n"
@@ -3374,7 +3449,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct POINT\n"
@@ -3390,7 +3465,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
@@ -3406,7 +3481,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3418,13 +3493,13 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred()\n"
               "    { a = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
               "private:\n"
               "    union { int a{}; int b; };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3438,7 +3513,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() : data_type(0)\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (warning) Member variable 'Fred::data' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3451,7 +3526,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    void Init();"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown non-member function (friend class)
@@ -3462,7 +3537,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    friend ABC;\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown non-member function (is Init a virtual function?)
@@ -3472,7 +3547,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown non-member function
@@ -3482,7 +3557,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown non-member function
@@ -3493,7 +3568,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { Init(); }\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown member functions and unknown static functions
@@ -3513,7 +3588,7 @@ class TestConstructors : public TestFixture {
               "    static void static_f();\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // Unknown overloaded member functions
@@ -3526,7 +3601,7 @@ class TestConstructors : public TestFixture {
               "    void func();\n"
               "private:\n"
               "    int i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3538,7 +3613,7 @@ class TestConstructors : public TestFixture {
               "    Fred() {}\n"
               "private:\n"
               "    unsigned int i;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -3549,7 +3624,7 @@ class TestConstructors : public TestFixture {
               "struct Y {\n"
               "    Y() {}\n"
               "    X x;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3565,7 +3640,7 @@ class TestConstructors : public TestFixture {
               "        if(!(in >> foo))\n"
               "            throw 0;\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3577,7 +3652,7 @@ class TestConstructors : public TestFixture {
               "    typedef int * pointer;\n"
               "    Foo() : a(0) {}\n"
               "    pointer a;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3588,7 +3663,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    int * pointer;\n"
               "    Foo() { memset(this, 0, sizeof(*this)); }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -3597,7 +3672,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    int * pointer;\n"
               "    Foo() { ::memset(this, 0, sizeof(*this)); }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -3606,13 +3681,13 @@ class TestConstructors : public TestFixture {
               "    int * p;\n"
               "    char c;\n"
               "    Foo() { memset(p, 0, sizeof(int)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Foo::c' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct Foo {\n"
               "    int i;\n"
               "    char c;\n"
               "    Foo() { memset(&i, 0, sizeof(int)); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Foo::c' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct Foo { int f; };\n"
               "struct Bar { int b; };\n"
@@ -3626,7 +3701,7 @@ class TestConstructors : public TestFixture {
               "int main() {\n"
               "  FooBar foobar;\n"
               "  return foobar.foo.f + foobar.bar.b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (warning) Member variable 'FooBar::bar' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
         check("struct Foo { int f; };\n"
               "struct Bar { int b; };\n"
@@ -3640,7 +3715,7 @@ class TestConstructors : public TestFixture {
               "int main() {\n"
               "  FooBar foobar;\n"
               "  return foobar.foo.f + foobar.bar.b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (warning) Member variable 'FooBar::bar' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // #7755
@@ -3649,7 +3724,7 @@ class TestConstructors : public TestFixture {
               "    memset(this->data, 0, 42);\n"
               "  }\n"
               "  char data[42];\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3659,7 +3734,7 @@ class TestConstructors : public TestFixture {
             check("class Foo {\n"
                   "    int foo;\n"
                   "    Foo() { }\n"
-                  "};", dinit(CheckOptions, $.s = &s));
+                  "};\n", s);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -3668,7 +3743,7 @@ class TestConstructors : public TestFixture {
             check("class Foo {\n"
                   "    int foo;\n"
                   "    Foo() { }\n"
-                  "};", dinit(CheckOptions, $.s = &s));
+                  "};\n", s);
             ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Foo::foo' is not initialized in the constructor. [uninitMemberVarPrivate]\n", errout_str());
         }
     }
@@ -3681,7 +3756,7 @@ class TestConstructors : public TestFixture {
               "    Foo() { }\n"
               "public:\n"
               "    explicit Foo(int _i) { }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("[test.cpp:7:14]: (warning) Member variable 'Foo::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
@@ -3702,7 +3777,7 @@ class TestConstructors : public TestFixture {
               "int* A::f(int* p)\n"
               "{\n"
               "    return p;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3716,7 +3791,7 @@ class TestConstructors : public TestFixture {
               "    int *i;\n"
               "public:\n"
               "    Fred() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3730,7 +3805,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { }\n"
               "private:\n"
               "    int x;\n"
-              "};", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3740,7 +3815,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { }\n"
               "    int *operator [] (int index) { return 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3754,7 +3829,7 @@ class TestConstructors : public TestFixture {
               "    { f.d = 0; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3766,7 +3841,7 @@ class TestConstructors : public TestFixture {
               "    { }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "", errout_str());
     }
 
@@ -3780,7 +3855,7 @@ class TestConstructors : public TestFixture {
               "    { f.d = 0; return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3792,7 +3867,7 @@ class TestConstructors : public TestFixture {
               "    { return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "",  errout_str());
     }
 
@@ -3806,7 +3881,7 @@ class TestConstructors : public TestFixture {
               "    { d = 0; return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3818,7 +3893,7 @@ class TestConstructors : public TestFixture {
               "    { return true; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3832,7 +3907,7 @@ class TestConstructors : public TestFixture {
               "    { f.d = 0; }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -3844,7 +3919,7 @@ class TestConstructors : public TestFixture {
               "    { }\n"
               "\n"
               "    double d;\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "", errout_str());
     }
 
@@ -3858,7 +3933,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() { Init( B ); };\n"
               "    void Init( Structure& S ) { S.C = 0; };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Structure {\n"
@@ -3870,7 +3945,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A() { Init( B ); };\n"
               "    void Init(const Structure& S) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (warning) Member variable 'A::B' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
@@ -3895,7 +3970,7 @@ class TestConstructors : public TestFixture {
               "A::B::B()\n"
               "{\n"
               "    i = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
@@ -3921,7 +3996,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "A::B::B()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:18:4]: (warning) Member variable 'B::j' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:22:7]: (warning) Member variable 'B::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -3942,7 +4017,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace n1\n"
@@ -3964,7 +4039,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:10]: (warning) Member variable 'Foo::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("namespace n1\n"
@@ -3986,7 +4061,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4007,7 +4082,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    void init(int value)\n"
               "    { i = value; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -4025,7 +4100,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    void init(int value)\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (warning) Member variable 'A::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class bar {\n" // #9887
@@ -4046,7 +4121,7 @@ class TestConstructors : public TestFixture {
               "    int a;\n"
               "    A() { a=0; }\n"
               "    A(A const &a) { operator=(a); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -4057,7 +4132,7 @@ class TestConstructors : public TestFixture {
               "        a = rhs.a;\n"
               "        return *this;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -4067,7 +4142,7 @@ class TestConstructors : public TestFixture {
               "    A & operator = (const A & rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'A::a' is not initialized in the copy constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:9]: (warning) Member variable 'A::a' is not assigned a value in 'A::operator='. [operatorEqVarError]\n", errout_str());
     }
@@ -4079,28 +4154,28 @@ class TestConstructors : public TestFixture {
               "struct B {\n"
               "    A* a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct A;\n"
               "struct B {\n"
               "    A* a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct A;\n"
               "struct B {\n"
               "    const A* a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct A;\n"
               "struct B {\n"
               "    A* const a;\n"
               "    B() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class Test {\n" // #8498
@@ -4131,6 +4206,18 @@ class TestConstructors : public TestFixture {
               "    std::map<int, int>* pMap = nullptr;\n"
               "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #6294
+              "    S() : r(new int) {\n"
+              "        *p = 0;\n"
+              "        *(q) = 1;\n"
+              "        *r = 2;\n"
+              "    }\n"
+              "    int *p, *q, *r;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'S::p' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:2:5]: (warning) Member variable 'S::q' is not initialized in the constructor. [uninitMemberVar]\n",
+                      errout_str());
     }
 
     void uninitConstVar() {
@@ -4139,7 +4226,7 @@ class TestConstructors : public TestFixture {
               "    A* const a;\n"
               "    B() { }\n"
               "    B(B& b) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:5:5]: (warning) Member variable 'B::a' is not initialized in the copy constructor. [uninitMemberVar]\n", errout_str());
 
@@ -4147,21 +4234,21 @@ class TestConstructors : public TestFixture {
               "struct B {\n"
               "    A* const a;\n"
               "    B& operator=(const B& r) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str()); // #3804
 
         check("struct B {\n"
               "    const int a;\n"
               "    B() { }\n"
               "    B(B& b) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n"
                       "[test.cpp:4:5]: (warning) Member variable 'B::a' is not initialized in the copy constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct B {\n"
               "    const int a;\n"
               "    B& operator=(const B& r) { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4171,7 +4258,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "  C() _STLP_NOTHROW {}\n"
               "  C(const C&) _STLP_NOTHROW {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4180,7 +4267,7 @@ class TestConstructors : public TestFixture {
               "  int mValue;\n"
               "public:\n"
               "  operatorX() : mValue(0) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4190,7 +4277,7 @@ class TestConstructors : public TestFixture {
               "  T* mElements;\n"
               "};\n"
               "template <class T> Container<T>::Container() : mElements(nullptr) {}\n"
-              "Container<int> intContainer;");
+              "Container<int> intContainer;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4200,7 +4287,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    SelectionPosition() {}\n"
               "    const rvec &x() const;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4215,7 +4302,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Member variable 'C::x' is not initialized in the constructor.\n",
                            "[test.cpp:3:5]: (warning) Member variable 'C::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -4229,7 +4316,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};", dinit(CheckOptions, $.inconclusive = true));
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Member variable 'C::x' is not initialized in the constructor.\n",
                            "[test.cpp:3:5]: (warning) Member variable 'C::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
@@ -4243,7 +4330,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4256,7 +4343,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4266,7 +4353,7 @@ class TestConstructors : public TestFixture {
               "        i = i * SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4276,7 +4363,7 @@ class TestConstructors : public TestFixture {
               "        i = i / SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4286,7 +4373,7 @@ class TestConstructors : public TestFixture {
               "        i = i % SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4296,7 +4383,7 @@ class TestConstructors : public TestFixture {
               "        i = i + SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4306,7 +4393,7 @@ class TestConstructors : public TestFixture {
               "        i = i - SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4316,7 +4403,7 @@ class TestConstructors : public TestFixture {
               "        i = i << SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4326,7 +4413,7 @@ class TestConstructors : public TestFixture {
               "        i = i >> SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4336,7 +4423,7 @@ class TestConstructors : public TestFixture {
               "        i = i ^ SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4351,7 +4438,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4364,7 +4451,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4374,7 +4461,7 @@ class TestConstructors : public TestFixture {
               "        i *= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4384,7 +4471,7 @@ class TestConstructors : public TestFixture {
               "        i /= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4394,7 +4481,7 @@ class TestConstructors : public TestFixture {
               "        i %= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4404,7 +4491,7 @@ class TestConstructors : public TestFixture {
               "        i += SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4414,7 +4501,7 @@ class TestConstructors : public TestFixture {
               "        i -= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4424,7 +4511,7 @@ class TestConstructors : public TestFixture {
               "        i <<= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4434,7 +4521,7 @@ class TestConstructors : public TestFixture {
               "        i >>= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4444,7 +4531,7 @@ class TestConstructors : public TestFixture {
               "        i ^= SetValue();\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4459,7 +4546,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4472,7 +4559,7 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4481,7 +4568,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 < SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4490,7 +4577,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 <= SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4499,7 +4586,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 > SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
@@ -4508,7 +4595,7 @@ class TestConstructors : public TestFixture {
               "        bool b = (0 >= SetValue());\n"
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4526,7 +4613,7 @@ class TestConstructors : public TestFixture {
               "class C {\n"
               "  private:\n"
               "    A* b;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T> class A{};\n"
@@ -4538,7 +4625,7 @@ class TestConstructors : public TestFixture {
               "    bool m_value;\n"
               "};\n"
               "template<class T1, class T2>\n"
-              "A<B<T1, T2>>::A() : m_value(false) {}");
+              "A<B<T1, T2>>::A() : m_value(false) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <typename T> struct S;\n" // #11177
@@ -4557,7 +4644,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    A& operator=() { return *this; }\n"
               "};\n"
-              "A<decltype(SOMETHING)> a;");
+              "A<decltype(SOMETHING)> a;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
index 175e158ed5c..d88daceb0d9 100644
--- a/test/testcppcheck.cpp
+++ b/test/testcppcheck.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,23 +16,49 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "addoninfo.h"
+#include "analyzerinfo.h"
 #include "color.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "filesettings.h"
 #include "fixture.h"
 #include "helpers.h"
 #include "path.h"
+#include "preprocessor.h"
+#include "redirect.h"
 #include "settings.h"
+#include "standards.h"
 #include "suppressions.h"
 
-#include "simplecpp.h"
-
 #include <algorithm>
+#include <cstdio>
+#include <cstdlib>
 #include <list>
 #include <string>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
+#include <simplecpp.h>
+
+namespace {
+    class FilesDeleter {
+    public:
+        FilesDeleter() = default;
+        ~FilesDeleter() {
+            for (const std::string& fileName: mFilenames)
+                std::remove(fileName.c_str());
+        }
+        void addFile(const std::string& fileName) {
+            mFilenames.push_back(fileName);
+        }
+    private:
+        std::vector<std::string> mFilenames;
+    };
+}
+
 class TestCppcheck : public TestFixture {
 public:
     TestCppcheck() : TestFixture("TestCppcheck") {}
@@ -52,18 +78,30 @@ class TestCppcheck : public TestFixture {
             ids.push_back(msg.id);
             errmsgs.push_back(msg);
         }
+
+        void reportMetric(const std::string &metric) override {
+            (void) metric;
+        }
     };
 
     void run() override {
         TEST_CASE(getErrorMessages);
         TEST_CASE(checkWithFile);
+        TEST_CASE(checkWithFileWithTools);
+        TEST_CASE(checkWithFileWithToolsNoCommand);
         TEST_CASE(checkWithFS);
+        TEST_CASE(checkWithFSWithTools);
+        TEST_CASE(checkWithFSWithToolsNoCommand);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
         TEST_CASE(unique_errors_2);
         TEST_CASE(isPremiumCodingStandardId);
         TEST_CASE(getDumpFileContentsRawTokens);
         TEST_CASE(getDumpFileContentsLibrary);
+        TEST_CASE(checkPlistOutput);
+        TEST_CASE(premiumResultsCache);
+        TEST_CASE(purgedConfiguration);
+        TEST_CASE(recheckInclude);
     }
 
     void getErrorMessages() const {
@@ -104,65 +142,231 @@ class TestCppcheck : public TestFixture {
         ASSERT(foundMissingIncludeSystem);
     }
 
-    void checkWithFile() const
+    static std::string exename_(const std::string& exe)
+    {
+#ifdef _WIN32
+        return exe + ".exe";
+#else
+        return exe;
+#endif
+    }
+
+    CppCheck::ExecuteCmdFn getExecuteCommand(const std::string& fname, int& called) const
+    {
+        // cppcheck-suppress passedByValue - used as callback so we need to preserve the signature
+        // NOLINTNEXTLINE(performance-unnecessary-value-param) - used as callback so we need to preserve the signature
+        return [&](std::string exe, std::vector<std::string> args, std::string redirect, std::string& /*output*/) -> int {
+            ++called;
+            if (exe == exename_("clang-tidy"))
+            {
+                ASSERT_EQUALS(4, args.size());
+                ASSERT_EQUALS("-quiet", args[0]);
+                ASSERT_EQUALS("-checks=*,-clang-analyzer-*,-llvm*", args[1]);
+                ASSERT_EQUALS(fname, args[2]);
+                ASSERT_EQUALS("--", args[3]);
+                ASSERT_EQUALS("2>&1", redirect);
+                return EXIT_SUCCESS;
+            }
+            if (exe == exename_("python3"))
+            {
+                ASSERT_EQUALS(1, args.size());
+                ASSERT_EQUALS("--version", args[0]);
+                ASSERT_EQUALS("2>&1", redirect);
+                return EXIT_SUCCESS;
+            }
+            if (exe == exename_("python"))
+            {
+                ASSERT_EQUALS(1, args.size());
+                ASSERT_EQUALS("--version", args[0]);
+                ASSERT_EQUALS("2>&1", redirect);
+                return EXIT_SUCCESS;
+            }
+            ASSERT_MSG(false, "unhandled exe: " + exe);
+            return EXIT_FAILURE;
+        };
+    }
+
+    void checkWithFileInternal(const std::string& fname, bool tools, bool nocmd = false) const
     {
-        ScopedFile file("test.cpp",
-                        "int main()\n"
+        REDIRECT;
+        ScopedFile file(fname,
+                        "void f()\n"
                         "{\n"
-                        "  int i = *((int*)0);\n"
-                        "  return 0;\n"
-                        "}");
+                        "  (void)(*((int*)0));\n"
+                        "}\n");
 
-        const auto s = dinit(Settings, $.templateFormat = templateFormat);
+        int called = 0;
+        std::unordered_set<std::string> addons;
+        std::vector<AddonInfo> addonInfo;
+        if (tools)
+        {
+            addons.emplace("testcppcheck");
+            addonInfo.emplace_back(/*AddonInfo()*/);
+        }
+        const auto s = dinit(Settings,
+                             $.templateFormat = templateFormat,
+                                 $.clangTidy = tools,
+                                 $.addons = std::move (addons),
+                                 $.addonInfos = std::move (addonInfo));
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck::ExecuteCmdFn f;
+        if (tools && !nocmd) {
+            f = getExecuteCommand(fname, called);
+        }
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, f);
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(file.path(), Path::identify(file.path(), false), 0)));
         // TODO: how to properly disable these warnings?
         errorLogger.ids.erase(std::remove_if(errorLogger.ids.begin(), errorLogger.ids.end(), [](const std::string& id) {
             return id == "logChecker";
         }), errorLogger.ids.end());
-        ASSERT_EQUALS(1, errorLogger.ids.size());
-        ASSERT_EQUALS("nullPointer", *errorLogger.ids.cbegin());
+        errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
+            return msg.id == "logChecker";
+        }), errorLogger.errmsgs.end());
+        if (tools)
+        {
+            ASSERT_EQUALS(2, errorLogger.ids.size());
+            auto it = errorLogger.errmsgs.cbegin();
+            ASSERT_EQUALS("nullPointer", it->id);
+            ++it;
+
+            if (nocmd)
+            {
+                ASSERT_EQUALS("internalError", it->id);
+                ASSERT_EQUALS("Bailing out from analysis: Checking file failed: Failed to execute addon - no command callback provided", it->shortMessage()); // TODO: add addon name
+
+                // TODO: clang-tidy is currently not invoked for file inputs - see #12053
+                // TODO: needs to become a proper error
+                TODO_ASSERT_EQUALS("Failed to execute '" + exename_("clang-tidy") + "' (no command callback provided)\n", "", GET_REDIRECT_ERROUT);
+
+                ASSERT_EQUALS(0, called); // not called because we check if the callback exists
+            }
+            else
+            {
+                ASSERT_EQUALS("internalError", it->id);
+                ASSERT_EQUALS("Bailing out from analysis: Checking file failed: Failed to auto detect python", it->shortMessage()); // TODO: clarify what python is used for
+
+                // TODO: we cannot check this because the python detection is cached globally so this result will different dependent on how the test is called
+                //ASSERT_EQUALS(2, called);
+            }
+        }
+        else
+        {
+            ASSERT_EQUALS(0, called);
+            ASSERT_EQUALS(1, errorLogger.ids.size());
+            ASSERT_EQUALS("nullPointer", *errorLogger.ids.cbegin());
+        }
+    }
+
+    void checkWithFile() const {
+        checkWithFileInternal("file.c", false);
     }
 
-    void checkWithFS() const
+    void checkWithFileWithTools() const {
+        checkWithFileInternal("file_tools.c", true);
+    }
+
+    void checkWithFileWithToolsNoCommand() const {
+        checkWithFileInternal("file_tools_nocmd.c", true, true);
+    }
+
+    void checkWithFSInternal(const std::string& fname, bool tools, bool nocmd = false) const
     {
-        ScopedFile file("test.cpp",
-                        "int main()\n"
+        REDIRECT;
+        ScopedFile file(fname,
+                        "void f()\n"
                         "{\n"
-                        "  int i = *((int*)0);\n"
-                        "  return 0;\n"
-                        "}");
+                        "  (void)(*((int*)0));\n"
+                        "}\n");
 
-        const auto s = dinit(Settings, $.templateFormat = templateFormat);
+        int called = 0;
+        std::unordered_set<std::string> addons;
+        std::vector<AddonInfo> addonInfo;
+        if (tools)
+        {
+            addons.emplace("testcppcheck");
+            addonInfo.emplace_back(/*AddonInfo()*/);
+        }
+        const auto s = dinit(Settings,
+                             $.templateFormat = templateFormat,
+                                 $.clangTidy = tools,
+                                 $.addons = std::move (addons),
+                                 $.addonInfos = std::move (addonInfo));
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck::ExecuteCmdFn f;
+        if (tools && !nocmd) {
+            f = getExecuteCommand(fname, called);
+        }
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, f);
         FileSettings fs{file.path(), Path::identify(file.path(), false), 0};
         ASSERT_EQUALS(1, cppcheck.check(fs));
         // TODO: how to properly disable these warnings?
         errorLogger.ids.erase(std::remove_if(errorLogger.ids.begin(), errorLogger.ids.end(), [](const std::string& id) {
             return id == "logChecker";
         }), errorLogger.ids.end());
-        ASSERT_EQUALS(1, errorLogger.ids.size());
-        ASSERT_EQUALS("nullPointer", *errorLogger.ids.cbegin());
+        errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
+            return msg.id == "logChecker";
+        }), errorLogger.errmsgs.end());
+        if (tools)
+        {
+            ASSERT_EQUALS(2, errorLogger.ids.size());
+            auto it = errorLogger.errmsgs.cbegin();
+            ASSERT_EQUALS("nullPointer", it->id);
+            ++it;
+
+            if (nocmd)
+            {
+                ASSERT_EQUALS("internalError", it->id);
+                ASSERT_EQUALS("Bailing out from analysis: Checking file failed: Failed to execute addon - no command callback provided", it->shortMessage()); // TODO: add addon name
+
+                // TODO: needs to become a proper error
+                ASSERT_EQUALS("Failed to execute '" + exename_("clang-tidy") + "' (no command callback provided)\n", GET_REDIRECT_ERROUT);
+
+                ASSERT_EQUALS(0, called); // not called because we check if the callback exists
+            }
+            else
+            {
+                ASSERT_EQUALS("internalError", it->id);
+                ASSERT_EQUALS("Bailing out from analysis: Checking file failed: Failed to auto detect python", it->shortMessage()); // TODO: clarify what python is used for
+
+                // TODO: we cannot check this because the python detection is cached globally so this result will different dependent on how the test is called
+                //ASSERT_EQUALS(3, called);
+            }
+        }
+        else
+        {
+            ASSERT_EQUALS(0, called);
+            ASSERT_EQUALS(1, errorLogger.ids.size());
+            ASSERT_EQUALS("nullPointer", *errorLogger.ids.cbegin());
+        }
+    }
+
+    void checkWithFS() const {
+        checkWithFSInternal("fs.c", false);
+    }
+
+    void checkWithFSWithTools() const {
+        checkWithFSInternal("fs_tools.c", true);
+    }
+
+    void checkWithFSWithToolsNoCommand() const {
+        checkWithFSInternal("fs_tools_nocmd.c", true, true);
     }
 
     void suppress_error_library() const
     {
-        ScopedFile file("test.cpp",
-                        "int main()\n"
+        ScopedFile file("suppr_err_lib.c",
+                        "void f()\n"
                         "{\n"
-                        "  int i = *((int*)0);\n"
-                        "  return 0;\n"
-                        "}");
+                        "  (void)(*((int*)0));\n"
+                        "}\n");
 
-        const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
+        const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
         const Settings s = settingsBuilder().libraryxml(xmldata).build();
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         ASSERT_EQUALS(0, cppcheck.check(FileWithDetails(file.path(), Path::identify(file.path(), false), 0)));
         // TODO: how to properly disable these warnings?
         errorLogger.ids.erase(std::remove_if(errorLogger.ids.begin(), errorLogger.ids.end(), [](const std::string& id) {
@@ -177,18 +381,18 @@ class TestCppcheck : public TestFixture {
         ScopedFile file("inc.h",
                         "inline void f()\n"
                         "{\n"
-                        "  (void)*((int*)0);\n"
-                        "}");
-        ScopedFile test_file_a("a.cpp",
-                               "#include \"inc.h\"");
-        ScopedFile test_file_b("b.cpp",
-                               "#include \"inc.h\"");
+                        "  (void)(*((int*)0));\n"
+                        "}\n");
+        ScopedFile test_file_a("a.c",
+                               "#include \"inc.h\"\n");
+        ScopedFile test_file_b("b.c",
+                               "#include \"inc.h\"\n");
 
         // this is the "simple" format
         const auto s = dinit(Settings, $.templateFormat = templateFormat); // TODO: remove when we only longer rely on toString() in unique message handling
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file_a.path(), Path::identify(test_file_a.path(), false), 0)));
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file_b.path(), Path::identify(test_file_b.path(), false), 0)));
         // TODO: how to properly disable these warnings?
@@ -198,29 +402,29 @@ class TestCppcheck : public TestFixture {
         // the internal errorlist is cleared after each check() call
         ASSERT_EQUALS(2, errorLogger.errmsgs.size());
         auto it = errorLogger.errmsgs.cbegin();
-        ASSERT_EQUALS("a.cpp", it->file0);
+        ASSERT_EQUALS("a.c", it->file0);
         ASSERT_EQUALS("nullPointer", it->id);
         ++it;
-        ASSERT_EQUALS("b.cpp", it->file0);
+        ASSERT_EQUALS("b.c", it->file0);
         ASSERT_EQUALS("nullPointer", it->id);
     }
 
     void unique_errors_2() const
     {
-        ScopedFile test_file("c.cpp",
+        ScopedFile test_file("c.c",
                              "void f()\n"
                              "{\n"
                              "const long m[9] = {};\n"
                              "long a=m[9], b=m[9];\n"
                              "(void)a;\n"
                              "(void)b;\n"
-                             "}");
+                             "}\n");
 
         // this is the "simple" format
         const auto s = dinit(Settings, $.templateFormat = templateFormat); // TODO: remove when we only longer rely on toString() in unique message handling?
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
         ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file.path(), Path::identify(test_file.path(), false), 0)));
         // TODO: how to properly disable these warnings?
         errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
@@ -229,7 +433,7 @@ class TestCppcheck : public TestFixture {
         // the internal errorlist is cleared after each check() call
         ASSERT_EQUALS(2, errorLogger.errmsgs.size());
         auto it = errorLogger.errmsgs.cbegin();
-        ASSERT_EQUALS("c.cpp", it->file0);
+        ASSERT_EQUALS("c.c", it->file0);
         ASSERT_EQUALS(1, it->callStack.size());
         {
             auto stack = it->callStack.cbegin();
@@ -238,7 +442,7 @@ class TestCppcheck : public TestFixture {
         }
         ASSERT_EQUALS("arrayIndexOutOfBounds", it->id);
         ++it;
-        ASSERT_EQUALS("c.cpp", it->file0);
+        ASSERT_EQUALS("c.c", it->file0);
         ASSERT_EQUALS(1, it->callStack.size());
         {
             auto stack = it->callStack.cbegin();
@@ -254,14 +458,16 @@ class TestCppcheck : public TestFixture {
 
         {
             const auto s = dinit(Settings, $.premiumArgs = "");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
 
             ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2012-0.0"));
             ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2023-0.0"));
-            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c2012-0.0"));
-            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c2023-0.0"));
-            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c++2008-0.0.0"));
-            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c++2023-0.0.0"));
+            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c-2012-0.0"));
+            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c-2023-0.0"));
+            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c-2025-0.0"));
+            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c-2025-dir-0.0"));
+            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c++-2008-0-0-0"));
+            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-misra-c++-2023-0.0.0"));
             ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-cert-int50-cpp"));
             ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("premium-autosar-0-0-0"));
         }
@@ -269,14 +475,15 @@ class TestCppcheck : public TestFixture {
         {
             const auto s = dinit(Settings, $.premiumArgs = "--misra-c-2012 --cert-c++-2016 --autosar");
 
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
 
-            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("misra-c2012-0.0"));
-            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("misra-c2023-0.0"));
-            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c2012-0.0"));
-            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c2023-0.0"));
-            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c++2008-0.0.0"));
-            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c++2023-0.0.0"));
+            ASSERT_EQUALS(false, cppcheck.isPremiumCodingStandardId("misra-c2012-0.0"));
+            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c-2012-0.0"));
+            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c-2023-0.0"));
+            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c-2025-0.0"));
+            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c-2025-dir-0.0"));
+            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c++-2008-0-0-0"));
+            ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-misra-c++-2023-0.0.0"));
             ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-cert-int50-cpp"));
             ASSERT_EQUALS(true, cppcheck.isPremiumCodingStandardId("premium-autosar-0-0-0"));
         }
@@ -288,13 +495,28 @@ class TestCppcheck : public TestFixture {
         s.basePaths.emplace_back("/some/path");
         Suppressions supprs;
         ErrorLogger2 errorLogger;
-        CppCheck cppcheck(s, supprs, errorLogger, false, {});
-        std::vector<std::string> files{"/some/path/test.cpp"};
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+        std::vector<std::string> files{"/some/path/test.c"};
         simplecpp::TokenList tokens1(files);
         const std::string expected = "  <rawtokens>\n"
-                                     "    <file index=\"0\" name=\"test.cpp\"/>\n"
+                                     "    <file index=\"0\" name=\"test.c\"/>\n"
                                      "  </rawtokens>\n";
         ASSERT_EQUALS(expected, cppcheck.getDumpFileContentsRawTokens(files, tokens1));
+
+        const char code[] = "//x \\ \n"
+                            "y\n"
+                            ";\n";
+
+        simplecpp::OutputList outputList;
+        const simplecpp::TokenList tokens2(code, files, "", {}, &outputList);
+        const std::string expected2 = "  <rawtokens>\n"
+                                      "    <file index=\"0\" name=\"test.c\"/>\n"
+                                      "    <file index=\"1\" name=\"\"/>\n"
+                                      "    <tok fileIndex=\"1\" linenr=\"1\" column=\"1\" str=\"//x &#10;y\"/>\n"
+                                      "    <tok fileIndex=\"1\" linenr=\"3\" column=\"1\" str=\";\"/>\n"
+                                      "  </rawtokens>\n";
+        ASSERT_EQUALS(expected2, cppcheck.getDumpFileContentsRawTokens(files, tokens2));
+
     }
 
     void getDumpFileContentsLibrary() const {
@@ -304,8 +526,8 @@ class TestCppcheck : public TestFixture {
         {
             Settings s;
             s.libraries.emplace_back("std.cfg");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
-            //std::vector<std::string> files{ "/some/path/test.cpp" };
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+            //std::vector<std::string> files{ "/some/path/test.c" };
             const std::string expected = "  <library lib=\"std.cfg\"/>\n";
             ASSERT_EQUALS(expected, cppcheck.getLibraryDumpData());
         }
@@ -314,12 +536,227 @@ class TestCppcheck : public TestFixture {
             Settings s;
             s.libraries.emplace_back("std.cfg");
             s.libraries.emplace_back("posix.cfg");
-            CppCheck cppcheck(s, supprs, errorLogger, false, {});
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
             const std::string expected = "  <library lib=\"std.cfg\"/>\n  <library lib=\"posix.cfg\"/>\n";
             ASSERT_EQUALS(expected, cppcheck.getLibraryDumpData());
         }
     }
 
+    void checkPlistOutput() const {
+        Suppressions supprs;
+        ErrorLogger2 errorLogger;
+
+        {
+            const auto s = dinit(Settings, $.templateFormat = templateFormat, $.plistOutput = "output");
+            const ScopedFile file("file", "");
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+            const FileWithDetails fileWithDetails {file.path(), Path::identify(file.path(), false), 0};
+
+            cppcheck.checkPlistOutput(fileWithDetails);
+            const std::string outputFile {"outputfile_" + std::to_string(std::hash<std::string> {}(fileWithDetails.spath())) + ".plist"};
+            ASSERT(Path::exists(outputFile));
+            std::remove(outputFile.c_str());
+        }
+
+        {
+            const auto s = dinit(Settings, $.plistOutput = "output");
+            const ScopedFile file("file.c", "");
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+            const FileWithDetails fileWithDetails {file.path(), Path::identify(file.path(), false), 0};
+
+            cppcheck.checkPlistOutput(fileWithDetails);
+            const std::string outputFile {"outputfile_" + std::to_string(std::hash<std::string> {}(fileWithDetails.spath())) + ".plist"};
+            ASSERT(Path::exists(outputFile));
+            std::remove(outputFile.c_str());
+        }
+
+        {
+            Settings s;
+            const ScopedFile file("file.c", "");
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+            cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0));
+        }
+    }
+
+    void premiumResultsCache() const {
+        // Trac #13889 - cached misra results are shown after removing --premium=misra-c-2012 option
+
+        Settings settings;
+        Suppressions supprs;
+        ErrorLogger2 errorLogger;
+
+        std::vector<std::string> files;
+
+        const char code[] = "void f();\nint x;\n";
+        simplecpp::TokenList tokens(code, files, "m1.c");
+
+        Preprocessor preprocessor(tokens, settings, errorLogger, Standards::Language::C);
+        ASSERT(preprocessor.loadAllIncludes(files));
+
+        AddonInfo premiumaddon;
+        premiumaddon.name = "premiumaddon.json";
+        premiumaddon.executable = "premiumaddon";
+
+        settings.cppcheckCfgProductName = "Cppcheck Premium 0.0.0";
+        settings.addons.insert(premiumaddon.name);
+        settings.addonInfos.push_back(premiumaddon);
+
+        settings.premiumArgs = "misra-c-2012";
+        CppCheck check(settings, supprs, errorLogger, nullptr, false, {});
+        const size_t hash1 = check.calculateHash(preprocessor);
+
+        settings.premiumArgs = "";
+        const size_t hash2 = check.calculateHash(preprocessor);
+
+        // cppcheck-suppress knownConditionTrueFalse
+        ASSERT(hash1 != hash2);
+    }
+
+    void purgedConfiguration() const
+    {
+        ScopedFile test_file("test.cpp",
+                             "#ifdef X\n"
+                             "#endif\n"
+                             "int main() {}\n");
+
+        // this is the "simple" format
+        const auto s = dinit(Settings,
+                             $.templateFormat = templateFormat, // TODO: remove when we only longer rely on toString() in unique message handling
+                                 $.severity.enable (Severity::information);
+                             $.debugwarnings = true);
+        Suppressions supprs;
+        ErrorLogger2 errorLogger;
+        CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+        ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(test_file.path(), Path::identify(test_file.path(), false), 0)));
+        // TODO: how to properly disable these warnings?
+        errorLogger.errmsgs.erase(std::remove_if(errorLogger.errmsgs.begin(), errorLogger.errmsgs.end(), [](const ErrorMessage& msg) {
+            return msg.id == "logChecker";
+        }), errorLogger.errmsgs.end());
+        // the internal errorlist is cleared after each check() call
+        ASSERT_EQUALS(1, errorLogger.errmsgs.size());
+        auto it = errorLogger.errmsgs.cbegin();
+        ASSERT_EQUALS("test.cpp:0:0: information: The configuration 'X=X' was not checked because its code equals another one. [purgedConfiguration]",
+                      it->toString(false, templateFormat, ""));
+    }
+
+    void recheckInclude() const
+    {
+        const auto settings = dinit(Settings,
+                                    $.templateFormat = templateFormat,
+                                        $.debugainfo = true,
+                                        $.buildDir = "test-build-dir");
+
+        ScopedFile build_dir("empty", "", "test-build-dir");
+
+        FilesDeleter filesDeleter;
+        filesDeleter.addFile("test-build-dir/files.txt");
+        filesDeleter.addFile("test-build-dir/test.a1");
+        filesDeleter.addFile("test-build-dir/test.s1");
+
+        AnalyzerInformation::writeFilesTxt(settings.buildDir, {"test.cpp"}, {});
+
+        // First check
+        {
+            REDIRECT;
+
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n"
+                                   "#include \"test2.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 {};\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("no cached result 'test-build-dir/test.a1' for 'test.cpp' found\n", out);
+        }
+
+        // No change, don't recheck
+        {
+            REDIRECT;
+
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n"
+                                   "#include \"test2.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 {};\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("skipping analysis - loaded 0 cached finding(s) from 'test-build-dir/test.a1' for 'test.cpp'\n", out);
+        }
+
+        // Header changed, recheck
+        {
+            REDIRECT;
+
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n"
+                                   "#include \"test2.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 { int a; };\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("discarding cached result from 'test-build-dir/test.a1' for 'test.cpp' - hash mismatch\n", out);
+        }
+
+        // Source changed, recheck
+        {
+            REDIRECT;
+
+            // Inclusion removed
+            ScopedFile source_file("test.cpp",
+                                   "#include \"test1.h\"\n");
+            ScopedFile header1_file("test1.h",
+                                    "class TestClass1 {};\n");
+            ScopedFile header2_file("test2.h",
+                                    "class TestClass2 { int a; };\n");
+
+            Suppressions suppressions;
+            ErrorLogger2 errorLogger;
+            CppCheck cppcheck(settings, suppressions, errorLogger, nullptr, false, {});
+
+            const auto ret = cppcheck.check(FileWithDetails(source_file.path(), Standards::Language::CPP, 0));
+            const auto out = GET_REDIRECT_OUTPUT;
+
+            ASSERT_EQUALS(0, ret);
+            ASSERT_EQUALS("discarding cached result from 'test-build-dir/test.a1' for 'test.cpp' - hash mismatch\n", out);
+        }
+
+        // Inclusion removed from source, check that it's removed from analyzer info
+        {
+            AnalyzerInformation analyzerInfo;
+            const auto includes = analyzerInfo.getIncludes("test-build-dir", "test.cpp", "", 0);
+
+            ASSERT_EQUALS(1, includes.size());
+            ASSERT_EQUALS("test1.h", *includes.begin());
+        }
+    }
+
     // TODO: test suppressions
     // TODO: test all with FS
 };
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
index 4fc629a4d0e..c849d3a0c61 100644
--- a/test/testerrorlogger.cpp
+++ b/test/testerrorlogger.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,6 +21,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "fixture.h"
+#include "helpers.h"
 #include "suppressions.h"
 
 #include <list>
@@ -43,19 +44,23 @@ class TestErrorLogger : public TestFixture {
     void run() override {
         TEST_CASE(PatternSearchReplace);
         TEST_CASE(FileLocationConstruct);
+        TEST_CASE(FileLocationConstructFile);
         TEST_CASE(FileLocationSetFile);
         TEST_CASE(FileLocationSetFile2);
         TEST_CASE(ErrorMessageConstruct);
         TEST_CASE(ErrorMessageConstructLocations);
         TEST_CASE(ErrorMessageVerbose);
         TEST_CASE(ErrorMessageVerboseLocations);
+        TEST_CASE(ErrorMessageVerboseSymbol);
+        TEST_CASE(ErrorMessageVerboseNewline);
         TEST_CASE(ErrorMessageFromInternalError);
+        TEST_CASE(ErrorMessageCode);
         TEST_CASE(CustomFormat);
         TEST_CASE(CustomFormat2);
         TEST_CASE(CustomFormatLocations);
         TEST_CASE(ToXmlV2);
         TEST_CASE(ToXmlV2RemarkComment);
-        TEST_CASE(ToXmlV2Locations);
+        TEST_CASE(ToXmlLocations);
         TEST_CASE(ToXmlV2Encoding);
         TEST_CASE(FromXmlV2);
         TEST_CASE(ToXmlV3);
@@ -75,8 +80,7 @@ class TestErrorLogger : public TestFixture {
 
         TEST_CASE(isCriticalErrorId);
 
-        TEST_CASE(ErrorMessageReportTypeMisraC);
-        TEST_CASE(ErrorMessageReportTypeCertC);
+        TEST_CASE(TestReportType);
     }
 
     void TestPatternSearchReplace(const std::string& idPlaceholder, const std::string& id) const {
@@ -115,20 +119,116 @@ class TestErrorLogger : public TestFixture {
     }
 
     void FileLocationConstruct() const {
-        const ErrorMessage::FileLocation loc("foo.cpp", 1, 2);
-        ASSERT_EQUALS("foo.cpp", loc.getOrigFile());
-        ASSERT_EQUALS("foo.cpp", loc.getfile());
-        ASSERT_EQUALS(1, loc.line);
-        ASSERT_EQUALS(2, loc.column);
-        ASSERT_EQUALS("[foo.cpp:1]", loc.stringify(false));
-        ASSERT_EQUALS("[foo.cpp:1:2]", loc.stringify(true));
+        {
+            const ErrorMessage::FileLocation loc("foo.cpp", 1, 2);
+            ASSERT_EQUALS("foo.cpp", loc.getOrigFile(false));
+            ASSERT_EQUALS("foo.cpp", loc.getfile(false));
+            ASSERT_EQUALS(1, loc.line);
+            ASSERT_EQUALS(2, loc.column);
+            ASSERT_EQUALS("[foo.cpp:1]", loc.stringify(false));
+            ASSERT_EQUALS("[foo.cpp:1:2]", loc.stringify(true));
+            ASSERT_EQUALS("", loc.getinfo());
+        }
+        {
+            const ErrorMessage::FileLocation loc("foo.cpp", "info", 1, 2);
+            ASSERT_EQUALS("foo.cpp", loc.getOrigFile(false));
+            ASSERT_EQUALS("foo.cpp", loc.getfile(false));
+            ASSERT_EQUALS(1, loc.line);
+            ASSERT_EQUALS(2, loc.column);
+            ASSERT_EQUALS("[foo.cpp:1]", loc.stringify(false));
+            ASSERT_EQUALS("[foo.cpp:1:2]", loc.stringify(true));
+            ASSERT_EQUALS("info", loc.getinfo());
+        }
+        {
+            const SimpleTokenList tokenlist("a\n", "dir/a.cpp");
+            {
+                const ErrorMessage::FileLocation loc(tokenlist.front(), &tokenlist.get());
+                ASSERT_EQUALS("dir/a.cpp", loc.getOrigFile(false));
+                ASSERT_EQUALS("dir/a.cpp", loc.getfile(false));
+                ASSERT_EQUALS(1, loc.line);
+                ASSERT_EQUALS(1, loc.column);
+#if defined(_WIN32)
+                ASSERT_EQUALS("[dir\\a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir\\a.cpp:1:1]", loc.stringify(true));
+#else
+                ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
+#endif
+                ASSERT_EQUALS("", loc.getinfo());
+            }
+            {
+                const ErrorMessage::FileLocation loc(tokenlist.front(), "info", &tokenlist.get());
+                ASSERT_EQUALS("dir/a.cpp", loc.getOrigFile(false));
+                ASSERT_EQUALS("dir/a.cpp", loc.getfile(false));
+                ASSERT_EQUALS(1, loc.line);
+                ASSERT_EQUALS(1, loc.column);
+#if defined(_WIN32)
+                ASSERT_EQUALS("[dir\\a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir\\a.cpp:1:1]", loc.stringify(true));
+#else
+                ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
+#endif
+                ASSERT_EQUALS("info", loc.getinfo());
+            }
+        }
+        {
+            const SimpleTokenList tokenlist("a\n", "dir\\a.cpp");
+            {
+                const ErrorMessage::FileLocation loc(tokenlist.front(), &tokenlist.get());
+                ASSERT_EQUALS("dir\\a.cpp", loc.getOrigFile(false));
+                ASSERT_EQUALS("dir/a.cpp", loc.getfile(false));
+                ASSERT_EQUALS(1, loc.line);
+                ASSERT_EQUALS(1, loc.column);
+#if defined(_WIN32)
+                ASSERT_EQUALS("[dir\\a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir\\a.cpp:1:1]", loc.stringify(true));
+#else
+                ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
+#endif
+                ASSERT_EQUALS("", loc.getinfo());
+            }
+            {
+                const ErrorMessage::FileLocation loc(tokenlist.front(), "info", &tokenlist.get());
+                ASSERT_EQUALS("dir\\a.cpp", loc.getOrigFile(false));
+                ASSERT_EQUALS("dir/a.cpp", loc.getfile(false));
+                ASSERT_EQUALS(1, loc.line);
+                ASSERT_EQUALS(1, loc.column);
+#if defined(_WIN32)
+                ASSERT_EQUALS("[dir\\a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir\\a.cpp:1:1]", loc.stringify(true));
+#else
+                ASSERT_EQUALS("[dir/a.cpp:1]", loc.stringify(false));
+                ASSERT_EQUALS("[dir/a.cpp:1:1]", loc.stringify(true));
+#endif
+                ASSERT_EQUALS("info", loc.getinfo());
+            }
+        }
+    }
+
+    void FileLocationConstructFile() const {
+        ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir/a.cpp", 1, 1).getfile(false));
+        ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir\\a.cpp", 1, 1).getfile(false));
+        ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir/a.cpp", "info", 1, 1).getfile(false));
+        ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation("dir\\a.cpp", "info", 1, 1).getfile(false));
+        {
+            const SimpleTokenList tokenlist("a\n", "dir/a.cpp");
+            ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), &tokenlist.get()).getfile(false));
+            ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), "info", &tokenlist.get()).getfile(false));
+        }
+        {
+            const SimpleTokenList tokenlist("a\n", "dir\\a.cpp");
+            ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), &tokenlist.get()).getfile(false));
+            ASSERT_EQUALS("dir/a.cpp", ErrorMessage::FileLocation(tokenlist.front(), "info", &tokenlist.get()).getfile(false));
+        }
     }
 
     void FileLocationSetFile() const {
         ErrorMessage::FileLocation loc("foo1.cpp", 0, 0);
         loc.setfile("foo.cpp");
-        ASSERT_EQUALS("foo1.cpp", loc.getOrigFile());
-        ASSERT_EQUALS("foo.cpp", loc.getfile());
+        ASSERT_EQUALS("foo1.cpp", loc.getOrigFile(false));
+        ASSERT_EQUALS("foo.cpp", loc.getfile(false));
         ASSERT_EQUALS(0, loc.line);
         ASSERT_EQUALS(0, loc.column);
         // TODO: the following looks wrong - there is no line or column 0
@@ -139,8 +239,8 @@ class TestErrorLogger : public TestFixture {
     void FileLocationSetFile2() const {
         ErrorMessage::FileLocation loc("foo1.cpp", SuppressionList::Suppression::NO_LINE, 0); // TODO: should not depend on Suppression
         loc.setfile("foo.cpp");
-        ASSERT_EQUALS("foo1.cpp", loc.getOrigFile());
-        ASSERT_EQUALS("foo.cpp", loc.getfile());
+        ASSERT_EQUALS("foo1.cpp", loc.getOrigFile(false));
+        ASSERT_EQUALS("foo.cpp", loc.getfile(false));
         ASSERT_EQUALS(SuppressionList::Suppression::NO_LINE, loc.line);
         ASSERT_EQUALS(0, loc.column);
         ASSERT_EQUALS("[foo.cpp]", loc.stringify(false));
@@ -187,6 +287,27 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Verbose error", msg.toString(true, templateFormat, ""));
     }
 
+    void ErrorMessageVerboseSymbol() const {
+        std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "$symbol:sym\nProgramming error with $symbol.\nVerbose error about $symbol", "errorId", Certainty::normal);
+        ASSERT_EQUALS(1, msg.callStack.size());
+        ASSERT_EQUALS("Programming error with sym.", msg.shortMessage());
+        ASSERT_EQUALS("Verbose error about sym", msg.verboseMessage());
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error with sym.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Verbose error about sym", msg.toString(true, templateFormat, ""));
+        ASSERT_EQUALS("sym\n", msg.symbolNames());
+    }
+
+    void ErrorMessageVerboseNewline() const {
+        std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error\nEven more verbose", "errorId", Certainty::normal);
+        ASSERT_EQUALS(1, msg.callStack.size());
+        ASSERT_EQUALS("Programming error.", msg.shortMessage());
+        ASSERT_EQUALS("Verbose error\nEven more verbose", msg.verboseMessage());
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Verbose error\nEven more verbose", msg.toString(true, templateFormat, ""));
+    }
+
     void ErrorMessageFromInternalError() const {
         // TODO: test with token
         {
@@ -217,30 +338,52 @@ class TestErrorLogger : public TestFixture {
         }
     }
 
-    void ErrorMessageReportTypeMisraC() const {
+    #define testReportType(...) testReportType_(__FILE__, __LINE__, __VA_ARGS__)
+    void testReportType_(const char *file, int line, ReportType reportType, Severity severity, const std::string &errorId,
+                         const std::string &expectedClassification, const std::string &expectedGuideline) const
+    {
         std::list<ErrorMessage::FileLocation> locs = { fooCpp5 };
-        const auto reportType = ReportType::misraC;
         const auto mapping = createGuidelineMapping(reportType);
-        const std::string format = "{severity} {id}";
-        ErrorMessage msg(std::move(locs), emptyString, Severity::error, "", "unusedVariable", Certainty::normal);
+
+        ErrorMessage msg(std::move(locs), "", severity, "", errorId, Certainty::normal);
         msg.guideline = getGuideline(msg.id, reportType, mapping, msg.severity);
         msg.classification = getClassification(msg.guideline, reportType);
-        ASSERT_EQUALS("Advisory", msg.classification);
-        ASSERT_EQUALS("2.8", msg.guideline);
-        ASSERT_EQUALS("Advisory 2.8", msg.toString(true, format, ""));
+
+        ASSERT_EQUALS_LOC(expectedClassification, msg.classification, file, line);
+        ASSERT_EQUALS_LOC(expectedGuideline, msg.guideline, file, line);
     }
 
-    void ErrorMessageReportTypeCertC() const {
-        std::list<ErrorMessage::FileLocation> locs = { fooCpp5 };
-        const auto reportType = ReportType::certC;
-        const auto mapping = createGuidelineMapping(reportType);
-        const std::string format = "{severity} {id}";
-        ErrorMessage msg(std::move(locs), emptyString, Severity::error, "", "resourceLeak", Certainty::normal);
-        msg.guideline = getGuideline(msg.id, reportType, mapping, msg.severity);
-        msg.classification = getClassification(msg.guideline, reportType);
-        ASSERT_EQUALS("L3", msg.classification);
-        ASSERT_EQUALS("FIO42-C", msg.guideline);
-        ASSERT_EQUALS("L3 FIO42-C", msg.toString(true, format, ""));
+    void TestReportType() const {
+        testReportType(ReportType::misraC2012, Severity::error, "unusedVariable", "Advisory", "2.8");
+        testReportType(ReportType::misraCpp2023, Severity::warning, "premium-misra-cpp-2023-6.8.4", "Advisory", "6.8.4");
+        testReportType(ReportType::misraCpp2023, Severity::style, "premium-misra-cpp-2023-19.6.1", "Advisory", "19.6.1");
+        testReportType(ReportType::misraCpp2023, Severity::style, "premium-misra-cpp-2023-dir-0.3.1", "Advisory", "Dir 0.3.1");
+        testReportType(ReportType::misraCpp2023, Severity::style, "premium-misra-cpp-2023-dir-0.3.2", "Required", "Dir 0.3.2");
+        testReportType(ReportType::misraCpp2008, Severity::style, "premium-misra-cpp-2008-3-4-1", "Required", "3-4-1");
+        testReportType(ReportType::misraC2012, Severity::style, "premium-misra-c-2012-dir-4.6", "Advisory", "Dir 4.6");
+        testReportType(ReportType::misraC2012, Severity::style, "premium-misra-c-2012-10.4-positive-number", "Required", "10.4");
+        testReportType(ReportType::misraC2012, Severity::style, "premium-misra-c-2012-10.4", "Required", "10.4");
+        testReportType(ReportType::misraC2012, Severity::style, "misra-c2012-dir-4.6", "Advisory", "Dir 4.6");
+        testReportType(ReportType::certC, Severity::error, "resourceLeak", "L3", "FIO42-C");
+    }
+
+    void ErrorMessageCode() const {
+        ScopedFile file("code.cpp",
+                        "int i;\n"
+                        "int i2;\n"
+                        "int i3;\n"
+                        );
+
+        ErrorMessage::FileLocation codeCpp3_5{"code.cpp", 3, 5};
+        std::list<ErrorMessage::FileLocation> locs = { codeCpp3_5 };
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        ASSERT_EQUALS(1, msg.callStack.size());
+        ASSERT_EQUALS("Programming error.", msg.shortMessage());
+        ASSERT_EQUALS("Verbose error", msg.verboseMessage());
+        ASSERT_EQUALS("code.cpp:3:5: error: Programming error. [errorId]\n"
+                      "int i3;\n"
+                      "    ^",
+                      msg.toString(false, "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", ""));
     }
 
     void CustomFormat() const {
@@ -295,26 +438,31 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("        <error id=\"id\" severity=\"warning\" msg=\"\" verbose=\"\" remark=\"remark\"/>", msg.toXML());
     }
 
-    void ToXmlV2Locations() const {
-        std::list<ErrorMessage::FileLocation> locs = { fooCpp5, barCpp8_i };
+    void ToXmlLocations() const {
+        const ErrorMessage::FileLocation dir1loc{"dir1/a.cpp", 1, 1};
+        const ErrorMessage::FileLocation dir2loc{"dir2\\a.cpp", 1, 1};
+        ErrorMessage::FileLocation dir3loc{"dir/a.cpp", 1, 1};
+        dir3loc.setfile("dir3/a.cpp");
+        ErrorMessage::FileLocation dir4loc{"dir/a.cpp", 1, 1};
+        dir4loc.setfile("dir4\\a.cpp");
+        std::list<ErrorMessage::FileLocation> locs = { dir4loc, dir3loc, dir2loc, dir1loc, fooCpp5, barCpp8_i };
+
         ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
-        std::string header("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results version=\"2\">\n");
-        header += "    <cppcheck version=\"";
-        header += CppCheck::version();
-        header += "\"/>\n    <errors>";
-        ASSERT_EQUALS(header, ErrorMessage::getXMLHeader(""));
-        ASSERT_EQUALS("    </errors>\n</results>", ErrorMessage::getXMLFooter(2));
-        std::string message("        <error id=\"errorId\" severity=\"error\"");
-        message += " msg=\"Programming error.\" verbose=\"Verbose error\">\n";
+        std::string message;
+        message += "        <error id=\"errorId\" severity=\"error\" msg=\"Programming error.\" verbose=\"Verbose error\">\n";
         message += "            <location file=\"bar.cpp\" line=\"8\" column=\"1\" info=\"\\303\\244\"/>\n";
-        message += "            <location file=\"foo.cpp\" line=\"5\" column=\"1\"/>\n        </error>";
+        message += "            <location file=\"foo.cpp\" line=\"5\" column=\"1\"/>\n";
+        message += "            <location file=\"dir1/a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "            <location origfile=\"dir2\\a.cpp\" file=\"dir2/a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "            <location origfile=\"dir/a.cpp\" file=\"dir3/a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "            <location origfile=\"dir/a.cpp\" file=\"dir4/a.cpp\" line=\"1\" column=\"1\"/>\n";
+        message += "        </error>";
         ASSERT_EQUALS(message, msg.toXML());
     }
 
     void ToXmlV2Encoding() const {
         {
-            std::list<ErrorMessage::FileLocation> locs;
-            ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nComparing \"\203\" with \"\003\"", "errorId", Certainty::normal);
+            ErrorMessage msg({}, "", Severity::error, "Programming error.\nComparing \"\203\" with \"\003\"", "errorId", Certainty::normal);
             const std::string expected("        <error id=\"errorId\" severity=\"error\" msg=\"Programming error.\" verbose=\"Comparing &quot;\\203&quot; with &quot;\\003&quot;\"/>");
             ASSERT_EQUALS(expected, msg.toXML());
         }
@@ -339,7 +487,7 @@ class TestErrorLogger : public TestFixture {
                                " hash=\"456\""
                                ">\n"
                                "  <location file=\"bar.cpp\" line=\"8\" column=\"1\"/>\n"
-                               "  <location file=\"foo.cpp\" line=\"5\" column=\"2\"/>\n"
+                               "  <location origfile=\"proj/foo.cpp\" file=\"foo.cpp\" line=\"5\" column=\"2\"/>\n"
                                "</error>";
         tinyxml2::XMLDocument doc;
         ASSERT(doc.Parse(xmldata, sizeof(xmldata)) == tinyxml2::XML_SUCCESS);
@@ -354,10 +502,12 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("Verbose error", msg.verboseMessage());
         ASSERT_EQUALS(456u, msg.hash);
         ASSERT_EQUALS(2u, msg.callStack.size());
-        ASSERT_EQUALS("foo.cpp", msg.callStack.front().getfile());
+        ASSERT_EQUALS("proj/foo.cpp", msg.callStack.front().getOrigFile(false));
+        ASSERT_EQUALS("foo.cpp", msg.callStack.front().getfile(false));
         ASSERT_EQUALS(5, msg.callStack.front().line);
         ASSERT_EQUALS(2u, msg.callStack.front().column);
-        ASSERT_EQUALS("bar.cpp", msg.callStack.back().getfile());
+        ASSERT_EQUALS("bar.cpp", msg.callStack.back().getOrigFile(false));
+        ASSERT_EQUALS("bar.cpp", msg.callStack.back().getfile(false));
         ASSERT_EQUALS(8, msg.callStack.back().line);
         ASSERT_EQUALS(1u, msg.callStack.back().column);
     }
@@ -388,8 +538,7 @@ class TestErrorLogger : public TestFixture {
 
     void SerializeInconclusiveMessage() const {
         // Inconclusive error message
-        std::list<ErrorMessage::FileLocation> locs;
-        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error", "errorId", Certainty::inconclusive);
+        ErrorMessage msg({}, "", Severity::error, "Programming error", "errorId", Certainty::inconclusive);
         msg.file0 = "test.cpp";
 
         const std::string msg_str = msg.serialize();
@@ -450,7 +599,7 @@ class TestErrorLogger : public TestFixture {
                                "0 "
                                "0 ";
             ErrorMessage msg;
-            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid CWE ID - not an integer");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid CWE ID - not an integer (invalid_argument)");
         }
         {
             // invalid hash
@@ -466,7 +615,7 @@ class TestErrorLogger : public TestFixture {
                                "0 "
                                "0 ";
             ErrorMessage msg;
-            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid hash - not an integer");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid hash - not an integer (invalid_argument)");
         }
         {
             // out-of-range CWE ID
@@ -487,8 +636,7 @@ class TestErrorLogger : public TestFixture {
     }
 
     void SerializeSanitize() const {
-        std::list<ErrorMessage::FileLocation> locs;
-        ErrorMessage msg(std::move(locs), "", Severity::error, std::string("Illegal character in \"foo\001bar\""), "errorId", Certainty::normal);
+        ErrorMessage msg({}, "", Severity::error, std::string("Illegal character in \"foo\001bar\""), "errorId", Certainty::normal);
         msg.file0 = "1.c";
 
         const std::string msg_str = msg.serialize();
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index 0ec92c982e7..7e3de4405b0 100644
--- a/test/testexceptionsafety.cpp
+++ b/test/testexceptionsafety.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -57,11 +57,11 @@ class TestExceptionSafety : public TestFixture {
         TEST_CASE(rethrowNoCurrentException2);
         TEST_CASE(rethrowNoCurrentException3);
         TEST_CASE(noFunctionCall);
+        TEST_CASE(entryPoint);
     }
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool inconclusive = false;
         const Settings *s = nullptr;
     };
@@ -75,8 +75,8 @@ class TestExceptionSafety : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check char variable usage..
-        runChecks<CheckExceptionSafety>(tokenizer, this);
+        CheckExceptionSafety check;
+        runChecks(check, tokenizer, *this);
     }
 
     void destructors() {
@@ -84,18 +84,18 @@ class TestExceptionSafety : public TestFixture {
               "    ~x() {\n"
               "        throw e;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Class x is not safe, destructor throws exception [exceptThrowInDestructor]\n"
-                      "[test.cpp:3:9]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
+                      "[test.cpp:3:9]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         check("class x {\n"
               "    ~x();\n"
               "};\n"
               "x::~x() {\n"
               "    throw e;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Class x is not safe, destructor throws exception [exceptThrowInDestructor]\n"
-                      "[test.cpp:5:5]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
+                      "[test.cpp:5:5]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // #3858 - throwing exception in try block in destructor.
         check("class x {\n"
@@ -105,7 +105,7 @@ class TestExceptionSafety : public TestFixture {
               "        } catch (...) {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class x {\n"
@@ -114,8 +114,8 @@ class TestExceptionSafety : public TestFixture {
               "            throw e;\n"
               "        }\n"
               "    }\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4:13]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // #11031 should not warn when noexcept false
         check("class A {\n"
@@ -123,7 +123,7 @@ class TestExceptionSafety : public TestFixture {
               "    ~A() noexcept(false) {\n"
               "        throw 30;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -134,7 +134,7 @@ class TestExceptionSafety : public TestFixture {
               "    if (x)\n"
               "        throw 123;\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory. [exceptDeallocThrow]\n", errout_str());
 
         check("void f() {\n"
@@ -143,7 +143,7 @@ class TestExceptionSafety : public TestFixture {
               "    if (foo)\n"
               "        throw 1;\n"
               "    p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory. [exceptDeallocThrow]\n", errout_str());
     }
 
@@ -154,7 +154,7 @@ class TestExceptionSafety : public TestFixture {
               "    if (foo)\n"
               "        throw 1;\n"
               "    p = new int;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -162,7 +162,7 @@ class TestExceptionSafety : public TestFixture {
               "    delete p;\n"
               "    reset(p);\n"
               "    throw 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -171,14 +171,14 @@ class TestExceptionSafety : public TestFixture {
               "    static int* p = 0;\n"
               "    delete p;\n"
               "    throw 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static int* p = 0;\n"
               "    delete p;\n"
               "    throw 1;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory. [exceptDeallocThrow]\n", errout_str());
     }
 
@@ -192,7 +192,7 @@ class TestExceptionSafety : public TestFixture {
               "    {\n"
               "        throw err;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
@@ -206,7 +206,7 @@ class TestExceptionSafety : public TestFixture {
               "    {\n"
               "        throw err;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
@@ -218,7 +218,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(std::runtime_error& err) {\n"
               "        throw err;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
@@ -233,7 +233,7 @@ class TestExceptionSafety : public TestFixture {
               "        exception err2;\n"
               "        throw err2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -250,7 +250,7 @@ class TestExceptionSafety : public TestFixture {
               "            throw inner;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:13]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
 
         check("void f() {\n"
@@ -265,7 +265,7 @@ class TestExceptionSafety : public TestFixture {
               "            throw outer;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -277,7 +277,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch( ::std::exception err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Exception should be caught by reference. [catchExceptionByValue]\n", errout_str());
 
         check("void f() {\n"
@@ -287,7 +287,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(const exception err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Exception should be caught by reference. [catchExceptionByValue]\n", errout_str());
 
         check("void f() {\n"
@@ -297,7 +297,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch( ::std::exception& err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -307,7 +307,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(exception* err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -317,7 +317,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(const exception& err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -327,7 +327,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(int err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -337,7 +337,7 @@ class TestExceptionSafety : public TestFixture {
               "    catch(exception* const err) {\n"
               "        foo(err);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -347,15 +347,30 @@ class TestExceptionSafety : public TestFixture {
               "void func3() noexcept(true) { throw 1; }\n"
               "void func4() noexcept(false) { throw 1; }\n"
               "void func5() noexcept(true) { func1(); }\n"
-              "void func6() noexcept(false) { func1(); }");
-        ASSERT_EQUALS("[test.cpp:2:25]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
-                      "[test.cpp:3:31]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
-                      "[test.cpp:5:31]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
+              "void func6() noexcept(false) { func1(); }\n");
+        ASSERT_EQUALS("[test.cpp:2:25]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
+                      "[test.cpp:3:31]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
+                      "[test.cpp:5:31]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
         check("const char *func() noexcept { return 0; }\n"
-              "const char *func1() noexcept { try { throw 1; } catch(...) {} return 0; }");
+              "const char *func1() noexcept { try { throw 1; } catch(...) {} return 0; }\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct A {\n" // #14526
+              "    void f(int = 0, int = 1) { throw 0; }\n"
+              "};\n"
+              "void g() noexcept {\n"
+              "    A a;\n"
+              "    a.f();\n"
+              "}\n"
+              "void h() noexcept {\n"
+              "    A a;\n"
+              "    a.f(1, 3);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:7]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
+                      "[test.cpp:10:7]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n",
+                      errout_str());
     }
 
     void nothrowThrow() {
@@ -363,12 +378,12 @@ class TestExceptionSafety : public TestFixture {
               "void func2() throw() { throw 1; }\n"
               "void func3() throw(int) { throw 1; }\n"
               "void func4() throw() { func1(); }\n"
-              "void func5() throw(int) { func1(); }");
-        ASSERT_EQUALS("[test.cpp:2:24]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
-                      "[test.cpp:4:24]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
+              "void func5() throw(int) { func1(); }\n");
+        ASSERT_EQUALS("[test.cpp:2:24]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
+                      "[test.cpp:4:24]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
-        check("const char *func() throw() { return 0; }");
+        check("const char *func() throw() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -404,7 +419,7 @@ class TestExceptionSafety : public TestFixture {
               "{\n"
               "    f();\n"
               "}\n", dinit(CheckOptions, $.inconclusive = true));
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n", errout_str());
     }
 
     void unhandledExceptionSpecification3() {
@@ -421,23 +436,27 @@ class TestExceptionSafety : public TestFixture {
                             "}\n";
 
         check(code, dinit(CheckOptions, $.inconclusive = true));
-        ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:1:6]: (style, inconclusive) Unhandled exception specification when calling function f(). [unhandledExceptionSpecification]\n"
+        ASSERT_EQUALS("[test.cpp:10:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n"
+                      "[test.cpp:3:5] -> [test.cpp:1:6]: (style, inconclusive) Unhandled exception specification when calling function f(). [unhandledExceptionSpecification]\n"
                       "[test.cpp:6:5] -> [test.cpp:1:6]: (style, inconclusive) Unhandled exception specification when calling function f(). [unhandledExceptionSpecification]\n", errout_str());
 
         const Settings s = settingsBuilder().library("gnu.cfg").build();
         check(code, dinit(CheckOptions, $.inconclusive = true, $.s = &s));
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n"
+                      "[test.cpp:6:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n"
+                      "[test.cpp:10:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n",
+                      errout_str());
     }
 
     void nothrowAttributeThrow() {
         check("void func1() throw(int) { throw 1; }\n"
               "void func2() __attribute((nothrow)); void func2() { throw 1; }\n"
-              "void func3() __attribute((nothrow)); void func3() { func1(); }");
-        ASSERT_EQUALS("[test.cpp:2:53]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
-                      "[test.cpp:3:53]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
+              "void func3() __attribute((nothrow)); void func3() { func1(); }\n");
+        ASSERT_EQUALS("[test.cpp:2:53]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
+                      "[test.cpp:3:53]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
-        check("const char *func() __attribute((nothrow)); void func1() { return 0; }");
+        check("const char *func() __attribute((nothrow)); void func1() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -446,30 +465,30 @@ class TestExceptionSafety : public TestFixture {
               "  void copyMemberValues() throw () {\n"
               "      copyMemberValues();\n"
               "   }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void nothrowDeclspecThrow() {
         check("void func1() throw(int) { throw 1; }\n"
               "void __declspec(nothrow) func2() { throw 1; }\n"
-              "void __declspec(nothrow) func3() { func1(); }");
-        ASSERT_EQUALS("[test.cpp:2:36]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
-                      "[test.cpp:3:36]: (error) Exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
+              "void __declspec(nothrow) func3() { func1(); }\n");
+        ASSERT_EQUALS("[test.cpp:2:36]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n"
+                      "[test.cpp:3:36]: (error) Unhandled exception thrown in function declared not to throw exceptions. [throwInNoexceptFunction]\n", errout_str());
 
         // avoid false positives
-        check("const char *func() __attribute((nothrow)); void func1() { return 0; }");
+        check("const char *func() __attribute((nothrow)); void func1() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void rethrowNoCurrentException1() {
-        check("void func1(const bool flag) { try{ if(!flag) throw; } catch (int&) { ; } }");
+        check("void func1(const bool flag) { try{ if(!flag) throw; } catch (int&) { ; } }\n");
         ASSERT_EQUALS("[test.cpp:1:46]: (error) Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."
                       " If there is no current exception this calls std::terminate(). More: https://isocpp.org/wiki/faq/exceptions#throw-without-an-object [rethrowNoCurrentException]\n", errout_str());
     }
 
     void rethrowNoCurrentException2() {
-        check("void func1() { try{ ; } catch (...) { ; } throw; }");
+        check("void func1() { try{ ; } catch (...) { ; } throw; }\n");
         ASSERT_EQUALS("[test.cpp:1:43]: (error) Rethrowing current exception with 'throw;', it seems there is no current exception to rethrow."
                       " If there is no current exception this calls std::terminate(). More: https://isocpp.org/wiki/faq/exceptions#throw-without-an-object [rethrowNoCurrentException]\n", errout_str());
     }
@@ -477,7 +496,7 @@ class TestExceptionSafety : public TestFixture {
     void rethrowNoCurrentException3() {
         check("void on_error() { try { throw; } catch (const int &) { ; } catch (...) { ; } }\n"      // exception dispatcher idiom
               "void func2() { try{ ; } catch (const int&) { throw; } ; }\n"
-              "void func3() { throw 0; }");
+              "void func3() { throw 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -490,6 +509,40 @@ class TestExceptionSafety : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
+
+    void entryPoint() {
+        check("void f(int i) {\n" // #14195
+              "    if (i < 2)\n"
+              "        throw 0;\n"
+              "}\n"
+              "int main(int argc, char* argv[]) {\n"
+              "    f(argc);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n",
+                      errout_str());
+
+        check("void f(int i) {\n"
+              "    if (i < 2)\n"
+              "        throw 0;\n"
+              "}\n"
+              "int main(int argc, char* argv[]) {\n"
+              "    try {\n"
+              "        f(argc);\n"
+              "    } catch (...) {\n"
+              "        return 1;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int i) {\n" // #9380
+              "    throw i;\n"
+              "}\n"
+              "int main() {\n"
+              "    f(123);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n",
+                      errout_str());
+    }
 };
 
 REGISTER_TEST(TestExceptionSafety)
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
index ab4b4778a33..30b2b834834 100644
--- a/test/testexecutor.cpp
+++ b/test/testexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "executor.h"
@@ -23,6 +24,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
+#include "standards.h"
 #include "suppressions.h"
 
 #include <list>
@@ -34,10 +36,10 @@ class DummyExecutor : public Executor
 {
 public:
     DummyExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger)
-        : Executor(files, fileSettings, settings, suppressions, errorLogger)
+        : Executor(files, fileSettings, settings, suppressions, errorLogger, nullptr)
     {}
 
-    unsigned int check() override
+    NORETURN unsigned int check() override
     {
         throw std::runtime_error("not implemented");
     }
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
index 048c2e4c17a..13057735513 100644
--- a/test/testfilelister.cpp
+++ b/test/testfilelister.cpp
@@ -27,8 +27,6 @@
 #include <list>
 #include <stdexcept>
 #include <string>
-#include <vector>
-#include <utility>
 
 class TestFileLister : public TestFixture {
 public:
@@ -62,9 +60,7 @@ class TestFileLister : public TestFixture {
 
         // Recursively add add files..
         std::list<FileWithDetails> files;
-        std::vector<std::string> masks;
-        PathMatch matcher(std::move(masks));
-        std::string err = FileLister::recursiveAddFiles(files, adddir, {}, matcher);
+        std::string err = FileLister::recursiveAddFiles(files, adddir, {}, PathMatch());
         ASSERT_EQUALS("", err);
 
         ASSERT(!files.empty());
@@ -110,7 +106,7 @@ class TestFileLister : public TestFixture {
 
     void recursiveAddFilesEmptyPath() const {
         std::list<FileWithDetails> files;
-        const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch({}));
+        const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch());
         ASSERT_EQUALS("no path specified", err);
     }
 
@@ -118,8 +114,7 @@ class TestFileLister : public TestFixture {
         const std::string basedir = findBaseDir();
 
         std::list<FileWithDetails> files;
-        std::vector<std::string> ignored{"lib/token.cpp"};
-        PathMatch matcher(ignored);
+        PathMatch matcher({"lib/token.cpp"});
         std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
         ASSERT_EQUALS("", err);
         ASSERT(files.empty());
@@ -129,9 +124,7 @@ class TestFileLister : public TestFixture {
         const std::string basedir = findBaseDir();
 
         std::list<FileWithDetails> files;
-        std::vector<std::string> ignored;
-        PathMatch matcher(ignored);
-        std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
+        std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, PathMatch());
         ASSERT_EQUALS("", err);
         ASSERT_EQUALS(1, files.size());
         ASSERT_EQUALS(basedir + "lib/token.cpp", files.begin()->path());
@@ -141,8 +134,7 @@ class TestFileLister : public TestFixture {
         const std::string basedir = findBaseDir() + ".";
 
         std::list<FileWithDetails> files;
-        std::vector<std::string> ignored{"lib/"}; // needs to end with slash so it matches directories - added by CmdLineParser
-        PathMatch matcher(ignored);
+        PathMatch matcher({"lib/"});
         std::string err = FileLister::recursiveAddFiles(files, basedir, {}, matcher);
         ASSERT_EQUALS("", err);
         ASSERT(!files.empty());
@@ -165,27 +157,27 @@ class TestFileLister : public TestFixture {
 
         {
             const std::string addfile = Path::join(Path::join(adddir, "cli"), "main.cpp");
-            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
+            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
             ASSERT_EQUALS("", err);
         }
         {
             const std::string addfile = Path::join(Path::join(adddir, "lib"), "token.cpp");
-            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
+            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
             ASSERT_EQUALS("", err);
         }
         {
             const std::string addfile = Path::join(Path::join(adddir, "cli"), "token.cpp"); // does not exist
-            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
+            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
             ASSERT_EQUALS("", err);
         }
         {
             const std::string addfile = Path::join(Path::join(adddir, "lib2"), "token.cpp"); // does not exist
-            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
+            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
             ASSERT_EQUALS("", err);
         }
         {
             const std::string addfile = Path::join(Path::join(adddir, "lib"), "matchcompiler.h");
-            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
+            const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
             ASSERT_EQUALS("", err);
         }
 
diff --git a/test/testfrontend.cpp b/test/testfrontend.cpp
new file mode 100644
index 00000000000..ef6b774181a
--- /dev/null
+++ b/test/testfrontend.cpp
@@ -0,0 +1,147 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2025 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/>.
+ */
+
+#include <filesettings.h>
+
+#include "fixture.h"
+#include "frontend.h"
+#include "settings.h"
+#include "standards.h"
+
+#include <list>
+#include <string>
+
+class TestFrontend : public TestFixture {
+public:
+    TestFrontend() : TestFixture("TestFrontend") {}
+
+private:
+    void run() override {
+        TEST_CASE(applyLangFS);
+        TEST_CASE(applyLangFiles);
+    }
+
+    void applyLangFS() const {
+        const char xmldata[] = R"(<def format="2"><markup ext=".ml" reporterrors="false"/></def>)";
+        const Settings s = settingsBuilder().libraryxml(xmldata).build();
+
+        const std::list<FileSettings> fs = {
+            {"nolang", Standards::Language::None, 0 },
+            {"c", Standards::Language::None, 0 }, // TODO: should be C - FileSettings are currently expected to not be pre-identified
+            {"cpp", Standards::Language::None, 0 }, // TODO: should be CPP - FileSettings arecurrently expected to not be pre-identified
+            {"nolang.c", Standards::Language::None, 0 },
+            {"nolang.cpp", Standards::Language::None, 0 },
+            {"nolang.ml", Standards::Language::None, 0 }
+        };
+
+        // no language to enforce - identify only
+        {
+            std::list<FileSettings> fs1 = fs;
+            frontend::applyLang(fs1, s, Standards::Language::None);
+            auto it = fs1.cbegin();
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP); // unknown defaults to C++
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP); // unknown defaults to C++
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP); // unknown defaults to C++
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C); // markup files are always C
+        }
+
+        // language to enforce (C)
+        {
+            std::list<FileSettings> fs1 = fs;
+            frontend::applyLang(fs1, s, Standards::Language::C);
+            auto it = fs1.cbegin();
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C); // markup files are always C
+        }
+
+        // language to enforce (C++)
+        {
+            std::list<FileSettings> fs1 = fs;
+            frontend::applyLang(fs1, s, Standards::Language::CPP);
+            auto it = fs1.cbegin();
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->file.lang(), Standards::Language::C); // markup files are always C
+        }
+    }
+
+    void applyLangFiles() const
+    {
+        const char xmldata[] = R"(<def format="2"><markup ext=".ml" reporterrors="false"/></def>)";
+        const Settings s = settingsBuilder().libraryxml(xmldata).build();
+
+        const std::list<FileWithDetails> fs = {
+            {"nolang", Standards::Language::None, 0 },
+            {"c", Standards::Language::C, 0 },
+            {"cpp", Standards::Language::CPP, 0 },
+            {"nolang.c", Standards::Language::None, 0 },
+            {"nolang.cpp", Standards::Language::None, 0 },
+            {"nolang.ml", Standards::Language::None, 0 }
+        };
+
+        // no language to enforce - identify only
+        {
+            std::list<FileWithDetails> fs1 = fs;
+            frontend::applyLang(fs1, s, Standards::Language::None);
+            auto it = fs1.cbegin();
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP); // unknown defaults to C++
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C); // markup files are always C
+        }
+
+        // language to enforce (C)
+        {
+            std::list<FileWithDetails> fs1 = fs;
+            frontend::applyLang(fs1, s, Standards::Language::C);
+            auto it = fs1.cbegin();
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C); // markup files are always C
+        }
+
+        // language to enforce (C++)
+        {
+            std::list<FileWithDetails> fs1 = fs;
+            frontend::applyLang(fs1, s, Standards::Language::CPP);
+            auto it = fs1.cbegin();
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::CPP);
+            ASSERT_EQUALS_ENUM((it++)->lang(), Standards::Language::C); // markup files are always C
+        }
+    }
+};
+
+REGISTER_TEST(TestFrontend)
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index f78356395f7..4ebe3360aba 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -85,6 +85,10 @@ class TestFunctions : public TestFixture {
         TEST_CASE(checkMissingReturn4);
         TEST_CASE(checkMissingReturn5);
         TEST_CASE(checkMissingReturn6); // #13180
+        TEST_CASE(checkMissingReturn7); // #14370 - FN try/catch
+        TEST_CASE(checkMissingReturn8);
+        TEST_CASE(checkMissingReturn9);
+        TEST_CASE(checkMissingReturnStdInt); // #14482 - FN std::int32_t
 
         // std::move for locar variable
         TEST_CASE(returnLocalStdMove1);
@@ -116,35 +120,36 @@ class TestFunctions : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool cpp = true;
-        const Settings* s = nullptr;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings& s = options.s ? *options.s : settings;
+        check_(file, line, code, settings, options.cpp);
+    }
 
-        // Tokenize..
-        SimpleTokenizer tokenizer(s, *this, options.cpp);
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& s, bool cpp = true) {
+        SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckFunctions>(tokenizer, this);
+        CheckFunctions check;
+        runChecks(check, tokenizer, *this);
     }
 
     void prohibitedFunctions_posix() {
         check("void f()\n"
               "{\n"
               "    bsd_signal(SIGABRT, SIG_IGN);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Obsolescent function 'bsd_signal' called. It is recommended to use 'sigaction' instead. [bsd_signalCalled]\n", errout_str());
 
         check("int f()\n"
               "{\n"
               "    int bsd_signal(0);\n"
               "    return bsd_signal;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -153,7 +158,7 @@ class TestFunctions : public TestFixture {
               "    if(!hp = gethostbyname(\"127.0.0.1\")) {\n"
               "        exit(1);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (style) Obsolescent function 'gethostbyname' called. It is recommended to use 'getaddrinfo' instead. [gethostbynameCalled]\n", errout_str());
 
         check("void f()\n"
@@ -163,13 +168,13 @@ class TestFunctions : public TestFixture {
               "    if(!hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET)) {\n"
               "        exit(1);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (style) Obsolescent function 'gethostbyaddr' called. It is recommended to use 'getnameinfo' instead. [gethostbyaddrCalled]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    usleep( 1000 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Obsolescent function 'usleep' called. It is recommended to use 'nanosleep' or 'setitimer' instead. [usleepCalled]\n", errout_str());
     }
 
@@ -181,7 +186,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    n1::index();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::size_t f()\n"
@@ -189,19 +194,19 @@ class TestFunctions : public TestFixture {
               "    std::size_t index(0);\n"
               "    index++;\n"
               "    return index;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f()\n"
               "{\n"
               "    return this->index();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    int index( 0 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const char f()\n"
@@ -209,7 +214,7 @@ class TestFunctions : public TestFixture {
               "    const char var[6] = \"index\";\n"
               "    const char i = index(var, 0);\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:20]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n",
                       errout_str());
     }
@@ -217,10 +222,10 @@ class TestFunctions : public TestFixture {
     void prohibitedFunctions_qt_index() {
         check("void TDataModel::forceRowRefresh(int row) {\n"
               "    emit dataChanged(index(row, 0), index(row, columnCount() - 1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:22]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n"
-            "[test.cpp:2:37]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n",   // duplicate
+            "[test.cpp:2:37]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n",
             errout_str());
     }
 
@@ -228,14 +233,14 @@ class TestFunctions : public TestFixture {
         check("void f()\n"
               "{\n"
               "    int rindex( 0 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char var[7] = \"rindex\";\n"
               "    print(rindex(var, 0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Obsolescent function 'rindex' called. It is recommended to use 'strrchr' instead. [rindexCalled]\n", errout_str());
     }
 
@@ -245,7 +250,7 @@ class TestFunctions : public TestFixture {
               "public:\n"
               "    Fred() : index(0) { }\n"
               "    int index;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -253,13 +258,13 @@ class TestFunctions : public TestFixture {
         check("void f()\n"
               "{\n"
               "    char *x = gets(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    foo(x, gets(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
     }
 
@@ -267,32 +272,32 @@ class TestFunctions : public TestFixture {
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}");  // #4382 - there are no VLAs in C++
+              "}\n");  // #4382 - there are no VLAs in C++
         ASSERT_EQUALS("[test.cpp:3:15]: (warning) Obsolete function 'alloca' called. [allocaCalled]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:15]: (warning) Obsolete function 'alloca' called. In C99 and later it is recommended to use a variable length array instead. [allocaCalled]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).c(Standards::C89).cpp(Standards::CPP03).build();
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", dinit(CheckOptions, $.s = &s));  // #4382 - there are no VLAs in C++
+              "}\n", s);  // #4382 - there are no VLAs in C++
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", dinit(CheckOptions, $.cpp = false, $.s = &s)); // #7558 - no alternative to alloca in C89
+              "}\n", s, false); // #7558 - no alternative to alloca in C89
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", dinit(CheckOptions, $.cpp = false, $.s = &s));
+              "}\n", s, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -306,7 +311,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    int b ; b = ftime ( 1 ) ;\n"
               "    return 0 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -316,7 +321,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    char *x = std::gets(str);\n"
               "    char *y = gets(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n"
                       "[test.cpp:4:15]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
     }
@@ -327,7 +332,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    char *x = std::gets(str);\n"
               "    usleep( 1000 );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n"
                       "[test.cpp:4:5]: (style) Obsolescent function 'usleep' called. It is recommended to use 'nanosleep' or 'setitimer' instead. [usleepCalled]\n", errout_str());
     }
@@ -339,14 +344,14 @@ class TestFunctions : public TestFixture {
               "    char s [ 10 ] ;\n"
               "    gets ( s ) ;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead. [getsCalled]\n", errout_str());
 
         check("int getcontext(ucontext_t *ucp);\n"
               "void f (ucontext_t *ucp)\n"
               "{\n"
               "    getcontext ( ucp ) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) Obsolescent function 'getcontext' called. Applications are recommended to be rewritten to use POSIX threads. [getcontextCalled]\n", errout_str());
     }
 
@@ -357,7 +362,7 @@ class TestFunctions : public TestFixture {
               "    char s [ 10 ] ;\n"
               "    gets ( s ) ;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -366,7 +371,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    char *cpwd;"
               "    crypt(pwd, cpwd);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (warning) Return value of function crypt() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:3:20]: (portability) Non reentrant function 'crypt' called. For threadsafe applications it is recommended to use the reentrant replacement function 'crypt_r'. [cryptCalled]\n", errout_str());
 
@@ -375,7 +380,7 @@ class TestFunctions : public TestFixture {
               "    char *pwd = getpass(\"Password:\");"
               "    char *cpwd;"
               "    crypt(pwd, cpwd);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:57]: (warning) Return value of function crypt() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:3:57]: (portability) Non reentrant function 'crypt' called. For threadsafe applications it is recommended to use the reentrant replacement function 'crypt_r'. [cryptCalled]\n", errout_str());
 
@@ -383,7 +388,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    int crypt = 0;"
               "    return crypt;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -392,14 +397,14 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    time_t t = 0;"
               "    auto lt = std::localtime(&t);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:37]: (portability) Non reentrant function 'localtime' called. For threadsafe applications it is recommended to use the reentrant replacement function 'localtime_r'. [localtimeCalled]\n", errout_str());
 
         // Passed as function argument
         check("void f()\n"
               "{\n"
               "    printf(\"Magic guess: %d\", getpwent());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:31]: (portability) Non reentrant function 'getpwent' called. For threadsafe applications it is recommended to use the reentrant replacement function 'getpwent_r'. [getpwentCalled]\n", errout_str());
 
         // Pass return value
@@ -407,14 +412,14 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    time_t t = 0;"
               "    struct tm *foo = localtime(&t);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:39]: (portability) Non reentrant function 'localtime' called. For threadsafe applications it is recommended to use the reentrant replacement function 'localtime_r'. [localtimeCalled]\n", errout_str());
 
         // Access via global namespace
         check("void f()\n"
               "{\n"
               "    ::getpwent();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Return value of function ::getpwent() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:3:7]: (portability) Non reentrant function 'getpwent' called. For threadsafe applications it is recommended to use the reentrant replacement function 'getpwent_r'. [getpwentCalled]\n", errout_str());
 
@@ -422,68 +427,68 @@ class TestFunctions : public TestFixture {
         check("int getpwent()\n"
               "{\n"
               "    return 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Be quiet on other namespaces
         check("void f()\n"
               "{\n"
               "    foobar::getpwent();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Be quiet on class member functions
         check("void f()\n"
               "{\n"
               "    foobar.getpwent();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void invalidFunctionUsage1() {
-        check("void f() { memset(a,b,sizeof(a)!=12); }");
+        check("void f() { memset(a,b,sizeof(a)!=12); }\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
-        check("void f() { memset(a,b,sizeof(a)!=0); }");
+        check("void f() { memset(a,b,sizeof(a)!=0); }\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
-        check("void f() { memset(a,b,!c); }");
+        check("void f() { memset(a,b,!c); }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         // Ticket #6990
-        check("void f(bool c) { memset(a,b,c); }");
+        check("void f(bool c) { memset(a,b,c); }\n");
         ASSERT_EQUALS("[test.cpp:1:29]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
-        check("void f() { memset(a,b,true); }");
+        check("void f() { memset(a,b,true); }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         // Ticket #6588 (c mode)
         check("void record(char* buf, int n) {\n"
               "  memset(buf, 0, n < 255);\n"           /* KO */
               "  memset(buf, 0, n < 255 ? n : 255);\n" /* OK */
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:20]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         // Ticket #6588 (c++ mode)
         check("void record(char* buf, int n) {\n"
               "  memset(buf, 0, n < 255);\n"           /* KO */
               "  memset(buf, 0, n < 255 ? n : 255);\n" /* OK */
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (error) Invalid memset() argument nr 3. A non-boolean value is required. [invalidFunctionArgBool]\n", errout_str());
 
         check("int boolArgZeroIsInvalidButOneIsValid(int a, int param) {\n"
               "  return div(a, param > 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (error) Invalid div() argument nr 2. The value is 0 or 1 (boolean) but the valid values are ':-1,1:'. [invalidFunctionArg]\n", errout_str());
 
         check("void boolArgZeroIsValidButOneIsInvalid(int param) {\n"
               "  strtol(a, b, param > 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Invalid strtol() argument nr 3. The value is 0 or 1 (boolean) but the valid values are '0,2:36'. [invalidFunctionArg]\n", errout_str());
 
-        check("void f() { strtol(a,b,1); }");
+        check("void f() { strtol(a,b,1); }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (error) Invalid strtol() argument nr 3. The value is 1 but the valid values are '0,2:36'. [invalidFunctionArg]\n", errout_str());
 
-        check("void f() { strtol(a,b,10); }");
+        check("void f() { strtol(a,b,10); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n" //  #10754
@@ -526,16 +531,16 @@ class TestFunctions : public TestFixture {
     }
 
     void invalidFunctionUsageStrings() {
-        check("size_t f() { char x = 'x'; return strlen(&x); }");
+        check("size_t f() { char x = 'x'; return strlen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f() { return strlen(&x); }");
+        check("size_t f() { return strlen(&x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f(char x) { return strlen(&x); }");
+        check("size_t f(char x) { return strlen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:34]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f() { char x = '\\0'; return strlen(&x); }");
+        check("size_t f() { char x = '\\0'; return strlen(&x); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
@@ -545,41 +550,41 @@ class TestFunctions : public TestFixture {
               "  else\n"
               "    x = 'a';\n"
               "  return strlen(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:17]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("int f() { char x = '\\0'; return strcmp(\"Hello world\", &x); }");
+        check("int f() { char x = '\\0'; return strcmp(\"Hello world\", &x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f() { char x = 'x'; return strcmp(\"Hello world\", &x); }");
+        check("int f() { char x = 'x'; return strcmp(\"Hello world\", &x); }\n");
         ASSERT_EQUALS("[test.cpp:1:54]: (error) Invalid strcmp() argument nr 2. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f(char x) { char * y = &x; return strlen(y); }");
+        check("size_t f(char x) { char * y = &x; return strlen(y); }\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", "", errout_str());
 
-        check("size_t f(char x) { char * y = &x; char *z = y; return strlen(z); }");
+        check("size_t f(char x) { char * y = &x; char *z = y; return strlen(z); }\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", "", errout_str());
 
-        check("size_t f() { char x = 'x'; char * y = &x; char *z = y; return strlen(z); }");
+        check("size_t f() { char x = 'x'; char * y = &x; char *z = y; return strlen(z); }\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:42]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", "", errout_str());
 
-        check("size_t f() { char x = '\\0'; char * y = &x; char *z = y; return strlen(z); }");
+        check("size_t f() { char x = '\\0'; char * y = &x; char *z = y; return strlen(z); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f() { char x[] = \"Hello world\"; return strlen(x); }");
+        check("size_t f() { char x[] = \"Hello world\"; return strlen(x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f(char x[]) { return strlen(x); }");
+        check("size_t f(char x[]) { return strlen(x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(char x, char y) { return strcmp(&x, &y); }");
+        check("int f(char x, char y) { return strcmp(&x, &y); }\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (error) Invalid strcmp() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n"
                       "[test.cpp:1:43]: (error) Invalid strcmp() argument nr 2. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("size_t f() { char x[] = \"Hello world\"; return strlen(&x[0]); }");
+        check("size_t f() { char x[] = \"Hello world\"; return strlen(&x[0]); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f() { char* x = \"Hello world\"; return strlen(&x[0]); }");
+        check("size_t f() { char* x = \"Hello world\"; return strlen(&x[0]); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -592,11 +597,11 @@ class TestFunctions : public TestFixture {
               "  size_t l1 = strlen(&s1.x);\n"
               "  size_t l2 = strlen(&s2.x);\n"
               "  return l1 + l2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:22]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n"
                       "[test.cpp:9:22]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("const char x = 'x'; size_t f() { return strlen(&x); }");
+        check("const char x = 'x'; size_t f() { return strlen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:48]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("struct someStruct {\n"
@@ -611,7 +616,7 @@ class TestFunctions : public TestFixture {
               "int f(struct someStruct * const tp, const int k)\n"
               "{\n"
               "    return strcmp(&tp->x.buf[k], \"needle\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct someStruct {\n"
@@ -620,29 +625,29 @@ class TestFunctions : public TestFixture {
               "int f(struct someStruct * const tp, const int k)\n"
               "{\n"
               "    return strcmp(&tp->buf[k], \"needle\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("const char x = 'x'; size_t f() { char y = x; return strlen(&y); }");
+        check("const char x = 'x'; size_t f() { char y = x; return strlen(&y); }\n");
         ASSERT_EQUALS("[test.cpp:1:60]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("const char x = '\\0'; size_t f() { return strlen(&x); }");
+        check("const char x = '\\0'; size_t f() { return strlen(&x); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("const char x = '\\0'; size_t f() { char y = x; return strlen(&y); }");
+        check("const char x = '\\0'; size_t f() { char y = x; return strlen(&y); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
               "  char * a = \"Hello world\";\n"
               "  char ** b = &a;\n"
               "  return strlen(&b[0][0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
               "  char ca[] = \"asdf\";\n"
               "  return strlen((char*) &ca);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5225
@@ -653,67 +658,67 @@ class TestFunctions : public TestFixture {
               "  strcat(str, &d);\n"
               "  puts(str);\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (error) Invalid strcat() argument nr 2. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[1] = { \'x\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[2] = { \'x\', \'y\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[3] = { \'x\', \'y\' ,\'\\0\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[3] = { \'x\', \'\\0\' ,\'y\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[3] = { \'x\', \'y\' };\n" // implicit '\0' added at the end
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { \'\\0\' };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { \'0\' + 42 };\n" // no size is explicitly defined, no implicit '\0' is added
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { \'0\' + 42, \'x\' };\n" // no size is explicitly defined, no implicit '\0' is added
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[2] = { \'0\' + 42 };\n" // implicitly '\0' added at the end because size is set to 2
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { };\n"
               "  return fopen(fileName, \"r\"); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void scanMetaTypes()\n" // don't crash
@@ -724,7 +729,7 @@ class TestFunctions : public TestFixture {
               "        if (strstr(name, \"GammaRay::\") != name)\n"
               "            metaTypes.push_back(mtId);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -759,10 +764,17 @@ class TestFunctions : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("size_t f() { wchar_t x = L'x'; return wcslen(&x); }");
+        check("char* f() {\n" // #14715
+              "    char a[3] = { 'a', 'b', 'c' };\n"
+              "    *a = 0;\n"
+              "    return strdup(a);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("size_t f() { wchar_t x = L'x'; return wcslen(&x); }\n");
         ASSERT_EQUALS("[test.cpp:1:46]: (error) Invalid wcslen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
-        check("void f() { char a[10] = \"1234567890\"; puts(a); }", dinit(CheckOptions, $.cpp = false)); // #1770
+        check("void f() { char a[10] = \"1234567890\"; puts(a); }\n", dinit(CheckOptions, $.cpp = false)); // #1770
         ASSERT_EQUALS("[test.c:1:44]: (error) Invalid puts() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
     }
 
@@ -777,7 +789,7 @@ class TestFunctions : public TestFixture {
               "        memmove(&tgt, &src, sizeof src);\n"
               "        memset(&tgt + sizeof src, ' ', sizeof tgt - sizeof src);\n"
               "    }\n"
-              "}\n", dinit(CheckOptions, $.cpp = false, $.s = &settingsUnix32));
+              "}\n", settingsUnix32, false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -788,7 +800,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrt(-1) << std::endl;\n"
               "    std::cout <<  sqrtf(-1) << std::endl;\n"
               "    std::cout <<  sqrtl(-1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid sqrt() argument nr 1. The value is -1 but the valid values are '0.0:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid sqrtf() argument nr 1. The value is -1 but the valid values are '0.0:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid sqrtl() argument nr 1. The value is -1 but the valid values are '0.0:'. [invalidFunctionArg]\n", errout_str());
@@ -799,7 +811,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrt(-0.) << std::endl;\n"
               "    std::cout <<  sqrtf(-0.) << std::endl;\n"
               "    std::cout <<  sqrtl(-0.) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -807,7 +819,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrt(1) << std::endl;\n"
               "    std::cout <<  sqrtf(1) << std::endl;\n"
               "    std::cout <<  sqrtl(1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -827,7 +839,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-3) << std::endl;\n"
               "    std::cout <<  log1pf(-3) << std::endl;\n"
               "    std::cout <<  log1pl(-3) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (error) Invalid log() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:25]: (error) Invalid logf() argument nr 1. The value is -2 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:25]: (error) Invalid logl() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -864,7 +876,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-2) << std::endl;\n"
               "    std::cout <<  log1pf(-2) << std::endl;\n"
               "    std::cout <<  log1pl(-2) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (error) Invalid log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:25]: (error) Invalid logf() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:25]: (error) Invalid logl() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -901,7 +913,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-2.0) << std::endl;\n"
               "    std::cout <<  log1pf(-2.0) << std::endl;\n"
               "    std::cout <<  log1pl(-2.0) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid logf() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid logl() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -938,7 +950,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-1.1) << std::endl;\n"
               "    std::cout <<  log1pf(-1.1) << std::endl;\n"
               "    std::cout <<  log1pl(-1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid log() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid logf() argument nr 1. The value is -0.1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid logl() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -975,7 +987,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(-1.) << std::endl;\n"
               "    std::cout <<  log1pf(-1.0) << std::endl;\n"
               "    std::cout <<  log1pl(-1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Invalid log() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
                       "[test.cpp:4:25]: (error) Invalid logf() argument nr 1. The value is 0 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
                       "[test.cpp:5:25]: (error) Invalid logl() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
@@ -1048,21 +1060,21 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1p(2.0)        << std::endl;\n"
               "    std::cout <<  log1pf(2.0)       << std::endl;\n"
               "    std::cout <<  log1pf(2.0f)      << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    std::string *log(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3473 - no warning if "log" is a variable
-        check("Fred::Fred() : log(0) { }");
+        check("Fred::Fred() : log(0) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5748
-        check("void f() { foo.log(0); }");
+        check("void f() { foo.log(0); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1100,7 +1112,7 @@ class TestFunctions : public TestFixture {
               "    + acosl(0.1E-1)  \n"
               "    + acosl(+0.1E-1) \n"
               "    + acosl(-0.1E-1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1108,7 +1120,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  acos(1.1) << std::endl;\n"
               "    std::cout <<  acosf(1.1) << std::endl;\n"
               "    std::cout <<  acosl(1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid acos() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid acosf() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid acosl() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1118,7 +1130,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  acos(-1.1) << std::endl;\n"
               "    std::cout <<  acosf(-1.1) << std::endl;\n"
               "    std::cout <<  acosl(-1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Invalid acos() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:27]: (error) Invalid acosf() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:27]: (error) Invalid acosl() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1161,7 +1173,7 @@ class TestFunctions : public TestFixture {
               "    + asinl(0.1E-1)  \n"
               "    + asinl(+0.1E-1) \n"
               "    + asinl(-0.1E-1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1169,7 +1181,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  asin(1.1) << std::endl;\n"
               "    std::cout <<  asinf(1.1) << std::endl;\n"
               "    std::cout <<  asinl(1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (error) Invalid asin() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:26]: (error) Invalid asinf() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:26]: (error) Invalid asinl() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1179,7 +1191,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  asin(-1.1) << std::endl;\n"
               "    std::cout <<  asinf(-1.1) << std::endl;\n"
               "    std::cout <<  asinl(-1.1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Invalid asin() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:27]: (error) Invalid asinf() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:27]: (error) Invalid asinl() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'. [invalidFunctionArg]\n", errout_str());
@@ -1192,7 +1204,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  pow(0,-10) << std::endl;\n"
               "    std::cout <<  powf(0,-10) << std::endl;\n"
               "    std::cout <<  powl(0,-10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Passing values 0 and -10 to pow() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:4:19]: (warning) Passing values 0 and -10 to powf() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:5:19]: (warning) Passing values 0 and -10 to powl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
@@ -1202,7 +1214,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  pow(0,10) << std::endl;\n"
               "    std::cout <<  powf(0,10) << std::endl;\n"
               "    std::cout <<  powl(0,10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1243,7 +1255,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  atan2l(0.1E-1,3)   ;\n"
               "    std::cout <<  atan2l(+0.1E-1,1)  ;\n"
               "    std::cout <<  atan2l(-0.1E-1,8)  ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1251,7 +1263,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  atan2(0,0) << std::endl;\n"
               "    std::cout <<  atan2f(0,0) << std::endl;\n"
               "    std::cout <<  atan2l(0,0) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Passing values 0 and 0 to atan2() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:4:19]: (warning) Passing values 0 and 0 to atan2f() leads to implementation-defined result. [wrongmathcall]\n"
                       "[test.cpp:5:19]: (warning) Passing values 0 and 0 to atan2l() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
@@ -1264,7 +1276,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  fmod(1.0,0) << std::endl;\n"
               "    std::cout <<  fmodf(1.0,0) << std::endl;\n"
               "    std::cout <<  fmodl(1.0,0) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (error) Invalid fmod() argument nr 2. The value is 0 but the valid values are '!0.0'. [invalidFunctionArg]\n"
                       "[test.cpp:4:29]: (error) Invalid fmodf() argument nr 2. The value is 0 but the valid values are '!0.0'. [invalidFunctionArg]\n"
                       "[test.cpp:5:29]: (error) Invalid fmodl() argument nr 2. The value is 0 but the valid values are '!0.0'. [invalidFunctionArg]\n"
@@ -1277,7 +1289,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  fmod(1.0,1) << std::endl;\n"
               "    std::cout <<  fmodf(1.0,1) << std::endl;\n"
               "    std::cout <<  fmodl(1.0,1) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1286,7 +1298,7 @@ class TestFunctions : public TestFixture {
               "    print(exp(x) - 1);\n"
               "    print(log(1 + x));\n"
               "    print(1 - erf(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:3:11]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:4:11]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision. [unpreciseMathCall]\n", errout_str());
@@ -1295,7 +1307,7 @@ class TestFunctions : public TestFixture {
               "    print(exp(x) - 1.0);\n"
               "    print(log(1.0 + x));\n"
               "    print(1.0 - erf(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:3:11]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:4:12]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision. [unpreciseMathCall]\n", errout_str());
@@ -1304,7 +1316,7 @@ class TestFunctions : public TestFixture {
               "    print(exp(3 + x*f(a)) - 1);\n"
               "    print(log(x*4 + 1));\n"
               "    print(1 - erf(34*x + f(x) - c));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:3:11]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision. [unpreciseMathCall]\n"
                       "[test.cpp:4:11]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision. [unpreciseMathCall]\n", errout_str());
@@ -1312,7 +1324,7 @@ class TestFunctions : public TestFixture {
         check("void foo() {\n"
               "    print(2*exp(x) - 1);\n"
               "    print(1 - erf(x)/2.0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1329,67 +1341,67 @@ class TestFunctions : public TestFixture {
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Return value of function mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void foo() {\n"
               "  foo::mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:8]: (warning) Return value of function foo::mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void f() {\n"
               "  foo x;\n"
               "  x.mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Return value of function x.mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("bool mystrcmp(char* a, char* b);\n" // cppcheck sees a custom strcmp definition, but it returns a value. Assume it is the one specified in the library.
               "void foo() {\n"
               "    mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Return value of function mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void mystrcmp(char* a, char* b);\n" // cppcheck sees a custom strcmp definition which returns void!
               "void foo() {\n"
               "    mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    class mystrcmp { mystrcmp() {} };\n" // strcmp is a constructor definition here
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return foo::mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if(mystrcmp(a, b));\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    bool b = mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6194
         check("void foo() {\n"
               "    MyStrCmp mystrcmp(x, y);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6197
         check("void foo() {\n"
               "    abc::def.mystrcmp(a,b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #6233
@@ -1400,30 +1412,30 @@ class TestFunctions : public TestFixture {
               "    };\n"
               "    lambda(13.3);\n"
               "    return 0;\n"
-              "}");
-        ASSERT_EQUALS("", errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #6669
         check("void foo(size_t size) {\n"
               "   void * res{malloc(size)};\n"
-              "}");
-        ASSERT_EQUALS("", errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #7447
         check("void foo() {\n"
               "   int x{mystrcmp(a,b)};\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         // #7905
         check("void foo() {\n"
               "   int x({mystrcmp(a,b)});\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // don't crash
               "  DEBUG(123)(mystrcmp(a,b))(fd);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         check("struct teststruct {\n"
               "    int testfunc1() __attribute__ ((warn_unused_result)) { return 1; }\n"
               "    [[nodiscard]] int testfunc2() { return 1; }\n"
@@ -1434,7 +1446,7 @@ class TestFunctions : public TestFixture {
               "    TestStruct1.testfunc1();\n"
               "    TestStruct1.testfunc2();\n"
               "    return 0;\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:4:18]: (warning) Return value of function testfunc1() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:4:31]: (warning) Return value of function testfunc2() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:8:17]: (warning) Return value of function TestStruct1.testfunc1() is not used. [ignoredReturnValue]\n"
@@ -1444,34 +1456,34 @@ class TestFunctions : public TestFixture {
         check("template <typename... a> uint8_t b(std::tuple<uint8_t> d) {\n"
               "  std::tuple<a...> c{std::move(d)};\n"
               "  return std::get<0>(c);\n"
-              "}");
-        ASSERT_EQUALS("", errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         check("struct A { int x; };\n"
               "template <class... Ts>\n"
               "A f(int x, Ts... xs) {\n"
               "    return {std::move(x), static_cast<int>(xs)...};\n"
               "}\n"
-              "A g() { return f(1); }");
-        ASSERT_EQUALS("", errout_str());
+              "A g() { return f(1); }\n");
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #8412 - unused operator result
         check("void foo() {\n"
               "  !mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:4]: (warning) Return value of function mystrcmp() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void f(std::vector<int*> v) {\n"
               "    delete *v.begin();\n"
               "}\n");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         check("int __attribute__((pure)) p_foo(int);\n" // #12697
               "int __attribute__((const)) c_foo(int);\n"
               "void f() {\n"
               "    p_foo(0);\n"
               "    c_foo(0);\n"
-              "}\n");
+              "}\n"); // TODO: use settings2?
         ASSERT_EQUALS("[test.cpp:4:5]: (warning) Return value of function p_foo() is not used. [ignoredReturnValue]\n"
                       "[test.cpp:5:5]: (warning) Return value of function c_foo() is not used. [ignoredReturnValue]\n",
                       errout_str());
@@ -1490,24 +1502,24 @@ class TestFunctions : public TestFixture {
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", dinit(CheckOptions, $.s = &settings2));
+              "}\n", settings2);
         ASSERT_EQUALS("[test.cpp:2:3]: (style) Error code from the return value of function mystrcmp() is not used. [ignoredReturnErrorCode]\n", errout_str());
     }
 
     void memsetZeroBytes() {
         check("void f() {\n"
               "    memset(p, 10, 0x0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) memset() called to fill 0 bytes. [memsetZeroBytes]\n", errout_str());
 
         check("void f() {\n"
               "    memset(p, sizeof(p), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) memset() called to fill 0 bytes. [memsetZeroBytes]\n", errout_str());
 
         check("void f() {\n"
               "    memset(p, sizeof(p), i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6269 false positives in case of overloaded standard library functions
@@ -1516,13 +1528,13 @@ class TestFunctions : public TestFixture {
               "  void f( void )   {\n"
               "     memset( 0 );\n"
               "  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7285
         check("void f() {\n"
               "    memset(&tm, sizeof(tm), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) memset() called to fill 0 bytes. [memsetZeroBytes]\n", errout_str());
 
     }
@@ -1533,7 +1545,7 @@ class TestFunctions : public TestFixture {
               "    memset(is, 1.0f, 40);\n"
               "    int* is2 = new int[10];\n"
               "    memset(is2, 0.1f, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (portability) The 2nd memset() argument '1.0f' is a float, its representation is implementation defined. [memsetFloat]\n"
                       "[test.cpp:5:18]: (portability) The 2nd memset() argument '0.1f' is a float, its representation is implementation defined. [memsetFloat]\n", errout_str());
 
@@ -1541,19 +1553,19 @@ class TestFunctions : public TestFixture {
               "    int* is = new int[10];\n"
               "    float g = computeG();\n"
               "    memset(is, g, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (portability) The 2nd memset() argument 'g' is a float, its representation is implementation defined. [memsetFloat]\n", errout_str());
 
         check("void f() {\n"
               "    int* is = new int[10];\n"
               "    memset(is, 0.0f, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // FP
               "    float x = 2.3f;\n"
               "    memset(a, (x?64:0), 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1561,7 +1573,7 @@ class TestFunctions : public TestFixture {
               "    memset(ss, 256, 4);\n"
               "    short ss2[2];\n"
               "    memset(ss2, -129, 4);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (warning) The 2nd memset() argument '256' doesn't fit into an 'unsigned char'. [memsetValueOutOfRange]\n"
                       "[test.cpp:5:18]: (warning) The 2nd memset() argument '-129' doesn't fit into an 'unsigned char'. [memsetValueOutOfRange]\n", errout_str());
 
@@ -1576,50 +1588,50 @@ class TestFunctions : public TestFixture {
               "    memset(cs2, 255, 30);\n"
               "    char cs3[30];\n"
               "    memset(cs3, 0, 30);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int is[10];\n"
               "    const int i = g();\n"
               "    memset(is, 1.0f + i, 40);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:21]: (portability) The 2nd memset() argument '1.0f+i' is a float, its representation is implementation defined. [memsetFloat]\n", errout_str());
     }
 
     void checkMissingReturn1() {
-        check("int f() {}");
+        check("int f() {}\n");
         ASSERT_EQUALS("[test.cpp:1:10]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         {
-            const char code[] = "int main(void) {}";
+            const char code[] = "int main(void) {}\n";
             {
                 const Settings s = settingsBuilder().c(Standards::C89).build();
 
-                check(code, dinit(CheckOptions, $.cpp = false, $.s = &s)); // c code (c89)
+                check(code, s, false); // c code (c89)
                 ASSERT_EQUALS("[test.c:1:17]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
             }
 
             {
                 const Settings s = settingsBuilder().c(Standards::C99).build();
-                check(code, dinit(CheckOptions, $.cpp = false, $.s = &s)); // c code (c99)
+                check(code, s, false); // c code (c99)
                 ASSERT_EQUALS("", errout_str());
 
-                check(code, dinit(CheckOptions, $.s = &s)); // c++ code
+                check(code, s); // c++ code
                 ASSERT_EQUALS("", errout_str());
             }
         }
 
-        check("F(A,B) { x=1; }");
+        check("F(A,B) { x=1; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("auto foo4() -> void {}");
+        check("auto foo4() -> void {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void STDCALL foo() {}");
+        check("void STDCALL foo() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void operator=(int y) { x=y; }");
+        check("void operator=(int y) { x=y; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -1635,14 +1647,14 @@ class TestFunctions : public TestFixture {
         check("int foo(int x) {\n"
               "  return 1;\n"
               "  (void)x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int x) {\n"
               "  if (x) goto out;\n"
               "  return 1;\n"
               "out:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         // switch
@@ -1651,7 +1663,7 @@ class TestFunctions : public TestFixture {
               "        case 1: break;\n" // <- error
               "        case 2: return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         check("int f() {\n"
@@ -1659,7 +1671,7 @@ class TestFunctions : public TestFixture {
               "        case 1: return 2; break;\n"
               "        default: return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool test(unsigned char v1, int v2) {\n"
@@ -1673,7 +1685,7 @@ class TestFunctions : public TestFixture {
               "        default:\n"
               "            return true;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // if/else
@@ -1681,7 +1693,7 @@ class TestFunctions : public TestFixture {
               "    if (x) {\n"
               "        return 1;\n"
               "    }\n" // <- error (missing else)
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         check("int f(int x) {\n"
@@ -1690,19 +1702,19 @@ class TestFunctions : public TestFixture {
               "    } else {\n"
               "        return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         check("int f() {\n"
               "    if (!0) {\n"
               "        return 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    if (!0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
 
         // loop
@@ -1710,7 +1722,7 @@ class TestFunctions : public TestFixture {
               "    while (1) {\n"
               "        dostuff();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return {..}
@@ -1719,20 +1731,20 @@ class TestFunctions : public TestFixture {
               "        return {};\n"
               "    else\n"
               "        return {1, 2};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // noreturn function
-        check("int f(int x) { exit(0); }");
+        check("int f(int x) { exit(0); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(int x) { assert(0); }");
+        check("int f(int x) { assert(0); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(int x) { if (x) return 1; else return bar({1}, {}); }");
+        check("int f(int x) { if (x) return 1; else return bar({1}, {}); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("auto f() -> void {}"); // #10342
+        check("auto f() -> void {}\n"); // #10342
         ASSERT_EQUALS("", errout_str());
 
         check("struct S1 {\n" // #7433
@@ -1752,36 +1764,36 @@ class TestFunctions : public TestFixture {
                       errout_str());
 
         // #11171
-        check("std::enable_if_t<sizeof(uint64_t) == 8> f() {}");
+        check("std::enable_if_t<sizeof(uint64_t) == 8> f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("std::enable_if_t<sizeof(uint64_t) == 8, int> f() {}");
+        check("std::enable_if_t<sizeof(uint64_t) == 8, int> f() {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:51]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> std::enable_if_t<std::is_same<T, int>{}, int> f(T) {}");
+        check("template<class T> std::enable_if_t<std::is_same<T, int>{}, int> f(T) {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:71]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> std::enable_if_t<std::is_same<T, int>{}> f(T) {}");
+        check("template<class T> std::enable_if_t<std::is_same<T, int>{}> f(T) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("typename std::enable_if<sizeof(uint64_t) == 8>::type f() {}");
+        check("typename std::enable_if<sizeof(uint64_t) == 8>::type f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("typename std::enable_if<sizeof(uint64_t) == 8, int>::type f() {}");
+        check("typename std::enable_if<sizeof(uint64_t) == 8, int>::type f() {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:64]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> typename std::enable_if<std::is_same<T, int>{}, int>::type f(T) {}");
+        check("template<class T> typename std::enable_if<std::is_same<T, int>{}, int>::type f(T) {}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:84]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
             errout_str());
 
-        check("template<class T> typename std::enable_if<std::is_same<T, int>{}>::type f(T) {}");
+        check("template<class T> typename std::enable_if<std::is_same<T, int>{}>::type f(T) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -1880,37 +1892,97 @@ class TestFunctions : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
     }
 
+    void checkMissingReturn7() {// #14370 FN try/catch
+        check("int foo(void) {\n"
+              "    try { return readData(); }\n"
+              "    catch (...) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void) {\n"
+              "    try { return readData(); }\n"
+              "    catch (const E& e) {}\n"
+              "    catch (...) { return 2; }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:25]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void) {\n"
+              "    try { x=1; }\n"
+              "    catch (...) { return 2; }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void) {\n"
+              "    try { return readData(); }\n"
+              "    catch (...) { return 0; }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int foo(void)\n"
+              "    try { x=1; }\n"
+              "    catch (...) { return 2; }\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+
+        check("int foo(void)\n"
+              "    try { return readData(); }\n"
+              "    catch (...) { }\n");
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+    }
+
+    void checkMissingReturn8() {
+        const Settings s = settingsBuilder(settings).cpp(Standards::CPP20).build();
+        check("boost::asio::awaitable<void> test() {\n"
+              "        co_return;\n"
+              "}\n",s);
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturn9() {
+        check("struct S { int v; };\n"
+              " S operator/(S x, S y) { return { x.v / y.v }; }\n"
+              " S f(int a, int b) {\n"
+              "    if (b) { return S{ a } / S{ b }; }\n"
+              "    else { return {}; }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturnStdInt() {// #14482 - FN
+        check("std::int32_t f() {}\n");
+        ASSERT_EQUALS("[test.cpp:1:19]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+    }
+
     // NRVO check
     void returnLocalStdMove1() {
-        check("struct A{}; A f() { A var; return std::move(var); }");
+        check("struct A{}; A f() { A var; return std::move(var); }\n");
         ASSERT_EQUALS("[test.cpp:1:45]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     // RVO, C++03 ctor style
     void returnLocalStdMove2() {
-        check("struct A{}; A f() { return std::move( A() ); }");
+        check("struct A{}; A f() { return std::move( A() ); }\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     // RVO, new ctor style
     void returnLocalStdMove3() {
-        check("struct A{}; A f() { return std::move(A{}); }");
+        check("struct A{}; A f() { return std::move(A{}); }\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     // Function argument
     void returnLocalStdMove4() {
-        check("struct A{}; A f(A a) { return std::move(A{}); }");
+        check("struct A{}; A f(A a) { return std::move(A{}); }\n");
         ASSERT_EQUALS("[test.cpp:1:42]: (performance) Using std::move for returning object by-value from function will affect copy elision optimization."
                       " More: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-move-local [returnStdMoveLocal]\n", errout_str());
     }
 
     void returnLocalStdMove5() {
         check("struct A{} a; A f1() { return std::move(a); }\n"
-              "A f2() { volatile A var; return std::move(var); }");
+              "A f2() { volatile A var; return std::move(var); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { std::string msg{ \"abc\" }; };\n"
@@ -1937,14 +2009,14 @@ class TestFunctions : public TestFixture {
               "   int *a;\n"
               "   a = malloc( -10 );\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Invalid malloc() argument nr 1. The value is -10 but the valid values are '0:'. [invalidFunctionArg]\n", errout_str());
 
         check("void f() {\n"
               "   int *a;\n"
               "   a = alloca( -10 );\n"
               "   free(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (warning) Obsolete function 'alloca' called. [allocaCalled]\n"
                       "[test.cpp:3:17]: (error) Invalid alloca() argument nr 1. The value is -10 but the valid values are '0:'. [invalidFunctionArg]\n", errout_str());
     }
@@ -1955,12 +2027,12 @@ class TestFunctions : public TestFixture {
 
         check("void f() {\n"
               "    lib_func();"
-              "}", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:5]: (information) --check-library: There is no matching configuration for function lib_func() [checkLibraryFunction]\n", errout_str());
 
         check("void f(void* v) {\n"
               "    lib_func(v);"
-              "}", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:2:5]: (information) --check-library: There is no matching configuration for function lib_func() [checkLibraryFunction]\n", errout_str());
 
         // #10105
@@ -1976,7 +2048,7 @@ class TestFunctions : public TestFixture {
               "\n"
               "        void testFunctionReturnType() {\n"
               "        }\n"
-              "};", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
 
         // #11183
@@ -1986,7 +2058,7 @@ class TestFunctions : public TestFixture {
               "\n"
               "void f() {\n"
               "    cb(std::string(\"\"));\n"
-              "}", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         TODO_ASSERT_EQUALS("", "[test.cpp:6:5]: (information) --check-library: There is no matching configuration for function cb() [checkLibraryFunction]\n", errout_str());
 
         // #7375
@@ -1994,38 +2066,38 @@ class TestFunctions : public TestFixture {
               "    struct S { int i; char c; };\n"
               "    size_t s = sizeof(S);\n"
               "    static_assert(s == 9);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char) {}\n"
               "void g() {\n"
               "    f(int8_t(1));\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::uint64_t& u) {\n"
               "    u = std::uint32_t(u) * std::uint64_t(100);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { throw(1); }\n", dinit(CheckOptions, $.s = &s)); // #8958
+        check("void f() { throw(1); }\n", s); // #8958
         ASSERT_EQUALS("", errout_str());
 
         check("using namespace std;\n"
-              "void f() { throw range_error(\"abc\"); }\n", dinit(CheckOptions, $.s = &s));
+              "void f() { throw range_error(\"abc\"); }\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n" // #9002
               "public:\n"
               "    static int f() { return 1; }\n"
               "};\n"
-              "void g() { C::f(); }\n", dinit(CheckOptions, $.s = &s));
+              "void g() { C::f(); }\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<std::string>& v) {\n" // #11223
               "    for (const auto& s : v)\n"
               "        s.find(\"\");\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:3:11]: (warning) Return value of function s.find() is not used. [ignoredReturnValue]\n", errout_str());
 
         check("void f() {\n"
@@ -2035,19 +2107,19 @@ class TestFunctions : public TestFixture {
               "    q->push_back(1);\n"
               "    auto* r = new std::vector<int>;\n"
               "    r->push_back(1);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    auto p = std::make_shared<std::vector<int>>();\n"
               "    p->push_back(1);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<std::vector<int>>& v) {\n"
               "    auto it = v.begin();\n"
               "    it->push_back(1);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2057,7 +2129,7 @@ class TestFunctions : public TestFixture {
               "    w.push_back(1);\n"
               "    auto x = std::vector<int>(1);\n"
               "    x.push_back(1);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2065,7 +2137,7 @@ class TestFunctions : public TestFixture {
               "    p->push_back(1);\n"
               "    auto q{ std::make_shared<std::vector<int>>{} };\n"
               "    q->push_back(1);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         TODO_ASSERT_EQUALS("",
                            "[test.cpp:2:5]: (debug) auto token with no type. [autoNoType]\n"
                            "[test.cpp:4:5]: (debug) auto token with no type. [autoNoType]\n"
@@ -2078,12 +2150,12 @@ class TestFunctions : public TestFixture {
               "    std::list<F>::iterator it;\n"
               "    for (it = l.begin(); it != l.end(); ++it)\n"
               "        it->g(0);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         check("auto f() {\n"
               "    return std::runtime_error(\"abc\");\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         TODO_ASSERT_EQUALS("",
                            "[test.cpp:1:1]: (debug) auto token with no type. [autoNoType]\n",
                            errout_str());
@@ -2096,7 +2168,7 @@ class TestFunctions : public TestFixture {
               "void S::f(int i) const {\n"
               "    for (const std::shared_ptr<S>& c : v)\n"
               "        c->f(i);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("namespace N {\n"
@@ -2105,29 +2177,29 @@ class TestFunctions : public TestFixture {
               "void f() {\n"
               "    const auto& t = N::S::s;\n"
               "    if (t.find(\"abc\") != t.end()) {}\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         check("void f(std::vector<std::unordered_map<int, std::unordered_set<int>>>& v, int i, int j) {\n"
               "    auto& s = v[i][j];\n"
               "    s.insert(0);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<std::string>& v, int i, char c) {\n"
               "    const auto& s = v[i];\n"
               "    return s.find(c);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11604
               "    int (*g)() = nullptr;\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    INT (*g)() = nullptr;\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("struct T;\n"
@@ -2136,13 +2208,13 @@ class TestFunctions : public TestFixture {
               "    auto p = get();\n"
               "    p->h(i);\n"
               "    p.reset(nullptr);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:5:8]: (information) --check-library: There is no matching configuration for function T::h() [checkLibraryFunction]\n",
                       errout_str());
 
         check("struct S : std::vector<int> {\n"
               "    void f(int i) { push_back(i); }\n"
-              "};\n", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2152,18 +2224,18 @@ class TestFunctions : public TestFixture {
               "    auto h{ []() -> std::string { return \"xyz\"; } };\n"
               "    auto t = h();\n"
               "    if (t.at(0)) {}\n"
-              "};\n", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         check("::std::string f(const char* c) {\n" // #12365
               "    return ::std::string(c);\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("template <typename T>\n"
               "struct S : public std::vector<T> {\n"
               "    void resize(size_t n) { std::vector<T>::resize(n); }\n"
-              "};\n", dinit(CheckOptions, $.s = &s));
+              "};\n", s);
         ASSERT_EQUALS("", errout_str());
 
         check("struct P {\n" // #13105
@@ -2174,8 +2246,14 @@ class TestFunctions : public TestFixture {
               "    auto it = m->find(i);\n"
               "    const bool b = it != m->end();\n"
               "    return b;\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n", s);
         TODO_ASSERT_EQUALS("", "[test.cpp:6:5]: (debug) auto token with no type. [autoNoType]\n", errout_str());
+
+        check("template <typename T>\n" // #13509
+              "void f(const T& t) {\n"
+              "    t.g();\n"
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkUseStandardLibrary1() {
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 321d922f2f4..c798950b8e3 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -17,6 +17,7 @@
  */
 
 #include "check.h"
+#include "checks.h"
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
@@ -38,6 +39,8 @@ class TestGarbage : public TestFixture {
         settings.severity.fill();
         settings.certainty.fill();
 
+        mNewTemplate = true;
+
         // don't freak out when the syntax is wrong
 
         TEST_CASE(final_class_x);
@@ -255,6 +258,9 @@ class TestGarbage : public TestFixture {
         TEST_CASE(garbageCode226);
         TEST_CASE(garbageCode227);
         TEST_CASE(garbageCode228);
+        TEST_CASE(garbageCode229);
+        TEST_CASE(garbageCode230);
+        TEST_CASE(garbageCode231);
 
         TEST_CASE(garbageCodeFuzzerClientMode1); // test cases created with the fuzzer client, mode 1
 
@@ -273,18 +279,6 @@ class TestGarbage : public TestFixture {
     }
 
 #define checkCodeInternal(...) checkCodeInternal_(__FILE__, __LINE__, __VA_ARGS__)
-    template<size_t size>
-    std::string checkCode(const char (&code)[size], bool cpp = true) {
-        // double the tests - run each example as C as well as C++
-
-        // run alternate check first. It should only ensure stability - so we catch exceptions here.
-        try {
-            (void)checkCodeInternal(code, !cpp);
-        } catch (const InternalError&) {}
-
-        return checkCodeInternal(code, cpp);
-    }
-
     template<size_t size>
     std::string checkCodeInternal_(const char* file, int line, const char (&code)[size], bool cpp) {
         // tokenize..
@@ -292,13 +286,25 @@ class TestGarbage : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // call all "runChecks" in all registered Check classes
-        for (auto it = Check::instances().cbegin(); it != Check::instances().cend(); ++it) {
-            (*it)->runChecks(tokenizer, this);
+        for (Check * const c : CheckInstances::get()) {
+            c->runChecks(tokenizer, *this);
         }
 
         return tokenizer.tokens()->stringifyList(false, false, false, true, false, nullptr, nullptr);
     }
 
+    template<size_t size>
+    std::string checkCode(const char (&code)[size], bool cpp = true) {
+        // double the tests - run each example as C as well as C++
+
+        // run alternate check first. It should only ensure stability - so we catch exceptions here.
+        try {
+            (void)checkCodeInternal(code, !cpp);
+        } catch (const InternalError&) {}
+
+        return checkCodeInternal(code, cpp);
+    }
+
 #define getSyntaxError(...) getSyntaxError_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string getSyntaxError_(const char* file, int line, const char (&code)[size]) {
@@ -315,8 +321,7 @@ class TestGarbage : public TestFixture {
 
 
     void final_class_x() {
-
-        const char code[] = "class __declspec(dllexport) x final { };";
+        const char code[] = "class __declspec(dllexport) x final { };\n";
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS("", errout_str());
@@ -324,18 +329,18 @@ class TestGarbage : public TestFixture {
 
     void wrong_syntax1() {
         {
-            const char code[] ="TR(kvmpio, PROTO(int rw), ARGS(rw), TP_(aa->rw;))";
+            const char code[] ="TR(kvmpio, PROTO(int rw), ARGS(rw), TP_(aa->rw;))\n";
             ASSERT_THROW_INTERNAL(checkCode(code), UNKNOWN_MACRO);
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] ="struct A { template<int> struct { }; };";
+            const char code[] ="struct A { template<int> struct { }; };\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
 
         {
-            const char code[] ="enum ABC { A,B, typedef enum { C } };";
+            const char code[] ="enum ABC { A,B, typedef enum { C } };\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
     }
@@ -346,7 +351,7 @@ class TestGarbage : public TestFixture {
                             "    Y<int, int, int, int, int, char> y;\n"
                             "}\n"
                             "\n"
-                            "void G( template <typename T> class (j) ) {}";
+                            "void G( template <typename T> class (j) ) {}\n";
 
         // don't segfault..
         ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
@@ -361,7 +366,7 @@ class TestGarbage : public TestFixture {
                             "  for(  #endif typedef typedef cb[N] )\n"
                             "        ca[N]; =  cb[i]\n"
                             " )\n"
-                            "}";
+                            "}\n";
 
         SimpleTokenizer tokenizer(settings, *this);
         try {
@@ -375,25 +380,25 @@ class TestGarbage : public TestFixture {
     }
 
     void wrong_syntax4() {   // #3618
-        const char code[] = "typedef void (x) (int);    return x&";
+        const char code[] = "typedef void (x) (int);    return x&\n";
 
         ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void wrong_syntax_if_macro() {
         // #2518 #4171
-        ASSERT_THROW_INTERNAL(checkCode("void f() { if MACRO(); }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if MACRO(); }\n"), SYNTAX);
 
         // #4668 - note there is no semicolon after MACRO()
-        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() {} }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() {} }\n"), SYNTAX);
 
         // #4810 - note there is no semicolon after MACRO()
-        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() else ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() else ; }\n"), SYNTAX);
     }
 
     void wrong_syntax_class_x_y() {
         // #3585
-        const char code[] = "class x y { };";
+        const char code[] = "class x y { };\n";
 
         {
             SimpleTokenizer tokenizer(settings, *this, false);
@@ -403,70 +408,70 @@ class TestGarbage : public TestFixture {
         {
             SimpleTokenizer tokenizer(settings, *this);
             ASSERT(tokenizer.tokenize(code));
-            ASSERT_EQUALS("[test.cpp:1]: (information) The code 'class x y {' is not handled. You can use -I or --include to add handling of this code.\n", errout_str());
+            ASSERT_EQUALS("[test.cpp:1:1]: (information) The code 'class x y {' is not handled. You can use -I or --include to add handling of this code. [class_X_Y]\n", errout_str());
         }
     }
 
     void wrong_syntax_anonymous_struct() {
-        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } = {0};"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } * = {0};"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } = {0};\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } * = {0};\n"), SYNTAX);
     }
 
     void syntax_case_default() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case: z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case: z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case;: z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case;: z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case {}: z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case {}: z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?{1}:{2} : z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?{1}:{2} : z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?1;:{2} : z(); break;}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?1;:{2} : z(); break;}}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?(1?{3:4}):2 : z(); break;}}"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?(1?{3:4}):2 : z(); break;}}\n"), AST);
 
         //ticket #4234
-        ASSERT_THROW_INTERNAL(checkCode("( ) { switch break ; { switch ( x ) { case } y break ; : } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { switch break ; { switch ( x ) { case } y break ; : } }\n"), SYNTAX);
 
         //ticket #4267
-        ASSERT_THROW_INTERNAL(checkCode("f ( ) { switch break; { switch ( x ) { case } case break; -6: ( ) ; } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("f ( ) { switch break; { switch ( x ) { case } case break; -6: ( ) ; } }\n"), SYNTAX);
 
         // Missing semicolon
-        ASSERT_THROW_INTERNAL(checkCode("void foo () { switch(0) case 0 : default : }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void foo () { switch(0) case 0 : default : }\n"), SYNTAX);
     }
 
     void garbageCode1() {
-        (void)checkCode("struct x foo_t; foo_t typedef y;");
+        (void)checkCode("struct x foo_t; foo_t typedef y;\n");
     }
 
     void garbageCode2() { //#4300 (segmentation fault)
-        TODO_ASSERT_THROW(checkCode("enum { D = 1  struct  { } ; }  s.b = D;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { D = 1  struct  { } ; }  s.b = D;\n"), InternalError);
     }
 
     void garbageCode3() { //#4849 (segmentation fault in Tokenizer::simplifyStructDecl (invalid code))
-        TODO_ASSERT_THROW(checkCode("enum {  D = 2 s ; struct y  { x } ; } { s.a = C ; s.b = D ; }"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum {  D = 2 s ; struct y  { x } ; } { s.a = C ; s.b = D ; }\n"), InternalError);
     }
 
     void garbageCode4() { // #4887
-        ASSERT_THROW_INTERNAL(checkCode("void f ( ) { = a ; if ( 1 ) if = ( 0 ) ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f ( ) { = a ; if ( 1 ) if = ( 0 ) ; }\n"), SYNTAX);
     }
 
     void garbageCode5() { // #5168 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode("( asm : ; void : );"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( asm : ; void : );\n"), SYNTAX);
     }
 
     void garbageCode6() { // #5214
-        ASSERT_THROW_INTERNAL(checkCode("int b = ( 0 ? ? ) 1 : 0 ;"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("int a = int b = ( 0 ? ? ) 1 : 0 ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int b = ( 0 ? ? ) 1 : 0 ;\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int a = int b = ( 0 ? ? ) 1 : 0 ;\n"), SYNTAX);
     }
 
     void garbageCode7() {
-        ASSERT_THROW_INTERNAL(checkCode("1 (int j) { return return (c) * sizeof } y[1];"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("foo(Args&&...) fn void = { } auto template<typename... bar(Args&&...)"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("1 (int j) { return return (c) * sizeof } y[1];\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("foo(Args&&...) fn void = { } auto template<typename... bar(Args&&...)\n"), SYNTAX);
     }
 
     void garbageCode8() { // #5604
-        TODO_ASSERT_THROW(checkCode("{ enum struct : };"), InternalError);
+        TODO_ASSERT_THROW(checkCode("{ enum struct : };\n"), InternalError);
         TODO_ASSERT_THROW(checkCode("int ScopedEnum{ template<typename T> { { e = T::error }; };\n"
                                     "ScopedEnum1<int> se1; { enum class E : T { e = 0 = e ScopedEnum2<void*> struct UnscopedEnum3 { T{ e = 4 }; };\n"
                                     "arr[(int) E::e]; }; UnscopedEnum3<int> e2 = f()\n"
@@ -474,48 +479,48 @@ class TestGarbage : public TestFixture {
                                     "namespace UnscopedEnum { template<typename T> struct UnscopedEnum1 { E{ e = T::error }; }; UnscopedEnum1<int> { enum E : { e = 0 }; };\n"
                                     "UnscopedEnum2<void*> ue3; template<typename T> struct UnscopedEnum3 { enum { }; }; int arr[E::e]; };\n"
                                     "UnscopedEnum3<int> namespace template<typename T> int f() { enum E { e }; T::error }; return (int) E(); } int test1 int g() { enum E { e = E };\n"
-                                    "E::e; } int test2 = g<int>(); }"), InternalError);
+                                    "E::e; } int test2 = g<int>(); }\n"), InternalError);
     }
 
     void garbageCode9() {
-        TODO_ASSERT_THROW(checkCode("enum { e = { } } ( ) { { enum { } } } { e } "), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { e = { } } ( ) { { enum { } } } { e } \n"), InternalError);
     }
 
     void garbageCode10() { // #6127
-        ASSERT_THROW_INTERNAL(checkCode("for( rl=reslist; rl!=NULL; rl=rl->next )"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("for( rl=reslist; rl!=NULL; rl=rl->next )\n"), SYNTAX);
     }
 
     void garbageCode12() { // do not crash
-        (void)checkCode("{ g; S (void) { struct } { } int &g; }");
+        (void)checkCode("{ g; S (void) { struct } { } int &g; }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode13() { // Ticket #2607 - crash
-        (void)checkCode("struct C {} {} x");
+        (void)checkCode("struct C {} {} x\n");
     }
 
     void garbageCode15() { // Ticket #5203
-        ASSERT_THROW_INTERNAL(checkCode("int f ( int* r ) { {  int s[2] ; f ( s ) ; if ( ) } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int f ( int* r ) { {  int s[2] ; f ( s ) ; if ( ) } }\n"), SYNTAX);
     }
 
     void garbageCode16() { // #6080 (segmentation fault)
-        (void)checkCode("{ } A() { delete }"); // #6080
+        (void)checkCode("{ } A() { delete }\n"); // #6080
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode17() {
         ASSERT_THROW_INTERNAL(checkCode("void h(int l) {\n"
                                         "    while\n" // Don't crash (#3870)
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode18() {
-        ASSERT_THROW_INTERNAL(checkCode("switch(){case}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("switch(){case}\n"), SYNTAX);
     }
 
     void garbageCode20() {
         // #3953 (valgrind errors on garbage code)
-        ASSERT_EQUALS("void f ( 0 * ) ;", checkCode("void f ( 0 * ) ;"));
+        ASSERT_EQUALS("void f ( 0 * ) ;", checkCode("void f ( 0 * ) ;\n"));
     }
 
     void garbageCode21() {
@@ -526,7 +531,7 @@ class TestGarbage : public TestFixture {
                                         "    x;\n"
                                         "    int a, a2, a2*x; if () ;\n"
                                         "  )\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode22() {
@@ -534,7 +539,7 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW_INTERNAL(checkCode("int f()\n"
                                         "{\n"
                                         "    return if\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode23() {
@@ -542,7 +547,7 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW_INTERNAL_EQUALS(checkCode("{\n"
                                                "    if (1) = x\n"
                                                "    else abort s[2]\n"
-                                               "}"),
+                                               "}\n"),
                                      SYNTAX,
                                      "syntax error");
     }
@@ -565,7 +570,7 @@ class TestGarbage : public TestFixture {
                                         "    switch ( x ) {\n"
                                         "        case struct Tree : break;\n"
                                         "    }\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
         ignore_errout(); // we do not care about the output
     }
 
@@ -577,13 +582,13 @@ class TestGarbage : public TestFixture {
                                         "    case 0:\n"
                                         "        return;\n"
                                         "    }\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode27() {
         ASSERT_THROW_INTERNAL(checkCode("int f() {\n"
                                         "    return if\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode28() { // #5702 (segmentation fault)
@@ -591,7 +596,7 @@ class TestGarbage : public TestFixture {
         (void)checkCode("struct R1 {\n"
                         "  int a;\n"
                         "  R1 () : a { }\n"
-                        "};");
+                        "};\n");
         ignore_errout(); // we do not care about the output
     }
 
@@ -599,16 +604,16 @@ class TestGarbage : public TestFixture {
         // simply survive - a syntax error would be even better (#5867)
         (void)checkCode("void f(int x) {\n"
                         " x = 42\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode31() {
-        ASSERT_THROW_INTERNAL(checkCode("typedef struct{}x[([],)]typedef e y;(y,x 0){}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef struct{}x[([],)]typedef e y;(y,x 0){}\n"), SYNTAX);
     }
 
     void garbageCode33() { // #6613 (segmentation fault)
-        (void)checkCode("main(()B{});");
+        (void)checkCode("main(()B{});\n");
     }
 
     // Bug #6626 crash: Token::astOperand2() const ( do while )
@@ -616,13 +621,13 @@ class TestGarbage : public TestFixture {
         const char code[] = "void foo(void) {\n"
                             " do\n"
                             " while (0);\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void garbageCode35() {
         // ticket #2604 segmentation fault
-        ASSERT_THROW_INTERNAL(checkCode("sizeof <= A"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("sizeof <= A\n"), AST);
     }
 
     void garbageCode36() { // #6334
@@ -636,312 +641,311 @@ class TestGarbage : public TestFixture {
 
     void garbageCode37() {
         // #5166 segmentation fault (invalid code) in lib/checkother.cpp:329 ( void * f { } void b ( ) { * f } )
-        (void)checkCode("void * f { } void b ( ) { * f }");
+        (void)checkCode("void * f { } void b ( ) { * f }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode38() { // Ticket #6666 (segmentation fault)
-        (void)checkCode("{ f2 { } } void f3 () { delete[] } { }");
+        (void)checkCode("{ f2 { } } void f3 () { delete[] } { }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode40() { // #6620 (segmentation fault)
-        (void)checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }");
+        (void)checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }\n");
         // test doesn't seem to work on any platform: ASSERT_THROW(checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }", "test.c"), InternalError);
     }
 
     void garbageCode41() { // #6685 (segmentation fault)
-        (void)checkCode(" { } { return } *malloc(__SIZE_TYPE__ size); *memcpy(void n); static * const () { memcpy (*slot, 3); } { (); } { }");
+        (void)checkCode(" { } { return } *malloc(__SIZE_TYPE__ size); *memcpy(void n); static * const () { memcpy (*slot, 3); } { (); } { }\n");
     }
 
     void garbageCode42() { // #5760 (segmentation fault)
-        (void)checkCode("{  } * const ( ) { }");
+        (void)checkCode("{  } * const ( ) { }\n");
     }
 
     void garbageCode43() { // #6703 (segmentation fault)
-        (void)checkCode("int { }; struct A<void> a = { }");
+        (void)checkCode("int { }; struct A<void> a = { }\n");
     }
 
     void garbageCode44() { // #6704
-        ASSERT_THROW_INTERNAL(checkCode("{ { }; }; { class A : }; public typedef b;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { }; }; { class A : }; public typedef b;\n"), SYNTAX);
     }
 
     void garbageCode45() { // #6608
-        ASSERT_THROW_INTERNAL(checkCode("struct true template < > { = } > struct Types \"s\" ; static_assert < int > ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct true template < > { = } > struct Types \"s\" ; static_assert < int > ;\n"), SYNTAX);
     }
 
     void garbageCode46() { // #6705 (segmentation fault)
-        (void)checkCode(" { bar(char *x); void foo (int ...) { struct } va_list ap; va_start(ap, size); va_arg(ap, (d)); }");
+        (void)checkCode(" { bar(char *x); void foo (int ...) { struct } va_list ap; va_start(ap, size); va_arg(ap, (d)); }\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode47() { // #6706 (segmentation fault)
-        (void)checkCode(" { { }; }; * new private: B: B;");
+        (void)checkCode(" { { }; }; * new private: B: B;\n");
     }
 
     void garbageCode48() { // #6712 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode(" { d\" ) d ...\" } int main ( ) { ( ) catch ( A a ) { { } catch ( ) \"\" } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" { d\" ) d ...\" } int main ( ) { ( ) catch ( A a ) { { } catch ( ) \"\" } }\n"), SYNTAX);
     }
 
     void garbageCode49() { // #6715
-        ASSERT_THROW_INTERNAL(checkCode(" ( ( ) ) { } ( { ( __builtin_va_arg_pack ( ) ) ; } ) { ( int { ( ) ( ( ) ) } ( ) { } ( ) ) += ( ) }"), AST);
+        ASSERT_THROW_INTERNAL(checkCode(" ( ( ) ) { } ( { ( __builtin_va_arg_pack ( ) ) ; } ) { ( int { ( ) ( ( ) ) } ( ) { } ( ) ) += ( ) }\n"), AST);
     }
 
     void garbageCode51() { // #6719
-        ASSERT_THROW_INTERNAL(checkCode(" (const \"C\" ...); struct base { int f2; base (int arg1, int arg2); }; global_base(0x55, 0xff); { ((global_base.f1 0x55) (global_base.f2 0xff)) { } } base::base(int arg1, int arg2) { f2 = }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" (const \"C\" ...); struct base { int f2; base (int arg1, int arg2); }; global_base(0x55, 0xff); { ((global_base.f1 0x55) (global_base.f2 0xff)) { } } base::base(int arg1, int arg2) { f2 = }\n"), SYNTAX);
     }
 
     void garbageCode53() { // #6721
-        ASSERT_THROW_INTERNAL(checkCode("{ { } }; void foo (struct int i) { x->b[i] = = }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; void foo (struct int i) { x->b[i] = = }\n"), SYNTAX);
     }
 
     void garbageCode54() { // #6722
-        ASSERT_THROW_INTERNAL(checkCode("{ typedef long ((pf) p) (); }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ typedef long ((pf) p) (); }\n"), SYNTAX);
     }
 
     void garbageCode55() { // #6724
-        ASSERT_THROW_INTERNAL(checkCode("() __attribute__((constructor)); { } { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("() __attribute__((constructor)); { } { }\n"), SYNTAX);
     }
 
     void garbageCode56() { // #6713
-        ASSERT_THROW_INTERNAL(checkCode("void foo() { int a = 0; int b = ???; }"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("void foo() { int a = 0; int b = ???; }\n"), AST);
     }
 
     void garbageCode57() { // #6731
-        ASSERT_THROW_INTERNAL(checkCode("{ } if () try { } catch (...) B::~B { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } if () try { } catch (...) B::~B { }\n"), SYNTAX);
     }
 
     void garbageCode58() { // #6732, #6762
-        ASSERT_THROW_INTERNAL(checkCode("{ }> {= ~A()^{} }P { }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("{= ~A()^{} }P { } { }> is"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ }> {= ~A()^{} }P { }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{= ~A()^{} }P { } { }> is\n"), SYNTAX);
     }
 
     void garbageCode59() { // #6735
-        ASSERT_THROW_INTERNAL(checkCode("{ { } }; char font8x8[256][8]"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; char font8x8[256][8]\n"), SYNTAX);
     }
 
     void garbageCode60() { // #6736
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int int_array[]; int_array &right ="), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int int_array[]; int_array &right =\n"), SYNTAX);
     }
 
     void garbageCode61() { // #6737
-        ASSERT_THROW_INTERNAL(checkCode("{ (const U&) }; { }; { }; struct U : virtual public"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ (const U&) }; { }; { }; struct U : virtual public\n"), SYNTAX);
     }
 
     void garbageCode63() { // #6739
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref u_array_ref_gbl_obj0"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref u_array_ref_gbl_obj0\n"), SYNTAX);
     }
 
     void garbageCode64() { // #6740
-        ASSERT_THROW_INTERNAL(checkCode("{ } foo(void (*bar)(void))"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } foo(void (*bar)(void))\n"), SYNTAX);
     }
 
     void garbageCode65() { // #6741 (segmentation fault)
         // TODO write some syntax error
-        (void)checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref");
+        (void)checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref\n");
     }
 
     void garbageCode66() { // #6742
-        ASSERT_THROW_INTERNAL(checkCode("{ { } }; { { } }; { }; class bar : public virtual"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; { { } }; { }; class bar : public virtual\n"), SYNTAX);
     }
 
     void garbageCode68() { // #6745 (segmentation fault)
-        (void)checkCode("(int a[3]); typedef void (*fp) (void); fp");
+        (void)checkCode("(int a[3]); typedef void (*fp) (void); fp\n");
     }
 
     void garbageCode69() { // #6746
-        ASSERT_THROW_INTERNAL(checkCode("{ (make_mess, aux); } typedef void F(void); aux(void (*x)()) { } (void (*y)()) { } F*"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ (make_mess, aux); } typedef void F(void); aux(void (*x)()) { } (void (*y)()) { } F*\n"), SYNTAX);
     }
 
     void garbageCode70() { // #6747
-        ASSERT_THROW_INTERNAL(checkCode("{ } __attribute__((constructor)) void"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } __attribute__((constructor)) void\n"), SYNTAX);
     }
 
     void garbageCode71() { // #6748
-        ASSERT_THROW_INTERNAL(checkCode("( ) { } typedef void noattr_t ( ) ; noattr_t __attribute__ ( )"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { } typedef void noattr_t ( ) ; noattr_t __attribute__ ( )\n"), SYNTAX);
     }
 
     void garbageCode72() { // #6749
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void voidfn(void); <voidfn&"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void voidfn(void); <voidfn&\n"), SYNTAX);
     }
 
     void garbageCode73() { // #6750
-        ASSERT_THROW_INTERNAL(checkCode("typedef int IRT[2]; IRT&"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef int IRT[2]; IRT&\n"), SYNTAX);
     }
 
     void garbageCode74() { // #6751
-        ASSERT_THROW_INTERNAL(checkCode("_lenraw(const char* digits) { } typedef decltype(sizeof(0)) { } operator"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("_lenraw(const char* digits) { } typedef decltype(sizeof(0)) { } operator\n"), SYNTAX);
     }
 
     void garbageCode76() { // #6754
-        ASSERT_THROW_INTERNAL(checkCode(" ( ) ( ) { ( ) [ ] } TEST ( ) { ( _broadcast_f32x4 ) ( ) ( ) ( ) ( ) if ( ) ( ) ; } E mask = ( ) [ ] ( ) res1.x ="), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" ( ) ( ) { ( ) [ ] } TEST ( ) { ( _broadcast_f32x4 ) ( ) ( ) ( ) ( ) if ( ) ( ) ; } E mask = ( ) [ ] ( ) res1.x =\n"), SYNTAX);
     }
 
     void garbageCode77() { // #6755
-        ASSERT_THROW_INTERNAL(checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d\n"), SYNTAX);
     }
 
     void garbageCode78() { // #6756
-        ASSERT_THROW_INTERNAL(checkCode("( ) { [ ] } ( ) { } const_array_of_int ( ) { } typedef int A [ ] [ ] ; A a = { { } { } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { [ ] } ( ) { } const_array_of_int ( ) { } typedef int A [ ] [ ] ; A a = { { } { } }\n"), SYNTAX);
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode79() { // #6757
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void ( func_type ) ( ) ; func_type & ( )"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void ( func_type ) ( ) ; func_type & ( )\n"), SYNTAX);
     }
 
     void garbageCode80() { // #6759
-        ASSERT_THROW_INTERNAL(checkCode("( ) { ; ( ) ; ( * ) [ ] ; [ ] = ( ( ) ( ) h ) ! ( ( ) ) } { ; } { } head heads [ ] = ; = & heads [ 2 ]"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ; ( ) ; ( * ) [ ] ; [ ] = ( ( ) ( ) h ) ! ( ( ) ) } { ; } { } head heads [ ] = ; = & heads [ 2 ]\n"), SYNTAX);
     }
 
     void garbageCode81() { // #6760
-        ASSERT_THROW_INTERNAL(checkCode("{ } [ ] { ( ) } { } typedef void ( *fptr1 ) ( ) const"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } [ ] { ( ) } { } typedef void ( *fptr1 ) ( ) const\n"), SYNTAX);
     }
 
     void garbageCode82() { // #6761
-        ASSERT_THROW_INTERNAL(checkCode("p(\"Hello \" 14) _yn(const size_t) typedef bool pfunk (*pfunk)(const size_t)"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("p(\"Hello \" 14) _yn(const size_t) typedef bool pfunk (*pfunk)(const size_t)\n"), SYNTAX);
     }
 
     void garbageCode83() { // #6771
-        ASSERT_THROW_INTERNAL(checkCode("namespace A { class } class A { friend C ; } { } ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("namespace A { class } class A { friend C ; } { } ;\n"), SYNTAX);
     }
 
     void garbageCode84() { // #6780
-        ASSERT_THROW_INTERNAL(checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode85() { // #6784 (segmentation fault)
-        (void)checkCode("{ } { } typedef void ( *VoidFunc() ) ( ) ; VoidFunc"); // do not crash
+        (void)checkCode("{ } { } typedef void ( *VoidFunc() ) ( ) ; VoidFunc\n"); // do not crash
     }
 
     void garbageCode86() { // #6785
-        ASSERT_THROW_INTERNAL(checkCode("{ } typedef char ( *( X ) ( void) , char ) ;"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } typedef char ( *( X ) ( void) , char ) ;\n"), SYNTAX); // do not crash
     }
 
     void garbageCode87() { // #6788
-        ASSERT_THROW_INTERNAL(checkCode("((X (128))) (int a) { v[ = {} (x 42) a] += }"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("((X (128))) (int a) { v[ = {} (x 42) a] += }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode88() { // #6786
-        ASSERT_THROW_INTERNAL(checkCode("( ) { ( 0 ) { ( ) } } g ( ) { i( ( false ?) ( ) : 1 ) ; } ;"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ( 0 ) { ( ) } } g ( ) { i( ( false ?) ( ) : 1 ) ; } ;\n"), SYNTAX); // do not crash
     }
 
     void garbageCode90() { // #6790
-        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array [[ ] ; typedef u_array & u_array_ref] ( ) { } u_array_ref_gbl_obj0"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array [[ ] ; typedef u_array & u_array_ref] ( ) { } u_array_ref_gbl_obj0\n"), SYNTAX); // do not crash
     }
 
     void garbageCode91() { // #6791
-        ASSERT_THROW_INTERNAL(checkCode("typedef __attribute__((vector_size (16))) { return[ (v2df){ } ;] }"), SYNTAX); // throw syntax error
+        ASSERT_THROW_INTERNAL(checkCode("typedef __attribute__((vector_size (16))) { return[ (v2df){ } ;] }\n"), SYNTAX); // throw syntax error
     }
 
     void garbageCode92() { // #6792
-        ASSERT_THROW_INTERNAL(checkCode("template < typename _Tp ( ( ) ; _Tp ) , decltype > { } { ( ) ( ) }"), SYNTAX); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("template < typename _Tp ( ( ) ; _Tp ) , decltype > { } { ( ) ( ) }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode94() { // #6803
         //checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }");
-        ASSERT_THROW_INTERNAL(checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }\n"), SYNTAX);
     }
 
     void garbageCode95() { // #6804
-        ASSERT_THROW_INTERNAL(checkCode("{ } x x ; { } h h [ ] ( ) ( ) { struct x ( x ) ; int __attribute__ ( ) f ( ) { h - > first = & x ; struct x * n = h - > first ; ( ) n > } }"), AST); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } x x ; { } h h [ ] ( ) ( ) { struct x ( x ) ; int __attribute__ ( ) f ( ) { h - > first = & x ; struct x * n = h - > first ; ( ) n > } }\n"), SYNTAX); // do not crash
     }
 
     void garbageCode96() { // #6807
-        ASSERT_THROW_INTERNAL(checkCode("typedef J J[ ; typedef ( ) ( ) { ; } typedef J J ;] ( ) ( J cx ) { n } ;"), SYNTAX); // throw syntax error
+        ASSERT_THROW_INTERNAL(checkCode("typedef J J[ ; typedef ( ) ( ) { ; } typedef J J ;] ( ) ( J cx ) { n } ;\n"), SYNTAX); // throw syntax error
     }
 
     void garbageCode97() { // #6808
-        ASSERT_THROW_INTERNAL(checkCode("namespace A {> } class A{ { }} class A : T< ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("namespace A {> } class A{ { }} class A : T< ;\n"), SYNTAX);
     }
 
     void garbageCode98() { // #6838
         ASSERT_THROW_INTERNAL(checkCode("for (cocon To::ta@Taaaaaforconst oken aaaaaaaaaaaa5Dl()\n"
                                         "const unsigned in;\n"
-                                        "fon *tok = f);.s(Token i = d-)L;"), SYNTAX);
+                                        "fon *tok = f);.s(Token i = d-)L;\n"), SYNTAX);
     }
 
     void garbageCode99() { // #6726
         ASSERT_THROW_INTERNAL_EQUALS(checkCode("{ xs :: i(:) ! ! x/5 ! !\n"
                                                "i, :: a :: b integer, } foo2(x) :: j(:)\n"
                                                "b type(*), d(:), a x :: end d(..), foo end\n"
-                                               "foo4 b d(..), a a x type(*), b foo2 b"), SYNTAX, "syntax error");
+                                               "foo4 b d(..), a a x type(*), b foo2 b\n"), SYNTAX, "syntax error");
     }
 
     void garbageCode100() { // #6840
-        ASSERT_THROW_INTERNAL(checkCode("( ) { ( i< ) } int foo ( ) { int i ; ( for ( i => 1 ) ; ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ( i< ) } int foo ( ) { int i ; ( for ( i => 1 ) ; ) }\n"), SYNTAX);
     }
 
     void garbageCode101() { // #6835
         // Reported case
-        ASSERT_THROW_INTERNAL(checkCode("template < class , =( , int) X = 1 > struct A { } ( ) { = } [ { } ] ( ) { A < void > 0 }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < class , =( , int) X = 1 > struct A { } ( ) { = } [ { } ] ( ) { A < void > 0 }\n"), SYNTAX);
         // Reduced case
-        ASSERT_THROW_INTERNAL(checkCode("template < class =( , ) X = 1> struct A {}; A<void> a;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < class =( , ) X = 1> struct A {}; A<void> a;\n"), SYNTAX);
     }
 
     void garbageCode102() { // #6846 (segmentation fault)
-        (void)checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }");
-        ignore_errout(); // we do not care about the output
+        ASSERT_THROW_INTERNAL(checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }\n"), SYNTAX);
     }
 
     void garbageCode103() { // #6824
-        ASSERT_THROW_INTERNAL(checkCode("a f(r) int * r; { { int s[2]; [f(s); if () ]  } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("a f(r) int * r; { { int s[2]; [f(s); if () ]  } }\n"), SYNTAX);
     }
 
     void garbageCode104() { // #6847
-        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S {> ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) } { ( )> >} { ( ) { } } ( ) { ( ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S {> ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) } { ( )> >} { ( ) { } } ( ) { ( ) }\n"), SYNTAX);
     }
 
     void garbageCode105() { // #6859
-        ASSERT_THROW_INTERNAL(checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }\n"), SYNTAX);
     }
 
     void garbageCode106() { // #6880
-        ASSERT_THROW_INTERNAL(checkCode("[ ] typedef typedef b_array b_array_ref [ ; ] ( ) b_array_ref b_array_ref_gbl_obj0 { ; { b_array_ref b_array_ref_gbl_obj0 } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("[ ] typedef typedef b_array b_array_ref [ ; ] ( ) b_array_ref b_array_ref_gbl_obj0 { ; { b_array_ref b_array_ref_gbl_obj0 } }\n"), SYNTAX);
     }
 
     void garbageCode107() { // #6881
-        TODO_ASSERT_THROW(checkCode("enum { val = 1{ }; { const} }; { } Bar { const int A = val const } ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { val = 1{ }; { const} }; { } Bar { const int A = val const } ;\n"), InternalError);
     }
 
     void garbageCode108() { //  #6895 "segmentation fault (invalid code) in CheckCondition::isOppositeCond"
-        ASSERT_THROW_INTERNAL(checkCode("A( ) { } bool f( ) { ( ) F; ( ) { ( == ) if ( !=< || ( !A( ) && r[2] ) ) ( !A( ) ) ( ) } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("A( ) { } bool f( ) { ( ) F; ( ) { ( == ) if ( !=< || ( !A( ) && r[2] ) ) ( !A( ) ) ( ) } }\n"), SYNTAX);
     }
 
     void garbageCode109() { //  #6900 "segmentation fault (invalid code) in CheckStl::runSimplifiedChecks"
-        (void)checkCode("( *const<> (( ) ) { } ( *const ( ) ( ) ) { } ( * const<> ( size_t )) ) { } ( * const ( ) ( ) ) { }");
+        (void)checkCode("( *const<> (( ) ) { } ( *const ( ) ( ) ) { } ( * const<> ( size_t )) ) { } ( * const ( ) ( ) ) { }\n");
     }
 
     void garbageCode110() { //  #6902 "segmentation fault (invalid code) in CheckStl::string_c_str"
-        ASSERT_THROW_INTERNAL(checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }\n"), SYNTAX);
     }
 
     void garbageCode111() { //  #6907
-        TODO_ASSERT_THROW(checkCode("enum { FOO = 1( ,) } {{ FOO }} ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { FOO = 1( ,) } {{ FOO }} ;\n"), InternalError);
     }
 
     void garbageCode112() { //  #6909
-        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }}>> enum { FOO< = ( ) } { { } } ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }}>> enum { FOO< = ( ) } { { } } ;\n"), InternalError);
     }
 
     void garbageCode114() { // #2118
         ASSERT_NO_THROW(checkCode("Q_GLOBAL_STATIC_WITH_INITIALIZER(Qt4NodeStaticData, qt4NodeStaticData, {\n"
                                   "    for (unsigned i = 0 ; i < count; i++) {\n"
                                   "    }\n"
-                                  "});"));
+                                  "});\n"));
     }
 
     void garbageCode115() { // #5506
-        ASSERT_THROW_INTERNAL(checkCode("A template < int { int = -1 ; } template < int N > struct B { int [ A < N > :: zero ] ;  } ; B < 0 > b ;"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("A template < int { int = -1 ; } template < int N > struct B { int [ A < N > :: zero ] ;  } ; B < 0 > b ;\n"), UNKNOWN_MACRO);
     }
 
     void garbageCode116() { // #5356
-        ASSERT_THROW_INTERNAL(checkCode("struct template<int { = }; > struct B { }; B < 0 > b;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct template<int { = }; > struct B { }; B < 0 > b;\n"), SYNTAX);
     }
 
     void garbageCode117() { // #6121
         TODO_ASSERT_THROW(checkCode("enum E { f = {} };\n"
-                                    "int a = f;"), InternalError);
+                                    "int a = f;\n"), InternalError);
     }
 
     void garbageCode118() { // #5600 - missing include causes invalid enum
@@ -951,32 +955,32 @@ class TestGarbage : public TestFixture {
                                         "};\n"
                                         "struct bytecode {};\n"
                                         "jv jq_next() { opcode = ((opcode) +NUM_OPCODES);\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode119() { // #5598 (segmentation fault)
-        (void)checkCode("{ { void foo() { struct }; template <typename> struct S { Used x; void bar() } auto f = [this] { }; } };");
+        (void)checkCode("{ { void foo() { struct }; template <typename> struct S { Used x; void bar() } auto f = [this] { }; } };\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode120() { // #4927 (segmentation fault)
         (void)checkCode("int main() {\n"
                         "   return 0\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void garbageCode121() { // #2585
         ASSERT_THROW_INTERNAL(checkCode("abcdef?" "?<"
                                         "123456?" "?>"
-                                        "+?" "?="), SYNTAX);
+                                        "+?" "?=\n"), SYNTAX);
     }
 
     void garbageCode122() { // #6303 (segmentation fault)
         (void)checkCode("void foo() {\n"
                         "char *a = malloc(10);\n"
                         "a[0]\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
@@ -985,18 +989,18 @@ class TestGarbage : public TestFixture {
                         "    class C {\n"
                         "        C tpl_mem(T *) { return }\n"
                         "    };\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode125() {
-        ASSERT_THROW_INTERNAL(checkCode("{ T struct B : T valueA_AA ; } T : [ T > ( ) { B } template < T > struct A < > : ] { ( ) { return valueA_AC struct { : } } b A < int > AC ( ) a_aa.M ; ( ) ( ) }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S :{ ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) }"),
+        ASSERT_THROW_INTERNAL(checkCode("{ T struct B : T valueA_AA ; } T : [ T > ( ) { B } template < T > struct A < > : ] { ( ) { return valueA_AC struct { : } } b A < int > AC ( ) a_aa.M ; ( ) ( ) }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S :{ ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) }\n"),
                               SYNTAX);
     }
 
     void garbageCode126() {
-        ASSERT_THROW_INTERNAL(checkCode("{ } float __ieee754_sinhf ( float x ) { float t , , do { gf_u ( jx ) { } ( 0 ) return ; ( ) { } t } ( 0x42b17180 ) { } }"),
+        ASSERT_THROW_INTERNAL(checkCode("{ } float __ieee754_sinhf ( float x ) { float t , , do { gf_u ( jx ) { } ( 0 ) return ; ( ) { } t } ( 0x42b17180 ) { } }\n"),
                               SYNTAX);
     }
 
@@ -1009,38 +1013,38 @@ class TestGarbage : public TestFixture {
                         "  ~A() { printf(\"A d'tor\\n\"); }\n"
                         "};\n"
                         " const A& foo(const A& arg) { return arg; }\n"
-                        " foo(A(12)).Var");
+                        " foo(A(12)).Var\n");
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode128() {
-        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }} enum {{ FOO << = } ( ) } {{ }} ;"),
+        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ) } {{ }} enum {{ FOO << = } ( ) } {{ }} ;\n"),
                           InternalError);
     }
 
     void garbageCode129() {
-        ASSERT_THROW_INTERNAL(checkCode("operator - ( { } typedef typename x ; ( ) ) { ( { { ( ( ) ) } ( { } ) } ) }"),
+        ASSERT_THROW_INTERNAL(checkCode("operator - ( { } typedef typename x ; ( ) ) { ( { { ( ( ) ) } ( { } ) } ) }\n"),
                               SYNTAX);
     }
 
     void garbageCode130() {
-        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ){ } { { } } { { FOO} = } ( ) } { { } } enumL\" ( enumL\" { { FOO } ( ) } { { } } ;"),
+        TODO_ASSERT_THROW(checkCode("enum { FOO = ( , ){ } { { } } { { FOO} = } ( ) } { { } } enumL\" ( enumL\" { { FOO } ( ) } { { } } ;\n"),
                           InternalError);
     }
 
     void garbageCode131() {
-        ASSERT_THROW_INTERNAL(checkCode("( void ) { ( ) } ( ) / { ( ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( void ) { ( ) } ( ) / { ( ) }\n"), SYNTAX);
         // actually the invalid code should trigger an syntax error...
     }
 
     void garbageCode132() { // #7022
-        ASSERT_THROW_INTERNAL(checkCode("() () { } { () () ({}) i() } void i(void(*ptr) ()) { ptr(!) () }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("() () { } { () () ({}) i() } void i(void(*ptr) ()) { ptr(!) () }\n"), SYNTAX);
     }
 
     void garbageCode133() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() {{}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {{}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("void f()) {}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f()) {}\n"), SYNTAX);
 
         ASSERT_THROW_INTERNAL(checkCode("void f()\n"
                                         "{\n"
@@ -1091,32 +1095,32 @@ class TestGarbage : public TestFixture {
 
     void garbageCode134() {
         // Ticket #5605, #5759, #5762, #5774, #5823, #6059
-        ASSERT_THROW_INTERNAL(checkCode("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("() template < T = typename = x > struct a {} { f <int> () }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("template < T = typename = > struct a { f <int> }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("() template < T = typename = x > struct a {} { f <int> () }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < T = typename = > struct a { f <int> }\n"), SYNTAX);
         (void)checkCode("struct S { int i, j; }; "
                         "template<int S::*p, typename U> struct X {}; "
                         "X<&S::i, int> x = X<&S::i, int>(); "
-                        "X<&S::j, int> y = X<&S::j, int>();");
+                        "X<&S::j, int> y = X<&S::j, int>();\n");
         ignore_errout(); // we are not interested in the output
         (void)checkCode("template <typename T> struct A {}; "
                         "template <> struct A<void> {}; "
-                        "void foo(const void* f = 0) {}");
+                        "void foo(const void* f = 0) {}\n");
         (void)checkCode("template<typename... T> struct A { "
                         "  static const int s = 0; "
                         "}; "
-                        "A<int> a;");
+                        "A<int> a;\n");
         (void)checkCode("template<class T, class U> class A {}; "
                         "template<class T = A<int, int> > class B {}; "
                         "template<class T = B<int> > class C { "
                         "    C() : _a(0), _b(0) {} "
                         "    int _a, _b; "
-                        "};");
+                        "};\n");
         (void)checkCode("template<class... T> struct A { "
                         "  static int i; "
                         "}; "
-                        "void f() { A<int>::i = 0; }");
+                        "void f() { A<int>::i = 0; }\n");
         ignore_errout(); // we are not interested in the output
     }
 
@@ -1125,17 +1129,17 @@ class TestGarbage : public TestFixture {
                         "  return a >> extern\n"
                         "}\n"
                         "long a = 1 ;\n"
-                        "long b = 2 ;");
+                        "long b = 2 ;\n");
         ignore_errout(); // we are not interested in the output
     }
 
     void garbageCode136() { // #7033
-        ASSERT_THROW_INTERNAL(checkCode("{ } () { void f() { node_t * n; for (; -n) {} } } { }"),
+        ASSERT_THROW_INTERNAL(checkCode("{ } () { void f() { node_t * n; for (; -n) {} } } { }\n"),
                               SYNTAX);
     }
 
     void garbageCode137() { // #7034
-        ASSERT_THROW_INTERNAL(checkCode("\" \" typedef signed char f; \" \"; void a() { f * s = () &[]; (; ) (; ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("\" \" typedef signed char f; \" \"; void a() { f * s = () &[]; (; ) (; ) }\n"), SYNTAX);
     }
 
     void garbageCode138() { // #6660 (segmentation fault)
@@ -1147,7 +1151,7 @@ class TestGarbage : public TestFixture {
                         "      {};\n"
                         "    } halo;\n"
                         "}\n"
-                        "CS_PLUGIN_NAMESPACE_END(csparser)");
+                        "CS_PLUGIN_NAMESPACE_END(csparser)\n");
         ignore_errout(); // we are not interested in the output
     }
 
@@ -1156,19 +1160,19 @@ class TestGarbage : public TestFixture {
                                         "   de_ctrl = (nDirection == RIGHT_TO_LEFT) ?\n"
                                         "    ( (0 & ~(((1 << (1 - (0 ? DE_CONTROL_DIRECTION))) - 1) << (0 ? DE_CONTROL_DIRECTION))) )\n"
                                         "    : 42;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode140() { // #7035
-        ASSERT_THROW_INTERNAL(checkCode("int foo(int align) { int off(= 0 % align;  return off) ? \\ align - off  :  0;  \\ }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int foo(int align) { int off(= 0 % align;  return off) ? \\ align - off  :  0;  \\ }\n"), SYNTAX);
     }
 
     void garbageCode141() { // #7043
-        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } enum { X = X } = X ;"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } enum { X = X } = X ;\n"), InternalError);
     }
 
     void garbageCode142() { // #7050
-        ASSERT_THROW_INTERNAL(checkCode("{ } (  ) { void mapGraphs ( ) { node_t * n ; for (!oid n ) { } } } { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ } (  ) { void mapGraphs ( ) { node_t * n ; for (!oid n ) { } } } { }\n"), SYNTAX);
     }
 
     void garbageCode143() { // #6922
@@ -1182,18 +1186,18 @@ class TestGarbage : public TestFixture {
                                         "            VGAwCR(0x64,0x?? );\n"
                                         "        }\n"
                                         "    }\n"
-                                        "}"), AST);
+                                        "}\n"), AST);
     }
 
     void garbageCode144() { // #6865
-        ASSERT_THROW_INTERNAL(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;\n"), SYNTAX);
     }
 
     void garbageCode146() { // #7081
         ASSERT_THROW_INTERNAL(checkCode("void foo() {\n"
                                         "    ? std::cout << pow((, 1) << std::endl;\n"
                                         "    double <ip = NUO ip) << std::end;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode147() { // #7082
@@ -1207,9 +1211,9 @@ class TestGarbage : public TestFixture {
                                         "void est2() {\n"
                                         "    for (int ui = 0; ui < 1z; ui++)\n"
                                         "        ;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("; void f ^ { return } int main ( ) { }"), SYNTAX); // #4941
+        ASSERT_THROW_INTERNAL(checkCode("; void f ^ { return } int main ( ) { }\n"), SYNTAX); // #4941
     }
 
     void garbageCode148() { // #7090
@@ -1217,14 +1221,14 @@ class TestGarbage : public TestFixture {
                                         "    typedef S0 b[][1][1] != 0\n"
                                         "};\n"
                                         "b[K][0] S0 b[][1][1] != 4{ 0 };\n"
-                                        "b[0][0]"), UNKNOWN_MACRO);
+                                        "b[0][0]\n"), UNKNOWN_MACRO);
     }
 
     void garbageCode149() { // #7085 (segmentation fault)
         (void)checkCode("int main() {\n"
                         "    for (j = 0; j < 1; j)\n"
                         "        j6;\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
@@ -1241,27 +1245,26 @@ class TestGarbage : public TestFixture {
         (void)checkCode("void f() {\n"
                         "    int a;\n"
                         "    do { a=do_something() } while (a);\n"
-                        "}");
+                        "}\n");
     }
 
     void garbageCode152() { // happened in travis, originally from llvm clang code (segmentation fault)
         const char code[] = "template <bool foo = std::value &&>\n"
                             "static std::string foo(char *Bla) {\n"
                             "    while (Bla[1] && Bla[1] != ',') }\n";
-        (void)checkCode(code);
-        ignore_errout(); // we are not interested in the output
+        ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void garbageCode153() {
-        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } { X X } enum { X = << { ( X ) } } { } X */"), InternalError);
+        TODO_ASSERT_THROW(checkCode("enum { X = << { X } } { X X } enum { X = << { ( X ) } } { } X */\n"), InternalError);
     }
 
     void garbageCode154() { // #7112 (segmentation fault)
-        (void)checkCode("\"abc\"[];");
+        (void)checkCode("\"abc\"[];\n");
     }
 
     void garbageCode156() { // #7120
-        ASSERT_THROW_INTERNAL(checkCode("struct {}a; d f() { c ? : } {}a.p"), AST);
+        ASSERT_THROW_INTERNAL(checkCode("struct {}a; d f() { c ? : } {}a.p\n"), AST);
     }
 
     void garbageCode157() { // #7131
@@ -1273,24 +1276,24 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode158() { // #3238 (segmentation fault)
-        (void)checkCode("__FBSDID(\"...\");");
+        (void)checkCode("__FBSDID(\"...\");\n");
     }
 
     void garbageCode159() { // #7119
-        ASSERT_THROW_INTERNAL(checkCode("({}typedef typename x;typename x!){({{}()})}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("({}typedef typename x;typename x!){({{}()})}\n"), SYNTAX);
     }
 
     void garbageCode160() { // #7190
-        ASSERT_THROW_INTERNAL(checkCode("f(a,b,c,d)float [  a[],d;int ]  b[],c;{} "), SYNTAX); // don't hang
+        ASSERT_THROW_INTERNAL(checkCode("f(a,b,c,d)float [  a[],d;int ]  b[],c;{} \n"), SYNTAX); // don't hang
     }
 
 
     void garbageCodeFuzzerClientMode1() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= name2 & name3 name2 = | 0.1 , | 0.1 , | 0.1 name4 <= >( ); }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x = , * [ | + 0xff | > 0xff]; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() {  x = , | 0xff , 0.1 < ; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x = [ 1 || ] ; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f1() { x = name6 1 || ? name3 [  ( 1 || +) ] ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= name2 & name3 name2 = | 0.1 , | 0.1 , | 0.1 name4 <= >( ); }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x = , * [ | + 0xff | > 0xff]; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {  x = , | 0xff , 0.1 < ; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x = [ 1 || ] ; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f1() { x = name6 1 || ? name3 [  ( 1 || +) ] ; }\n"), SYNTAX);
     }
 
     void garbageValueFlow() {
@@ -1303,44 +1306,46 @@ class TestGarbage : public TestFixture {
         }
 
         { // 6122 survive garbage code
-            const char code[] = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }";
+            const char code[] = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
 
         {
-            const char code[] = "void f1() { for (int n = 0 n < 10 n++); }";
+            const char code[] = "void f1() { for (int n = 0 n < 10 n++); }\n";
             ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
     }
 
     void garbageSymbolDatabase() {
-        (void)checkCode("void f( { u = 1 ; } ) { }");
+        (void)checkCode("void f( { u = 1 ; } ) { }\n");
 
-        ASSERT_THROW_INTERNAL(checkCode("{ }; void namespace A::f; { g() { int } }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ }; void namespace A::f; { g() { int } }\n"), SYNTAX);
 
-        ASSERT_THROW_INTERNAL(checkCode("class Foo {}; class Bar : public Foo"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("class Foo {}; class Bar : public Foo\n"), SYNTAX);
 
         // #5663 (segmentation fault)
         (void)checkCode("YY_DECL { switch (yy_act) {\n"
                         "    case 65: YY_BREAK\n"
                         "    case YY_STATE_EOF(block):\n"
                         "        yyterminate();\n"
-                        "} }");
+                        "} }\n");
         ignore_errout(); // we are not interested in the output
     }
 
     void garbageAST() {
         ASSERT_THROW_INTERNAL(checkCode("N 1024 float a[N], b[N + 3], c[N]; void N; (void) i;\n"
                                         "int #define for (i = avx_test i < c[i]; i++)\n"
-                                        "b[i + 3] = a[i] * {}"), SYNTAX); // Don't hang (#5787)
+                                        "b[i + 3] = a[i] * {}\n"), SYNTAX); // Don't hang (#5787)
 
-        (void)checkCode("START_SECTION([EXTRA](bool isValid(const String &filename)))"); // Don't crash (#5991)
+        (void)checkCode("START_SECTION([EXTRA](bool isValid(const String &filename)))\n"); // Don't crash (#5991)
 
         // #8352
         ASSERT_THROW_INTERNAL(checkCode("else return % name5 name2 - =name1 return enum | { - name3 1 enum != >= 1 >= ++ { { || "
-                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { name6 | ; ++}}}}}}}"), UNKNOWN_MACRO);
+                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { name6 | ; ++}}}}}}}\n"), UNKNOWN_MACRO);
         ASSERT_THROW_INTERNAL(checkCode("else return % name5 name2 - =name1 return enum | { - name3 1 enum != >= 1 >= ++ { { || "
-                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { { || ; ++}}}}}}}}"), UNKNOWN_MACRO);
+                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { { || ; ++}}}}}}}}\n"), UNKNOWN_MACRO);
+
+        ASSERT_THROW_INTERNAL(checkCode("f(*p, requires(x));\n"), AST); // #14740
     }
 
     void templateSimplifierCrashes() {
@@ -1364,7 +1369,7 @@ class TestGarbage : public TestFixture {
             "  void f() {\n"
             "    s.operator A<A<int> >();\n"
             "  }\n"
-            "}");
+            "}\n");
 
         ASSERT_NO_THROW(checkCode( // #6034
                             "template<template<typename...> class T, typename... Args>\n"
@@ -1378,7 +1383,7 @@ class TestGarbage : public TestFixture {
                             "\n"
                             "int main() {\n"
                             "  foo<int_<0> >::value;\n"
-                            "}"));
+                            "}\n"));
 
         (void)checkCode( // #6117 (segmentation fault)
             "template <typename ...> struct something_like_tuple\n"
@@ -1396,7 +1401,7 @@ class TestGarbage : public TestFixture {
             "\n"
             "typedef something_like_tuple<char, int, float> something_like_tuple_t;\n"
             "SA ((is_last<float, something_like_tuple_t>::value == false));\n"
-            "SA ((is_last<int, something_like_tuple_t>::value == false));");
+            "SA ((is_last<int, something_like_tuple_t>::value == false));\n");
         ignore_errout(); // we are not interested in the output
 
         (void)checkCode( // #6225 (use-after-free)
@@ -1407,7 +1412,7 @@ class TestGarbage : public TestFixture {
             "        template <typename T>\n"
             "        struct A {};\n"
             "        using AliasA = A<T>;\n"
-            "}");
+            "}\n");
 
         // #3449
         ASSERT_EQUALS("template < typename T > struct A ;\n"
@@ -1415,72 +1420,72 @@ class TestGarbage : public TestFixture {
                       "{ } ;",
                       checkCode("template<typename T> struct A;\n"
                                 "struct B { template<typename T> struct C };\n"
-                                "{};"));
+                                "{};\n"));
     }
     void garbageCode161() {
         //7200
-        ASSERT_THROW_INTERNAL(checkCode("{ }{ if () try { } catch (...)} B : : ~B { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{ }{ if () try { } catch (...)} B : : ~B { }\n"), SYNTAX);
     }
 
     void garbageCode162() {
         //7208
-        ASSERT_THROW_INTERNAL(checkCode("return <<  >>  x return <<  >>  x ", false), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("return <<  >>  x return <<  >>  x \n", false), UNKNOWN_MACRO);
     }
 
     void garbageCode163() {
         //7228
-        ASSERT_THROW_INTERNAL(checkCode("typedef s f[](){typedef d h(;f)}", false), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("typedef s f[](){typedef d h(;f)}\n", false), SYNTAX);
     }
 
     void garbageCode164() {
         //7234
-        ASSERT_THROW_INTERNAL(checkCode("class d{k p;}(){d::d():B<()}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("class d{k p;}(){d::d():B<()}\n"), SYNTAX);
     }
 
     void garbageCode165() {
         //7235
-        ASSERT_THROW_INTERNAL(checkCode("for(;..)", false),SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("for(;..)\n", false),SYNTAX);
     }
 
     void garbageCode167() {
         //7237
-        ASSERT_THROW_INTERNAL(checkCode("class D00i000{:D00i000::}i"),SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("class D00i000{:D00i000::}i\n"),SYNTAX);
     }
 
     void garbageCode168() {
         // #7246 (segmentation fault)
-        (void)checkCode("long foo(void) { return *bar; }", false);
+        (void)checkCode("long foo(void) { return *bar; }\n", false);
         ignore_errout(); // we do not care about the output
     }
 
     void garbageCode169() {
         // 6713
         ASSERT_THROW_INTERNAL(checkCode("( ) { ( ) ; { return } switch ( ) i\n"
-                                        "set case break ; default: ( ) }", false), SYNTAX);
+                                        "set case break ; default: ( ) }\n", false), SYNTAX);
     }
 
     void garbageCode170() {
         // 7255
-        ASSERT_THROW_INTERNAL(checkCode("d i(){{f*s=typeid(()0,)}}", false), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d i(){{f*s=typeid(()0,)}}\n", false), SYNTAX);
     }
 
     void garbageCode171() {
         // 7270
-        ASSERT_THROW_INTERNAL(checkCode("(){case()?():}:", false), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("(){case()?():}:\n", false), SYNTAX);
     }
 
     void garbageCode172() {
         // #7357
-        ASSERT_THROW_INTERNAL(checkCode("p<e T=l[<]<>>,"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("p<e T=l[<]<>>,\n"), SYNTAX);
     }
 
     void garbageCode173() {
         // #6781  heap corruption ;  TemplateSimplifier::simplifyTemplateInstantiations
-        ASSERT_THROW_INTERNAL(checkCode(" template < Types > struct S : >( S < ...Types... > S <) > { ( ) { } } ( ) { return S < void > ( ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(" template < Types > struct S : >( S < ...Types... > S <) > { ( ) { } } ( ) { return S < void > ( ) }\n"), SYNTAX);
     }
 
     void garbageCode174() { // #7356
-        ASSERT_THROW_INTERNAL(checkCode("{r e() { w*constD = (())D = cast< }}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{r e() { w*constD = (())D = cast< }}\n"), SYNTAX);
     }
 
     void garbageCode175() { // #7027
@@ -1489,32 +1494,32 @@ class TestGarbage : public TestFixture {
                                         "  for ( i = t3 , i < t1 ; i++ )\n"
                                         "    for ( j = 0 ; j < = j++ )\n"
                                         "        return t1 ,\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode176() { // #7257 (segmentation fault)
-        (void)checkCode("class t { { struct } enum class f : unsigned { q } b ; operator= ( T ) { switch ( b ) { case f::q: } } { assert ( b ) ; } } { ; & ( t ) ( f::t ) ; } ;");
+        (void)checkCode("class t { { struct } enum class f : unsigned { q } b ; operator= ( T ) { switch ( b ) { case f::q: } } { assert ( b ) ; } } { ; & ( t ) ( f::t ) ; } ;\n");
         ignore_errout(); // we are not interested in the output
     }
 
     void garbageCode181() {
-        ASSERT_THROW_INTERNAL(checkCode("int test() { int +; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int test() { int +; }\n"), SYNTAX);
     }
 
     // #4195 - segfault for "enum { int f ( ) { return = } r = f ( ) ; }"
     void garbageCode182() {
-        ASSERT_THROW_INTERNAL(checkCode("enum { int f ( ) { return = } r = f ( ) ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("enum { int f ( ) { return = } r = f ( ) ; }\n"), SYNTAX);
     }
     // #7505 - segfault
     void garbageCode183() {
-        ASSERT_THROW_INTERNAL(checkCode("= { int } enum return { r = f() f(); }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("= { int } enum return { r = f() f(); }\n"), SYNTAX);
     }
 
     void garbageCode184() { // #7699
         ASSERT_THROW_INTERNAL(checkCode("unsigned int AquaSalSystem::GetDisplayScreenCount() {\n"
                                         "    NSArray* pScreens = [NSScreen screens];\n"
                                         "    return pScreens ? [pScreens count] : 1;\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode185() { // #6011 crash in libreoffice failure to create proper AST
@@ -1526,29 +1531,29 @@ class TestGarbage : public TestFixture {
             "               pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? TRUE : FALSE ) );\n"
             "               return bStatus;\n"
             "       };\n"
-            "}");
+            "}\n");
         ignore_errout(); // we are not interested in the output
     }
 
     // #8151 - segfault due to incorrect template syntax
     void garbageCode186() {
-        ASSERT_THROW_INTERNAL(checkCode("A<B<><>C"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("A<B<><>C\n"), SYNTAX);
     }
 
     void garbageCode187() { // # 8152 - segfault in handling
         const char inp[] = "0|\0|0>;\n";
         ASSERT_THROW_INTERNAL(checkCode(inp), SYNTAX);
 
-        (void)checkCode("template<class T> struct S : A< B<T> || C<T> > {};"); // No syntax error: #8390
-        (void)checkCode("static_assert(A<x> || B<x>, ab);");
+        (void)checkCode("template<class T> struct S : A< B<T> || C<T> > {};\n"); // No syntax error: #8390
+        (void)checkCode("static_assert(A<x> || B<x>, ab);\n");
     }
 
     void garbageCode188() { // #8255
-        ASSERT_THROW_INTERNAL(checkCode("{z r(){(){for(;<(x);){if(0==0)}}}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{z r(){(){for(;<(x);){if(0==0)}}}}\n"), SYNTAX);
     }
 
     void garbageCode189() { // #8317 (segmentation fault)
-        (void)checkCode("t&n(){()()[](){()}}$");
+        (void)checkCode("t&n(){()()[](){()}}$\n");
     }
 
     void garbageCode190() { // #8307
@@ -1556,31 +1561,31 @@ class TestGarbage : public TestFixture {
                                         "    int i;\n"
                                         "    i *= 0;\n"
                                         "    !i <;\n"
-                                        "}"),
+                                        "}\n"),
                               AST);
     }
 
     void garbageCode191() { // #8333
-        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(const); };"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(int, const, char); };"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(struct); };"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(const); };\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(int, const, char); };\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct A { int f(struct); };\n"), SYNTAX);
 
         // The following code is valid and should not trigger any error
-        ASSERT_NO_THROW(checkCode("struct A { int f ( char ) ; } ;"));
+        ASSERT_NO_THROW(checkCode("struct A { int f ( char ) ; } ;\n"));
     }
 
     void garbageCode192() { // #8386 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode("{(()[((0||0xf||))]0[])}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{(()[((0||0xf||))]0[])}\n"), SYNTAX);
     }
 
     // #8740
     void garbageCode193() {
-        ASSERT_THROW_INTERNAL(checkCode("d f(){!=[]&&0()!=0}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){!=[]&&0()!=0}\n"), SYNTAX);
     }
 
     // #8384
     void garbageCode194() {
-        ASSERT_THROW_INTERNAL(checkCode("{((()))(return 1||);}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{((()))(return 1||);}\n"), SYNTAX);
     }
 
     // #8709 - no garbage but to avoid stability regression (segmentation fault)
@@ -1590,19 +1595,19 @@ class TestGarbage : public TestFixture {
                         "  switch (d) { case b:; }\n"
                         "  double e(b);\n"
                         "  if(e <= 0) {}\n"
-                        "}");
+                        "}\n");
         ignore_errout(); // we do not care about the output
     }
 
     // #8265
     void garbageCode196() {
-        ASSERT_THROW_INTERNAL(checkCode("0|,0<<V"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode(";|4|<0;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("0|,0<<V\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(";|4|<0;\n"), SYNTAX);
     }
 
     // #8385
     void garbageCode197() {
-        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)|{e:[()]}}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)|{e:[()]}}}\n"), SYNTAX);
     }
 
     // #8383
@@ -1612,38 +1617,38 @@ class TestGarbage : public TestFixture {
                                         "ame5 ( name5 struct ( name5 name5 < ) ) ( default ) { name4 != name5 name5 name5\n"
                                         " ( name5 name5 name5 ( { 1 >= void { ( ()) } 1 name3 return >= >= ( ) >= name5 (\n"
                                         " name5 name6 :nam00 [ ()])}))})})})};\n"
-                                        "}"), SYNTAX);
+                                        "}\n"), SYNTAX);
     }
 
     // #8752 (segmentation fault)
     void garbageCode199() {
-        ASSERT_THROW_INTERNAL(checkCode("d f(){e n00e0[]n00e0&" "0+f=0}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){e n00e0[]n00e0&" "0+f=0}\n"), SYNTAX);
     }
 
     // #8757
     void garbageCode200() {
-        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)!{e:[]}}}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)!{e:[]}}}\n"), SYNTAX);
     }
 
     // #8873
     void garbageCode201() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() { std::string s=\"abc\"; return s + }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { std::string s=\"abc\"; return s + }\n"), SYNTAX);
     }
 
     // #8907
     void garbageCode202() {
-        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(return); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(throw); }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(return); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(throw); }\n"), UNKNOWN_MACRO);
         ignore_errout();
     }
 
     void garbageCode203() { // #8972 (segmentation fault)
-        ASSERT_THROW_INTERNAL(checkCode("{ > () {} }"), SYNTAX);
-        (void)checkCode("template <> a > ::b();");
+        ASSERT_THROW_INTERNAL(checkCode("{ > () {} }\n"), SYNTAX);
+        (void)checkCode("template <> a > ::b();\n");
     }
 
     void garbageCode204() {
-        ASSERT_THROW_INTERNAL(checkCode("template <a, = b<>()> c; template <a> a as() {} as<c<>>();"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("template <a, = b<>()> c; template <a> a as() {} as<c<>>();\n"), SYNTAX);
     }
 
     void garbageCode205() {
@@ -1662,55 +1667,55 @@ class TestGarbage : public TestFixture {
                                         "CodeSnippetsEvent :: CodeSnippetsEvent ( const CodeSnippetsEvent & Event )\n"
                                         ": wxCommandEvent ( Event )\n"
                                         ", m_SnippetID ( 0 ) {\n"
-                                        "}"),
+                                        "}\n"),
                               INTERNAL);
     }
 
     void garbageCode206() {
-        ASSERT_EQUALS("[test.cpp:1] syntax error: operator", getSyntaxError("void foo() { for (auto operator new : int); }"));
-        ASSERT_EQUALS("[test.cpp:1] syntax error", getSyntaxError("void foo() { for (a operator== :) }"));
+        ASSERT_EQUALS("[test.cpp:1] syntax error: operator", getSyntaxError("void foo() { for (auto operator new : int); }\n"));
+        ASSERT_EQUALS("[test.cpp:1] syntax error", getSyntaxError("void foo() { for (a operator== :) }\n"));
     }
 
     void garbageCode207() { // #8750
-        ASSERT_THROW_INTERNAL(checkCode("d f(){(.n00e0(return%n00e0''('')));}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){(.n00e0(return%n00e0''('')));}\n"), SYNTAX);
     }
 
     void garbageCode208() { // #8753
-        ASSERT_THROW_INTERNAL(checkCode("d f(){(for(((((0{t b;((((((((()))))))))}))))))}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){(for(((((0{t b;((((((((()))))))))}))))))}\n"), SYNTAX);
     }
 
     void garbageCode209() { // #8756
-        ASSERT_THROW_INTERNAL(checkCode("{(- -##0xf/-1 0)[]}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{(- -##0xf/-1 0)[]}\n"), SYNTAX);
     }
 
     void garbageCode210() { // #8762
-        ASSERT_THROW_INTERNAL(checkCode("{typedef typedef c n00e0[]c000(;n00e0&c000)}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{typedef typedef c n00e0[]c000(;n00e0&c000)}\n"), SYNTAX);
     }
 
     void garbageCode211() { // #8764
-        ASSERT_THROW_INTERNAL(checkCode("{typedef f typedef[]({typedef e e,>;typedef(((typedef<typedef|)))})}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{typedef f typedef[]({typedef e e,>;typedef(((typedef<typedef|)))})}\n"), SYNTAX);
     }
 
     void garbageCode212() { // #8765
-        ASSERT_THROW_INTERNAL(checkCode("{(){}[]typedef r n00e0[](((n00e0 0((;()))))){(0 typedef n00e0 bre00 n00e0())}[]();typedef n n00e0()[],(bre00)}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{(){}[]typedef r n00e0[](((n00e0 0((;()))))){(0 typedef n00e0 bre00 n00e0())}[]();typedef n n00e0()[],(bre00)}\n"), SYNTAX);
     }
 
     void garbageCode213() { // #8758
-        ASSERT_THROW_INTERNAL(checkCode("{\"\"[(1||)];}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{\"\"[(1||)];}\n"), SYNTAX);
     }
 
     void garbageCode214() { // segmentation fault
-        (void)checkCode("THIS FILE CONTAINS VARIOUS TEXT");
+        (void)checkCode("THIS FILE CONTAINS VARIOUS TEXT\n");
     }
 
     void garbageCode215() { // daca@home script with extension .c
-        ASSERT_THROW_INTERNAL(checkCode("a = [1,2,3];"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("a = [1,2,3];\n"), SYNTAX);
     }
 
     void garbageCode216() { // #7884 (out-of-memory)
         (void)checkCode("template<typename> struct A {};\n"
                         "template<typename...T> struct A<T::T...> {}; \n"
-                        "A<int> a;");
+                        "A<int> a;\n");
     }
 
     void garbageCode217() { // #10011
@@ -1718,11 +1723,11 @@ class TestGarbage : public TestFixture {
                                         "    auto p;\n"
                                         "    if (g(p)) {}\n"
                                         "    assert();\n"
-                                        "}"), AST);
+                                        "}\n"), AST);
     }
 
     void garbageCode218() { // #8763
-        ASSERT_THROW_INTERNAL(checkCode("d f(){t n0000 const[]n0000+0!=n0000,(0)}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){t n0000 const[]n0000+0!=n0000,(0)}\n"), SYNTAX);
     }
     void garbageCode219() { // #10101
         (void)checkCode("typedef void (*func) (addr) ;\n"
@@ -1742,100 +1747,111 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW_INTERNAL(checkCode("template<template<class>\n"), SYNTAX);  // don't crash
     }
     void garbageCode223() { // #11639
-        ASSERT_THROW_INTERNAL(checkCode("struct{}*"), SYNTAX);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("struct{}*\n"), SYNTAX);  // don't crash
     }
     void garbageCode224() {
-        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast<const }"), SYNTAX);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast<const }\n"), SYNTAX);  // don't crash
         ASSERT_EQUALS("", errout_str());
-        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast x; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast x; }\n"), SYNTAX);
         ignore_errout();
     }
     void garbageCode225() {
-        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof = ) }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof |= ) }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof = ) }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int n() { c * s0, 0 s0 = c(sizeof |= ) }\n"), SYNTAX);
     }
     void garbageCode226() {
-        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)`)) } {}"), SYNTAX); // #11638
-        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)\\)) } {}"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)@)) } {}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)`)) } {}\n"), SYNTAX); // #11638
+        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)\\)) } {}\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int a() { (b((c)@)) } {}\n"), SYNTAX);
     }
     void garbageCode227() { // #12615
-        ASSERT_NO_THROW(checkCode("f(&S::operator=);"));
+        ASSERT_NO_THROW(checkCode("f(&S::operator=);\n"));
     }
     void garbageCode228() {
-        ASSERT_NO_THROW(checkCode("void f() { enum { A = [=]() mutable { return 0; }() }; }"));
-        ASSERT_NO_THROW(checkCode("enum { A = [=](void) mutable -> int { return 0; }() };"));
+        ASSERT_NO_THROW(checkCode("void f() { enum { A = [=]() mutable { return 0; }() }; }\n"));
+        ASSERT_NO_THROW(checkCode("enum { A = [=](void) mutable -> int { return 0; }() };\n"));
+    }
+    void garbageCode229() { // #14126
+        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[maybe_unused]]\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[unused]]\n"), SYNTAX);
     }
+    void garbageCode230() { // #14432
+        ASSERT_THROW_INTERNAL(checkCode("e U U,i\n"), SYNTAX);
+    }
+    void garbageCode231() {
+        ASSERT_THROW_INTERNAL(checkCode("char char* [] = {\"a\" \"b\"}\n"), SYNTAX);
+    }
+
 
     void syntaxErrorFirstToken() {
-        ASSERT_THROW_INTERNAL(checkCode("&operator(){[]};"), SYNTAX); // #7818
-        ASSERT_THROW_INTERNAL(checkCode("*(*const<> (size_t); foo) { } *(*const (size_t)() ; foo) { }"), SYNTAX); // #6858
-        ASSERT_THROW_INTERNAL(checkCode(">{ x while (y) z int = }"), SYNTAX); // #4175
-        ASSERT_THROW_INTERNAL(checkCode("&p(!{}e x){({(0?:?){({})}()})}"), SYNTAX); // #7118
-        ASSERT_THROW_INTERNAL(checkCode("<class T> { struct { typename D4:typename Base<T*> }; };"), SYNTAX); // #3533
+        ASSERT_THROW_INTERNAL(checkCode("&operator(){[]};\n"), SYNTAX); // #7818
+        ASSERT_THROW_INTERNAL(checkCode("*(*const<> (size_t); foo) { } *(*const (size_t)() ; foo) { }\n"), SYNTAX); // #6858
+        ASSERT_THROW_INTERNAL(checkCode(">{ x while (y) z int = }\n"), SYNTAX); // #4175
+        ASSERT_THROW_INTERNAL(checkCode("&p(!{}e x){({(0?:?){({})}()})}\n"), SYNTAX); // #7118
+        ASSERT_THROW_INTERNAL(checkCode("<class T> { struct { typename D4:typename Base<T*> }; };\n"), SYNTAX); // #3533
         ASSERT_THROW_INTERNAL(checkCode(" > template < . > struct Y < T > { = } ;\n"), SYNTAX); // #6108
     }
 
     void syntaxErrorLastToken() {
-        ASSERT_THROW_INTERNAL(checkCode("int *"), SYNTAX); // #7821
-        ASSERT_THROW_INTERNAL(checkCode("x[y]"), SYNTAX); // #2986
-        ASSERT_THROW_INTERNAL(checkCode("( ) &"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("|| #if #define <="), SYNTAX); // #2601
-        ASSERT_THROW_INTERNAL(checkCode("f::y:y : <x::"), SYNTAX); // #6613
-        ASSERT_THROW_INTERNAL(checkCode("a \"b\" not_eq \"c\""), SYNTAX); // #6720
-        ASSERT_THROW_INTERNAL(checkCode("(int arg2) { } { } typedef void (func_type) (int, int); typedef func_type&"), SYNTAX); // #6738
-        ASSERT_THROW_INTERNAL(checkCode("&g[0]; { (g[0] 0) } =", false), SYNTAX); // #6744
-        ASSERT_THROW_INTERNAL(checkCode("{ { void foo() { struct }; { }; } }; struct S { } f =", false), SYNTAX); // #6753
-        ASSERT_THROW_INTERNAL(checkCode("{ { ( ) } P ( ) ^ { } { } { } ( ) } 0"), SYNTAX); // #6772
-        ASSERT_THROW_INTERNAL(checkCode("+---+"), SYNTAX); // #6948
+        ASSERT_THROW_INTERNAL(checkCode("int *\n"), SYNTAX); // #7821
+        ASSERT_THROW_INTERNAL(checkCode("x[y]\n"), SYNTAX); // #2986
+        ASSERT_THROW_INTERNAL(checkCode("( ) &\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("|| #if #define <=\n"), SYNTAX); // #2601
+        ASSERT_THROW_INTERNAL(checkCode("f::y:y : <x::\n"), SYNTAX); // #6613
+        ASSERT_THROW_INTERNAL(checkCode("a \"b\" not_eq \"c\"\n"), SYNTAX); // #6720
+        ASSERT_THROW_INTERNAL(checkCode("(int arg2) { } { } typedef void (func_type) (int, int); typedef func_type&\n"), SYNTAX); // #6738
+        ASSERT_THROW_INTERNAL(checkCode("&g[0]; { (g[0] 0) } =\n", false), SYNTAX); // #6744
+        ASSERT_THROW_INTERNAL(checkCode("{ { void foo() { struct }; { }; } }; struct S { } f =\n", false), SYNTAX); // #6753
+        ASSERT_THROW_INTERNAL(checkCode("{ { ( ) } P ( ) ^ { } { } { } ( ) } 0\n"), SYNTAX); // #6772
+        ASSERT_THROW_INTERNAL(checkCode("+---+\n"), SYNTAX); // #6948
         ASSERT_THROW_INTERNAL(checkCode("template<>\n"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("++4++ +  + E++++++++++ + ch " "tp.oed5[.]"), SYNTAX); // #7074
-        ASSERT_THROW_INTERNAL(checkCode("d a(){f s=0()8[]s?():0}*()?:0", false), SYNTAX); // #7236
-        ASSERT_THROW_INTERNAL(checkCode("!2 : #h2 ?:", false), SYNTAX); // #7769
-        ASSERT_THROW_INTERNAL(checkCode("--"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("volatile true , test < test < #ifdef __ppc__ true ,"), SYNTAX); // #4169
+        ASSERT_THROW_INTERNAL(checkCode("++4++ +  + E++++++++++ + ch " "tp.oed5[.]\n"), SYNTAX); // #7074
+        ASSERT_THROW_INTERNAL(checkCode("d a(){f s=0()8[]s?():0}*()?:0\n", false), SYNTAX); // #7236
+        ASSERT_THROW_INTERNAL(checkCode("!2 : #h2 ?:\n", false), SYNTAX); // #7769
+        ASSERT_THROW_INTERNAL(checkCode("--\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("volatile true , test < test < #ifdef __ppc__ true ,\n"), SYNTAX); // #4169
         ASSERT_THROW_INTERNAL(checkCode("a,b--\n"), SYNTAX); // #2847
-        ASSERT_THROW_INTERNAL(checkCode("x a[0] ="), SYNTAX); // #2682
+        ASSERT_THROW_INTERNAL(checkCode("x a[0] =\n"), SYNTAX); // #2682
         ASSERT_THROW_INTERNAL(checkCode("auto_ptr<x>\n"), SYNTAX); // #2967
         ASSERT_THROW_INTERNAL(checkCode("char a[1]\n"), SYNTAX); // #2865
-        ASSERT_THROW_INTERNAL(checkCode("<><<"), SYNTAX); // #2612
-        ASSERT_THROW_INTERNAL(checkCode("z<y<x>"), SYNTAX); // #2831
-        ASSERT_THROW_INTERNAL(checkCode("><,f<i,"), SYNTAX); // #2835
-        ASSERT_THROW_INTERNAL(checkCode("0; (a) < (a)"), SYNTAX); // #2875
-        ASSERT_THROW_INTERNAL(checkCode(" ( * const ( size_t ) ; foo )"), SYNTAX); // #6135
-        ASSERT_THROW_INTERNAL(checkCode("({ (); strcat(strcat(() ()) ()) })"), SYNTAX); // #6686
-        ASSERT_THROW_INTERNAL(checkCode("%: return ; ()"), SYNTAX); // #3441
-        ASSERT_THROW_INTERNAL(checkCode("__attribute__((destructor)) void"), SYNTAX); // #7816
-        ASSERT_THROW_INTERNAL(checkCode("1 *p = const"), SYNTAX); // #3512
-        ASSERT_THROW_INTERNAL(checkCode("sizeof"), SYNTAX); // #2599
-        ASSERT_THROW_INTERNAL(checkCode(" enum struct"), SYNTAX); // #6718
-        ASSERT_THROW_INTERNAL(checkCode("{(){(())}}r&const"), SYNTAX); // #7321
-        ASSERT_THROW_INTERNAL(checkCode("int"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("<><<\n"), SYNTAX); // #2612
+        ASSERT_THROW_INTERNAL(checkCode("z<y<x>\n"), SYNTAX); // #2831
+        ASSERT_THROW_INTERNAL(checkCode("><,f<i,\n"), SYNTAX); // #2835
+        ASSERT_THROW_INTERNAL(checkCode("0; (a) < (a)\n"), SYNTAX); // #2875
+        ASSERT_THROW_INTERNAL(checkCode(" ( * const ( size_t ) ; foo )\n"), SYNTAX); // #6135
+        ASSERT_THROW_INTERNAL(checkCode("({ (); strcat(strcat(() ()) ()) })\n"), SYNTAX); // #6686
+        ASSERT_THROW_INTERNAL(checkCode("%: return ; ()\n"), SYNTAX); // #3441
+        ASSERT_THROW_INTERNAL(checkCode("__attribute__((destructor)) void\n"), SYNTAX); // #7816
+        ASSERT_THROW_INTERNAL(checkCode("1 *p = const\n"), SYNTAX); // #3512
+        ASSERT_THROW_INTERNAL(checkCode("sizeof\n"), SYNTAX); // #2599
+        ASSERT_THROW_INTERNAL(checkCode(" enum struct\n"), SYNTAX); // #6718
+        ASSERT_THROW_INTERNAL(checkCode("{(){(())}}r&const\n"), SYNTAX); // #7321
+        ASSERT_THROW_INTERNAL(checkCode("int\n"), SYNTAX);
         ASSERT_THROW_INTERNAL(checkCode("struct A :\n"), SYNTAX); // #2591
         ASSERT_THROW_INTERNAL(checkCode("{} const const\n"), SYNTAX); // #2637
-        ASSERT_THROW_INTERNAL(checkCode("re2c: error: line 14, column 4: can only difference char sets"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("re2c: error: line 14, column 4: can only difference char sets\n"), SYNTAX);
 
         // ASSERT_THROW(  , InternalError)
     }
 
     void syntaxErrorCase() {
         // case must be inside switch block
-        ASSERT_THROW_INTERNAL(checkCode("void f() { switch (a) {}; case 1: }"), SYNTAX); // #8184
-        ASSERT_THROW_INTERNAL(checkCode("struct V : { public case {} ; struct U : U  void { V *f (int x) (x) } }"), SYNTAX); // #5120
-        ASSERT_THROW_INTERNAL(checkCode("void f() { 0 0; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { true 0; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { 'a' 0; }"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f() { 1 \"\"; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { switch (a) {}; case 1: }\n"), SYNTAX); // #8184
+        ASSERT_THROW_INTERNAL(checkCode("struct V : { public case {} ; struct U : U  void { V *f (int x) (x) } }\n"), SYNTAX); // #5120
+        ASSERT_THROW_INTERNAL(checkCode("void f() { 0 0; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { true 0; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { 'a' 0; }\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { 1 \"\"; }\n"), SYNTAX);
     }
 
     void syntaxErrorFuzzerCliType1() {
-        ASSERT_THROW_INTERNAL(checkCode("void f(){x=0,return return''[]()}"), SYNTAX);
-        ASSERT_THROW_INTERNAL(checkCode("void f(){x='0'++'0'(return)[];}"), SYNTAX); // #9063
-        (void)checkCode("void f(){*(int *)42=0;}"); // no syntax error
+        ASSERT_THROW_INTERNAL(checkCode("void f(){x=0,return return''[]()}\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f(){x='0'++'0'(return)[];}\n"), SYNTAX); // #9063
+        (void)checkCode("void f(){*(int *)42=0;}\n"); // no syntax error
         ignore_errout(); // we are not interested in the output
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }"), SYNTAX); // #9067
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }"), SYNTAX); // #9068
-        ASSERT_THROW_INTERNAL(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }"), SYNTAX); // #9069
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }\n"), SYNTAX); // #9067
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }\n"), SYNTAX); // #9068
+        ASSERT_THROW_INTERNAL(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }\n"), SYNTAX); // #9069
     }
 
     void cliCode() {
@@ -1846,12 +1862,12 @@ class TestGarbage : public TestFixture {
                             "bool GetDeviceInformation(String ^ port, LibCECConfiguration ^configuration, uint32_t timeoutMs) {\n"
                             "bool bReturn(false);\n"
                             "}\n"
-                            "};"));
+                            "};\n"));
         ignore_errout(); // we are not interested in the output
     }
 
     void enumTrailingComma() {
-        ASSERT_THROW_INTERNAL(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;"), SYNTAX); // #8079
+        ASSERT_THROW_INTERNAL(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;\n"), SYNTAX); // #8079
     }
 
     void nonGarbageCode1() {
@@ -1864,22 +1880,31 @@ class TestGarbage : public TestFixture {
                                   "template< class T >\n"
                                   "template< class Predicate > int\n"
                                   "List<T>::DeleteIf( const Predicate &pred )\n"
-                                  "{}"));
+                                  "{}\n"));
         ignore_errout(); // we are not interested in the output
 
         // #8749
         ASSERT_NO_THROW(checkCode(
                             "struct A {\n"
                             "    void operator+=(A&) && = delete;\n"
-                            "};"));
+                            "};\n"));
 
         // #8788
         ASSERT_NO_THROW(checkCode(
                             "struct foo;\n"
                             "void f() {\n"
                             "    auto fn = []() -> foo* { return new foo(); };\n"
-                            "}"));
+                            "}\n"));
         ignore_errout(); // we do not care about the output
+
+        // #13892
+        ASSERT_NO_THROW(checkCode("void foovm(int x[const *]);\n"));
+
+        // #14676
+        ASSERT_NO_THROW(checkCode("int main() {\n"
+                                  "    auto value = m[1 + qRow<>];\n"
+                                  "}\n"));
+        ignore_errout();
     }
 };
 
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
index 42888a8e401..873272030f6 100644
--- a/test/testimportproject.cpp
+++ b/test/testimportproject.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,23 +21,28 @@
 #include "importproject.h"
 #include "redirect.h"
 #include "settings.h"
+#include "standards.h"
 #include "suppressions.h"
+#include "xml.h"
 
 #include <list>
 #include <map>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
 
-class TestImporter : public ImportProject {
+class TestImporter final : public ImportProject {
 public:
     using ImportProject::importCompileCommands;
     using ImportProject::importCppcheckGuiProject;
-
-    bool sourceFileExists(const std::string & /*file*/) override {
-        return true;
-    }
+    using ImportProject::importVcxproj;
+    using ImportProject::SharedItemsProject;
+    using ImportProject::collectArgs;
+    using ImportProject::fsSetDefines;
+    using ImportProject::fsSetIncludePaths;
+    using ImportProject::setRelativePaths;
 };
 
 
@@ -52,6 +57,7 @@ class TestImportProject : public TestFixture {
         TEST_CASE(setIncludePaths1);
         TEST_CASE(setIncludePaths2);
         TEST_CASE(setIncludePaths3); // macro names are case insensitive
+        TEST_CASE(setRelativePathsInclude); // #14746
         TEST_CASE(importCompileCommands1);
         TEST_CASE(importCompileCommands2); // #8563, #9567
         TEST_CASE(importCompileCommands3); // check with existing trailing / in directory
@@ -65,25 +71,41 @@ class TestImportProject : public TestFixture {
         TEST_CASE(importCompileCommands11); // include path order
         TEST_CASE(importCompileCommands12); // #13040: "directory" is parent directory, relative include paths
         TEST_CASE(importCompileCommands13); // #13333: duplicate file entries
+        TEST_CASE(importCompileCommands14); // #14156
+        TEST_CASE(importCompileCommands15); // #14306
+        TEST_CASE(importCompileCommandsForcedInclude); // -include / /FI force-include
         TEST_CASE(importCompileCommandsArgumentsSection); // Handle arguments section
         TEST_CASE(importCompileCommandsNoCommandSection); // gracefully handles malformed json
+        TEST_CASE(importCompileCommandsDirectoryMissing); // 'directory' field missing
+        TEST_CASE(importCompileCommandsDirectoryInvalid); // 'directory' field not a string
         TEST_CASE(importCppcheckGuiProject);
+        TEST_CASE(importCppcheckGuiProjectDuplicateSuppressions);
+        TEST_CASE(importCppcheckGuiProjectPremiumMisra);
         TEST_CASE(ignorePaths);
+        TEST_CASE(testVcxprojUnicode);
+        TEST_CASE(testCollectArgs1);
+        TEST_CASE(testCollectArgs2);
+        TEST_CASE(testCollectArgs3);
+        TEST_CASE(testCollectArgs4);
+        TEST_CASE(testCollectArgs5);
+        TEST_CASE(testCollectArgs6);
+        TEST_CASE(testCollectArgs7);
+        TEST_CASE(testVcxprojConditions);
     }
 
     void setDefines() const {
         FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
 
-        ImportProject::fsSetDefines(fs, "A");
+        TestImporter::fsSetDefines(fs, "A");
         ASSERT_EQUALS("A=1", fs.defines);
 
-        ImportProject::fsSetDefines(fs, "A;B;");
+        TestImporter::fsSetDefines(fs, "A;B;");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
 
-        ImportProject::fsSetDefines(fs, "A;;B;");
+        TestImporter::fsSetDefines(fs, "A;;B;");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
 
-        ImportProject::fsSetDefines(fs, "A;;B");
+        TestImporter::fsSetDefines(fs, "A;;B");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
     }
 
@@ -91,7 +113,7 @@ class TestImportProject : public TestFixture {
         FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
         std::list<std::string> in(1, "../include");
         std::map<std::string, std::string, cppcheck::stricmp> variables;
-        ImportProject::fsSetIncludePaths(fs, "abc/def/", in, variables);
+        TestImporter::fsSetIncludePaths(fs, "abc/def/", in, variables);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("abc/include/", fs.includePaths.front());
     }
@@ -101,7 +123,7 @@ class TestImportProject : public TestFixture {
         std::list<std::string> in(1, "$(SolutionDir)other");
         std::map<std::string, std::string, cppcheck::stricmp> variables;
         variables["SolutionDir"] = "c:/abc/";
-        ImportProject::fsSetIncludePaths(fs, "/home/fred", in, variables);
+        TestImporter::fsSetIncludePaths(fs, "/home/fred", in, variables);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
     }
@@ -111,11 +133,23 @@ class TestImportProject : public TestFixture {
         std::list<std::string> in(1, "$(SOLUTIONDIR)other");
         std::map<std::string, std::string, cppcheck::stricmp> variables;
         variables["SolutionDir"] = "c:/abc/";
-        ImportProject::fsSetIncludePaths(fs, "/home/fred", in, variables);
+        TestImporter::fsSetIncludePaths(fs, "/home/fred", in, variables);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
     }
 
+    void setRelativePathsInclude() const {
+        const std::string cwd = Path::fromNativeSeparators(Path::getCurrentPath());
+        TestImporter importer;
+        FileSettings fs{cwd + "/sub/a.c", Standards::Language::C, 0};
+        fs.includePaths.push_back(cwd + "/");
+        importer.fileSettings.push_back(fs);
+        importer.setRelativePaths("compile_commands.json");
+        fs = importer.fileSettings.front();
+        ASSERT_EQUALS(".", fs.includePaths.front());
+        ASSERT_EQUALS("sub/a.c", fs.filename());
+    }
+
     void importCompileCommands1() const {
         REDIRECT;
         constexpr char json[] = R"([{
@@ -357,8 +391,69 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS(2, importer.fileSettings.size());
         const FileSettings &fs1 = importer.fileSettings.front();
         const FileSettings &fs2 = importer.fileSettings.back();
-        ASSERT_EQUALS(0, fs1.fileIndex);
-        ASSERT_EQUALS(1, fs2.fileIndex);
+        ASSERT_EQUALS(0, fs1.file.fsFileId());
+        ASSERT_EQUALS(1, fs2.file.fsFileId());
+    }
+
+    void importCompileCommands14() const { // #14156
+        REDIRECT;
+        constexpr char json[] =
+            R"([{
+                "arguments": [
+                  "/usr/bin/g++",
+                  "-DTFS_LINUX_MODULE_NAME=\"tfs_linux\"",
+                  "-g",
+                  "-c",
+                  "cli/main.cpp"
+                ],
+                "directory": "/home/daniel/cppcheck",
+                "file": "/home/daniel/cppcheck/cli/main.cpp",
+                "output": "/home/daniel/cppcheck/cli/main.o"
+            }])";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(1, importer.fileSettings.size());
+        const FileSettings &fs = importer.fileSettings.front();
+        ASSERT_EQUALS("TFS_LINUX_MODULE_NAME=\"tfs_linux\"", fs.defines);
+    }
+
+    void importCompileCommands15() const { // #14306
+        REDIRECT;
+        constexpr char json[] =
+            R"([
+                 {
+                   "directory": "C:\\Users\\abcd\\efg\\hijk",
+                   "command": "gcc \"-Ipath\\123\" \"-c\" test.c",
+                   "file": "test.c",
+                   "output": "test.obj"
+                 }
+               ])";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(1, importer.fileSettings.size());
+        const FileSettings &fs = importer.fileSettings.front();
+        ASSERT_EQUALS(1, fs.includePaths.size());
+        ASSERT_EQUALS("C:/Users/abcd/efg/hijk/path/123/", fs.includePaths.front());
+    }
+
+    void importCompileCommandsForcedInclude() const { // -include / /FI force-include
+        REDIRECT;
+        constexpr char json[] =
+            R"([{
+               "file": "/x/a.c",
+               "directory": "/x",
+               "command": "cc -include prefix.h /FIplatform.h -c a.c"
+            }])";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(1, importer.fileSettings.size());
+        const FileSettings &fs = importer.fileSettings.front();
+        ASSERT_EQUALS(2, fs.forcedIncludes.size());
+        ASSERT_EQUALS("prefix.h", fs.forcedIncludes.front()); // gcc/clang -include
+        ASSERT_EQUALS("platform.h", fs.forcedIncludes.back()); // MSVC/clang-cl /FI
     }
 
     void importCompileCommandsArgumentsSection() const {
@@ -381,7 +476,31 @@ class TestImportProject : public TestFixture {
         TestImporter importer;
         ASSERT_EQUALS(false, importer.importCompileCommands(istr));
         ASSERT_EQUALS(0, importer.fileSettings.size());
-        ASSERT_EQUALS("cppcheck: error: no 'arguments' or 'command' field found in compilation database entry\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS(1, importer.errors.size());
+        ASSERT_EQUALS("no 'arguments' or 'command' field found in compilation database entry", importer.errors[0]);
+    }
+
+    void importCompileCommandsDirectoryMissing() const {
+        REDIRECT;
+        constexpr char json[] = "[ { \"file\": \"src.mm\" } ]";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(false, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(0, importer.fileSettings.size());
+        ASSERT_EQUALS(1, importer.errors.size());
+        ASSERT_EQUALS("'directory' field in compilation database entry missing", importer.errors[0]);
+    }
+
+    void importCompileCommandsDirectoryInvalid() const {
+        REDIRECT;
+        constexpr char json[] = "[ { \"directory\": 123,"
+                                "\"file\": \"src.mm\" } ]";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(false, importer.importCompileCommands(istr));
+        ASSERT_EQUALS(0, importer.fileSettings.size());
+        ASSERT_EQUALS(1, importer.errors.size());
+        ASSERT_EQUALS("'directory' field in compilation database entry is not a string", importer.errors[0]);
     }
 
     void importCppcheckGuiProject() const {
@@ -397,6 +516,7 @@ class TestImportProject : public TestFixture {
                                "    <paths>\n"
                                "        <dir name=\"cli/\"/>\n"
                                "    </paths>\n"
+                               "    <user-include>gcc-macros.h</user-include>\n"
                                "    <exclude>\n"
                                "        <path name=\"gui/temp/\"/>\n"
                                "    </exclude>\n"
@@ -412,9 +532,52 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS("cli/", project.guiProject.pathNames[0]);
         ASSERT_EQUALS(1, s.includePaths.size());
         ASSERT_EQUALS("lib/", s.includePaths.front());
+        ASSERT_EQUALS(1, s.userIncludes.size());
+        ASSERT_EQUALS("gcc-macros.h", s.userIncludes.front());
         ASSERT_EQUALS(true, s.inlineSuppressions);
     }
 
+    void importCppcheckGuiProjectDuplicateSuppressions() const {
+        REDIRECT;
+        constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                               "<project version=\"1\">\n"
+                               "    <root name=\".\"/>\n"
+                               "    <project-name>test test</project-name>\n"
+                               "    <suppressions>\n"
+                               "        <suppression>uninitvar</suppression>\n"
+                               "        <suppression>uninitvar</suppression>\n"
+                               "    </suppressions>\n"
+                               "</project>\n";
+        std::istringstream istr(xml);
+        Settings s;
+        Suppressions supprs;
+        TestImporter project;
+        ASSERT_EQUALS(false, project.importCppcheckGuiProject(istr, s, supprs));
+        ASSERT_EQUALS(1, project.errors.size());
+        ASSERT_EQUALS("suppression 'uninitvar' already exists", project.errors[0]);
+    }
+
+    void importCppcheckGuiProjectPremiumMisra() const {
+        REDIRECT;
+        constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                               "<project>\n"
+                               "    <paths>\n"
+                               "        <dir name=\"m1.c\"/>\n"
+                               "    </paths>\n"
+                               "    <addons>\n"
+                               "        <addon>misra</addon>\n"  // <- Premium: add premium argument misra-c-2012
+                               "    </addons>\n"
+                               "</project>";
+        std::istringstream istr(xml);
+        Settings s;
+        s.premium = true;
+        Suppressions supprs;
+        TestImporter project;
+        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, s, supprs));
+        ASSERT_EQUALS("--misra-c-2012", s.premiumArgs);
+        ASSERT(s.addons.empty());
+    }
+
     void ignorePaths() const {
         FileSettings fs1{"foo/bar", Standards::Language::CPP, 0};
         FileSettings fs2{"qwe/rty", Standards::Language::CPP, 0};
@@ -422,7 +585,7 @@ class TestImportProject : public TestFixture {
         project.fileSettings = {std::move(fs1), std::move(fs2)};
 
         project.ignorePaths({"*foo", "bar*"});
-        ASSERT_EQUALS(2, project.fileSettings.size());
+        ASSERT_EQUALS(1, project.fileSettings.size());
 
         project.ignorePaths({"foo/*"});
         ASSERT_EQUALS(1, project.fileSettings.size());
@@ -432,28 +595,184 @@ class TestImportProject : public TestFixture {
         ASSERT_EQUALS(0, project.fileSettings.size());
     }
 
+    void testVcxprojUnicode() const
+    {
+        const char vcxproj[] = R"-(
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <!-- Only to test that the last configuration entry overwrites this -->
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+</Project>
+)-";
+        tinyxml2::XMLDocument doc;
+        ASSERT_EQUALS(tinyxml2::XML_SUCCESS, doc.Parse(vcxproj, sizeof(vcxproj)));
+        TestImporter project;
+        std::map<std::string, std::string, cppcheck::stricmp> variables;
+        std::vector<TestImporter::SharedItemsProject> cache;
+        ASSERT_EQUALS(project.importVcxproj("test.vcxproj", doc, variables, {}, {}, cache), true);
+        ASSERT_EQUALS(project.fileSettings.size(), 2);
+        ASSERT(project.fileSettings.front().defines.find(";UNICODE=1;") != std::string::npos);
+        ASSERT(project.fileSettings.front().defines.find(";_UNICODE=1") != std::string::npos);
+        ASSERT(project.fileSettings.front().defines.find(";_UNICODE=1;") == std::string::npos); // No duplicates
+        ASSERT_EQUALS(project.fileSettings.front().useMfc, false);
+        ASSERT(project.fileSettings.back().defines.find(";UNICODE=1;") == std::string::npos);
+        ASSERT(project.fileSettings.back().defines.find(";_UNICODE=1") == std::string::npos);
+        ASSERT_EQUALS(project.fileSettings.back().useMfc, true);
+    }
+
+    void testCollectArgs1() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "  gcc -o main main.c  ";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("main.c", args[3]);
+    }
+
+    void testCollectArgs2() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main \"directory with space\"/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory with space/main.c", args[3]);
+    }
+
+    void testCollectArgs3() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main directory\\ with\\ space/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory with space/main.c", args[3]);
+    }
+
+    void testCollectArgs4() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main \'directory with space\'/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory with space/main.c", args[3]);
+    }
+
+    void testCollectArgs5() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main directory_with_quote\\\"/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("directory_with_quote\"/main.c", args[3]);
+    }
+
+    void testCollectArgs6() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main windows\\\\path\\\\main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("", error);
+        ASSERT_EQUALS(4, args.size());
+        ASSERT_EQUALS("gcc", args[0]);
+        ASSERT_EQUALS("-o", args[1]);
+        ASSERT_EQUALS("main", args[2]);
+        ASSERT_EQUALS("windows\\path\\main.c", args[3]);
+    }
+
+    void testCollectArgs7() const
+    {
+        std::vector<std::string> args;
+        const std::string cmd = "gcc -o main \"non-terminated-quote/main.c";
+        const std::string error = TestImporter::collectArgs(cmd, args);
+
+        ASSERT_EQUALS("Missing closing quote in command string", error);
+    }
+
+    void testVcxprojConditions() const
+    {
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(Configuration)'=='Debug'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(Platform)'=='Win32'", "Debug", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("'$(Configuration)'=='Release'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' ", "Debug", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' != 'Debug' ", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition("'$(Configuration)|$(Platform)' == 'Debug|Win32' ", "Debug", "Win32"));
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("!('$(Configuration)|$(Platform)' == 'Debug|Win32' )", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' And '$(Platform)' == 'Win32'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' Or '$(Platform)' == 'Win32'", "Release", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.StartsWith('Debug'))", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.EndsWith('AddressSanitizer'))", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.Contains('Address'))", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.Contains ( 'Address'  ) )", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.Contains('Address')) And '$(Platform)' == 'Win32'", "Debug-AddressSanitizer", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" ($(Configuration.Contains('Address')) ) And ( '$(Platform)' == 'Win32')", "Debug-AddressSanitizer", "Win32"));
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("And", "", ""), std::runtime_error, "Invalid condition: 'And'");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("Or", "", ""), std::runtime_error, "Invalid condition: 'Or'");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("!", "", ""), std::runtime_error, "Invalid condition: '!'");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("'' == '' And ", "", ""), std::runtime_error, "Missing operator");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("('' == ''", "", ""), std::runtime_error, "'(' without closing ')'!");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("'' == '')", "", ""), std::runtime_error, "unmatched ')' in condition '' == '')");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("''", "", ""), std::runtime_error, "Invalid condition: ''''");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("'' == '", "", ""), std::runtime_error, "Can not tokenize condition");
+        ASSERT_THROW_EQUALS(cppcheck::testing::evaluateVcxprojCondition("$(Configuration.Lower())", "", ""), std::runtime_error, "Missing operator");
+        // invalid expression in => no error. We are ok with that as long as we don't crash
+        ASSERT(!cppcheck::testing::evaluateVcxprojCondition("' ' && ' '", "", ""));
+    }
+
     // TODO: test fsParseCommand()
 
-    // TODO: test vcxproj conditions
-    /*
-        <?xml version="1.0" encoding="utf-8"?>
-        <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-        <ItemGroup Label="ProjectConfigurations">
-        <ProjectConfiguration Include="Debug|x64">
-        <Configuration>Debug</Configuration>
-        <Platform>x64</Platform>
-        </ProjectConfiguration>
-        </ItemGroup>
-        <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <ClCompile>
-        <PreprocessorDefinitions>CPPCHECKLIB_IMPORT</PreprocessorDefinitions>
-        </ClCompile>
-        </ItemDefinitionGroup>
-        <ItemGroup>
-        <ClCompile Include="main.c" />
-        </ItemGroup>
-        </Project>
-     */
 };
 
 REGISTER_TEST(TestImportProject)
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
index f8e44e19133..8e523e3d06e 100644
--- a/test/testincompletestatement.cpp
+++ b/test/testincompletestatement.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -22,8 +22,8 @@
 #include "settings.h"
 #include "fixture.h"
 
+#include <cstddef>
 #include <string>
-#include <vector>
 
 class TestIncompleteStatement : public TestFixture {
 public:
@@ -31,17 +31,18 @@ class TestIncompleteStatement : public TestFixture {
 
 private:
     const Settings settings = settingsBuilder().severity(Severity::warning).library("std.cfg").build();
+    const Settings settings_i = settingsBuilder(settings).certainty(Certainty::inconclusive).build();
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool inconclusive = false;
         bool cpp = true;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, options.inconclusive).build();
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
+        const Settings &settings1 = options.inconclusive ? settings_i : settings;
 
         SimpleTokenizer2 tokenizer(settings1, *this, code, options.cpp ? "test.cpp" : "test.c");
 
@@ -49,7 +50,7 @@ class TestIncompleteStatement : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for incomplete statements..
-        CheckOther checkOther(&tokenizer, &settings1, this);
+        CheckOtherImpl checkOther(&tokenizer, settings1, *this);
         checkOther.checkIncompleteStatement();
     }
 
@@ -92,7 +93,7 @@ class TestIncompleteStatement : public TestFixture {
               "{\n"
               "    const char def[] =\n"
               "    \"abc\";\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -101,7 +102,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    \"abc\";\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with string constant. [constStatement]\n", errout_str());
     }
@@ -110,7 +111,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    const char *str[] = { \"abc\" };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -124,7 +125,7 @@ class TestIncompleteStatement : public TestFixture {
               "\"more \"\n"
               "\"world\"\n"
               "};\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -133,7 +134,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    50;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n", errout_str());
     }
@@ -144,7 +145,7 @@ class TestIncompleteStatement : public TestFixture {
               "  1 == (two + three);\n"
               "  2 != (two + three);\n"
               "  (one + two) != (two + three);\n"
-              "}");
+              "}\n");
     }
 
     void test7() { // #9335
@@ -159,7 +160,7 @@ class TestIncompleteStatement : public TestFixture {
               "  for (C c(S); ; ) {\n"
               "    (void)c;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -173,22 +174,38 @@ class TestIncompleteStatement : public TestFixture {
               "    {\n"
               "        { 346.1,114.1 }, { 347.1,111.1 }\n"
               "    };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     void void0() { // #6327
-        check("void f() { (void*)0; }");
+        check("#define assert(x) ((void)0)\n"
+              "void f(int* p) {\n"
+              "    assert(p);\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("void f() { (void*)0; }\n");
+        ASSERT_EQUALS("[test.cpp:1:12]: (warning) Redundant code: Found unused cast in expression '(void*)0'. [constStatement]\n", errout_str());
+
+        check("void f() {\n" // #13148
+              "    static_cast<void>(1);\n"
+              "    static_cast<void>(nullptr);\n"
+              "    (void)NULL;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:22]: (warning) Redundant code: Found unused cast in expression 'static_cast<void>(1)'. [constStatement]\n"
+                      "[test.cpp:3:22]: (warning) Redundant code: Found unused cast in expression 'static_cast<void>(nullptr)'. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast in expression '(void)NULL'. [constStatement]\n",
+                      errout_str());
+
         check("#define X  0\n"
-              "void f() { X; }");
+              "void f() { X; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void intarray() {
-        check("int arr[] = { 100/2, 1*100 };");
+        check("int arr[] = { 100/2, 1*100 };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -196,7 +213,7 @@ class TestIncompleteStatement : public TestFixture {
         check("struct st arr[] = {\n"
               "    { 100/2, 1*100 }\n"
               "    { 90, 70 }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -204,14 +221,14 @@ class TestIncompleteStatement : public TestFixture {
         check("struct st arr[] = {\n"
               "    { 100/2, 1*100 }\n"
               "    { 90, 70 }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void conditionalcall() {
         check("void f() {\n"
               "    0==x ? X() : Y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -219,7 +236,7 @@ class TestIncompleteStatement : public TestFixture {
         // #2462 - C++11 struct initialization
         check("void f() {\n"
               "    ABC abc{1,2,3};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6260 - C++11 array initialization
@@ -227,30 +244,30 @@ class TestIncompleteStatement : public TestFixture {
               "    static const char* a[][2] {\n"
               "        {\"b\", \"\"},\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2482 - false positive for empty struct
-        check("struct A {};");
+        check("struct A {};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4387 - C++11 initializer list
-        check("A::A() : abc{0} {}");
+        check("A::A() : abc{0} {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5042 - C++11 initializer list
-        check("A::A() : abc::def<int>{0} {}");
+        check("A::A() : abc::def<int>{0} {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4503 - vector init
-        check("void f() { vector<int> v{1}; }");
+        check("void f() { vector<int> v{1}; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void returnstruct() {
         check("struct s foo() {\n"
               "    return (struct s){0,0};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4754
@@ -259,19 +276,19 @@ class TestIncompleteStatement : public TestFixture {
               "        {\"hi\", \"there\"},\n"
               "        {\"happy\", \"sad\"}\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct s foo() {\n"
               "  return (struct s){0};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void cast() {
         check("void f() {\n"
               "    ((struct foo *)(0x1234))->xy = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(const std::exception& e) {\n" // #10918
@@ -290,14 +307,14 @@ class TestIncompleteStatement : public TestFixture {
         check("void f() {\n"
               "    int x = 1;\n"
               "    x++, x++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void cpp11init() {
         check("void f() {\n"
               "    int x{1};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> f(int* p) {\n"
@@ -309,7 +326,7 @@ class TestIncompleteStatement : public TestFixture {
     void cpp11init2() {
         check("x<string> handlers{\n"
               "  { \"mode2\", []() { return 2; } },\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -317,33 +334,33 @@ class TestIncompleteStatement : public TestFixture {
         check("struct A { void operator()(int); };\n"
               "void f() {\n"
               "A{}(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class> struct A { void operator()(int); };\n"
               "void f() {\n"
               "A<int>{}(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void block() {
         check("void f() {\n"
               "    ({ do_something(); 0; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "out:\n"
               "    ({ do_something(); 0; });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void mapindex() {
         check("void f() {\n"
               "  map[{\"1\",\"2\"}]=0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -351,7 +368,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void foo(int,const char*,int);\n" // #8827
               "void f(int value) {\n"
               "    foo(42,\"test\",42),(value&42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (warning) Found suspicious operator ',', result is not used. [constStatement]\n", errout_str());
 
         check("int f() {\n" // #11257
@@ -431,22 +448,22 @@ class TestIncompleteStatement : public TestFixture {
               "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
                       "[test.cpp:3:6]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
-                      "[test.cpp:4:5]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
-                      "[test.cpp:5:6]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast in expression '(char)1'. [constStatement]\n"
+                      "[test.cpp:5:6]: (warning) Redundant code: Found unused cast in expression '(char)1'. [constStatement]\n"
                       "[test.cpp:6:5]: (warning, inconclusive) Found suspicious operator '!', result is not used. [constStatement]\n"
                       "[test.cpp:7:6]: (warning, inconclusive) Found suspicious operator '!', result is not used. [constStatement]\n"
-                      "[test.cpp:8:5]: (warning) Redundant code: Found unused cast of expression '!x'. [constStatement]\n"
+                      "[test.cpp:8:5]: (warning) Redundant code: Found unused cast in expression '(unsigned int)!x'. [constStatement]\n"
                       "[test.cpp:9:5]: (warning, inconclusive) Found suspicious operator '~', result is not used. [constStatement]\n",
                       errout_str());
 
-        check("void f1(int x) { x; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f1(int x) { x; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:1:18]: (warning) Unused variable value 'x' [constStatement]\n", errout_str());
 
-        check("void f() { if (Type t; g(t)) {} }"); // #9776
+        check("void f() { if (Type t; g(t)) {} }\n"); // #9776
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { static_cast<unsigned>(x); }");
-        ASSERT_EQUALS("[test.cpp:1:38]: (warning) Redundant code: Found unused cast of expression 'x'. [constStatement]\n", errout_str());
+        check("void f(int x) { static_cast<unsigned>(x); }\n");
+        ASSERT_EQUALS("[test.cpp:1:38]: (warning) Redundant code: Found unused cast in expression 'static_cast<unsigned int>(x)'. [constStatement]\n", errout_str());
 
         check("void f(int x, int* p) {\n"
               "    static_cast<void>(x);\n"
@@ -456,7 +473,7 @@ class TestIncompleteStatement : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { false; }"); // #10856
+        check("void f() { false; }\n"); // #10856
         ASSERT_EQUALS("[test.cpp:1:12]: (warning) Redundant code: Found a statement that begins with bool constant. [constStatement]\n", errout_str());
 
         check("void f(int i) {\n"
@@ -464,9 +481,9 @@ class TestIncompleteStatement : public TestFixture {
               "    static_cast<float>((char)i);\n"
               "    (char)static_cast<float>(i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n"
-                      "[test.cpp:3:23]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n"
-                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n",
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found unused cast in expression '(float)(char)i'. [constStatement]\n"
+                      "[test.cpp:3:23]: (warning) Redundant code: Found unused cast in expression 'static_cast<float>((char)i)'. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning) Redundant code: Found unused cast in expression '(char)static_cast<float>(i)'. [constStatement]\n",
                       errout_str());
 
         check("namespace M {\n"
@@ -475,7 +492,7 @@ class TestIncompleteStatement : public TestFixture {
               "void f(int i) {\n"
               "    (M::N::T)i;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Redundant code: Found unused cast in expression '(T)i'. [constStatement]\n", errout_str());
 
         check("void f(int (g)(int a, int b)) {\n" // #10873
               "    int p = 0, q = 1;\n"
@@ -527,7 +544,7 @@ class TestIncompleteStatement : public TestFixture {
               "    for (L\"y\"; ;) {}\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Unused variable value 'i' [constStatement]\n"
-                      "[test.cpp:3:10]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n"
+                      "[test.cpp:3:10]: (warning) Redundant code: Found unused cast in expression '(long)i'. [constStatement]\n"
                       "[test.cpp:4:10]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n"
                       "[test.cpp:5:10]: (warning) Redundant code: Found a statement that begins with bool constant. [constStatement]\n"
                       "[test.cpp:6:10]: (warning) Redundant code: Found a statement that begins with character constant. [constStatement]\n"
@@ -695,8 +712,8 @@ class TestIncompleteStatement : public TestFixture {
               "    NULL;\n"
               "    nullptr;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found a statement that begins with NULL constant. [constStatement]\n"
-                      "[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with NULL constant. [constStatement]\n",
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found a statement that begins with null constant. [constStatement]\n"
+                      "[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with null constant. [constStatement]\n",
                       errout_str());
 
         check("struct S { int i; };\n" // #6504
@@ -731,59 +748,90 @@ class TestIncompleteStatement : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found unused lambda. [constStatement]\n",
                       errout_str());
+
+        check("int main() {\n" // #13177
+              "    sizeof(int);\n"
+              "    alignof(long double*);\n"
+              "    noexcept(int());\n"
+              "    typeid(int);\n"
+              "    return(0);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (warning) Redundant code: Found unused 'sizeof' expression. [constStatement]\n"
+                      "[test.cpp:3:12]: (warning) Redundant code: Found unused 'alignof' expression. [constStatement]\n"
+                      "[test.cpp:4:13]: (warning) Redundant code: Found unused 'noexcept' expression. [constStatement]\n"
+                      "[test.cpp:5:11]: (warning) Redundant code: Found unused 'typeid' expression. [constStatement]\n",
+                      errout_str());
+
+        check("void f() {\n" // #14044
+              "    g<sizeof(wchar_t)>();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S;\n" // #14664
+              "S* a[1];\n"
+              "void f() {\n"
+              "    a[0];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:6]: (warning) Redundant code: Found unused array access. [constStatement]\n",
+                      errout_str());
+
+        check("int f(int i) {\n" // #14889
+              "    return i ? 8 : ({ int x = 2; x; });\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void vardecl() {
         // #8984
-        check("void f() { a::b *c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { a::b *c = d(); }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> *c; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { std::vector<b> *c; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a::b &c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { a::b &c = d(); }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> &c; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { std::vector<b> &c; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a::b &&c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { a::b &&c = d(); }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> &&c; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { std::vector<b> &&c; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a, * const * b; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { char * const * a, * const * b; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a = 0, * volatile restrict * b; }", dinit(CheckOptions, $.inconclusive = true, $.cpp = false));
+        check("void f() { char * const * a = 0, * volatile restrict * b; }\n", dinit(CheckOptions, $.inconclusive = true, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a = 0, * volatile const * b; }", dinit(CheckOptions, $.inconclusive = true));
+        check("void f() { char * const * a = 0, * volatile const * b; }\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
     void archive() {
         check("void f(Archive &ar) {\n"
               "  ar & x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int ar) {\n"
               "  ar & x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:6]: (warning, inconclusive) Found suspicious operator '&', result is not used. [constStatement]\n", errout_str());
     }
 
     void ast() {
-        check("struct c { void a() const { for (int x=0; x;); } };", dinit(CheckOptions, $.inconclusive = true));
+        check("struct c { void a() const { for (int x=0; x;); } };\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
     void oror() {
         check("void foo() {\n"
               "    params_given (params, \"overrides\") || (overrides = \"1\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::ifstream& file) {\n" // #10930
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
index 009129c5dc1..61c36a8e7dd 100644
--- a/test/testinternal.cpp
+++ b/test/testinternal.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -56,8 +56,8 @@ class TestInternal : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckInternal>(tokenizer, this);
+        CheckInternal check;
+        runChecks(check, tokenizer, *this);
     }
 
     void simplePatternInTokenMatch() {
diff --git a/test/testio.cpp b/test/testio.cpp
index 61a78430821..ad95345e1fd 100644
--- a/test/testio.cpp
+++ b/test/testio.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -35,6 +35,7 @@ class TestIO : public TestFixture {
     /*const*/ Settings settings1 = settingsBuilder().library("std.cfg").library("windows.cfg").library("qt.cfg").severity(Severity::warning).severity(Severity::style).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(coutCerrMisusage);
 
         TEST_CASE(wrongMode_simple);
@@ -43,17 +44,22 @@ class TestIO : public TestFixture {
         TEST_CASE(fileIOwithoutPositioning);
         TEST_CASE(seekOnAppendedFile);
         TEST_CASE(fflushOnInputStream);
+        TEST_CASE(ftellCompatibility);
         TEST_CASE(incompatibleFileOpen);
+        TEST_CASE(testWrongfeofUsage); // #958
 
         TEST_CASE(testScanf1); // Scanf without field limiters
         TEST_CASE(testScanf2);
         TEST_CASE(testScanf3); // #3494
         TEST_CASE(testScanf4); // #ticket 2553
         TEST_CASE(testScanf5); // #10632
+        TEST_CASE(testScanf6);
 
+        mNewTemplate = false;
         TEST_CASE(testScanfArgument);
         TEST_CASE(testPrintfArgument);
         TEST_CASE(testPrintfArgumentVariables);
+        mNewTemplate = true;
         TEST_CASE(testPosixPrintfScanfParameterPosition);  // #4900
 
         TEST_CASE(testMicrosoftPrintfArgument); // ticket #4902
@@ -83,7 +89,6 @@ class TestIO : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool inconclusive = false;
         bool portability = false;
         Platform::Type platform = Platform::Type::Unspecified;
@@ -107,61 +112,62 @@ class TestIO : public TestFixture {
 
         // Check..
         if (options.onlyFormatStr) {
-            CheckIO checkIO(&tokenizer, &settings1, this);
+            CheckIOImpl checkIO(&tokenizer, settings1, *this);
             checkIO.checkWrongPrintfScanfArguments();
             return;
         }
-        runChecks<CheckIO>(tokenizer, this);
+        CheckIO check;
+        runChecks(check, tokenizer, *this);
     }
 
     void coutCerrMisusage() {
         check(
             "void foo() {\n"
             "  std::cout << std::cout;\n"
-            "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid usage of output stream: '<< std::cout'.\n", errout_str());
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cout'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << (std::cout);\n"
-            "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid usage of output stream: '<< std::cout'.\n", errout_str());
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cout'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << \"xyz\" << std::cout;\n"
-            "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid usage of output stream: '<< std::cout'.\n", errout_str());
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cout'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo(int i) {\n"
             "  std::cout << i << std::cerr;\n"
-            "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid usage of output stream: '<< std::cerr'.\n", errout_str());
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:3]: (error) Invalid usage of output stream: '<< std::cerr'. [coutCerrMisusage]\n", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << \"xyz\";\n"
             "  std::cout << \"xyz\";\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << std::cout.good();\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "    unknownObject << std::cout;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  MACRO(std::cout <<, << std::cout)\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -174,103 +180,103 @@ class TestIO : public TestFixture {
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfopen(name, L\"r\");\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfopen(name, _T(\"r\"));\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfopen(name, _T(\"r\"));\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _wfopen_s(&f, name, L\"r\");\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _tfopen_s(&f, name, _T(\"r\"));\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _tfopen_s(&f, name, _T(\"r\"));\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"r+\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfopen(name, L\"r+\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfopen(name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfopen(name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _wfopen_s(&f, name, L\"r+\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _tfopen_s(&f, name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    _tfopen_s(&f, name, _T(\"r+\"));\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = tmpfile();\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
 
         // Write mode
@@ -279,19 +285,19 @@ class TestIO : public TestFixture {
               "    fwrite(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Read operation on a file that was opened only for writing.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Read operation on a file that was opened only for writing. [readWriteOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"w+\");\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = tmpfile();\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Append mode
@@ -300,14 +306,14 @@ class TestIO : public TestFixture {
               "    fwrite(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Repositioning operation performed on a file opened in append mode has no effect.\n"
-                      "[test.cpp:5]: (error) Read operation on a file that was opened only for writing.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) Repositioning operation performed on a file opened in append mode has no effect. [seekOnAppendedFile]\n"
+                      "[test.cpp:5:5]: (error) Read operation on a file that was opened only for writing. [readWriteOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"a+\");\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Variable declared locally
@@ -315,8 +321,8 @@ class TestIO : public TestFixture {
               "    FILE* f = fopen(name, \"r\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
               "    fclose(f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         // Call unknown function
         check("void foo(FILE*& f) {\n"
@@ -324,60 +330,60 @@ class TestIO : public TestFixture {
               "    fwrite(buffer, 5, 6, f);\n"
               "    bar(f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // freopen and tmpfile
         check("void foo(FILE*& f) {\n"
               "    f = freopen(name, \"r\", f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfreopen(name, L\"r\", f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen(name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen(name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfreopen_s(&f, name, L\"r\", f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen_s(&f, name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _tfreopen_s(&f, name, _T(\"r\"), f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Write operation on a file that was opened only for reading. [writeReadOnlyFile]\n", errout_str());
 
         // Crash tests
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, mode);\n" // No assertion failure (#3830)
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void fopen(std::string const &filepath, std::string const &mode);"); // #3832
+        check("void fopen(std::string const &filepath, std::string const &mode);\n"); // #3832
     }
 
     void wrongMode_complex() {
@@ -386,7 +392,7 @@ class TestIO : public TestFixture {
               "    else  f = fopen(name, \"r\");\n"
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -395,15 +401,15 @@ class TestIO : public TestFixture {
               "    else  f = fopen(name, \"r\");\n"
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(name, \"w\");\n"
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Read operation on a file that was opened only for writing.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:11]: (error) Read operation on a file that was opened only for writing. [readWriteOnlyFile]\n", errout_str());
     }
 
     void useClosedFile() {
@@ -415,13 +421,13 @@ class TestIO : public TestFixture {
               "    ungetc('a', f);\n"
               "    ungetwc(L'a', f);\n"
               "    rewind(f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Used file that is not opened.\n"
-                      "[test.cpp:4]: (error) Used file that is not opened.\n"
-                      "[test.cpp:5]: (error) Used file that is not opened.\n"
-                      "[test.cpp:6]: (error) Used file that is not opened.\n"
-                      "[test.cpp:7]: (error) Used file that is not opened.\n"
-                      "[test.cpp:8]: (error) Used file that is not opened.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Used file that is not opened. [useClosedFile]\n"
+                      "[test.cpp:4:5]: (error) Used file that is not opened. [useClosedFile]\n"
+                      "[test.cpp:5:5]: (error) Used file that is not opened. [useClosedFile]\n"
+                      "[test.cpp:6:5]: (error) Used file that is not opened. [useClosedFile]\n"
+                      "[test.cpp:7:5]: (error) Used file that is not opened. [useClosedFile]\n"
+                      "[test.cpp:8:5]: (error) Used file that is not opened. [useClosedFile]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    if(!ferror(f)) {\n"
@@ -429,40 +435,40 @@ class TestIO : public TestFixture {
               "        return;"
               "    }\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    fclose(f);\n"
               "    f = fopen(name, \"r\");\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"r\");\n"
               "    f = g;\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f;\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Used file that is not opened.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Used file that is not opened. [useClosedFile]\n", errout_str());
 
         check("void foo() {\n"
               "    FILE* f(stdout);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #3965
               "    FILE* f[3];\n"
               "    f[0] = fopen(name, mode);\n"
               "    fclose(f[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4368: multiple functions
@@ -485,7 +491,7 @@ class TestIO : public TestFixture {
               "  dump();\n"
               "  close();\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static FILE *fp = NULL;\n"
@@ -499,8 +505,8 @@ class TestIO : public TestFixture {
               "{\n"
               "  fclose(fp);\n"
               "  fprintf(fp, \"Here's the output.\\n\");\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:11]: (error) Used file that is not opened.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:11:3]: (error) Used file that is not opened. [useClosedFile]\n", errout_str());
 
         // #4466
         check("void chdcd_parse_nero(FILE *infile) {\n"
@@ -512,7 +518,7 @@ class TestIO : public TestFixture {
               "            fclose(infile);\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void chdcd_parse_nero(FILE *infile) {\n"
@@ -524,7 +530,7 @@ class TestIO : public TestFixture {
               "            fclose(infile);\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4649
@@ -534,15 +540,37 @@ class TestIO : public TestFixture {
               "    a.f2 = fopen(name,mode);\n"
               "    fclose(a.f1);\n"
               "    fclose(a.f2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #1473
         check("void foo() {\n"
               "    FILE *a = fopen(\"aa\", \"r\");\n"
               "    while (fclose(a)) {}\n"
-              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Used file that is not opened.\n", "", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (warning) fclose() used as loop condition may skip loop body or double-close file handle. [fcloseInLoopCondition]\n", errout_str());
+
+        check("void foo() {\n"
+              "    FILE *a = fopen(\"aa\", \"r\");\n"
+              "    while (fclose(a)) {\n"
+              "         break;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo() {\n"
+              "    FILE *a = fopen(\"aa\", \"r\");\n"
+              "    while (fclose(a)) {\n"
+              "        a = fopen(\"aa\", \"r\");\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo() {\n"
+              "    FILE *a = fopen(\"aa\", \"r\");\n"
+              "    do {} while (fclose(a));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (warning) fclose() used as loop condition may skip loop body or double-close file handle. [fcloseInLoopCondition]\n", errout_str());
 
         // #6823
         check("void foo() {\n"
@@ -551,7 +579,7 @@ class TestIO : public TestFixture {
               "    f[1] = fopen(\"2\", \"w\");\n"
               "    fclose(f[0]);\n"
               "    fclose(f[1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #12236
@@ -567,57 +595,57 @@ class TestIO : public TestFixture {
         check("void foo(FILE* f) {\n"
               "    fwrite(buffer, 5, 6, f);\n"
               "    fread(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         check("void foo(FILE* f, bool read) {\n"
               "    if(read)\n"
               "        fread(buffer, 5, 6, f);\n"
               "    else\n"
               "        fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fflush(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    rewind(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fsetpos(f, pos);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    fseek(f, 0, SEEK_SET);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE* f) {\n"
               "    fread(buffer, 5, 6, f);\n"
               "    long pos = ftell(f);\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         // #6452 - member functions
         check("class FileStream {\n"
@@ -629,7 +657,7 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(aboutToOverwrite.data(), 1, bufferLength, d->file);\n"
               "    seek(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class FileStream {\n"
@@ -640,7 +668,7 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(aboutToOverwrite.data(), 1, bufferLength, d->file);\n"
               "    unknown(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class FileStream {\n"
@@ -652,8 +680,8 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(aboutToOverwrite.data(), 1, bufferLength, d->file);\n"
               "    known(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:9:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
 
         check("class FileStream {\n"
               "    void insert(const ByteVector &data, ulong start);\n"
@@ -664,33 +692,50 @@ class TestIO : public TestFixture {
               "    int bytesRead = fread(X::data(), 1, bufferLength, d->file);\n"
               "    known(writePosition);\n"
               "    fwrite(X::data(), sizeof(char), buffer.size(), d->file);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:9:5]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour. [IOWithoutPositioning]\n", errout_str());
+
+        check("struct MemStream {\n"
+              "    char buf[1024];\n"
+              "    int pos = 0;\n"
+              "    void fwrite(const void *ptr, size_t n) { memcpy(buf + pos, ptr, n); pos += (int)n; }\n"
+              "};\n"
+              "struct FileStream {\n"
+              "    FILE *fp;\n"
+              "    size_t _fread(void *ptr, size_t n) { return ::fread(ptr, 1, n, fp); }\n"
+              "    size_t fread(void *ptr, size_t n) { return _fread(ptr, n); }\n"
+              "    void copy_to(MemStream *dst, size_t n) {\n"
+              "        char tmp[256];\n"
+              "        fread(tmp, n);\n"
+              "        dst->fwrite(tmp, n);\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void seekOnAppendedFile() {
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"a+\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"w\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"a\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Repositioning operation performed on a file opened in append mode has no effect.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Repositioning operation performed on a file opened in append mode has no effect. [seekOnAppendedFile]\n", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"a\");\n"
               "    fflush(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #5578
 
         check("void foo() {\n"
@@ -698,38 +743,54 @@ class TestIO : public TestFixture {
               "    fclose(f);\n"
               "    f = fopen(\"\", \"r\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #6566
     }
 
+    void ftellCompatibility() {
+
+        check("void foo() {\n"
+              "     FILE *f = fopen(\"\", \"rt\");\n"
+              "     if (f)\n"
+              "     {\n"
+              "         extern long position;\n"
+              "         fseek(f, 0, SEEK_END);\n"
+              "         position = ftell(f);\n"
+              "         fclose(f);\n"
+              "     }\n"
+              "}\n", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("[test.cpp:7:21]: (portability) ftell() result is unspecified when file is opened in mode \"t\" [ftellTextModeFile]\n", errout_str());
+    }
+
+
     void fflushOnInputStream() {
         check("void foo()\n"
               "{\n"
               "    fflush(stdin);\n"
-              "}", dinit(CheckOptions, $.portability = true));
-        ASSERT_EQUALS("[test.cpp:3]: (portability) fflush() called on input stream 'stdin' may result in undefined behaviour on non-linux systems.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("[test.cpp:3:5]: (portability) fflush() called on input stream 'stdin' may result in undefined behaviour on non-linux systems. [fflushOnInputStream]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    fflush(stdout);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(path, \"r\");\n"
               "    fflush(f);\n"
-              "}", dinit(CheckOptions, $.portability = true));
-        ASSERT_EQUALS("[test.cpp:3]: (portability) fflush() called on input stream 'f' may result in undefined behaviour on non-linux systems.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("[test.cpp:3:5]: (portability) fflush() called on input stream 'f' may result in undefined behaviour on non-linux systems. [fflushOnInputStream]\n", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(path, \"w\");\n"
               "    fflush(f);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    fflush(f);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -737,8 +798,57 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    FILE *f1 = fopen(\"tmp\", \"wt\");\n"
               "    FILE *f2 = fopen(\"tmp\", \"rt\");\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) The file '\"tmp\"' is opened for read and write access at the same time on different streams\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:16]: (warning) The file '\"tmp\"' is opened for read and write access at the same time on different streams [incompatibleFileOpen]\n", errout_str());
+    }
+
+    void testWrongfeofUsage() { // ticket #958
+        check("void foo(FILE * fp) {\n"
+              "  while (!feof(fp)) \n"
+              "  {\n"
+              "     char line[100];\n"
+              "     fgets(line, sizeof(line), fp);\n"
+              "     dostuff(line);\n"
+              "  }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (warning) Using feof() as a loop condition causes the last line to be processed twice. [wrongfeofUsage]\n", errout_str());
+
+        check("int foo(FILE *fp) {\n"
+              "  char line[100];\n"
+              "  while (fgets(line, sizeof(line), fp)) {}\n"
+              "  if (!feof(fp))\n"
+              "    return 1;\n"
+              "  return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo(FILE *fp){\n"
+              "  char line[100];\n"
+              "  fgets(line, sizeof(line), fp);\n"
+              "  while (!feof(fp)){\n"
+              "    dostuff(line);\n"
+              "    fgets(line, sizeof(line), fp);"
+              "  }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo(FILE *fp) {\n"
+              "  char line[100];\n"
+              "  do {\n"
+              "    fgets(line, sizeof(line), fp);\n"
+              "    dostuff(line);\n"
+              "  } while (!feof(fp));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (warning) Using feof() as a loop condition causes the last line to be processed twice. [wrongfeofUsage]\n", errout_str());
+
+        check("void foo(FILE *fp) {\n"
+              "  char line[100];\n"
+              "  do {\n"
+              "    dostuff(line);\n"
+              "    fgets(line, sizeof(line), fp);\n"
+              "  } while (!feof(fp));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -752,12 +862,12 @@ class TestIO : public TestFixture {
               "    sscanf(foo, \"%[^~]\", bar);\n"
               "    scanf(\"%dx%s\", &b, bar);\n"
               "    fclose(file);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) fscanf() without field width limits can crash with huge input data.\n"
-                      "[test.cpp:5]: (warning) scanf() without field width limits can crash with huge input data.\n"
-                      "[test.cpp:6]: (warning) scanf() without field width limits can crash with huge input data.\n"
-                      "[test.cpp:7]: (warning) sscanf() without field width limits can crash with huge input data.\n"
-                      "[test.cpp:8]: (warning) scanf() without field width limits can crash with huge input data.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (warning) fscanf() without field width limits can crash with huge input data. [invalidscanf]\n"
+                      "[test.cpp:5:9]: (warning) scanf() without field width limits can crash with huge input data. [invalidscanf]\n"
+                      "[test.cpp:6:9]: (warning) scanf() without field width limits can crash with huge input data. [invalidscanf]\n"
+                      "[test.cpp:7:5]: (warning) sscanf() without field width limits can crash with huge input data. [invalidscanf]\n"
+                      "[test.cpp:8:5]: (warning) scanf() without field width limits can crash with huge input data. [invalidscanf]\n", errout_str());
     }
 
     void testScanf2() {
@@ -768,8 +878,8 @@ class TestIO : public TestFixture {
               "    scanf(\"aa%d\", &a);\n" // No %s
               "    scanf(\"aa%ld\", &a);\n" // No %s
               "    scanf(\"%*[^~]\");\n" // Ignore input
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) scanf format string requires 0 parameters but 1 is given.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) scanf format string requires 0 parameters but 1 is given. [wrongPrintfScanfArgNum]\n", errout_str());
     }
 
     void testScanf3() { // ticket #3494
@@ -778,8 +888,8 @@ class TestIO : public TestFixture {
               "  scanf(\"%7c\", str);\n"
               "  scanf(\"%8c\", str);\n"
               "  scanf(\"%9c\", str);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Width 9 given in format string (no. 1) is larger than destination buffer 'str[8]', use %8c to prevent overflowing it.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:3]: (error) Width 9 given in format string (no. 1) is larger than destination buffer 'str[8]', use %8c to prevent overflowing it. [invalidScanfFormatWidth]\n", errout_str());
     }
 
     void testScanf4() { // ticket #2553
@@ -787,22 +897,30 @@ class TestIO : public TestFixture {
               "{\n"
               "  char str [8];\n"
               "  scanf (\"%70s\",str);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Width 70 given in format string (no. 1) is larger than destination buffer 'str[8]', use %7s to prevent overflowing it.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:3]: (error) Width 70 given in format string (no. 1) is larger than destination buffer 'str[8]', use %7s to prevent overflowing it. [invalidScanfFormatWidth]\n", errout_str());
     }
 
     void testScanf5() { // #10632
         check("char s1[42], s2[42];\n"
               "void test() {\n"
               "    scanf(\"%42s%42[a-z]\", s1, s2);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Width 42 given in format string (no. 1) is larger than destination buffer 's1[42]', use %41s to prevent overflowing it.\n"
-                      "[test.cpp:3]: (error) Width 42 given in format string (no. 2) is larger than destination buffer 's2[42]', use %41[a-z] to prevent overflowing it.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Width 42 given in format string (no. 1) is larger than destination buffer 's1[42]', use %41s to prevent overflowing it. [invalidScanfFormatWidth]\n"
+                      "[test.cpp:3:5]: (error) Width 42 given in format string (no. 2) is larger than destination buffer 's2[42]', use %41[a-z] to prevent overflowing it. [invalidScanfFormatWidth]\n", errout_str());
+    }
+
+    void testScanf6() {
+        ASSERT_NO_THROW(check("int f(const char *p) {\n"
+                              "        char a[3];\n"
+                              "        return sscanf(p, \"%02s\", a);\n"
+                              "}\n"));
+        ASSERT_EQUALS("", errout_str());
     }
 
 
 #define TEST_SCANF_CODE(format, type) \
-    "void f(){" type " x; scanf(\"" format "\", &x);}"
+    "void f(){" type " x; scanf(\"" format "\", &x);}\n"
 
 #define TEST_SCANF_ERR(format, formatStr, type) \
     "[test.c:1]: (warning) " format " in format string (no. 1) requires '" formatStr " *' but the argument type is '" type " *'.\n"
@@ -817,7 +935,7 @@ class TestIO : public TestFixture {
     TEST_SCANF_ERR_AKA_("test.cpp", format, formatStr, type, akaType)
 
 #define TEST_PRINTF_CODE(format, type) \
-    "void f(" type " x){printf(\"" format "\", x);}"
+    "void f(" type " x){printf(\"" format "\", x);}\n"
 
 #define TEST_PRINTF_ERR(format, requiredType, actualType) \
     "[test.c:1]: (warning) " format " in format string (no. 1) requires '" requiredType "' but the argument type is '" actualType "'.\n"
@@ -956,7 +1074,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%*1x %1x %29s\", &count, KeyName);\n" // #3373
               "    fscanf(f, \"%7ms\", &ref);\n" // #3461
               "    sscanf(ip_port, \"%*[^:]:%4d\", &port);\n" // #3468
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -964,7 +1082,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%1d\", &foo, &bar);\n"
               "    fscanf(bar, \"%1d\", &foo, &bar);\n"
               "    scanf(\"%*1x %1x %29s\", &count, KeyName, foo);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) scanf format string requires 0 parameters but 1 is given.\n"
                       "[test.cpp:3]: (warning) scanf format string requires 1 parameter but 2 are given.\n"
                       "[test.cpp:4]: (warning) fscanf format string requires 1 parameter but 2 are given.\n"
@@ -975,7 +1093,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%1u%1u\", bar());\n"
               "    sscanf(bar, \"%1d%1d\", &foo);\n"
               "    scanf(\"%*1x %1x %29s\", &count);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (error) scanf format string requires 1 parameter but only 0 are given.\n"
                       "[test.cpp:3]: (error) scanf format string requires 2 parameters but only 1 is given.\n"
                       "[test.cpp:4]: (error) sscanf format string requires 2 parameters but only 1 is given.\n"
@@ -987,7 +1105,7 @@ class TestIO : public TestFixture {
               "    sscanf(input, \"%3s\", output);\n"
               "    sscanf(input, \"%4s\", output);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6]: (error) Width 5 given in format string (no. 1) is larger than destination buffer 'output[5]', use %4s to prevent overflowing it.\n", errout_str());
 
         check("void foo() {\n"
@@ -997,7 +1115,7 @@ class TestIO : public TestFixture {
               "    sscanf(input, \"%3s\", output);\n"
               "    sscanf(input, \"%4s\", output);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:5]: (warning, inconclusive) Width 3 given in format string (no. 1) is smaller than destination buffer 'output[5]'.\n"
                       "[test.cpp:7]: (error) Width 5 given in format string (no. 1) is larger than destination buffer 'output[5]', use %4s to prevent overflowing it.\n"
                       "[test.cpp:4]: (warning) sscanf() without field width limits can crash with huge input data.\n", errout_str());
@@ -1009,7 +1127,7 @@ class TestIO : public TestFixture {
               "    bufT projectId= {0};\n"
               "    const int scanrc=sscanf(line, \"Project(\\\"{%36s}\\\")\", projectId);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:6]: (warning, inconclusive) Width 36 given in format string (no. 1) is smaller than destination buffer 'projectId[2048]'.\n", errout_str());
 
         check("void foo(unsigned int i) {\n"
@@ -1022,7 +1140,7 @@ class TestIO : public TestFixture {
               "  scanf(\"%t\", &i);\n"
               "  scanf(\"%L\", &i);\n"
               "  scanf(\"%I\", &i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) 'h' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:3]: (warning) 'hh' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:4]: (warning) 'l' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
@@ -1078,13 +1196,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%u\", \"s3\");\n"
               "    scanf(\"%u\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 1) requires 'unsigned int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%u\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 1) requires 'unsigned int *' but the argument type is 'signed long'.\n", errout_str());
 
         TEST_SCANF_WARN("%lu","unsigned long","bool");
@@ -1466,13 +1584,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%Ld\", \"s3\");\n"
               "    scanf(\"%Ld\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Ld in format string (no. 1) requires 'long long *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %Ld in format string (no. 1) requires 'long long *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(int i) {\n"
               "    scanf(\"%Ld\", i);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Ld in format string (no. 1) requires 'long long *' but the argument type is 'signed int'.\n", errout_str());
 
         TEST_SCANF_WARN("%ju", "uintmax_t", "bool");
@@ -1943,13 +2061,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%d\", \"s3\");\n"
               "    scanf(\"%d\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %d in format string (no. 1) requires 'int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%d\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 1) requires 'int *' but the argument type is 'signed long'.\n", errout_str());
 
         TEST_SCANF_WARN("%x", "unsigned int", "bool");
@@ -1987,13 +2105,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%x\", \"s3\");\n"
               "    scanf(\"%x\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %x in format string (no. 1) requires 'unsigned int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %x in format string (no. 1) requires 'unsigned int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%x\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %x in format string (no. 1) requires 'unsigned int *' but the argument type is 'signed long'.\n", errout_str());
 
         TEST_SCANF_WARN("%f", "float", "bool");
@@ -2027,13 +2145,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%f\", \"s3\");\n"
               "    scanf(\"%f\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'float *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 1) requires 'float *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(float f) {\n"
               "    scanf(\"%f\", f);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'float *' but the argument type is 'float'.\n", errout_str());
 
         TEST_SCANF_WARN("%lf", "double", "bool");
@@ -2123,13 +2241,13 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%n\", \"s3\");\n"
               "    scanf(\"%n\", L\"s5W\");\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("void foo(long l) {\n"
               "    scanf(\"%n\", l);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'signed long'.\n", errout_str());
 
         check("void g() {\n" // #5104
@@ -2143,7 +2261,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%lf\",&v4[0]);\n"
               "    myvector<char *> v5(1);\n"
               "    scanf(\"%10s\",v5[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -2175,7 +2293,7 @@ class TestIO : public TestFixture {
             check("void g() {\n"
                   "    const char c[]=\"42\";\n"
                   "    scanf(\"%s\", c);\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:3]: (warning) %s in format string (no. 1) requires a 'char *' but the argument type is 'const char *'.\n"
                           "[test.cpp:3]: (warning) scanf() without field width limits can crash with huge input data.\n", errout_str());
         }
@@ -2184,6 +2302,12 @@ class TestIO : public TestFixture {
               "    scanf(\"%i\", \"abc\" + 1);\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %i in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n", errout_str());
+
+        check("struct S { unsigned char a[1]; };\n" // #14302
+              "void f(S s) {\n"
+              "    scanf(\"%hhu\", s.a);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testPrintfArgument() {
@@ -2197,7 +2321,7 @@ class TestIO : public TestFixture {
               "    snprintf(str,10,\"%u%s\");\n"
               "    sprintf(string1, \"%-*.*s\", 32, string2);\n" // #3364
               "    snprintf(a, 9, \"%s%d\", \"11223344\");\n" // #3655
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (error) printf format string requires 1 parameter but only 0 are given.\n"
                       "[test.cpp:3]: (error) printf format string requires 2 parameters but only 1 is given.\n"
                       "[test.cpp:4]: (error) printf format string requires 3 parameters but only 2 are given.\n"
@@ -2212,7 +2336,7 @@ class TestIO : public TestFixture {
               "    printf(\"\", 0);\n"
               "    printf(\"%i\", 123, bar());\n"
               "    printf(\"%i%s\", 0, bar(), 43123);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) printf format string requires 0 parameters but 1 is given.\n"
                       "[test.cpp:3]: (warning) printf format string requires 1 parameter but 2 are given.\n"
                       "[test.cpp:4]: (warning) printf format string requires 2 parameters but 3 are given.\n", errout_str());
@@ -2222,7 +2346,7 @@ class TestIO : public TestFixture {
               "    swprintf(string1, L\"%s%s\", L\"a\", string2);\n" // MSVC implementation
               "    swprintf(string1, 6, L\"%i\", 32, string2);\n" // Standard implementation
               "    swprintf(string1, 6, L\"%i%s\", 32, string2);\n" // Standard implementation
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) swprintf format string requires 1 parameter but 2 are given.\n"
                       "[test.cpp:4]: (warning) swprintf format string requires 1 parameter but 2 are given.\n", errout_str());
 
@@ -2239,7 +2363,7 @@ class TestIO : public TestFixture {
               "    printf(\"string: %.*s\", len, string);\n" // #3311
               "    fprintf(stderr, \"%*cText.\", indent, ' ');\n" // #3313
               "    sprintf(string1, \"%*\", 32);\n" // #3364
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* s, const char* s2, std::string s3, int i) {\n"
@@ -2249,7 +2373,7 @@ class TestIO : public TestFixture {
               "    printf(\"%s\", s3);\n"
               "    printf(\"%s\", \"s4\");\n"
               "    printf(\"%u\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'signed int'.\n"
                       "[test.cpp:4]: (warning) %s in format string (no. 2) requires 'char *' but the argument type is 'signed int'.\n"
                       "[test.cpp:5]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'std::string'.\n"
@@ -2262,7 +2386,7 @@ class TestIO : public TestFixture {
               "    printf(\"%jo\", s3);\n"
               "    printf(\"%jx\", i);\n"
               "    printf(\"%jX\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'char *'.\n"
                       "[test.cpp:3]: (warning) %ji in format string (no. 1) requires 'intmax_t' but the argument type is 'char *'.\n"
                       "[test.cpp:4]: (warning) %ju in format string (no. 1) requires 'uintmax_t' but the argument type is 'const char *'.\n"
@@ -2276,7 +2400,7 @@ class TestIO : public TestFixture {
               "    printf(\"%jd\", ui);\n"
               "    printf(\"%jd\", s3);\n"
               "    printf(\"%jd\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %ju in format string (no. 1) requires 'uintmax_t' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:4]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:5]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'std::string'.\n"
@@ -2289,7 +2413,7 @@ class TestIO : public TestFixture {
               "    printf(\"%n\", pi);\n"
               "    printf(\"%n\", s);\n"
               "    printf(\"%n\", \"s4\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'signed int'.\n"
                       "[test.cpp:4]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'signed int'.\n"
                       "[test.cpp:6]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'std::string'.\n"
@@ -2297,7 +2421,7 @@ class TestIO : public TestFixture {
 
         check("void foo() {\n"
               "    printf(\"%n\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("class foo {};\n"
@@ -2310,7 +2434,7 @@ class TestIO : public TestFixture {
               "    printf(\"%X\", bp);\n"
               "    printf(\"%X\", u);\n"
               "    printf(\"%X\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %X in format string (no. 1) requires 'unsigned int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %c in format string (no. 1) requires 'unsigned int' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %o in format string (no. 1) requires 'unsigned int' but the argument type is 'double'.\n"
@@ -2321,7 +2445,7 @@ class TestIO : public TestFixture {
               "void foo(const char* cpc, char* pc) {\n"
               "    printf(\"%x\", cpc);\n"
               "    printf(\"%x\", pc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'const char *'.\n"
                       "[test.cpp:4]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'char *'.\n", errout_str());
 
@@ -2331,7 +2455,7 @@ class TestIO : public TestFixture {
               "    printf(\"%X\", L\"s5W\");\n"
               "    printf(\"%c\", L\"s5W\");\n"
               "    printf(\"%o\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:4]: (warning) %X in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:5]: (warning) %c in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n"
@@ -2347,7 +2471,7 @@ class TestIO : public TestFixture {
               "    printf(\"%i\", b);\n"
               "    printf(\"%i\", bp);\n"
               "    printf(\"%i\", uc);\n" // char is smaller than int, so there shouldn't be a problem
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'double'.\n"
@@ -2359,7 +2483,7 @@ class TestIO : public TestFixture {
               "void foo() {\n"
               "    printf(\"%i\", L\"s5W\");\n"
               "    printf(\"%d\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const wchar_t *'.\n", errout_str());
 
@@ -2373,7 +2497,7 @@ class TestIO : public TestFixture {
               "    printf(\"%u\", b);\n"
               "    printf(\"%u\", bp);\n"
               "    printf(\"%u\", bo);\n" // bool shouldn't have a negative sign
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'double'.\n"
@@ -2384,7 +2508,7 @@ class TestIO : public TestFixture {
         check("class foo {};\n"
               "void foo(const int* cpi, foo f, bar b, bar* bp, double d, int i, bool bo) {\n"
               "    printf(\"%u\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("class foo {};\n"
@@ -2394,7 +2518,7 @@ class TestIO : public TestFixture {
               "    printf(\"%p\", bp);\n"
               "    printf(\"%p\", cpi);\n"
               "    printf(\"%p\", b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %p in format string (no. 1) requires an address but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %p in format string (no. 1) requires an address but the argument type is 'char'.\n", errout_str());
 
@@ -2406,7 +2530,7 @@ class TestIO : public TestFixture {
               "    printf(\"%p\", cpwc);\n"
               "    printf(\"%p\", \"s4\");\n"
               "    printf(\"%p\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo {};\n"
@@ -2418,7 +2542,7 @@ class TestIO : public TestFixture {
               "    printf(\"%f\", d);\n"
               "    printf(\"%f\", b);\n"
               "    printf(\"%f\", (float)cpi);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %e in format string (no. 1) requires 'double' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %E in format string (no. 1) requires 'double' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'const signed int *'.\n"
@@ -2431,7 +2555,7 @@ class TestIO : public TestFixture {
               "    printf(\"%f\", cpc);\n"
               "    printf(\"%G\", pc);\n"
               "    printf(\"%f\", pc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %e in format string (no. 1) requires 'double' but the argument type is 'const char *'.\n"
                       "[test.cpp:4]: (warning) %E in format string (no. 1) requires 'double' but the argument type is 'char *'.\n"
                       "[test.cpp:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'const char *'.\n"
@@ -2444,7 +2568,7 @@ class TestIO : public TestFixture {
               "    printf(\"%E\", L\"s5W\");\n"
               "    printf(\"%f\", L\"s5W\");\n"
               "    printf(\"%G\", L\"s5W\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %e in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:4]: (warning) %E in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n"
                       "[test.cpp:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n"
@@ -2455,7 +2579,7 @@ class TestIO : public TestFixture {
               "    printf(\"%u\", f);\n"
               "    printf(\"%f\", f);\n"
               "    printf(\"%p\", f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'foo'.\n"
                       "[test.cpp:4]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'foo'.\n"
                       "[test.cpp:5]: (warning) %p in format string (no. 1) requires an address but the argument type is 'foo'.\n", errout_str());
@@ -2465,14 +2589,14 @@ class TestIO : public TestFixture {
         check("void foo(signed char sc, unsigned char uc, short int si, unsigned short int usi) {\n"
               "  printf(\"%hhx %hhd\", sc, uc);\n"
               "  printf(\"%hd %hu\", si, usi);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhx in format string (no. 1) requires 'unsigned char' but the argument type is 'signed char'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 2) requires 'char' but the argument type is 'unsigned char'.\n", errout_str());
 
         check("void foo(long long int lli, unsigned long long int ulli, long int li, unsigned long int uli) {\n"
               "  printf(\"%llo %llx\", lli, ulli);\n"
               "  printf(\"%ld %lu\", li, uli);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(intmax_t im, uintmax_t uim, size_t s, ptrdiff_t p, long double ld, std::size_t ss, std::ptrdiff_t sp) {\n"
@@ -2482,7 +2606,7 @@ class TestIO : public TestFixture {
               "  printf(\"%Lf\", ld);\n"
               "  printf(\"%zx\", ss);\n"
               "  printf(\"%ti\", sp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unrecognized (and non-existent in standard library) specifiers.
@@ -2494,31 +2618,31 @@ class TestIO : public TestFixture {
               "  printf(\"%La\", ld);\n"
               "  printf(\"%zv\", ss);\n"
               "  printf(\"%tp\", sp);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(long long l, ptrdiff_t p, std::ptrdiff_t sp) {\n"
               "  printf(\"%td\", p);\n"
               "  printf(\"%td\", sp);\n"
               "  printf(\"%td\", l);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %td in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'signed long long'.\n", errout_str());
 
         check("void foo(int i, long double ld) {\n"
               "  printf(\"%zx %zu\", i, ld);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %zx in format string (no. 1) requires 'size_t' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %zu in format string (no. 2) requires 'size_t' but the argument type is 'long double'.\n", errout_str());
 
         check("void foo(unsigned int ui, long double ld) {\n"
               "  printf(\"%zu %zx\", ui, ld);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %zu in format string (no. 1) requires 'size_t' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %zx in format string (no. 2) requires 'size_t' but the argument type is 'long double'.\n", errout_str());
 
         check("void foo(int i, long double ld) {\n"
               "  printf(\"%tx %tu\", i, ld);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %tx in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %tu in format string (no. 2) requires 'unsigned ptrdiff_t' but the argument type is 'long double'.\n", errout_str());
 
@@ -2533,7 +2657,7 @@ class TestIO : public TestFixture {
               "  printf(\"%t\", i);\n"
               "  printf(\"%L\", i);\n"
               "  printf(\"%I\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) 'h' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:3]: (warning) 'hh' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:4]: (warning) 'l' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
@@ -2549,7 +2673,7 @@ class TestIO : public TestFixture {
               "  printf(\"%hhd\", i);\n"
               "  printf(\"%ld\", i);\n"
               "  printf(\"%lld\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hd in format string (no. 1) requires 'short' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:3]: (warning) %hhd in format string (no. 1) requires 'char' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:4]: (warning) %ld in format string (no. 1) requires 'long' but the argument type is 'unsigned int'.\n"
@@ -2558,56 +2682,56 @@ class TestIO : public TestFixture {
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long}'.\n", errout_str());
 
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'size_t {aka unsigned long long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'ptrdiff_t {aka signed long long}'.\n", errout_str());
 
         check("void foo(std::size_t s, std::ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %zd in format string (no. 1) requires 'ssize_t' but the argument type is 'std::size_t {aka unsigned long long}'.\n"
                       "[test.cpp:3]: (portability) %tu in format string (no. 1) requires 'unsigned ptrdiff_t' but the argument type is 'std::ptrdiff_t {aka signed long long}'.\n", errout_str());
 
@@ -2616,7 +2740,7 @@ class TestIO : public TestFixture {
               "  printf(\"%lu\", um);\n"
               "  printf(\"%llu\", s);\n"
               "  printf(\"%llu\", um);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'size_t {aka unsigned long long}'.\n"
                       "[test.cpp:3]: (portability) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'uintmax_t {aka unsigned long long}'.\n"
                       "[test.cpp:4]: (portability) %llu in format string (no. 1) requires 'unsigned long long' but the argument type is 'size_t {aka unsigned long long}'.\n"
@@ -2629,7 +2753,7 @@ class TestIO : public TestFixture {
               "  printf(\"%llu\", i);\n"
               "  printf(\"%lx\", i);\n"
               "  printf(\"%llx\", i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %ld in format string (no. 1) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:3]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:4]: (warning) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'unsigned int'.\n"
@@ -2641,13 +2765,13 @@ class TestIO : public TestFixture {
               "  printf(\"%lld\", i);\n"
               "  printf(\"%lld\", im);\n"
               "  printf(\"%lld\", p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'signed int'.\n", errout_str());
 
         check("void foo(intmax_t im, ptrdiff_t p) {\n"
               "  printf(\"%lld\", im);\n"
               "  printf(\"%lld\", p);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:2]: (portability) %lld in format string (no. 1) requires 'long long' but the argument type is 'intmax_t {aka signed long long}'.\n"
                       "[test.cpp:3]: (portability) %lld in format string (no. 1) requires 'long long' but the argument type is 'ptrdiff_t {aka signed long long}'.\n", errout_str());
 
@@ -2666,7 +2790,7 @@ class TestIO : public TestFixture {
               "    printf(\"%d %f %f %d %f %f\",\n"
               "        foo->d, foo->bar[0].i, a[0],\n"
               "        f[0].d, f[0].baz.i, f[0].bar[0].i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'double'.\n"
                       "[test.cpp:13]: (warning) %f in format string (no. 2) requires 'double' but the argument type is 'signed int'.\n"
                       "[test.cpp:13]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'int'.\n"
@@ -2675,7 +2799,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:13]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'int'.\n", errout_str());
 
         check("short f() { return 0; }\n"
-              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed short'.\n"
@@ -2685,7 +2809,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed short'.\n", errout_str());
 
         check("unsigned short f() { return 0; }\n"
-              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned short'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned short'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires 'unsigned __int64' but the argument type is 'unsigned short'.\n"
@@ -2694,7 +2818,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned short'.\n", errout_str());
 
         check("int f() { return 0; }\n"
-              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%d %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed int'.\n"
@@ -2704,7 +2828,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed int'.\n", errout_str());
 
         check("unsigned int f() { return 0; }\n"
-              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%u %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned int'.\n"
@@ -2714,7 +2838,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned int'.\n", errout_str());
 
         check("long f() { return 0; }\n"
-              "void foo() { printf(\"%ld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%ld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed long'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed long'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed long'.\n"
@@ -2724,7 +2848,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed long'.\n", errout_str());
 
         check("unsigned long f() { return 0; }\n"
-              "void foo() { printf(\"%lu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%lu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned long'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned long'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned long'.\n"
@@ -2734,7 +2858,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned long'.\n", errout_str());
 
         check("long long f() { return 0; }\n"
-              "void foo() { printf(\"%lld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%lld %u %lu %I64u %I64d %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed long long'.\n"
@@ -2743,7 +2867,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed long long'.\n", errout_str());
 
         check("unsigned long long f() { return 0; }\n"
-              "void foo() { printf(\"%llu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%llu %d %ld %I64d %I64u %f %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned long long'.\n"
@@ -2752,7 +2876,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned long long'.\n", errout_str());
 
         check("float f() { return 0; }\n"
-              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'float'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'float'.\n"
                       "[test.cpp:2]: (warning) %u in format string (no. 4) requires 'unsigned int' but the argument type is 'float'.\n"
@@ -2763,7 +2887,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'float'.\n", errout_str());
 
         check("double f() { return 0; }\n"
-              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %Lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'double'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'double'.\n"
                       "[test.cpp:2]: (warning) %u in format string (no. 4) requires 'unsigned int' but the argument type is 'double'.\n"
@@ -2774,7 +2898,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'double'.\n", errout_str());
 
         check("long double f() { return 0; }\n"
-              "void foo() { printf(\"%Lf %d %ld %u %lu %I64d %I64u %f %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }");
+              "void foo() { printf(\"%Lf %d %ld %u %lu %I64d %I64u %f %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'long double'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'long double'.\n"
                       "[test.cpp:2]: (warning) %u in format string (no. 4) requires 'unsigned int' but the argument type is 'long double'.\n"
@@ -2785,37 +2909,37 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'long double'.\n", errout_str());
 
         check("int f() { return 0; }\n"
-              "void foo() { printf(\"%I64d %I64u %I64x %d\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%I64d %I64u %I64x %d\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %I64d in format string (no. 1) requires '__int64' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 2) requires 'unsigned __int64' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %I64x in format string (no. 3) requires 'unsigned __int64' but the argument type is 'signed int'.\n", errout_str());
 
         check("long long f() { return 0; }\n"
-              "void foo() { printf(\"%I32d %I32u %I32x %lld\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%I32d %I32u %I32x %lld\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %I32d in format string (no. 1) requires '__int32' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %I32x in format string (no. 3) requires 'unsigned __int32' but the argument type is 'signed long long'.\n", errout_str());
 
         check("unsigned long long f() { return 0; }\n"
-              "void foo() { printf(\"%I32d %I32u %I32x %llx\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%I32d %I32u %I32x %llx\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %I32x in format string (no. 3) requires 'unsigned __int32' but the argument type is 'unsigned long long'.\n", errout_str());
 
         check("signed char f() { return 0; }\n"
-              "void foo() { printf(\"%Id %Iu %Ix %hhi\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%Id %Iu %Ix %hhi\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'signed char'.\n"
                       "[test.cpp:2]: (warning) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'signed char'.\n"
                       "[test.cpp:2]: (warning) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'signed char'.\n", errout_str());
 
         check("unsigned char f() { return 0; }\n"
-              "void foo() { printf(\"%Id %Iu %Ix %hho\", f(), f(), f(), f()); }");
+              "void foo() { printf(\"%Id %Iu %Ix %hho\", f(), f(), f(), f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'unsigned char'.\n", errout_str());
 
         check("namespace bar { int f() { return 0; } }\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar::f(), bar::f(), bar::f(), bar::f(), bar::f(), bar::f()); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar::f(), bar::f(), bar::f(), bar::f(), bar::f(), bar::f()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2823,7 +2947,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Fred { int i; } f;\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", f.i, f.i, f.i, f.i, f.i, f.i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", f.i, f.i, f.i, f.i, f.i, f.i); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2831,7 +2955,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Fred { unsigned int u; } f;\n"
-              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.u, f.u, f.u, f.u, f.u, f.u); }");
+              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.u, f.u, f.u, f.u, f.u, f.u); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'unsigned int'.\n"
@@ -2839,7 +2963,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'unsigned int'.\n", errout_str());
 
         check("struct Fred { unsigned int ui() { return 0; } } f;\n"
-              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.ui(), f.ui(), f.ui(), f.ui(), f.ui(), f.ui()); }");
+              "void foo() { printf(\"%u %d %ld %f %Lf %p\", f.ui(), f.ui(), f.ui(), f.ui(), f.ui(), f.ui()); }\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'unsigned int'.\n"
@@ -2850,12 +2974,12 @@ class TestIO : public TestFixture {
         check("void f(int len, int newline) {\n"
               "    printf(\"%s\", newline ? a : str + len);\n"
               "    printf(\"%s\", newline + newline);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Fred { int i; } f;\n"
               "struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2864,7 +2988,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f;\n"
               "const struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2873,7 +2997,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f;\n"
               "static const struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2882,7 +3006,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f[2];\n"
               "struct Fred * bar() { return f; };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2891,7 +3015,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f[2];\n"
               "const struct Fred * bar() { return f; };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2900,7 +3024,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int i; } f[2];\n"
               "static const struct Fred * bar() { return f; };\n"
-              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }");
+              "void foo() { printf(\"%d %u %lu %f %Lf %p\", bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i, bar()[0].i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 3) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed int'.\n"
@@ -2909,7 +3033,7 @@ class TestIO : public TestFixture {
 
         check("struct Fred { int32_t i; } f;\n"
               "struct Fred & bar() { };\n"
-              "void foo() { printf(\"%d %ld %u %lu %f %Lf\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }");
+              "void foo() { printf(\"%d %ld %u %lu %f %Lf\", bar().i, bar().i, bar().i, bar().i, bar().i, bar().i); }\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %ld in format string (no. 2) requires 'long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %lu in format string (no. 4) requires 'unsigned long' but the argument type is 'signed int'.\n"
@@ -2920,27 +3044,27 @@ class TestIO : public TestFixture {
         // #4984
         check("void f(double *x) {\n"
               "    printf(\"%f\", x[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int array[10];\n"
               "int * foo() { return array; }\n"
               "void f() {\n"
               "    printf(\"%f\", foo()[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Base { int length() { } };\n"
               "struct Derived : public Base { };\n"
               "void foo(Derived * d) {\n"
               "    printf(\"%f\", d.length());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout_str());
 
         check("std::vector<int> v;\n"
               "void foo() {\n"
               "    printf(\"%d %u %f\", v[0], v[0], v[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'signed int'.\n", errout_str());
 
@@ -2948,7 +3072,7 @@ class TestIO : public TestFixture {
         check("int bar(int a);\n"
               "void foo() {\n"
               "    printf(\"%d\", bar(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> v;\n"
@@ -3194,20 +3318,20 @@ class TestIO : public TestFixture {
 
         check("void foo() {\n"
               "    printf(\"%f %d\", static_cast<int>(1.0f), reinterpret_cast<const void *>(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const void *'.\n", errout_str());
 
         check("void foo() {\n"
               "    UNKNOWN * u;\n"
               "    printf(\"%d %x %u %f\", u[i], u[i], u[i], u[i]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    long * l;\n"
               "    printf(\"%d %x %u %f\", l[i], l[i], l[i], l[i]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'signed long'.\n"
                       "[test.cpp:3]: (warning) %x in format string (no. 2) requires 'unsigned int' but the argument type is 'signed long'.\n"
                       "[test.cpp:3]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'signed long'.\n"
@@ -3228,27 +3352,27 @@ class TestIO : public TestFixture {
               "    printf(\"%u\",v6[0]);\n"
               "    myvector<char *> v7(1,0);\n"
               "    printf(\"%s\",v7[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<char> v;\n" // #5151
               "void foo() {\n"
               "   printf(\"%c %u %f\", v.at(32), v.at(32), v.at(32));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'char'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'char'.\n", errout_str());
 
         // #5195 (segmentation fault)
         check("void T::a(const std::vector<double>& vx) {\n"
               "    printf(\"%f\", vx.at(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5486
         check("void foo() {\n"
               "    ssize_t test = 0;\n"
               "    printf(\"%zd\", test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6009
@@ -3256,7 +3380,7 @@ class TestIO : public TestFixture {
               "extern int         IntByReturnValue();\n"
               "void MyFunction() {\n"
               "    printf( \"%s - %s\", StringByReturnValue(), IntByReturnValue() );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) %s in format string (no. 1) requires 'char *' but the argument type is 'std::string'.\n"
                       "[test.cpp:4]: (warning) %s in format string (no. 2) requires 'char *' but the argument type is 'signed int'.\n", errout_str());
 
@@ -3269,7 +3393,7 @@ class TestIO : public TestFixture {
               "    Array<int, 10> array1;\n"
               "    Array<float, 10> array2;\n"
               "    printf(\"%u %u\", array1[0], array2[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'int'.\n"
                       "[test.cpp:9]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'float'.\n", errout_str());
 
@@ -3277,19 +3401,19 @@ class TestIO : public TestFixture {
         check("struct S { unsigned short x; } s = {0};\n"
               "void foo() {\n"
               "    printf(\"%d\", s.x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #7601
         check("void foo(int i, unsigned int ui, long long ll, unsigned long long ull) {\n"
               "    printf(\"%Ld %Lu %Ld %Lu\", i, ui, ll, ull);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %Ld in format string (no. 1) requires 'long long' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %Lu in format string (no. 2) requires 'unsigned long long' but the argument type is 'unsigned int'.\n", errout_str());
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hhd %hhd %hhd %hhd %hhd %hhd %hhd %hhd\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhd in format string (no. 2) requires 'char' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 3) requires 'char' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 4) requires 'char' but the argument type is 'unsigned short'.\n"
@@ -3300,7 +3424,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhu in format string (no. 1) requires 'unsigned char' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hhu in format string (no. 3) requires 'unsigned char' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %hhu in format string (no. 4) requires 'unsigned char' but the argument type is 'unsigned short'.\n"
@@ -3311,7 +3435,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hhx %hhx %hhx %hhx %hhx %hhx %hhx %hhx\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hhx in format string (no. 1) requires 'unsigned char' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hhx in format string (no. 3) requires 'unsigned char' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %hhx in format string (no. 4) requires 'unsigned char' but the argument type is 'unsigned short'.\n"
@@ -3322,7 +3446,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hd %hd %hd %hd %hd %hd %hd %hd\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hd in format string (no. 1) requires 'short' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hd in format string (no. 2) requires 'short' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hd in format string (no. 4) requires 'short' but the argument type is 'unsigned short'.\n"
@@ -3333,7 +3457,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hu %hu %hu %hu %hu %hu %hu %hu\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hu in format string (no. 1) requires 'unsigned short' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hu in format string (no. 2) requires 'unsigned short' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hu in format string (no. 3) requires 'unsigned short' but the argument type is 'signed short'.\n"
@@ -3344,7 +3468,7 @@ class TestIO : public TestFixture {
 
         check("void foo(char c, unsigned char uc, short s, unsigned short us, int i, unsigned int ui, long l, unsigned long ul) {\n"
               "    printf(\"%hx %hx %hx %hx %hx %hx %hx %hx\", c, uc, s, us, i, ui, l, ul);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (warning) %hx in format string (no. 1) requires 'unsigned short' but the argument type is 'char'.\n"
                       "[test.cpp:2]: (warning) %hx in format string (no. 2) requires 'unsigned short' but the argument type is 'unsigned char'.\n"
                       "[test.cpp:2]: (warning) %hx in format string (no. 3) requires 'unsigned short' but the argument type is 'signed short'.\n"
@@ -3360,9 +3484,23 @@ class TestIO : public TestFixture {
               "\n"
               "void foo(struct S x) {\n"
               "  printf(\"%f\", x.f(4.0));\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("enum E : uint8_t { E0 }; \n" // #7959
+              "void f(E e) {\n"
+              "    printf(\"%hhu\", e);\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("enum E : uint8_t { E0 }; \n"
+              "void f(E e) {\n"
+              "    printf(\"%lu\", e);\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'uint8_t'.\n",
+                           "",
+                           errout_str());
+
         check("void f() {\n"
               "    printf(\"%lu\", sizeof(char));\n"
               "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
@@ -4121,7 +4259,7 @@ class TestIO : public TestFixture {
               "  printf(\"%1$d\", 1);"
               "  printf(\"%1$d, %d, %1$d\", 1, 2);"
               "  scanf(\"%1$d\", &bar);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4130,11 +4268,11 @@ class TestIO : public TestFixture {
               "  printf(\"%1$d, %d, %4$d\", 1, 2, 3);\n"
               "  scanf(\"%2$d\", &bar);\n"
               "  printf(\"%0$f\", 0.0);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) printf format string requires 1 parameter but only 0 are given.\n"
-                      "[test.cpp:4]: (warning) printf: referencing parameter 4 while 3 arguments given\n"
-                      "[test.cpp:5]: (warning) scanf: referencing parameter 2 while 1 arguments given\n"
-                      "[test.cpp:6]: (warning) printf: parameter positions start at 1, not 0\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:3]: (error) printf format string requires 1 parameter but only 0 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:4:3]: (warning) printf: referencing parameter 4 while 3 arguments given [wrongPrintfScanfParameterPositionError]\n"
+                      "[test.cpp:5:3]: (warning) scanf: referencing parameter 2 while 1 arguments given [wrongPrintfScanfParameterPositionError]\n"
+                      "[test.cpp:6:3]: (warning) printf: parameter positions start at 1, not 0 [wrongPrintfScanfParameterPositionError]\n"
                       "", errout_str());
     }
 
@@ -4153,14 +4291,14 @@ class TestIO : public TestFixture {
               "    printf(\"%I32d %I32u %I32x\", u32, u32, u32);\n"
               "    printf(\"%I64d %I64u %I64x\", i64, i64, i64);\n"
               "    printf(\"%I64d %I64u %I64x\", u64, u64, u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:8]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'size_t {aka unsigned long}'.\n"
-                      "[test.cpp:9]: (portability) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
-                      "[test.cpp:9]: (portability) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
-                      "[test.cpp:10]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is '__int32 {aka signed int}'.\n"
-                      "[test.cpp:11]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'.\n"
-                      "[test.cpp:12]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64' but the argument type is '__int64 {aka signed long long}'.\n"
-                      "[test.cpp:13]: (portability) %I64d in format string (no. 1) requires '__int64' but the argument type is 'unsigned __int64 {aka unsigned long long}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'size_t {aka unsigned long}'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:10:5]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is '__int32 {aka signed int}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:11:5]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:12:5]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64' but the argument type is '__int64 {aka signed long long}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:13:5]: (portability) %I64d in format string (no. 1) requires '__int64' but the argument type is 'unsigned __int64 {aka unsigned long long}'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("void foo() {\n"
               "    size_t s;\n"
@@ -4175,14 +4313,14 @@ class TestIO : public TestFixture {
               "    printf(\"%I32d %I32u %I32x\", u32, u32, u32);\n"
               "    printf(\"%I64d %I64u %I64x\", i64, i64, i64);\n"
               "    printf(\"%I64d %I64u %I64x\", u64, u64, u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
-        ASSERT_EQUALS("[test.cpp:8]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'size_t {aka unsigned long long}'.\n"
-                      "[test.cpp:9]: (portability) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long long}'.\n"
-                      "[test.cpp:9]: (portability) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long long}'.\n"
-                      "[test.cpp:10]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is '__int32 {aka signed int}'.\n"
-                      "[test.cpp:11]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'.\n"
-                      "[test.cpp:12]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64' but the argument type is '__int64 {aka signed long long}'.\n"
-                      "[test.cpp:13]: (portability) %I64d in format string (no. 1) requires '__int64' but the argument type is 'unsigned __int64 {aka unsigned long long}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t' but the argument type is 'size_t {aka unsigned long long}'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long long}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t' but the argument type is 'ptrdiff_t {aka signed long long}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:10:5]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32' but the argument type is '__int32 {aka signed int}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:11:5]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:12:5]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64' but the argument type is '__int64 {aka signed long long}'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:13:5]: (portability) %I64d in format string (no. 1) requires '__int64' but the argument type is 'unsigned __int64 {aka unsigned long long}'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("void foo() {\n"
               "    size_t s;\n"
@@ -4201,21 +4339,21 @@ class TestIO : public TestFixture {
               "    printf(\"%I16x%i\", s, i);\n"
               "    printf(\"%I32%i\", s, i);\n"
               "    printf(\"%I64%i\", s, i);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:6]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:7]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:8]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:9]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:10]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:11]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:12]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:13]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:14]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:15]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:16]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:17]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:5:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:6:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:7:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:8:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:9:5]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:10:5]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:11:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:12:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:13:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:14:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:15:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:16:5]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:17:5]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n", errout_str());
 
         // ticket #5264
         check("void foo(LPARAM lp, WPARAM wp, LRESULT lr) {\n"
@@ -4231,14 +4369,14 @@ class TestIO : public TestFixture {
         check("void foo(UINT32 a, ::UINT32 b, Fred::UINT32 c) {\n"
               "    printf(\"%d %d %d\", a, b, c);\n"
               "};\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:2]: (portability) %d in format string (no. 1) requires 'int' but the argument type is 'UINT32 {aka unsigned int}'.\n"
-                      "[test.cpp:2]: (portability) %d in format string (no. 2) requires 'int' but the argument type is 'UINT32 {aka unsigned int}'.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (portability) %d in format string (no. 1) requires 'int' but the argument type is 'UINT32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:2:5]: (portability) %d in format string (no. 2) requires 'int' but the argument type is 'UINT32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("void foo(LPCVOID a, ::LPCVOID b, Fred::LPCVOID c) {\n"
               "    printf(\"%d %d %d\", a, b, c);\n"
               "};\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const void *'.\n"
-                      "[test.cpp:2]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const void *'.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const void *'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:2:5]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const void *'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("void foo() {\n"
               "    SSIZE_T s = -2;\n" // In MSVC, SSIZE_T is available in capital letters using #include <BaseTsd.h>
@@ -4246,8 +4384,8 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:6]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long}'. [invalidPrintfArgType_uint]\n", errout_str());
 
         check("void foo() {\n"
               "    SSIZE_T s = -2;\n" // In MSVC, SSIZE_T is available in capital letters using #include <BaseTsd.h>
@@ -4255,8 +4393,8 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
-        ASSERT_EQUALS("[test.cpp:6]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long long}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long long}'. [invalidPrintfArgType_uint]\n", errout_str());
 
         check("void foo() {\n"
               "    SSIZE_T s = -2;\n" // Under Unix, ssize_t has to be written in small letters. Not Cppcheck, but the compiler will report this.
@@ -4264,7 +4402,7 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4274,8 +4412,8 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
-        ASSERT_EQUALS("[test.cpp:7]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long long}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("[test.cpp:7:5]: (portability) %zu in format string (no. 1) requires 'size_t' but the argument type is 'SSIZE_T {aka signed long long}'. [invalidPrintfArgType_uint]\n", errout_str());
 
     }
 
@@ -4293,16 +4431,16 @@ class TestIO : public TestFixture {
               "    scanf(\"%I32d %I32u %I32x\", &u32, &u32, &u32);\n"
               "    scanf(\"%I64d %I64u %I64x\", &i64, &i64, &i64);\n"
               "    scanf(\"%I64d %I64u %I64x\", &u64, &u64, &u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:8]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t *' but the argument type is 'size_t * {aka unsigned long *}'.\n"
-                      "[test.cpp:9]: (portability) %Iu in format string (no. 2) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long *}'.\n"
-                      "[test.cpp:9]: (portability) %Ix in format string (no. 3) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long *}'.\n"
-                      "[test.cpp:10]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'.\n"
-                      "[test.cpp:10]: (portability) %I32x in format string (no. 3) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'.\n"
-                      "[test.cpp:11]: (portability) %I32d in format string (no. 1) requires '__int32 *' but the argument type is 'unsigned __int32 * {aka unsigned int *}'.\n"
-                      "[test.cpp:12]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'.\n"
-                      "[test.cpp:12]: (portability) %I64x in format string (no. 3) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'.\n"
-                      "[test.cpp:13]: (portability) %I64d in format string (no. 1) requires '__int64 *' but the argument type is 'unsigned __int64 * {aka unsigned long long *}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t *' but the argument type is 'size_t * {aka unsigned long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:10:5]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:10:5]: (portability) %I32x in format string (no. 3) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:11:5]: (portability) %I32d in format string (no. 1) requires '__int32 *' but the argument type is 'unsigned __int32 * {aka unsigned int *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:12:5]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:12:5]: (portability) %I64x in format string (no. 3) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:13:5]: (portability) %I64d in format string (no. 1) requires '__int64 *' but the argument type is 'unsigned __int64 * {aka unsigned long long *}'. [invalidScanfArgType_int]\n", errout_str());
 
         check("void foo() {\n"
               "    size_t s;\n"
@@ -4317,16 +4455,16 @@ class TestIO : public TestFixture {
               "    scanf(\"%I32d %I32u %I32x\", &u32, &u32, &u32);\n"
               "    scanf(\"%I64d %I64u %I64x\", &i64, &i64, &i64);\n"
               "    scanf(\"%I64d %I64u %I64x\", &u64, &u64, &u64);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
-        ASSERT_EQUALS("[test.cpp:8]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t *' but the argument type is 'size_t * {aka unsigned long long *}'.\n"
-                      "[test.cpp:9]: (portability) %Iu in format string (no. 2) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long long *}'.\n"
-                      "[test.cpp:9]: (portability) %Ix in format string (no. 3) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long long *}'.\n"
-                      "[test.cpp:10]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'.\n"
-                      "[test.cpp:10]: (portability) %I32x in format string (no. 3) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'.\n"
-                      "[test.cpp:11]: (portability) %I32d in format string (no. 1) requires '__int32 *' but the argument type is 'unsigned __int32 * {aka unsigned int *}'.\n"
-                      "[test.cpp:12]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'.\n"
-                      "[test.cpp:12]: (portability) %I64x in format string (no. 3) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'.\n"
-                      "[test.cpp:13]: (portability) %I64d in format string (no. 1) requires '__int64 *' but the argument type is 'unsigned __int64 * {aka unsigned long long *}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("[test.cpp:8:5]: (portability) %Id in format string (no. 1) requires 'ptrdiff_t *' but the argument type is 'size_t * {aka unsigned long long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:9:5]: (portability) %Iu in format string (no. 2) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:9:5]: (portability) %Ix in format string (no. 3) requires 'size_t *' but the argument type is 'ptrdiff_t * {aka signed long long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:10:5]: (portability) %I32u in format string (no. 2) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:10:5]: (portability) %I32x in format string (no. 3) requires 'unsigned __int32 *' but the argument type is '__int32 * {aka signed int *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:11:5]: (portability) %I32d in format string (no. 1) requires '__int32 *' but the argument type is 'unsigned __int32 * {aka unsigned int *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:12:5]: (portability) %I64u in format string (no. 2) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:12:5]: (portability) %I64x in format string (no. 3) requires 'unsigned __int64 *' but the argument type is '__int64 * {aka signed long long *}'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:13:5]: (portability) %I64d in format string (no. 1) requires '__int64 *' but the argument type is 'unsigned __int64 * {aka unsigned long long *}'. [invalidScanfArgType_int]\n", errout_str());
 
         check("void foo() {\n"
               "    size_t s;\n"
@@ -4345,21 +4483,21 @@ class TestIO : public TestFixture {
               "    scanf(\"%I16x%i\", &s, &i);\n"
               "    scanf(\"%I32%i\", &s, &i);\n"
               "    scanf(\"%I64%i\", &s, &i);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:6]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:7]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:8]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:9]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:10]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:11]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:12]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:13]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:14]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:15]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:16]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:17]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:5:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:6:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:7:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:8:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:9:5]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:10:5]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:11:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:12:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:13:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:14:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:15:5]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:16:5]: (warning) 'I32' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n"
+                      "[test.cpp:17:5]: (warning) 'I64' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier. [invalidLengthModifierError]\n", errout_str());
 
         check("void foo() {\n"
               "    SSIZE_T s;\n" // In MSVC, SSIZE_T is available in capital letters using #include <BaseTsd.h>
@@ -4367,8 +4505,8 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:6]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long *}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long *}'. [invalidScanfArgType_int]\n", errout_str());
 
         check("void foo() {\n"
               "    SSIZE_T s;\n" // In MSVC, SSIZE_T is available in capital letters using #include <BaseTsd.h>
@@ -4376,8 +4514,8 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
-        ASSERT_EQUALS("[test.cpp:6]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long long *}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("[test.cpp:6:5]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long long *}'. [invalidScanfArgType_int]\n", errout_str());
 
         check("void foo() {\n"
               "    SSIZE_T s;\n" // Under Unix, ssize_t has to be written in small letters. Not Cppcheck, but the compiler will report this.
@@ -4385,7 +4523,7 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4395,8 +4533,8 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
-        ASSERT_EQUALS("[test.cpp:7]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long long *}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("[test.cpp:7:5]: (portability) %zu in format string (no. 1) requires 'size_t *' but the argument type is 'SSIZE_T * {aka signed long long *}'. [invalidScanfArgType_int]\n", errout_str());
 
     }
 
@@ -4406,7 +4544,7 @@ class TestIO : public TestFixture {
               "    String string;\n"
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4414,7 +4552,7 @@ class TestIO : public TestFixture {
               "    CString string;\n"
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -4423,10 +4561,10 @@ class TestIO : public TestFixture {
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
               "    CString::Format(\"%I32d\", u32);\n"
-              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:4]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'.\n"
-                      "[test.cpp:5]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'.\n"
-                      "[test.cpp:6]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:4:12]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:12]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:6:14]: (portability) %I32d in format string (no. 1) requires '__int32' but the argument type is 'unsigned __int32 {aka unsigned int}'. [invalidPrintfArgType_sint]\n", errout_str());
     }
 
     void testMicrosoftSecurePrintfArgument() {
@@ -4435,36 +4573,36 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    _tprintf_s(_T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) _tprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) _tprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _tprintf_s(_T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) _tprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) _tprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    int i;\n"
               "    unsigned int u;\n"
               "    printf_s(\"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) printf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) printf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    int i;\n"
               "    unsigned int u;\n"
               "    wprintf_s(L\"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) wprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) wprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    TCHAR str[10];\n"
@@ -4472,9 +4610,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    _stprintf_s(str, sizeof(str) / sizeof(TCHAR), _T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) _stprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) _stprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    TCHAR str[10];\n"
@@ -4482,9 +4620,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    _stprintf_s(str, sizeof(str) / sizeof(TCHAR), _T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) _stprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) _stprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    char str[10];\n"
@@ -4492,9 +4630,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    sprintf_s(str, sizeof(str), \"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) sprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) sprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    char str[10];\n"
@@ -4502,9 +4640,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    sprintf_s(str, \"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) sprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) sprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t str[10];\n"
@@ -4512,9 +4650,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    swprintf_s(str, sizeof(str) / sizeof(wchar_t), L\"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) swprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) swprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t str[10];\n"
@@ -4522,9 +4660,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    swprintf_s(str, L\"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) swprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) swprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    TCHAR str[10];\n"
@@ -4532,9 +4670,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    _sntprintf_s(str, sizeof(str) / sizeof(TCHAR), _TRUNCATE, _T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) _sntprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) _sntprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    TCHAR str[10];\n"
@@ -4542,9 +4680,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    _sntprintf_s(str, sizeof(str) / sizeof(TCHAR), _TRUNCATE, _T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) _sntprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) _sntprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    char str[10];\n"
@@ -4552,9 +4690,9 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    _snprintf_s(str, sizeof(str), _TRUNCATE, \"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) _snprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) _snprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t str[10];\n"
@@ -4562,45 +4700,45 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    _snwprintf_s(str, sizeof(str) / sizeof(wchar_t), _TRUNCATE, L\"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:5]: (warning) _snwprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:5:5]: (warning) _snwprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _ftprintf_s(fp, _T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) _ftprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) _ftprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _ftprintf_s(fp, _T(\"%d %u\"), u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) _ftprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) _ftprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
               "    unsigned int u;\n"
               "    fprintf_s(fp, \"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) fprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) fprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
               "    unsigned int u;\n"
               "    fwprintf_s(fp, L\"%d %u\", u, i, 0);\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:4]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'.\n"
-                      "[test.cpp:4]: (warning) fwprintf_s format string requires 2 parameters but 3 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]\n"
+                      "[test.cpp:4:5]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint]\n"
+                      "[test.cpp:4:5]: (warning) fwprintf_s format string requires 2 parameters but 3 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    char lineBuffer [600];\n"
@@ -4628,31 +4766,43 @@ class TestIO : public TestFixture {
               "    sprintf_s(lineBuffer, 100, format2, \"type\", \"sum\", \"avg\", \"min\", i, 0);\n"
               "    sprintf_s(lineBuffer, 100, format3, \"type\", \"sum\", \"avg\", \"min\", i, 0);\n"
               "}\n", dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:6]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:6]: (warning) sprintf_s format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:7]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:7]: (warning) sprintf_s format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:8]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:8]: (warning) sprintf_s format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:9]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:9]: (warning) sprintf format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:10]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:10]: (warning) sprintf format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:11]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:11]: (warning) sprintf format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:12]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:12]: (warning) printf format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:13]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:13]: (warning) printf format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:14]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:14]: (warning) printf format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:15]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:15]: (warning) sprintf_s format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:16]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:16]: (warning) sprintf_s format string requires 5 parameters but 6 are given.\n"
-                      "[test.cpp:17]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'.\n"
-                      "[test.cpp:17]: (warning) sprintf_s format string requires 5 parameters but 6 are given.\n", errout_str());
-
+        ASSERT_EQUALS("[test.cpp:6:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:6:5]: (warning) sprintf_s format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:7:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:7:5]: (warning) sprintf_s format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:8:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:8:5]: (warning) sprintf_s format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:9:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:9:5]: (warning) sprintf format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:10:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:10:5]: (warning) sprintf format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:11:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:11:5]: (warning) sprintf format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:12:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:12:5]: (warning) printf format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:13:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:13:5]: (warning) printf format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:14:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:14:5]: (warning) printf format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:15:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:15:5]: (warning) sprintf_s format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:16:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:16:5]: (warning) sprintf_s format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n"
+                      "[test.cpp:17:5]: (warning) %s in format string (no. 5) requires 'char *' but the argument type is 'signed int'. [invalidPrintfArgType_s]\n"
+                      "[test.cpp:17:5]: (warning) sprintf_s format string requires 5 parameters but 6 are given. [wrongPrintfScanfArgNum]\n", errout_str());
+
+        check("int main()\n"
+              "{\n"
+              "    double value = 3.14;\n"
+              "    const size_t buffer_size = 64;\n"
+              "    char buffer[buffer_size];\n"
+              "    int precision = 2;\n"
+              "    _locale_t locale = _create_locale(LC_ALL, \"C\");\n"
+              "    _sprintf_s_l(buffer, buffer_size, \"%.*f\", locale, precision, value);\n"
+              "    _free_locale(locale);\n"
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMicrosoftSecureScanfArgument() {
@@ -4662,9 +4812,9 @@ class TestIO : public TestFixture {
               "    TCHAR str[10];\n"
               "    _tscanf_s(_T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) _tscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) _tscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    int i;\n"
@@ -4672,9 +4822,9 @@ class TestIO : public TestFixture {
               "    TCHAR str[10];\n"
               "    _tscanf_s(_T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) _tscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) _tscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    int i;\n"
@@ -4682,9 +4832,9 @@ class TestIO : public TestFixture {
               "    char str[10];\n"
               "    scanf_s(\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) scanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) scanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    int i;\n"
@@ -4692,16 +4842,16 @@ class TestIO : public TestFixture {
               "    wchar_t str[10];\n"
               "    wscanf_s(L\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) wscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) wscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void f() {\n"
               "  char str[8];\n"
               "  scanf_s(\"%8c\", str, sizeof(str));\n"
               "  scanf_s(\"%9c\", str, sizeof(str));\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:4]: (error) Width 9 given in format string (no. 1) is larger than destination buffer 'str[8]', use %8c to prevent overflowing it.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:3]: (error) Width 9 given in format string (no. 1) is larger than destination buffer 'str[8]', use %8c to prevent overflowing it. [invalidScanfFormatWidth]\n", errout_str());
 
         check("void foo() {\n"
               "    TCHAR txt[100];\n"
@@ -4710,9 +4860,9 @@ class TestIO : public TestFixture {
               "    TCHAR str[10];\n"
               "    _stscanf_s(txt, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:6]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:6]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:6]: (warning) _stscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) _stscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    TCHAR txt[100];\n"
@@ -4721,9 +4871,9 @@ class TestIO : public TestFixture {
               "    TCHAR str[10];\n"
               "    _stscanf_s(txt, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:6]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:6]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:6]: (warning) _stscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) _stscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    char txt[100];\n"
@@ -4732,9 +4882,9 @@ class TestIO : public TestFixture {
               "    char str[10];\n"
               "    sscanf_s(txt, \"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:6]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:6]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:6]: (warning) sscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) sscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t txt[100];\n"
@@ -4743,9 +4893,9 @@ class TestIO : public TestFixture {
               "    wchar_t str[10];\n"
               "    swscanf_s(txt, L\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:6]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:6]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:6]: (warning) swscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:6:5]: (warning) swscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
@@ -4753,9 +4903,9 @@ class TestIO : public TestFixture {
               "    TCHAR str[10];\n"
               "    _ftscanf_s(fp, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) _ftscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) _ftscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
@@ -4763,9 +4913,9 @@ class TestIO : public TestFixture {
               "    TCHAR str[10];\n"
               "    _ftscanf_s(fp, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) _ftscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) _ftscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
@@ -4773,9 +4923,9 @@ class TestIO : public TestFixture {
               "    char str[10];\n"
               "    fscanf_s(fp, \"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) fscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) fscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo(FILE * fp) {\n"
               "    int i;\n"
@@ -4783,35 +4933,42 @@ class TestIO : public TestFixture {
               "    wchar_t str[10];\n"
               "    fwscanf_s(fp, L\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
-        ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'.\n"
-                      "[test.cpp:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:5]: (warning) fwscanf_s format string requires 6 parameters but 7 are given.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) %d in format string (no. 2) requires 'int *' but the argument type is 'unsigned int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) %u in format string (no. 3) requires 'unsigned int *' but the argument type is 'signed int *'. [invalidScanfArgType_int]\n"
+                      "[test.cpp:5:5]: (warning) fwscanf_s format string requires 6 parameters but 7 are given. [wrongPrintfScanfArgNum]\n", errout_str());
 
         check("void foo() {\n"
               "    WCHAR msStr1[5] = {0};\n"
               "    wscanf_s(L\"%4[^-]\", msStr1, _countof(msStr1));\n"
               "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const char* c) {\n"
+              "    const size_t N = 5;\n"
+              "    char buf[N];\n"
+              "    sscanf_s(c, \"%4[^.]\", buf, N);\n"
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testQStringFormatArguments() {
         check("void foo(float f) {\n"
               "    QString string;\n"
               "    string.sprintf(\"%d\", f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:3]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'float'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:3:12]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'float'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("void foo(float f) {\n"
               "    QString string;\n"
               "    string = QString::asprintf(\"%d\", f);\n"
-              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
-        ASSERT_EQUALS("[test.cpp:3]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'float'.\n", errout_str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("[test.cpp:3:23]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'float'. [invalidPrintfArgType_sint]\n", errout_str());
     }
 
     void testTernary() {  // ticket #6182
         check("void test(const std::string &val) {\n"
               "    printf(\"%s\", val.empty() ? \"I like to eat bananas\" : val.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4819,30 +4976,30 @@ class TestIO : public TestFixture {
         check("void test() {\n"
               "    unsigned const x = 5;\n"
               "    printf(\"%u\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void testAstType() { // ticket #7014
         check("void test() {\n"
               "    printf(\"%c\", \"hello\"[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    printf(\"%lld\", (long long)1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    printf(\"%i\", (short *)x);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'signed short *'.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'signed short *'. [invalidPrintfArgType_sint]\n", errout_str());
 
         check("int (*fp)();\n" // #7178 - function pointer call
               "void test() {\n"
               "    printf(\"%i\", fp());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4850,7 +5007,7 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    printf(\"%u %lu %llu\", 0U, 0UL, 0ULL);\n"
               "    printf(\"%u %lu %llu\", 0u, 0ul, 0ull);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4858,14 +5015,14 @@ class TestIO : public TestFixture {
         check("void f() {\n"
               "   const char *s = \"0\";\n"
               "   printf(\"%ld%lld\", atol(s), atoll(s));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // 8141
         check("void f(int i) {\n"
               "   printf(\"%f\", imaxabs(i));\n"
               "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
-        ASSERT_EQUALS("[test.cpp:2]: (portability) %f in format string (no. 1) requires 'double' but the argument type is 'intmax_t {aka signed long}'.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:4]: (portability) %f in format string (no. 1) requires 'double' but the argument type is 'intmax_t {aka signed long}'. [invalidPrintfArgType_float]\n", errout_str());
     }
 
     void testPrintfTypeAlias1() {
@@ -4877,7 +5034,7 @@ class TestIO : public TestFixture {
               "PCINT pci;"
               "void foo() {\n"
               "    printf(\"%d %p %p\", i, pi, pci);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("using INT = int;\n\n"
@@ -4888,10 +5045,10 @@ class TestIO : public TestFixture {
               "PCINT pci;"
               "void foo() {\n"
               "    printf(\"%f %f %f\", i, pi, pci);\n"
-              "};");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:8]: (warning) %f in format string (no. 2) requires 'double' but the argument type is 'signed int *'.\n"
-                      "[test.cpp:8]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'const signed int *'.\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:8:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n"
+                      "[test.cpp:8:5]: (warning) %f in format string (no. 2) requires 'double' but the argument type is 'signed int *'. [invalidPrintfArgType_float]\n"
+                      "[test.cpp:8:5]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'const signed int *'. [invalidPrintfArgType_float]\n", errout_str());
     }
 
     void testPrintfAuto() { // #8992
@@ -4900,31 +5057,31 @@ class TestIO : public TestFixture {
               "    printf(\"%zu\", s);\n"
               "    printf(\"%f\", s);\n"
               "}\n", dinit(CheckOptions, $.portability = true));
-        ASSERT_EQUALS("[test.cpp:4]: (portability) %f in format string (no. 1) requires 'double' but the argument type is 'size_t {aka unsigned long}'.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (portability) %f in format string (no. 1) requires 'double' but the argument type is 'size_t {aka unsigned long}'. [invalidPrintfArgType_float]\n", errout_str());
     }
 
     void testPrintfParenthesis() { // #8489
         check("void f(int a) {\n"
               "    printf(\"%f\", (a >> 24) & 0xff);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n", errout_str());
 
         check("void f(int a) {\n"
               "    printf(\"%f\", 0xff & (a >> 24));\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n", errout_str());
 
         check("void f(int a) {\n"
               "    printf(\"%f\", ((a >> 24) + 1) & 0xff);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'. [invalidPrintfArgType_float]\n", errout_str());
     }
 
     void testStdDistance() { // #10304
         check("void foo(const std::vector<int>& IO, const int* pio) {\n"
               "const auto Idx = std::distance(&IO.front(), pio);\n"
               "printf(\"Idx = %td\", Idx);\n"
-              "}", dinit(CheckOptions, $.portability = true));
+              "}\n", dinit(CheckOptions, $.portability = true));
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index d74892e9c27..cb5f9d53c8a 100644
--- a/test/testleakautovar.cpp
+++ b/test/testleakautovar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,14 +23,13 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestLeakAutoVar : public TestFixture {
 public:
     TestLeakAutoVar() : TestFixture("TestLeakAutoVar") {}
 
 private:
-    const Settings settings = settingsBuilder().library("std.cfg").build();
+    const Settings settings = settingsBuilder().library("std.cfg").checkLibrary().build();
 
     void run() override {
         mNewTemplate = true;
@@ -108,6 +107,8 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(doublefree15);
         TEST_CASE(doublefree16);
         TEST_CASE(doublefree17); // #8109: delete with comma operator
+        TEST_CASE(doublefree18);
+        TEST_CASE(doublefree19); // #13960
 
         // exit
         TEST_CASE(exit1);
@@ -153,6 +154,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(ifelse27);
         TEST_CASE(ifelse28); // #11038
         TEST_CASE(ifelse29);
+        TEST_CASE(ifelse30);
 
         // switch
         TEST_CASE(switch1);
@@ -179,6 +181,8 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(return9);
         TEST_CASE(return10);
         TEST_CASE(return11); // #13098
+        TEST_CASE(return12); // #12238
+        TEST_CASE(return13);
 
         // General tests: variable type, allocation type, etc
         TEST_CASE(test1);
@@ -207,6 +211,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(inlineFunction); // #3989
 
         TEST_CASE(smartPtrInContainer); // #8262
+        TEST_CASE(unconditionalScope);
 
         TEST_CASE(functionCallCastConfig); // #9652
         TEST_CASE(functionCallLeakIgnoreConfig); // #7923
@@ -214,7 +219,6 @@ class TestLeakAutoVar : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool cpp = false;
         const Settings *s = nullptr;
     };
@@ -222,26 +226,18 @@ class TestLeakAutoVar : public TestFixture {
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(options.s ? *options.s : settings).checkLibrary().build();
-
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
-
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        const Settings& settings1 = options.s ? *options.s : settings;
+        check_(file, line, code, settings1, options.cpp);
     }
 
     template<size_t size>
-    void check_(const char* file, int line, const char (&code)[size], const Settings & s) {
-        const Settings settings0 = settingsBuilder(s).checkLibrary().build();
-
+    void check_(const char* file, int line, const char (&code)[size], const Settings & s, bool cpp = true) {
         // Tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void assign1() {
@@ -249,7 +245,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    p = NULL;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -258,7 +254,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    char *q = p;\n"
               "    free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -267,7 +263,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    char *q = p + 1;\n"
               "    free(q - 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -276,7 +272,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *a = malloc(10);\n"
               "    a += 10;\n"
               "    free(a - 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -285,7 +281,7 @@ class TestLeakAutoVar : public TestFixture {
               "{\n"
               "    char *p = new char[100];\n"
               "    list += p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -294,7 +290,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    p = strcpy(p,q);\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -302,7 +298,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void foo(struct str *d) {\n"
               "    struct str *p = malloc(10);\n"
               "    d->p = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -310,7 +306,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void foo(struct str *d) {\n"
               "    struct str *p = malloc(10);\n"
               "    d->p = &p->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -319,7 +315,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = x();\n"
               "    free(p);\n"
               "    p = NULL;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -329,7 +325,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    if (!x) { p = NULL; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -337,7 +333,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    x = a(b(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (information) --check-library: Function b() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
@@ -347,7 +343,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    bar(&p);\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -357,22 +353,22 @@ class TestLeakAutoVar : public TestFixture {
               "    char * &ref = p;\n"
               "    p = malloc(10);\n"
               "    free(ref);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("", "[test.cpp:6:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign14() {
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = malloc(10))) { }"
-              "}");
-        ASSERT_EQUALS("[test.c:3:35]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = malloc(10))) { }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = new char[10])) { }"
-              "}", dinit(CheckOptions, $.cpp = true));
-        ASSERT_EQUALS("[test.cpp:3:37]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = new char[10])) { }\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign15() {
@@ -383,7 +379,7 @@ class TestLeakAutoVar : public TestFixture {
               "   free(p);\n"
               "   p = malloc(sizeof *p);\n"
               "   free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -392,48 +388,48 @@ class TestLeakAutoVar : public TestFixture {
               "   char *p = malloc(10);\n"
               "   free(p);\n"
               "   if (p=dostuff()) *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void assign17() { // #9047
         check("void f() {\n"
               "    char *p = (char*)malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    char *p = (char*)(int*)malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign18() {
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = (char*)malloc(10))) { }"
-              "}");
-        ASSERT_EQUALS("[test.c:3:42]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = (char*)malloc(10))) { }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f(int x) {\n"
               "    char *p;\n"
-              "    if (x && (p = (char*)(int*)malloc(10))) { }"
-              "}");
-        ASSERT_EQUALS("[test.c:3:48]: (error) Memory leak: p [memleak]\n", errout_str());
+              "    if (x && (p = (char*)(int*)malloc(10))) { }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign19() {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    free((void*)p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void assign20() { // #9187
         check("void f() {\n"
               "    char *p = static_cast<int>(malloc(10));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -441,32 +437,32 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(int **x) {\n" // #10186
               "    void *p = malloc(10);\n"
               "    *x = (int*)p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { int i; };\n" // #10996
               "void f() {\n"
               "    S* s = new S();\n"
               "    (void)s;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: s [memleak]\n", errout_str());
     }
 
     void assign22() { // #9139
-        const Settings s = settingsBuilder().library("posix.cfg").build();
+        const Settings s = settingsBuilder().library("posix.cfg").checkLibrary().build();
         check("void f(char tempFileName[256]) {\n"
               "    const int fd = socket(AF_INET, SOCK_PACKET, 0 );\n"
-              "}", dinit(CheckOptions, $.cpp = true, $.s = &s));
+              "}\n", dinit(CheckOptions, $.cpp = true, $.s = &s));
         ASSERT_EQUALS("[test.cpp:3:1]: (error) Resource leak: fd [resourceLeak]\n", errout_str());
 
         check("void f() {\n"
               "    const void * const p = malloc(10);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign23() {
-        const Settings s = settingsBuilder().library("posix.cfg").build();
+        const Settings s = settingsBuilder().library("posix.cfg").checkLibrary().build();
         check("void f() {\n"
               "    int n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14;\n"
               "    *&n1 = open(\"xx.log\", O_RDONLY);\n"
@@ -569,7 +565,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n" // #11796
               "    int* p{ new int };\n"
               "    int* q(new int);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: p [memleak]\n"
                       "[test.cpp:4:1]: (error) Memory leak: q [memleak]\n",
                       errout_str());
@@ -633,48 +629,54 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(int*& x) {\n" // #8235
               "    int* p = (int*)malloc(10);\n"
               "    x = p ? p : nullptr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int*& x) {\n"
               "    int* p = (int*)malloc(10);\n"
               "    x = p != nullptr ? p : nullptr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const char* n) {\n" // #12724
+              "    FILE* fp = fopen(n, \"r\");\n"
+              "    bool b = (fp == NULL);\n"
+              "    if (b)\n"
+              "        return;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:6:1]: (error) Resource leak: fp [resourceLeak]\n", errout_str());
     }
 
     void memcpy1() { // #11542
-        const Settings s = settingsBuilder().library("std.cfg").build();
         check("void f(char** old, char* value) {\n"
               "    char *str = strdup(value);\n"
               "    memcpy(old, &str, sizeof(char*));\n"
-              "}\n", dinit(CheckOptions, $.s = &s));
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void memcpy2() {
-        const Settings s = settingsBuilder().library("std.cfg").build();
         check("void f(char* old, char* value, size_t len) {\n"
               "    char *str = strdup(value);\n"
               "    memcpy(old, str, len);\n"
-              "}\n", dinit(CheckOptions, $.cpp = true, $.s = &s));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: str [memleak]\n", errout_str());
     }
 
     void isAutoDealloc() {
         check("void f() {\n"
               "    char *p = new char[100];"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:29]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    Fred *fred = new Fred;"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::string *str = new std::string;"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:40]: (error) Memory leak: str [memleak]\n", errout_str());
 
         check("class TestType {\n" // #9028
@@ -683,13 +685,13 @@ class TestLeakAutoVar : public TestFixture {
               "};\n"
               "void f() {\n"
               "    TestType *tt = new TestType();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:7:1]: (error) Memory leak: tt [memleak]\n", errout_str());
 
         check("void f(Bar& b) {\n" // #7622
               "    char* data = new char[10];\n"
               "    b = Bar(*new Foo(data));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function Foo() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
 
         check("class B {};\n"
@@ -697,7 +699,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void g() {\n"
               "        auto d = new D();\n"
               "        if (d) {}\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:6:1]: (error) Memory leak: d [memleak]\n", errout_str());
 
         check("struct S {\n" // #12354
@@ -708,7 +710,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (b)\n"
               "        p = new S();\n"
               "    p->f();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:9:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -717,7 +719,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *p = malloc(10);\n"
               "    void *q = realloc(p, 20);\n"
               "    free(q)\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -725,7 +727,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    void *p = malloc(10);\n"
               "    void *q = realloc(p, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
@@ -733,7 +735,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    char *q = (char*) realloc(p, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
@@ -742,7 +744,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void * q = realloc(p, 10);\n"
               "    if (q == NULL)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:5:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
@@ -753,7 +755,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (size && !datap)\n"
               "        free(ptr);\n"
               "    return datap;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9990
@@ -767,7 +769,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    }\n"
               "    free(p2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -776,7 +778,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *p = fopen(name,a);\n"
               "    void *q = freopen(name, b, p);\n"
               "    fclose(q)\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -784,7 +786,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    void *p = fopen(name,a);\n"
               "    void *q = freopen(name, b, p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:1]: (error) Resource leak: q [resourceLeak]\n", errout_str());
     }
 
@@ -792,13 +794,13 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:6]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
 
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    char c = *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:15]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
@@ -806,7 +808,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(struct str *p) {\n"
               "    free(p);\n"
               "    p = p->next;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:9]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
@@ -814,25 +816,25 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:5] -> [test.c:3:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) free(p);\n"
               "  return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) delete p;\n"
               "  return p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) delete [] p;\n"
               "  return p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void* p) {\n"
@@ -842,7 +844,7 @@ class TestLeakAutoVar : public TestFixture {
               "   }\n"
               "   g(p);\n"
               "   return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -850,7 +852,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p), p = 0;\n"
               "    *p = 0;\n"  // <- Make sure pointer info is reset. It is NOT a freed pointer dereference
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -858,7 +860,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    x = p = foo();\n"  // <- p is not dereferenced
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -867,14 +869,14 @@ class TestLeakAutoVar : public TestFixture {
               "void f(Foo* foo) {\n"
               "    delete foo->ptr;\n"
               "    foo->ptr = new Foo;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { int* ptr; };\n"
               "void f(Foo* foo) {\n"
               "    delete foo->ptr;\n"
               "    x = *foo->ptr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("[test.cpp:4:6]: (error) Dereferencing 'ptr' after it is deallocated / released [deallocuse]\n", "", errout_str());
 
         check("void parse() {\n"
@@ -883,7 +885,7 @@ class TestLeakAutoVar : public TestFixture {
               "        ~Buf() { delete[]m_buf; }\n"
               "        uint8_t *m_buf;\n"
               "    };\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {\n"
@@ -895,14 +897,14 @@ class TestLeakAutoVar : public TestFixture {
               "    delete foo->ptr;\n"
               "    foo->ptr = new Foo;\n"
               "    foo->ptr->func();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(void (*conv)(char**)) {\n"
               "  char * ptr=(char*)malloc(42);\n"
               "  free(ptr);\n"
               "  (*conv)(&ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -911,7 +913,7 @@ class TestLeakAutoVar : public TestFixture {
               "    int *ptr = new int;\n"
               "    delete(ptr);\n"
               "    *ptr = 0;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Dereferencing 'ptr' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
@@ -962,14 +964,14 @@ class TestLeakAutoVar : public TestFixture {
               "  int *array = new int[42];\n"
               "  delete [] array;\n"
               "  return array[1];" // <<
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:4:3]: (error) Returning/dereferencing 'array' after it is deallocated / released [deallocret]\n", errout_str());
 
         check("int f() {\n"
               "  int *array = (int*)malloc(40);\n"
               "  free(array);\n"
               "  return array[1];" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:3] -> [test.c:4:3]: (error) Returning/dereferencing 'array' after it is deallocated / released [deallocret]\n", errout_str());
     }
 
@@ -980,7 +982,7 @@ class TestLeakAutoVar : public TestFixture {
               "}\n"
               "void f2(struct foo *f, int *out) {\n"
               "  *out = f->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1118,35 +1120,35 @@ class TestLeakAutoVar : public TestFixture {
               "    else\n"
               "        p = 0;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:9] -> [test.c:6:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  free(p);\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:3:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p, char *r) {\n"
             "  free(p);\n"
             "  free(r);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  free(p);\n"
             "  free(r);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  if (x < 3) free(p);\n"
             "  else { if (x > 9) free(p); }\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1154,7 +1156,7 @@ class TestLeakAutoVar : public TestFixture {
             "  free(p);\n"
             "  getNext(&p);\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1162,7 +1164,7 @@ class TestLeakAutoVar : public TestFixture {
             "  free(p);\n"
             "  bar();\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1170,7 +1172,7 @@ class TestLeakAutoVar : public TestFixture {
             "  free(p);\n"
             "  printf(\"Freed memory at location %x\", p);\n"
             "  free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:3:41]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n"
                       "[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n",
                       errout_str());
@@ -1179,21 +1181,21 @@ class TestLeakAutoVar : public TestFixture {
             "void foo(FILE *p) {\n"
             "  fclose(p);\n"
             "  fclose(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:3:3]: (error) Resource handle 'p' freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(FILE *p, FILE *r) {\n"
             "  fclose(p);\n"
             "  fclose(r);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(FILE *p) {\n"
             "  if (x < 3) fclose(p);\n"
             "  else { if (x > 9) fclose(p); }\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1201,7 +1203,7 @@ class TestLeakAutoVar : public TestFixture {
             "  fclose(p);\n"
             "  gethandle(&p);\n"
             "  fclose(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1209,14 +1211,14 @@ class TestLeakAutoVar : public TestFixture {
             "  fclose(p);\n"
             "  gethandle();\n"
             "  fclose(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Resource handle 'p' freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(Data* p) {\n"
             "  free(p->a);\n"
             "  free(p->b);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1227,7 +1229,7 @@ class TestLeakAutoVar : public TestFixture {
             "        exit();\n"
             "    }\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1238,7 +1240,7 @@ class TestLeakAutoVar : public TestFixture {
             "        x = 0;\n"
             "    }\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:4:9] -> [test.c:7:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1247,35 +1249,35 @@ class TestLeakAutoVar : public TestFixture {
             "    free(p);\n"
             "    p = do_something();\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete p;\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:10]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p, char *r) {\n"
             "  delete p;\n"
             "  delete r;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(P p) {\n"
             "  delete p.x;\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char **p) {\n"
             "  delete p[0];\n"
             "  delete p[1];\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1283,7 +1285,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete p;\n"
             "  getNext(&p);\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1291,21 +1293,21 @@ class TestLeakAutoVar : public TestFixture {
             "  delete p;\n"
             "  bar();\n"
             "  delete p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:4:10]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete[] p;\n"
             "  delete[] p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:12]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p, char *r) {\n"
             "  delete[] p;\n"
             "  delete[] r;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1313,7 +1315,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete[] p;\n"
             "  getNext(&p);\n"
             "  delete[] p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1321,7 +1323,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete[] p;\n"
             "  bar();\n"
             "  delete[] p;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:4:12]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1332,7 +1334,7 @@ class TestLeakAutoVar : public TestFixture {
             "  delete pxpm;\n"
             "  pxpm = NULL;\n"
             "  return *this;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1349,7 +1351,7 @@ class TestLeakAutoVar : public TestFixture {
             "      throw;\n"
             "    }\n"
             "  delete ptr;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1365,7 +1367,7 @@ class TestLeakAutoVar : public TestFixture {
             "   if(doDelete)\n"
             "       delete a;\n"
             "   return 0;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("", "[test.cpp:8:8] -> [test.cpp:11:15]: (error) Memory pointed to by 'a' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1379,7 +1381,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1391,7 +1393,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
@@ -1403,7 +1405,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
@@ -1415,7 +1417,7 @@ class TestLeakAutoVar : public TestFixture {
             "        free(x);\n"
             "    }\n"
             "    free(x);\n"
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("[test.c:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
@@ -1429,7 +1431,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1443,7 +1445,7 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    } while (true);\n"
             "    delete[] x;\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1455,7 +1457,7 @@ class TestLeakAutoVar : public TestFixture {
             "        free(p);\n"
             "    }\n"
             "    free(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.c:6:9] -> [test.c:8:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
@@ -1476,7 +1478,7 @@ class TestLeakAutoVar : public TestFixture {
             "void MyThrow(err)\n"
             "{\n"
             "    throw(err);\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -1497,7 +1499,7 @@ class TestLeakAutoVar : public TestFixture {
             "void MyExit(err)\n"
             "{\n"
             "    exit(err);\n"
-            "}", dinit(CheckOptions, $.cpp = true));
+            "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check( // #6252
@@ -1512,14 +1514,14 @@ class TestLeakAutoVar : public TestFixture {
             "        delete m_thing;\n"
             "        m_thing = new Thing;\n"
             "    }\n"
-            "};", dinit(CheckOptions, $.cpp = true));
+            "};\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         // #7401
         check("void pCodeLabelDestruct(pCode *pc) {\n"
               "    free(PCL(pc)->label);\n"
               "    free(pc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1529,7 +1531,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (a == 2) { free(p); return ((void*)1); }\n"
               "    free(p);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1546,7 +1548,7 @@ class TestLeakAutoVar : public TestFixture {
               "       free(bar)\n"
               "   } while(!done);\n"
               "   return;"
-              "}"
+              "}\n"
               );
         ASSERT_EQUALS("", errout_str());
     }
@@ -1558,7 +1560,7 @@ class TestLeakAutoVar : public TestFixture {
               "    exit(1);\n"
               "  }\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void* p, int i) {\n" // #11391
@@ -1578,7 +1580,7 @@ class TestLeakAutoVar : public TestFixture {
               "  free(p);\n"
               "  x = (q == p);\n"
               "  free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
     }
 
@@ -1586,7 +1588,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void do_wordexp(FILE *f) {\n"
               "  free(getword(f));\n"
               "  fclose(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1595,14 +1597,14 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    if (x && (p = malloc(10)))\n"
               "        free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
               "    delete[] p;\n"
               "    if (x && (p = new char[10]))\n"
               "        delete[] p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1715,7 +1717,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (q == NULL)\n"
               "        return;\n"
               "    free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:16] -> [test.c:8:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
     }
 
@@ -1751,7 +1753,7 @@ class TestLeakAutoVar : public TestFixture {
               "    int *i = new int;\n"
               "    unique_ptr<int> x(i);\n"
               "    delete i;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:6:5] -> [test.cpp:7:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         check("using namespace std;\n"
@@ -1760,14 +1762,14 @@ class TestLeakAutoVar : public TestFixture {
               "{\n"
               "    int *i = new int;\n"
               "    unique_ptr<int> x(i);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree15() { // #11966
         check("void f(FILE* fp) {\n"
               "    static_cast<void>(fclose(fp));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1801,11 +1803,35 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:6:16]: (error) Memory pointed to by 'c' is freed twice. [doubleFree]\n", errout_str());
     }
 
+    void doublefree18() {
+        check("typedef struct {\n" // #13918
+              "    FILE * fp;\n"
+              "} S;\n"
+              "void f(S* s, FILE* x) {\n"
+              "    if (fclose(s->fp)) {}\n"
+              "    s->fp = x;\n"
+              "    if (fclose(s->fp)) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void doublefree19() {
+        check("struct S {\n"
+              "  void *x;\n"
+              "};\n"
+              "void f(struct S *p)\n"
+              "{\n"
+              "  free(p->x);\n"
+              "  free(p->x);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:6:3] -> [test.c:7:3]: (error) Memory pointed to by 'x' is freed twice. [doubleFree]\n", errout_str());
+    }
+
     void exit1() {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    exit(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1813,7 +1839,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    fatal_error();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:18]: (information) --check-library: Function fatal_error() should have <noreturn> configuration [checkLibraryNoReturn]\n",
                       errout_str());
     }
@@ -1824,9 +1850,9 @@ class TestLeakAutoVar : public TestFixture {
               "  if (x) {\n"
               "    free(p);\n"
               "    ::exit(0);\n"
-              "  }"
+              "  }\n"
               "  free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1834,9 +1860,9 @@ class TestLeakAutoVar : public TestFixture {
               "  if (x) {\n"
               "    free(p);\n"
               "    std::exit(0);\n"
-              "  }"
+              "  }\n"
               "  free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1849,7 +1875,7 @@ class TestLeakAutoVar : public TestFixture {
               "        func_notret();\n"
               "    }\n"
               "    free(ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1858,7 +1884,7 @@ class TestLeakAutoVar : public TestFixture {
               "  p->x = malloc(10);\n"
               "  free(p->x);\n"
               "  p->x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(s_t s) {\n" // #11061
@@ -1868,20 +1894,19 @@ class TestLeakAutoVar : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        const Settings s = settingsBuilder().library("std.cfg").build();
         check("struct S {};\n"
               "void f(int i, std::vector<std::unique_ptr<S>> &v) {\n"
               "    if (i < 1) {\n"
               "        auto s = new S;\n"
               "        v.push_back(std::unique_ptr<S>(s));\n"
               "    }\n"
-              "}\n", dinit(CheckOptions, $.cpp = true, $.s = &s));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str()); // don't crash
 
         check("void g(size_t len) {\n" // #12365
               "    char* b = new char[len + 1]{};\n"
               "    std::string str = std::string(b);\n"
-              "}", dinit(CheckOptions, $.cpp = true, $.s = &s));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: b [memleak]\n", errout_str());
     }
 
@@ -1892,7 +1917,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (err) {\n"
               "        free(reg);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1905,7 +1930,7 @@ class TestLeakAutoVar : public TestFixture {
               "        goto x;\n"
               "    }\n"
               "    return p;\n"  // no error since there is a goto
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1930,7 +1955,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    else { return 0; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1939,7 +1964,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = NULL;\n"
               "    if (x) { p = malloc(10); }\n"
               "    else { return 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:5:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -1948,7 +1973,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    if (!p) { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char * f(size_t size) {"
@@ -1956,14 +1981,14 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!p && size != 0)"
               "        return NULL;"
               "    return p;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    if (p) { } else { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3866 - UNLIKELY
@@ -1971,7 +1996,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    if (UNLIKELY(!p)) { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1980,7 +2005,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p;\n"
               "    if (x) { p = malloc(10); }\n"
               "    if (x) { free(p); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -1988,7 +2013,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    if (!x) { return; }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1997,7 +2022,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    if (!p && x) { p = malloc(10); }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2008,7 +2033,7 @@ class TestLeakAutoVar : public TestFixture {
               "        free(a);\n"
               "    else\n"
               "        a = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:6:9]: (error) Memory leak: a [memleak]\n", errout_str());
     }
 
@@ -2018,7 +2043,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x < 0)\n"  // assume negative value indicates its unallocated
               "        return;\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2028,7 +2053,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd == -1)\n"
               "        return -1;\n"
               "    return fd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
@@ -2036,7 +2061,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd != -1)\n"
               "        return fd;\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2046,7 +2071,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (dostuff(p==NULL,0))\n"
               "        return;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2056,7 +2081,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!(x != NULL))\n"
               "        return;\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2066,7 +2091,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (NULL == (p = malloc(4)))\n"
               "        return;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2074,7 +2099,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f(char **p) {\n"
               "    if ((*p = malloc(4)) == NULL)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2085,7 +2110,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return 1;\n"
               "    free(path);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int fd, const char *mode) {\n"
@@ -2094,7 +2119,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return 1;\n" // <- memory leak
               "    free(path);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4] memory leak", "", errout_str());
     }
 
@@ -2104,7 +2129,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (buf == (char*)NULL)\n"
               "        return NULL;\n"
               "    return buf;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2114,14 +2139,14 @@ class TestLeakAutoVar : public TestFixture {
               "void test_alloc() {\n"
               "   if ( global_ptr = new SSS()) {}\n"
               "   return;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("FILE* hFile;\n"
               "int openFile( void ) {\n"
               "   if ((hFile = fopen(\"1.txt\", \"wb\" )) == NULL) return 0;\n"
               "   return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2132,7 +2157,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(p);\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
@@ -2141,7 +2166,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(p);\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2151,7 +2176,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!p)\n"
               "        return NULL;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int *f() {\n"
@@ -2159,7 +2184,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!!(!p))\n"
               "        return NULL;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2170,7 +2195,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (q == 0)\n"
               "        return;\n"
               "    free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:5:9]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
@@ -2181,7 +2206,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    } else\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:8:9]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -2192,7 +2217,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!b)\n"
               "        return;\n"
               "    a = b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2203,18 +2228,18 @@ class TestLeakAutoVar : public TestFixture {
               "    else\n"
               "        void * p2 = malloc(2);\n"
               "    return;\n"
-              "}");
-        ASSERT_EQUALS("[test.c:3:0]: (error) Memory leak: p1 [memleak]\n"
-                      "[test.c:5:0]: (error) Memory leak: p2 [memleak]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.c:3:30]: (error) Memory leak: p1 [memleak]\n"
+                      "[test.c:5:30]: (error) Memory leak: p2 [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    if (x > 0)\n"
               "        void * p1 = malloc(5);\n"
               "    else\n"
               "        void * p2 = malloc(2);\n"
-              "}");
-        ASSERT_EQUALS("[test.c:3:0]: (error) Memory leak: p1 [memleak]\n"
-                      "[test.c:5:0]: (error) Memory leak: p2 [memleak]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.c:3:30]: (error) Memory leak: p1 [memleak]\n"
+                      "[test.c:5:30]: (error) Memory leak: p2 [memleak]\n", errout_str());
     }
 
     void ifelse21() {
@@ -2225,7 +2250,7 @@ class TestLeakAutoVar : public TestFixture {
               "            p = malloc(5);\n"
               "    }\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:6:5]: (error) Memory leak: p [memleak]\n",  errout_str());
     }
 
@@ -2235,7 +2260,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd >= 0)\n"
               "        return fd;\n"
               "    return -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const char * pathname, int flags) {\n"
@@ -2243,7 +2268,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fd <= -1)\n"
               "        return -1;\n"
               "    return fd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2255,7 +2280,7 @@ class TestLeakAutoVar : public TestFixture {
     }
 
     void ifelse24() { // #1733
-        const Settings s = settingsBuilder().library("std.cfg").library("posix.cfg").build();
+        const Settings s = settingsBuilder().library("std.cfg").library("posix.cfg").checkLibrary().build();
 
         check("void f() {\n"
               "    char* temp = strdup(\"temp.txt\");\n"
@@ -2361,6 +2386,22 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("", errout_str()); // don't crash
     }
 
+    void ifelse30() {
+        check("void f(void** pp) {\n" // #14709
+              "    void* p = malloc(8);\n"
+              "    if ((void*)p == 0)\n"
+              "        return;\n"
+              "    *pp = p;\n"
+              "}\n"
+              "void g(void** pp) {\n"
+              "    void* p = malloc(8);\n"
+              "    if (static_cast<void*>(p) == 0)\n"
+              "        return;\n"
+              "    *pp = p;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void switch1() {
         check("void f() {\n"
               "    char *p = 0;\n"
@@ -2369,7 +2410,7 @@ class TestLeakAutoVar : public TestFixture {
               "    default: return;\n"
               "    }\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2380,7 +2421,7 @@ class TestLeakAutoVar : public TestFixture {
               "    for (i=0;i<5;i++) { }\n"
               "    if (x) { free(p) }\n"
               "    else { a = p; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2415,13 +2456,13 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    free(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:12] -> [test.c:3:5]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    free((void*)f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:12] -> [test.c:3:5]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
@@ -2431,18 +2472,18 @@ class TestLeakAutoVar : public TestFixture {
               "    delete[] cPtr;\n"
               "    cPtr = new char[100];\n"
               "    delete cPtr;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:7:12]: (error) Mismatching allocation and deallocation: cPtr [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    char *cPtr = new char[100];\n"
               "    free(cPtr);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:3:5]: (error) Mismatching allocation and deallocation: cPtr [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    char *cPtr = new (buf) char[100];\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2461,7 +2502,7 @@ class TestLeakAutoVar : public TestFixture {
               "   void* a = malloc(1);\n"
               "   void* b = freopen(f, p, a);\n"
               "   free(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:2:14] -> [test.c:3:14]: (error) Mismatching allocation and deallocation: a [mismatchAllocDealloc]\n"
                       "[test.c:3:14] -> [test.c:4:4]: (error) Mismatching allocation and deallocation: b [mismatchAllocDealloc]\n", errout_str());
 
@@ -2469,14 +2510,14 @@ class TestLeakAutoVar : public TestFixture {
               "   void* a;\n"
               "   void* b = realloc(a, 10);\n"
               "   free(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int * i = new int;\n"
               "   int * j = realloc(i, 2 * sizeof(int));\n"
               "   delete[] j;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:14]: (error) Mismatching allocation and deallocation: i [mismatchAllocDealloc]\n"
                       "[test.cpp:3:14] -> [test.cpp:4:13]: (error) Mismatching allocation and deallocation: j [mismatchAllocDealloc]\n", errout_str());
 
@@ -2506,26 +2547,26 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::unique_ptr<FILE> fp{f};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:30]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::unique_ptr<FILE, decltype(&fclose)> fp{f, &fclose};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, &fclose};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct deleter { void operator()(FILE* f) { fclose(f); }};\n"
               "void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::unique_ptr<FILE, deleter> fp{f};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int * create();\n"
@@ -2547,39 +2588,39 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, [](FILE* x) { fclose(x); }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, +[](FILE* x) { fclose(x); }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, [](FILE* x) { free(f); }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:30]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::shared_ptr<FILE> fp{f, [](FILE* x) {}};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:30]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("class C;\n"
               "void f() {\n"
               "  C* c = new C{};\n"
               "  std::shared_ptr<C> a{c, [](C*) {}};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class C;\n"
               "void f() {\n"
               "  C* c = new C{};\n"
               "  std::shared_ptr<C> a{c, [](C* x) { delete x; }};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct DirDeleter {\n" // #12544
@@ -2611,7 +2652,7 @@ class TestLeakAutoVar : public TestFixture {
         check("int f() {\n"
               "    char *p = malloc(100);\n"
               "    return 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -2619,7 +2660,7 @@ class TestLeakAutoVar : public TestFixture {
         check("char *f() {\n"
               "    char *p = malloc(100);\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2627,7 +2668,7 @@ class TestLeakAutoVar : public TestFixture {
         check("struct dev * f() {\n"
               "    struct ABC *abc = malloc(100);\n"
               "    return &abc->dev;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2639,7 +2680,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
@@ -2648,7 +2689,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    delete p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
@@ -2657,7 +2698,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    delete [] p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2671,7 +2712,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2679,7 +2720,7 @@ class TestLeakAutoVar : public TestFixture {
         check("std::pair<char*, char*> f(size_t n) {\n"
               "   char* p = (char* )malloc(n);\n"
               "   return {p, p};\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2687,43 +2728,43 @@ class TestLeakAutoVar : public TestFixture {
         check("uint8_t *f() {\n"
               "    void *x = malloc(1);\n"
               "    return (uint8_t *)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("uint8_t f() {\n"
               "    void *x = malloc(1);\n"
               "    return (uint8_t)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: x [memleak]\n", errout_str());
 
         check("void** f() {\n"
               "    void *x = malloc(1);\n"
               "    return (void**)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (long long)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (void*)(short)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: x [memleak]\n", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (mytype)x;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n" // Do not crash
               "    void *x = malloc(1);\n"
               "    return (mytype)y;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: x [memleak]\n", errout_str());
     }
 
@@ -2731,25 +2772,25 @@ class TestLeakAutoVar : public TestFixture {
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (x);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return ((x));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return ((((x))));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("char* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (char*)(x);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2757,7 +2798,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void* f() {\n"
               "    void *x = malloc (sizeof (struct alloc));\n"
               "    return x + sizeof (struct alloc);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2766,7 +2807,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char* p = (char*)malloc(1);\n"
               "    p[0] = 'x';\n"
               "    return p[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:5]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("struct S { int f(); };\n" // #11746
@@ -2774,14 +2815,14 @@ class TestLeakAutoVar : public TestFixture {
               "    S* s = new S;\n"
               "    delete s;\n"
               "    return s->f();\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:5:5]: (error) Returning/dereferencing 's' after it is deallocated / released [deallocret]\n", errout_str());
 
         check("int f() {\n"
               "    int* p = new int(3);\n"
               "    delete p;\n"
               "    return *p;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:4:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n", errout_str());
     }
 
@@ -2807,10 +2848,37 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("[test.c:7:5]: (error) Memory leak: ptr [memleak]\n", errout_str());
     }
 
+    void return12() { // #12238
+        CheckOptions options;
+        options.cpp = true;
+        check("void f(size_t size) {\n"
+              "    void* buffer = malloc(size);\n"
+              "    std::vector<void*> v{ buffer };\n"
+              "    x->g(v);\n"
+              "}\n", options);
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void return13() { // #4638
+        CheckOptions options;
+        options.cpp = true;
+        check("bool f() {\n"
+              "    int* p = new int;\n"
+              "    return p;\n"
+              "}\n"
+              "bool g() {\n"
+              "    void* p = malloc(4);\n"
+              "    return p;\n"
+              "}\n", options);
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: p [memleak]\n"
+                      "[test.cpp:7:5]: (error) Memory leak: p [memleak]\n",
+                      errout_str());
+    }
+
     void test1() {
         check("void f(double*&p) {\n" // 3809
               "    p = malloc(0x100);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int*& p) {\n" // #4400
@@ -2839,7 +2907,7 @@ class TestLeakAutoVar : public TestFixture {
         check("struct Fred {\n"
               "    char *p;\n"
               "    void f1() { free(p); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2847,7 +2915,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *&p = x();\n"
               "    p = malloc(10);\n"
-              "};", dinit(CheckOptions, $.cpp = true));
+              "};\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2856,21 +2924,21 @@ class TestLeakAutoVar : public TestFixture {
               "    static char *p;\n"
               "    if (!p) p = malloc(10);\n"
               "    if (x) { free(p); p = 0; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void test5() { // unknown type
-        check("void f() { Fred *p = malloc(10); }", dinit(CheckOptions, $.cpp = true));
+        check("void f() { Fred *p = malloc(10); }\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:1:34]: (error) Memory leak: p [memleak]\n", errout_str());
 
-        check("void f() { Fred *p = malloc(10); }");
+        check("void f() { Fred *p = malloc(10); }\n");
         ASSERT_EQUALS("[test.c:1:34]: (error) Memory leak: p [memleak]\n", errout_str());
 
-        check("void f() { Fred *p = new Fred; }", dinit(CheckOptions, $.cpp = true));
+        check("void f() { Fred *p = new Fred; }\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { Fred fred = malloc(10); }", dinit(CheckOptions, $.cpp = true));
+        check("void f() { Fred fred = malloc(10); }\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2878,7 +2946,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    throw 123;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
@@ -2888,7 +2956,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 123;\n"
               "    } catch (...) { }\n"
               "    free(p);\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2905,7 +2973,7 @@ class TestLeakAutoVar : public TestFixture {
               "        throw ::NS::Except();\n"
               "    }\n"
               "    delete pi;\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2918,7 +2986,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    x(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:9]: (information) --check-library: Function x() should have <noreturn> configuration [checkLibraryNoReturn]\n"
                       "[test.c:4:1]: (information) --check-library: Function x() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n",
                       errout_str());
@@ -2936,7 +3004,7 @@ class TestLeakAutoVar : public TestFixture {
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    x(&p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:10]: (information) --check-library: Function x() should have <noreturn> configuration [checkLibraryNoReturn]\n"
                       "[test.c:4:1]: (information) --check-library: Function x() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n",
                       errout_str());
@@ -2947,7 +3015,7 @@ class TestLeakAutoVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    char *p = malloc(10);\n"
                                 "    if (set_data(p)) { }\n"
-                                "}";
+                                "}\n";
             check(code);
             ASSERT_EQUALS("[test.c:4:1]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
             check(code, dinit(CheckOptions, $.cpp = true));
@@ -2958,7 +3026,7 @@ class TestLeakAutoVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    char *p = malloc(10);\n"
                                 "    if (set_data(p)) { return; }\n"
-                                "}";
+                                "}\n";
             check(code);
             ASSERT_EQUALS("[test.c:3:24]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n"
                           "[test.c:4:1]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n"
@@ -2975,7 +3043,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    int ret = set_data(p);\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:4:5]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
@@ -3053,7 +3121,7 @@ class TestLeakAutoVar : public TestFixture {
     void ptrptr() {
         check("void f() {\n"
               "    char **p = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
@@ -3061,19 +3129,19 @@ class TestLeakAutoVar : public TestFixture {
         check("void QueueDSMCCPacket(unsigned char *data, int length) {\n"
               "    unsigned char *dataCopy = malloc(length * sizeof(unsigned char));\n"
               "    m_dsmccQueue.enqueue(new DSMCCPacket(dataCopy));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function DSMCCPacket() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
 
         check("void QueueDSMCCPacket(unsigned char *data, int length) {\n"
               "    unsigned char *dataCopy = malloc(length * sizeof(unsigned char));\n"
               "    m_dsmccQueue.enqueue(new DSMCCPacket(somethingunrelated));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: dataCopy [memleak]\n", errout_str());
 
         check("void f() {\n"
               "  char *buf = new char[1000];\n"
               "  clist.push_back(new (std::nothrow) C(buf));\n"
-              "}", dinit(CheckOptions, $.cpp = true));
+              "}\n", dinit(CheckOptions, $.cpp = true));
         ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function C() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
@@ -3082,7 +3150,7 @@ class TestLeakAutoVar : public TestFixture {
               "  double *new = malloc(1*sizeof(double));\n"
               "  free(new);\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3095,7 +3163,7 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    c = malloc(128);\n"
               "    return ret();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3111,6 +3179,34 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void unconditionalScope() {
+        check("void f() {\n" // #14945
+              "    {\n"
+              "        int* p = new int;\n"
+              "        *p = 1;\n"
+              "    }\n"
+              "    {\n"
+              "        int* q = new int;\n"
+              "        *q = 2;\n"
+              "        delete q;\n"
+              "    }\n"
+              "    int* r = new int;\n"
+              "    *r = 3;\n"
+              "    delete r;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Memory leak: p [memleak]\n", errout_str());
+
+        check("void f() {\n"
+              "    int* p = new int;\n"
+              "    {\n"
+              "        (void)p;\n"
+              "    }\n"
+              "    *p = 1;\n"
+              "    delete p;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void functionCallCastConfig() { // #9652
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<def format=\"2\">\n"
@@ -3130,7 +3226,7 @@ class TestLeakAutoVar : public TestFixture {
               "{\n"
               "    char * buf = malloc(4);\n"
               "    free_func((void *)(1), buf);\n"
-              "}", settingsFunctionCall);
+              "}\n", settingsFunctionCall);
         ASSERT_EQUALS("[test.cpp:5:1]: (information) --check-library: Function free_func() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
 
         check("void g(void*);\n"
@@ -3157,7 +3253,7 @@ class TestLeakAutoVar : public TestFixture {
                                    "    <arg nr=\"1\" direction=\"in\"/>\n"
                                    "  </function>\n"
                                    "</def>\n";
-        const Settings settingsLeakIgnore = settingsBuilder().libraryxml(xmldata).build();
+        const Settings settingsLeakIgnore = settingsBuilder().libraryxml(xmldata).checkLibrary().build();
         check("void f() {\n"
               "    double* a = new double[1024];\n"
               "    SomeClass::someMethod(a);\n"
@@ -3192,14 +3288,15 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
     const Settings settings = settingsBuilder().library("std.cfg").checkLibrary().build();
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkP_(const char* file, int line, const char code[], bool cpp = false) {
-        SimpleTokenizer2 tokenizer(settings, *this, code, cpp?"test.cpp":"test.c");
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.c");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -3215,7 +3312,7 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
                                             "void foo() {\n"
                                             "  if (0) { }\n"
                                             "  THOU THOU\n"
-                                            "}"), LIMIT, "Internal limit: CheckLeakAutoVar::checkScope() Maximum recursive count of 1000 reached.");
+                                            "}\n"), LIMIT, "Internal limit: CheckLeakAutoVar::checkScope() Maximum recursive count of 1000 reached.");
         ASSERT_NO_THROW(checkP("#define ONE     if (0) { }\n"
                                "#define TEN     ONE ONE ONE ONE ONE ONE ONE ONE ONE ONE\n"
                                "#define HUN     TEN TEN TEN TEN TEN TEN TEN TEN TEN TEN\n"
@@ -3223,7 +3320,7 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
                                "void foo() {\n"
                                "  if (0) { }\n"
                                "  THOU THOU\n"
-                               "}"));
+                               "}\n"));
     }
 };
 
@@ -3245,8 +3342,8 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -3265,7 +3362,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
               "{\n"
               "    char* ptr = new char[strlen(str)+1];\n"
               "    m = strcpy(ptr, str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3273,7 +3370,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         check("void f(char *p) {\n"
               "    free(p);\n"
               "    strcpy(a, p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
 
         check("void f(char *p, const char *q) {\n" // #11665
@@ -3286,12 +3383,12 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         check("void f(char *p) {\n"   // #3041 - assigning pointer when it's used
               "    free(p);\n"
               "    strcpy(a, p=b());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void fclose_false_positive() { // #9575
-        check("int  f(FILE *fp) { return fclose(fp); }");
+        check("int  f(FILE *fp) { return fclose(fp); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3321,7 +3418,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
               "    if (b)\n"
               "        p = new S();\n"
               "    p->f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("class B { std::string s; };\n" // #12062
@@ -3350,8 +3447,8 @@ class TestLeakAutoVarWindows : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, false);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -3423,8 +3520,8 @@ class TestLeakAutoVarPosix : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index 657df937716..28264a02a53 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -28,7 +28,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <map>
-#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -64,6 +63,8 @@ class TestLibrary : public TestFixture {
         TEST_CASE(resource);
         TEST_CASE(podtype);
         TEST_CASE(container);
+        TEST_CASE(containerActionToFromString);
+        TEST_CASE(containerYieldToFromString);
         TEST_CASE(version);
         TEST_CASE(loadLibErrors);
         TEST_CASE(loadLibCombinations);
@@ -108,7 +109,7 @@ class TestLibrary : public TestFixture {
                                    "  </function>\n"
                                    "</def>";
 
-        const char code[] = "foo();";
+        const char code[] = "foo();\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -130,13 +131,13 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         {
-            const char code[] = "fred.foo(123);"; // <- wrong scope, not library function
+            const char code[] = "fred.foo(123);\n"; // <- wrong scope, not library function
             const SimpleTokenList tokenList(code);
 
             ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
         }
         {
-            const char code[] = "Fred::foo(123);"; // <- wrong scope, not library function
+            const char code[] = "Fred::foo(123);\n"; // <- wrong scope, not library function
             const SimpleTokenList tokenList(code);
 
             ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
@@ -152,8 +153,8 @@ class TestLibrary : public TestFixture {
                                    "</def>";
 
         TokenList tokenList(settingsDefault, Standards::Language::CPP);
-        std::istringstream istr("foo();"); // <- too few arguments, not library function
-        ASSERT(tokenList.createTokens(istr));
+        const char code[] = "foo();\n"; // <- too few arguments, not library function
+        ASSERT(tokenList.createTokensFromString(code));
         Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
         tokenList.createAst();
 
@@ -176,8 +177,8 @@ class TestLibrary : public TestFixture {
 
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            std::istringstream istr("foo();"); // <- too few arguments, not library function
-            ASSERT(tokenList.createTokens(istr));
+            const char code[] = "foo();\n"; // <- too few arguments, not library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -185,8 +186,8 @@ class TestLibrary : public TestFixture {
         }
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            std::istringstream istr("foo(a);"); // <- library function
-            ASSERT(tokenList.createTokens(istr));
+            const char code[] = "foo(a);\n"; // <- library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -196,8 +197,8 @@ class TestLibrary : public TestFixture {
         }
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            std::istringstream istr("foo(a, b);"); // <- library function
-            ASSERT(tokenList.createTokens(istr));
+            const char code[] = "foo(a, b);\n"; // <- library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -207,8 +208,8 @@ class TestLibrary : public TestFixture {
         }
         {
             TokenList tokenList(settingsDefault, Standards::Language::CPP);
-            std::istringstream istr("foo(a, b, c);"); // <- too much arguments, not library function
-            ASSERT(tokenList.createTokens(istr));
+            const char code[] = "foo(a, b, c);\n"; // <- too much arguments, not library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -224,7 +225,7 @@ class TestLibrary : public TestFixture {
                                    "  </function>\n"
                                    "</def>";
 
-        const char code[] = "Fred foo(123);"; // <- Variable declaration, not library function
+        const char code[] = "Fred foo(123);\n"; // <- Variable declaration, not library function
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
         tokenList.front()->next()->varId(1);
@@ -284,7 +285,7 @@ class TestLibrary : public TestFixture {
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         ASSERT_EQUALS(0, library.functions().at("foo").argumentChecks.at(-1).notuninit);
 
-        const char code[] = "foo(a,b,c,d,e);";
+        const char code[] = "foo(a,b,c,d,e);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -308,7 +309,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "foo(a,b,c,d);";
+        const char code[] = "foo(a,b,c,d);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -339,7 +340,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "foo(a,b,c,d,e,f,g,h,i,j,k);";
+        const char code[] = "foo(a,b,c,d,e,f,g,h,i,j,k);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -480,7 +481,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "foo(a,b,c,d,e);";
+        const char code[] = "foo(a,b,c,d,e);\n";
         SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
@@ -542,13 +543,13 @@ class TestLibrary : public TestFixture {
         ASSERT(library.functions().at("bar").argumentChecks.empty());
 
         {
-            const char code[] = "Foo::foo();";
+            const char code[] = "Foo::foo();\n";
             const SimpleTokenList tokenList(code);
             ASSERT(library.isnotnoreturn(tokenList.front()->tokAt(2)));
         }
 
         {
-            const char code[] = "bar();";
+            const char code[] = "bar();\n";
             const SimpleTokenList tokenList(code);
             ASSERT(library.isnotnoreturn(tokenList.front()));
         }
@@ -568,14 +569,14 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "CString str; str.Format();";
+            const char code[] = "CString str; str.Format();\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "HardDrive hd; hd.Format();";
+            const char code[] = "HardDrive hd; hd.Format();\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
@@ -594,14 +595,14 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "struct X : public Base { void dostuff() { f(0); } };";
+            const char code[] = "struct X : public Base { void dostuff() { f(0); } };\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
 
         {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            const char code[] = "struct X : public Base { void dostuff() { f(1,2); } };";
+            const char code[] = "struct X : public Base { void dostuff() { f(1,2); } };\n";
             ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
@@ -621,7 +622,7 @@ class TestLibrary : public TestFixture {
         Library library;
         ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        const char code[] = "a(); b();";
+        const char code[] = "a(); b();\n";
         const SimpleTokenList tokenList(code);
 
         const Library::WarnInfo* a = library.getWarnInfo(tokenList.front());
@@ -871,7 +872,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::A<int> a;"));
+            ASSERT(var.tokenize("std::A<int> a;\n"));
             ASSERT_EQUALS(&A, library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -881,7 +882,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::A<int>::size_type a_s;"));
+            ASSERT(var.tokenize("std::A<int>::size_type a_s;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -889,7 +890,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::A<int>::iterator a_it;"));
+            ASSERT(var.tokenize("std::A<int>::iterator a_it;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT_EQUALS(&A, library.detectIterator(var.tokens()));
             bool isIterator;
@@ -899,7 +900,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::B<int> b;"));
+            ASSERT(var.tokenize("std::B<int> b;\n"));
             ASSERT_EQUALS(&B, library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -909,7 +910,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::B<int>::size_type b_s;"));
+            ASSERT(var.tokenize("std::B<int>::size_type b_s;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -917,7 +918,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::B<int>::iterator b_it;"));
+            ASSERT(var.tokenize("std::B<int>::iterator b_it;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT_EQUALS(&B, library.detectIterator(var.tokens()));
             bool isIterator;
@@ -927,7 +928,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("C c;"));
+            ASSERT(var.tokenize("C c;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -935,7 +936,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("D d;"));
+            ASSERT(var.tokenize("D d;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -943,7 +944,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::E e;"));
+            ASSERT(var.tokenize("std::E e;\n"));
             ASSERT(library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -954,7 +955,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("E e;"));
+            ASSERT(var.tokenize("E e;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -963,7 +964,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::E::iterator I;"));
+            ASSERT(var.tokenize("std::E::iterator I;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -972,7 +973,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::E::size_type p;"));
+            ASSERT(var.tokenize("std::E::size_type p;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -981,7 +982,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::F f;"));
+            ASSERT(var.tokenize("std::F f;\n"));
             ASSERT(library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -991,7 +992,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("std::F::iterator I;"));
+            ASSERT(var.tokenize("std::F::iterator I;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             TODO_ASSERT(library.detectIterator(var.tokens()));
             bool isIterator = false;
@@ -1001,7 +1002,7 @@ class TestLibrary : public TestFixture {
 
         {
             SimpleTokenizer var(*this);
-            ASSERT(var.tokenize("F::iterator I;"));
+            ASSERT(var.tokenize("F::iterator I;\n"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
@@ -1011,7 +1012,14 @@ class TestLibrary : public TestFixture {
         }
     }
 
-#define LOADLIBERROR(xmldata, errorcode) loadLibError(xmldata, errorcode, __FILE__, __LINE__)
+#define LOADLIBERROR(...) loadLibError(__FILE__, __LINE__, __VA_ARGS__)
+    template<std::size_t size>
+    void loadLibError(const char* file, unsigned line, const char (&xmldata)[size], Library::ErrorCode errorcode) const {
+        Library library;
+        Library::Error liberr;
+        assertEquals(file, line, true, LibraryHelper::loadxmldata(library, liberr, xmldata, size-1));
+        assertEquals(file, line, true, errorcode == liberr.errorcode);
+    }
 
     void version() const {
         {
@@ -1036,12 +1044,20 @@ class TestLibrary : public TestFixture {
         }
     }
 
-    template<std::size_t size>
-    void loadLibError(const char (&xmldata)[size], Library::ErrorCode errorcode, const char* file, unsigned line) const {
-        Library library;
-        Library::Error liberr;
-        assertEquals(file, line, true, LibraryHelper::loadxmldata(library, liberr, xmldata, size-1));
-        assertEquals(file, line, true, errorcode == liberr.errorcode);
+    void containerActionToFromString() const {
+        for (uint16_t i = 0; i < static_cast<uint16_t>(Library::Container::Action::NO_ACTION); ++i) {
+            const auto a = static_cast<Library::Container::Action>(i);
+            const std::string& s = Library::Container::toString(a);
+            ASSERT_EQUALS(i, static_cast<uint16_t>(Library::Container::actionFrom(s)));
+        }
+    }
+
+    void containerYieldToFromString() const {
+        for (uint16_t i = 0; i < static_cast<uint16_t>(Library::Container::Yield::NO_YIELD); ++i) {
+            const auto y = static_cast<Library::Container::Yield>(i);
+            const std::string& s = Library::Container::toString(y);
+            ASSERT_EQUALS(i, static_cast<uint16_t>(Library::Container::yieldFrom(s)));
+        }
     }
 
 #define LOADLIB_ERROR_INVALID_RANGE(valid) LOADLIBERROR("<?xml version=\"1.0\"?>\n" \
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index dbd4a5e8837..8cbe5b50019 100644
--- a/test/testmathlib.cpp
+++ b/test/testmathlib.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
 #include "fixture.h"
 #include "mathlib.h"
+#include "standards.h"
 #include "token.h"
 #include "tokenlist.h"
 
@@ -167,7 +167,7 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("1", MathLib::calculate("0", "1", '^'));
 
         // Unknown action should throw exception
-        ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate(). Please report this to Cppcheck developers.");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate().");
     }
 
     void calculate1() const {
@@ -385,23 +385,19 @@ class TestMathLib : public TestFixture {
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("02000000000000000000000"), INTERNAL, "Internal Error. MathLib::toBigNumber: out_of_range: 02000000000000000000000");
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("-02000000000000000000000"), INTERNAL, "Internal Error. MathLib::toBigNumber: out_of_range: -02000000000000000000000");
 
-        // min/max and out-of-bounds - decimal
-        SUPPRESS_WARNING_CLANG_PUSH("-Wimplicitly-unsigned-literal")
-        SUPPRESS_WARNING_GCC_PUSH("-Woverflow")
+        // min/max and out-of-range - decimal
         {
-            constexpr MathLib::bigint i = 18446744073709551615;
+            constexpr MathLib::bigint i = 18446744073709551615ULL;
             ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
             ASSERT_EQUALS(i, MathLib::toBigNumber("18446744073709551615"));
         }
         {
-            constexpr MathLib::bigint i = -18446744073709551615;
+            constexpr MathLib::bigint i = -18446744073709551615ULL;
             ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
             ASSERT_EQUALS(i, MathLib::toBigNumber("-18446744073709551615"));
         }
-        SUPPRESS_WARNING_GCC_POP
-        SUPPRESS_WARNING_CLANG_POP
 
-            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("18446744073709551616"), INTERNAL, "Internal Error. MathLib::toBigNumber: out_of_range: 18446744073709551616");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("18446744073709551616"), INTERNAL, "Internal Error. MathLib::toBigNumber: out_of_range: 18446744073709551616");
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("-18446744073709551616"), INTERNAL, "Internal Error. MathLib::toBigNumber: out_of_range: -18446744073709551616");
 
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("invalid"), INTERNAL, "Internal Error. MathLib::toBigNumber: invalid_argument: invalid");
@@ -420,6 +416,8 @@ class TestMathLib : public TestFixture {
             TokenList::deleteTokens(tok);
         }
 
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("''"), INTERNAL, "Internal Error. MathLib::toBigNumber: characterLiteralToLL('') => empty character literal");
+
         // TODO: test binary
         // TODO: test floating point
 
@@ -561,23 +559,19 @@ class TestMathLib : public TestFixture {
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("02000000000000000000000"), INTERNAL, "Internal Error. MathLib::toBigUNumber: out_of_range: 02000000000000000000000");
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("-02000000000000000000000"), INTERNAL, "Internal Error. MathLib::toBigUNumber: out_of_range: -02000000000000000000000");
 
-        // min/max and out-of-bounds - decimal
-        SUPPRESS_WARNING_CLANG_PUSH("-Wimplicitly-unsigned-literal")
-        SUPPRESS_WARNING_GCC_PUSH("-Woverflow")
+        // min/max and out-of-range - decimal
         {
-            constexpr MathLib::biguint u = 18446744073709551615;
+            constexpr MathLib::biguint u = 18446744073709551615ULL;
             ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
             ASSERT_EQUALS(u, MathLib::toBigUNumber("18446744073709551615"));
         }
         {
-            constexpr MathLib::biguint u = -18446744073709551615;
+            constexpr MathLib::biguint u = -18446744073709551615ULL;
             ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
             ASSERT_EQUALS(u, MathLib::toBigUNumber("-18446744073709551615"));
         }
-        SUPPRESS_WARNING_GCC_POP
-        SUPPRESS_WARNING_CLANG_POP
 
-            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("18446744073709551616"), INTERNAL, "Internal Error. MathLib::toBigUNumber: out_of_range: 18446744073709551616");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("18446744073709551616"), INTERNAL, "Internal Error. MathLib::toBigUNumber: out_of_range: 18446744073709551616");
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("-18446744073709551616"), INTERNAL, "Internal Error. MathLib::toBigUNumber: out_of_range: -18446744073709551616");
 
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("invalid"), INTERNAL, "Internal Error. MathLib::toBigUNumber: invalid_argument: invalid");
@@ -596,6 +590,8 @@ class TestMathLib : public TestFixture {
             TokenList::deleteTokens(tok);
         }
 
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("''"), INTERNAL, "Internal Error. MathLib::toBigUNumber: characterLiteralToLL('') => empty character literal");
+
         // TODO: test binary
         // TODO: test floating point
 
@@ -683,7 +679,8 @@ class TestMathLib : public TestFixture {
 
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
 
-#if defined(_LIBCPP_VERSION) && (defined(__APPLE__) && defined(__MACH__))
+        // AppleClang before 18 reports a different error
+#if (defined(__APPLE__) && defined(__MACH__)) && (defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION < 180000))
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid");
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid");
 #else
@@ -743,6 +740,8 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("0.0",  MathLib::toString(MathLib::toDoubleNumber("-0")));
         ASSERT_EQUALS("0.0",  MathLib::toString(MathLib::toDoubleNumber("-0.")));
         ASSERT_EQUALS("0.0",  MathLib::toString(MathLib::toDoubleNumber("-0.0")));
+
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("''"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: characterLiteralToLL('') => empty character literal");
     }
 
     void isint() const {
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index a6a7abb51c0..e05698ae23e 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,33 +39,32 @@ class TestMemleak : public TestFixture {
 
 #define functionReturnType(...) functionReturnType_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    CheckMemoryLeak::AllocType functionReturnType_(const char* file, int line, const char (&code)[size]) {
+    CheckMemoryLeakImpl::AllocType functionReturnType_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
         SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        const CheckMemoryLeak c(&tokenizer, this, &settingsDefault);
-
+        const CheckMemoryLeakImpl c(&tokenizer, settingsDefault, *this);
         return (c.functionReturnType)(&tokenizer.getSymbolDatabase()->scopeList.front().functionList.front());
     }
 
     void testFunctionReturnType() {
         {
             const char code[] = "const char *foo()\n"
-                                "{ return 0; }";
-            ASSERT_EQUALS(CheckMemoryLeak::No, functionReturnType(code));
+                                "{ return 0; }\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::No, functionReturnType(code));
         }
 
         {
             const char code[] = "Fred *newFred()\n"
-                                "{ return new Fred; }";
-            ASSERT_EQUALS(CheckMemoryLeak::New, functionReturnType(code));
+                                "{ return new Fred; }\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::New, functionReturnType(code));
         }
 
         {
             const char code[] = "char *foo()\n"
-                                "{ return new char[100]; }";
-            ASSERT_EQUALS(CheckMemoryLeak::NewArray, functionReturnType(code));
+                                "{ return new char[100]; }\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::NewArray, functionReturnType(code));
         }
 
         {
@@ -73,8 +72,8 @@ class TestMemleak : public TestFixture {
                                 "{\n"
                                 "    char *p = new char[100];\n"
                                 "    return p;\n"
-                                "}";
-            ASSERT_EQUALS(CheckMemoryLeak::NewArray, functionReturnType(code));
+                                "}\n";
+            ASSERT_EQUALS(CheckMemoryLeakImpl::NewArray, functionReturnType(code));
         }
     }
 
@@ -94,8 +93,8 @@ class TestMemleak : public TestFixture {
 
         // there is no allocation
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "ret =");
-        const CheckMemoryLeak check(&tokenizer, nullptr, &settingsDefault);
-        ASSERT_EQUALS(CheckMemoryLeak::No, check.getAllocationType(tok->tokAt(2), 1));
+        const CheckMemoryLeakImpl check(&tokenizer, settingsDefault, *this);
+        ASSERT_EQUALS(CheckMemoryLeakImpl::No, check.getAllocationType(tok->tokAt(2), 1));
     }
 };
 
@@ -120,7 +119,7 @@ class TestMemleakInFunction : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &settings, this);
+        CheckMemoryLeakInFunctionImpl checkMemoryLeak(&tokenizer, settings, *this);
         checkMemoryLeak.checkReallocUsage();
     }
 
@@ -150,6 +149,7 @@ class TestMemleakInFunction : public TestFixture {
         TEST_CASE(realloc22);
         TEST_CASE(realloc23);
         TEST_CASE(realloc24); // #9228
+        TEST_CASE(realloc25);
     }
 
     void realloc1() {
@@ -157,7 +157,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    char *a = (char *)malloc(10);\n"
               "    a = realloc(a, 100);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -167,7 +167,7 @@ class TestMemleakInFunction : public TestFixture {
               "    char *a = (char *)malloc(10);\n"
               "    a = (char *)realloc(a, 100);\n"
               "    free(a);\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
@@ -179,7 +179,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if ((a = realloc(a, 100)) == NULL)\n"
               "        return;\n"
               "    free(a);\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -191,7 +191,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if ((a = realloc(a, 100)) == NULL)\n"
               "        return;\n"
               "    free(a);\n"
-              "}");
+              "}\n");
 
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: a\n",
                            "[test.cpp:4:10]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n",
@@ -209,7 +209,7 @@ class TestMemleakInFunction : public TestFixture {
               "        free(buf);\n"
               "    else\n"
               "        free(new_buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -223,7 +223,7 @@ class TestMemleakInFunction : public TestFixture {
               "    }\n"
               "    free(pData);\n"
               "    return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -235,7 +235,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!m_buf) {\n"
               "        m_buf = origBuf;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -243,7 +243,7 @@ class TestMemleakInFunction : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    x = realloc(x,100);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -253,7 +253,7 @@ class TestMemleakInFunction : public TestFixture {
               "    pa = pb = malloc(10);\n"
               "    pa = realloc(pa, 20);"
               "    exit();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -264,7 +264,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!p)\n"
               "        error();\n"
               "    usep(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -275,7 +275,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if ((a = realloc(a, x + 100)) == NULL)\n"
               "        return;\n"
               "    free(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -285,7 +285,7 @@ class TestMemleakInFunction : public TestFixture {
               "    char **str;\n"
               "    *str = realloc(*str,100);\n"
               "    free (*str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Common realloc mistake: \'str\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -296,7 +296,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!p)\n"
               "        error();\n"
               "    usep(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -307,7 +307,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if( m_options == NULL )\n"
               "        return false;\n"
               "    return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Common realloc mistake: \'m_options\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -317,7 +317,7 @@ class TestMemleakInFunction : public TestFixture {
               "  if (zLine) {\n"
               "    free(zLine);\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -326,7 +326,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void ***a = malloc(sizeof(a));\n"
               "    ***a = realloc(***(a), sizeof(a) * 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -335,7 +335,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void *a = malloc(sizeof(a));\n"
               "    a = realloc((void*)a, sizeof(a) * 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -344,7 +344,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void *a = malloc(sizeof(a));\n"
               "    a = (realloc((void*)((a)), sizeof(a) * 2));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
@@ -353,7 +353,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    void *a = malloc(sizeof(a));\n"
               "    a = realloc((a) + 1, sizeof(a) * 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -364,7 +364,7 @@ class TestMemleakInFunction : public TestFixture {
               "    bs = realloc(bs, 100);\n"
               "    if (bs == NULL) return bs0;\n"
               "    return bs;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -375,7 +375,7 @@ class TestMemleakInFunction : public TestFixture {
               "    bs = realloc(bs, 100);\n"
               "    if (bs == NULL) return;\n"
               "    *bsp = bs;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -386,7 +386,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (!(cigar = realloc(cigar, 100 * sizeof(*cigar))))\n"
               "        return;\n"
               "    s->cigar = cigar;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -394,28 +394,82 @@ class TestMemleakInFunction : public TestFixture {
         check("void f() {\n"
               "void *a = NULL;\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "void *a = NULL;\n"
               "a = malloc(10);\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
 
         check("void f() {\n"
               "void *a = nullptr;\n"
               "a = malloc(10);\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:1]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
 
         check("void f(char *b) {\n"
               "void *a = NULL;\n"
               "a = b;\n"
               "a = realloc(a, 20);\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void realloc25() {
+        check("struct T {\n"
+              "    char* ptr;\n"
+              "    size_t len;\n"
+              "};\n"
+              "struct S {\n"
+              "    struct T t;\n"
+              "};\n"
+              "void f(struct S* s, size_t len) {\n"
+              "    char* p = s->t.ptr;\n"
+              "    p = realloc(p, len);\n"
+              "    if (p) {\n"
+              "        s->t.ptr = p;\n"
+              "        s->t.len = len;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n"
+              "    char* ptr;\n"
+              "    size_t len;\n"
+              "};\n"
+              "struct S {\n"
+              "    struct T t[1];\n"
+              "};\n"
+              "void f(struct S* s, size_t len) {\n"
+              "    char* p = s->t[0].ptr;\n"
+              "    p = realloc(p, len);\n"
+              "    if (p) {\n"
+              "        s->t[0].ptr = p;\n"
+              "        s->t[0].len = len;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n" // #14718
+              "    char* ptr;\n"
+              "    size_t len;\n"
+              "};\n"
+              "struct S {\n"
+              "    struct T t;\n"
+              "};\n"
+              "char* get(struct T t) { return t.ptr; };\n"
+              "void f(struct S* s, size_t len) {\n"
+              "    char* p = get(s->t);\n"
+              "    p = realloc(p, len);\n"
+              "    if (p) {\n"
+              "        s->t.ptr = p;\n"
+              "        s->t.len = len;\n"
+              "    }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
@@ -434,7 +488,7 @@ class TestMemleakInClass : public TestFixture {
     TestMemleakInClass() : TestFixture("TestMemleakInClass") {}
 
 private:
-    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).library("std.cfg").build();
+    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).library("std.cfg").library("posix.cfg").build();
 
     /**
      * Tokenize and execute leak check for given code
@@ -447,7 +501,7 @@ class TestMemleakInClass : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &settings, this);
+        CheckMemoryLeakInClassImpl checkMemoryLeak(&tokenizer, settings, *this);
         (checkMemoryLeak.check)();
     }
 
@@ -479,6 +533,7 @@ class TestMemleakInClass : public TestFixture {
         TEST_CASE(class25); // ticket #4367 - false positive implementation for destructor is not seen
         TEST_CASE(class26); // ticket #10789
         TEST_CASE(class27); // ticket #8126
+        TEST_CASE(class28); // ticket #14954
 
         TEST_CASE(staticvar);
 
@@ -513,7 +568,7 @@ class TestMemleakInClass : public TestFixture {
               "Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class Fred\n"
@@ -531,7 +586,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        delete [] str2;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -553,7 +608,7 @@ class TestMemleakInClass : public TestFixture {
               "Fred::~Fred()\n"
               "{\n"
               "    free(str1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:17:5]: (error) Mismatching allocation and deallocation: Fred::str1 [mismatchAllocDealloc]\n", errout_str());
 
         check("class Fred\n"
@@ -569,7 +624,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        free(str1);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:12:9]: (error) Mismatching allocation and deallocation: Fred::str1 [mismatchAllocDealloc]\n", errout_str());
     }
 
@@ -605,7 +660,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete tok;\n"
               "        tok = next;\n"
               "    }\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -634,7 +689,7 @@ class TestMemleakInClass : public TestFixture {
               "            tok = next;\n"
               "        }\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -658,7 +713,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    ABC *p = new ABC;\n"
               "    addAbc( p );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct ABC;\n"
@@ -675,7 +730,7 @@ class TestMemleakInClass : public TestFixture {
               "        ABC *p = new ABC;\n"
               "        addAbc( p );\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -691,7 +746,7 @@ class TestMemleakInClass : public TestFixture {
               "    char *str = new char[100];\n"
               "    delete [] str;\n"
               "    hello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -703,7 +758,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete [] str;\n"
               "        hello();\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -723,7 +778,7 @@ class TestMemleakInClass : public TestFixture {
               "Fred::~Fred()\n"
               "{\n"
               "    delete this->i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -738,7 +793,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        delete this->i;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -755,7 +810,7 @@ class TestMemleakInClass : public TestFixture {
               "    int* c = new int(1);\n"
               "    delete c;\n"
               "    doNothing(c);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -768,7 +823,7 @@ class TestMemleakInClass : public TestFixture {
               "        doNothing(c);\n"
               "    }\n"
               "    void doNothing() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -785,7 +840,7 @@ class TestMemleakInClass : public TestFixture {
               "{ p = new int; }\n"
               "\n"
               "A::~A()\n"
-              "{ delete (p); }");
+              "{ delete (p); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -796,7 +851,7 @@ class TestMemleakInClass : public TestFixture {
               "    { p = new int; }\n"
               "    ~A()\n"
               "    { delete (p); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -808,7 +863,7 @@ class TestMemleakInClass : public TestFixture {
               "    A();\n"
               "};\n"
               "A::A()\n"
-              "{ p = new int; }");
+              "{ p = new int; }\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class A\n"
@@ -816,7 +871,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    int * p;\n"
               "    A() { p = new int; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -826,8 +881,8 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    int * p;\n"
               "    A() : p(new int[10])\n"
-              "    { }"
-              "};");
+              "    { }\n"
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class A\n"
@@ -837,7 +892,7 @@ class TestMemleakInClass : public TestFixture {
               "    A();\n"
               "};\n"
               "A::A() : p(new int[10])\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -859,7 +914,7 @@ class TestMemleakInClass : public TestFixture {
               "{ }\n"
               "\n"
               "void A::cleanup()\n"
-              "{ delete [] p; }");
+              "{ delete [] p; }\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("class A\n"
@@ -873,7 +928,7 @@ class TestMemleakInClass : public TestFixture {
               "    { }\n"
               "    void cleanup()\n"
               "    { delete [] p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -895,7 +950,7 @@ class TestMemleakInClass : public TestFixture {
               "{ }\n"
               "\n"
               "void A::foo()\n"
-              "{ p = new int[10]; delete [] p; }");
+              "{ p = new int[10]; delete [] p; }\n");
         ASSERT_EQUALS("[test.cpp:17:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class A\n"
@@ -909,7 +964,7 @@ class TestMemleakInClass : public TestFixture {
               "    { }\n"
               "    void foo()\n"
               "    { p = new int[10]; delete [] p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:11:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 
@@ -922,7 +977,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "\n"
               "void A::init()\n"
-              "{ p = new int[10]; }");
+              "{ p = new int[10]; }\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -932,7 +987,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    void init()\n"
               "    { p = new int[10]; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -945,7 +1000,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "\n"
               "void A::init()\n"
-              "{ p = new int; }");
+              "{ p = new int; }\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -955,7 +1010,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    void init()\n"
               "    { p = new int; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -968,7 +1023,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "\n"
               "void A::init()\n"
-              "{ p = malloc(sizeof(int)*10); }");
+              "{ p = malloc(sizeof(int)*10); }\n");
         ASSERT_EQUALS("[test.cpp:9:3]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -978,7 +1033,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    void init()\n"
               "    { p = malloc(sizeof(int)*10); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:3:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
@@ -992,7 +1047,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~A() { delete [] p; }\n"
               "};\n"
               "A::A()\n"
-              "{ p = new int[10]; }");
+              "{ p = new int[10]; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1002,7 +1057,7 @@ class TestMemleakInClass : public TestFixture {
               "    A()\n"
               "    { p = new int[10]; }\n"
               "    ~A() { delete [] p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -1014,7 +1069,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~A() { delete p; }\n"
               "};\n"
               "A::A()\n"
-              "{ p = new int; }");
+              "{ p = new int; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1024,7 +1079,7 @@ class TestMemleakInClass : public TestFixture {
               "    A()\n"
               "    { p = new int; }\n"
               "    ~A() { delete p; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -1036,7 +1091,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~A() { free(p); }\n"
               "};\n"
               "A::A()\n"
-              "{ p = malloc(sizeof(int)*10); }");
+              "{ p = malloc(sizeof(int)*10); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
@@ -1046,7 +1101,7 @@ class TestMemleakInClass : public TestFixture {
               "    A()\n"
               "    { p = malloc(sizeof(int)*10); }\n"
               "    ~A() { free(p); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1059,7 +1114,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    A() { a = b = new int[10]; }\n"
               "    ~A() { delete [] a; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1076,7 +1131,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    A::pd = new char[12];\n"
               "    delete [] A::pd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class A {\n"
@@ -1088,7 +1143,7 @@ class TestMemleakInClass : public TestFixture {
               "        pd = new char[12];\n"
               "        delete [] pd;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class A {\n"
@@ -1102,7 +1157,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    pd = new char[12];\n"
               "    delete [] pd;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:5]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 
@@ -1118,7 +1173,7 @@ class TestMemleakInClass : public TestFixture {
               "  }\n"
               "private:\n"
               "  char *a;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class  A : public x\n"
@@ -1132,7 +1187,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "  a = new char[10];\n"
               "  foo(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1150,7 +1205,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    rp1 = new TRadioButton(this);\n"
               "    rp2 = new TRadioButton(this);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class TRadioButton { };\n"
@@ -1166,7 +1221,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    rp1 = new TRadioButton;\n"
               "    rp2 = new TRadioButton;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (style) Class 'Foo' is unsafe, 'Foo::rp1' can leak by wrong usage. [unsafeClassCanLeak]\n"
                       "[test.cpp:6:19]: (style) Class 'Foo' is unsafe, 'Foo::rp2' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
@@ -1189,7 +1244,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete rp1;\n"
               "    delete rp2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1211,7 +1266,7 @@ class TestMemleakInClass : public TestFixture {
               "            delete [] str2;\n"
               "        }\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1235,7 +1290,7 @@ class TestMemleakInClass : public TestFixture {
               "    {\n"
               "        delete [] str2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1258,7 +1313,7 @@ class TestMemleakInClass : public TestFixture {
               "ns1::Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:15]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1283,7 +1338,7 @@ class TestMemleakInClass : public TestFixture {
               "ns1::ns2::Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
 
         check("namespace ns1 {\n"
@@ -1310,7 +1365,7 @@ class TestMemleakInClass : public TestFixture {
               "ns1::ns2::ns3::Fred::~Fred()\n"
               "{\n"
               "    delete [] str2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:23]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
@@ -1327,7 +1382,7 @@ class TestMemleakInClass : public TestFixture {
               "    C *c;\n"
               "public:\n"
               "    A() : b(new B()), c(new C(b)) { }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n"
                            "[test.cpp:10]: (style) Class 'A' is unsafe, 'A::c' can leak by wrong usage.\n",
                            "[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n",
@@ -1349,7 +1404,7 @@ class TestMemleakInClass : public TestFixture {
               "       b = new B();\n"
               "       c = new C(b);\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n"
                            "[test.cpp:10]: (style) Class 'A' is unsafe, 'A::c' can leak by wrong usage.\n",
                            "[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n",
@@ -1363,7 +1418,7 @@ class TestMemleakInClass : public TestFixture {
               "private:\n"
               "    Fred() { a = new int; }\n"
               "    ~Fred() { (delete(a), (a)=NULL); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1382,7 +1437,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~CData() { if (m_impl) m_impl->Release(); }\n"
               "private:\n"
               "    CDataImpl *m_impl;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1393,7 +1448,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    Fred(const Fred &fred) { a = new int; }\n"
               "    ~Fred() { delete a; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1404,7 +1459,7 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    Fred() { a = new int; }\n"
               "    ~Fred();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1430,6 +1485,15 @@ class TestMemleakInClass : public TestFixture {
         ASSERT_EQUALS("[test.cpp:6:11]: (style) Class 'S' is unsafe, 'S::a' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
+    void class28() { // ticket #14954
+        check("struct S {\n"
+              "    explicit S(char *name) { m_fd = mkstemp(name); }\n"
+              "    ~S() { /* close(m_fd); */ }\n"
+              "    int m_fd;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Class 'S' is unsafe, 'S::m_fd' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
+    }
+
     void staticvar() {
         check("class A\n"
               "{\n"
@@ -1441,7 +1505,7 @@ class TestMemleakInClass : public TestFixture {
               "        if (!p)\n"
               "            p = new int[100];\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1473,7 +1537,7 @@ class TestMemleakInClass : public TestFixture {
               "void Tokenizer::deleteTokens(int *tok)\n"
               "{\n"
               "    delete tok;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Global function
@@ -1500,7 +1564,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    deleteTokens(_tokens);\n"
               "    _tokens = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1525,7 +1589,7 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "A::~A() {\n"
               "    delete [] pkt_buffer;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:14:9]: (error) Mismatching allocation and deallocation: A::pkt_buffer [mismatchAllocDealloc]\n", errout_str());
 
         check("struct S {\n" // 5678
@@ -1561,7 +1625,7 @@ class TestMemleakInClass : public TestFixture {
               "  data_ = new char[42];\n"
               "  delete data_;\n"
               "  data_ = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:17:3]: (warning) Possible leak in public function. The pointer 'data_' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:18:3]: (error) Mismatching allocation and deallocation: Foo::data_ [mismatchAllocDealloc]\n", errout_str());
 
@@ -1584,7 +1648,7 @@ class TestMemleakInClass : public TestFixture {
               "  data_ = new char[42];\n"
               "  delete data_;\n"
               "  data_ = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:17:3]: (warning) Possible leak in public function. The pointer 'data_' is not deallocated before it is allocated. [publicAllocationError]\n"
                       "[test.cpp:18:3]: (error) Mismatching allocation and deallocation: Foo::data_ [mismatchAllocDealloc]\n", errout_str());
     }
@@ -1599,7 +1663,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~Fred() { free(s); }\n"
               "    void xy()\n"
               "    { s = malloc(100); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:7]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
 
         check("class Fred\n"
@@ -1611,7 +1675,7 @@ class TestMemleakInClass : public TestFixture {
               "    { s = malloc(100); }\n"
               "private:\n"
               "    char *s;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:7:7]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 
@@ -1625,7 +1689,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~Fred() { free(s); }\n"
               "    const Fred & operator = (const Fred &f)\n"
               "    { s = malloc(100); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:7]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated. [publicAllocationError]\n", errout_str());
     }
 };
@@ -1652,7 +1716,7 @@ class TestMemleakStructMember : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakStructMember checkMemoryLeakStructMember(&tokenizer, &settings, this);
+        CheckMemoryLeakStructMemberImpl checkMemoryLeakStructMember(&tokenizer, settings, *this);
         (checkMemoryLeakStructMember.check)();
     }
 
@@ -1673,6 +1737,8 @@ class TestMemleakStructMember : public TestFixture {
         TEST_CASE(assign2);
         TEST_CASE(assign3);
         TEST_CASE(assign4); // #11019
+        TEST_CASE(assign5);
+        TEST_CASE(assign6);
 
         // Failed allocation
         TEST_CASE(failedAllocation);
@@ -1682,6 +1748,7 @@ class TestMemleakStructMember : public TestFixture {
         TEST_CASE(function3);   // #3024: kernel list
         TEST_CASE(function4);   // #3038: Deallocating in function
         TEST_CASE(function5);   // #10381, #10382, #10158
+        TEST_CASE(function6);
 
         // Handle if-else
         TEST_CASE(ifelse);
@@ -1715,14 +1782,14 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static void foo()\n"
               "{\n"
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static ABC * foo()\n"
@@ -1735,7 +1802,7 @@ class TestMemleakStructMember : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return abc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static void foo(int a)\n"
@@ -1747,7 +1814,7 @@ class TestMemleakStructMember : public TestFixture {
               "        free(abc->a);\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
@@ -1763,7 +1830,7 @@ class TestMemleakStructMember : public TestFixture {
               "out:\n"
               "    free(abc->a);\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1773,13 +1840,13 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    return abc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo(struct ABC *abc)\n"
               "{\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7302
@@ -1787,14 +1854,14 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC abc;\n"
               "    abc.a = malloc(10);\n"
               "    return abc.a;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "    struct ABC abc;\n"
               "    abc.a = malloc(10);\n"
               "    return abc.b;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:4:5]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
@@ -1804,7 +1871,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    return &abc->self;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1813,7 +1880,7 @@ class TestMemleakStructMember : public TestFixture {
               "{\n"
               "    struct ABC *abc = abc1;\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
@@ -1821,7 +1888,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc;\n"
               "    abc1 = abc = malloc(sizeof(ABC));\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
@@ -1830,7 +1897,7 @@ class TestMemleakStructMember : public TestFixture {
               " ptr = malloc(sizeof(struct msn_entry));\n"
               " ptr->msn = malloc(100);\n"
               " back = ptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -1839,7 +1906,7 @@ class TestMemleakStructMember : public TestFixture {
         check("static void foo() {\n"
               "    struct ABC *abc = malloc(123);\n"
               "    abc->a = abc->b = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1848,7 +1915,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct s f2;\n"
               "    f2.a = malloc(100);\n"
               "    *f1 = f2;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1919,6 +1986,50 @@ class TestMemleakStructMember : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void assign5() {
+        check("struct S { int fd; };\n"
+              "void f() {\n"
+              "    struct S* s = (struct S*)malloc(sizeof(struct S));\n"
+              "    s->fd = open(\"abc\", O_RDWR | O_NOCTTY);\n"
+              "    free(s);\n"
+              "}\n"
+              "void g() {\n"
+              "    struct S* s = static_cast<struct S*>(malloc(sizeof(struct S)));\n"
+              "    s->fd = open(\"abc\", O_RDWR | O_NOCTTY);\n"
+              "    free(s);\n"
+              "}\n"
+              "void h() {\n"
+              "    S* s = new S;\n"
+              "    s->fd = open(\"abc\", O_RDWR | O_NOCTTY);\n"
+              "    delete s;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Resource leak: s.fd [resourceLeak]\n"
+                      "[test.cpp:10:5]: (error) Resource leak: s.fd [resourceLeak]\n"
+                      "[test.cpp:16:1]: (error) Resource leak: s.fd [resourceLeak]\n",
+                      errout_str());
+
+        check("struct S { int fd; };\n" // #13031
+              "void f() {\n"
+              "    struct S* s = malloc(sizeof(struct S));\n"
+              "    s->fd = open(\"abc\", O_RDWR | O_NOCTTY);\n"
+              "    if (s->fd < 0) {\n"
+              "        free(s);\n"
+              "        return NULL;\n"
+              "    }\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void assign6() {
+        check("struct S { S* p; };\n" // #14524
+              "void f() {\n"
+              "    S s;\n"
+              "    s.p = static_cast<S*>(malloc(sizeof(S)));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: s.p [memleak]\n", errout_str());
+    }
+
     void failedAllocation() {
         check("static struct ABC * foo()\n"
               "{\n"
@@ -1930,7 +2041,7 @@ class TestMemleakStructMember : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return abc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1941,7 +2052,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    func(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
@@ -1949,7 +2060,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(sizeof(struct ABC));\n"
               "    abclist.push_back(abc);\n"
               "    abc->a = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1959,7 +2070,7 @@ class TestMemleakStructMember : public TestFixture {
               "  A a = { 0 };\n"
               "  a.foo = (char *) malloc(10);\n"
               "  assign(&a);\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1969,7 +2080,7 @@ class TestMemleakStructMember : public TestFixture {
               "  struct ABC *abc = malloc(100);\n"
               "  abc.a = (char *) malloc(10);\n"
               "  list_add_tail(&abc->list, head);\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1980,7 +2091,7 @@ class TestMemleakStructMember : public TestFixture {
               "  struct ABC abc;\n"
               "  abc.a = (char *) malloc(10);\n"
               "  a(abc.a);\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1989,14 +2100,14 @@ class TestMemleakStructMember : public TestFixture {
               "    struct s s1;\n"
               "    s1->x = malloc(1);\n"
               "    return (s1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct nc_rpc nc_rpc_getconfig() {\n" // #10382
               "    struct nc_rpc rpc;\n"
               "    rpc->filter = malloc(1);\n"
               "    return (nc_rpc)rpc;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("T* f(const char *str) {\n" // #10158
@@ -2018,7 +2129,33 @@ class TestMemleakStructMember : public TestFixture {
               "    }\n"
               "    return g(&a);\n"
               "}\n");
-        TODO_ASSERT_EQUALS("", "[test.cpp:9:9]: (error) Memory leak: a.str [memleak]\n", errout_str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int *p; };\n"
+              "S f(int i) {\n"
+              "    S s;\n"
+              "    switch(i) {\n"
+              "    case 1:\n"
+              "        s.p = new int;\n"
+              "        break;\n"
+              "    default: {\n"
+              "        return {};\n"
+              "    }\n"
+              "    }\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void function6() {
+        check("struct S { int* p; };\n" // #14706
+              "void g(void*);\n"
+              "void f() {\n"
+              "    S* s = new S();\n"
+              "    s->p = new int();\n"
+              "    g((void*)s);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse() {
@@ -2036,7 +2173,7 @@ class TestMemleakStructMember : public TestFixture {
               "    }\n"
               "    free(abc->a);\n"
               "    free(abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2052,7 +2189,7 @@ class TestMemleakStructMember : public TestFixture {
               "        free(abc);\n"
               "        abc = next;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2064,7 +2201,7 @@ class TestMemleakStructMember : public TestFixture {
               "    abc = malloc(sizeof(struct ABC));\n"
               "    abc->a = malloc(10);\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2082,7 +2219,7 @@ class TestMemleakStructMember : public TestFixture {
                              "    a.f = fopen(\"test\", \"r\");\n"
                              "    a.c = new char[12];\n"
                              "    a.m = malloc(12);\n"
-                             "}";
+                             "}\n";
 
         check(code1, true);
         ASSERT_EQUALS("[test.cpp:12:1]: (error) Resource leak: a.f [resourceLeak]\n"
@@ -2107,7 +2244,7 @@ class TestMemleakStructMember : public TestFixture {
                              "    fclose(a.f);\n"
                              "    delete [] a.c;\n"
                              "    free(a.m);\n"
-                             "}";
+                             "}\n";
 
         check(code2, true);
         ASSERT_EQUALS("", errout_str());
@@ -2116,7 +2253,7 @@ class TestMemleakStructMember : public TestFixture {
         const char code3[] = "void func() {\n"
                              "    struct A a;\n"
                              "    a.f = fopen(\"test\", \"r\");\n"
-                             "}";
+                             "}\n";
 
         check(code3, true);
         ASSERT_EQUALS("", errout_str());
@@ -2131,7 +2268,7 @@ class TestMemleakStructMember : public TestFixture {
                              "void func() {\n"
                              "    struct A a;\n"
                              "    a.f = fopen(\"test\", \"r\");\n"
-                             "}";
+                             "}\n";
 
         check(code4, true);
         ASSERT_EQUALS("", errout_str());
@@ -2147,7 +2284,7 @@ class TestMemleakStructMember : public TestFixture {
               "{\n"
               "  Test& y = *x;\n"
               "  y.data = malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2157,7 +2294,7 @@ class TestMemleakStructMember : public TestFixture {
               "unique_ptr<char[]>otherbuffer{new char[otherbufsize+1]};\n"
               "char *const oldbuffer = otherbuffer.get();\n"
               "int const oldbufsize = otherbufsize;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2170,7 +2307,7 @@ class TestMemleakStructMember : public TestFixture {
               "  (s).state_check_buff = (void* )malloc(1);\n"
               "  if (s.state_check_buff == 0)\n"
               "    return;\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:9:1]: (error) Memory leak: s.state_check_buff [memleak]\n", errout_str());
     }
 
@@ -2180,7 +2317,7 @@ class TestMemleakStructMember : public TestFixture {
               "  foo f;\n"
               "  ((f)->realm) = strdup(realm);\n"
               "  if(f->realm == NULL) {}\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:6:1]: (error) Memory leak: f.realm [memleak]\n", errout_str());
     }
 
@@ -2191,7 +2328,7 @@ class TestMemleakStructMember : public TestFixture {
               "void func() {\n"
               "    struct ABC abc;\n"
               "    abc.a = myalloc();\n"
-              "}", false);
+              "}\n", false);
         ASSERT_EQUALS("[test.c:7:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
@@ -2207,7 +2344,7 @@ class TestMemleakStructMember : public TestFixture {
             "    }\n"
             "    delete[] s.p;\n"
             "    return 0;\n"
-            "}", true);
+            "}\n", true);
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -2261,7 +2398,7 @@ class TestMemleakNoVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
-        CheckMemoryLeakNoVar checkMemoryLeakNoVar(&tokenizer, &settings, this);
+        CheckMemoryLeakNoVarImpl checkMemoryLeakNoVar(&tokenizer, settings, *this);
         (checkMemoryLeakNoVar.check)();
     }
 
@@ -2288,23 +2425,23 @@ class TestMemleakNoVar : public TestFixture {
         // standard function..
         check("void x() {\n"
               "    strcpy(a, strdup(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Allocation with strdup, strcpy doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("char *x() {\n"
               "    char *ret = strcpy(malloc(10), \"abc\");\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *x() {\n"
               "    return strcpy(malloc(10), \"abc\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x() {\n"
               "    free(malloc(10));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // user function..
@@ -2313,76 +2450,76 @@ class TestMemleakNoVar : public TestFixture {
               "\n"
               "void x() {\n"
               "    set_error(strdup(p));\n"
-              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Allocation with strdup, set_error doesn't release it.\n", "", errout_str());
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:5:15]: (error) Allocation with strdup, set_error doesn't release it. [leakNoVarFunctionCall]\n", "", errout_str());
 
         check("void f()\n"
               "{\n"
               "    int fd;\n"
               "    fd = mkstemp(strdup(\"/tmp/file.XXXXXXXX\"));\n"
               "    close(fd);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Allocation with strdup, mkstemp doesn't release it.\n", "", errout_str());
 
         check("void f()\n"
               "{\n"
               "    if(TRUE || strcmp(strdup(a), b));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Allocation with strdup, strcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    if(!strcmp(strdup(a), b) == 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Allocation with strdup, strcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "    42, strcmp(strdup(a), b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Allocation with strdup, strcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f() {\n"
               "   assert(freopen(\"/dev/null\", \"r\", stdin));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x() {\n"
               "    strcpy(a, (void*)strdup(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Allocation with strdup, strcpy doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void* malloc1() {\n"
               "    return (malloc(1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *x() {\n"
               "    char *ret = (char*)strcpy(malloc(10), \"abc\");\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    free(malloc(1));\n"
               "    strcpy(a, strdup(p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Allocation with strdup, strcpy doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void f() {\n"
               "    memcmp(calloc(10, 10), strdup(q), 100);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Allocation with calloc, memcmp doesn't release it. [leakNoVarFunctionCall]\n"
                       "[test.cpp:2:28]: (error) Allocation with strdup, memcmp doesn't release it. [leakNoVarFunctionCall]\n", errout_str());
 
         check("void* f(int size) {\n"
               "    return (void*) malloc(size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(int size) {\n"
               "    return static_cast<int*>(malloc(size));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() { if (new int[42]) {} }\n" // #10857
@@ -2466,31 +2603,66 @@ class TestMemleakNoVar : public TestFixture {
               "    f(new U());\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct A {\n" // #14339
+              "    void g(int* p) { p_ = p; }\n"
+              "    int *p_;\n"
+              "};\n"
+              "void f(A& a) {\n"
+              "    a.g(new int);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f() {\n" // #11184
+              "    return strlen(new char[4]{});\n"
+              "}\n"
+              "int g() {\n"
+              "    int i = strlen(new char[4]{});\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:19]: (error) Allocation with new, strlen doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:5:20]: (error) Allocation with new, strlen doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
+
+        check("int* f1() { return new int; }\n" // #14808
+              "std::string* f2() { return new std::string(\"abc\"); }\n"
+              "std::clock_t* f3() { return new std::clock_t; }\n"
+              "QWidget* f4(QObject* parent) { return new QWidget(parent); }\n"
+              "void g(QObject* parent) {\n"
+              "    assert(f1());\n"
+              "    assert(f2());\n"
+              "    assert(f3());\n"
+              "    assert(f4(parent));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (error) Allocation with f1, assert doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:7:12]: (error) Allocation with f2, assert doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:8:12]: (error) Allocation with f3, assert doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
     }
 
     void missingAssignment() {
         check("void x()\n"
               "{\n"
               "    malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
               "{\n"
               "    calloc(10, 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Return value of allocation function 'calloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
               "{\n"
               "    strdup(\"Test\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Return value of allocation function 'strdup' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
               "{\n"
               "    (char*) malloc(10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
@@ -2498,7 +2670,7 @@ class TestMemleakNoVar : public TestFixture {
               "    char* ptr = malloc(10);\n"
               "    foo(ptr);\n"
               "    free(ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f( void ) {\n" // FP: #11246
@@ -2507,19 +2679,19 @@ class TestMemleakNoVar : public TestFixture {
               "  if ( ok )\n"
               "    free( address ), address = 0;\n"
               "  return 0;\n"
-              "} ");
+              "} \n");
         ASSERT_EQUALS("", errout_str());
 
         check("char** x(const char* str) {\n"
               "    char* ptr[] = { malloc(10), malloc(5), strdup(str) };\n"
               "    return ptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x()\n"
               "{\n"
               "    42,malloc(42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void *f()\n"
@@ -2529,7 +2701,7 @@ class TestMemleakNoVar : public TestFixture {
               "void x()\n"
               "{\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Return value of allocation function 'f' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void f()\n" // #8100
@@ -2539,7 +2711,7 @@ class TestMemleakNoVar : public TestFixture {
               "void x()\n"
               "{\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void *f() {\n" // #8848
@@ -2548,26 +2720,26 @@ class TestMemleakNoVar : public TestFixture {
               "void x()\n"
               "{\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void x()\n"
               "{\n"
               "    if(!malloc(5)) fail();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("FOO* factory() {\n"
               "    FOO* foo = new (std::nothrow) FOO;\n"
               "    return foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6536
         check("struct S { S(int) {} };\n"
               "void foo(int i) {\n"
               "  S socket(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6693
@@ -2577,12 +2749,12 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void CTest::Initialise() {\n"
               "    malloc();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #7348 - cast
               "    p = (::X*)malloc(42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7182 "crash: CheckMemoryLeak::functionReturnType()"
@@ -2590,7 +2762,7 @@ class TestMemleakNoVar : public TestFixture {
               "template<typename T, typename... Ts> auto binary_left_comma (T x, Ts... ts) { return (x , ... , ts); }\n"
               "int main() {\n"
               "  unary_right_comma (a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -2606,7 +2778,7 @@ class TestMemleakNoVar : public TestFixture {
               "    new int{};\n"
               "    new int{ 1 };\n"
               "    new uint8_t[4];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
                       "[test.cpp:3:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
                       "[test.cpp:4:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
@@ -2624,7 +2796,7 @@ class TestMemleakNoVar : public TestFixture {
         check("void f(int* p) {\n"
               "    new auto('c');\n"
               "    new(p) int;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:1:29]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
                            "[test.cpp:3]: (error) Return value of allocation function 'new' is not stored.\n",
                            "",
@@ -2661,7 +2833,7 @@ class TestMemleakNoVar : public TestFixture {
               "    C{ new int(1), 1 };\n"
               "    C{ new(p) int, 1 };\n"
               "    C{ new QWidget, 1 };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) { if (b && malloc(42)) {} }\n" //  // #10858
@@ -2701,59 +2873,77 @@ class TestMemleakNoVar : public TestFixture {
               "    delete[] &p[-1];\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(FILE* fp1, FILE* fp2) {\n" // #14171
+              "    if (freopen(NULL, \"w+b\", fp1) == NULL) {}\n"
+              "    if (std::freopen(NULL, \"w+b\", fp2) == NULL) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #14172
+              "    if (malloc(4) == nullptr) {}\n"
+              "    if (::malloc(4) == nullptr) {}\n"
+              "    if (std::malloc(4) == nullptr) {}\n"
+              "    if (::std::malloc(4) == nullptr) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:3:11]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:4:14]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:5:16]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n",
+                      errout_str());
     }
 
     void smartPointerFunctionParam() {
         check("void x() {\n"
               "    f(shared_ptr<int>(new int(42)), g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    h(12, f(shared_ptr<int>(new int(42)), g()));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(unique_ptr<int>(new int(42)), g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_unique<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(g(), shared_ptr<int>(new int(42)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(g(), unique_ptr<int>(new int(42)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_unique<int>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(shared_ptr<char>(new char), make_unique<int>(32));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If make_unique<int>() throws, memory could be leaked. Use make_shared<char>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(g(124), h(\"test\", 234), shared_ptr<char>(new char));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If h() throws, memory could be leaked. Use make_shared<char>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void x() {\n"
               "    f(shared_ptr<std::string>(new std::string(\"\")), g<std::string>());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Unsafe allocation. If g<std::string>() throws, memory could be leaked. Use make_shared<std::string>() instead. [leakUnsafeArgAlloc]\n", errout_str());
 
         check("void g(int x) throw() { }\n"
               "void x() {\n"
               "    f(g(124), shared_ptr<char>(new char));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void __declspec(nothrow) g(int x) { }\n"
               "void x() {\n"
               "    f(g(124), shared_ptr<char>(new char));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
     void resourceLeak() {
@@ -2764,23 +2954,23 @@ class TestMemleakNoVar : public TestFixture {
               "    if (result) return !result;\n"
               "    fclose(fp);\n"
               "    return result;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  fopen(\"file.txt\", \"r\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Return value of allocation function 'fopen' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void foo() {\n"
               "  FILE *f = fopen(\"file.txt\", \"r\");\n"
               "  freopen(\"file.txt\", \"r\", f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Return value of allocation function 'freopen' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void foo() {\n"
               "  freopen(\"file.txt\", \"r\", stdin);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2790,7 +2980,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder h ( fopen(\"file.txt\", \"r\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2800,7 +2990,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder ( fopen(\"file.txt\", \"r\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2810,7 +3000,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder h { fopen(\"file.txt\", \"r\")};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2820,7 +3010,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder h = fopen(\"file.txt\", \"r\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2830,7 +3020,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder { fopen(\"file.txt\", \"r\")};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
@@ -2840,7 +3030,7 @@ class TestMemleakNoVar : public TestFixture {
               "};\n"
               "void foo() {\n"
               "  Holder { 0, fopen(\"file.txt\", \"r\")};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2851,7 +3041,7 @@ class TestMemleakNoVar : public TestFixture {
               "\n"
               "void f() {\n"
               "  makeThing();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10631
@@ -2878,12 +3068,12 @@ class TestMemleakNoVar : public TestFixture {
     void crash1() { // #10729
         check("void foo() {\n"
               "    extern void *realloc (void *ptr, size_t size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    extern void *malloc (size_t size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index 454cb06eac5..81c44d58811 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,12 +24,12 @@
 #include "helpers.h"
 #include "library.h"
 #include "settings.h"
+#include "standards.h"
 #include "token.h"
 
 #include <cstddef>
 #include <list>
 #include <string>
-#include <vector>
 
 class TestNullPointer : public TestFixture {
 public:
@@ -37,6 +37,7 @@ class TestNullPointer : public TestFixture {
 
 private:
     const Settings settings = settingsBuilder().library("std.cfg").severity(Severity::warning).build();
+    const Settings settings_i = settingsBuilder(settings).certainty(Certainty::inconclusive).build();
 
     void run() override {
         mNewTemplate = true;
@@ -140,6 +141,13 @@ class TestNullPointer : public TestFixture {
         TEST_CASE(nullpointer101);        // #11382
         TEST_CASE(nullpointer102);
         TEST_CASE(nullpointer103);
+        TEST_CASE(nullpointer104); // #13881
+        TEST_CASE(nullpointer105); // #13861
+        TEST_CASE(nullpointer106); // #13682
+        TEST_CASE(nullpointer107); // #13682 (FP/FN cases around guards that depend on the pointer indirectly)
+        TEST_CASE(nullpointer108);
+        TEST_CASE(nullpointer109);
+        TEST_CASE(nullpointer110); // #14937
         TEST_CASE(nullpointer_addressOf); // address of
         TEST_CASE(nullpointerSwitch); // #2626
         TEST_CASE(nullpointer_cast); // #4692
@@ -164,6 +172,7 @@ class TestNullPointer : public TestFixture {
         TEST_CASE(nullpointerStdStream);
         TEST_CASE(nullpointerSmartPointer);
         TEST_CASE(nullpointerOutOfMemory);
+        TEST_CASE(nullpointerOutOfResources);
         TEST_CASE(functioncall);
         TEST_CASE(functioncalllibrary); // use Library to parse function call
         TEST_CASE(functioncallDefaultArguments);
@@ -178,7 +187,6 @@ class TestNullPointer : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool inconclusive = false;
         bool cpp = true;
     };
@@ -186,28 +194,30 @@ class TestNullPointer : public TestFixture {
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, options.inconclusive).build();
+        const Settings& settings1 = options.inconclusive ? settings_i : settings;
+        check_(file, line, code, settings1, options.cpp);
+    }
 
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& s, bool cpp = true) {
         // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+        SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(tokenizer, this);
+        CheckNullPointer check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void checkP_(const char* file, int line, const char (&code)[size]) {
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, false).build();
-
-        SimpleTokenizer2 tokenizer(settings1, *this, code, "test.cpp");
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(tokenizer, this);
+        CheckNullPointer check;
+        runChecks(check, tokenizer, *this);
     }
 
 
@@ -218,7 +228,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "    while (tok);\n"
               "    tok = tok->next();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:4:11]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok. [nullPointerRedundantCheck]\n", errout_str());
 
         // #2681
@@ -243,7 +253,7 @@ class TestNullPointer : public TestFixture {
               "        while (tok && tok->str() != \";\")\n"
               "            tok = tok->next();\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (warning) Either the condition 'while' is redundant or there is possible null pointer dereference: tok.\n", "", errout_str());
 
         check("void foo(Token &tok)\n"
@@ -253,7 +263,7 @@ class TestNullPointer : public TestFixture {
               "        while (!tok)\n"
               "            char c = tok.read();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -264,7 +274,7 @@ class TestNullPointer : public TestFixture {
               "            tok = tok->next();\n"
               "        if( !tok ) break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -274,7 +284,7 @@ class TestNullPointer : public TestFixture {
               "        while (tok && tok->str() != \";\")\n"
               "            tok = tok->next();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(A*a)\n"
@@ -289,7 +299,7 @@ class TestNullPointer : public TestFixture {
               "      a->b();\n"
               "      break;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // dereference in outer scope..
@@ -298,7 +308,7 @@ class TestNullPointer : public TestFixture {
               "        while (tok) tok = tok->next();\n"
               "    }\n"
               "    tok->str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:5:5]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok. [nullPointerRedundantCheck]\n", errout_str());
 
         check("int foo(const Token *tok)\n"
@@ -323,7 +333,7 @@ class TestNullPointer : public TestFixture {
               "    while (d && d->i == 0)\n"
               "      d = d->c;\n"
               "  if (!d) throw;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct b {\n"
@@ -348,7 +358,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    else if (a->x == 2) { }\n"
               "    if (a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2134 - sizeof doesn't dereference
@@ -358,7 +368,7 @@ class TestNullPointer : public TestFixture {
               "    sizeof(*list);\n"
               "    if (!list)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2245 - sizeof doesn't dereference
@@ -366,7 +376,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p) {\n"
               "        int sz = sizeof(p->x);\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -378,7 +388,7 @@ class TestNullPointer : public TestFixture {
               "    Fred fred;\n"
               "    while (fred);\n"
               "    fred.hello();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -394,7 +404,7 @@ class TestNullPointer : public TestFixture {
               "    int a = abc->a;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:13]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(struct ABC *abc) {\n"
@@ -403,7 +413,7 @@ class TestNullPointer : public TestFixture {
               "    bar(x, y, abc->a);\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:2:9]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n"
                       "[test.cpp:5:9] -> [test.cpp:3:12]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n"
                       "[test.cpp:5:9] -> [test.cpp:4:15]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n", errout_str());
@@ -413,7 +423,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "    if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:2:9]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -423,7 +433,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "    if (!abc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:2:9]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n", errout_str());
 
         // TODO: False negative if member of member is dereferenced
@@ -431,14 +441,14 @@ class TestNullPointer : public TestFixture {
               "    abc->next->a = 0;\n"
               "    if (abc->next)\n"
               "        ;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Possible null pointer dereference: abc - otherwise it is redundant to check it against null.\n", "", errout_str());
 
         check("void foo(ABC *abc) {\n"
               "    abc->a = 0;\n"
               "    if (abc && abc->b == 0)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:9] -> [test.cpp:2:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -449,13 +459,13 @@ class TestNullPointer : public TestFixture {
               "    if (abc && abc->a);\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n"
               "    int x = abc && a(abc->x);\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok to use a linked list..
@@ -464,13 +474,13 @@ class TestNullPointer : public TestFixture {
               "    abc = abc->next;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n"
               "    abc = (ABC *)(abc->_next);\n"
-              "    if (abc) { }"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "    if (abc) { }\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // reassign struct..
@@ -480,7 +490,7 @@ class TestNullPointer : public TestFixture {
               "    abc = abc->next;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct ABC *abc)\n"
@@ -489,7 +499,7 @@ class TestNullPointer : public TestFixture {
               "    f(&abc);\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // goto..
@@ -503,7 +513,7 @@ class TestNullPointer : public TestFixture {
               "out:\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // loops..
@@ -517,7 +527,7 @@ class TestNullPointer : public TestFixture {
               "        --a;\n"
               "    }\n"
               "    while (a > 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -529,7 +539,7 @@ class TestNullPointer : public TestFixture {
               "        if (!tok)\n"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // dynamic_cast..
@@ -538,7 +548,7 @@ class TestNullPointer : public TestFixture {
               "    int a = abc->a;\n"
               "    if (!dynamic_cast<DEF *>(abc))\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2641 - global pointer, function call
@@ -547,14 +557,14 @@ class TestNullPointer : public TestFixture {
               "    abc->a = 0;\n"
               "    do_stuff();\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
 
         check("Fred *fred;\n"
               "void f() {\n"
               "    fred->foo();\n"
               "    if (fred) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
 
         // #2641 - local pointer, function call
@@ -563,7 +573,7 @@ class TestNullPointer : public TestFixture {
               "    abc->a = 0;\n"
               "    do_stuff();\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:3:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -573,7 +583,7 @@ class TestNullPointer : public TestFixture {
               "    abc->a = 0;\n"
               "    do_stuff();\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:2:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -588,32 +598,32 @@ class TestNullPointer : public TestFixture {
               "            if ( abc ) {}\n"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3128
         check("void f(ABC *abc) {\n"
               "    x(!abc || y(abc->a));\n"
               "    if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "  x(def || !abc || y(def, abc->a));\n"
               "  if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "  x(abc && y(def, abc->a));\n"
               "  if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "    x(def && abc && y(def, abc->a));\n"
               "    if (abc) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3228 - calling function with null object
@@ -621,7 +631,7 @@ class TestNullPointer : public TestFixture {
             const char code[] = "void f(Fred *fred) {\n"
                                 "    fred->x();\n"
                                 "    if (fred) { }\n"
-                                "}";
+                                "}\n";
             check(code);
             ASSERT_EQUALS(
                 "[test.cpp:3:9] -> [test.cpp:2:5]: (warning) Either the condition 'fred' is redundant or there is possible null pointer dereference: fred. [nullPointerRedundantCheck]\n",
@@ -633,7 +643,7 @@ class TestNullPointer : public TestFixture {
                "void f(struct FRED *fred) {\n"
                "    fred->x = 0;\n"
                "    IF(!fred){}\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -641,7 +651,7 @@ class TestNullPointer : public TestFixture {
               "  if (!buffer)\n"
               "    uv_fatal_error();\n"
               "  buffer->x = 11;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -655,14 +665,14 @@ class TestNullPointer : public TestFixture {
               "    *p = 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(int *p)\n"
               "{\n"
               "    *p = 0;\n"
               "    if (p) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:3:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -671,7 +681,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "    *p = 0;\n"
               "    if (p || q) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:3:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -681,7 +691,7 @@ class TestNullPointer : public TestFixture {
               "    bar(*p);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:10]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p)\n"
@@ -689,14 +699,14 @@ class TestNullPointer : public TestFixture {
               "    strcpy(p, \"abc\");\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:12]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p)\n"
               "{\n"
               "    if (*p == 0) { }\n"
               "    if (!p) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:10]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // no error
@@ -706,7 +716,7 @@ class TestNullPointer : public TestFixture {
               "    f(&p);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -714,7 +724,7 @@ class TestNullPointer : public TestFixture {
               "    int **p = f();\n"
               "    if (!p)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p)\n"
@@ -725,7 +735,7 @@ class TestNullPointer : public TestFixture {
               "        *p = 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x)\n"
@@ -733,7 +743,7 @@ class TestNullPointer : public TestFixture {
               "    int a = 2 * x;"
               "    if (x == 0)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p)\n"
@@ -741,7 +751,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = p ? *p : 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p, bool x)\n"
@@ -749,7 +759,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = x ? *p : 5;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:3:21]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -758,13 +768,13 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p) {\n"
               "    *p = 0;\n"
               "    while (p) { p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 0;\n"
               "    while (p) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -775,7 +785,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = p ? (p->a) : 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(ABC *p)\n"
@@ -783,7 +793,7 @@ class TestNullPointer : public TestFixture {
               "    int var1 = p ? (1 + p->a) : 0;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -815,7 +825,7 @@ class TestNullPointer : public TestFixture {
               "      break;\n"
               "    else\n"
               "      p = p->next();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(Document *doc) {\n"
@@ -823,27 +833,27 @@ class TestNullPointer : public TestFixture {
               "    if (!doc) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3128 - false positive
         check("void f(int *p) {\n"
               "    assert(!p || (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    assert(p && (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 12;\n"
               "    assert(p && (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:12] -> [test.cpp:2:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -853,7 +863,7 @@ class TestNullPointer : public TestFixture {
               "    p = p->next;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
@@ -861,7 +871,7 @@ class TestNullPointer : public TestFixture {
               "    p = bar(p->next);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
@@ -869,7 +879,7 @@ class TestNullPointer : public TestFixture {
               "    p = aa->bar(p->next);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
@@ -877,7 +887,7 @@ class TestNullPointer : public TestFixture {
               "    p = *p2 = p->next;\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct ABC *abc)\n"
@@ -885,32 +895,32 @@ class TestNullPointer : public TestFixture {
               "    abc = abc ? abc->next : 0;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n" // #4523
               "    abc = (*abc).next;\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n" // #4523
               "    abc = (*abc->ptr);\n"
               "    if (abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(Item *item) {\n"
               "    x = item ? ab(item->x) : 0;\n"
               "    if (item) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(Item *item) {\n"
               "    item->x = 0;\n"
               "    a = b ? c : d;\n"
               "    if (item) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:9] -> [test.cpp:2:5]: (warning) Either the condition 'item' is redundant or there is possible null pointer dereference: item. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -924,7 +934,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "    if( !pFrm )\n"
               "        return FALSE;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2463
@@ -944,7 +954,7 @@ class TestNullPointer : public TestFixture {
               "                break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2525 - sizeof
@@ -953,26 +963,26 @@ class TestNullPointer : public TestFixture {
               "    int c = sizeof(test[0]);\n"
               "    if (!test)\n"
               "        ;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(type* p) {\n" // #4983
               "    x(sizeof p[0]);\n"
               "    if (!p)\n"
               "        ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3023 - checked deref
         check("void f(struct ABC *abc) {\n"
               "  WARN_ON(!abc || abc->x == 0);\n"
               "  if (!abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(struct ABC *abc) {\n"
               "  WARN_ON(!abc || abc->x == 7);\n"
               "  if (!abc) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3425 - false positives when there are macros
@@ -980,20 +990,28 @@ class TestNullPointer : public TestFixture {
                "void f(int *p) {\n"
                "    *p = 0;\n"
                "    IF(!p){}\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #3914 - false positive
               "    int *p;\n"
               "    ((p=ret()) && (x=*p));\n"
               "    if (p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { struct T { char c; } *p; };\n" // #6541
               "char f(S* s) { return s->p ? 'a' : s->p->c; }\n");
         ASSERT_EQUALS("[test.cpp:2:24] -> [test.cpp:2:37]: (warning) Either the condition 's->p' is redundant or there is possible null pointer dereference: s->p. [nullPointerRedundantCheck]\n",
                       errout_str());
+
+        check("int f(const int a[]) {\n" // #14544
+              "    int i = 0;\n"
+              "    if (!a)\n"
+              "        a = &i;\n"
+              "    return *a;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer5() {
@@ -1003,7 +1021,7 @@ class TestNullPointer : public TestFixture {
               " char c = a.c();\n"
               " if (!a)\n"
               "   return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1018,18 +1036,18 @@ class TestNullPointer : public TestFixture {
               "    } else { if (a == 2) {\n"
               "        p = new FooCar; } }\n"
               "    p->abcd();\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Possible null pointer dereference: p\n",
                            "", errout_str());
 
         check("static void foo() {\n"
               "    int &r = *(int*)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         check("static void foo(int x) {\n"
               "    int y = 5 + *(int*)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         {
@@ -1044,7 +1062,7 @@ class TestNullPointer : public TestFixture {
 
         check("static void foo() {\n"
               "    std::cout << *(int*)0;"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         check("void f()\n"
@@ -1054,12 +1072,12 @@ class TestNullPointer : public TestFixture {
               "        delete c;\n"
               "    }\n"
               "    c[0] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Null pointer dereference: c [nullPointer]\n", errout_str());
 
         check("static void foo() {\n"
               "    if (3 > *(int*)0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         // no false positive..
@@ -1068,20 +1086,20 @@ class TestNullPointer : public TestFixture {
               "    Foo *p = 0;\n"
               "    p = new Foo;\n"
               "    p->abcd();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int sz = sizeof((*(struct dummy *)0).x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void get_offset(long &offset)\n"
               "{\n"
               "    mystruct * temp; temp = 0;\n"
               "    offset = (long)(&(temp->z));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #1893 - try/catch inside else
@@ -1100,7 +1118,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *Q=1;\n"
               "    return Q;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int *test(int *Z)\n"
@@ -1116,7 +1134,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *Q=1;\n"
               "    return Q;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (warning) Possible null pointer dereference: Q [nullPointer]\n", errout_str());
 
         // Ticket #2052 (false positive for 'else continue;')
@@ -1127,7 +1145,7 @@ class TestNullPointer : public TestFixture {
               "        else continue;\n"
               "        *p = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // function pointer..
@@ -1136,7 +1154,7 @@ class TestNullPointer : public TestFixture {
               "    void (*f)();\n"
               "    f = 0;\n"
               "    f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (error) Null pointer dereference: f [nullPointer]\n", errout_str());
 
         check("int* g();\n" // #11007
@@ -1154,7 +1172,7 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < 10; ++i) {\n"
               "        int x = *p + 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("void f(int a) {\n"
@@ -1165,21 +1183,21 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < 3; i++) {\n"
               "        if (a && (p[i] == '1'));\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2251: taking the address of member
         check("void f() {\n"
               "    Fred *fred = 0;\n"
               "    int x = &fred->x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // ticket #3220: dereferencing a null pointer is UB
         check("void f() {\n"
               "    Fred *fred = NULL;\n"
               "    fred->do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Null pointer dereference: fred [nullPointer]\n", errout_str());
 
         // ticket #3570 - parsing of conditions
@@ -1189,21 +1207,21 @@ class TestNullPointer : public TestFixture {
                   "    if (x)\n"
                   "        p = q;\n"
                   "    if (p && *p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
             check("void f() {\n"
                   "    int *p = NULL;\n"
                   "    if (x)\n"
                   "        p = q;\n"
                   "    if (!p || *p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
             check("void f() {\n"
                   "    int *p = NULL;\n"
                   "    if (x)\n"
                   "        p = q;\n"
                   "    if (p || *p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:5:15]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
         }
 
@@ -1219,7 +1237,7 @@ class TestNullPointer : public TestFixture {
                   "\n"
                   "void g() {\n"
                   "    f(NULL, NULL);\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -1244,7 +1262,7 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < n; i++) {\n"
               "        argv32[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // No false negative:
@@ -1259,7 +1277,7 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < n; i++) {\n"
               "        argv32[i] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:9]: (warning) Possible null pointer dereference: argv32 [nullPointer]\n", errout_str());
 
         // #2231 - error if assignment in loop is not used
@@ -1275,7 +1293,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -1284,7 +1302,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "  wxLongLong x = 0;\n"
               "  int y = x.GetValue();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1293,7 +1311,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "  std::string * x = 0;\n"
               "  *x = \"test\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:4]: (error) Null pointer dereference: x [nullPointer]\n", errout_str());
     }
 
@@ -1303,7 +1321,7 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "  struct my_type* p = 0;\n"
               "  p->x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -1315,7 +1333,7 @@ class TestNullPointer : public TestFixture {
               "  struct my_type* p;\n"
               "  p = 0;\n"
               "  return p->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -1329,8 +1347,12 @@ class TestNullPointer : public TestFixture {
         check(code); // C++ file => nullptr means NULL
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: i [nullPointer]\n", errout_str());
 
-        check(code, dinit(CheckOptions, $.cpp = false)); // C file => nullptr does not mean NULL
+        const Settings s = settingsBuilder(settings).c(Standards::C17).build();
+        check(code, s, false); // C17 file => nullptr does not mean NULL
         ASSERT_EQUALS("", errout_str());
+
+        check(code, dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:4:11]: (error) Null pointer dereference: i [nullPointer]\n", errout_str());
     }
 
     void nullpointer15() {  // #3560
@@ -1338,7 +1360,7 @@ class TestNullPointer : public TestFixture {
               "    char *p = 0;\n"
               "    if (x) p = \"abcd\";\n"
               "    return p ? f(*p) : f(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1347,7 +1369,7 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    bar(&p);\n"
               "    *p = 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1356,14 +1378,14 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    if (x) { return 0; }\n"
               "    return !p || *p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    int *p = 0;\n"
               "    if (x) { return 0; }\n"
               "    return p && *p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1376,14 +1398,14 @@ class TestNullPointer : public TestFixture {
               "  {\n"
               "    i++;\n"
               "  };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Null pointer dereference: str [nullPointer]\n", errout_str());
     }
 
     void nullpointer19() { // #3811
         check("int foo() {\n"
               "    perror(0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1392,15 +1414,17 @@ class TestNullPointer : public TestFixture {
               "    struct xy *p = 0;\n"
               "    if (x) p = q;\n"
               "    if (p ? p->x || p->y : 0) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"   // false negative
               "    struct xy *p = 0;\n"
               "    if (x) p = q;\n"
               "    if (y ? p->x : p->y) { }\n"
-              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning) Possible null pointer dereference: p\n", "", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:13]: (warning) Possible null pointer dereference: p [nullPointer]\n"
+                      "[test.cpp:4:20]: (warning) Possible null pointer dereference: p [nullPointer]\n",
+                      errout_str());
     }
 
     void nullpointer21() {  // #4038 - fp: if (x) p=q; else return;
@@ -1409,7 +1433,7 @@ class TestNullPointer : public TestFixture {
               "    if (x) p = q;\n"
               "    else return;\n"
               "    *p = 0;\n" // <- p is not NULL
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1418,7 +1442,7 @@ class TestNullPointer : public TestFixture {
               "    char *c = NULL;\n"
               "    char cBuf[10];\n"
               "    sprintf(cBuf, \"%s\", c ? c : \"0\" );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
     }
 
@@ -1427,7 +1451,7 @@ class TestNullPointer : public TestFixture {
               "    char *c = NULL;\n"
               "    x = c = new char[10];\n"
               "    *c = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1437,7 +1461,7 @@ class TestNullPointer : public TestFixture {
               "    int *array = NULL;\n"
               "    if (data == 1 && array[i] == 0)\n"
               "        std::cout << \"test\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (error) Null pointer dereference: array [nullPointer]\n", errout_str());
     }
 
@@ -1454,7 +1478,7 @@ class TestNullPointer : public TestFixture {
               "    if (t2 && (!t1))\n"
               "        return 0.0;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1468,7 +1492,7 @@ class TestNullPointer : public TestFixture {
               "    pointer_=NULL;\n"
               "    *pointer_=0;\n"
               "    return *this;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (error) Null pointer dereference: pointer_ [nullPointer]\n", errout_str());
     }
 
@@ -1478,7 +1502,7 @@ class TestNullPointer : public TestFixture {
               "  int i = s ? s->value + 1\n"
               "            : s->value - 1; // <-- null ptr dereference\n"
               "  return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:11] -> [test.cpp:4:15]: (warning) Either the condition 's' is redundant or there is possible null pointer dereference: s. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1529,7 +1553,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "\n"
               "    (void)f->x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1641,7 +1665,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->x == NULL) {}\n"
               "    *(a->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:14] -> [test.cpp:4:8]: (warning) Either the condition 'a->x==NULL' is redundant or there is possible null pointer dereference: a->x. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1652,7 +1676,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->x == nullptr) {}\n"
               "    *(a->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:14] -> [test.cpp:4:8]: (warning) Either the condition 'a->x==nullptr' is redundant or there is possible null pointer dereference: a->x. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1663,7 +1687,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->g() == nullptr) {}\n"
               "    *(a->g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:16] -> [test.cpp:4:11]: (warning) Either the condition 'a->g()==nullptr' is redundant or there is possible null pointer dereference: a->g(). [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1672,7 +1696,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->g() == nullptr) {}\n"
               "    *(a->g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1681,7 +1705,7 @@ class TestNullPointer : public TestFixture {
               "void f(struct A *a) {\n"
               "    if (a->g() == nullptr) {}\n"
               "    *(a->g());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:16] -> [test.cpp:4:11]: (warning) Either the condition 'a->g()==nullptr' is redundant or there is possible null pointer dereference: a->g(). [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1694,7 +1718,7 @@ class TestNullPointer : public TestFixture {
               "    if (x) {\n"
               "        (void)*a->x;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1706,7 +1730,7 @@ class TestNullPointer : public TestFixture {
               "    if ( w == 0.0 )\n"
               "        return 0;\n"
               "    return b->get();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         // #9423
         check("extern F* GetF();\n"
@@ -1723,7 +1747,7 @@ class TestNullPointer : public TestFixture {
               "    if (!lPtrOk)\n"
               "        return;\n"
               "    lPtr->Clear();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1740,7 +1764,7 @@ class TestNullPointer : public TestFixture {
               "    g();\n"
               "  a d = *c->b();\n"
               "  return d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
@@ -1756,7 +1780,7 @@ class TestNullPointer : public TestFixture {
               "    e();\n"
               "  a d = *c->b();\n"
               "  return d;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1764,7 +1788,7 @@ class TestNullPointer : public TestFixture {
         check("void f() {\n"
               "    char* p = new(std::nothrow) char[1];\n"
               "    if( p ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1773,7 +1797,7 @@ class TestNullPointer : public TestFixture {
               "   if(!p[0]) {}\n"
               "   const int *const a = p;\n"
               "   if(!a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:2:8]: (warning) Either the condition '!a' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
     }
 
@@ -1782,7 +1806,7 @@ class TestNullPointer : public TestFixture {
               "auto f(T& x) -> decltype(x);\n"
               "int& g(int* x) {\n"
               "    return f(*x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1792,7 +1816,7 @@ class TestNullPointer : public TestFixture {
               "    if(n > 10) q = p;\n"
               "    *p +=2;\n"
               "    if(n < 120) *q+=12;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (warning) Possible null pointer dereference: q [nullPointer]\n", errout_str());
 
         check("void f(int *p, int n) {\n"
@@ -1800,7 +1824,7 @@ class TestNullPointer : public TestFixture {
               "    if(n > 10) q = p;\n"
               "    *p +=2;\n"
               "    if(n > 10) *q+=12;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1814,7 +1838,7 @@ class TestNullPointer : public TestFixture {
               "            }\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:8] -> [test.cpp:6:18]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1830,7 +1854,7 @@ class TestNullPointer : public TestFixture {
               "  if (c(e, \"\"))\n"
               "    return nullptr;\n"
               "  return e->b();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1840,7 +1864,7 @@ class TestNullPointer : public TestFixture {
               "    if(b) c = b;\n"
               "    if (!c) c = &a;\n"
               "    return *c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a, int* b) {\n"
@@ -1849,7 +1873,7 @@ class TestNullPointer : public TestFixture {
               "    bool d = !c;\n"
               "    if (d) c = &a;\n"
               "    return *c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
@@ -1859,7 +1883,7 @@ class TestNullPointer : public TestFixture {
               "    if(b) c.x = b;\n"
               "    if (!c.x) c.x = &a;\n"
               "    return *c.x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
@@ -1870,7 +1894,7 @@ class TestNullPointer : public TestFixture {
               "    bool d = !c.x;\n"
               "    if (d) c.x = &a;\n"
               "    return *c.x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
@@ -1893,7 +1917,7 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "void bar() {\n"
               "  f(0, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Possible null pointer dereference: params [nullPointer]\n", errout_str());
     }
 
@@ -1909,7 +1933,7 @@ class TestNullPointer : public TestFixture {
               "int bar() {\n"
               "    int **array = NULL;\n"
               "    foo (array, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1919,7 +1943,7 @@ class TestNullPointer : public TestFixture {
               "    while (tok3->astParent() && tok3->str() == \",\")\n"
               "        tok3 = tok3->astParent();\n"
               "    if (tok3 && tok3->str() == \"(\") {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:5:9] -> [test.cpp:3:12]: (warning) Either the condition 'tok3' is redundant or there is possible null pointer dereference: tok3. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -1932,7 +1956,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    if (!t1 || !t2)\n"
               "        return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(int* i);\n"
@@ -1940,7 +1964,7 @@ class TestNullPointer : public TestFixture {
               "    while(f(i) && *i == 0)\n"
               "        i++;\n"
               "    if (!i) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1952,7 +1976,7 @@ class TestNullPointer : public TestFixture {
               "    ListEntry *prev = NULL;\n"
               "    for (ListEntry *cursor = listHead; cursor != NULL; prev = cursor, cursor = cursor->next) {}\n"
               "    if (prev) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2429,6 +2453,9 @@ class TestNullPointer : public TestFixture {
 
     void nullpointer77()
     {
+        // No warning: 'i' is passed to the unknown function 'h' in the same condition that guards the
+        // dereference. 'h' may validate the pointer (e.g. return false for null), so '*i' can be safe
+        // - this is the common "if (check(p) && p->...)" pattern, so we must not assume 'i' is null.
         check("bool h(int*);\n"
               "void f(int* i) {\n"
               "    int* i = nullptr;\n"
@@ -2444,6 +2471,8 @@ class TestNullPointer : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        // Likewise here, even though 'i' is null when the first 'h(i)' was true: the second 'h(i)' is an
+        // independent call that may validate 'i', so '*i' is not necessarily a null dereference.
         check("bool h(int*);\n"
               "void f(int* x) {\n"
               "    int* i = x;\n"
@@ -2452,6 +2481,14 @@ class TestNullPointer : public TestFixture {
               "    if (h(i) && *i == 1) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(int i) {\n" // #13797
+              "    int* p = nullptr;\n"
+              "    if (!i) {\n"
+              "        *p = 0;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer78() // #7802
@@ -2462,7 +2499,7 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    pp = &p;\n"
               "    **pp = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (error) Null pointer dereference: *pp [nullPointer]\n", errout_str());
     }
 
@@ -2698,7 +2735,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "  }\n"
               "  return \"unknown\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:12] -> [test.cpp:3:7]: (warning) Either the condition 'ctx' is redundant or there is possible null pointer dereference: ctx. [nullPointerRedundantCheck]\n",
             errout_str());
@@ -2740,7 +2777,7 @@ class TestNullPointer : public TestFixture {
               "        int* myNull = GetThing();\n"
               "        *myNull=42;\n"
               "        return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference: myNull [nullPointer]\n", errout_str());
 
         check("struct foo {\n"
@@ -2751,7 +2788,7 @@ class TestNullPointer : public TestFixture {
               "        int* myNull = myFoo.GetThing();\n"
               "        *myNull=42;\n"
               "        return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (error) Null pointer dereference: myNull [nullPointer]\n", errout_str());
 
         check("struct T { bool g() const; };\n"
@@ -2848,7 +2885,7 @@ class TestNullPointer : public TestFixture {
               "        int * buf = foo(true);\n"
               "        buf[2] = 0;" // <<
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:14:9]: (error) Null pointer dereference: buf [nullPointer]\n", errout_str());
     }
 
@@ -2919,17 +2956,208 @@ class TestNullPointer : public TestFixture {
         TODO_ASSERT_EQUALS("", "[test.cpp:3:10]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
+    void nullpointer104() // #13881
+    {
+        check("using std::max;\n"
+              "void f(int i) {\n"
+              "    const size_t maxlen = i == 1 ? 8 : (std::numeric_limits<std::size_t>::max());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer105() // #13861
+    {
+        check("struct AB { int a; int b; };\n"
+              "namespace ns { typedef AB S[10]; }\n"
+              "void foo(void) {\n"
+              "    ns::S x = {0};\n"
+              "    x[1].a = 2;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer106() // #13682
+    {
+        // An unrelated condition between the null check and the dereference must not stop the analysis
+        check("struct S {\n"
+              "    bool b;\n"
+              "    bool f() const;\n"
+              "};\n"
+              "void f(const S* p, const S* o) {\n"
+              "    const S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (p == o)\n"
+              "        return;\n"
+              "    if (p1->b) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:7:9] -> [test.cpp:11:9]: (warning) Either the condition 'p1' is redundant or there is possible null pointer dereference: p1. [nullPointerRedundantCheck]\n",
+            errout_str());
+    }
+
+    void nullpointer107() // #13682 - guards that depend on the pointer indirectly
+    {
+        // cached null-check 'ok'; guard 'if (!ok)' is safe -> no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p) {\n"
+              "    bool ok = (p != nullptr);\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (!ok)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // unrelated bool guard -> conservative, no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, bool valid) {\n"
+              "    S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (!valid)\n"
+              "        return;\n"
+              "    p1->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // guard on a different pointer -> no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, S* q) {\n"
+              "    S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (!q)\n"
+              "        return;\n"
+              "    p1->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // direct null guard on the alias -> no FP
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p) {\n"
+              "    S* p1 = p;\n"
+              "    if (p1 && p1->f())\n"
+              "        return;\n"
+              "    if (!p)\n"
+              "        return;\n"
+              "    p1->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // FN: 'if (ok)' => survivor has p==nullptr, but the cached 'ok' is not followed -> should warn
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p) {\n"
+              "    bool ok = (p != nullptr);\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (ok)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:4:9] -> [test.cpp:8:5]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+            "",
+            errout_str());
+
+        // FN: sink(q) drops the q==p symbolic, so guard 'if (q)' is no longer seen to relate to p -> should warn
+        check("struct S { void g(); bool f() const; };\n"
+              "void sink(S*&);\n"
+              "void f(S* p) {\n"
+              "    S* q = p;\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    sink(q);\n"
+              "    if (q)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:5:9] -> [test.cpp:10:5]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+            "",
+            errout_str());
+
+        // a conditional modification makes ProgramMemory drop the guard (FP-prone) -> must stay quiet:
+        // alias 'q==p' re-assigned to p under a condition
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, bool c) {\n"
+              "    S* q = p;\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (c)\n"
+              "        q = p;\n"
+              "    if (!q)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // cached 'ok' refreshed under a condition
+        check("struct S { void g(); bool f() const; };\n"
+              "void f(S* p, bool c) {\n"
+              "    bool ok = (p != nullptr);\n"
+              "    if (p && p->f())\n"
+              "        return;\n"
+              "    if (c)\n"
+              "        ok = (p != nullptr);\n"
+              "    if (!ok)\n"
+              "        return;\n"
+              "    p->g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer108() { // #14422
+        check("void f() {\n"
+              "    int *p{};\n"
+              "    int *&r{p};\n"
+              "    if (*r) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference: r [nullPointer]\n", errout_str());
+    }
+
+    void nullpointer109()
+    {
+        check("boost::asio::awaitable<int> test()\n"
+              "{\n"
+              "    const auto *s = getStr();\n"
+              "    if(!s) co_return int{1};\n"
+              "    std::print(\"{}\",*s);\n"
+              "    co_return int{9};\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer110()
+    { // #14937 - noreturn member function called on operator() result
+        check("struct A {\n"
+              "    [[noreturn]] void g(int);\n"
+              "};\n"
+              "template<class T>\n"
+              "struct Thunk {\n"
+              "    T& operator()() const;\n"
+              "};\n"
+              "void f(Thunk<A> thunk, int* p) {\n"
+              "    if (!p)\n"
+              "        thunk().g(0);\n"
+              "    *p = 1;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void nullpointer_addressOf() { // address of
         check("void f() {\n"
               "  struct X *x = 0;\n"
               "  if (addr == &x->y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  struct X *x = 0;\n"
               "  if (addr == &x->y.z[0]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("typedef int Count;\n" // #10018
@@ -2955,7 +3183,7 @@ class TestNullPointer : public TestFixture {
               "        break;\n"
               "    }\n"
               "    return p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:7:10]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
@@ -2965,7 +3193,7 @@ class TestNullPointer : public TestFixture {
               "        while (*p && nasm_isspace(*p))\n"
               "            p++;\n"
               "    return p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char* origin) {\n" // #11449
@@ -2980,7 +3208,7 @@ class TestNullPointer : public TestFixture {
         check("void f () {\n"
               "    int *buf; buf = NULL;\n"
               "    buf;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3002,27 +3230,27 @@ class TestNullPointer : public TestFixture {
               "    if (!p) {\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (p && *p == 0) {\n"
               "    }\n"
               "    printf(\"%c\", *p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:19]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (p && *p == 0) {\n"
               "    } else { *p = 0; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:15]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (p) {\n"
               "    }\n"
               "    strcpy(p, \"abc\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:12]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(char *p) {\n"
@@ -3030,7 +3258,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    bar();\n"
               "    strcpy(p, \"abc\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:5:12]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void foo(abc *p) {\n"
@@ -3038,7 +3266,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    else { if (!p->x) {\n"
               "    } }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -3048,7 +3276,7 @@ class TestNullPointer : public TestFixture {
                 "        abort();\n"
                 "    }\n"
                 "    *p = 0;\n"
-                "}";
+                "}\n";
             check(code);
             ASSERT_EQUALS("", errout_str());
 
@@ -3061,7 +3289,7 @@ class TestNullPointer : public TestFixture {
               "        (*bail)();\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
@@ -3069,7 +3297,7 @@ class TestNullPointer : public TestFixture {
               "        throw x;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
@@ -3077,21 +3305,21 @@ class TestNullPointer : public TestFixture {
               "        ab.abort();\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
               "        switch (x) { }\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
               "    }\n"
               "    return *x;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int *p) {\n"
@@ -3099,7 +3327,7 @@ class TestNullPointer : public TestFixture {
               "        x = *p;\n"
               "        return 5+*p;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:14]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
                       "[test.cpp:2:9] -> [test.cpp:4:19]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
@@ -3109,7 +3337,7 @@ class TestNullPointer : public TestFixture {
               "    if (!a) {\n"
               "        a.x();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // This is why this check can't be used on the simplified token list
@@ -3117,7 +3345,7 @@ class TestNullPointer : public TestFixture {
               "    if (!dynamic_cast<bar *>(foo)) {\n"
               "        *foo = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket: #2300 - calling unknown function that may initialize the pointer
@@ -3127,7 +3355,7 @@ class TestNullPointer : public TestFixture {
               "        initfred();\n"
               "        fred->x = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #1219
@@ -3136,7 +3364,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:5:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // #2467 - unknown macro may terminate the application
@@ -3145,7 +3373,7 @@ class TestNullPointer : public TestFixture {
               "        MACRO;\n"
               "    }\n"
               "    fred->a();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2493 - switch
@@ -3158,7 +3386,7 @@ class TestNullPointer : public TestFixture {
               "            fred->a();\n"
               "            break;\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4118 - second if
@@ -3166,7 +3394,7 @@ class TestNullPointer : public TestFixture {
               "    int x = 1;\n"
               "    if (!p) x = 0;\n"
               "    if (x) *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2674 - different functions
@@ -3183,7 +3411,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "void Fred::b() {\n"
               "    wilma->Reload();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int *i) {\n"
@@ -3191,7 +3419,7 @@ class TestNullPointer : public TestFixture {
               "  else {\n"
               "    int b = *i;\n"
               "  }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 1
@@ -3204,7 +3432,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "   if (pFoo)\n"
               "      bar();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 2
@@ -3217,7 +3445,7 @@ class TestNullPointer : public TestFixture {
               "      pFoo = pFoo->next;\n"
               "\n"
               "   len = sizeof(pFoo->data);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 3
@@ -3230,13 +3458,13 @@ class TestNullPointer : public TestFixture {
               "      pFoo = pFoo->next;\n"
               "\n"
               "   len = decltype(*pFoo);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(struct Fred *fred) {\n"
               "    if (fred) { }\n"
               "    return fred->a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:12]: (warning) Either the condition 'fred' is redundant or there is possible null pointer dereference: fred. [nullPointerRedundantCheck]\n", errout_str());
 
         // #2789 - assign and check pointer
@@ -3244,7 +3472,7 @@ class TestNullPointer : public TestFixture {
               "    char *p; p = x();\n"
               "    if (!p) { }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:4:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, assign and use
@@ -3253,7 +3481,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && (p = malloc(10)) != 0) {\n"
               "        *p = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // check, assign and use
@@ -3262,7 +3490,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && (p = malloc(10)) != a && (*p = a)) {\n"
               "        *p = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // check, and use
@@ -3271,7 +3499,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && (*p = 0)) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:3:21]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, and use
@@ -3280,7 +3508,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 && p->x == 10) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:3:19]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, and use
@@ -3289,7 +3517,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0 || p->x == 10) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // check, and use
@@ -3298,7 +3526,7 @@ class TestNullPointer : public TestFixture {
               "    if (p == NULL && (*p = a)) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:3:24]: (warning) Either the condition 'p==NULL' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // check, and use
@@ -3306,14 +3534,14 @@ class TestNullPointer : public TestFixture {
               "    if (!p && x==1 || p && p->x==0) {\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
             const char code[] = "void f(Fred *fred) {\n"
                                 "    if (fred == NULL) { }\n"
                                 "    fred->x();\n"
-                                "}";
+                                "}\n";
 
             check(code);     // inconclusive
             ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:5]: (warning) Either the condition 'fred==NULL' is redundant or there is possible null pointer dereference: fred. [nullPointerRedundantCheck]\n", errout_str());
@@ -3322,53 +3550,67 @@ class TestNullPointer : public TestFixture {
         check("void f(char *s) {\n"   // #3358
               "    if (s==0);\n"
               "    strcpy(a, s?b:c);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // sizeof
         check("void f(struct fred_t *fred) {\n"
               "    if (!fred)\n"
               "        int sz = sizeof(fred->x);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // check in macro
         check("void f(int *x) {\n"
               "    $if (!x) {}\n"
               "    *x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return ?:
         check("int f(ABC *p) {\n" // FP : return ?:
               "    if (!p) {}\n"
               "    return p ? p->x : 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("int f(ABC *p) {\n" // no fn
               "    if (!p) {}\n"
               "    return q ? p->x : 0;\n"
-              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", "", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:16]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("int f(ABC *p) {\n" // FP : return &&
               "    if (!p) {}\n"
               "    return p && p->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int *p) {\n"
               "    if (x || !p) {}\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         // sizeof
         check("void f() {\n"
               "  int *pointer = NULL;\n"
               "  pointer = func(sizeof pointer[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n" // #14164
+              "    T* next;\n"
+              "    char op;\n"
+              "};\n"
+              "void h(int, char);\n"
+              "void g(const T* tok, bool b) {\n"
+              "    if (tok->op == '<') {\n"
+              "        while ((tok = tok->next) && tok->op != '>') {}\n"
+              "    }\n"
+              "    h(b ? 1 : 0, tok->op);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:8:21] -> [test.cpp:10:18]: (warning) Either the condition 'tok=tok->next' is redundant or there is possible null pointer dereference: tok. [nullPointerRedundantCheck]\n",
+                      errout_str());
     }
 
     // Test CheckNullPointer::nullConstantDereference
@@ -3376,12 +3618,12 @@ class TestNullPointer : public TestFixture {
         check("int f() {\n"
               "    int* p = 0;\n"
               "    return p[4];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("void f() {\n"
               "    typeof(*NULL) y;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("int * f() {\n"
@@ -3389,7 +3631,7 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "int main() {\n"
               "  return *f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Null pointer dereference: f() [nullPointer]\n", errout_str());
     }
 
@@ -3397,7 +3639,7 @@ class TestNullPointer : public TestFixture {
         // Ticket #2621
         check("void f(struct ABC *abc) {\n"
               "    ({ if (abc) dbg(); })\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3405,7 +3647,7 @@ class TestNullPointer : public TestFixture {
         // Ticket #2840
         check("void f() {\n"
               "    int bytes = snprintf(0, 0, \"%u\", 1);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3413,150 +3655,143 @@ class TestNullPointer : public TestFixture {
         // Ticket #2840
         check("void f() {\n"
               "    int bytes = snprintf(0, 10, \"%u\", 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (error) Null pointer dereference [nullPointer]\n", errout_str());
     }
 
     void printf_with_invalid_va_argument() {
         check("void f() {\n"
               "    printf(\"%s\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"%s\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* s = 0;\n"
               "    printf(\"%s\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:18]: (error) Null pointer dereference: s [nullPointer]\n"
-            "[test.cpp:3:18]: (error) Null pointer dereference [nullPointer]\n",
+            "[test.cpp:3:18]: (error) Null pointer dereference: s [nullPointer]\n",
             errout_str());
 
         check("void f() {\n"
               "    char *s = 0;\n"
               "    printf(\"%s\", s == 0 ? a : s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    printf(\"%u%s\", 0, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"%u%s\", 0, s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* s = 0;\n"
               "    printf(\"%u%s\", 123, s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:25]: (error) Null pointer dereference: s [nullPointer]\n"
-            "[test.cpp:3:25]: (error) Null pointer dereference [nullPointer]\n",
+            "[test.cpp:3:25]: (error) Null pointer dereference: s [nullPointer]\n",
             errout_str());
 
 
         check("void f() {\n"
               "    printf(\"%%%s%%\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"text: %s, %s\", s, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:31]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
 
         check("void f() {\n"
               "    char* s = \"blabla\";\n"
               "    printf(\"%s\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f(char* s) {\n"
               "    printf(\"text: %m%s, %s\", s, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:33]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"text: %*s, %s\", s, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         // Ticket #3364
         check("void f() {\n"
               "    printf(\"%-*.*s\", s, 0);\n"
               "    sprintf(\"%*\", s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void scanf_with_invalid_va_argument() {
         check("void f(char* s) {\n"
               "    sscanf(s, \"%s\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n",
             errout_str());
 
         check("void f() {\n"
               "    scanf(\"%d\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n",
             errout_str());
 
         check("void f(char* foo) {\n"
               "    char location[200];\n"
               "    int width, height;\n"
               "    sscanf(imgInfo, \"%s %d %d\", location, &width, &height);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // ticket #3207
 
         check("void f(char *dummy) {\n"
               "    int iVal;\n"
               "    sscanf(dummy, \"%d%c\", &iVal);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // ticket #3211
 
         check("void f(char *dummy) {\n"
               "    int* iVal = 0;\n"
               "    sscanf(dummy, \"%d\", iVal);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:25]: (error) Null pointer dereference: iVal [nullPointer]\n"
-            "[test.cpp:3:25]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:3:25]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:3:25]: (error) Null pointer dereference: iVal [nullPointer]\n",
             errout_str());
 
         check("void f(char *dummy) {\n"
               "    int* iVal;\n"
               "    sscanf(dummy, \"%d\", foo(iVal));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char *dummy) {\n"
               "    int* iVal = 0;\n"
               "    sscanf(dummy, \"%d%d\", foo(iVal), iVal);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char* dummy) {\n"
               "    sscanf(dummy, \"%*d%u\", 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n"
-            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n",
             errout_str());
     }
 
@@ -3566,12 +3801,12 @@ class TestNullPointer : public TestFixture {
               "    int* iVal = 0;\n"
               "    if(maybe()) iVal = g();\n"
               "    return iVal[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (warning) Possible null pointer dereference: iVal [nullPointer]\n", errout_str());
 
         check("int foo(int* iVal) {\n"
               "    return iVal[0];\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3581,20 +3816,20 @@ class TestNullPointer : public TestFixture {
               "bool foo() {\n"
               "     PolymorphicA* a = 0;\n"
               "     return typeid(*a) == typeid(*a);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("struct NonPolymorphicA { ~A() {} };\n"
               "bool foo() {\n"
               "     NonPolymorphicA* a = 0;\n"
               "     return typeid(*a) == typeid(*a);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo() {\n"
               "     char* c = 0;\n"
               "     return typeid(*c) == typeid(*c);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3603,40 +3838,40 @@ class TestNullPointer : public TestFixture {
         check("size_t foo() {\n"
               "    char* c = 0;\n"
               "    return alignof(*c);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return alignof(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    f(alignof(*p));\n"
               "    if (p) {}\n"
               "    return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    char* c = 0;\n"
               "    return _Alignof(*c);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return _alignof(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return __alignof(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return __alignof__(*0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3647,7 +3882,7 @@ class TestNullPointer : public TestFixture {
               "  cnt = 0;\n"
               " for (int i = 0; i < cnt; ++i)\n"
               "  *ptr++ = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11635
@@ -3661,6 +3896,26 @@ class TestNullPointer : public TestFixture {
               "            i++;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const int* p) {\n" // #6710
+              "    for (int i = *p; i < 5; ++i) {}\n"
+              "    if (p) {}\n"
+              "}\n"
+              "struct S { int a; };\n"
+              "void g(const S* s) {\n"
+              "    for (int i = s->a; i < 5; ++i) {}\n"
+              "    if (s) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:19]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
+                      "[test.cpp:8:9] -> [test.cpp:7:18]: (warning) Either the condition 's' is redundant or there is possible null pointer dereference: s. [nullPointerRedundantCheck]\n",
+                      errout_str());
+
+        check("struct S { int a; };\n" // #6492
+              "void h(const S* s) {\n"
+              "    for (int i = s->a; s; ++i) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:3:18]: (warning) Either the condition 's' is redundant or there is possible null pointer dereference: s. [nullPointerRedundantCheck]\n",
+                      errout_str());
     }
 
     void nullpointerDeadCode() {
@@ -3702,6 +3957,15 @@ class TestNullPointer : public TestFixture {
                "    return 1 ? 1 : *(int*)0 = 1;\n"
                "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check ("struct S {\n" // #13220
+               "    explicit S(int* p) : i(*p) {\n"
+               "        if (p) {}\n"
+               "    }\n"
+               "    int i;\n"
+               "};\n");
+        ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:2:29]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+                      errout_str());
     }
 
     void nullpointerDelete() {
@@ -3728,7 +3992,22 @@ class TestNullPointer : public TestFixture {
               "void f(int* x) {\n"
               "    if (x)\n"
               "        g(x);\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n" // #14308
+              "    bool b{};\n"
+              "    T* next{};\n"
+              "};\n"
+              "bool g(const T*& r) {\n"
+              "    const T* t = r;\n"
+              "    r = t->next;\n"
+              "    return t->b;\n"
+              "}\n"
+              "void f(const T* tok) {\n"
+              "    if (g(tok)) {}\n"
+              "    if (tok) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3755,7 +4034,7 @@ class TestNullPointer : public TestFixture {
               "    std::string s4 = p;\n"
               "    std::string s5(p);\n"
               "    foo(std::string(p));\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:9:10]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:10:22]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:11:20]: (error) Null pointer dereference: p [nullPointer]\n"
@@ -3771,7 +4050,7 @@ class TestNullPointer : public TestFixture {
               "    std::string s2 = nullptr;\n"
               "    std::string s3(nullptr);\n"
               "    foo(std::string(nullptr));\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:3:22]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:4:17]: (error) Null pointer dereference [nullPointer]\n"
@@ -3783,7 +4062,7 @@ class TestNullPointer : public TestFixture {
               "    std::string s2 = NULL;\n"
               "    std::string s3(NULL);\n"
               "    foo(std::string(NULL));\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:3:22]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:4:17]: (error) Null pointer dereference [nullPointer]\n"
@@ -3799,7 +4078,7 @@ class TestNullPointer : public TestFixture {
               "    foo(p == s1);\n"
               "    foo(p == s2);\n"
               "    foo(p == s3);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:5:15]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:7:9]: (error) Null pointer dereference: p [nullPointer]\n"
@@ -3814,7 +4093,7 @@ class TestNullPointer : public TestFixture {
               "    foo(s1.size() == 0);\n"
               "    foo(s2.size() == 0);\n"
               "    foo(s3->size() == 0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s1, const std::string& s2) {\n"
@@ -3823,7 +4102,7 @@ class TestNullPointer : public TestFixture {
               "    foo(0 == s2[0]);\n"
               "    foo(s1[0] == 0);\n"
               "    foo(s2[0] == 0);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s1, const std::string& s2) {\n"
@@ -3832,7 +4111,7 @@ class TestNullPointer : public TestFixture {
               "    foo(s2 == '\\0');\n"
               "    foo('\\0' == s1);\n"
               "    foo('\\0' == s2);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class Bar {\n"
@@ -3843,19 +4122,19 @@ class TestNullPointer : public TestFixture {
               "    std::string s;\n"
               "    Foo();\n"
               "};\n"
-              "Foo::Foo() : s(0) {}");
+              "Foo::Foo() : s(0) {}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:9:14]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f() {\n"
               "    std::string s = 0 == x ? \"a\" : \"b\";\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  const std::string s = g();\n"
               "  ASSERT_MESSAGE(\"Error on s\", 0 == s.compare(\"Some text\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i, std::string s);\n"
@@ -3866,7 +4145,7 @@ class TestNullPointer : public TestFixture {
               "  foo(var, NULL);\n"
               "  foo(var, nullptr);\n"
               "  foo(0, var);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:5:12]: (error) Null pointer dereference [nullPointer]\n"
                       "[test.cpp:6:12]: (error) Null pointer dereference [nullPointer]\n"
@@ -3880,7 +4159,8 @@ class TestNullPointer : public TestFixture {
               "  std::string s(p);\n"
               "  return s;\n"
               "}\n", dinit(CheckOptions, $.inconclusive = true));
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:6:17]: (warning, inconclusive) Possible null pointer dereference: p [nullPointer]\n",
+                      errout_str());
 
         check("void f() {\n" // #11078
               "    const char* p = nullptr;\n"
@@ -3895,13 +4175,22 @@ class TestNullPointer : public TestFixture {
               "void f() { std::string s = g(0L); }\n");
         ASSERT_EQUALS("[test.cpp:2:29]: (error) Null pointer dereference: g(0L) [nullPointer]\n",
                       errout_str());
+
+        check("const char* g() { return nullptr; }\n" // #14098
+              "std::string f() {\n"
+              "    std::string s{ g() };\n"
+              "    return s + std::string(g());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:21]: (error) Null pointer dereference: g() [nullPointer]\n"
+                      "[test.cpp:4:29]: (error) Null pointer dereference: g() [nullPointer]\n",
+                      errout_str());
     }
 
     void nullpointerStdStream() {
         check("void f(std::ifstream& is) {\n"
               "    char* p = 0;\n"
               "    is >> p;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Possible null pointer dereference: p\n", "", errout_str());
 
         check("void f(const std::ostringstream& oss, char* q) {\n"
@@ -3910,7 +4199,7 @@ class TestNullPointer : public TestFixture {
               "    oss << foo << p;\n"
               "    if(q == 0)\n"
               "        oss << foo << q;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:4:19]: (error) Null pointer dereference: p [nullPointer]\n"
                       "[test.cpp:5:10] -> [test.cpp:6:23]: (warning) Either the condition 'q==0' is redundant or there is possible null pointer dereference: q. [nullPointerRedundantCheck]\n", errout_str());
@@ -3922,7 +4211,7 @@ class TestNullPointer : public TestFixture {
               "        std::cin >> p;\n"
               "        std::cout << abc << p;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:3:22]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
                            "[test.cpp:2:10] -> [test.cpp:4:22]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
                            "[test.cpp:2:10] -> [test.cpp:5]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n"
@@ -3937,7 +4226,7 @@ class TestNullPointer : public TestFixture {
               "    char* p2 = 0;\n"
               "    std::cin >> (int)p;\n" // result casted
               "    std::cout << (int)p;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string& str) {\n"
@@ -3945,13 +4234,13 @@ class TestNullPointer : public TestFixture {
               "    std::istringstream istr(str);\n"
               "    istr >> std::hex >> ret;\n" // Read integer
               "    return ret;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int* i) {\n"
               "    if(i) return;\n"
               "    std::cout << i;\n" // Its no char* (#4240)
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         // #5811 false positive: (error) Null pointer dereference
@@ -3960,7 +4249,7 @@ class TestNullPointer : public TestFixture {
               "    stringstream out;\n"
               "    out << ((ip >> 0) & 0xFF);\n"
               "    return out.str();\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
         // avoid regression from first fix attempt for #5811...
         check("void deserialize(const std::string &data) {\n"
@@ -3980,42 +4269,42 @@ class TestNullPointer : public TestFixture {
               "void f(std::shared_ptr<Fred> p) {\n"
               "  if (p) {}\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7] -> [test.cpp:4:11]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::shared_ptr<Fred> p) {\n"
               "  p = nullptr;\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::unique_ptr<Fred> p) {\n"
               "  if (p) {}\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7] -> [test.cpp:4:11]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::unique_ptr<Fred> p) {\n"
               "  p = nullptr;\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f() {\n"
               "  std::shared_ptr<Fred> p;\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::shared_ptr<Fred> p) {\n"
               "  p.reset();\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
@@ -4023,7 +4312,7 @@ class TestNullPointer : public TestFixture {
               "  Fred * pp = nullptr;\n"
               "  p.reset(pp);\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
@@ -4031,28 +4320,28 @@ class TestNullPointer : public TestFixture {
               "  std::shared_ptr<Fred> p;\n"
               "  p.reset(&f);\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(std::shared_ptr<Fred> p) {\n"
               "  p.reset();\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f() {\n"
               "  std::shared_ptr<Fred> p(nullptr);\n"
               "  dostuff(p->x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct A {};\n"
               "void f(int n) {\n"
               "    std::unique_ptr<const A*[]> p;\n"
               "    p.reset(new const A*[n]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9216
@@ -4063,7 +4352,7 @@ class TestNullPointer : public TestFixture {
               "void g(std::unique_ptr<A> var) {\n"
               "    var->reset();\n"
               "    var->f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9439
@@ -4091,21 +4380,21 @@ class TestNullPointer : public TestFixture {
               "    int *p = malloc(10);\n"
               "    *p = 0;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (warning) If memory allocation fails, then there is a possible null pointer dereference: p [nullPointerOutOfMemory]\n", errout_str());
 
         check("void f() {\n"
               "    int *p = malloc(10);\n"
               "    *(p+2) = 0;\n"
               "    free(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (error) If memory allocation fails: pointer addition with NULL pointer. [nullPointerArithmeticOutOfMemory]\n", errout_str());
 
         check("void f() {\n" // #13676
               "    int* q = static_cast<int*>(std::malloc(4));\n"
               "    *q = 0;\n"
               "    std::free(q);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (warning) If memory allocation fails, then there is a possible null pointer dereference: q [nullPointerOutOfMemory]\n", errout_str());
     }
 
@@ -4117,7 +4406,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // function seen (taking pointer parameter)
@@ -4127,7 +4416,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4139,7 +4428,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS("", errout_str());
 
             // function implementation not seen
@@ -4149,7 +4438,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:6]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4159,7 +4448,7 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS(
                 "[test.cpp:4:9] -> [test.cpp:2:6]: (warning, inconclusive) Either the condition 'p' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4172,7 +4461,7 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // function seen (taking pointer parameter)
@@ -4182,7 +4471,7 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4194,7 +4483,7 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:6:9] -> [test.cpp:4:5]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
                 errout_str());
@@ -4204,16 +4493,81 @@ class TestNullPointer : public TestFixture {
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}", dinit(CheckOptions, $.inconclusive = true));
+                  "}\n", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS(
                 "[test.cpp:4:9] -> [test.cpp:2:5]: (warning, inconclusive) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc. [nullPointerRedundantCheck]\n",
                 errout_str());
         }
     }
 
+    void nullpointerOutOfResources() {
+        check("void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    fprintf(fid, \"abcdef\");\n"
+              "    fclose(fid);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:13]: (warning) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n"
+            "[test.cpp:4:12]: (warning) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n",
+            errout_str());
+
+        // the guard might call an unknown, possibly noreturn function -> no warning
+        check("void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid == NULL)\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // .. but an inconclusive warning is reported with --inconclusive
+        check("void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid == NULL)\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:5:12]: (warning, inconclusive) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n",
+            errout_str());
+
+        check("int f(const int* p) {\n"
+              "    if (p == nullptr)\n"
+              "        g();\n"
+              "    return *p;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:2:11] -> [test.cpp:4:13]: (warning, inconclusive) Either the condition 'p==nullptr' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid != NULL)\n"
+              "        ;\n"
+              "    else\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // guard function is known to return -> warning
+        check("void g() {}\n"
+              "void f() {\n"
+              "    FILE* fid = fopen(\"x.txt\", \"w\");\n"
+              "    if (fid == NULL)\n"
+              "        g();\n"
+              "    fclose(fid);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:6:12]: (warning) If resource allocation fails, then there is a possible null pointer dereference: fid [nullPointerOutOfResources]\n",
+            errout_str());
+    }
+
     void functioncalllibrary() {
         SimpleTokenizer tokenizer(settingsDefault,*this,false);
-        const char code[] = "void f() { int a,b,c; x(a,b,c); }";
+        const char code[] = "void f() { int a,b,c; x(a,b,c); }\n";
         ASSERT_EQUALS(true, tokenizer.tokenize(code));
         const Token *xtok = Token::findsimplematch(tokenizer.tokens(), "x");
 
@@ -4231,8 +4585,7 @@ class TestNullPointer : public TestFixture {
             Library library;
             ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-            std::list<const Token *> null;
-            CheckNullPointer::parseFunctionCall(*xtok, null, library);
+            const std::list<const Token *> null = CheckNullPointerImpl::parseFunctionCall(*xtok, library);
             ASSERT_EQUALS(0U, null.size());
         }
 
@@ -4250,8 +4603,7 @@ class TestNullPointer : public TestFixture {
             Library library;
             ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-            std::list<const Token *> null;
-            CheckNullPointer::parseFunctionCall(*xtok, null, library);
+            const std::list<const Token *> null = CheckNullPointerImpl::parseFunctionCall(*xtok, library);
             ASSERT_EQUALS(1U, null.size());
             ASSERT_EQUALS("a", null.front()->str());
         }
@@ -4261,51 +4613,51 @@ class TestNullPointer : public TestFixture {
 
         check("void f(int *p = 0) {\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (!p)\n"
               "        return;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char a, int *p = 0) {\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    printf(\"p = %d\", *p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    printf(\"p[1] = %d\", p[1]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    buf[p] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p != 0 && bar())\n"
               "      *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p != 0)\n"
               "      *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
@@ -4313,13 +4665,13 @@ class TestNullPointer : public TestFixture {
               "    if (p == 0)\n"
               "      p = &y;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int *p = 0) {\n"
               "    if (a != 0)\n"
               "      *p = 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
             "[test.cpp:3:8]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n",
             errout_str());
@@ -4327,13 +4679,13 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p = 0) {\n"
               "    p = a;\n"
               "    *p = 0;\n" // <- don't simplify and verify
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    p += a;\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int *p = 0) {\n"
@@ -4341,17 +4693,17 @@ class TestNullPointer : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << p ? *p : 0;\n" // Due to operator precedence, this is equivalent to: (std::cout << p) ? *p : 0;
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str()); // Check the first branch of ternary
 
         check("void f(char *p = 0) {\n"
               "    std::cout << p ? *p : 0;\n" // Due to operator precedence, this is equivalent to: (std::cout << p) ? *p : 0;
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:18]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n"
             "[test.cpp:2:23]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n",   // duplicate
@@ -4359,27 +4711,27 @@ class TestNullPointer : public TestFixture {
 
         check("void f(int *p = 0) {\n"
               "    std::cout << (p ? *p : 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << (p && p[0] ? *p : 42);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void isEmpty(int *p = 0) {\n"
               "    return p && *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int *p = 0) {\n"
               "    return !p || *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4388,13 +4740,13 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p = 0) {\n"
               "    bar(p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    printf(\"%p\", p);\n"
               "    *p = 0;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:3:6]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         // The init() function may or may not initialize p, but since the address
@@ -4403,14 +4755,14 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p = 0) {\n"
               "    init(&p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void init(int* &g);\n"
               "void f(int *p = 0) {\n"
               "    init(p);\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
@@ -4418,7 +4770,7 @@ class TestNullPointer : public TestFixture {
               "        init(&p);\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
@@ -4426,12 +4778,12 @@ class TestNullPointer : public TestFixture {
               "        throw SomeException;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x, int *p = 0) {\n"
               "    int var1 = x ? *p : 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n", errout_str());
 
         check("void f(int* i = nullptr) { *i = 0; }\n" // #11567
@@ -4446,7 +4798,7 @@ class TestNullPointer : public TestFixture {
               "    unsigned int j;\n"
               "    for (j = 0; j < b[0].a->size; ++j) {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4470,33 +4822,33 @@ class TestNullPointer : public TestFixture {
         check("void foo(char *s) {\n"
               "  char *p = s - 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n",
                       errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  char *p = s - 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:15]: (warning) Either the condition '!s' is redundant or there is overflow in pointer subtraction. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  s -= 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n",
                       errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  s -= 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:5]: (warning) Either the condition '!s' is redundant or there is overflow in pointer subtraction. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
-        check("int* f8() { int *x = NULL; return --x; }");
+        check("int* f8() { int *x = NULL; return --x; }\n");
         ASSERT_EQUALS("[test.cpp:1:35]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n", errout_str());
 
-        check("int* f9() { int *x = NULL; return x--; }");
+        check("int* f9() { int *x = NULL; return x--; }\n");
         ASSERT_EQUALS("[test.cpp:1:36]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n", errout_str());
     }
 
@@ -4504,48 +4856,48 @@ class TestNullPointer : public TestFixture {
         check("void foo(char *s) {\n"
               "  char * p = s + 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  char * p = s + 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:16]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  char * p = 20 + s;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  char * p = 20 + s;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:17]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  s += 20;\n"
               "}\n"
-              "void bar() { foo(0); }");
+              "void bar() { foo(0); }\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("void foo(char *s) {\n"
               "  if (!s) {}\n"
               "  s += 20;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7] -> [test.cpp:3:5]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer. [nullPointerArithmeticRedundantCheck]\n", errout_str());
 
-        check("int* f7() { int *x = NULL; return ++x; }");
+        check("int* f7() { int *x = NULL; return ++x; }\n");
         ASSERT_EQUALS("[test.cpp:1:35]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
-        check("int* f10() { int *x = NULL; return x++; }");
+        check("int* f10() { int *x = NULL; return x++; }\n");
         ASSERT_EQUALS("[test.cpp:1:37]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("class foo {};\n"
               "const char* get() const { return 0; }\n"
-              "void f(foo x) { if (get()) x += get(); }");
+              "void f(foo x) { if (get()) x += get(); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("typedef struct { uint8_t* buf, *buf_end; } S;\n" // #11117
@@ -4561,23 +4913,23 @@ class TestNullPointer : public TestFixture {
     }
 
     void isPointerDeRefFunctionDecl() {
-        check("const char** get() { return 0; }");
+        check("const char** get() { return 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
-#define ctu(code) ctu_(code, __FILE__, __LINE__)
+#define ctu(...) ctu_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    void ctu_(const char (&code)[size], const char* file, int line) {
+    void ctu_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
+        const CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check code..
-        std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckNullPointer>();
-        fileInfo.push_back(c.getFileInfo(tokenizer, settings));
+        CheckNullPointer check;
+        Check& c = getCheck(check);
+        std::list<const Check::FileInfo*> fileInfo;
+        fileInfo.push_back(c.getFileInfo(tokenizer, settings, ""));
         c.analyseWholeProgram(*ctu, fileInfo, settings, *this); // TODO: check result
         while (!fileInfo.empty()) {
             delete fileInfo.back();
@@ -4595,7 +4947,7 @@ class TestNullPointer : public TestFixture {
             "int main() {\n"
             "  int *p = 0;\n"
             "  f(p);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: error: Null pointer dereference: fp [ctunullpointer]\n"
                       "[test.cpp:5:12]: note: Assignment 'p=0', assigned value is 0\n"
                       "[test.cpp:6:4]: note: Calling function f, 1st argument is null\n"
@@ -4605,7 +4957,7 @@ class TestNullPointer : public TestFixture {
             "void call(int x, int *p) { x++; use(p); }\n"
             "int main() {\n"
             "  call(4,0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:1:25]: error: Null pointer dereference: p [ctunullpointer]\n"
                       "[test.cpp:4:7]: note: Calling function call, 2nd argument is null\n"
                       "[test.cpp:2:33]: note: Calling function use, 1st argument is null\n"
@@ -4619,7 +4971,7 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(a, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
@@ -4630,7 +4982,7 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(a, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // else
@@ -4641,7 +4993,7 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(0, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ?, &&, ||
@@ -4651,14 +5003,14 @@ class TestNullPointer : public TestFixture {
             "\n"
             "void f() {\n"
             "  dostuff(0, 0);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void g(int* x) { *x; }\n"
             "void f(int* x) {\n"
             "    if (x)\n"
             "        g(x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("size_t f(int* p) {\n"
@@ -4706,6 +5058,15 @@ class TestNullPointer : public TestFixture {
                       "[test.cpp:5:20]: note: Assignment 'f=fopen(notexist,t)', assigned value is 0\n"
                       "[test.cpp:6:8]: note: Calling function foo, 1st argument is null\n"
                       "[test.cpp:2:13]: note: Dereferencing argument f that is null\n", errout_str());
+
+        ctu("void g(std::optional<int>& o) {\n" // #14728
+            "    *o = 1;\n"
+            "}\n"
+            "void f() {\n"
+            "    std::optional<int> x = 0;\n"
+            "    g(x);\n"
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testoptions.cpp b/test/testoptions.cpp
index 909dcb277b8..af164fb43cc 100644
--- a/test/testoptions.cpp
+++ b/test/testoptions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,7 +20,6 @@
 #include "options.h"
 #include "utils.h"
 
-#include <functional>
 #include <set>
 #include <string>
 
@@ -36,9 +35,8 @@ class TestOptions : public TestFixture {
         TEST_CASE(which_test);
         TEST_CASE(which_test_method);
         TEST_CASE(no_test_method);
-        TEST_CASE(not_quiet);
+        TEST_CASE(defaults);
         TEST_CASE(quiet);
-        TEST_CASE(not_help);
         TEST_CASE(help);
         TEST_CASE(help_long);
         TEST_CASE(multiple_testcases);
@@ -46,54 +44,65 @@ class TestOptions : public TestFixture {
         TEST_CASE(invalid_switches);
         TEST_CASE(summary);
         TEST_CASE(dry_run);
+        TEST_CASE(exclude_tests);
+        TEST_CASE(timer_results);
     }
 
 
     void which_test() const {
         const char* argv[] = {"./test_runner", "TestClass"};
         options args(getArrayLength(argv), argv);
-        ASSERT(std::set<std::string> {"TestClass"} == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", {} }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
 
     void which_test_method() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod"};
         options args(getArrayLength(argv), argv);
-        ASSERT(std::set<std::string> {"TestClass::TestMethod"} == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", {"TestMethod"} }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
 
     void no_test_method() const {
         const char* argv[] = {"./test_runner"};
         options args(getArrayLength(argv), argv);
-        ASSERT(std::set<std::string> {""} == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{};
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
 
-    void not_quiet() const {
-        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-v"};
+    void defaults() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(false, args.quiet());
+        ASSERT_EQUALS(false, args.help());
+        ASSERT_EQUALS(true, args.summary());
+        ASSERT_EQUALS(false, args.dry_run());
+        ASSERT_EQUALS(false, args.exclude_tests());
+        ASSERT(args.errors().empty());
     }
 
-
     void quiet() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-q"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.quiet());
+        ASSERT(args.errors().empty());
     }
 
-    void not_help() const {
-        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-v"};
-        options args(getArrayLength(argv), argv);
-        ASSERT_EQUALS(false, args.help());
-    }
-
-
     void help() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-h"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.help());
+        ASSERT(args.errors().empty());
     }
 
 
@@ -101,40 +110,69 @@ class TestOptions : public TestFixture {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "--help"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.help());
+        ASSERT(args.errors().empty());
     }
 
     void multiple_testcases() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "TestClass::AnotherTestMethod"};
         options args(getArrayLength(argv), argv);
-        std::set<std::string> expected {"TestClass::TestMethod", "TestClass::AnotherTestMethod"};
-        ASSERT(expected == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", { "TestMethod", "AnotherTestMethod" } }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
     void multiple_testcases_ignore_duplicates() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "TestClass"};
         options args(getArrayLength(argv), argv);
-        std::set<std::string> expected {"TestClass"};
-        ASSERT(expected == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected{
+            { "TestClass", {} }
+        };
+        ASSERT(expected == args.which_tests());
+        ASSERT(args.errors().empty());
     }
 
     void invalid_switches() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-a", "-v", "-q"};
         options args(getArrayLength(argv), argv);
-        std::set<std::string> expected {"TestClass::TestMethod"};
-        ASSERT(expected == args.which_test());
+        const std::map<std::string, std::set<std::string>> expected {
+            { "TestClass", { "TestMethod" } }
+        };
+        ASSERT(expected == args.which_tests());
         ASSERT_EQUALS(true, args.quiet());
+        ASSERT_EQUALS(2, args.errors().size());
+        auto it = args.errors().cbegin();
+        ASSERT_EQUALS("unknown option '-a'", *it);
+        ++it;
+        ASSERT_EQUALS("unknown option '-v'", *it);
     }
 
     void summary() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-n"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(false, args.summary());
+        ASSERT(args.errors().empty());
     }
 
     void dry_run() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-d"};
         options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.dry_run());
+        ASSERT(args.errors().empty());
+    }
+
+    void exclude_tests() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-x"};
+        options args(getArrayLength(argv), argv);
+        ASSERT_EQUALS(true, args.exclude_tests());
+        ASSERT(args.errors().empty());
+    }
+
+    void timer_results() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-t"};
+        options args(getArrayLength(argv), argv);
+        ASSERT(!!args.timer_results());
     }
 };
 
diff --git a/test/testother.cpp b/test/testother.cpp
index 0eb6218361e..3c301a3fc3c 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,15 +25,28 @@
 #include "standards.h"
 
 #include <cstddef>
+#include <sstream>
 #include <string>
-#include <vector>
+
+static std::string unionZeroInitMessage(int lno, int cno, const std::string &varName, const std::string &largestMemberName)
+{
+    std::stringstream ss;
+    ss << "[test.cpp:" << lno << ":" << cno << "]: (portability) ";
+    ss << "Zero initializing union '" << varName << "' ";
+    ss << "does not guarantee its complete storage to be zero initialized as its largest member is not declared as the first member. ";
+    ss << "Consider making " << largestMemberName << " the first member or favor memset(). [UnionZeroInit]";
+    ss << std::endl;
+    return ss.str();
+}
 
 class TestOther : public TestFixture {
 public:
     TestOther() : TestFixture("TestOther") {}
 
 private:
-    /*const*/ Settings _settings = settingsBuilder().library("std.cfg").build();
+    const Settings settings0 = settingsBuilder().library("std.cfg").build();
+    /*const*/ Settings settings1 = settingsBuilder().library("std.cfg").severity(Severity::style).severity(Severity::warning).severity(Severity::portability).severity(Severity::performance).build();
+    const Settings settings2 = settingsBuilder(settings1).certainty(Certainty::inconclusive).build();
 
     void run() override {
         mNewTemplate = true;
@@ -60,6 +73,7 @@ class TestOther : public TestFixture {
         TEST_CASE(zeroDiv19);
         TEST_CASE(zeroDiv20); // #11175
         TEST_CASE(zeroDiv21);
+        TEST_CASE(zeroDiv22);
 
         TEST_CASE(zeroDivCond); // division by zero / useless condition
 
@@ -107,8 +121,12 @@ class TestOther : public TestFixture {
         TEST_CASE(varScope41);      // #11845
         TEST_CASE(varScope42);
         TEST_CASE(varScope43);
+        TEST_CASE(varScope44);
+        TEST_CASE(varScope45);
+        TEST_CASE(varScope46);
 
         TEST_CASE(oldStylePointerCast);
+        TEST_CASE(intToPointerCast);
         TEST_CASE(invalidPointerCast);
 
         TEST_CASE(passedByValue);
@@ -180,8 +198,13 @@ class TestOther : public TestFixture {
         TEST_CASE(duplicateExpression16); // #10569
         TEST_CASE(duplicateExpression17); // #12036
         TEST_CASE(duplicateExpression18);
+        TEST_CASE(duplicateExpression19);
+        TEST_CASE(duplicateExpression20);
+        TEST_CASE(duplicateExpression21);
+        TEST_CASE(duplicateExpression22);
         TEST_CASE(duplicateExpressionLoop);
         TEST_CASE(duplicateValueTernary);
+        TEST_CASE(duplicateValueTernarySizeof); // #13773
         TEST_CASE(duplicateExpressionTernary); // #6391
         TEST_CASE(duplicateExpressionTemplate); // #6930
         TEST_CASE(duplicateExpressionCompareWithZero);
@@ -241,6 +264,9 @@ class TestOther : public TestFixture {
         TEST_CASE(raceAfterInterlockedDecrement);
 
         TEST_CASE(testUnusedLabel);
+        TEST_CASE(testUnusedLabelConfiguration);
+        TEST_CASE(testUnusedLabelSwitchConfiguration);
+        TEST_CASE(testUnusedLabelPremiumMisra);
 
         TEST_CASE(testEvaluationOrder);
         TEST_CASE(testEvaluationOrderSelfAssignment);
@@ -280,6 +306,8 @@ class TestOther : public TestFixture {
         TEST_CASE(moveForRange);
         TEST_CASE(moveTernary);
         TEST_CASE(movePointerAlias);
+        TEST_CASE(moveOutparam);
+        TEST_CASE(moveTryEmplace);
 
         TEST_CASE(funcArgNamesDifferent);
         TEST_CASE(funcArgOrderDifferent);
@@ -306,75 +334,71 @@ class TestOther : public TestFixture {
 
         TEST_CASE(knownConditionFloating);
         TEST_CASE(knownConditionPrefixed);
+
+        TEST_CASE(unionZeroInitBasic);
+        TEST_CASE(unionZeroInitArrayMember);
+        TEST_CASE(unionZeroInitStructMember);
+        TEST_CASE(unionZeroInitUnknownType);
+        TEST_CASE(unionZeroInitBitfields);
     }
 
+    struct CheckOptions
+    {
+        bool cpp = true;
+        bool inconclusive = true;
+        bool verbose = false;
+        Settings* settings = nullptr; // TODO: split from this
+    };
+
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    void check_(const char* file, int line, const char (&code)[size], bool cpp = true, bool inconclusive = true, bool runSimpleChecks=true, bool verbose=false, Settings* settings = nullptr) {
-        if (!settings) {
-            settings = &_settings;
+    void check_(const char* file, int line, const char (&code)[size], const CheckOptions& opt = make_default_obj{}) {
+        // TODO: do not modify object passed into
+        Settings* settings;
+        if (!opt.settings) {
+            settings = &settings1;
         }
-        settings->severity.enable(Severity::style);
-        settings->severity.enable(Severity::warning);
-        settings->severity.enable(Severity::portability);
-        settings->severity.enable(Severity::performance);
-        settings->standards.c = Standards::CLatest;
-        settings->standards.cpp = Standards::CPPLatest;
-        settings->certainty.setEnabled(Certainty::inconclusive, inconclusive);
-        settings->verbose = verbose;
+        else {
+            settings = opt.settings;
+        }
+        settings->certainty.setEnabled(Certainty::inconclusive, opt.inconclusive);
+        settings->verbose = opt.verbose;
 
         // Tokenize..
-        SimpleTokenizer tokenizer(*settings, *this, cpp);
+        SimpleTokenizer tokenizer(*settings, *this, opt.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
-
-        (void)runSimpleChecks; // TODO Remove this
-    }
-
-    template<size_t size>
-    void check_(const char* file, int line, const char (&code)[size], Settings *s) {
-        check_(file, line, code, true, true, true, false, s);
+        CheckOther check;
+        runChecks(check, tokenizer, *this);
     }
 
     struct CheckPOptions
     {
-        CheckPOptions() = default;
         bool cpp = true;
     };
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void checkP_(const char* file, int line, const char (&code)[size], const CheckPOptions& options = make_default_obj()) {
-        Settings* settings = &_settings;
-        settings->severity.enable(Severity::style);
-        settings->severity.enable(Severity::warning);
-        settings->severity.enable(Severity::portability);
-        settings->severity.enable(Severity::performance);
-        settings->standards.c = Standards::CLatest;
-        settings->standards.cpp = Standards::CPPLatest;
-        settings->certainty.enable(Certainty::inconclusive);
-
-        SimpleTokenizer2 tokenizer(*settings, *this, code, options.cpp ? "test.cpp" : "test.c");
+        SimpleTokenizer2 tokenizer(settings2, *this, code, options.cpp ? "test.cpp" : "test.c");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+        CheckOther check;
+        runChecks(check, tokenizer, *this);
     }
 
     template<size_t size>
     void checkInterlockedDecrement(const char (&code)[size]) {
         /*const*/ Settings settings = settingsBuilder().platform(Platform::Type::Win32A).build();
 
-        check(code, true, false, true, false, &settings);
+        check(code, dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
     }
 
     void emptyBrackets() {
         check("{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -382,22 +406,22 @@ class TestOther : public TestFixture {
     void zeroDiv1() { // floating point division by zero => no error
         check("void foo() {\n"
               "    cout << 1. / 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (double)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (float)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (int)0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -410,34 +434,34 @@ class TestOther : public TestFixture {
               "        sum += i;\n"
               "    }\n"
               "    cout<<b/sum;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv3() {
         check("int foo(int i) {\n"
               "    return i / 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("int foo(int i) {\n"
               "    return i % 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void foo(int& i) {\n"
               "    i /= 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void foo(int& i) {\n"
               "    i %= 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("uint8_t foo(uint8_t i) {\n"
               "    return i / 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -445,40 +469,40 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{\n"
               "   long a = b / 0x6;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0x0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0x0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0L;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0L;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0ul;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0ul;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         // Don't warn about floating points (gcc doesn't warn either)
@@ -486,13 +510,13 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{\n"
               "   long a = b / 0.0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -500,12 +524,12 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{ { {\n"
               "   long a = b / 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{ { {\n"
               "   long a = b / 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -513,12 +537,12 @@ class TestOther : public TestFixture {
         check("void f()\n"
               "{ { {\n"
               "   int a = b % 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int b)\n"
               "{ { {\n"
               "   int a = b % 0;\n"
-              "} } }");
+              "} } }\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -527,12 +551,12 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "  int a = x/2*3/0;\n"
               "  int b = y/2*3%0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f(int x, int y) {\n"
               "  int a = x/2*3/0;\n"
               "  int b = y/2*3%0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (error) Division by zero. [zerodiv]\n"
                       "[test.cpp:3:16]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
@@ -543,7 +567,7 @@ class TestOther : public TestFixture {
               "  int a = 0;\n"
               "  do_something(a);\n"
               "  return 4 / a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error, inconclusive) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -557,7 +581,7 @@ class TestOther : public TestFixture {
               "       sal_Int32 nIntervalCount = static_cast< sal_Int32 >(fStepMain / fStepHelp);\n"
               "    }\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -568,7 +592,7 @@ class TestOther : public TestFixture {
               "    << boost::format(\" %d :: %s <> %s\") % 0 % \"a\" % \"b\"\n"
               "    << std::endl;\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -576,13 +600,13 @@ class TestOther : public TestFixture {
         check("void f(int a) {\n"
               "  int res = (a+2)/0;\n"
               "  int res = (a*2)/0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Division by zero. [zerodiv]\n"
                       "[test.cpp:3:18]: (error) Division by zero. [zerodiv]\n", errout_str());
         check("void f() {\n"
               "  int res = (a+2)/0;\n"
               "  int res = (a*2)/0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -590,7 +614,7 @@ class TestOther : public TestFixture {
         // #8141
         check("intmax_t f() {\n"
               "  return 1 / imaxabs(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
     void zeroDiv13() {
@@ -685,7 +709,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    uint16_t x = 0xFFFFU;\n" // UINT16_MAX=0xFFFF
               "    return 42/(++x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
@@ -700,29 +724,37 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
+    void zeroDiv22()
+    {
+        check("int main() {\n"
+              "    return _Generic((0), int: (42) / (0), default: 0);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:36]: (error) Division by zero. [zerodiv]\n", errout_str());
+    }
+
     void zeroDivCond() {
         check("void f(unsigned int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x > 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x>0' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         check("void f(unsigned int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x >= 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x>=1' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         check("void f(int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x==0' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         check("void f(unsigned int x) {\n"
               "  int y = 17 / x;\n"
               "  if (x != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:14]: (warning) Either the condition 'x!=0' is redundant or there is division by zero at line 2. [zerodivcond]\n", errout_str());
 
         // function call
@@ -730,7 +762,7 @@ class TestOther : public TestFixture {
               "void f2(unsigned int y) {\n"
               "    f1(123,y);\n"
               "    if (y>0){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:10] -> [test.cpp:1:28]: (warning) Either the condition 'y>0' is redundant or there is division by zero at line 1. [zerodivcond]\n",
             errout_str());
@@ -741,7 +773,7 @@ class TestOther : public TestFixture {
               "  int y = 17 / x;\n"
               "  x = some+calculation;\n"
               "  if (x != 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -752,7 +784,7 @@ class TestOther : public TestFixture {
                   "  int y = 17 / x;\n"
                   "  do_something();\n"
                   "  if (x != 0) {}\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // function is called. but don't care, variable is local
@@ -762,7 +794,7 @@ class TestOther : public TestFixture {
                   "  int y = 17 / x;\n"
                   "  do_something();\n"
                   "  if (x != 0) {}\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:6:9] -> [test.cpp:4:14]: (warning) Either the condition 'x!=0' is redundant or there is division by zero at line 4. [zerodivcond]\n", errout_str());
         }
 
@@ -770,14 +802,14 @@ class TestOther : public TestFixture {
               "void f(int x) {\n"
               "  int y = 17 / x;\n"
               "  do_something(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int x;\n"
               "void f() {\n"
               "  int y = 17 / x;\n"
               "  while (y || x == 0) { x--; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket 5033 segmentation fault (valid code) in CheckOther::checkZeroDivisionOrUselessCondition
@@ -786,33 +818,33 @@ class TestOther : public TestFixture {
               "double* p2= new double[1];\n"
               "double* p3= new double[1];\n"
               "double* pp[3] = {p1,p2,p3};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5105 - FP
         check("int f(int a, int b) {\n"
               "  int r = a / b;\n"
               "  if (func(b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown types for b and c --> do not warn
         check("int f(int d) {\n"
               "  int r = (a?b:c) / d;\n"
               "  if (d == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  int r = a ? 1 / a : 0;\n"
               "  if (a == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  int r = (a == 0) ? 0 : 1 / a;\n"
               "  if (a == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g();\n"
@@ -822,7 +854,7 @@ class TestOther : public TestFixture {
               "  else if (x > 0) {}\n"
               "  else\n"
               "    a = b / -x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -869,35 +901,35 @@ class TestOther : public TestFixture {
               "{\n"
               "   double x = 3.0 / 0.0 + 1.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 3.0 / 0.0 - 1.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 1.0 + 3.0 / 0.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 1.0 - 3.0 / 0.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25]: (style) Using NaN/Inf in a computation. [nanInArithmeticExpression]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   double x = 3.0 / 0.0;\n"
               "   printf(\"%f\", x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -928,7 +960,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "\n"
               "    return 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -938,7 +970,7 @@ class TestOther : public TestFixture {
               "    Error e;\n"
               "    e.SetValue(12);\n"
               "    throw e;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -952,7 +984,7 @@ class TestOther : public TestFixture {
               "        p = &i;\n"
               "    }\n"
               "    *p = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -960,7 +992,7 @@ class TestOther : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    int i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -971,7 +1003,7 @@ class TestOther : public TestFixture {
               "    if (x) {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -979,7 +1011,7 @@ class TestOther : public TestFixture {
               "    if (x) {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x)\n"
@@ -989,7 +1021,7 @@ class TestOther : public TestFixture {
               "    else {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1003,7 +1035,7 @@ class TestOther : public TestFixture {
               "    if (b) {\n"
               "        c(i);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #5398
@@ -1012,14 +1044,14 @@ class TestOther : public TestFixture {
               "    if (success) {\n"
               "        foo(notReducable);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Test &test) {\n"
               "  int& x = test.getData();\n"
               "  if (test.process())\n"
               "    x = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -1034,7 +1066,7 @@ class TestOther : public TestFixture {
               "  return 0;\n"
               " }\n"
               "}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int &x)\n"
@@ -1045,7 +1077,7 @@ class TestOther : public TestFixture {
               "    ++n;\n"
               "    ++x;\n"
               "  } while (x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1057,7 +1089,7 @@ class TestOther : public TestFixture {
               "    if (x) {\n"
               "        y++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1068,7 +1100,7 @@ class TestOther : public TestFixture {
               "    BOOST_FOREACH(int edge, edges) {\n"
               "        edgeResistance = (edge+1) / 2.0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'edgeResistance' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1076,6 +1108,7 @@ class TestOther : public TestFixture {
         // classes may have extra side effects
         check("class fred {\n"
               "public:\n"
+              "    fred();\n"
               "    void x();\n"
               "};\n"
               "void test(int a) {\n"
@@ -1083,8 +1116,30 @@ class TestOther : public TestFixture {
               "    if (a == 2) {\n"
               "        f.x();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("class fred {\n" // #2062
+              "public:\n"
+              "    void x();\n"
+              "};\n"
+              "void test(int a) {\n"
+              "    fred f;\n"
+              "    if (a == 2) {\n"
+              "        f.x();\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:10]: (style) The scope of the variable 'f' can be reduced. [variableScope]\n", errout_str());
+
+        check("struct S { int a, b; };\n"
+              "bool f() {\n"
+              "    S s{};\n"
+              "    {\n"
+              "        bool b = s.a && a.b;\n"
+              "        return b;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) The scope of the variable 's' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope10() {
@@ -1094,7 +1149,7 @@ class TestOther : public TestFixture {
               "    FOR {\n"
               "        foo(x++);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1102,21 +1157,21 @@ class TestOther : public TestFixture {
         check("int f() {\n"
               "    int x = 0;\n"
               "    AB ab = { x, 0 };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int x = 0;\n"
               "    if (a == 0) { ++x; }\n"
               "    AB ab = { x, 0 };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int x = 0;\n"
               "    if (a == 0) { ++x; }\n"
               "    if (a == 1) { AB ab = { x, 0 }; }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1127,7 +1182,7 @@ class TestOther : public TestFixture {
               "    if (x)\n"
               "        foo(i);\n"
               "    foo(j);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
 
         check("void f(int x) {\n"
@@ -1136,7 +1191,7 @@ class TestOther : public TestFixture {
               "    if (x)\n"
               "        j = i;\n"
               "    foo(j);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -1144,7 +1199,7 @@ class TestOther : public TestFixture {
               "    x++;\n"
               "    if (x == 5)\n"
               "        foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
@@ -1152,7 +1207,7 @@ class TestOther : public TestFixture {
               "    x++;\n"
               "    if (x == 5)\n"
               "        foo(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1163,7 +1218,7 @@ class TestOther : public TestFixture {
               "    forever {\n"
               "        if (i++ == 42) { break; }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1174,7 +1229,7 @@ class TestOther : public TestFixture {
               "    if(a) {\n"
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1186,7 +1241,7 @@ class TestOther : public TestFixture {
               "    else if(b);\n"
               "    else if(c);\n"
               "    else;\n"
-              "}", true, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1196,7 +1251,7 @@ class TestOther : public TestFixture {
               "    while((++a) < 56) {\n"
               "        foo();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1204,7 +1259,7 @@ class TestOther : public TestFixture {
               "    do {\n"
               "        foo();\n"
               "    } while((++a) < 56);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1213,7 +1268,7 @@ class TestOther : public TestFixture {
               "        a = 64;\n"
               "        foo(a);\n"
               "    } while((++a) < 56);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1222,7 +1277,7 @@ class TestOther : public TestFixture {
               "        a = 64;\n"
               "        foo(a);\n"
               "    } while(z());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'a' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1233,7 +1288,7 @@ class TestOther : public TestFixture {
               "        x = stuff(x);\n"
               "        morestuff(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
@@ -1243,7 +1298,7 @@ class TestOther : public TestFixture {
               "        morestuff(x);\n"
               "    }\n"
               "    if (b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1263,7 +1318,7 @@ class TestOther : public TestFixture {
               "        x = foo();\n"
               "        do_something(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
@@ -1282,7 +1337,7 @@ class TestOther : public TestFixture {
               "        x = foo();\n"
               "        do_something(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1297,7 +1352,7 @@ class TestOther : public TestFixture {
               "        default:\n"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
@@ -1314,7 +1369,7 @@ class TestOther : public TestFixture {
               "                do_something(x);\n"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1324,7 +1379,7 @@ class TestOther : public TestFixture {
               "  int b = a;\n"
               "  if (b > 32) b = x;\n"
               "  return b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1333,7 +1388,7 @@ class TestOther : public TestFixture {
               "    int test_value = 3;\n"
               "    int test_array[1][1] = { { test_value } };\n"
               "    return sizeof(test_array);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1346,7 +1401,7 @@ class TestOther : public TestFixture {
               "      ++p;\n"
               "      ++i;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         // try to avoid an obvious false negative after applying the fix for the example above:
         check("void foo() {\n"
@@ -1359,7 +1414,7 @@ class TestOther : public TestFixture {
               "      ++p;\n"
               "      ++i;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'p' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1369,7 +1424,7 @@ class TestOther : public TestFixture {
               "   Test myTest([&](size_t aX){\n"
               "       std::cout << myCounter += aX << std::endl;\n"
               "   });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1379,7 +1434,7 @@ class TestOther : public TestFixture {
               "   if (cond) {\n"
               "       r.dostuff();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'r' can be reduced. [variableScope]\n", errout_str());
 
         check("void f(Foo x) {\n"
@@ -1387,7 +1442,7 @@ class TestOther : public TestFixture {
               "   if (cond) {\n"
               "       foo.dostuff();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1398,7 +1453,7 @@ class TestOther : public TestFixture {
               "        currtime = time(&dummy);\n"
               "        if (currtime > t) {}\n"
               "    }\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:12]: (style) The scope of the variable 'currtime' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1410,7 +1465,7 @@ class TestOther : public TestFixture {
               "       if (cond2) { dostuff(key); }\n"
               "     }\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1420,7 +1475,7 @@ class TestOther : public TestFixture {
                "#ifdef X\n"
                "#endif\n"
                "  if (id == ABC) { return x; }\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("void f() {\n"
@@ -1428,7 +1483,7 @@ class TestOther : public TestFixture {
                "#endif\n"
                "  int x = 0;\n"
                "  if (id == ABC) { return x; }\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1451,7 +1506,7 @@ class TestOther : public TestFixture {
               "        s.i = 0;\n"
               "        g(e, s);\n"
               "    }\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:4:12]: (style) The scope of the variable 'e' can be reduced. [variableScope]\n"
                       "[test.c:5:14]: (style) The scope of the variable 's' can be reduced. [variableScope]\n",
                       errout_str());
@@ -1462,7 +1517,7 @@ class TestOther : public TestFixture {
               "        s = \"abc\";\n"
               "        g(s);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) The scope of the variable 's' can be reduced. [variableScope]\n", errout_str());
 
         check("auto foo(std::vector<int>& vec, bool flag) {\n"
@@ -1475,7 +1530,7 @@ class TestOther : public TestFixture {
               "        iter = dummy.begin();\n"
               "    }\n"
               "    return *iter;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:28]: (style) Parameter 'vec' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("auto& foo(std::vector<int>& vec, bool flag) {\n"
@@ -1488,7 +1543,7 @@ class TestOther : public TestFixture {
               "        iter = dummy.begin();\n"
               "    }\n"
               "    return *iter;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1710,7 +1765,7 @@ class TestOther : public TestFixture {
               "    else{\n"
               "         for( i = 0U; i < 5U; i++ ) {}\n"
               "    }\n"
-              "}\n", true, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:2:14]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1725,7 +1780,7 @@ class TestOther : public TestFixture {
               "            for( i = 0U; i < 5U; i++ ) {}\n"
               "        }\n"
               "    }\n"
-              "}\n", true, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:2:14]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
     }
 
@@ -1741,7 +1796,7 @@ class TestOther : public TestFixture {
 
     void varScope39() {
         check("struct S {\n" // #12405
-              "    void f(const std::string&) const;\n"
+              "    void f(const std::string& s) const;\n"
               "    const int* g(std::string&) const;\n"
               "};\n"
               "void h(int);\n"
@@ -1897,122 +1952,255 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3:12]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
+    void varScope44() { // #14496
+        check("char* f() {\n"
+              "    char* p = nullptr;\n"
+              "    {\n"
+              "        p = strdup(\"abc\");\n"
+              "        if (p) {\n"
+              "            return p;\n"
+              "        }\n"
+              "    }\n"
+              "    return nullptr;\n"
+              "}\n"
+              "char* g() {\n"
+              "    char* q = NULL;\n"
+              "    {\n"
+              "        q = strdup(\"abc\");\n"
+              "        if (q) {\n"
+              "            return q;\n"
+              "        }\n"
+              "    }\n"
+              "    return nullptr;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'p' can be reduced. [variableScope]\n"
+                      "[test.cpp:12:11]: (style) The scope of the variable 'q' can be reduced. [variableScope]\n",
+                      errout_str());
+    }
+
+    void varScope45() {
+        check("void g(int x, int y) {\n" // #14497
+              "    int a = x, b = y;\n"
+              "    if (a) {}\n"
+              "    else {\n"
+              "        if (b) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) The scope of the variable 'b' can be reduced. [variableScope]\n", errout_str());
+    }
+
+    void varScope46() {
+        check("void f() {\n" // #7091
+              "    int y1;\n"
+              "    for (int i = 0; i < 3; ++i) {\n"
+              "        for(int j = 0; j < 3; ++j) {\n"
+              "                y1 = 2 * 1;\n"
+              "                y1 += 1;\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'y1' can be reduced. [variableScope]\n",
+                      errout_str());
+
+        check("bool f() {\n"
+              "bool b = false;\n"
+              "do {\n"
+              "    switch (g()) {\n"
+              "        case 0:\n"
+              "            b = true;\n"
+              "            break;\n"
+              "        case 1:\n"
+              "            return b;\n"
+              "            break;\n"
+              "        default:\n"
+              "            break;\n"
+              "    }\n"
+              "}\n"
+              "while (true);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    int y1 = 0;\n"
+              "    for (int i = 0; i < 3; ++i) {\n"
+              "        for(int j = 0; j < 3; ++j) {\n"
+              "                y1 = y1 + 1;\n"
+              "                dostuff(y1);\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int& r) {\n" // #14566
+              "    int i = 0;\n"
+              "    while (g()) {\n"
+              "        {\n"
+              "            if (g()) {\n"
+              "                i = 0;"
+              "                std::swap(i, r);\n"
+              "            }\n"
+              "        }\n"
+              "    }\n"
+              "    use(i);"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
 #define checkOldStylePointerCast(...) checkOldStylePointerCast_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void checkOldStylePointerCast_(const char* file, int line, const char (&code)[size], Standards::cppstd_t std = Standards::CPPLatest) {
 
-        const Settings settings = settingsBuilder().severity(Severity::style).cpp(std).build();
+        const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).cpp(std).build();
 
         // Tokenize..
         SimpleTokenizer tokenizerCpp(settings, *this);
         ASSERT_LOC(tokenizerCpp.tokenize(code), file, line);
 
-        CheckOther checkOtherCpp(&tokenizerCpp, &settings, this);
+        CheckOtherImpl checkOtherCpp(&tokenizerCpp, settings, *this);
         checkOtherCpp.warningOldStylePointerCast();
+        checkOtherCpp.warningDangerousTypeCast();
     }
 
     void oldStylePointerCast() {
-        checkOldStylePointerCast("class Base;\n"
+        checkOldStylePointerCast("class Base{};\n"
+                                 "class Derived: public Base {};\n"
+                                 "void foo(Base* base)\n"
+                                 "{\n"
+                                 "    Derived * d = (Derived *) base;\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
+
+        checkOldStylePointerCast("class Base{};\n"
+                                 "class Derived: public Base {};\n"
+                                 "void foo(Derived* derived)\n"
+                                 "{\n"
+                                 "    Base * b = (Base *) derived;\n" // <- cast from derived to base is safe => cstyleCast
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:5:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+
+        checkOldStylePointerCast("void foo(Base* base)\n"
+                                 "{\n"
+                                 "    Derived * d = (Derived *) base;\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:3:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
+
+        checkOldStylePointerCast("class Base{};\n"
+                                 "class Derived: public Base {};\n"
+                                 "void foo(Base* base)\n"
+                                 "{\n"
+                                 "    Derived * d = (const Derived *) base;\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
+
+        checkOldStylePointerCast("class Base{};\n"
+                                 "class Derived: public Base {};\n"
                                  "void foo()\n"
                                  "{\n"
-                                 "    Base * b = (Base *) derived;\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "    Derived * d = (const Derived *) ( new Base() );\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
-        checkOldStylePointerCast("class Base;\n"
+        checkOldStylePointerCast("class Base{};\n"
+                                 "class Derived: public Base {};\n"
                                  "void foo()\n"
                                  "{\n"
-                                 "    Base * b = (const Base *) derived;\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:17]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "    Derived * d = (const Derived *) new Base();\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:5:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
-        checkOldStylePointerCast("class Base;\n"
+        checkOldStylePointerCast("class Base{};\n"
                                  "void foo()\n"
                                  "{\n"
-                                 "    Base * b = (const Base * const) derived;\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:23]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "    Base * b = (Base *) new short[10];\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (volatile Base *) derived;\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:17]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (volatile Base * const) derived;\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:26]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const volatile Base *) derived;\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:23]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const volatile Base * const) derived;\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:32]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const Base *) ( new Derived() );\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:17]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const Base *) new Derived();\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:17]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class Base;\n"
                                  "void foo()\n"
                                  "{\n"
                                  "    Base * b = (const Base *) new short[10];\n"
-                                 "}");
-        ASSERT_EQUALS("[test.cpp:4:17]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:4:16]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         checkOldStylePointerCast("class B;\n"
                                  "class A\n"
                                  "{\n"
                                  "  virtual void abc(B *) const = 0;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkOldStylePointerCast("class B;\n"
                                  "class A\n"
                                  "{\n"
                                  "  virtual void abc(const B *) const = 0;\n"
-                                 "}");
+                                 "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3630
-        checkOldStylePointerCast("class SomeType;\n"
+        checkOldStylePointerCast("class SomeType{};\n"
                                  "class X : public Base {\n"
-                                 "    X() : Base((SomeType*)7) {}\n"
-                                 "};");
-        ASSERT_EQUALS("[test.cpp:3:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+                                 "    X() : Base((SomeType*)7) {}\n" // <- intToPointerCast
+                                 "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkOldStylePointerCast("class SomeType{};\n"
+                                 "class X : public Base {\n"
+                                 "    X() : Base((SomeType*)0x7000) {}\n" // <- it's common in embedded code to cast address
+                                 "};\n");
+        ASSERT_EQUALS("", errout_str());
 
         checkOldStylePointerCast("class SomeType;\n"
                                  "class X : public Base {\n"
                                  "    X() : Base((SomeType*)var) {}\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         checkOldStylePointerCast("class SomeType;\n"
                                  "class X : public Base {\n"
                                  "    X() : Base((SomeType*)0) {}\n"
-                                 "};");
+                                 "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5560
@@ -2022,7 +2210,7 @@ class TestOther : public TestFixture {
                                  "{ virtual G* createGui(S*, C*) const = 0; };\n"
                                  "\n"
                                  "class MS : public M\n"
-                                 "{ virtual void addController(C*) override {} };", Standards::CPP03);
+                                 "{ virtual void addController(C*) override {} };\n", Standards::CPP03);
         ASSERT_EQUALS("", errout_str());
 
         // #6164
@@ -2031,7 +2219,8 @@ class TestOther : public TestFixture {
                                  "void testCC() {\n"
                                  "  std::vector<Base*> v;\n"
                                  "  v.push_back((Base*)new Derived);\n"
-                                 "}");
+                                 "}\n");
+        // FIXME write a dangerousTypeCast warning instead
         ASSERT_EQUALS("[test.cpp:5:15]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         // #7709
@@ -2055,22 +2244,22 @@ class TestOther : public TestFixture {
                                  "    TT* tt = (TT*)i;\n"
                                  "    TT2* tt2 = (TT2*)i;\n"
                                  "}\n");
-        ASSERT_EQUALS("[test.cpp:10:13]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:11:15]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:12:22]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:13:13]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:14:21]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:15:15]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:16:16]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:17:16]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:18:15]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:19:17]: (style) C-style pointer casting [cstyleCast]\n",
+        ASSERT_EQUALS("[test.cpp:10:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:11:14]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:12:21]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:13:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:14:20]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:15:15]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:16:16]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:17:16]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:18:14]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:19:16]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n",
                       errout_str());
 
         // #8649
         checkOldStylePointerCast("struct S {};\n"
                                  "void g(S*& s);\n"
-                                 "void f(int i) {\n"
+                                 "void f(uintptr_t i) {\n"
                                  "    g((S*&)i);\n"
                                  "    S*& r = (S*&)i;\n"
                                  "}\n");
@@ -2078,6 +2267,17 @@ class TestOther : public TestFixture {
                       "[test.cpp:5:13]: (style) C-style pointer casting [cstyleCast]\n",
                       errout_str());
 
+        checkOldStylePointerCast("struct S {};\n"
+                                 "void g(S*& s);\n"
+                                 "void f(uint8_t i) {\n"
+                                 "    g((S*&)i);\n"
+                                 "    S*& r = (S*&)i;\n"
+                                 "}\n");
+        // TODO: these conversions are dangerous, but it's a different issue not covered by cstyleCast. A separate checker can be added which is executed for both C and C++ code.
+        // clang says: 1.cpp:5:18: warning: cast to 'unsigned char *' from smaller integer type 'uint8_t' (aka 'unsigned char') [-Wint-to-pointer-cast]
+        ASSERT_EQUALS("[test.cpp:4:7]: (style) C-style pointer casting [cstyleCast]\n"
+                      "[test.cpp:5:13]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+
         // #10823
         checkOldStylePointerCast("void f(void* p) {\n"
                                  "    auto h = reinterpret_cast<void (STDAPICALLTYPE*)(int)>(p);\n"
@@ -2085,12 +2285,14 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         // #5210
-        checkOldStylePointerCast("void f(void* v1, void* v2) {\n"
-                                 "    T** p1 = (T**)v1;\n"
-                                 "    T*** p2 = (T***)v2;\n"
+        checkOldStylePointerCast("class Base {};\n"
+                                 "class Derived: public Base {};\n"
+                                 "void f(Base** b1, Base*** b2) {\n"
+                                 "    Derived** p1 = (Derived**)b1;\n"
+                                 "    Derived*** p2 = (Derived***)b2;\n"
                                  "}\n");
-        ASSERT_EQUALS("[test.cpp:2:14]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:3:15]: (style) C-style pointer casting [cstyleCast]\n",
+        ASSERT_EQUALS("[test.cpp:4:20]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
+                      "[test.cpp:5:21]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n",
                       errout_str());
 
         // #12446
@@ -2105,16 +2307,16 @@ class TestOther : public TestFixture {
                                  "    auto pv = (std::vector<int>*)(p);\n"
                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:15]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:8:16]: (style) C-style pointer casting [cstyleCast]\n"
-                      "[test.cpp:9:15]: (style) C-style pointer casting [cstyleCast]\n",
-                      errout_str());
+                      "[test.cpp:8:15]: (style) C-style pointer casting [cstyleCast]\n"
+                      "[test.cpp:9:15]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         // #12447
-        checkOldStylePointerCast("void f(const int& i) {\n"
-                                 "  int& r = (int&)i;\n"
-                                 "  r = 0;\n"
+        checkOldStylePointerCast("class Base {};\n"
+                                 "class Derived: public Base {};\n"
+                                 "void f(const Base& base) {\n"
+                                 "  d = (const Derived&)base;\n"
                                  "}\n");
-        ASSERT_EQUALS("[test.cpp:2:12]: (style) C-style reference casting [cstyleCast]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:7]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         // #11430
         checkOldStylePointerCast("struct B {\n"
@@ -2125,44 +2327,86 @@ class TestOther : public TestFixture {
                                  "}\n"
                                  "bool g(B& b) {\n"
                                  "    using float_ptr = float*;\n"
-                                 "    return N::f(float_ptr(b.data()));\n"
+                                 "    return N::f(float_ptr(b.data()));\n" // <- the cast is safe
                                  "}\n");
         ASSERT_EQUALS("[test.cpp:9:17]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
     }
 
-#define checkInvalidPointerCast(...) checkInvalidPointerCast_(__FILE__, __LINE__, __VA_ARGS__)
+#define checkIntToPointerCast(...) checkIntToPointerCast_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    void checkInvalidPointerCast_(const char* file, int line, const char (&code)[size], bool portability = true, bool inconclusive = false) {
-        /*const*/ Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability, portability).certainty(Certainty::inconclusive, inconclusive).build();
-        settings.platform.defaultSign = 's';
+    void checkIntToPointerCast_(const char* file, int line, const char (&code)[size]) {
+
+        const Settings settings = settingsBuilder().severity(Severity::portability).build();
 
         // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+        SimpleTokenizer tokenizerCpp(settings, *this);
+        ASSERT_LOC(tokenizerCpp.tokenize(code), file, line);
 
-        CheckOther checkOtherCpp(&tokenizer, &settings, this);
-        checkOtherCpp.invalidPointerCast();
+        CheckOtherImpl checkOtherCpp(&tokenizerCpp, settings, *this);
+        checkOtherCpp.warningIntToPointerCast();
     }
 
+    void intToPointerCast() {
+        // #3630
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)7;\n");
+        ASSERT_EQUALS("[test.cpp:1:16]: (portability) Casting non-zero decimal integer literal to pointer. [intToPointerCast]\n", errout_str());
 
-    void invalidPointerCast() {
-        checkInvalidPointerCast("void test() {\n"
-                                "    float *f = new float[10];\n"
-                                "    delete [] (double*)f;\n"
-                                "    delete [] (long double const*)(new float[10]);\n"
-                                "}");
-        ASSERT_EQUALS("[test.cpp:3:15]: (portability) Casting between float * and double * which have an incompatible binary data representation. [invalidPointerCast]\n"
-                      "[test.cpp:4:15]: (portability) Casting between float * and const long double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
+        checkIntToPointerCast("void* ptr = (void*)7;\n");
+        ASSERT_EQUALS("[test.cpp:1:13]: (portability) Casting non-zero decimal integer literal to pointer. [intToPointerCast]\n", errout_str());
 
-        checkInvalidPointerCast("void test(const float* f) {\n"
-                                "    double *d = (double*)f;\n"
-                                "}");
-        ASSERT_EQUALS("[test.cpp:2:17]: (portability) Casting between const float * and double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0;\n");
+        ASSERT_EQUALS("", errout_str());
 
-        checkInvalidPointerCast("void test(double* d1) {\n"
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0x7000;\n"); // <- it's common in embedded code to cast address
+        ASSERT_EQUALS("", errout_str());
+
+        checkIntToPointerCast("struct S { int i; };\n" // #13886, don't crash
+                              "int f() { return sizeof(((struct S*)0)->i); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkIntToPointerCast("auto p = (int*)0b10;\n"); // #14180
+        ASSERT_EQUALS("[test.cpp:1:10]: (portability) Casting non-zero binary integer literal to pointer. [intToPointerCast]\n", errout_str());
+    }
+
+    struct CheckInvalidPointerCastOptions
+    {
+        bool portability = true;
+        bool inconclusive = false;
+    };
+
+#define checkInvalidPointerCast(...) checkInvalidPointerCast_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkInvalidPointerCast_(const char* file, int line, const char (&code)[size], const CheckInvalidPointerCastOptions& opt = make_default_obj{}) {
+        /*const*/ Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability, opt.portability).certainty(Certainty::inconclusive, opt.inconclusive).build();
+        settings.platform.defaultSign = 's';
+
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        CheckOtherImpl checkOtherCpp(&tokenizer, settings, *this);
+        checkOtherCpp.invalidPointerCast();
+    }
+
+
+    void invalidPointerCast() {
+        checkInvalidPointerCast("void test() {\n"
+                                "    float *f = new float[10];\n"
+                                "    delete [] (double*)f;\n"
+                                "    delete [] (long double const*)(new float[10]);\n"
+                                "}\n");
+        ASSERT_EQUALS("[test.cpp:3:15]: (portability) Casting between float * and double * which have an incompatible binary data representation. [invalidPointerCast]\n"
+                      "[test.cpp:4:15]: (portability) Casting between float * and const long double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
+
+        checkInvalidPointerCast("void test(const float* f) {\n"
+                                "    double *d = (double*)f;\n"
+                                "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (portability) Casting between const float * and double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
+
+        checkInvalidPointerCast("void test(double* d1) {\n"
                                 "    long double *ld = (long double*)d1;\n"
                                 "    double *d2 = (double*)ld;\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (portability) Casting between double * and long double * which have an incompatible binary data representation. [invalidPointerCast]\n"
                       "[test.cpp:3:18]: (portability) Casting between long double * and double * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
@@ -2170,148 +2414,148 @@ class TestOther : public TestFixture {
                                 "    long double *d = (long double*)(i);\n"
                                 "    double *d = (double*)(i);\n"
                                 "    float *f = reinterpret_cast<float*>(i);\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (portability) Casting between signed int * and long double * which have an incompatible binary data representation. [invalidPointerCast]\n"
                       "[test.cpp:3:17]: (portability) Casting between signed int * and double * which have an incompatible binary data representation. [invalidPointerCast]\n"
                       "[test.cpp:4:16]: (portability) Casting between signed int * and float * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("float* test(unsigned int* i) {\n"
                                 "    return (float*)i;\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (portability) Casting between unsigned int * and float * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("float* test(unsigned int* i) {\n"
                                 "    return (float*)i[0];\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInvalidPointerCast("float* test(double& d) {\n"
                                 "    return (float*)&d;\n"
-                                "}");
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (portability) Casting between double * and float * which have an incompatible binary data representation. [invalidPointerCast]\n", errout_str());
 
         checkInvalidPointerCast("void test(float* data) {\n"
                                 "    f.write((char*)data,sizeof(float));\n"
-                                "}", true, false);
+                                "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInvalidPointerCast("void test(float* data) {\n"
                                 "    f.write((char*)data,sizeof(float));\n"
-                                "}", true, true); // #3639
-        ASSERT_EQUALS("[test.cpp:2:13]: (portability, inconclusive) Casting from float * to signed char * is not portable due to different binary data representations on different platforms. [invalidPointerCast]\n", errout_str());
+                                "}\n", dinit(CheckInvalidPointerCastOptions, $.inconclusive = true)); // #3639
+        ASSERT_EQUALS("[test.cpp:2:13]: (portability, inconclusive) Casting from float * to char * is not portable due to different binary data representations on different platforms. [invalidPointerCast]\n", errout_str());
 
 
         checkInvalidPointerCast("long long* test(float* f) {\n"
                                 "    return (long long*)f;\n"
-                                "}", false);
+                                "}\n", dinit(CheckInvalidPointerCastOptions, $.portability = false));
         ASSERT_EQUALS("", errout_str());
 
         checkInvalidPointerCast("long long* test(float* f, char* c) {\n"
                                 "    foo((long long*)f);\n"
                                 "    return reinterpret_cast<long long*>(c);\n"
-                                "}", true);
+                                "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (portability) Casting from float * to signed long long * is not portable due to different binary data representations on different platforms. [invalidPointerCast]\n", errout_str());
 
-        checkInvalidPointerCast("Q_DECLARE_METATYPE(int*)"); // #4135 - don't crash
+        checkInvalidPointerCast("Q_DECLARE_METATYPE(int*)\n"); // #4135 - don't crash
     }
 
 
     void passedByValue() {
-        check("void f(const std::string str) {}");
+        check("void f(const std::string str) {}\n");
         ASSERT_EQUALS("[test.cpp:1:26]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(std::unique_ptr<std::string> ptr) {}");
+        check("void f(std::unique_ptr<std::string> ptr) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::shared_ptr<std::string> ptr) {}");
+        check("void f(const std::shared_ptr<std::string> ptr) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::function<F> ptr) {}");
+        check("void f(const std::function<F> ptr) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
-            check("void f(const std::pair<int,int> x) {}");
+            check("void f(const std::pair<int,int> x) {}\n");
             ASSERT_EQUALS("", errout_str());
 
-            check("void f(const std::pair<std::string,std::string> x) {}");
+            check("void f(const std::pair<std::string,std::string> x) {}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
-        check("void f(const std::string::size_type x) {}");
+        check("void f(const std::string::size_type x) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("class Foo;\nvoid f(const Foo foo) {}"); // Unknown class
+        check("class Foo;\nvoid f(const Foo foo) {}\n"); // Unknown class
         ASSERT_EQUALS("[test.cpp:2:18]: (performance, inconclusive) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class Foo { std::vector<int> v; };\nvoid f(const Foo foo) {}"); // Large class (STL member)
+        check("class Foo { std::vector<int> v; };\nvoid f(const Foo foo) {}\n"); // Large class (STL member)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class Foo { int i; };\nvoid f(const Foo foo) {}"); // Small class
+        check("class Foo { int i; };\nvoid f(const Foo foo) {}\n"); // Small class
         ASSERT_EQUALS("", errout_str());
 
-        check("class Foo { int i[6]; };\nvoid f(const Foo foo) {}"); // Large class (array)
+        check("class Foo { int i[6]; };\nvoid f(const Foo foo) {}\n"); // Large class (array)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class Foo { std::string* s; };\nvoid f(const Foo foo) {}"); // Small class (pointer)
+        check("class Foo { std::string* s; };\nvoid f(const Foo foo) {}\n"); // Small class (pointer)
         ASSERT_EQUALS("", errout_str());
 
-        check("class Foo { static std::string s; };\nvoid f(const Foo foo) {}"); // Small class (static member)
+        check("class Foo { static std::string s; };\nvoid f(const Foo foo) {}\n"); // Small class (static member)
         ASSERT_EQUALS("", errout_str());
 
-        check("class X { std::string s; }; class Foo : X { };\nvoid f(const Foo foo) {}"); // Large class (inherited)
+        check("class X { std::string s; }; class Foo : X { };\nvoid f(const Foo foo) {}\n"); // Large class (inherited)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("class X { std::string s; }; class Foo { X x; };\nvoid f(const Foo foo) {}"); // Large class (inherited)
+        check("class X { std::string s; }; class Foo { X x; };\nvoid f(const Foo foo) {}\n"); // Large class (inherited)
         ASSERT_EQUALS("[test.cpp:2:18]: (performance) Function parameter 'foo' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::string &str) {}");
+        check("void f(const std::string &str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // The idiomatic way of passing a std::string_view is by value
-        check("void f(const std::string_view str) {}");
+        check("void f(const std::string_view str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(std::string_view str) {}");
+        check("void f(std::string_view str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::string_view &str) {}");
+        check("void f(const std::string_view &str) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::vector<int> v) {}");
+        check("void f(const std::vector<int> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:31]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::vector<std::string> v) {}");
+        check("void f(const std::vector<std::string> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:39]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::vector<std::string>::size_type s) {}");
+        check("void f(const std::vector<std::string>::size_type s) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::vector<int> &v) {}");
+        check("void f(const std::vector<int> &v) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::map<int,int> &v) {}");
+        check("void f(const std::map<int,int> &v) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(const std::map<int,int> v) {}");
+        check("void f(const std::map<int,int> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::map<std::string,std::string> v) {}");
+        check("void f(const std::map<std::string,std::string> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:48]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::map<int,std::string> v) {}");
+        check("void f(const std::map<int,std::string> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::map<std::string,int> v) {}");
+        check("void f(const std::map<std::string,int> v) {}\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("void f(const std::streamoff pos) {}");
+        check("void f(const std::streamoff pos) {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(std::initializer_list<int> i) {}");
+        check("void f(std::initializer_list<int> i) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5824
-        check("void log(const std::string& file, int line, const std::string& function, const std::string str, ...) {}");
+        check("void log(const std::string& file, int line, const std::string& function, const std::string str, ...) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5534
@@ -2320,12 +2564,12 @@ class TestOther : public TestFixture {
               "class Plane {\n"
               "    vec Refract(vec &vec) const;\n"
               "    bool IntersectLinePlane(const vec &planeNormal);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    virtual void func(const std::string str) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:2:41]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("enum X;\n"
@@ -2342,7 +2586,7 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         check("enum X;\n"
-              "enum X { a, b, c };"
+              "enum X { a, b, c };\n"
               "void foo(X x4){}\n");
         ASSERT_EQUALS("", errout_str());
 
@@ -2429,7 +2673,7 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:1:42]: (performance) Function parameter 't' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        /*const*/ Settings settings0 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
+        /*const*/ Settings settingsUnix64 = settingsBuilder(settings0).platform(Platform::Type::Unix64).build();
         check("struct S {\n" // #12138
               "    union {\n"
               "        int a = 0;\n"
@@ -2446,7 +2690,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void f(S s) {\n"
               "    if (s.x > s.y) {}\n"
-              "}\n", /*cpp*/ true, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings0);
+              "}\n", dinit(CheckOptions, $.settings = &settingsUnix64));
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { std::list<int> l; };\n" // #12147
@@ -2486,93 +2730,103 @@ class TestOther : public TestFixture {
         check("void f(const std::array<int, 10> a[]) {}\n"); // #13524
         ASSERT_EQUALS("", errout_str());
 
-        /*const*/ Settings settings1 = settingsBuilder().platform(Platform::Type::Win64).build();
+        check("struct S {\n" // #10733
+              "    std::vector<int> v;\n"
+              "    using F = void (*)();\n"
+              "    void func(F f);\n"
+              "};\n"
+              "void S::func(S::F f) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        /*const*/ Settings settingsWin64 = settingsBuilder().platform(Platform::Type::Win64).build();
         check("using ui64 = unsigned __int64;\n"
               "ui64 Test(ui64 one, ui64 two) { return one + two; }\n",
-              /*cpp*/ true, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings1);
+              dinit(CheckOptions, $.settings = &settingsWin64));
         ASSERT_EQUALS("", errout_str());
     }
 
     void passedByValue_nonConst() {
-        check("void f(std::string str) {}");
+        check("void f(std::string str) {}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    return str + x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    std::cout << str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    std::cin >> str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string str) {\n"
               "    std::string s2 = str;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (performance, inconclusive) Use const reference for 's2' to avoid unnecessary data copying. [redundantCopyLocalConst]\n"
+                      "[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n",
+                      errout_str());
 
         check("void f(std::string str) {\n"
               "    std::string& s2 = str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n"
                       "[test.cpp:2:18]: (style) Variable 's2' can be declared as reference to const [constVariableReference]\n",
                       errout_str());
 
         check("void f(std::string str) {\n"
               "    const std::string& s2 = str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void f(std::string str) {\n"
               "    str = \"\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string str) {\n"
               "    foo(str);\n" // It could be that foo takes str as non-const-reference
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const std::string& str);\n"
               "void f(std::string str) {\n"
               "    foo(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void foo(std::string str);\n"
               "void f(std::string str) {\n"
               "    foo(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("void foo(std::string& str);\n"
               "void f(std::string str) {\n"
               "    foo(str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::string* str);\n"
               "void f(std::string str) {\n"
               "    foo(&str);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i1, const std::string& str, int& i2);\n"
               "void f(std::string str) {\n"
               "    foo((a+b)*c, str, x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("std::string f(std::string str) {\n"
               "    str += x;\n"
               "    return str;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
@@ -2581,7 +2835,7 @@ class TestOther : public TestFixture {
               "};\n"
               "Y f(X x) {\n"
               "    x.func();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
@@ -2589,17 +2843,17 @@ class TestOther : public TestFixture {
               "};\n"
               "Y f(X x) {\n"
               "    x.func();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    void func(std::string str) {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:2:27]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
               "    virtual void func(std::string str) {}\n" // Do not warn about virtual functions, if 'str' is not declared as const
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
@@ -2609,7 +2863,7 @@ class TestOther : public TestFixture {
               "    char b;\n"
               "};\n"
               "void f(Y y) {\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10]: (performance) Function parameter 'y' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
@@ -2622,7 +2876,7 @@ class TestOther : public TestFixture {
               "    char c;\n"
               "};\n"
               "void f(X x, Y y) {\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:15]: (performance) Function parameter 'y' should be passed by const reference. [passedByValue]\n", errout_str());
 
         {
@@ -2631,14 +2885,14 @@ class TestOther : public TestFixture {
                                 "    uint64_t a;\n"
                                 "    uint64_t b;\n"
                                 "};\n"
-                                "void f(X x) {}";
+                                "void f(X x) {}\n";
 
-            /*const*/ Settings s32 = settingsBuilder(_settings).platform(Platform::Type::Unix32).build();
-            check(code, &s32);
+            /*const*/ Settings s32 = settingsBuilder(settings1).platform(Platform::Type::Unix32).build();
+            check(code, dinit(CheckOptions, $.settings = &s32));
             ASSERT_EQUALS("[test.cpp:5:10]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
-            /*const*/ Settings s64 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
-            check(code, &s64);
+            /*const*/ Settings s64 = settingsBuilder(settings1).platform(Platform::Type::Unix64).build();
+            check(code, dinit(CheckOptions, $.settings = &s64));
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2646,27 +2900,30 @@ class TestOther : public TestFixture {
               "\n"
               "void foo(Buffer& buffer) {\n"
               "    getWriter()->operator<<(buffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void passedByValue_externC() {
-        check("struct X { int a[5]; }; void f(X v) { }");
+        check("struct X { int a[5]; }; void f(X v) { }\n");
         ASSERT_EQUALS("[test.cpp:1:34]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("extern \"C\" { struct X { int a[5]; }; void f(X v) { } }");
+        check("extern \"C\" { struct X { int a[5]; }; void f(X v) { } }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct X { int a[5]; }; extern \"C\" void f(X v) { }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct X { int a[5]; }; extern \"C\" void f(X v) { }");
+        check("struct X { int a[5]; }; void f(const X v);\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct X { int a[5]; }; void f(const X v);");
+        check("struct X { int a[5]; }; void f(const X v) { (void) v; }\n");
         ASSERT_EQUALS("[test.cpp:1:40]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        check("extern \"C\" { struct X { int a[5]; }; void f(const X v); }");
+        check("extern \"C\" { struct X { int a[5]; }; void f(const X v); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct X { int a[5]; }; extern \"C\" void f(const X v) { }");
+        check("struct X { int a[5]; }; extern \"C\" void f(const X v) { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2674,140 +2931,140 @@ class TestOther : public TestFixture {
         check("int f(std::vector<int> x) {\n"
               "    int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n"
                       "[test.cpp:2:10]: (style) Variable 'i' can be declared as reference to const [constVariableReference]\n",
                       errout_str());
 
         check("int f(std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("int f(std::vector<int> x) {\n"
               "    const int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("int f(std::vector<int> x) {\n"
               "    static int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("int f(std::vector<int> x) {\n"
               "    int& i = x[0];\n"
               "    i++;\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::vector<int>& x) {\n"
               "    x.push_back(1);\n"
               "    int& i = x[0];\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const int& f(std::vector<int>& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("int f(std::vector<int>& x) {\n"
               "    x[0]++;\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int a; };\n"
               "A f(std::vector<A>& x) {\n"
               "    x[0].a = 1;\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int a(); };\n"
               "A f(std::vector<A>& x) {\n"
               "    x[0].a();\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g(int& x);\n"
               "int f(std::vector<int>& x) {\n"
               "    g(x[0]);\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T&& x) {\n"
               "    return x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T& x) {\n"
               "    return x[0];\n"
               "}\n"
-              "void h() { std::vector<int> v; h(v); }");
+              "void h() { std::vector<int> v; h(v); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int& x) {\n"
               "    return std::move(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::ostream& os) {\n"
               "    os << \"Hello\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int*);\n"
               "void f(int& x) {\n"
               "    g(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(int*); };\n"
               "A f(int& x) {\n"
               "    return A(&x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(int*); };\n"
               "A f(int& x) {\n"
               "    return A{&x};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int& x, int& y) {\n"
               "    y++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:13]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("struct A {\n"
               "    explicit A(int& y) : x(&y) {}\n"
               "    int * x = nullptr;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -2815,7 +3072,7 @@ class TestOther : public TestFixture {
               "    void swap(A& a) {\n"
               "        v.swap(a.v);\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -2826,24 +3083,24 @@ class TestOther : public TestFixture {
               "};\n"
               "void g(A& a) {\n"
               "    a.f<int>();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto&& x:v)\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto x:v)\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:26]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto& x:v) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Variable 'x' can be declared as reference to const [constVariableReference]\n",
                       errout_str());
 
@@ -2864,32 +3121,32 @@ class TestOther : public TestFixture {
 
         check("void f(std::vector<int>& v) {\n"
               "    for(const auto& x:v) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:26]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("void f(int& i) {\n"
               "    int& j = i;\n"
               "    j++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    int& i = v[0];\n"
               "    i++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<unsigned int, std::map<std::string, unsigned int> >& m, unsigned int i) {\n"
               "    std::map<std::string, unsigned int>& members = m[i];\n"
               "    members.clear();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int& x;\n"
               "    A(int& y) : x(y)\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -2898,14 +3155,14 @@ class TestOther : public TestFixture {
               "struct B : A {\n"
               "    B(int& x) : A(x)\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b, int& x, int& y) {\n"
               "  auto& z = x;\n"
               "  auto& w = b ? y : z;\n"
               "  w = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
@@ -2913,7 +3170,7 @@ class TestOther : public TestFixture {
               "};\n"
               "int& f(S& s) {\n"
               "  return s.i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::list<int>& x, unsigned int y) {\n"
@@ -2922,7 +3179,7 @@ class TestOther : public TestFixture {
               "            return &m;\n"
               "    }\n"
               "    return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::list<int>& x, int& y) {\n"
@@ -2931,7 +3188,7 @@ class TestOther : public TestFixture {
               "            return m;\n"
               "    }\n"
               "    return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool from_string(int& t, const std::string& s) {\n"
@@ -2975,7 +3232,7 @@ class TestOther : public TestFixture {
         check("struct T { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
@@ -2983,86 +3240,86 @@ class TestOther : public TestFixture {
               "    const T& z = x;\n" // Make sure we find all assignments
               "    T& y = x;\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = x\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = x;\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    my<fancy>::type& y = x;\n" // we don't know if y is const or not
               "    y.mutate();\n"             // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = static_cast<const U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U  { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = static_cast<U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<const U&>(x)\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<U const &>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<U & const>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = dynamic_cast<U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = dynamic_cast<typename const U&>(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U& y = dynamic_cast<typename U&>(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U* y = dynamic_cast<U*>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct T : public U { void dostuff() const {}};\n"
@@ -3070,50 +3327,50 @@ class TestOther : public TestFixture {
               "    x.dostuff();\n"
               "    const U * y = dynamic_cast<const U *>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("can be const", errout_str(), ""); //Currently taking the address is treated as a non-const operation when it should depend on what we do with it
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U const * y = dynamic_cast<U const *>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("can be const", errout_str(), ""); //Currently taking the address is treated as a non-const operation when it should depend on what we do with it
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U const * const * const * const y = dynamic_cast<const U const * const * const * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U const * const * const * const y = dynamic_cast<const U const * const * const * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("can be const", errout_str(), ""); //Currently taking the address is treated as a non-const operation when it should depend on what we do with it
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U const * const *  * const y = dynamic_cast<const U const * const *  * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    my::fancy<typename type const *> const * const  * const y = dynamic_cast<my::fancy<typename type const *> const * const  * const>(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = (const U&)(x);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4:19]: (style) C-style reference casting [cstyleCast]\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:18]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
                       "[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n",
                       errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
@@ -3121,14 +3378,14 @@ class TestOther : public TestFixture {
               "    x.dostuff();\n"
               "    U& y = (U&)(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
-        ASSERT_EQUALS("[test.cpp:4:12]: (style) C-style reference casting [cstyleCast]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    const U& y = (typename const U&)(x);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4:0]: (style) C-style reference casting [cstyleCast]\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:18]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
                       "[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n",
                       errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
@@ -3136,22 +3393,22 @@ class TestOther : public TestFixture {
               "    x.dostuff();\n"
               "    U& y = (typename U&)(x);\n"
               "    y.mutate();\n" // to avoid warnings that y can be const
-              "}");
-        ASSERT_EQUALS("[test.cpp:4:12]: (style) C-style reference casting [cstyleCast]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
         check("struct T : public U { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "    U* y = (U*)(&x);\n"
               "    y->mutate();\n" // to avoid warnings that y can be const
-              "}");
-        ASSERT_EQUALS("[test.cpp:4:12]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         check("struct C { void f() const; };\n" // #9875 - crash
               "\n"
               "void foo(C& x) {\n"
               "   x.f();\n"
               "   foo( static_cast<U2>(0) );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("class a {\n"
@@ -3205,6 +3462,10 @@ class TestOther : public TestFixture {
               "};\n");
         ASSERT_EQUALS("", errout_str());
 
+        // #14136
+        check("void f(int& x) { (void)x; }\n");
+        ASSERT_EQUALS("", errout_str());
+
         check("void e();\n"
               "void g(void);\n"
               "void h(void);\n"
@@ -3355,7 +3616,7 @@ class TestOther : public TestFixture {
               "void bh(const std::list<int> &ak, const std::list<int> &al);\n"
               "void ah();\n"
               "void an();\n"
-              "void h();");
+              "void h();\n");
         ASSERT_EQUALS("[test.cpp:131:12]: (style) Variable 'tm' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:136:19]: (style) Variable 'af' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:137:12]: (style) Variable 'ag' can be declared as pointer to const [constVariablePointer]\n",
@@ -3370,7 +3631,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3379,7 +3640,7 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(i)\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C\n"
@@ -3391,7 +3652,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&) noexcept;\n"
+              "  explicit D(int& i) noexcept;\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3399,7 +3660,7 @@ class TestOther : public TestFixture {
               "\n"
               "D::D(int& i) noexcept\n"
               "  : c(i)\n"
-              "{}");
+              "{}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C\n"
@@ -3411,7 +3672,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3420,7 +3681,7 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(i)\n"
               "{\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("class C\n"
@@ -3432,7 +3693,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3441,7 +3702,7 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(i)\n"
               "{\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("class C\n"
@@ -3453,7 +3714,7 @@ class TestOther : public TestFixture {
               "class D\n"
               "{\n"
               "public:\n"
-              "  explicit D(int&);\n"
+              "  explicit D(int& i);\n"
               "\n"
               "private:\n"
               "  C c;\n"
@@ -3462,13 +3723,13 @@ class TestOther : public TestFixture {
               "D::D(int& i)\n"
               "  : c(0, i)\n"
               "{\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("void f(std::map<int, std::vector<int>> &map) {\n" // #10266
               "  for (auto &[slave, panels] : map)\n"
               "    panels.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { void f(); int i; };\n"
@@ -3589,7 +3850,7 @@ class TestOther : public TestFixture {
               "void g(A* a) {\n"
               "    const B* b = (const B*)a;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:10:19]: (style) C-style pointer casting [cstyleCast]\n"
+        ASSERT_EQUALS("[test.cpp:10:18]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n"
                       "[test.cpp:6:11]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:9:11]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -3654,7 +3915,9 @@ class TestOther : public TestFixture {
               "    (void)(true);\n"
               "    if (r) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1:13]: (style) Parameter 'r' can be declared as reference to const [constParameterReference]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Redundant code: Found unused cast in expression '(void)(true)'. [constStatement]\n"
+                      "[test.cpp:1:13]: (style) Parameter 'r' can be declared as reference to const [constParameterReference]\n",
+                      errout_str());
 
         check("struct S { void f(int&); };\n" // #12216
               "void g(S& s, int& r, void (S::* p2m)(int&)) {\n"
@@ -3816,11 +4079,98 @@ class TestOther : public TestFixture {
                       "[test.cpp:7:10]: (style) Parameter 't' can be declared as reference to const [constParameterReference]\n"
                       "[test.cpp:10:25]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n",
                       errout_str());
+
+        check("void push(V& v) { v.push_back({ .x = 1 }); }\n"); // #14010
+        ASSERT_EQUALS("", errout_str());
+
+        check("size_t* f(std::array<uint8_t, 128>& a) { return reinterpret_cast<size_t*>(a.data()); }\n"); // #14074
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i; };\n" // #14231
+              "void* f(S& s, int& v) {\n"
+              "    v = s.i;\n"
+              "    return (void*)&s;\n"
+              "}\n"); // don't crash
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i; };\n" // #14251
+              "struct T { std::optional<S> s; };\n"
+              "void f(T& t) {\n"
+              "    t.s->i = 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct B {};\n" // #13877
+              "struct D : B { int i; };\n"
+              "void f(B& b) {\n"
+              "    static_cast<D&>(b).i = 0;\n"
+              "}\n"
+              "void g(B& b) {\n"
+              "    std::cin >> static_cast<D&>(b).i;\n"
+              "}\n"
+              "int h(B& b) {\n"
+              "    return static_cast<const D&>(b).i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:9:10]: (style) Parameter 'b' can be declared as reference to const [constParameterReference]\n", errout_str());
+
+        check("void f(int *p) {\n" // #14409
+              "    int*& pp{ p };\n"
+              "    if (*pp) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class C {\n"
+              "public:\n"
+              "    explicit C(const std::string s);\n"
+              "private:\n"
+              "    std::string _s;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int& r) {\n" // #9761
+              "    o1 = r;\n"
+              "}\n"
+              "boost::optional<int&> o2;\n"
+              "void g(int& r) {\n"
+              "    o2 = r;\n"
+              "}\n"
+              "struct T {\n"
+              "    int* p;\n"
+              "    T& operator=(int& rhs) { p = &rhs; return *this; }\n"
+              "};\n"
+              "void h(T& t, int& r) {\n"
+              "    t = r;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::optional<int>& o) {\n"
+              "    *o = 1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f() {\n"
+              "  int x = 0;\n"
+              "  int& r(x);\n"
+              "  r = x;\n"
+              "  return r;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct Item { int state; };\n"
+              "void foo(std::vector<Item> &items) {\n"
+              "    for (auto &item : items) {\n"
+              "        switch (auto &s = item.state) {\n"
+              "        case 0: s = 1; break;\n"
+              "        default: break;\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void constParameterCallback() {
         check("int callback(std::vector<int>& x) { return x[0]; }\n"
-              "void f() { dostuff(callback); }");
+              "void f() { dostuff(callback); }\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:1:32]: (style) Parameter 'x' can be declared as reference to const. However it seems that 'callback' is a callback function, if 'x' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n", errout_str());
 
         // #9906
@@ -3838,62 +4188,81 @@ class TestOther : public TestFixture {
               "\n"
               "void EventEngine::signalEvent(ev::sig& signal, int revents) {\n"
               "    switch (signal.signum) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:48] -> [test.cpp:13:40]: (style) Parameter 'signal' can be declared as reference to const. However it seems that 'signalEvent' is a callback function, if 'signal' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n", errout_str());
 
         check("void f(int* p) {}\n" // 12843
               "void g(std::map<void(*)(int*), int>&m) {\n"
               "    m[&f] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:1:13]: (style) Parameter 'p' can be declared as pointer to const. "
                       "However it seems that 'f' is a callback function, if 'p' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n",
                       errout_str());
+
+        check("struct S { explicit S(std::function<void(std::string)>); };\n" // #13338
+              "void cb(std::string s) {\n"
+              "    (void)s.empty();\n"
+              "}\n"
+              "void f() {\n"
+              "    S s2{ cb };\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:11] -> [test.cpp:2:21]: (performance) Function parameter 's' should be passed by const reference. However it seems that 'cb' is a callback function. [passedByValueCallback]\n", errout_str());
+
+        check("struct S {\n" // #14696
+              "    explicit S(std::string s = {}) {}\n"
+              "};\n"
+              "struct T {\n"
+              "    explicit T(std::string* s = {}) {}\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:28]: (performance) Function parameter 's' should be passed by const reference. [passedByValue]\n"
+                      "[test.cpp:5:29]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
     }
 
     void constPointer() {
-        check("void foo(int *p) { return *p; }");
+        check("void foo(int *p) { return *p; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { x = *p; }");
+        check("void foo(int *p) { x = *p; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { int &ref = *p; ref = 12; }");
+        check("void foo(int *p) { int &ref = *p; ref = 12; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo(int *p) { x = *p + 10; }");
+        check("void foo(int *p) { x = *p + 10; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { return p[10]; }");
+        check("void foo(int *p) { return p[10]; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { int &ref = p[0]; ref = 12; }");
+        check("void foo(int *p) { int &ref = p[0]; ref = 12; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo(int *p) { x[*p] = 12; }");
+        check("void foo(int *p) { x[*p] = 12; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (p) {} }");
+        check("void foo(int *p) { if (p) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (p || x) {} }");
+        check("void foo(int *p) { if (p || x) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (p == 0) {} }");
+        check("void foo(int *p) { if (p == 0) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (!p) {} }");
+        check("void foo(int *p) { if (!p) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { if (*p > 123) {} }");
+        check("void foo(int *p) { if (*p > 123) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { return *p + 1; }");
+        check("void foo(int *p) { return *p + 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(int *p) { return *p > 1; }");
+        check("void foo(int *p) { return *p > 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
-        check("void foo(const int* c) { if (c == 0) {}; }");
+        check("void foo(const int* c) { if (c == 0) {}; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct a { void b(); };\n"
@@ -3926,59 +4295,59 @@ class TestOther : public TestFixture {
               "    int& i = (*x)[0];\n"
               "    i++;\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int a; };\n"
               "A f(std::vector<A>* x) {\n"
               "    x->front().a = 1;\n"
               "    return x->front();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>* v) {\n"
               "    for(auto&& x:*v)\n"
               "        x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int* x;\n"
               "    A(int* y) : x(y)\n"
               "    {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b, int* x, int* y) {\n"
               "  int* z = x;\n"
               "  int* w = b ? y : z;\n"
               "  *w = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b, int* x, int* y) {\n"
               "  int& z = *x;\n"
               "  int& w = b ? *y : z;\n"
               "  w = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Base { virtual void dostuff(int *p) = 0; };\n" // #10397
-              "class Derived: public Base { int x; void dostuff(int *p) override { x = *p; } };");
+              "class Derived: public Base { int x; void dostuff(int *p) override { x = *p; } };\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Data { char buf[128]; };\n" // #10483
               "void encrypt(Data& data) {\n"
               "    const char a[] = \"asfasd\";\n"
               "    memcpy(data.buf, &a, sizeof(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10547
         check("void foo(std::istream &istr) {\n"
               "  unsigned char x[2];\n"
               "  istr >> x[0];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10744
@@ -4390,66 +4759,255 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:5:18]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
-    }
 
-    void constArray() {
-        check("void f(std::array<int, 2>& a) {\n"
-              "    if (a[0]) {}\n"
-              "}\n"
-              "void g(std::array<int, 2>& a) {\n"
-              "    a.fill(0);\n"
+        check("struct T;\n"
+              "void use(const T*);\n"
+              "void f(T* tok0) {\n"
+              "    T *tok1 = tok0;\n"
+              "    const T *tok2 = tok1;\n"
+              "    use(tok2);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1:28]: (style) Parameter 'a' can be declared as const array [constParameterReference]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:4:8]: (style) Variable 'tok1' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
 
-        check("int f() {\n"
-              "    static int i[1] = {};\n"
-              "    return i[0];\n"
+        check("struct S { S* next; };\n" // #14119
+              "void f(S* s) {\n"
+              "    for (S* p = s->next; p != nullptr; p = p->next) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:16]: (style) Variable 'i' can be declared as const array [constVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
 
-        check("int f() {\n"
-              "    static int i[] = { 0 };\n"
-              "    int j = i[0] + 1;\n"
-              "    return j;\n"
+        check("void f(int* p) {\n"
+              "    for (int* q = p; q;)\n"
+              "        break;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:16]: (style) Variable 'i' can be declared as const array [constVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (style) Variable 'q' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
 
-        check("void f(int i) {\n"
-              "    const char *tmp;\n"
-              "    char* a[] = { \"a\", \"aa\" };\n"
-              "    static char* b[] = { \"b\", \"bb\" };\n"
-              "    tmp = a[i];\n"
-              "    printf(\"%s\", tmp);\n"
-              "    tmp = b[i];\n"
-              "    printf(\"%s\", tmp);\n"
+        check("void g(const int*);\n" // #14148
+              "void f() {\n"
+              "    int a[] = {1, 2, 3};\n"
+              "    for (int* p = a; *p != 3; p++) {\n"
+              "        g(p);\n"
+              "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'a' can be declared as const array [constVariable]\n"
-                      "[test.cpp:4:18]: (style) Variable 'b' can be declared as const array [constVariable]\n",
+        ASSERT_EQUALS("[test.cpp:4:15]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
                       errout_str());
 
-        check("int f(int i, int j) {\n" // #13069
-              "    int a[3][4] = {\n"
-              "        { 2,  2, -1, -1 },\n"
-              "        { 2, -1,  2, -1 },\n"
-              "        { 2, -1, -1,  2 },\n"
-              "    };\n"
-              "    return a[j][i];\n"
+        check("uintptr_t f(int* p) {\n"
+              "    return (uintptr_t)p;\n"
+              "}\n"
+              "uintptr_t g(int* p) {\n"
+              "    return static_cast<uintptr_t>(p);\n"
+              "}\n"
+              "U h(int* p) {\n"
+              "    return (U)p;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:9]: (style) Variable 'a' can be declared as const array [constVariable]\n",
+        ASSERT_EQUALS("[test.cpp:1:18]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:4:18]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
 
-        check("void f(int n, int v[42]) {\n" // #12796
-              "    int j = 0;\n"
-              "    for (int i = 0; i < n; ++i) {\n"
-              "        j += 1;\n"
-              "        if (j == 1) {}\n"
-              "    }\n"
+        check("using fp_t = int (*)(int*);\n" // #14510
+              "fp_t g_fp;\n"
+              "struct S { fp_t m_fp; };\n"
+              "void g(fp_t);\n"
+              "S f(S* s) {\n"
+              "    g_fp = [](int* p) { return *p; };\n"
+              "    s->m_fp = [](int* p) { return *p; };\n"
+              "    g([](int* p) { return *p; });\n"
+              "    auto x = [](int* p) { return *p; };\n"
+              "    g(x);\n"
+              "    return { [](int* p) { return *p; } };\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1:19]: (style) Parameter 'v' can be declared as const array [constParameter]\n",
-                      errout_str());
-    }
+        ASSERT_EQUALS("", errout_str());
 
-    void switchRedundantAssignmentTest() {
+        check("void f() {\n"
+              "    int i = 0;\n"
+              "    auto x = [&]() { int* p = &i; if (*p) {} };\n"
+              "    x();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:27]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n", errout_str());
+
+        check("int f() {\n"
+              "    int i = 0;\n"
+              "    return [](int* p) { return *p; }(&i);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:20]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S {\n" // #14571
+              "    char* c;\n"
+              "};\n"
+              "struct T {\n"
+              "    S s;\n"
+              "};\n"
+              "void f(std::string* p, T& t) {\n"
+              "    S& r = t.s;\n"
+              "    strcpy(r.c, p->c_str());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:21]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S {\n" // #14559
+              "    int gc() const;\n"
+              "    int gnc();\n"
+              "};\n"
+              "int f1(S* s) {\n"
+              "    return h(s ? s->gc() : 1);\n"
+              "}\n"
+              "int f2(S* s) {\n"
+              "    return h(s ? s->gnc() : 1);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:11]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("using IntPtr = int *;\n"
+              "int* foo(IntPtr bar) {\n"
+              "  return bar = 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int x; };\n" // #14700
+              "int f(S* s) {\n"
+              "    return s->x ? 1 : 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S { int a[1][1]; };\n" // #14714
+              "int f(S* s) {\n"
+              "    return s->a[0][0] ? 1 : 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("int f(int *p, int *q) {\n" // #14748
+              "    return p ? *p : *q;\n"
+              "}\n"
+              "void g(int *p, int *q) {\n"
+              "    int& r = p ? *p : *q;\n"
+              "    r = 0;\n"
+              "}\n"
+              "void h(int *p, int *q) {\n"
+              "    i(p ? *p : *q);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:12]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:1:20]: (style) Parameter 'q' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("int f(std::vector<int>* p) {\n" // #14810
+              "    return *p->cbegin();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:25]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("struct S {\n" // #14817
+              "    explicit S(int *a) : m{ a[0], a[1] } {}\n"
+              "    int m[2];\n"
+              "}\n"
+              "struct T {\n"
+              "    explicit T(int *a) : m{ &a[0], &a[1] } {}\n"
+              "    int* m[2];\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:21]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("class A {\n" // #11471
+              "public:\n"
+              "    A(const int& i, int) : m_i(&i) {}\n"
+              "    const int* m_i;\n"
+              "};\n"
+              "A f(int& s) {\n"
+              "    return A(s, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:10]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n",
+                      errout_str());
+
+        check("struct S { std::string a; };\n" // #13678
+              "struct T { S s; };\n"
+              "bool f(S* s) {\n"
+              "    return s->a.empty();\n"
+              "}\n"
+              "bool g(T* t) {\n"
+              "    return t->s.a.empty();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:6:11]: (style) Parameter 't' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("struct S { int i; };\n" // #13099
+              "double f(S * s, int n, int a, int b, double* p) {\n"
+              "    return (s + (n * (a + 1) + b))->i / *(p + b);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:14]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:2:46]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("struct S : U {\n" // #13944
+              "    void f(int* p) const {\n"
+              "        if (m == p) {}\n"
+              "    }\n"
+              "    void g(int* p) final {\n"
+              "        if (m == p) {}\n"
+              "    }\n"
+              "    int* m;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Either there is a missing override/final keyword, or the parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+    }
+
+    void constArray() {
+        check("void f(std::array<int, 2>& a) {\n"
+              "    if (a[0]) {}\n"
+              "}\n"
+              "void g(std::array<int, 2>& a) {\n"
+              "    a.fill(0);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:28]: (style) Parameter 'a' can be declared as const array [constParameterReference]\n", errout_str());
+
+        check("int f() {\n"
+              "    static int i[1] = {};\n"
+              "    return i[0];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) Variable 'i' can be declared as const array [constVariable]\n", errout_str());
+
+        check("int f() {\n"
+              "    static int i[] = { 0 };\n"
+              "    int j = i[0] + 1;\n"
+              "    return j;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) Variable 'i' can be declared as const array [constVariable]\n", errout_str());
+
+        check("void f(int i) {\n"
+              "    const char *tmp;\n"
+              "    char* a[] = { \"a\", \"aa\" };\n"
+              "    static char* b[] = { \"b\", \"bb\" };\n"
+              "    tmp = a[i];\n"
+              "    printf(\"%s\", tmp);\n"
+              "    tmp = b[i];\n"
+              "    printf(\"%s\", tmp);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'a' can be declared as const array [constVariable]\n"
+                      "[test.cpp:4:18]: (style) Variable 'b' can be declared as const array [constVariable]\n",
+                      errout_str());
+
+        check("int f(int i, int j) {\n" // #13069
+              "    int a[3][4] = {\n"
+              "        { 2,  2, -1, -1 },\n"
+              "        { 2, -1,  2, -1 },\n"
+              "        { 2, -1, -1,  2 },\n"
+              "    };\n"
+              "    return a[j][i];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Variable 'a' can be declared as const array [constVariable]\n",
+                      errout_str());
+
+        check("void f(int n, int v[42]) {\n" // #12796
+              "    int j = 0;\n"
+              "    for (int i = 0; i < n; ++i) {\n"
+              "        j += 1;\n"
+              "        if (j == 1) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:19]: (style) Parameter 'v' can be declared as const array [constParameter]\n",
+                      errout_str());
+    }
+
+    void switchRedundantAssignmentTest() {
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4461,7 +5019,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:11] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void foo()\n"
@@ -4477,7 +5035,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void foo()\n"
@@ -4494,7 +5052,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4512,7 +5070,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4527,7 +5085,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4542,7 +5100,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4559,7 +5117,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4576,7 +5134,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4591,7 +5149,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -4606,7 +5164,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:11] -> [test.cpp:10:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void bar() {}\n" // bar isn't noreturn
@@ -4622,7 +5180,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:11] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("void foo(int a) {\n"
@@ -4634,7 +5192,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:8]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4648,7 +5206,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strncpy(str, \"b'\");\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:8]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4665,7 +5223,7 @@ class TestOther : public TestFixture {
               "      strcpy(str, \"b'\");\n"
               "      z++;\n"
               "    }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:10]: (style) Buffer 'str' is being written before its old content has been used. 'break;' missing?\n",
                            "",
                            errout_str());
@@ -4681,7 +5239,7 @@ class TestOther : public TestFixture {
               "      strcpy(str, \"b'\");\n"
               "      break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a) {\n"
@@ -4694,7 +5252,7 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5158 "segmentation fault (valid code)"
@@ -4708,7 +5266,7 @@ class TestOther : public TestFixture {
               "} deflate_state;\n"
               "void f(deflate_state *s) {\n"
               "    s->dyn_ltree[0].fc.freq++;\n"
-              "}\n", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6132 "crash: daca: kvirc CheckOther::checkRedundantAssignment()"
@@ -4718,7 +5276,7 @@ class TestOther : public TestFixture {
               "} else {\n"
               "KviKvsScript :: run ( m_szCompletionCallback , out ? out : ( g_pApp . activeConsole ( ) ) , & vParams ) ;\n"
               "}\n"
-              "}\n", true, false, true);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -4727,7 +5285,7 @@ class TestOther : public TestFixture {
               "  case 1: x = 3; goto a;\n"
               "  case 1: x = 6; goto a;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4743,7 +5301,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4758,7 +5316,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4771,7 +5329,7 @@ class TestOther : public TestFixture {
               "        ++y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4784,7 +5342,7 @@ class TestOther : public TestFixture {
               "        ++y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4797,7 +5355,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4812,7 +5370,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4825,7 +5383,7 @@ class TestOther : public TestFixture {
               "        --y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4838,7 +5396,7 @@ class TestOther : public TestFixture {
               "        --y;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4851,7 +5409,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4866,7 +5424,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:10] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4879,7 +5437,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4892,7 +5450,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4905,7 +5463,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:9:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4920,7 +5478,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:10] -> [test.cpp:11:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4933,7 +5491,7 @@ class TestOther : public TestFixture {
               "        y--;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4946,7 +5504,7 @@ class TestOther : public TestFixture {
               "        y--;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4962,7 +5520,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4979,7 +5537,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -4993,7 +5551,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5007,7 +5565,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5023,7 +5581,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5039,7 +5597,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        bar(y);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5053,7 +5611,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
@@ -5067,7 +5625,7 @@ class TestOther : public TestFixture {
               "        y = 3;\n"
               "    }\n"
               "    bar(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:10] -> [test.cpp:10:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing? [redundantAssignInSwitch]\n", errout_str());
 
         check("bool f() {\n"
@@ -5085,7 +5643,7 @@ class TestOther : public TestFixture {
               "    };\n"
               "    ret = true;\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:14:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:8:13] -> [test.cpp:14:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:11:13] -> [test.cpp:14:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n",
@@ -5104,7 +5662,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5118,7 +5676,7 @@ class TestOther : public TestFixture {
               "        y = y | 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5132,7 +5690,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5147,7 +5705,7 @@ class TestOther : public TestFixture {
               "            y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5162,7 +5720,7 @@ class TestOther : public TestFixture {
               "        y |= z;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5177,7 +5735,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5192,7 +5750,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:11] -> [test.cpp:8:11]: (style) Variable 'y' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5206,7 +5764,7 @@ class TestOther : public TestFixture {
               "        y &= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing? [redundantBitwiseOperationInSwitch]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5221,7 +5779,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5235,7 +5793,7 @@ class TestOther : public TestFixture {
               "        y ^= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5249,7 +5807,7 @@ class TestOther : public TestFixture {
               "        y |= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5263,7 +5821,7 @@ class TestOther : public TestFixture {
               "        y &= 3;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5277,7 +5835,7 @@ class TestOther : public TestFixture {
               "        y &= 2;\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5289,20 +5847,20 @@ class TestOther : public TestFixture {
               "            continue;\n"
               "        }\n"
               "    }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:5:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo(int a) {\n"
               "    return 0;\n"
               "    return(a-1);\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo(int a) {\n"
               "  A:"
               "    return(0);\n"
               "    goto A;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
@@ -5312,12 +5870,12 @@ class TestOther : public TestFixture {
                                    "    <arg nr=\"1\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).build();
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::style).build();
 
         check("void foo() {\n"
               "    exit(0);\n"
               "    break;\n"
-              "}", true, false, false, false, &settings);
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("class NeonSession {\n"
@@ -5326,16 +5884,16 @@ class TestOther : public TestFixture {
               "void NeonSession::exit()\n"
               "{\n"
               "    SAL_INFO(\"ucb.ucp.webdav\", \"neon commands cannot be aborted\");\n"
-              "}", true, false, false, false, &settings);
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("void NeonSession::exit()\n"
               "{\n"
               "    SAL_INFO(\"ucb.ucp.webdav\", \"neon commands cannot be aborted\");\n"
-              "}", true, false, false, false, &settings);
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { xResAccess->exit(); }", true, false, false, false, &settings);
+        check("void foo() { xResAccess->exit(); }\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5349,7 +5907,7 @@ class TestOther : public TestFixture {
               "            c++;\n"
               "            break;\n"
               "         }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:7:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5362,7 +5920,7 @@ class TestOther : public TestFixture {
               "            c++;\n"
               "            break;\n"
               "         }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
@@ -5373,7 +5931,7 @@ class TestOther : public TestFixture {
               "            break;\n"
               "          }\n"
               "       }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:6:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5385,7 +5943,7 @@ class TestOther : public TestFixture {
               "          }\n"
               "          a+=2;\n"
               "       }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:6:13]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo(int a)\n"
@@ -5396,50 +5954,50 @@ class TestOther : public TestFixture {
               "          }\n"
               "          a+=2;\n"
               "       }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    throw 0;\n"
               "    return 1;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo() {\n"
               "    throw 0;\n"
               "    return;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo() {\n"
               "    throw = 0;\n"
               "    return 1;\n"
-              "}", false, false, false);
+              "}\n", dinit(CheckOptions, $.cpp = false, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "    return 1;\n"
-              "}", true, false, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "    foo();\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
 
         check("int foo(int unused) {\n"
               "    return 0;\n"
               "    (void)unused;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int unused1, int unused2) {\n"
               "    return 0;\n"
               "    (void)unused1;\n"
               "    (void)unused2;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int unused1, int unused2) {\n"
@@ -5447,14 +6005,14 @@ class TestOther : public TestFixture {
               "    (void)unused1;\n"
               "    (void)unused2;\n"
               "    foo();\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:5:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
 
         check("int foo() {\n"
               "    if(bar)\n"
               "        return 0;\n"
               "    return 124;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
@@ -5465,7 +6023,7 @@ class TestOther : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return 124;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         check("void foo() {\n"
@@ -5473,7 +6031,7 @@ class TestOther : public TestFixture {
               "        return;\n"
               "        break;\n"
               "    }\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         // #5707
@@ -5484,20 +6042,20 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "    j=2;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:7:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "  label:\n"
               "    throw 0;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:3]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
 
         check("struct A {\n"
               "    virtual void foo  (P & Val) throw ();\n"
               "    virtual void foo1 (P & Val) throw ();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
@@ -5506,7 +6064,7 @@ class TestOther : public TestFixture {
               "     bar();\n"
               "     label:\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3457
 
         check("int foo() {\n"
@@ -5515,7 +6073,7 @@ class TestOther : public TestFixture {
               "     bar();\n"
               "     label:\n"
               "    } while (true);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3457
 
         check("int foo() {\n"
@@ -5524,7 +6082,7 @@ class TestOther : public TestFixture {
               "     bar();\n"
               "     label:\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3457
 
         // #3383. TODO: Use preprocessor
@@ -5533,23 +6091,21 @@ class TestOther : public TestFixture {
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
         check("int foo() {\n"
               "\n" // #ifdef A
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}", true, true, false);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (style, inconclusive) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n", errout_str());
 
         // #4711 lambda functions
         check("int f() {\n"
               "    return g([](int x){(void)x+1; return x;});\n"
-              "}",
-              true,
-              false,
-              false);
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #4756
@@ -5563,7 +6119,7 @@ class TestOther : public TestFixture {
               "             __asm__ (\"rorw $8, %w0\" : \"=r\" (__v) : \"0\" (__x) : \"cc\");\n"
               "         (void)__v;\n"
               "     }));\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #6008
@@ -5572,7 +6128,7 @@ class TestOther : public TestFixture {
               "        int sum = a_ + b_;\n"
               "        return sum;\n"
               "    };\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #5789
@@ -5580,20 +6136,20 @@ class TestOther : public TestFixture {
               "    uint64_t enter, exit;\n"
               "    uint64_t events;\n"
               "    per_state_info() : enter(0), exit(0), events(0) {}\n"
-              "};", true, false, false);
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #6664
         check("void foo() {\n"
               "    (beat < 100) ? (void)0 : exit(0);\n"
               "    bar();\n"
-              "}", true, false, false, false, &settings);
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    (beat < 100) ? exit(0) : (void)0;\n"
               "    bar();\n"
-              "}", true, false, false, false, &settings);
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         // #8261
@@ -5601,13 +6157,13 @@ class TestOther : public TestFixture {
         TODO_ASSERT_THROW(check("void foo() {\n"
                                 "    (beat < 100) ? (void)0 : throw(0);\n"
                                 "    bar();\n"
-                                "}", true, false, false, false, &settings), InternalError);
+                                "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings)), InternalError);
         //ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    exit(0);\n"
               "    return 1;\n" // <- clarify for tools that function does not continue..
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5778,7 +6334,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    var = 42;\n"
               "    return ret();\n"
-              "}\n", /*cpp*/ false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #13516
@@ -5850,7 +6406,7 @@ class TestOther : public TestFixture {
               "        case A||B:\n"
               "            foo();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (warning, inconclusive) Found suspicious case label in switch(). Operator '&&' probably doesn't work as intended. [suspiciousCase]\n"
                       "[test.cpp:5:16]: (warning, inconclusive) Found suspicious case label in switch(). Operator '||' probably doesn't work as intended. [suspiciousCase]\n"
                       "[test.cpp:7:15]: (warning, inconclusive) Found suspicious case label in switch(). Operator '||' probably doesn't work as intended. [suspiciousCase]\n", errout_str());
@@ -5860,7 +6416,7 @@ class TestOther : public TestFixture {
               "        case 1:\n"
               "            a=A&&B;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO Do not throw AST validation exception
@@ -5869,19 +6425,19 @@ class TestOther : public TestFixture {
                                 "        case A&&B?B:A:\n"
                                 "            foo();\n"
                                 "    }\n"
-                                "}"), InternalError);
+                                "}\n"), InternalError);
         //ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousEqualityComparison() {
         check("void foo(int c) {\n"
               "    if (x) c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(const int* c) {\n"
               "    if (x) *c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
 
@@ -5889,90 +6445,90 @@ class TestOther : public TestFixture {
               "    if (c == 1) {\n"
               "        c = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    c == 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (int i = 0; i == 10; i ++) {\n"
               "        a ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    for (i == 0; i < 10; i ++) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (i == 1; i < 10; i ++) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (i == 2; i < 10; i ++) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (int i = 0; i < 10; i == c) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:31]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int c) {\n"
               "    for (; running == 1;) {\n"
               "        c ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    printf(\"%i\", ({x==0;}));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int arg) {\n"
               "    printf(\"%i\", ({int x = do_something(); x == 0;}));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    printf(\"%i\", ({x == 0; x > 0 ? 10 : 20}));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
         check("void foo(int x) {\n"
               "    for (const Token* end = tok->link(); tok != end; tok = (tok == end) ? end : tok->next()) {\n"
               "        x++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    for (int i = (x == 0) ? 0 : 5; i < 10; i ++) {\n"
               "        x++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    for (int i = 0; i < 10; i += (x == 5) ? 1 : 2) {\n"
               "        x++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6028,26 +6584,26 @@ class TestOther : public TestFixture {
               "    int x = 1;\n"
               "    x = x;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int x = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         check("struct A { int b; };\n"
               "void foo(A* a1, A* a2) {\n"
               "    a1->b = a1->b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Redundant assignment of 'a1->b' to itself. [selfAssignment]\n", errout_str());
 
         check("int x;\n"
               "void f()\n"
               "{\n"
               "    x = x = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         // #4073 (segmentation fault)
@@ -6055,59 +6611,59 @@ class TestOther : public TestFixture {
               "{\n"
               "    if (a == 42)\n"
               "    a = a;\n"
-              "}");
+              "}\n");
 
         check("void foo()\n"
               "{\n"
               "    int x = 1;\n"
               "    x = x + 1;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "        int *x = getx();\n"
               "        *x = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    BAR *x = getx();\n"
               "    x = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         // #2502 - non-primitive type -> there might be some side effects
         check("void foo()\n"
               "{\n"
               "    Fred fred; fred = fred;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    x = (x == 0);"
               "    func(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    x = (x != 0);"
               "    func(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #3001 - false positive
         check("void foo(int x) {\n"
               "    x = x ? x : 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3800 - false negative when variable is extern
         check("extern int i;\n"
               "void f() {\n"
               "    i = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Redundant assignment of 'i' to itself. [selfAssignment]\n", errout_str());
 
         // #4291 - id for variables accessed through 'this'
@@ -6117,16 +6673,16 @@ class TestOther : public TestFixture {
               "};\n"
               "void Foo::func() {\n"
               "    this->var = var;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Redundant assignment of 'this->var' to itself. [selfAssignment]\n", errout_str());
 
         check("class Foo {\n"
               "    int var;\n"
-              "    void func(int var);\n"
+              "    Foo(int var);\n"
               "};\n"
-              "void Foo::func(int var) {\n"
+              "Foo::Foo(int var) {\n"
               "    this->var = var;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6406 - designated initializer doing bogus self assignment
@@ -6136,7 +6692,7 @@ class TestOther : public TestFixture {
               "void something(void) {}\n"
               "void f() {\n"
               "    struct callbacks ops = { .s = ops.s };\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Redundant assignment of 'something' to itself.\n", "", errout_str());
 
         check("class V\n"
@@ -6151,12 +6707,12 @@ class TestOther : public TestFixture {
               "        x = x; y = y; z = z;\n"
               "    }\n"
               "    double x, y, z;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:10:11]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n"
                       "[test.cpp:10:18]: (style) Redundant assignment of 'y' to itself. [selfAssignment]\n"
                       "[test.cpp:10:25]: (style) Redundant assignment of 'z' to itself. [selfAssignment]\n", errout_str());
 
-        check("void f(int i) { i = !!i; }");
+        check("void f(int i) { i = !!i; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -6202,6 +6758,10 @@ class TestOther : public TestFixture {
               "    s.i = o;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int N;\n" // #14234
+              "void f() { ::N = N; }\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) Redundant assignment of '::N' to itself. [selfAssignment]\n", errout_str());
     }
 
     void trac1132() {
@@ -6222,7 +6782,7 @@ class TestOther : public TestFixture {
               "    Lock(123);\n"
               "    std::cout << \"hello\" << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:15:5]: (style) Instance of 'Lock' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6232,7 +6792,7 @@ class TestOther : public TestFixture {
               "    b = 300\n"
               "  };\n"
               "};\n"
-              "const int DFLT_TIMEOUT = A::b % 1000000 ;\n", true, false, false);
+              "const int DFLT_TIMEOUT = A::b % 1000000 ;\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6241,7 +6801,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    CouldBeFunction ( 123 ) ;\n"
               "    return 0 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6258,7 +6818,7 @@ class TestOther : public TestFixture {
               "        error();\n"
               "        do_something();\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6268,7 +6828,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    NotAFunction ( 123 );\n"
               "    return 0 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'NotAFunction' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6278,7 +6838,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    NotAClass ( 123 ) ;\n"
               "    return true ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'NotAClass' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6287,7 +6847,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    if ( a > b ) return c == a ;\n"
               "    return b == a ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6297,7 +6857,7 @@ class TestOther : public TestFixture {
               "public:\n"
               "~Something ( ) ;\n"
               "Something ( ) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6316,7 +6876,7 @@ class TestOther : public TestFixture {
               "    int a = 1;\n"
               "    IncrementFunctor()(a);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6329,7 +6889,7 @@ class TestOther : public TestFixture {
               "    };\n"
               "    Foo();\n"
               "    do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (style) Instance of 'Foo' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6341,7 +6901,7 @@ class TestOther : public TestFixture {
               "\n"
               "void fn() {\n"
               "    Foo().bar();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6357,10 +6917,10 @@ class TestOther : public TestFixture {
                             "    do_something();\n"
                             "}\n";
 
-        check(code, true);
+        check(code);
         ASSERT_EQUALS("[test.cpp:7:5]: (style) Instance of 'cb_watch_bool' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
 
-        check(code, false);
+        check(code, dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2639
@@ -6370,14 +6930,14 @@ class TestOther : public TestFixture {
               "void foo() {\n"
               "    stat(\"file.txt\", &st);\n"
               "    do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("",errout_str());
 
         check("struct AMethodObject {\n" // #4336
               "    AMethodObject(double, double, double);\n"
               "};\n"
               "struct S {\n"
-              "    static void A(double, double, double);\n"
+              "    static void A(double a1, double a2, double a3);\n"
               "};\n"
               "void S::A(double const a1, double const a2, double const a3) {\n"
               "    AMethodObject(a1, a2, a3);\n"
@@ -6402,7 +6962,7 @@ class TestOther : public TestFixture {
                             "  do_something();\n"
                             "}\n";
 
-        check(code, true);
+        check(code);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6415,7 +6975,7 @@ class TestOther : public TestFixture {
                             "  }\n"
                             "  Foo(char x, int y) { }\n"
                             "};\n";
-        check(code, true);
+        check(code);
         ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'Foo' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6430,7 +6990,7 @@ class TestOther : public TestFixture {
               "    int{ i };\n"
               "    int{ g() };\n" // don't warn
               "    g();\n"
-              "}\n", true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Instance of 'int' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:4:5]: (style) Instance of 'int' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:6:5]: (style) Instance of 'int' object is destroyed immediately. [unusedScopedObject]\n"
@@ -6440,19 +7000,19 @@ class TestOther : public TestFixture {
 
         check("void f(int j) {\n"
               "    for (; bool(j); ) {}\n"
-              "}\n", true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g() {\n"
               "    float (f);\n"
               "    float (*p);\n"
-              "}\n", true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int i) {\n"
               "    void();\n"
               "    return i;\n"
-              "}\n", true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6465,7 +7025,7 @@ class TestOther : public TestFixture {
               "int f() {\n"
               "    M::N::S();\n"
               "    return 0;\n"
-              "}\n", true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:11]: (style) Instance of 'M::N::S' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
 
         check("void f() {\n" // #10057
@@ -6473,8 +7033,9 @@ class TestOther : public TestFixture {
               "    std::string{ \"abc\" };\n"
               "    std::pair<int, int>(1, 2);\n"
               "    (void)0;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:2:10]: (style) Instance of 'std::string' object is destroyed immediately. [unusedScopedObject]\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Redundant code: Found unused cast in expression '(void)0'. [constStatement]\n"
+                      "[test.cpp:2:10]: (style) Instance of 'std::string' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:3:10]: (style) Instance of 'std::string' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:4:10]: (style) Instance of 'std::pair' object is destroyed immediately. [unusedScopedObject]\n",
                       errout_str());
@@ -6490,7 +7051,7 @@ class TestOther : public TestFixture {
               "        std::scoped_lock(m);\n"
               "    }\n"
               "    std::mutex m;\n"
-              "}\n", true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Instance of 'std::lock_guard' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:6:14]: (style) Instance of 'std::scoped_lock' object is destroyed immediately. [unusedScopedObject]\n"
                       "[test.cpp:9:14]: (style) Instance of 'std::scoped_lock' object is destroyed immediately. [unusedScopedObject]\n",
@@ -6499,7 +7060,7 @@ class TestOther : public TestFixture {
         check("struct S { int i; };\n"
               "namespace {\n"
               "    S s() { return ::S{42}; }\n"
-              "}\n", true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6512,7 +7073,7 @@ class TestOther : public TestFixture {
               "void t0() { f() = {}; }\n"
               "void t1() { g() = {}; }\n"
               "void t2() { h() = {}; }\n"
-              "void t3() { *i() = {}; }\n", true);
+              "void t3() { *i() = {}; }\n");
         ASSERT_EQUALS("[test.cpp:6:19]: (style) Instance of 'S' object is destroyed immediately, assignment has no effect. [unusedScopedObject]\n", errout_str());
     }
 
@@ -6523,7 +7084,7 @@ class TestOther : public TestFixture {
               "\n"
               "    { sigaction(SIGHUP, &sa, 0); };\n"
               "    { sigaction(SIGINT, &sa, 0); };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6534,76 +7095,76 @@ class TestOther : public TestFixture {
               "    };\n"
               "\n"
               "    const AB ab[3] = { AB(0), AB(1), AB(2) };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCalculation() {
         check("int f(char c) {\n"
               "    return 10 * (c == 0) ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (style) Clarify calculation precedence for '*' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f(char c) {\n"
               "    printf(\"%i\", 10 * (c == 0) ? 1 : 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Clarify calculation precedence for '*' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    return (2*a)?b:c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char c) {\n"
               "    printf(\"%i\", a + b ? 1 : 2);\n"
-              "}",true,false,false);
+              "}\n",dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:2:24]: (style) Clarify calculation precedence for '+' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << x << y ? 2 : 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (style) Clarify calculation precedence for '<<' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    int ab = a - b ? 2 : 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Clarify calculation precedence for '-' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("void f() {\n"
               "    int ab = a | b ? 2 : 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Clarify calculation precedence for '|' and '?'. [clarifyCalculation]\n", errout_str());
 
         // ticket #195
         check("int f(int x, int y) {\n"
               "    return x >> ! y ? 8 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (style) Clarify calculation precedence for '>>' and '?'. [clarifyCalculation]\n", errout_str());
 
         check("int f() {\n"
               "   return shift < sizeof(int64_t)*8 ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a = *p ? 1 : 2; }");
+        check("void f() { a = *p ? 1 : 2; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { const char *p = x & 1 ? \"1\" : \"0\"; }");
+        check("void f(int x) { const char *p = x & 1 ? \"1\" : \"0\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { x = a % b ? \"1\" : \"0\"; }");
+        check("void foo() { x = a % b ? \"1\" : \"0\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { return x & 1 ? '1' : '0'; }");
+        check("void f(int x) { return x & 1 ? '1' : '0'; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { return x & 16 ? 1 : 0; }");
+        check("void f(int x) { return x & 16 ? 1 : 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { return x % 16 ? 1 : 0; }");
+        check("void f(int x) { return x % 16 ? 1 : 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("enum {X,Y}; void f(int x) { return x & Y ? 1 : 0; }");
+        check("enum {X,Y}; void f(int x) { return x & Y ? 1 : 0; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6611,7 +7172,7 @@ class TestOther : public TestFixture {
         check("char* f(char* c) {\n"
               "    *c++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:7]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6620,7 +7181,7 @@ class TestOther : public TestFixture {
         check("char* f(char** c) {\n"
               "    *c[5]--;\n"
               "    return *c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:10]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6628,7 +7189,7 @@ class TestOther : public TestFixture {
 
         check("void f(Foo f) {\n"
               "    *f.a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:9]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6636,7 +7197,7 @@ class TestOther : public TestFixture {
 
         check("void f(Foo f) {\n"
               "    *f.a[5].v[3]++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:17]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6644,7 +7205,7 @@ class TestOther : public TestFixture {
 
         check("void f(Foo f) {\n"
               "    *f.a(1, 5).v[x + y]++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:24]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6653,18 +7214,18 @@ class TestOther : public TestFixture {
         check("char* f(char* c) {\n"
               "    (*c)++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(char* c) {\n"
               "    bar(*c++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char*** f(char*** c) {\n"
               "    ***c++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:9]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6673,7 +7234,7 @@ class TestOther : public TestFixture {
         check("char** f(char*** c) {\n"
               "    **c[5]--;\n"
               "    return **c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n"
             "[test.cpp:2:11]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'? [clarifyStatement]\n",
@@ -6682,7 +7243,7 @@ class TestOther : public TestFixture {
         check("char*** f(char*** c) {\n"
               "    (***c)++;\n"
               "    return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const int*** p) {\n" // #10923
@@ -6692,12 +7253,12 @@ class TestOther : public TestFixture {
 
         check("void *f(char** c) {\n"
               "    bar(**c++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void *f(char* p) {\n"
               "    for (p = path; *p++;) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -6717,7 +7278,7 @@ class TestOther : public TestFixture {
               "        b = 1;\n"
               "    else\n"
               "        b = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:2:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
@@ -6728,7 +7289,7 @@ class TestOther : public TestFixture {
               "            b = 2;\n"
               "    } else\n"
               "        b = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:3:9]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f(int a, int &b) {\n"
@@ -6740,7 +7301,7 @@ class TestOther : public TestFixture {
               "        else\n"
               "            b = 2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:5:9]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("int f(int signed, unsigned char value) {\n"
@@ -6750,7 +7311,7 @@ class TestOther : public TestFixture {
               "    else\n"
               "        ret = (unsigned char)value;\n"
               "    return ret;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -6758,7 +7319,7 @@ class TestOther : public TestFixture {
               "        __asm__(\"mov ax, bx\");\n"
               "    else\n"
               "        __asm__(\"mov bx, bx\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3407
 
         check("void f() {\n"
@@ -6766,7 +7327,7 @@ class TestOther : public TestFixture {
               "        __asm__(\"mov ax, bx\");\n"
               "    else\n"
               "        __asm__(\"mov ax, bx\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:2:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
     }
 
@@ -6780,7 +7341,7 @@ class TestOther : public TestFixture {
               "    frac = front/(front-back);\n"
               "  else\n"
               "    frac = front/(front-back);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:3] -> [test.cpp:3:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f()\n"
@@ -6789,7 +7350,7 @@ class TestOther : public TestFixture {
               "  { frac = front/(front-back);}\n"
               "  else\n"
               "    frac = front/((front-back));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:3] -> [test.cpp:3:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         // No message about empty branches (#5354)
@@ -6799,7 +7360,7 @@ class TestOther : public TestFixture {
               "  {}\n"
               "  else\n"
               "  {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6811,7 +7372,7 @@ class TestOther : public TestFixture {
                "    DOSTUFF1\n"
                "  else\n"
                "    DOSTUFF2\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6823,7 +7384,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        x = j;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:5:7] -> [test.cpp:3:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n"
                       "[test.cpp:2:9]: (style) The scope of the variable 'j' can be reduced. [variableScope]\n",
                       errout_str());
@@ -6836,7 +7397,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        x = j;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6847,7 +7408,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        return new A::Z(true);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6861,7 +7422,7 @@ class TestOther : public TestFixture {
               "        unsigned int i = 0;\n"
               "        j = i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7] -> [test.cpp:3:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
 
         check("void f(bool b) {\n"
@@ -6873,7 +7434,7 @@ class TestOther : public TestFixture {
               "        unsigned int i = 0;\n"
               "        j = 1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -6883,7 +7444,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        int i = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -6895,7 +7456,16 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "        j = i;\n"
               "    }\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int i) {\n"
+              "  if (1 == i) {\n"
+              "    ;\n"
+              "  } else {\n"
+              "    ;\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6905,7 +7475,7 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "        int i = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
@@ -6913,14 +7483,14 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "    } else {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression1() {
         check("void foo(int a) {\n"
               "    if (a == a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void fun(int b) {\n"
@@ -6929,7 +7499,7 @@ class TestOther : public TestFixture {
               "            d > d &&\n"
               "            e < e &&\n"
               "            f ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n"
                       "[test.cpp:3:15]: (style) Same expression on both sides of '=='. [duplicateExpression]\n"
                       "[test.cpp:4:15]: (style) Same expression on both sides of '>'. [duplicateExpression]\n"
@@ -6937,82 +7507,82 @@ class TestOther : public TestFixture {
 
         check("void foo() {\n"
               "    return a && a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    a = b && b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    f(a,b == b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void foo(int b) {\n"
               "    f(b == b, a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (x!=2 || x!=2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((a < b) && (b > a)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '&&' because 'a<b' and 'b>a' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((a <= b) && (b >= a)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression on both sides of '&&' because 'a<=b' and 'b>=a' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo() {\n"
               "    if (x!=2 || y!=3 || x!=2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Same expression 'x!=2' found multiple times in chain of '||' operators. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (x!=2 && (x=y) && x!=2) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b || a && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a && b || b && c) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b | b && c) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '|'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if ((a + b) | (a + b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '|'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if ((a | b) & (a | b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '&'. [duplicateExpression]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((a | b) == (a | b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a1[a2[c & 0xff] & 0xff]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void d(const char f, int o, int v)\n"
@@ -7020,131 +7590,127 @@ class TestOther : public TestFixture {
               "     if (((f=='R') && (o == 1) && ((v < 2) || (v > 99))) ||\n"
               "         ((f=='R') && (o == 2) && ((v < 2) || (v > 99))) ||\n"
               "         ((f=='T') && (o == 2) && ((v < 200) || (v > 9999)))) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f(int x) { return x+x; }");
+        check("int f(int x) { return x+x; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { while (x+=x) ; }");
+        check("void f(int x) { while (x+=x) ; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b && b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a || b || b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a / 1000 / 1000) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(int i) {\n"
               "    return i/i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Same expression on both sides of '/'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (a << 1 << 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int f() { return !!y; }"); // No FP
+        check("int f() { return !!y; }\n"); // No FP
         ASSERT_EQUALS("", errout_str());
 
         // make sure there are not "same expression" fp when there are different casts
-        check("void f(long x) { if ((int32_t)x == (int64_t)x) {} }",
-              true,  // filename
-              false, // inconclusive
-              false, // runSimpleChecks
-              false, // verbose
-              nullptr   // settings
+        check("void f(long x) { if ((int32_t)x == (int64_t)x) {} }\n",
+              dinit(CheckOptions, $.inconclusive = false)
               );
         ASSERT_EQUALS("", errout_str());
 
         // make sure there are not "same expression" fp when there are different ({}) expressions
-        check("void f(long x) { if (({ 1+2; }) == ({3+4;})) {} }");
+        check("void f(long x) { if (({ 1+2; }) == ({3+4;})) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5535: Reference named like its type
-        check("void foo() { UMSConfig& UMSConfig = GetUMSConfiguration(); }");
+        check("void foo() { UMSConfig& UMSConfig = GetUMSConfiguration(); }\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (style) Variable 'UMSConfig' can be declared as reference to const [constVariableReference]\n", errout_str());
 
         // #3868 - false positive (same expression on both sides of |)
         check("void f(int x) {\n"
               "    a = x ? A | B | C\n"
               "          : A | B;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const Bar &bar) {\n"
               "    bool a = bar.isSet() && bar->isSet();\n"
               "    bool b = bar.isSet() && bar.isSet();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
 
         check("void foo(int a, int b) {\n"
               "    if ((b + a) | (a + b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Same expression on both sides of '|' because 'b+a' and 'a+b' represent the same value. [duplicateExpression]\n", errout_str());
 
         check("void foo(const std::string& a, const std::string& b) {\n"
               "  return a.find(b+\"&\") || a.find(\"&\"+b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((b > a) | (a > b)) {}\n" // > is not commutative
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(double a, double b) {\n"
               "    if ((b + a) > (a + b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) The comparison 'b+a > a+b' is always false because 'b+a' and 'a+b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) && (x == 0x00000001))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression on both sides of '&&' because 'x==1' and 'x==0x00000001' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
-              "    if (Four == 4) {}"
-              "}", true, true, false);
+              "    if (Four == 4) {}\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) The comparison 'Four == 4' is always true. [knownConditionTrueFalse]\n",
                       errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    static_assert(Four == 4, \"\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    _Static_assert(Four == 4, \"\");\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    static_assert(4 == Four, \"\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { FourInEnumOne = 4 };\n"
               "    enum { FourInEnumTwo = 4 };\n"
               "    if (FourInEnumOne == FourInEnumTwo) {}\n"
-              "}", true, true, false);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (style) The comparison 'FourInEnumOne == FourInEnumTwo' is always true because 'FourInEnumOne' and 'FourInEnumTwo' represent the same value. [knownConditionTrueFalse]\n",
                       errout_str());
 
@@ -7152,13 +7718,13 @@ class TestOther : public TestFixture {
               "    enum { FourInEnumOne = 4 };\n"
               "    enum { FourInEnumTwo = 4 };\n"
               "    static_assert(FourInEnumOne == FourInEnumTwo, \"\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if (sizeof(a) == sizeof(a)) { }\n"
               "    if (sizeof(a) == sizeof(b)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("float bar(int) __attribute__((pure));\n"
@@ -7167,7 +7733,7 @@ class TestOther : public TestFixture {
               "    if (bar(a) == bar(a)) { }\n"
               "    if (unknown(a) == unknown(a)) { }\n"
               "    if (foo(a) == foo(a)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:16]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
     }
 
@@ -7177,25 +7743,25 @@ class TestOther : public TestFixture {
               "    if (!(dbl == dbl)) have_nan = 1;\n"
               "    if (flt != flt) have_nan = 1;\n"
               "    return have_nan;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("float f(float x) { return x-x; }"); // ticket #4485 (Inf)
+        check("float f(float x) { return x-x; }\n"); // ticket #4485 (Inf)
         ASSERT_EQUALS("", errout_str());
 
-        check("float f(float x) { return (X double)x == (X double)x; }", true, false, false);
+        check("float f(float x) { return (X double)x == (X double)x; }\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { float f; };\n"
-              "float f(struct X x) { return x.f == x.f; }");
+              "float f(struct X x) { return x.f == x.f; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { int i; };\n"
-              "int f(struct X x) { return x.i == x.i; }");
+              "int f(struct X x) { return x.i == x.i; }\n");
         ASSERT_EQUALS("[test.cpp:2:32]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         // #5284 - when type is unknown, assume it's float
-        check("int f() { return x==x; }");
+        check("int f() { return x==x; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7208,11 +7774,11 @@ class TestOther : public TestFixture {
                                    "    <arg nr=\"2\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).build();
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::style).build();
 
         check("void foo() {\n"
               "    if (x() || x()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
@@ -7221,7 +7787,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void A::foo() const {\n"
               "    if (bar() && bar()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("struct A {\n"
@@ -7231,7 +7797,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void A::foo() {\n"
               "    if (bar() && bar()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class B {\n"
@@ -7245,74 +7811,74 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    if (b.bar(1) && b.bar(1)) {}\n"
               "    if (a.bar(1) && a.bar(1)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:18]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("class D { void strcmp(); };\n"
               "void foo() {\n"
               "    D d;\n"
               "    if (d.strcmp() && d.strcmp()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if ((mystrcmp(a, b) == 0) || (mystrcmp(a, b) == 0)) {}\n"
-              "}", true, false, true, false, &settings);
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:31]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void GetValue() { return rand(); }\n"
               "void foo() {\n"
               "    if ((GetValue() == 0) || (GetValue() == 0)) { dostuff(); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void __attribute__((const)) GetValue() { return X; }\n"
               "void foo() {\n"
               "    if ((GetValue() == 0) || (GetValue() == 0)) { dostuff(); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:27]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void GetValue() __attribute__((const));\n"
               "void GetValue() { return X; }\n"
               "void foo() {\n"
               "    if ((GetValue() == 0) || (GetValue() == 0)) { dostuff(); }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (str == \"(\" || str == \"(\") {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    if (bar(a) && !strcmp(a, b) && bar(a) && !strcmp(a, b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5334
         check("void f(C *src) {\n"
               "    if (x<A*>(src) || x<B*>(src))\n"
               "        a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(A *src) {\n"
               "    if (dynamic_cast<B*>(src) || dynamic_cast<B*>(src)) {}\n"
-              "}\n", true, false, false); // don't run simplifications
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:2:31]: (style) Same expression on both sides of '||'. [duplicateExpression]\n", errout_str());
 
         // #5819
         check("Vector func(Vector vec1) {\n"
               "    return fabs(vec1 & vec1 & vec1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("Vector func(int vec1) {\n"
               "    return fabs(vec1 & vec1 & vec1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:22]: (style) Same expression on both sides of '&'. [duplicateExpression]\n"
-            "[test.cpp:2:29]: (style) Same expression on both sides of '&'. [duplicateExpression]\n",   // duplicate
+            "[test.cpp:2:29]: (style) Same expression on both sides of '&'. [duplicateExpression]\n",
             errout_str());
 
     }
@@ -7320,25 +7886,25 @@ class TestOther : public TestFixture {
     void duplicateExpression4() {
         check("void foo() {\n"
               "    if (*a++ != b || *a++ != b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (*a-- != b || *a-- != b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assignment
         check("void f() {\n"
               "  while (*(a+=2)==*(b+=2) && *(a+=2)==*(b+=2)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression5() {  // #3749 - macros with same values
         check("void f() {\n"
               "    if ($a == $a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define X 1\n"
@@ -7360,7 +7926,7 @@ class TestOther : public TestFixture {
     void duplicateExpression6() {  // #4639
         check("float IsNan(float value) { return !(value == value); }\n"
               "double IsNan(double value) { return !(value == value); }\n"
-              "long double IsNan(long double value) { return !(value == value); }");
+              "long double IsNan(long double value) { return !(value == value); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7368,36 +7934,36 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    const int i = sizeof(int);\n"
               "    if ( i != sizeof (int)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25] -> [test.cpp:3:12]: (style) The comparison 'i != sizeof(int)' is always false because 'i' and 'sizeof(int)' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    const int i = sizeof(int);\n"
               "    if ( sizeof (int) != i){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25] -> [test.cpp:3:23]: (style) The comparison 'sizeof(int) != i' is always false because 'sizeof(int)' and 'i' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
-        check("void f(int a = 1) { if ( a != 1){}}");
+        check("void f(int a = 1) { if ( a != 1){}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    int b = 1;\n"
               "    if ( a != b){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:13] -> [test.cpp:4:12]: (style) The comparison 'a != b' is always false because 'a' and 'b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    int b = a;\n"
               "    if ( a != b){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:4:12]: (style) The comparison 'a != b' is always false because 'a' and 'b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void use(int);\n"
@@ -7406,7 +7972,7 @@ class TestOther : public TestFixture {
               "    int b = 1;\n"
               "    use(b);\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:6:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void use(int);\n"
@@ -7415,7 +7981,7 @@ class TestOther : public TestFixture {
               "    use(a);\n"
               "    a = 2;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void use(int);\n"
@@ -7424,38 +7990,38 @@ class TestOther : public TestFixture {
               "    use(a);\n"
               "    a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const int a = 1;\n"
               "void f() {\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("int a = 1;\n"
               "    void f() {\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static const int a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
               "    static int a = 1;\n"
               "    if ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    if ( a != 1){\n"
               "        a++;\n"
-              "    }}");
+              "    }}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:12]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int b) {\n"
@@ -7464,13 +8030,13 @@ class TestOther : public TestFixture {
               "        if ( a != 1){}\n"
               "        a++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool a, bool b) {\n"
               "    const bool c = a;\n"
               "    return a && b && c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:19]: (style) Same expression 'a' found multiple times in chain of '&&' operators because 'a' and 'c' represent the same value. [knownConditionTrueFalse]\n",
                       errout_str());
 
@@ -7478,13 +8044,13 @@ class TestOther : public TestFixture {
         check("void f(const bool b) {\n"
               "   const bool b1 = !b;\n"
               "   if(!b && b1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:10]: (style) Same expression on both sides of '&&' because '!b' and 'b1' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         // 7284
         check("void f(void) {\n"
               "   if (a || !!a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Same expression on both sides of '||' because 'a' and '!!a' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         // 8205
@@ -7495,7 +8061,7 @@ class TestOther : public TestFixture {
               "       if (Diag==0) {}\n"
               "       break;\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:5:16]: (style) The comparison 'Diag == 0' is always true. [knownConditionTrueFalse]\n", errout_str());
 
         // #9744
@@ -7523,13 +8089,13 @@ class TestOther : public TestFixture {
               "    int b = a;\n"
               "    a = 2;\n"
               "    if ( b != a){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int * a, int i) { int b = a[i]; a[i] = 2; if ( b != a[i]){}}");
+        check("void f(int * a, int i) { int b = a[i]; a[i] = 2; if ( b != a[i]){}}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int * a, int i) { int b = *a; *a = 2; if ( b != *a){}}");
+        check("void f(int * a, int i) { int b = *a; *a = 2; if ( b != *a){}}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A { int f() const; };\n"
@@ -7540,7 +8106,7 @@ class TestOther : public TestFixture {
               "        x = g();\n"
               "        if (x.f() == a) break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int i);\n"
@@ -7553,14 +8119,14 @@ class TestOther : public TestFixture {
               "    const bool x = a.f(A::B);\n"
               "    const bool y = a.f(A::C);\n"
               "    if(!x && !y) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    const bool x = a.f(A::B);\n"
               "    const bool y = a.f(A::C);\n"
               "    if (!x && !y) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool * const b);\n"
@@ -7569,17 +8135,17 @@ class TestOther : public TestFixture {
               "    bool y = true;\n"
               "    f(&x);\n"
               "    if (!x && !y) return;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const int a = {};\n"
               "    if(a == 1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("volatile const int var = 42;\n"
-              "void f() { if(var == 42) {} }");
+              "void f() { if(var == 42) {} }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -7588,7 +8154,7 @@ class TestOther : public TestFixture {
               "    c.a = &a;\n"
               "    g(&c);\n"
               "    if (a == 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7598,7 +8164,7 @@ class TestOther : public TestFixture {
               "  uint16_t x = 1000;\n"
               "  uint8_t y = x;\n"
               "  if (x != y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7609,7 +8175,7 @@ class TestOther : public TestFixture {
               "   const int b = a-1;\n"
               "   const int c = a+1;\n"
               "   return c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7618,7 +8184,7 @@ class TestOther : public TestFixture {
               "public:\n"
               "    double getScale() const { return m_range * m_zoom; }\n"
               "    void setZoom(double z) { m_zoom = z; }\n"
-              "    void dostuff(int);\n"
+              "    void dostuff(int x);\n"
               "private:\n"
               "    double m_zoom;\n"
               "    double m_range;\n"
@@ -7630,7 +8196,7 @@ class TestOther : public TestFixture {
               "        setZoom(m_zoom + 1);\n"
               "        double scale_ratio = getScale() / old_scale;\n" // <- FP
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7639,14 +8205,14 @@ class TestOther : public TestFixture {
               "{\n"
               "        int var = buffer[index - 1];\n"
               "        return buffer[index - 1] - var;\n"  // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:25] -> [test.cpp:4:34]: (style) Same expression on both sides of '-' because 'buffer[index-1]' and 'var' represent the same value. [duplicateExpression]\n", errout_str());
     }
 
     void duplicateExpression13() { //#7899
         check("void f() {\n"
               "    if (sizeof(long) == sizeof(long long)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7769,27 +8335,99 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void duplicateExpression19() {
+        checkP("const int i = 0;\n"
+               "void f() {\n"
+               "    assert(i == 0);\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void duplicateExpression20() {
+        check("enum { N = 1 };\n" // #14202
+              "int f() { return N - 1; }\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void duplicateExpression21() {
+        check("struct S { int i; };\n" // #12795
+              "struct T {\n"
+              "    std::map<std::string, S*> m;\n"
+              "    S* get(const std::string& s) { return m[s]; }\n"
+              "    void modify() { for (const auto& e : m) e.second->i = 0; }\n"
+              "};\n"
+              "void f(T& t) {\n"
+              "    const S* p = t.get(\"abc\");\n"
+              "    const int o = p->i;\n"
+              "    t.modify();\n"
+              "    if (p->i == o) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i; };\n"
+              "    struct T {\n"
+              "    std::vector<S*> m;\n"
+              "    void modify() { for (auto e : m) e->i = 0; }\n"
+              "};\n"
+              "void f(T& t) {\n"
+              "    const S* p = t.m[0];\n"
+              "    const int o = p->i;\n"
+              "    t.modify();\n"
+              "    if (p->i == o) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void duplicateExpression22() {
+        check("int f() {\n" // #14913
+              "    return 0x1 | (0x2 | 0x4) | 0x1;\n"
+              "}\n"
+              "int g() {\n"
+              "    return 0x1 | (0x2 | 0x1);\n"
+              "}\n"
+              "int h() {\n"
+              "    return 0x1 | (0x1 | 0x2);\n"
+              "}\n"
+              "int i() {\n"
+              "    return 0x2 | (0x4 | 0x1) | 0x1;\n"
+              "}\n"
+              "int j() {\n"
+              "    return 0x2 | (0x1 | 0x4) | 0x1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:30]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:5:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:8:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:11:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n"
+                      "[test.cpp:14:23]: (style) Same expression '0x1' found multiple times in chain of '|' operators. [duplicateExpression]\n",
+                      errout_str());
+
+        check("bool f(const int** a, const int** b) {\n"
+              "    return (a[0] != nullptr) != (b[0] != nullptr);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void duplicateExpressionLoop() {
         check("void f() {\n"
               "    int a = 1;\n"
               "    while ( a != 1){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:15]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
-        check("void f() { int a = 1; while ( a != 1){ a++; }}");
+        check("void f() { int a = 1; while ( a != 1){ a++; }}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { int a = 1; for ( int i=0; i < 3 && a != 1; i++){ a++; }}");
+        check("void f() { int a = 1; for ( int i=0; i < 3 && a != 1; i++){ a++; }}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int b) { int a = 1; while (b) { if ( a != 1){} b++; } a++; }");
+        check("void f(int b) { int a = 1; while (b) { if ( a != 1){} b++; } a++; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    for(int i = 0; i < 10;) {\n"
               "        if( i != 0 ) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:3:15]: (style) The comparison 'i != 0' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f() {\n"
@@ -7797,7 +8435,7 @@ class TestOther : public TestFixture {
               "        if( i != 0 ) {}\n"
               "        i++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -7805,14 +8443,14 @@ class TestOther : public TestFixture {
               "        if( i != 0 ) { i++; }\n"
               "        i++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    for(int i = 0; i < 10;) {\n"
               "        if( i != 0 ) { i++; }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -7821,7 +8459,7 @@ class TestOther : public TestFixture {
               "        if( i != 0 ) {}\n"
               "        i++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int b) {\n"
@@ -7830,7 +8468,7 @@ class TestOther : public TestFixture {
               "        if ( a != 1){}\n"
               "        b++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17] -> [test.cpp:4:16]: (style) The comparison 'a != 1' is always false. [knownConditionTrueFalse]\n", errout_str());
 
         check("struct T {\n" // #11083
@@ -7859,52 +8497,61 @@ class TestOther : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const std::vector<int>& v) {\n" // #14193
+              "    for (const int& r1 : v) {\n"
+              "        for (const int& r2 : v) {\n"
+              "            if (&r1 == &r2) {}\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpressionTernary() { // #6391
         check("void f() {\n"
               "    return A ? x : x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
         check("int f(bool b, int a) {\n"
               "    const int c = a;\n"
               "    return b ? a : c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19] -> [test.cpp:3:18]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
         check("void f() {\n"
               "    return A ? x : z;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned char c) {\n"
               "  x = y ? (signed char)c : (unsigned char)c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string stringMerge(std::string const& x, std::string const& y) {\n" // #7938
               "    return ((x > y) ? (y + x) : (x + y));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6426
         {
             const char code[] = "void foo(bool flag) {\n"
                                 "  bar( (flag) ? ~0u : ~0ul);\n"
-                                "}";
-            /*const*/ Settings settings = _settings;
+                                "}\n";
+            /*const*/ Settings settings = settings1;
             settings.platform.sizeof_int = 4;
             settings.platform.int_bit = 32;
 
             settings.platform.sizeof_long = 4;
             settings.platform.long_bit = 32;
-            check(code, &settings);
+            check(code, dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:2:21]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
             settings.platform.sizeof_long = 8;
             settings.platform.long_bit = 64;
-            check(code, &settings);
+            check(code, dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
         }
     }
@@ -7912,32 +8559,32 @@ class TestOther : public TestFixture {
     void duplicateValueTernary() {
         check("void f() {\n"
               "    if( a ? (b ? false:false): false ) ;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2:23]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f1(int a) {return (a == 1) ? (int)1 : 1; }");
+        check("int f1(int a) {return (a == 1) ? (int)1 : 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:41]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f2(int a) {return (a == 1) ? (int)1 : (int)1; }");
-        ASSERT_EQUALS("[test.cpp:1:41]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
+        check("int f2(int a) {return (a == 1) ? (int)1 : (int)1; }\n");
+        ASSERT_EQUALS("[test.cpp:1:41]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f3(int a) {return (a == 1) ? 1 : (int)1; }");
+        check("int f3(int a) {return (a == 1) ? 1 : (int)1; }\n");
         ASSERT_EQUALS("[test.cpp:1:36]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f4(int a) {return (a == 1) ? 1 : 1; }");
-        ASSERT_EQUALS("[test.cpp:1:36]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
+        check("int f4(int a) {return (a == 1) ? 1 : 1; }\n");
+        ASSERT_EQUALS("[test.cpp:1:36]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f5(int a) {return (a == (int)1) ? (int)1 : 1; }");
+        check("int f5(int a) {return (a == (int)1) ? (int)1 : 1; }\n");
         ASSERT_EQUALS("[test.cpp:1:46]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f6(int a) {return (a == (int)1) ? (int)1 : (int)1; }");
-        ASSERT_EQUALS("[test.cpp:1:46]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
+        check("int f6(int a) {return (a == (int)1) ? (int)1 : (int)1; }\n");
+        ASSERT_EQUALS("[test.cpp:1:46]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
-        check("int f7(int a) {return (a == (int)1) ? 1 : (int)1; }");
+        check("int f7(int a) {return (a == (int)1) ? 1 : (int)1; }\n");
         ASSERT_EQUALS("[test.cpp:1:41]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
 
-        check("int f8(int a) {return (a == (int)1) ? 1 : 1; }");
-        ASSERT_EQUALS("[test.cpp:1:41]: (style) Same value in both branches of ternary operator. [duplicateValueTernary]\n", errout_str());
+        check("int f8(int a) {return (a == (int)1) ? 1 : 1; }\n");
+        ASSERT_EQUALS("[test.cpp:1:41]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
 
         check("struct Foo {\n"
               "  std::vector<int> bar{1,2,3};\n"
@@ -7975,6 +8622,26 @@ class TestOther : public TestFixture {
               "    return (x >= 0.0) ? 0.0 : -0.0;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct A {};\n" // # 14300
+              "struct B {};\n"
+              "void f(bool x) {\n"
+              "    A* a = new A();\n"
+              "    B* b = new B();\n"
+              "    auto p = x ? static_cast<void*>(a) : static_cast<void*>(b);\n"
+              "    (void)p;\n"
+              "    delete a;\n"
+              "    delete b;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void duplicateValueTernarySizeof() { // #13773
+        check("int f() { return x ? sizeof(uint32_t) : sizeof(unsigned int); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f() { return x ? sizeof(uint32_t) : sizeof(uint32_t); }\n");
+        ASSERT_EQUALS("[test.cpp:1:39]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
     }
 
     void duplicateExpressionTemplate() {
@@ -7982,7 +8649,7 @@ class TestOther : public TestFixture {
               "    if (I >= 0 && I < 3) {}\n"
               "}\n"
               "\n"
-              "static auto a = f<0>();");
+              "static auto a = f<0>();\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<typename T>\n" // #7754
@@ -8068,35 +8735,35 @@ class TestOther : public TestFixture {
     }
 
     void oppositeExpression() {
-        check("void f(bool a) { if(a && !a) {} }");
+        check("void f(bool a) { if(a && !a) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (style) Opposite expression on both sides of '&&'. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if(a != !a) {} }");
+        check("void f(bool a) { if(a != !a) {} }\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( a == !(a) ) {}}");
+        check("void f(bool a) { if( a == !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( a != !(a) ) {}}");
+        check("void f(bool a) { if( a != !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:24]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(a) == a ) {}}");
+        check("void f(bool a) { if( !(a) == a ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:27]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(a) != a ) {}}");
+        check("void f(bool a) { if( !(a) != a ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:27]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(!a) == !(a) ) {}}");
+        check("void f(bool a) { if( !(!a) == !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:28]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { if( !(!a) != !(a) ) {}}");
+        check("void f(bool a) { if( !(!a) != !(a) ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:28]: (style) Opposite expression on both sides of '!='. [oppositeExpression]\n", errout_str());
 
         check("void f1(bool a) {\n"
               "    const bool b = a;\n"
               "    if( a == !(b) ) {}\n"
               "    if( b == !(a) ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n"
                       "[test.cpp:2:20] -> [test.cpp:4:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
@@ -8104,26 +8771,26 @@ class TestOther : public TestFixture {
               "    const bool b = *a;\n"
               "    if( *a == !(b) ) {}\n"
               "    if( b == !(*a) ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:12]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n"
                       "[test.cpp:2:20] -> [test.cpp:4:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
-        check("void f(bool a) { a = !a; }");
+        check("void f(bool a) { a = !a; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int a) { if( a < -a ) {}}");
+        check("void f(int a) { if( a < -a ) {}}\n");
         ASSERT_EQUALS("[test.cpp:1:23]: (style) Opposite expression on both sides of '<'. [oppositeExpression]\n", errout_str());
 
-        check("void f(int a) { a -= -a; }");
+        check("void f(int a) { a -= -a; }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int a) { a = a / (-a); }");
+        check("void f(int a) { a = a / (-a); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("bool f(int i){ return !((i - 1) & i); }");
+        check("bool f(int i){ return !((i - 1) & i); }\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("bool f(unsigned i){ return (x > 0) && (x & (x-1)) == 0; }");
+        check("bool f(unsigned i){ return (x > 0) && (x & (x-1)) == 0; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void A::f(bool a, bool c)\n"
@@ -8131,27 +8798,27 @@ class TestOther : public TestFixture {
               "    const bool b = a;\n"
               "    if(c) { a = false; }\n"
               "    if(b && !a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(bool c) {\n"
               "    const bool b = a;\n"
               "    if(c) { a = false; }\n"
               "    if(b && !a) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    bool x = a;\n"
               "    dostuff();\n"
               "    if (x && a) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  const bool b = g();\n"
               "  if (!b && g()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const bool *a) {\n"
@@ -8194,7 +8861,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f();\n"
               "    int j = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; int g() const; };\n"
@@ -8202,7 +8869,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; int g() const; };\n"
@@ -8211,7 +8878,7 @@ class TestOther : public TestFixture {
               "    Foo f2 = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9] -> [test.cpp:5:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8219,7 +8886,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = 1 + f();\n"
               "    int j = 1 + f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8227,7 +8894,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f() + 1;\n"
               "    int j = 1 + f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8236,7 +8903,7 @@ class TestOther : public TestFixture {
               "    int x = f();\n"
               "    int i = x + 1;\n"
               "    int j = f() + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() __attribute__((pure));\n"
@@ -8244,7 +8911,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f() + f();\n"
               "    int j = f() + f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f(int) __attribute__((pure));\n"
@@ -8252,7 +8919,7 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f(0);\n"
               "    int j = f(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("int f(int) __attribute__((pure));\n"
@@ -8261,39 +8928,39 @@ class TestOther : public TestFixture {
               "    const int x = 0;\n"
               "    int i = f(0);\n"
               "    int j = f(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(const int * p, const int * q) {\n"
               "    int i = *p;\n"
               "    int j = *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct A { int x; int y; };"
               "void test(A a) {\n"
               "    int i = a.x;\n"
               "    int j = a.x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:9]: (style) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("void test() {\n"
               "    int i = 0;\n"
               "    int j = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    int i = -1;\n"
               "    int j = -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int);\n"
               "void test() {\n"
               "    int i = f(0);\n"
               "    int j = f(1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f();\n"
@@ -8301,21 +8968,21 @@ class TestOther : public TestFixture {
               "void test() {\n"
               "    int i = f() || f();\n"
               "    int j = f() && f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "void test() {\n"
               "    Foo i = Foo();\n"
               "    Foo j = Foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "void test() {\n"
               "    Foo i = Foo{};\n"
               "    Foo j = Foo{};\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { int f() const; float g() const; };\n"
@@ -8323,7 +8990,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f(); int g(); };\n"
@@ -8331,43 +8998,43 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    int i = f();\n"
               "    int j = f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = ++x;\n"
               "    int j = ++x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x++;\n"
               "    int j = x++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = --x;\n"
               "    int j = --x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x--;\n"
               "    int j = x--;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x + 1;\n"
               "    int j = 1 + x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -8376,7 +9043,7 @@ class TestOther : public TestFixture {
               "void foo(SW* x) {\n"
               "    int start = x->first;\n"
               "    int end   = x->first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'start' and 'end'. [duplicateAssignExpression]\n"
                       "[test.cpp:2:14]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -8385,7 +9052,7 @@ class TestOther : public TestFixture {
               "void foo(SW* x, int i, int j) {\n"
               "    int start = x->first;\n"
               "    int end   = x->first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'start' and 'end'. [duplicateAssignExpression]\n"
                       "[test.cpp:2:14]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -8395,13 +9062,13 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("void test(const int * p) {\n"
               "    int i = *p;\n"
               "    int j = *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:2:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; int g(int) const; };\n"
@@ -8409,7 +9076,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct Foo { int f() const; };\n"
@@ -8417,7 +9084,7 @@ class TestOther : public TestFixture {
               "    Foo f = Foo{};\n"
               "    int i = f.f();\n"
               "    int j = f.f();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:4:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
     }
 
@@ -8429,7 +9096,7 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(i);\n"
               "    i = j;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct A { int x; int y; };"
@@ -8439,7 +9106,7 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(j);\n"
               "    j = i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n", errout_str());
 
         check("struct A { int x; int y; };"
@@ -8449,10 +9116,9 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(j);\n"
               "    if (i == j) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n"
-            "[test.cpp:3:14] -> [test.cpp:4:14] -> [test.cpp:6:11]: (style) The comparison 'i == j' is always true because 'i' and 'j' represent the same value. [knownConditionTrueFalse]\n",
+            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n",
             errout_str());
 
         check("struct A { int x; int y; };"
@@ -8462,10 +9128,9 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(j);\n"
               "    if (i == a.x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n"
-            "[test.cpp:3:14] -> [test.cpp:6:11]: (style) The comparison 'i == a.x' is always true because 'i' and 'a.x' represent the same value. [knownConditionTrueFalse]\n",
+            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n",
             errout_str());
 
         check("struct A { int x; int y; };"
@@ -8475,10 +9140,9 @@ class TestOther : public TestFixture {
               "    int j = a.x;\n"
               "    use(i);\n"
               "    if (j == a.x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n"
-            "[test.cpp:4:14] -> [test.cpp:6:11]: (style) The comparison 'j == a.x' is always true because 'j' and 'a.x' represent the same value. [knownConditionTrueFalse]\n",
+            "[test.cpp:4:9] -> [test.cpp:3:9]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'. [duplicateAssignExpression]\n",
             errout_str());
 
         // Issue #8612
@@ -8507,7 +9171,7 @@ class TestOther : public TestFixture {
               "        }\n"
               "        previous = current;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:16:7] -> [test.cpp:15:7]: (style, inconclusive) Same expression used in consecutive assignments of 'current' and 'previous'. [duplicateAssignExpression]\n", errout_str());
     }
 
@@ -8523,21 +9187,21 @@ class TestOther : public TestFixture {
               "        int b = x.f();\n"
               "        (void)a;\n"
               "        (void)b;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:13] -> [test.cpp:7:13]: (style, inconclusive) Same expression used in consecutive assignments of 'a' and 'b'. [duplicateAssignExpression]\n", errout_str());
 
         // Issue #8712
         check("void f() {\n"
               "  unsigned char d;\n"
               "  d = d % 5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <typename T>\n"
               "T f() {\n"
               "  T x = T();\n"
               "}\n"
-              "int &a = f<int&>();");
+              "int &a = f<int&>();\n");
         ASSERT_EQUALS("", errout_str());
 
         // Issue #8713
@@ -8549,7 +9213,7 @@ class TestOther : public TestFixture {
               "  uint32_t a = 42;\n"
               "  uint32_t b = uint32_t(A ::B / 1024);\n"
               "  int32_t c = int32_t(a / b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Issue #8709
@@ -8558,7 +9222,7 @@ class TestOther : public TestFixture {
               "  switch (d) { case b:; }\n"
               "  double e(b);\n"
               "  if(e <= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10718
@@ -8579,7 +9243,7 @@ class TestOther : public TestFixture {
               "  int val = 0;\n"
               "  if (val < 0) continue;\n"
               "  if ((val > 0)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n"
                       "[test.cpp:2:13] -> [test.cpp:4:12]: (style) The comparison 'val > 0' is always false. [knownConditionTrueFalse]\n", errout_str());
 
@@ -8610,7 +9274,7 @@ class TestOther : public TestFixture {
               "  if (val < 0) {\n"
               "    if ((val > 0)) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n"
                       "[test.cpp:2:13] -> [test.cpp:4:14]: (style) The comparison 'val > 0' is always false. [knownConditionTrueFalse]\n", errout_str());
 
@@ -8619,7 +9283,7 @@ class TestOther : public TestFixture {
               "  if (val < 0) {\n"
               "    if ((val < 0)) {}\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n"
                       "[test.cpp:2:13] -> [test.cpp:4:14]: (style) The comparison 'val < 0' is always false. [knownConditionTrueFalse]\n", errout_str());
 
@@ -8628,49 +9292,49 @@ class TestOther : public TestFixture {
               "  int foo = 0;\n"
               "  if (activate) {}\n"
               "  else if (foo) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void checkSignOfUnsignedVariable() {
         check("void foo() {\n"
               "  for(unsigned char i = 10; i >= 0; i--) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:31]: (style) Unsigned expression 'i' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(bool b) {\n"
               "  for(unsigned int i = 10; b || i >= 0; i--) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:35]: (style) Unsigned expression 'i' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         {
             const char code[] = "void foo(unsigned int x) {\n"
                                 "  if (x < 0) {}\n"
-                                "}";
-            check(code, true, false, true, false);
+                                "}\n";
+            check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
-            check(code, true, false, true, true);
+            check(code, dinit(CheckOptions, $.inconclusive = false, $.verbose = true));
             ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
         }
 
         check("void foo(unsigned int x) {\n"
               "  if (x < 0u) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
             const char code[] = "void foo(unsigned x) {\n"
                                 "  int y = 0;\n"
                                 "  if (x < y) {}\n"
-                                "}";
-            check(code, true, false, true, false);
+                                "}\n";
+            check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:3:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
-            check(code, true, false, true, true);
+            check(code, dinit(CheckOptions, $.inconclusive = false, $.verbose = true));
             ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
         }
         check("void foo(unsigned x) {\n"
@@ -8678,149 +9342,149 @@ class TestOther : public TestFixture {
               "  if (b)\n"
               "    y = 1;\n"
               "  if (x < y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0UL > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(unsigned int x, unsigned y) {\n"
               "  if (x - y >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Unsigned expression 'x-y' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (x >= 0ull) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0 <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0ll <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x) {\n"
               "  if (0 <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x < 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x < 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (0 > x && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (0 > x && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x >= 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x >= 0 && y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (y && x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && 0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (y && 0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (y && x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x < 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x < 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (0 > x || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (0 > x || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x >= 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it. [unsignedPositive]\n", errout_str());
 
         check("void foo(int x, bool y) {\n"
               "  if (x >= 0 || y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3233 - FP when template is used (template parameter is numeric constant)
@@ -8828,17 +9492,17 @@ class TestOther : public TestFixture {
             const char code[] = "template<int n> void foo(unsigned int x) {\n"
                                 "  if (x <= n);\n"
                                 "}\n"
-                                "foo<0>();";
-            check(code, true, false);
+                                "foo<0>();\n";
+            check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("", errout_str());
-            check(code, true, true);
+            check(code);
             ASSERT_EQUALS("", errout_str());
         }
 
         {
             check("template<int n> void foo(unsigned int x) {\n"
                   "if (x <= 0);\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("[test.cpp:2:7]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
         }
 
@@ -8849,16 +9513,16 @@ class TestOther : public TestFixture {
               "  {\n"
               "    value = 0u;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Checking if unsigned expression 'value' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         // #9040
-        /*const*/ Settings settings1 = settingsBuilder().platform(Platform::Type::Win64).build();
+        /*const*/ Settings settingsWin64 = settingsBuilder().platform(Platform::Type::Win64).build();
         check("using BOOL = unsigned;\n"
               "int i;\n"
               "bool f() {\n"
               "    return i >= 0;\n"
-              "}\n", &settings1);
+              "}\n", dinit(CheckOptions, $.settings = &settingsWin64));
         ASSERT_EQUALS("", errout_str());
 
         // #10612
@@ -8866,7 +9530,7 @@ class TestOther : public TestFixture {
               "   const uint32_t x = 0;\n"
               "   constexpr const auto y = 0xFFFFU;\n"
               "   if (y < x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Checking if unsigned expression 'y' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         // #12387
@@ -8878,83 +9542,101 @@ class TestOther : public TestFixture {
               "}\n"
               "void g() {\n"
               "    f<uint32_t>(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #13734
         check("void f() {\n"
               "    uint8_t a[N + 1];\n"
               "    for (unsigned p = 0; p < (sizeof(a) / sizeof((a)[0])); ++p) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const unsigned char u) {\n"
+              "    if (u >  0) {}\n"
+              "    if (u <  0) {}\n"
+              "    if (u >= 0) {}\n"
+              "    if (u <= 0) {}\n"
+              "    if (0 <  u) {}\n"
+              "    if (0 >  u) {}\n"
+              "    if (0 <= u) {}\n"
+              "    if (0 >= u) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n"
+                      "[test.cpp:4:11]: (style) Unsigned expression 'u' can't be negative so it is unnecessary to test it. [unsignedPositive]\n"
+                      "[test.cpp:5:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n"
+                      "[test.cpp:7:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n"
+                      "[test.cpp:8:11]: (style) Unsigned expression 'u' can't be negative so it is unnecessary to test it. [unsignedPositive]\n"
+                      "[test.cpp:9:11]: (style) Checking if unsigned expression 'u' is less than zero. [unsignedLessThanZero]\n",
+                      errout_str());
     }
 
     void checkSignOfPointer() {
         check("void foo(const int* x) {\n"
               "  if (x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n", errout_str());
 
         {
             const char code[] = "void foo(const int* x) {\n"
                                 "  int y = 0;\n"
                                 "  if (x >= y) {}\n"
-                                "}";
-            check(code, true, false, true, false);
+                                "}\n";
+            check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:3:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n", errout_str());
-            check(code, true, false, true, true);
+            check(code, dinit(CheckOptions, $.inconclusive = false, $.verbose = true));
             ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n", errout_str());
         }
         check("void foo(const int* x) {\n"
               "  if (*x >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x) {\n"
               "  if (x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n", errout_str());
 
         {
             const char code[] = "void foo(const int* x) {\n"
                                 "  unsigned y = 0u;\n"
                                 "  if (x < y) {}\n"
-                                "}";
+                                "}\n";
 
-            check(code, true, false, true, false);
+            check(code, dinit(CheckOptions, $.inconclusive = false));
             ASSERT_EQUALS("[test.cpp:3:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n", errout_str());
-            check(code, true, false, true, true);
+            check(code, dinit(CheckOptions, $.inconclusive = false, $.verbose = true));
             ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n", errout_str());
         }
 
         check("void foo(const int* x) {\n"
               "  if (*x < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y <= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y > 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const Bar* x) {\n"
               "  if (0 <= x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n", errout_str());
 
         check("struct S {\n"
@@ -8962,7 +9644,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first) {\n"
               "  if (first.ptr >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n"
                       "[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -8972,7 +9654,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if((first.ptr - second.ptr) >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -8982,7 +9664,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first) {\n"
               "  if((first.ptr) >= 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not. [pointerPositive]\n"
                       "[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -8992,7 +9674,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 <= first.ptr - second.ptr) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9002,7 +9684,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 <= (first.ptr - second.ptr)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9012,7 +9694,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(first.ptr - second.ptr < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9022,7 +9704,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if((first.ptr - second.ptr) < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9032,7 +9714,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 > first.ptr - second.ptr) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9042,69 +9724,69 @@ class TestOther : public TestFixture {
               "};\n"
               "void foo(S* first, S* second) {\n"
               "  if(0 > (first.ptr - second.ptr)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'first' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:23]: (style) Parameter 'second' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
 
         check("void foo(const int* x) {\n"
               "  if (0 <= x[0]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 <= x.y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 <= x->y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo(Bar* x, Bar* y) {\n"
               "  if (0 <= x->y - y->y ) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:1:23]: (style) Parameter 'y' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
 
         check("void foo(const Bar* x) {\n"
               "  if (0 > x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n", errout_str());
 
         check("void foo(const int* x) {\n"
               "  if (0 > x[0]) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 > x.y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 > x->y) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:15]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("void foo() {\n"
               "  int (*t)(void *a, void *b);\n"
               "  if (t(a, b) < 0) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  int (*t)(void *a, void *b);\n"
               "  if (0 > t(a, b)) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct object_info { int *typep; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (oi->typep < 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n"
                       "[test.cpp:2:45]: (style) Parameter 'oi' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9112,7 +9794,7 @@ class TestOther : public TestFixture {
         check("struct object_info { int typep[10]; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (oi->typep < 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) A pointer can not be negative so it is either pointless or an error to check if it is. [pointerLessThanZero]\n"
                       "[test.cpp:2:45]: (style) Parameter 'oi' can be declared as pointer to const [constParameterPointer]\n",
                       errout_str());
@@ -9120,28 +9802,28 @@ class TestOther : public TestFixture {
         check("struct object_info { int *typep; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (*oi->typep < 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:45]: (style) Parameter 'oi' can be declared as pointer to const [constParameterPointer]\n", errout_str());
     }
 
     void checkSuspiciousSemicolon1() {
         check("void foo() {\n"
               "  for(int i = 0; i < 10; ++i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Empty block
         check("void foo() {\n"
               "  for(int i = 0; i < 10; ++i); {\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Suspicious use of ; at the end of 'for' statement. [suspiciousSemicolon]\n", errout_str());
 
         check("void foo() {\n"
               "  while (!quit); {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Suspicious use of ; at the end of 'while' statement. [suspiciousSemicolon]\n", errout_str());
     }
 
@@ -9150,21 +9832,21 @@ class TestOther : public TestFixture {
               "  if (i == 1); {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (warning) Suspicious use of ; at the end of 'if' statement. [suspiciousSemicolon]\n", errout_str());
 
         // Seen this in the wild
         check("void foo() {\n"
               "  if (Match());\n"
               "  do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  if (Match());\n"
               "  else\n"
               "    do_something();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -9173,7 +9855,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -9182,7 +9864,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "    do_something();\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -9191,20 +9873,20 @@ class TestOther : public TestFixture {
                "void foo() {\n"
                "  if (x == 123);\n"
                "  REQUIRE(y=z);\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void checkSuspiciousComparison() {
         checkP("void f(int a, int b) {\n"
                "  a > b;\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '>', result is not used. [constStatement]\n", errout_str());
 
         checkP("void f() {\n" // #10607
                "  for (auto p : m)\n"
                "    std::vector<std::pair<std::string, std::string>> k;\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -9212,25 +9894,25 @@ class TestOther : public TestFixture {
         check("void foo(char *p) {\n"
               "  char *a; a = malloc(1024);\n"
               "  free(a + 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = malloc(1024);\n"
               "  free(a - 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = malloc(1024);\n"
               "  free(10 + a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char[1024];\n"
               "  delete[] (a + 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:3:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n",
                       errout_str());
@@ -9238,7 +9920,7 @@ class TestOther : public TestFixture {
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
               "  delete a + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:3:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n",
                       errout_str());
@@ -9247,7 +9929,7 @@ class TestOther : public TestFixture {
               "  char *a; a = new char;\n"
               "  bar(a);\n"
               "  delete a + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
@@ -9256,7 +9938,7 @@ class TestOther : public TestFixture {
               "  bar(a);\n"
               "  delete a + 10;\n"
               "  delete b + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n", errout_str());
 
         check("void foo(char *p) {\n"
@@ -9265,14 +9947,14 @@ class TestOther : public TestFixture {
               "  bar(a, b);\n"
               "  delete a + 10;\n"
               "  delete b + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
               "  bar()\n"
               "  delete a + 10;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
                       "[test.cpp:4:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset. [invalidFree]\n",
                       errout_str());
@@ -9281,7 +9963,7 @@ class TestOther : public TestFixture {
               "  char *ptr; ptr = malloc(42);\n"
               "  ptr += xx;\n"
               "  free(ptr + 1 - xx);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset. [invalidFree]\n", errout_str());
 
         check("void foo(size_t xx) {\n"
@@ -9289,7 +9971,7 @@ class TestOther : public TestFixture {
               "  std::cout << ptr;\n"
               "  ptr = otherPtr;\n"
               "  free(otherPtr - xx - 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9]: (style) Variable 'ptr' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -9299,7 +9981,7 @@ class TestOther : public TestFixture {
         check("const std::string& getA(){static std::string a;return a;}\n"
               "void foo() {\n"
               "    const std::string a = getA();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
 
         check("class A { public: A() {} char x[100]; };\n"
@@ -9308,7 +9990,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a = getA();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
 
         check("const int& getA(){static int a;return a;}\n"
@@ -9316,7 +9998,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const int a = getA();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const int& getA(){static int a;return a;}\n"
@@ -9325,7 +10007,7 @@ class TestOther : public TestFixture {
               "    int getA = 0;\n"
               "    const int a = getA + 3;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:12] -> [test.cpp:4:9]: (style) Local variable 'getA' shadows outer function [shadowFunction]\n", errout_str());
 
         check("class A { public: A() {} char x[100]; };\n"
@@ -9334,7 +10016,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a(getA());\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
 
         check("const int& getA(){static int a;return a;}\n"
@@ -9342,7 +10024,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const int a(getA());\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A{\n"
@@ -9354,7 +10036,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a = getA() + 1;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A{\n"
@@ -9366,7 +10048,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    const A a(getA()+1);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5190 - FP when creating object with constructor that takes a reference
@@ -9375,7 +10057,7 @@ class TestOther : public TestFixture {
               "const A &getA();\n"
               "void f() {\n"
               "    const B b(getA());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {};\n"
@@ -9383,7 +10065,7 @@ class TestOther : public TestFixture {
               "const A& getA();\n"
               "void f() {\n"
               "    const B b{ getA() };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5618
@@ -9396,10 +10078,10 @@ class TestOther : public TestFixture {
                                 "        const std::string temp = tok->str();\n"
                                 "        tok->str(tok->strAt(2));\n"
                                 "    }\n"
-                                "}";
-        check(code5618, true, true);
+                                "}\n";
+        check(code5618);
         ASSERT_EQUALS("", errout_str());
-        check(code5618, true, false);
+        check(code5618, dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #5890 - crash: wesnoth desktop_util.cpp / unicode.hpp
@@ -9407,7 +10089,7 @@ class TestOther : public TestFixture {
               "X f<X>(const X &in) {\n"
               "    const X s = f<X>(in);\n"
               "    return f<X>(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7981 - False positive redundantCopyLocalConst - const ref argument to ctor
@@ -9419,7 +10101,7 @@ class TestOther : public TestFixture {
               " \n"
               "void foo() {\n"
               "  const CD cd(CD::getOne());\n"
-              "}", true, true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #10545
@@ -9432,7 +10114,7 @@ class TestOther : public TestFixture {
               "    if (i != 0)\n"
               "        return old;\n"
               "    return {};\n"
-              "}", true, /*inconclusive*/ true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct X { int x; };\n" // #10191
@@ -9450,7 +10132,7 @@ class TestOther : public TestFixture {
               "        modify();\n"
               "        return x.x;\n"
               "    }\n"
-              "};\n", true, /*inconclusive*/ true);
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10704
@@ -9528,9 +10210,7 @@ class TestOther : public TestFixture {
               "    u.g();\n"
               "    if (c == m->get()) {}\n"
               "}\n");
-        TODO_ASSERT_EQUALS("",
-                           "[test.cpp:16:33] -> [test.cpp:18:11]: (style) The comparison 'c == m->get()' is always true because 'c' and 'm->get()' represent the same value. [knownConditionTrueFalse]\n",
-                           errout_str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #12925
               "    const std::string & f() const { return str; }\n"
@@ -9557,6 +10237,58 @@ class TestOther : public TestFixture {
               "    if (s.empty()) {}\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:6:16]: (performance, inconclusive) Use const reference for 's' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
+
+        check("void f1(const std::string& s) {\n"
+              "    std::string s1 = s;\n"
+              "    (void)s1;\n"
+              "}\n"
+              "void f2() {\n"
+              "    const std::string s;\n"
+              "    std::string s1 = s;\n"
+              "    (void)s1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (performance, inconclusive) Use const reference for 's1' to avoid unnecessary data copying. [redundantCopyLocalConst]\n"
+                      "[test.cpp:7:17]: (performance, inconclusive) Use const reference for 's1' to avoid unnecessary data copying. [redundantCopyLocalConst]\n",
+                      errout_str());
+
+        check("struct S {\n"
+              "    std::string m;\n"
+              "    int f(const std::string& s);\n"
+              "};\n"
+              "int S::f(const std::string& s) {\n"
+              "    std::string c = s;\n"
+              "    m.clear();\n"
+              "    return c.size();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    std::string m;\n"
+              "    int f(std::string s);\n"
+              "};\n"
+              "int S::f(std::string s) {\n"
+              "    s += m;\n"
+              "    std::string c = s;\n"
+              "    m.clear();\n"
+              "    return c.size();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:17]: (performance, inconclusive) Use const reference for 'c' to avoid unnecessary data copying. [redundantCopyLocalConst]\n",
+                      errout_str());
+
+        check("int f(const char* c) {\n" // #14530
+              "    std::string s = c;\n"
+              "    return s.rfind('.');\n"
+              "}\n"
+              "struct M {\n"
+              "    M(const std::array<double, 9>& a);\n"
+              "    double m[3][3];\n"
+              "    double trace() const;\n"
+              "};\n"
+              "double g(const std::array<double, 9>& a) {\n"
+              "    M m = a;\n"
+              "    return m.trace();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkNegativeShift() {
@@ -9564,62 +10296,62 @@ class TestOther : public TestFixture {
               "{\n"
               "   int a; a = 123;\n"
               "   (void)(a << -1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   int a; a = 123;\n"
               "   (void)(a >> -1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   int a; a = 123;\n"
               "   a <<= -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   int a; a = 123;\n"
               "   a >>= -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << -1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << a << -1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << 3 << -1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo() {\n"
               "   x = (-10+2) << 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (portability) Shifting a negative value is technically undefined behaviour [shiftNegativeLHS]\n", errout_str());
 
-        check("x = y ? z << $-1 : 0;");
+        check("x = y ? z << $-1 : 0;\n");
         ASSERT_EQUALS("", errout_str());
 
         // Negative LHS
-        check("const int x = -1 >> 2;");
+        check("const int x = -1 >> 2;\n");
         ASSERT_EQUALS("[test.cpp:1:18]: (portability) Shifting a negative value is technically undefined behaviour [shiftNegativeLHS]\n", errout_str());
 
         // #6383 - unsigned type
-        check("const int x = (unsigned int)(-1) >> 2;");
+        check("const int x = (unsigned int)(-1) >> 2;\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7814 - UB happening in valueflowcode when it tried to compute shifts.
         check("int shift1() { return 1 >> -1 ;}\n"
               "int shift2() { return 1 << -1 ;}\n"
               "int shift3() { return -1 >> 1 ;}\n"
-              "int shift4() { return -1 << 1 ;}");
+              "int shift4() { return -1 << 1 ;}\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n"
                       "[test.cpp:2:25]: (error) Shifting by a negative value is undefined behaviour [shiftNegative]\n"
                       "[test.cpp:3:26]: (portability) Shifting a negative value is technically undefined behaviour [shiftNegativeLHS]\n"
@@ -9668,7 +10400,7 @@ class TestOther : public TestFixture {
               "    memset(a, 123, 5);\n"
               "    memcpy(a, b, 5);\n"
               "    memmove(a, b, 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(// TODO "[test.cpp:4] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n"
             "[test.cpp:3:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n"
             "[test.cpp:4:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memcpy()' with 'sizeof(*a)'? [incompleteArrayFill]\n"
@@ -9679,7 +10411,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    memset(::a, 123, 5);\n"
               "    memset(Z::b.a, 123, 5);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) Array '::a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*::a)'? [incompleteArrayFill]\n"
                            "[test.cpp:5]: (warning, inconclusive) Array 'Z::b.a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*Z::b.a)'?\n",
                            "[test.cpp:4:5]: (warning, inconclusive) Array '::a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*::a)'? [incompleteArrayFill]\n", errout_str());
@@ -9687,45 +10419,45 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    Foo* a[5];\n"
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
 
         check("class Foo {int a; int b;};\n"
               "void f() {\n"
               "    Foo a[5];\n"
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
 
         check("void f() {\n"
               "    Foo a[5];\n" // Size of foo is unknown
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char a[5];\n"
               "    memset(a, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[5];\n"
               "    memset(a+15, 'a', 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    bool a[5];\n"
               "    memset(a, false, 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (portability, inconclusive) Array 'a' might be filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
 
         check("void f() {\n"
               "    const int n = 5;"
               "    int a[n];\n"
               "    memset(a, 0, n);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
     }
 
@@ -9736,7 +10468,7 @@ class TestOther : public TestFixture {
         check("void f(int i) {\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:2:7]: note: i is assigned\n"
                       "[test.cpp:3:7]: note: i is overwritten\n", errout_str());
@@ -9746,7 +10478,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: i is assigned\n"
                       "[test.cpp:4:7]: note: i is overwritten\n", errout_str());
@@ -9755,7 +10487,7 @@ class TestOther : public TestFixture {
               "    int i;\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: i is assigned\n"
                       "[test.cpp:4:7]: note: i is overwritten\n", errout_str());
@@ -9764,14 +10496,14 @@ class TestOther : public TestFixture {
               "    static int i;\n"
               "    i = 1;\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("void f() {\n"
               "    int i[10];\n"
               "    i[2] = 1;\n"
               "    i[2] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: style: Variable 'i[2]' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:10]: note: i[2] is assigned\n"
                       "[test.cpp:4:10]: note: i[2] is overwritten\n", errout_str());
@@ -9781,14 +10513,14 @@ class TestOther : public TestFixture {
               "    i[x] = 1;\n"
               "    x=1;\n"
               "    i[x] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const int x) {\n"
               "    int i[10];\n"
               "    i[x] = 1;\n"
               "    i[x] = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: style: Variable 'i[x]' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:10]: note: i[x] is assigned\n"
                       "[test.cpp:4:10]: note: i[x] is overwritten\n", errout_str());
@@ -9797,14 +10529,14 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
               "    bar = y;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("void f() {\n"
@@ -9812,7 +10544,7 @@ class TestOther : public TestFixture {
               "    bar = y();\n"
               "    foo();\n"
               "    bar = y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Tests with function call between assignment
@@ -9820,7 +10552,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:2:7]: note: i is assigned\n"
                       "[test.cpp:4:7]: note: i is overwritten\n", errout_str());
@@ -9830,7 +10562,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n" // Global variable might be accessed in bar()
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -9838,7 +10570,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n" // bar() might call f() recursively. This could be a false positive in more complex examples (when value of i is used somewhere. See #4229)
               "    i = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -9846,7 +10578,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar();\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: i is assigned\n"
                       "[test.cpp:5:7]: note: i is overwritten\n", errout_str());
@@ -9856,14 +10588,14 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    bar(i);\n" // Passed as argument
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    Foo bar = foo();\n"
               "    bar();\n" // #5568. operator() called
               "    bar = y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Branch tests
@@ -9871,7 +10603,7 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    if(x)\n"
               "        i = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
@@ -9879,7 +10611,7 @@ class TestOther : public TestFixture {
               "        i = 0;\n"
               "    i = 1;\n"
               "    i = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: style: Variable 'i' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:4:7]: note: i is assigned\n"
                       "[test.cpp:5:7]: note: i is overwritten\n", errout_str());
@@ -9892,7 +10624,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    x = 2;\n"
               "    x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g() {\n"
@@ -9901,7 +10633,7 @@ class TestOther : public TestFixture {
               "void f(int x) {\n"
               "    x = 2;\n"
               "    x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7]: style: Variable 'x' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:5:7]: note: x is assigned\n"
                       "[test.cpp:6:7]: note: x is overwritten\n", errout_str());
@@ -9910,7 +10642,7 @@ class TestOther : public TestFixture {
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
               "    bar = y();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
@@ -9922,7 +10654,7 @@ class TestOther : public TestFixture {
               "void C::f() {\n"
               "    x = 2;\n"
               "    x = g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
@@ -9934,7 +10666,7 @@ class TestOther : public TestFixture {
               "void C::f(Foo z) {\n"
               "    x = 2;\n"
               "    x = z.g();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ({ })
@@ -9942,7 +10674,7 @@ class TestOther : public TestFixture {
               "  int x;\n"
               "  x = 321;\n"
               "  x = ({ asm(123); })\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // from #3103 (avoid a false negative)
@@ -9951,7 +10683,7 @@ class TestOther : public TestFixture {
               "    x = 1;\n"
               "    x = 1;\n"
               "    return x + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: style: Variable 'x' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:7]: note: x is assigned\n"
                       "[test.cpp:4:7]: note: x is overwritten\n", errout_str());
@@ -9963,20 +10695,20 @@ class TestOther : public TestFixture {
               "    if (y)\n" // <-- cppcheck does not know anything about 'y'
               "        x = 2;\n"
               "    return x + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // initialization, assignment with 0
         check("void f() {\n"  // Ticket #4356
               "    int x = 0;\n"  // <- ignore initialization with 0
               "    x = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  state_t *x = NULL;\n"
               "  x = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:12]: style: Variable 'x' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -9985,7 +10717,7 @@ class TestOther : public TestFixture {
               "  state_t *x;\n"
               "  x = NULL;\n"
               "  x = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:12]: style: Variable 'x' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -9995,7 +10727,7 @@ class TestOther : public TestFixture {
               "    bar(++x);\n"
               "    x = 5;\n"
               "    return bar(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // struct member..
@@ -10006,7 +10738,7 @@ class TestOther : public TestFixture {
               "    ab.a = 1;\n"
               "    ab.a = 2;\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:10]: style: Variable 'ab.a' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:5:10]: note: ab.a is assigned\n"
                       "[test.cpp:6:10]: note: ab.a is overwritten\n", errout_str());
@@ -10018,7 +10750,7 @@ class TestOther : public TestFixture {
               "    ab.a = 1;\n"
               "    ab = do_something();\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10029,7 +10761,7 @@ class TestOther : public TestFixture {
               "    do_something(&ab);\n"
               "    ab.a = 2;\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10040,7 +10772,7 @@ class TestOther : public TestFixture {
               "    do_something(&ab);\n"
               "    ab.a = 2;\n"
               "    return ab.a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10051,7 +10783,7 @@ class TestOther : public TestFixture {
               "    ab++;\n"
               "    ab->a = 1;\n"
               "    ab->b = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
@@ -10062,20 +10794,20 @@ class TestOther : public TestFixture {
               "    ab = x;\n"
               "    ab->a = 1;\n"
               "    ab->b = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(struct AB *ab) {\n" // #
               "    ab->data->x = 1;\n"
               "    ab = &ab1;\n"
               "    ab->data->x = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5964
         check("void func(char *buffer, const char *format, int precision, unsigned value) {\n"
               "    (precision < 0) ? sprintf(buffer, format, value) : sprintf(buffer, format, precision, value);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // don't crash
@@ -10088,14 +10820,14 @@ class TestOther : public TestFixture {
               "void func(struct state *s) {\n"
               "  s->foo[s->x++] = 2;\n"
               "  s->d[1].fc.i++;\n"
-              "}");
+              "}\n");
 
         // #6525 - inline assembly
         check("void f(int i) {\n"
               "    i = 1;\n"
               "    asm(\"foo\");\n"
               "    i = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6555
@@ -10108,7 +10840,7 @@ class TestOther : public TestFixture {
               "    catch (...) {\n"
               "        barney(p);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
@@ -10120,7 +10852,7 @@ class TestOther : public TestFixture {
               "    catch (...) {\n"
               "        barney(x);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: style: The scope of the variable 'p' can be reduced. [variableScope]\n"
                       "[test.cpp:2:11]: style: Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
                       errout_str());
@@ -10136,17 +10868,17 @@ class TestOther : public TestFixture {
               "    catch (...) {\n"
               "        barney(p);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Member variable pointers
         check("void podMemPtrs() {\n"
-              "    int POD::*memptr;\n"
+              "    const int POD::*memptr;\n"
               "    memptr = &POD::a;\n"
               "    memptr = &POD::b;\n"
               "    if (memptr)\n"
               "        memptr = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: style: Variable 'memptr' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:12]: note: memptr is assigned\n"
                       "[test.cpp:4:12]: note: memptr is overwritten\n", errout_str());
@@ -10156,7 +10888,7 @@ class TestOther : public TestFixture {
               "{\n"
               "  var[0] = 0.2f;\n"
               "  var[0] = 0.2f;\n" // <-- is initialized twice
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: style: Variable 'var[0]' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:10]: note: var[0] is assigned\n"
                       "[test.cpp:4:10]: note: var[0] is overwritten\n", errout_str());
@@ -10165,7 +10897,7 @@ class TestOther : public TestFixture {
               "{\n"
               "  *var = 0.2f;\n"
               "  *var = 0.2f;\n" // <-- is initialized twice
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: style: Variable '*var' is reassigned a value before the old one has been used. [redundantAssignment]\n"
                       "[test.cpp:3:8]: note: *var is assigned\n"
                       "[test.cpp:4:8]: note: *var is overwritten\n", errout_str());
@@ -10175,8 +10907,8 @@ class TestOther : public TestFixture {
               "  volatile char *reg = (volatile char *)0x12345;\n"
               "  *reg = 12;\n"
               "  *reg = 34;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:2:25]: style: C-style pointer casting [cstyleCast]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<int, int>& m, int key, int value) {\n" // #6379
               "    m[key] = value;\n"
@@ -10192,28 +10924,28 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "   int a = 0;\n"
               "   a = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int a;\n"
               "   a = 0;\n"
               "   a = 4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   unsigned a;\n"
               "   a = 0u;\n"
               "   a = 2u;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   void* a;\n"
               "   a = (void*)0;\n"
               "   a = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10]: (style) Variable 'a' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -10222,10 +10954,25 @@ class TestOther : public TestFixture {
               "   void* a;\n"
               "   a = (void*)0U;\n"
               "   a = p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10]: (style) Variable 'a' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
+
+        check("std::string f() {\n" // #14534
+              "    std::string s = \"abc\";\n"
+              "    s = \"def\";\n"
+              "    return s;\n"
+              "}\n"
+              "const char* g() {\n"
+              "    const char* p = \"abc\";\n"
+              "    p = \"def\";\n"
+              "    return p;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:19] -> [test.cpp:3:7]: (style) Redundant initialization for 's'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
+            "[test.cpp:7:19] -> [test.cpp:8:7]: (style) Redundant initialization for 'p'. The initialized value is overwritten before it is read. [redundantInitialization]\n",
+            errout_str());
     }
 
     void redundantVarAssignment_struct() {
@@ -10237,7 +10984,7 @@ class TestOther : public TestFixture {
               "  struct foo x;\n"
               "  x.a = _mm_set1_ps(1.0);\n"
               "  x.a = _mm_set1_ps(2.0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:7] -> [test.cpp:8:7]: (style) Variable 'x.a' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         check("void f() {\n"
@@ -10245,13 +10992,13 @@ class TestOther : public TestFixture {
               "  ab.x = 23;\n"
               "  ab.y = 41;\n"
               "  ab.x = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:5:8]: (style) Variable 'ab.x' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         check("void f() {\n"
               "  struct AB ab = {0};\n"
               "  ab = foo();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10272,7 +11019,7 @@ class TestOther : public TestFixture {
               "    u.l1 = 1;\n"
               "    lTotal += u.b.b1;\n"
               "    u.l1 = 2;\n" //Should not show RedundantAssignment
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5115 "redundantAssignment when using a union"
@@ -10290,7 +11037,7 @@ class TestOther : public TestFixture {
               "    } u;\n"
               "    u.l1 = 1;\n"
               "    u.l1 = 2;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:13:10] -> [test.cpp:14:10]: (style) Variable 'u.l1' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
 
         // Ticket #10093 "redundantAssignment when using a union"
@@ -10314,7 +11061,7 @@ class TestOther : public TestFixture {
               "    m.u16.ab = 47;\n"
               "    m.u16.cd = 0;\n"
               "    m.u16.ab = m.u32.abcd / 53;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #10093 "redundantAssignment when using a union"
@@ -10332,7 +11079,7 @@ class TestOther : public TestFixture {
               "    u.as_int = 42;\n"
               "    fn(&u.as_char[0], 4);\n"
               "    u.as_int = 0;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5115 "redundantAssignment when using a union"
@@ -10343,7 +11090,7 @@ class TestOther : public TestFixture {
               "    } addr;\n"
               "    addr.s8 = ptr;\n"
               "    addr.u64 += 8;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #12895
@@ -10357,6 +11104,48 @@ class TestOther : public TestFixture {
               "    Dst.s->y = Src.s->y;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        // Ticket #14371 "redundantAssignment when using a union"
+        check("union U {\n"
+              "    struct {\n"
+              "        unsigned int abcd;\n"
+              "    } u32;\n"
+              "    struct {\n"
+              "        unsigned short ab;\n"
+              "        unsigned short cd;\n"
+              "    } u16;\n"
+              "};\n"
+              "void f1() {\n"
+              "    U m;\n"
+              "    m.u32.abcd = 1234;\n"
+              "    m.u32.abcd = 5 * m.u16.ab;\n"
+              "}\n"
+              "void f2(unsigned int a, unsigned short b) {\n"
+              "    U m;\n"
+              "    m.u32.abcd = a;\n"
+              "    m.u32.abcd += 0x8000;\n"
+              "    m.u32.abcd = m.u16.ab * b;\n"
+              "}\n"
+              "void f3(unsigned int seed) {\n"
+              "    U m, other;\n"
+              "    other.u32.abcd = seed;\n"
+              "    m.u32.abcd = 1234;\n"
+              "    m.u32.abcd = other.u16.ab * 2;\n"
+              "}\n"
+              "void f4(unsigned short x) {\n"
+              "    U m;\n"
+              "    m.u16.ab = x;\n"
+              "    m.u16.cd = 0;\n"
+              "    m.u16.ab = m.u32.abcd / 53;\n"
+              "}\n"
+              "void f5(unsigned short x, unsigned int y) {\n"
+              "    U m;\n"
+              "    m.u16.ab = x;\n"
+              "    m.u16.cd = 0;\n"
+              "    m.u16.ab = y;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("[test.cpp:24:16] -> [test.cpp:25:16]: (style) Variable 'm.u32.abcd' is reassigned a value before the old one has been used. [redundantAssignment]\n"
+                      "[test.cpp:35:14] -> [test.cpp:37:14]: (style) Variable 'm.u16.ab' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
     }
 
     void redundantVarAssignment_7133() {
@@ -10378,7 +11167,7 @@ class TestOther : public TestFixture {
               "   }\n"
               "   catch (const uno::Exception&)  {\n"
               "   }\n"
-              "}", true, true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void ConvertBitmapData(sal_uInt16 nDestBits) {\n"
@@ -10387,7 +11176,7 @@ class TestOther : public TestFixture {
               "    BitmapBuffer aDstBuf;\n"
               "    aSrcBuf.mnBitCount = nDestBits;\n"
               "    bConverted = ::ImplFastBitmapConversion( aDstBuf, aSrcBuf, aTwoRects );\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:24] -> [test.c:5:24]: (style) Variable 'aSrcBuf.mnBitCount' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
         check("void ConvertBitmapData(sal_uInt16 nDestBits) {\n"
               "    BitmapBuffer aSrcBuf;\n"
@@ -10395,7 +11184,7 @@ class TestOther : public TestFixture {
               "    BitmapBuffer aDstBuf;\n"
               "    aSrcBuf.mnBitCount = nDestBits;\n"
               "    bConverted = ::ImplFastBitmapConversion( aDstBuf, aSrcBuf, aTwoRects );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24] -> [test.cpp:5:24]: (style) Variable 'aSrcBuf.mnBitCount' is reassigned a value before the old one has been used. [redundantAssignment]\n",
                       errout_str());
 
@@ -10404,7 +11193,7 @@ class TestOther : public TestFixture {
               "    C c;\n"
               "    c = x;\n"
               "    c = x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:5:7]: (style, inconclusive) Variable 'c' is reassigned a value before the old one has been used if variable is no semaphore variable. [redundantAssignment]\n", errout_str());
     }
 
@@ -10418,7 +11207,7 @@ class TestOther : public TestFixture {
               "    m->prev->next = m->next;\n"
               "    m->next->prev = m->prev;\n"
               "    return m->next;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10432,7 +11221,7 @@ class TestOther : public TestFixture {
               "    x = 6;\n"
               "    f();\n"
               "    return y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10228
@@ -10452,7 +11241,7 @@ class TestOther : public TestFixture {
               "    for (i = 0; i < 4; i++)\n"
               "        buf[i] = 131;\n"
               "    buf[i] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void bar() {\n" // #9262 do-while with break
@@ -10462,20 +11251,20 @@ class TestOther : public TestFixture {
               "        if (foo()) break;\n"
               "        x = 1;\n"
               "     } while (false);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int num) {\n" // #9420 FP
               "  int a = num;\n"
               "  for (int b = 0; b < num; a = b++)\n"
               "    dostuff(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(int num) {\n" // #9420 FN
               "  int a = num;\n"
               "  for (int b = 0; b < num; a = b++);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -10488,7 +11277,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "    ret = 3;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:8:9]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
     }
 
@@ -10498,7 +11287,7 @@ class TestOther : public TestFixture {
               "    *x = 23;\n"
               "    foo(ptr);\n"
               "    *x = 32;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8997
@@ -10508,7 +11297,7 @@ class TestOther : public TestFixture {
               "  *p = 1;\n"
               "  p += 1;\n"
               "  *p = 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10517,7 +11306,7 @@ class TestOther : public TestFixture {
               "    *p = 1;\n"
               "    if (condition) return;\n"
               "    *p = 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10529,7 +11318,7 @@ class TestOther : public TestFixture {
               "    i += 2;\n"
               "    arr[i] = 3;\n"
               "    dostuff(arr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10543,9 +11332,9 @@ class TestOther : public TestFixture {
               "        if (b) break;\n"
               "        ret = 1;\n"
               "        break;\n"
-              "    }"
+              "    }\n"
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
@@ -10556,8 +11345,8 @@ class TestOther : public TestFixture {
               "        if (b) break;\n"
               "        ret = 1;\n"
               "        break;\n"
-              "    }"
-              "}");
+              "    }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:7:13]: (style) Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment]\n", errout_str());
     }
 
@@ -10567,7 +11356,7 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    int err = -ENOMEM;\n"
               "    err = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: style: Redundant initialization for 'err'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
                       "[test.cpp:2:13]: note: err is initialized\n"
                       "[test.cpp:3:9]: note: err is overwritten\n",
@@ -10576,7 +11365,7 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    struct S s = {1,2,3};\n"
               "    s = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: style: Redundant initialization for 's'. The initialized value is overwritten before it is read. [redundantInitialization]\n"
                       "[test.cpp:2:16]: note: s is initialized\n"
                       "[test.cpp:3:7]: note: s is overwritten\n",
@@ -10585,7 +11374,7 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    int *p = NULL;\n"
               "    p = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10]: style: Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
             errout_str());
@@ -10594,14 +11383,14 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    struct S s = {0};\n"
               "    s = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace N { enum E {e0,e1}; }\n"
               "void f() {\n"
               "    N::E e = N::e0;\n" // #9261
               "    e = dostuff();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #10143
@@ -10622,26 +11411,25 @@ class TestOther : public TestFixture {
     // cppcheck-suppress unusedPrivateFunction
     void redundantMemWrite() {
         // Simple tests
-        // cppcheck-suppress unreachableCode - remove when code is enabled again
         check("void f() {\n"
               "    char a[10];\n"
               "    memcpy(a, foo, bar);\n"
               "    memset(a, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void f() {\n"
               "    char a[10];\n"
               "    strcpy(a, foo);\n"
               "    strncpy(a, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void f() {\n"
               "    char a[10];\n"
               "    sprintf(a, \"foo\");\n"
               "    memmove(a, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void f(char *filename) {\n"
@@ -10649,14 +11437,14 @@ class TestOther : public TestFixture {
               "    strcpy(p, \"foo\");\n"
               "    dostuff(filename);\n"
               "    strcpy(p, \"foo\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Writing to different parts of a buffer
         check("void f(void* a) {\n"
               "    memcpy(a, foo, bar);\n"
               "    memset(a+5, 0, bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Use variable as second argument
@@ -10664,7 +11452,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, 5);\n"
               "    memcpy(b, a, 5);\n"
               "    memset(a, 1, 5);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // strcat is special
@@ -10673,7 +11461,7 @@ class TestOther : public TestFixture {
               "    strcpy(a, foo);\n"
               "    strcat(a, bar);\n" // Not redundant
               "    strcpy(a, x);\n" // Redundant
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         // Tests with function call between copy
@@ -10682,7 +11470,7 @@ class TestOther : public TestFixture {
               "    snprintf(a, foo, bar);\n"
               "    bar();\n"
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout_str());
 
         check("void* a;\n"
@@ -10690,7 +11478,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    bar();\n" // Global variable might be accessed in bar()
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -10698,7 +11486,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    bar();\n"
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n", "", errout_str());
 
         check("void bar(void* a) {}\n"
@@ -10706,7 +11494,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    bar(a);\n" // Passed as argument
               "    memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Branch tests
@@ -10714,7 +11502,7 @@ class TestOther : public TestFixture {
               "    memset(a, 0, size);\n"
               "    if(x)\n"
               "        memset(a, 0, size);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4455 - initialization of local buffer
@@ -10722,14 +11510,14 @@ class TestOther : public TestFixture {
               "    char buf[10];\n"
               "    memset(buf, 0, 10);\n"
               "    strcpy(buf, string);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "    char buf[10] = {0};\n"
               "    memset(buf, 0, 10);\n"
               "    strcpy(buf, string);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'buf' is being written before its old content has been used.\n", errout_str());
 
         // #5689 - use return value of strcpy
@@ -10737,7 +11525,7 @@ class TestOther : public TestFixture {
               "    int i = atoi(strcpy(a, foo));\n"
               "    strncpy(a, 0, bar);\n"
               "    return i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7175 - read+write
@@ -10746,7 +11534,7 @@ class TestOther : public TestFixture {
               "    strcpy(buf, x);\n"
               "    strcpy(buf, dostuff(buf));\n" // <- read + write
               "    strcpy(buf, x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -10754,7 +11542,7 @@ class TestOther : public TestFixture {
               "    strcpy(buf, x);\n"
               "    strcpy(buf, dostuff(buf));\n"
               "    strcpy(buf, x);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -10810,15 +11598,31 @@ class TestOther : public TestFixture {
               "    a = x;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int f(int a, int b, int c) {\n" // #4491
+              "    int x = a + b;\n"
+              "    if (c)\n"
+              "        x = a + b;\n"
+              "    return x;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:11] -> [test.cpp:3:9] -> [test.cpp:4:9]: (style) Variable 'x' is assigned an expression that holds the same value. [redundantAssignment]\n",
+            errout_str());
     }
 
     void varFuncNullUB() { // #4482
         check("void a(...);\n"
-              "void b() { a(NULL); }");
+              "void b() { a(NULL); }\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (portability) Passing NULL after the last typed argument to a variadic function leads to undefined behaviour. [varFuncNullUB]\n", errout_str());
 
         check("void a(char *p, ...);\n"
-              "void b() { a(NULL, 2); }");
+              "void b() { a(NULL, 2); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("extern const int sentinel;\n"
+               "void a(int, ...);\n"
+               "#define b(x, ...) a((x), __VA_ARGS__, &sentinel)\n"
+               "void c() { b(1, NULL); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -10832,7 +11636,7 @@ class TestOther : public TestFixture {
               "    bar(c);\n"
               "    c = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -10841,7 +11645,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "    bar(c);\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -10851,7 +11655,7 @@ class TestOther : public TestFixture {
               "    bar(c);\n"
               "    c = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -10859,7 +11663,7 @@ class TestOther : public TestFixture {
               "  while( EOF != ( c = getchar() ) )\n"
               "  {\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Storing getchar() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f() {\n"
@@ -10869,7 +11673,7 @@ class TestOther : public TestFixture {
               "    bar(i);\n"
               "    i = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -10879,7 +11683,7 @@ class TestOther : public TestFixture {
               "    bar(i);\n"
               "    i = getchar();\n"
               "  } ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -10889,7 +11693,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = getc (pFile);\n"
               "} while (c != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (warning) Storing getc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -10897,7 +11701,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = getc (pFile);\n"
               "} while (EOF != c);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (warning) Storing getc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -10905,7 +11709,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = getc (pFile);\n"
               "} while (i != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -10913,7 +11717,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = getc (pFile);\n"
               "} while (EOF != i);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -10923,7 +11727,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = fgetc (pFile);\n"
               "} while (c != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (warning) Storing fgetc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -10931,7 +11735,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = fgetc (pFile);\n"
               "} while (EOF != c);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (warning) Storing fgetc() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -10939,7 +11743,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  c = fgetc (pFile);\n"
               "} while (EOF != c);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -10947,7 +11751,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = fgetc (pFile);\n"
               "} while (i != EOF);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
@@ -10955,7 +11759,7 @@ class TestOther : public TestFixture {
               "do {\n"
               "  i = fgetc (pFile);\n"
               "} while (EOF != i);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // cin.get()
@@ -10965,7 +11769,7 @@ class TestOther : public TestFixture {
               "        std::cout << ch;\n"
               "        ch = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (warning) Storing cin.get() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f(){\n"
@@ -10974,7 +11778,7 @@ class TestOther : public TestFixture {
               "        std::cout << ch;\n"
               "        ch = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (warning) Storing cin.get() return value in char variable and then comparing with EOF. [checkCastIntToCharAndBack]\n", errout_str());
 
         check("void f(){\n"
@@ -10983,7 +11787,7 @@ class TestOther : public TestFixture {
               "        std::cout << i;\n"
               "        i = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(){\n"
@@ -10992,7 +11796,7 @@ class TestOther : public TestFixture {
               "        std::cout << i;\n"
               "        i = std::cin.get();\n"
               "   }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11001,32 +11805,32 @@ class TestOther : public TestFixture {
               "  if (a < 0)\n"
               "    return a++,\n"
               "  do_something();\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Comma is used in return statement. The comma can easily be misread as a ';'.\n", "", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a++, do_something();\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a+5,\n"
               "  do_something();\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Comma is used in return statement. The comma can easily be misread as a ';'.\n", "", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return a+5, do_something();\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return c<int,\nint>::b;\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         // #4943 take care of C++11 initializer lists
@@ -11037,7 +11841,7 @@ class TestOther : public TestFixture {
               "        { \"2\" },\n"
               "        { \"3\" }\n"
               "    };\n"
-              "}", true, false, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11053,7 +11857,7 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a(std::move(a)) {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", true, false, true);
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -11066,7 +11870,7 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a{std::move(a)} {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", true, false, true);
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -11080,7 +11884,7 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", true, false, true);
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
@@ -11094,7 +11898,7 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", true, false, true);
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:8:14]: (performance) Function parameter 'a2' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("struct A\n"
@@ -11108,11 +11912,11 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", true, false, true);
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:8:14]: (performance) Function parameter 'a2' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("std::map<int, int> m;\n" // #10817
-              "void f(const decltype(m)::const_iterator i) {}");
+              "void f(const decltype(m)::const_iterator i) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int (*pf) (std::vector<int>) = nullptr;\n" // #12118
@@ -11144,39 +11948,61 @@ class TestOther : public TestFixture {
               "};\n"
               "void f(S<char, 3> s) {}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct T {\n" // #14667
+              "    U u1, u2;\n"
+              "    union {\n"
+              "        enum { E0, E1 } e;\n"
+              "        U u3;\n"
+              "        T i;\n"
+              "    } x;\n"
+              "};\n"
+              "T f(T t) {\n"
+              "    return t;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
+        Settings settingsUnix32 = settingsBuilder().platform(Platform::Type::Unix32).build();
+        check("struct S {\n" // #13850
+              "    int i0 : 32;\n"
+              "    int i1 : 16;\n"
+              "    unsigned short u16;\n"
+              "};\n"
+              "void f(S s) {}\n", dinit(CheckOptions, $.settings = &settingsUnix32));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkComparisonFunctionIsAlwaysTrueOrFalse() {
         // positive test
         check("bool f(int x){\n"
               "   return isless(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with isless(x,x) always evaluates to false. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return isgreater(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with isgreater(x,x) always evaluates to false. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return islessgreater(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with islessgreater(x,x) always evaluates to false. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return islessequal(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with islessequal(x,x) always evaluates to true. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         check("bool f(int x){\n"
               "   return isgreaterequal(x,x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (warning) Comparison of two identical variables with isgreaterequal(x,x) always evaluates to true. [comparisonFunctionIsAlwaysTrueOrFalse]\n", errout_str());
 
         // no warning should be reported for
         check("bool f(int x, int y){\n"
               "   return isgreaterequal(x,y) && islessequal(x,y) && islessgreater(x,y) && isgreater(x,y) && isless(x,y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11184,19 +12010,19 @@ class TestOther : public TestFixture {
         // no signed integer overflow should happen
         check("void f(unsigned long long ull) {\n"
               "    if (ull == 0x89504e470d0a1a0a || ull == 0x8a4d4e470d0a1a0a) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void redundantPointerOp() {
         check("int *f(int *x) {\n"
               "    return &*x;\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Redundant pointer operation on 'x' - it's already a pointer. [redundantPointerOp]\n", errout_str());
 
         check("int *f(int *y) {\n"
               "    return &(*y);\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (style) Redundant pointer operation on 'y' - it's already a pointer. [redundantPointerOp]\n", errout_str());
 
         check("int f() {\n" // #10991
@@ -11204,18 +12030,18 @@ class TestOther : public TestFixture {
               "    int result1 = *(&value);\n"
               "    int result2 = *&value;\n"
               "    return result1 + result2;\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (style) Redundant pointer operation on 'value' - it's already a variable. [redundantPointerOp]\n"
                       "[test.cpp:4:19]: (style) Redundant pointer operation on 'value' - it's already a variable. [redundantPointerOp]\n",
                       errout_str());
 
         check("void f(int& a, int b) {\n"
               "    *(&a) = b;\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Redundant pointer operation on 'a' - it's already a variable. [redundantPointerOp]\n",
                       errout_str());
 
-        check("void f(int**& p) {}\n", true, true);
+        check("void f(int**& p) {}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define	RESTORE(ORIG, COPY) { *ORIG = *COPY; }\n"
@@ -11227,38 +12053,38 @@ class TestOther : public TestFixture {
         // no warning for bitwise AND
         check("void f(const int *b) {\n"
               "    int x = 0x20 & *b;\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // No message for double pointers to structs
         check("void f(struct foo **my_struct) {\n"
               "    char **pass_to_func = &(*my_struct)->buf;\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // another double pointer to struct - with an array
         check("void f(struct foo **my_struct) {\n"
               "    char **pass_to_func = &(*my_struct)->buf[10];\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // double pointer to array
         check("void f(char **ptr) {\n"
               "    int *x = &(*ptr)[10];\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Variable 'x' can be declared as pointer to const [constVariablePointer]\n", errout_str());
 
         // function calls
         check("void f(Mutex *mut) {\n"
               "    pthread_mutex_lock(&*mut);\n"
-              "}\n", true, false);
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:2:24]: (style) Redundant pointer operation on 'mut' - it's already a pointer. [redundantPointerOp]\n", errout_str());
 
         // make sure we got the AST match for "(" right
         check("void f(char *ptr) {\n"
               "    if (&*ptr == NULL)\n"
               "        return;\n"
-              "}\n", true, true);
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Redundant pointer operation on 'ptr' - it's already a pointer. [redundantPointerOp]\n", errout_str());
 
         // no warning for macros
@@ -11279,7 +12105,7 @@ class TestOther : public TestFixture {
     void test_isSameExpression() { // see #5738
         check("bool isInUnoIncludeFile(StringRef name) {"
               "   return  name.startswith(SRCDIR \"/com/\") || name.startswith(SRCDIR \"/uno/\");\n"
-              "};", true, false);
+              "};\n", dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11288,7 +12114,7 @@ class TestOther : public TestFixture {
                                   "    int counter = 0;\n"
                                   "    InterlockedDecrement(&counter);\n"
                                   "    whatever();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11297,7 +12123,7 @@ class TestOther : public TestFixture {
                                   "    if (counter)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11305,7 +12131,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (!counter)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11314,7 +12140,7 @@ class TestOther : public TestFixture {
                                   "    if (counter > 0)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11323,7 +12149,7 @@ class TestOther : public TestFixture {
                                   "    if (0 < counter)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11331,7 +12157,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (counter == 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11339,7 +12165,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (0 == counter)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11348,7 +12174,7 @@ class TestOther : public TestFixture {
                                   "    if (0 != counter)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11357,7 +12183,7 @@ class TestOther : public TestFixture {
                                   "    if (counter != 0)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11365,7 +12191,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (counter <= 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11373,7 +12199,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    if (0 >= counter)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11382,7 +12208,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11390,7 +12216,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (!newCount)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11399,7 +12225,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount > 0)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11408,7 +12234,7 @@ class TestOther : public TestFixture {
                                   "    if (0 < newCount)\n"
                                   "        return;\n"
                                   "    destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11416,7 +12242,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (newCount == 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11424,7 +12250,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (0 == newCount)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11433,7 +12259,7 @@ class TestOther : public TestFixture {
                                   "    if (0 != newCount)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11442,7 +12268,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount != 0)\n"
                                   "        return;\n"
                                   "    destroy()\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11450,7 +12276,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (newCount <= 0)\n"
                                   "        destroy();\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
@@ -11458,7 +12284,7 @@ class TestOther : public TestFixture {
                                   "    int newCount = InterlockedDecrement(&counter);\n"
                                   "    if (0 >= newCount)\n"
                                   "        destroy;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11469,7 +12295,7 @@ class TestOther : public TestFixture {
                                   "    } else {\n"
                                   "        return counter;\n"
                                   "    }\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11480,7 +12306,7 @@ class TestOther : public TestFixture {
                                   "    } else {\n"
                                   "        return counter;\n"
                                   "    }\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
 
@@ -11491,7 +12317,7 @@ class TestOther : public TestFixture {
                                   "        return 0;\n"
                                   "    }\n"
                                   "    return counter;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11501,7 +12327,7 @@ class TestOther : public TestFixture {
                                   "        return 0;\n"
                                   "    }\n"
                                   "    return counter;\n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11512,7 +12338,7 @@ class TestOther : public TestFixture {
                                   "    } else\n"
                                   "        return counter;\n"
                                   "   \n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
@@ -11523,21 +12349,21 @@ class TestOther : public TestFixture {
                                   "    } else\n"
                                   "        return counter;\n"
                                   "   \n"
-                                  "}");
+                                  "}\n");
         ASSERT_EQUALS("[test.cpp:7:16]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead. [raceAfterInterlockedDecrement]\n", errout_str());
     }
 
     void testUnusedLabel() {
         check("void f() {\n"
               "    label:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
 
         check("void f() {\n"
               "    label:\n"
               "    foo();\n"
               "    goto label;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -11547,28 +12373,28 @@ class TestOther : public TestFixture {
               "}\n"
               "void g() {\n"
               "    label:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
 
         check("void f() {\n"
               "    switch(a) {\n"
               "        default:\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    class X {\n"
               "        protected:\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    class X {\n"
               "        my_protected:\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int test(char art) {\n"
@@ -11580,7 +12406,7 @@ class TestOther : public TestFixture {
               "    case 2:\n"
               "        return 2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) Label 'caseZERO' is not used. Should this be a 'case' of the enclosing switch()? [unusedLabelSwitch]\n"
                       "[test.cpp:5:5]: (warning) Label 'case1' is not used. Should this be a 'case' of the enclosing switch()? [unusedLabelSwitch]\n", errout_str());
 
@@ -11590,54 +12416,87 @@ class TestOther : public TestFixture {
               "        return 2;\n"
               "    }\n"
               "    label:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
     }
 
-    #define checkCustomSettings(...) checkCustomSettings_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkCustomSettings_(const char* file, int line, const char code[], bool cpp = true, bool inconclusive = true, bool runSimpleChecks=true, bool verbose=false, Settings* settings = nullptr) {
-        if (!settings) {
-            settings = &_settings;
-        }
-        settings->certainty.setEnabled(Certainty::inconclusive, inconclusive);
-        settings->verbose = verbose;
 
-        // Tokenize..
-        SimpleTokenizer tokenizer(*settings, *this, cpp);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+    void testUnusedLabelConfiguration() {
+        checkP("void f() {\n"
+               "#ifdef X\n"
+               "    goto END;\n"
+               "#endif\n"
+               "END:\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:5:1]: (style) Label 'END' is not used. There is #if in function body so the label might be used in code that is removed by the preprocessor. [unusedLabelConfiguration]\n",
+                      errout_str());
+    }
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+    void testUnusedLabelSwitchConfiguration() {
+        checkP("void f(int i) {\n"
+               "    switch (i) {\n"
+               "    default:\n"
+               "        break;\n"
+               "#ifdef X\n"
+               "    case 1:\n"
+               "        goto END;\n"
+               "#endif\n"
+               "    case 2:\n"
+               "    END:\n"
+               "        return;\n"
+               "    }\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:10:5]: (warning) Label 'END' is not used. There is #if in function body so the label might be used in code that is removed by the preprocessor. Should this be a 'case' of the enclosing switch()? [unusedLabelSwitchConfiguration]\n",
+                      errout_str());
+    }
 
-        (void)runSimpleChecks; // TODO Remove this
+    void testUnusedLabelPremiumMisra() { // #14467 - enable unusedLabel with --premium=misra-c-20xx flag
+        Settings s;
+        check("void f() {\n"
+              "    label:\n"
+              "}\n", dinit(CheckOptions, $.settings = &s));
+        ASSERT_EQUALS("", errout_str());
+        s.premiumArgs = "--premium=misra-c-2012"; // <- activates unusedLabel checking
+        check("void f() {\n"
+              "    label:\n"
+              "}\n", dinit(CheckOptions, $.settings = &s));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
     }
 
-    void checkCustomSettings_(const char* file, int line, const char code[], Settings *s) {
-        checkCustomSettings_(file, line, code, true, true, true, false, s);
+    // TODO: only used in a single place
+#define checkCustomSettings(...) checkCustomSettings_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkCustomSettings_(const char* file, int line, const char (&code)[size], const Settings& settings, bool cpp = true) {
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        CheckOther check;
+        runChecks(check, tokenizer, *this);
     }
 
     void testEvaluationOrder() {
         check("void f() {\n"
               "  int x = dostuff();\n"
               "  return x + x++;\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (error) Expression 'x+x++' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         // #7226
         check("long int f1(const char *exp) {\n"
               "  return strtol(++exp, (char **)&exp, 10);\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("long int f1(const char *exp) {\n"
               "  return dostuff(++exp, exp, 10);\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:23]: (error) Expression '++exp,exp' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         check("void f() {\n"
               "  int a;\n"
               "  while (a=x(), a==123) {}\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // # 8717
@@ -11645,50 +12504,56 @@ class TestOther : public TestFixture {
               "    char **local_argv = safe_malloc(sizeof (*local_argv));\n"
               "    int local_argc = 0;\n"
               "    local_argv[local_argc++] = argv[0];\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x = 0;\n"
               "  return 0 + x++;\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "  int a[10];\n"
               "  a[x+y] = a[y+x]++;;\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:10]: (error) Expression 'a[x+y]=a[y+x]++' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         check("void f(int i) {\n"
               "  int n = ++i + i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Expression '++i+i' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         check("long int f1(const char *exp) {\n"
               "  return dostuff(++exp, ++exp, 10);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (portability) Expression '++exp,++exp' depends on order of evaluation of side effects. Behavior is Unspecified according to c++17 [unknownEvaluationOrder]\n"
                       "[test.cpp:2:23]: (portability) Expression '++exp,++exp' depends on order of evaluation of side effects. Behavior is Unspecified according to c++17 [unknownEvaluationOrder]\n", errout_str());
 
         check("void f(int i) {\n"
               "  int n = (~(-(++i)) + i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Expression '~(-(++i))+i' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
-        /*const*/ Settings settings11 = settingsBuilder(_settings).cpp(Standards::CPP11).build();
+        const Settings settings11 = settingsBuilder(settings0).cpp(Standards::CPP11).certainty(Certainty::inconclusive).build();
 
         checkCustomSettings("void f(int i) {\n"
                             "  i = i++ + 2;\n"
-                            "}", &settings11);
+                            "}\n", settings11);
         ASSERT_EQUALS("[test.cpp:2:11]: (error) Expression 'i+++2' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
+
+        // #14431
+        checkCustomSettings("int f(void) {\n"
+                            "  struct baz baz = {.bar = {.foo = {.foo = 1}}};\n"
+                            "}\n", settings0, false);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testEvaluationOrderSelfAssignment() {
         // self assignment
         check("void f() {\n"
               "  int x = x = y + 1;\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS(
             "[test.c:2:9]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n"
             "[test.c:2:9]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n",   // duplicate
@@ -11700,7 +12565,7 @@ class TestOther : public TestFixture {
         checkP("#define X x\n"
                "void f(int x) {\n"
                "  return x + X++;\n"
-               "}", dinit(CheckPOptions, $.cpp = false));
+               "}\n", dinit(CheckPOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (error) Expression 'x+x++' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
     }
 
@@ -11708,13 +12573,13 @@ class TestOther : public TestFixture {
         // FP
         check("void f(int id) {\n"
               "  id = dostuff(id += 42);\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // FN
         check("void f(int id) {\n"
               "  id = id + dostuff(id += 42);\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -11722,19 +12587,19 @@ class TestOther : public TestFixture {
         check("int f(void) {\n"
               "  int t;\n"
               "  return (unsigned char)(t=1,t^c);\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "  int t;\n"
               "  dostuff(t=1,t^c);\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:14]: (error) Expression 't=1,t^c' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
 
         check("void f(void) {\n"
               "  int t;\n"
               "  dostuff((t=1,t),2);\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // #8230
@@ -11742,28 +12607,28 @@ class TestOther : public TestFixture {
               "    do\n"
               "        ;\n"
               "    while (++fp, (*fp) <= 0177);\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void hprf(const char* fp) {\n"
               "    do\n"
               "        ;\n"
               "    while (i++, ++fp, (*fp) <= 0177);\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const char* fp) {\n"
               "    do\n"
               "        ;\n"
               "    while (f(++fp, (*fp) <= 7));\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:4:18]: (error) Expression '++fp,(*fp)<=7' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
     }
 
     void testEvaluationOrderSizeof() {
         check("void f(char *buf) {\n"
               "  dostuff(buf++, sizeof(*buf));"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11782,7 +12647,7 @@ class TestOther : public TestFixture {
               "  if (0 > d.n) {\n"
               "    return;\n"
               "  }\n"
-              "}", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:8:11]: (style) Checking if unsigned expression 'd.n' is less than zero. [unsignedLessThanZero]\n"
                       "[test.c:12:9]: (style) Checking if unsigned expression 'd.n' is less than zero. [unsignedLessThanZero]\n",
                       errout_str());
@@ -11794,7 +12659,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    g(std::move(a));\n"
               "    g(std::move(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -11808,7 +12673,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    B b1;\n"
               "    B b2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:6:24]: (warning) Access of moved variable 'b'. [accessMoved]\n", errout_str());
     }
 
@@ -11821,7 +12686,7 @@ class TestOther : public TestFixture {
               "    {}\n"
               "    B b1;\n"
               "    B b2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (warning) Access of moved variable 'b'. [accessMoved]\n", errout_str());
     }
 
@@ -11852,7 +12717,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    a = g(std::move(a));\n"
               "    a = g(std::move(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11862,7 +12727,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    B b = g(std::move(a));\n"
               "    C c = g(std::move(a));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -11878,7 +12743,7 @@ class TestOther : public TestFixture {
               "    h(a);\n"
               "    a = b;\n"
               "    h(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:8:7]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -11889,7 +12754,7 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    a.reset(g(std::move(a)));\n"
               "    a.reset(g(std::move(a)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11901,7 +12766,7 @@ class TestOther : public TestFixture {
               "    A c;\n"
               "    b.reset(g(std::move(a)));\n"
               "    c.reset(g(std::move(a)));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:25]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -11917,7 +12782,7 @@ class TestOther : public TestFixture {
               "    h(a);\n"
               "    a.reset(b);\n"
               "    h(a);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:8:7]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -11929,7 +12794,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:6:11]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -11941,7 +12806,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11952,7 +12817,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (warning) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:6:11]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -11963,7 +12828,7 @@ class TestOther : public TestFixture {
               "    A b = std::move(a);\n"
               "    g(a);\n"
               "    A c = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (warning, inconclusive) Access of moved variable 'a'. [accessMoved]\n"
                       "[test.cpp:5:11]: (warning, inconclusive) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
@@ -11976,7 +12841,7 @@ class TestOther : public TestFixture {
               "    if (i)\n"
               "        return g(std::move(b));\n"
               "    return h(std::move(a),std::move(b));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:24]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
@@ -11986,7 +12851,7 @@ class TestOther : public TestFixture {
               "    g(std::move(v));\n"
               "    v.clear();\n"
               "    if (v.empty()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -11996,7 +12861,7 @@ class TestOther : public TestFixture {
               "    g(std::move(p));\n"
               "    x = p->x;\n"
               "    y = p->y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) Access of moved variable 'p'. [accessMoved]\n"
                       "[test.cpp:5:9]: (warning) Access of moved variable 'p'. [accessMoved]\n", errout_str());
     }
@@ -12006,7 +12871,7 @@ class TestOther : public TestFixture {
               "    std::string s1 = x;\n"
               "    std::string s2 = std::move(s1);\n"
               "    p = &s1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12015,16 +12880,16 @@ class TestOther : public TestFixture {
               "    A a;\n"
               "    gx(std::move(a).x());\n"
               "    gy(std::move(a).y());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void moveAndLambda() {
         check("void f() {\n"
               "    A a;\n"
-              "    auto h = [a=std::move(a)](){return g(std::move(a));};"
+              "    auto h = [a=std::move(a)](){return g(std::move(a));};\n"
               "    b = a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12044,9 +12909,25 @@ class TestOther : public TestFixture {
               "        for (auto &j : g(std::move(l))) { (void)j; }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4:20]: (style) Variable 'j' can be declared as reference to const [constVariableReference]\n"
-                      "[test.cpp:4:36]: (warning) Access of moved variable 'l'. [accessMoved]\n",
-                      errout_str());
+        ASSERT_EQUALS("[test.cpp:4:36]: (warning) Access of moved variable 'l'. [accessMoved]\n", errout_str());
+
+        check("struct S {\n" // #13179
+              "    operator bool() const { return !m.empty(); }\n"
+              "    std::string m;\n"
+              "};\n"
+              "S get();\n"
+              "void set(S);\n"
+              "void f() {\n"
+              "    while (S s = get()) {\n"
+              "        set(std::move(s));\n"
+              "    }\n"
+              "}\n"
+              "void g() {\n"
+              "    while (S s{ get() }) {\n"
+              "        set(std::move(s));\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moveCallback()
@@ -12079,7 +12960,7 @@ class TestOther : public TestFixture {
               "void f(T && t) {\n"
               "    g(std::forward<T>(t));\n"
               "    T s = t;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (warning) Access of forwarded variable 't'. [accessForwarded]\n", errout_str());
     }
 
@@ -12105,6 +12986,13 @@ class TestOther : public TestFixture {
               "    cif::condition mWhere;\n"
               "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void g(std::string);\n" // #14928
+              "void f(std::string s) {\n"
+              "    g(std::move(s));\n"
+              "    for (char c : s) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:19]: (warning) Access of moved variable 's'. [accessMoved]\n", errout_str());
     }
 
     void moveTernary()
@@ -12134,6 +13022,18 @@ class TestOther : public TestFixture {
               "    h(b ? h(gA(5, std::move(s))) : h(gB(7, std::move(s))));\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int cb(std::string);\n" // #13628
+              "void f(bool b, std::string s1) {\n"
+              "    std::string s2 = b ? cb(std::move(s1)) : s1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int cb(std::string);\n"
+              "void f(bool b, std::string s1) {\n"
+              "    std::string s2 = b ? cb(std::move(s1)) : s1 + s1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void movePointerAlias()
@@ -12147,6 +13047,38 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:5:8]: (warning) Access of moved variable '.'. [accessMoved]\n", errout_str());
     }
 
+    void moveOutparam()
+    {
+        check("void f(std::vector<std::string>& v) {\n" // #11300
+              "    std::string l;\n"
+              "    while (std::getline(std::cin, l)) {\n"
+              "        if (!l.empty()) {\n"
+              "            v.emplace_back(std::move(l));\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::ifstream& fin, std::set<std::string>& s) {\n"
+              "    std::string line;\n"
+              "    while (std::getline(fin, line)) {\n"
+              "        s.emplace(std::move(line));\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void moveTryEmplace()
+    {
+        check("void f(std::map<std::string, std::string>& m, std::string& s) {\n" // #12773
+              "    bool b = m.try_emplace(\"a\", std::move(s)).second;\n"
+              "    if (!b) {\n"
+              "        std::cout << s;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void funcArgNamesDifferent() {
         check("void func1(int a, int b, int c);\n"
               "void func1(int a, int b, int c) { }\n"
@@ -12161,7 +13093,7 @@ class TestOther : public TestFixture {
               "void Fred::func1(int a, int b, int c) { }\n"
               "void Fred::func2(int A, int B, int C) { }\n"
               "void Fred::func3(int a, int b, int c) { }\n"
-              "void Fred::func4(int A, int B, int C) { }");
+              "void Fred::func4(int A, int B, int C) { }\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:4:16]: (style, inconclusive) Function 'func2' argument 1 names different: declaration 'a' definition 'A'. [funcArgNamesDifferent]\n"
                       "[test.cpp:3:23] -> [test.cpp:4:23]: (style, inconclusive) Function 'func2' argument 2 names different: declaration 'b' definition 'B'. [funcArgNamesDifferent]\n"
                       "[test.cpp:3:30] -> [test.cpp:4:30]: (style, inconclusive) Function 'func2' argument 3 names different: declaration 'c' definition 'C'. [funcArgNamesDifferent]\n"
@@ -12171,6 +13103,39 @@ class TestOther : public TestFixture {
                       "[test.cpp:9:20] -> [test.cpp:14:22]: (style, inconclusive) Function 'func4' argument 1 names different: declaration 'a' definition 'A'. [funcArgNamesDifferent]\n"
                       "[test.cpp:9:31] -> [test.cpp:14:29]: (style, inconclusive) Function 'func4' argument 2 names different: declaration 'b' definition 'B'. [funcArgNamesDifferent]\n"
                       "[test.cpp:9:42] -> [test.cpp:14:36]: (style, inconclusive) Function 'func4' argument 3 names different: declaration 'c' definition 'C'. [funcArgNamesDifferent]\n", errout_str());
+
+        check("using F1 = void (*)();\n" // #14633
+              "void f(F1 a);\n"
+              "void f(F1 b) {}\n"
+              "typedef void (*F2)();\n"
+              "void g(F2 a);\n"
+              "void g(F2 b) {}\n"
+              "void h(void (*a)());\n"
+              "void h(void (*b)()) {}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:11] -> [test.cpp:3:11]: (style, inconclusive) Function 'f' argument 1 names different: declaration 'a' definition 'b'. [funcArgNamesDifferent]\n"
+            "[test.cpp:5:11] -> [test.cpp:6:11]: (style, inconclusive) Function 'g' argument 1 names different: declaration 'a' definition 'b'. [funcArgNamesDifferent]\n"
+            "[test.cpp:7:15] -> [test.cpp:8:15]: (style, inconclusive) Function 'h' argument 1 names different: declaration 'a' definition 'b'. [funcArgNamesDifferent]\n",
+            errout_str());
+
+        check("void f(int a);\n" // #14632
+              "void f(int) {}\n"
+              "void g(int);\n"
+              "void g(int b) {}\n"
+              "void h(int);\n"
+              "void h(int) {}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:1:12]: (style, inconclusive) Function 'f' argument 1 names different: declaration 'a' definition '<unnamed>'. [funcArgNamesDifferentUnnamed]\n"
+            "[test.cpp:4:12]: (style, inconclusive) Function 'g' argument 1 names different: declaration '<unnamed>' definition 'b'. [funcArgNamesDifferentUnnamed]\n",
+            errout_str());
+
+        check("void f(void (*fp)(), int x);\n" // #14847
+              "void f(void (*fp)(), int x) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(void (*fp)(int a, int b), int b);\n" // #14853
+              "void f(void (*fp)(int a, int b), int b) {}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void funcArgOrderDifferent() {
@@ -12190,60 +13155,64 @@ class TestOther : public TestFixture {
               "void Fred::func2(int c, int b, int a) { }\n"
               "void Fred::func3(int c, int b, int a) { }\n"
               "void Fred::func4(int c, int b, int a) { }\n",
-              true, false);
+              dinit(CheckOptions, $.inconclusive = false));
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:4:16]: (warning) Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a' [funcArgOrderDifferent]\n"
                       "[test.cpp:5:12] -> [test.cpp:6:16]: (warning) Function 'func3' argument order different: declaration ', b, c' definition 'c, b, a' [funcArgOrderDifferent]\n"
                       "[test.cpp:9:20] -> [test.cpp:14:22]: (warning) Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a' [funcArgOrderDifferent]\n"
                       "[test.cpp:10:20] -> [test.cpp:15:22]: (warning) Function 'func3' argument order different: declaration 'a, b, c' definition 'c, b, a' [funcArgOrderDifferent]\n"
                       "[test.cpp:11:16] -> [test.cpp:16:22]: (warning) Function 'func4' argument order different: declaration ', b, c' definition 'c, b, a' [funcArgOrderDifferent]\n", errout_str());
+
+        check("void f(int N, const int a[N], const int b[N]);\n" // #14710
+              "void f(int N, const int a[N], const int b[N]) {}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #7846 - Syntax error when using C++11 braced-initializer in default argument
     void cpp11FunctionArgInit() {
         // syntax error is not expected
-        ASSERT_NO_THROW(check("\n void foo(int declaration = {}) {"
+        ASSERT_NO_THROW(check("\n void foo(int declaration = {}) {\n"
                               "\n   for (int i = 0; i < 10; i++) {}\n"
-                              "\n }"
-                              "\n  "));
+                              "\n }\n"
+                              "\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void shadowVariables() {
         check("int x;\n"
-              "void f() { int x; }");
+              "void f() { int x; }\n");
         ASSERT_EQUALS("[test.cpp:1:5] -> [test.cpp:2:16]: (style) Local variable 'x' shadows outer variable [shadowVariable]\n", errout_str());
 
         check("int x();\n"
-              "void f() { int x; }");
+              "void f() { int x; }\n");
         ASSERT_EQUALS("[test.cpp:1:5] -> [test.cpp:2:16]: (style) Local variable 'x' shadows outer function [shadowFunction]\n", errout_str());
 
         check("struct C {\n"
               "    C(int x) : x(x) {}\n" // <- we do not want a FP here
               "    int x;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  if (cond) {int x;}\n" // <- not a shadow variable
               "  int x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int size() {\n"
               "  int size;\n" // <- not a shadow variable
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #8954 - lambda
               "  int x;\n"
-              "  auto f = [](){ int x; }"
-              "}");
+              "  auto f = [](){ int x; }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void f(int x) { int x; }");
+        check("void f(int x) { int x; }\n");
         ASSERT_EQUALS("[test.cpp:1:12] -> [test.cpp:1:21]: (style) Local variable 'x' shadows outer argument [shadowArgument]\n", errout_str());
 
-        check("class C { C(); void foo() { static int C = 0; } }"); // #9195 - shadow constructor
+        check("class C { C(); void foo() { static int C = 0; } }\n"); // #9195 - shadow constructor
         ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n" // #10091 - shadow destructor
@@ -12252,7 +13221,7 @@ class TestOther : public TestFixture {
               "        bool C{};\n"
               "    }\n"
               "};\n"
-              "C::~C() = default;");
+              "C::~C() = default;\n");
         ASSERT_EQUALS("", errout_str());
 
         // 10752 - no
@@ -12263,21 +13232,21 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "        return i;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    int i{};\n"
               "    void f() { int i; }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:20]: (style) Local variable 'i' shadows outer variable [shadowVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:20]: (style) Local variable 'i' shadows outer member [shadowMember]\n", errout_str());
 
         check("struct S {\n"
               "    int i{};\n"
               "    std::vector<int> v;\n"
               "    void f() const { for (const int& i : v) {} }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:38]: (style) Local variable 'i' shadows outer variable [shadowVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:38]: (style) Local variable 'i' shadows outer member [shadowMember]\n", errout_str());
 
         check("struct S {\n" // #10405
               "    F* f{};\n"
@@ -12287,14 +13256,14 @@ class TestOther : public TestFixture {
               "void S::f() const {\n"
               "    for (const F& f : fl) {}\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:7:19]: (style) Local variable 'f' shadows outer variable [shadowVariable]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:7:19]: (style) Local variable 'f' shadows outer member [shadowMember]\n", errout_str());
 
         check("extern int a;\n"
               "int a;\n"
               "static int f(void) {\n"
               "    int a;\n"
               "    return 0;\n"
-              "}\n", false);
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:1:12] -> [test.c:4:9]: (style) Local variable 'a' shadows outer variable [shadowVariable]\n", errout_str());
 
         check("int f() {\n" // #12591
@@ -12303,25 +13272,64 @@ class TestOther : public TestFixture {
               "}\n"
               "int g() { return 1; }\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #13888
+              "    int i;\n"
+              "    friend int f() { int i = 5; return i; }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int x;\n"
+              "void f(int x) {}\n");
+        ASSERT_EQUALS("[test.cpp:1:5] -> [test.cpp:2:12]: (style) Argument 'x' shadows outer variable [shadowVariable]\n", errout_str());
+
+        check("void x() {}\n"
+              "void f(int x) {}\n");
+        ASSERT_EQUALS("[test.cpp:1:6] -> [test.cpp:2:12]: (style) Argument 'x' shadows outer function [shadowFunction]\n", errout_str());
+
+        check("struct S { int v; void func(int v); };\n"
+              "void S::func(int v) { this->v = v; }\n");
+        ASSERT_EQUALS("[test.cpp:1:16] -> [test.cpp:2:18]: (style) Argument 'v' shadows outer member [shadowMember]\n", errout_str());
+
+        check("struct S { int v; void func(void); };\n"
+              "void S::func() { int v = 0; }\n");
+        ASSERT_EQUALS("[test.cpp:1:16] -> [test.cpp:2:22]: (style) Local variable 'v' shadows outer member [shadowMember]\n", errout_str());
+
+        check("struct S { int v; explicit S(int v); };\n"
+              "S::S(int v) : v(v) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int v(); explicit S(int v); };\n"
+              "S::S(int v) : v(v) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i(); static void f(int i) {} };\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { static int i(); static void f(int i) {} };\n");
+        ASSERT_EQUALS("[test.cpp:1:23] -> [test.cpp:1:46]: (style) Argument 'i' shadows outer function [shadowFunction]\n", errout_str());
+
+        check("struct S { void g(float f) {} void f() {} };\n");
+        ASSERT_EQUALS("[test.cpp:1:36] -> [test.cpp:1:25]: (style) Argument 'f' shadows outer function [shadowFunction]\n", errout_str());
     }
 
     void knownArgument() {
         check("void g(int);\n"
               "void f(int x) {\n"
               "   g((x & 0x01) >> 7);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Argument '(x&0x01)>>7' to function g is always 0. It does not matter what value 'x' has. [knownArgument]\n", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "   g((int)((x & 0x01) >> 7));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (style) Argument '(int)((x&0x01)>>7)' to function g is always 0. It does not matter what value 'x' has. [knownArgument]\n", errout_str());
 
         check("void g(int, int);\n"
               "void f(int x) {\n"
               "   g(x, (x & 0x01) >> 7);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:20]: (style) Argument '(x&0x01)>>7' to function g is always 0. It does not matter what value 'x' has. [knownArgument]\n",
             errout_str());
@@ -12329,65 +13337,65 @@ class TestOther : public TestFixture {
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g(0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void h() { return 1; }\n"
               "void f(int x) {\n"
               "    g(h());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g(std::strlen(\"a\"));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g((int)0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(Foo *);\n"
               "void f() {\n"
               "    g(reinterpret_cast<Foo*>(0));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    x = 0;\n"
               "    g(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f() {\n"
               "    const int x = 0;\n"
               "    g(x + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f() {\n"
               "    char i = 1;\n"
               "    g(static_cast<int>(i));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("char *yytext;\n"
               "void re_init_scanner() {\n"
               "  int size = 256;\n"
               "  yytext = xmalloc(size * sizeof *yytext);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const char *c) {\n"
               "    if (*c == '+' && (operand || !isalnum(*c))) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8986
@@ -12395,14 +13403,14 @@ class TestOther : public TestFixture {
               "void g() {\n"
               "    const int x[] = { 10, 10 };\n"
               "    f(x[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int);\n"
               "void g() {\n"
               "    int x[] = { 10, 10 };\n"
               "    f(x[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'x' can be declared as const array [constVariable]\n", errout_str());
 
         check("struct A { int x; };"
@@ -12411,21 +13419,21 @@ class TestOther : public TestFixture {
               "    A y;\n"
               "    y.x = 1;\n"
               "    g(y.x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // allow known argument value in assert call
         check("void g(int);\n"
               "void f(int x) {\n"
               "   ASSERT((int)((x & 0x01) >> 7));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9905 - expression that does not use integer calculation at all
         check("void foo() {\n"
               "    const std::string heading = \"Interval\";\n"
               "    std::cout << std::setw(heading.length());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9909 - struct member with known value
@@ -12436,7 +13444,7 @@ class TestOther : public TestFixture {
               "void growLongStack(LongStack* self) {\n"
               "    self->maxsize = 32;\n"
               "    dostuff(self->maxsize * sizeof(intptr_t));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11894
@@ -12531,7 +13539,7 @@ class TestOther : public TestFixture {
               "    bar(P, N); \n"
               "    if (c ? a : b)\n"
               "      baz(P, N); \n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12544,7 +13552,7 @@ class TestOther : public TestFixture {
               "       diff = 1;\n"
               "    }\n"
               "    return diff;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:15] -> [test.cpp:5:8] -> [test.cpp:3:15] -> [test.cpp:5:14] -> [test.cpp:5:12]: (error) Comparing pointers that point to different objects [comparePointers]\n",
             errout_str());
@@ -12555,7 +13563,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x;\n"
               "    int* yp = &y;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9] -> [test.cpp:4:15] -> [test.cpp:3:9] -> [test.cpp:5:15] -> [test.cpp:6:15]: (error) Comparing pointers that point to different objects [comparePointers]\n"
             "[test.cpp:4:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
@@ -12566,7 +13574,7 @@ class TestOther : public TestFixture {
               "    int x = 0;\n"
               "    int y = 1;\n"
               "    return &x > &y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9] -> [test.cpp:4:12] -> [test.cpp:3:9] -> [test.cpp:4:17] -> [test.cpp:4:15]: (error) Comparing pointers that point to different objects [comparePointers]\n",
             errout_str());
@@ -12578,7 +13586,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x.data;\n"
               "    int* yp = &y.data;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:7] -> [test.cpp:5:15] -> [test.cpp:4:7] -> [test.cpp:6:15] -> [test.cpp:7:15]: (error) Comparing pointers that point to different objects [comparePointers]\n"
             "[test.cpp:5:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
@@ -12592,7 +13600,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x->data;\n"
               "    int* yp = &y->data;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:10] -> [test.cpp:3:12] -> [test.cpp:5:15] -> [test.cpp:2:16] -> [test.cpp:4:12] -> [test.cpp:6:15] -> [test.cpp:7:15]: (error) Comparing pointers that point to different objects [comparePointers]\n"
             "[test.cpp:5:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
@@ -12601,7 +13609,7 @@ class TestOther : public TestFixture {
 
         check("bool f(int * xp, int* yp) {\n"
               "    return &xp > &yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:1:14] -> [test.cpp:2:12] -> [test.cpp:1:23] -> [test.cpp:2:18] -> [test.cpp:2:16]: (error) Comparing pointers that point to different objects [comparePointers]\n",
             errout_str());
@@ -12610,7 +13618,7 @@ class TestOther : public TestFixture {
               "    int x = 0;\n"
               "    int y = 1;\n"
               "    return &x - &y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9] -> [test.cpp:4:12] -> [test.cpp:3:9] -> [test.cpp:4:17] -> [test.cpp:4:15]: (error) Subtracting pointers that point to different objects [subtractPointers]\n",
             errout_str());
@@ -12620,19 +13628,19 @@ class TestOther : public TestFixture {
               "    int* xp = &x[0];\n"
               "    int* yp = &x[1];\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:4:10]: (style) Variable 'yp' can be declared as pointer to const [constVariablePointer]\n",
                       errout_str());
 
         check("bool f(const int * xp, const int* yp) {\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f(const int & x, const int& y) {\n"
               "    return &x > &y;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int& g();\n"
@@ -12642,7 +13650,7 @@ class TestOther : public TestFixture {
               "    const int* xp = &x;\n"
               "    const int* yp = &y;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct A {int data;};\n"
@@ -12652,7 +13660,7 @@ class TestOther : public TestFixture {
               "    int* xp = &x->data;\n"
               "    int* yp = &y->data;\n"
               "    return xp > yp;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style) Variable 'xp' can be declared as pointer to const [constVariablePointer]\n"
                       "[test.cpp:6:10]: (style) Variable 'yp' can be declared as pointer to const [constVariablePointer]\n",
                       errout_str());
@@ -12661,7 +13669,7 @@ class TestOther : public TestFixture {
               "int f(S s) {\n"
               "    return &s.i - (int*)&s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:19]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:19]: (warning) Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast [dangerousTypeCast]\n", errout_str());
 
         check("struct S { int i; };\n"
               "int f(S s1, S s2) {\n"
@@ -12703,21 +13711,21 @@ class TestOther : public TestFixture {
               "            return A::Hash{}(a);\n"
               "        }\n"
               "    };\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void moduloOfOne() {
         check("void f(unsigned int x) {\n"
               "  int y = x % 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (style) Modulo of one is always equal to zero [moduloofone]\n", errout_str());
 
         check("void f() {\n"
               "  for (int x = 1; x < 10; x++) {\n"
               "    int y = 100 % x;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, int j) {\n" // #11191
@@ -12725,6 +13733,13 @@ class TestOther : public TestFixture {
               "    if (j % c) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    int i = 0;\n"
+              "    i %= 1;\n"
+              "    (void)i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) Modulo of one is always equal to zero [moduloofone]\n", errout_str());
     }
 
     void sameExpressionPointers() {
@@ -12743,44 +13758,44 @@ class TestOther : public TestFixture {
               "    union { int i; float f; } u;\n"
               "    u.i = 0;\n"
               "    u.i = u.f;\n" // <- error
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Overlapping read/write of union is undefined behavior [overlappingWriteUnion]\n", errout_str());
 
         check("void foo() {\n" // #11013
               "    union { struct { uint8_t a; uint8_t b; }; uint16_t c; } u;\n"
               "    u.a = u.b = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // memcpy
         check("void foo() {\n"
               "    char a[10];\n"
               "    memcpy(&a[5], &a[4], 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    char a[10];\n"
               "    memcpy(a+5, a+4, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    char a[10];\n"
               "    memcpy(a, a+1, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    char a[8];\n"
               "    memcpy(&a[0], &a[4], 4u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("_Bool a[10];\n" // #10350
               "void foo() {\n"
               "    memcpy(&a[5], &a[4], 2u * sizeof(a[0]));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("int K[2];\n" // #12638
@@ -12789,7 +13804,7 @@ class TestOther : public TestFixture {
               "    memcpy(&K[1], &K[0], sizeof(K[0]));\n"
               "    memcpy(p, p + 1, sizeof(*p));\n"
               "    memcpy(p + 1, p, sizeof(*p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int K[2];\n"
@@ -12798,7 +13813,7 @@ class TestOther : public TestFixture {
               "    memcpy(&K[1], &K[0], 2 *sizeof(K[0]));\n"
               "    memcpy(p, p + 1, 2 * sizeof(*p));\n"
               "    memcpy(p + 1, p, 2 * sizeof(*p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n"
                       "[test.cpp:4:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n"
                       "[test.cpp:5:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n"
@@ -12809,25 +13824,25 @@ class TestOther : public TestFixture {
         check("void foo() {\n"
               "    wchar_t a[10];\n"
               "    wmemcpy(&a[5], &a[4], 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in wmemcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t a[10];\n"
               "    wmemcpy(a+5, a+4, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in wmemcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         check("void foo() {\n"
               "    wchar_t a[10];\n"
               "    wmemcpy(a, a+1, 2u);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Overlapping read/write in wmemcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
 
         // strcpy
         check("void foo(char *ptr) {\n"
               "    strcpy(ptr, ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Overlapping read/write in strcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
     }
 
@@ -12866,14 +13881,14 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct A { bool x; };\n"
+        check("struct A { bool x; };\n" // #14481
               "bool f(A* a) {\n"
               "    if (a) {\n"
               "        return a->x;\n"
               "    }\n"
               "    return false;\n"
               "}\n");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("struct A { int* x; };\n"
               "bool f(A a) {\n"
@@ -12884,7 +13899,7 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:4:17]: (style) Pointer expression 'a.x' converted to bool is always true. [knownPointerToBool]\n", errout_str());
 
-        check("void f(bool* b) { if (b) *b = true; }");
+        check("void f(bool* b) { if (b) *b = true; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
@@ -12932,7 +13947,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    bool b[2] = {};\n"
               "    g(b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -12944,6 +13959,18 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (performance) Range variable 's' should be declared as const reference. [iterateByValue]\n",
                       errout_str());
+        check("void f() {\n" // #13696
+              "    struct T {\n"
+              "        std::string name;\n"
+              "        UnknownClass member;\n"
+              "    };\n"
+              "\n"
+              "    const std::set<T> ss;\n"
+              "    for (auto s : ss)\n"
+              "        (void)s.name;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:8:15]: (performance) Range variable 's' should be declared as const reference. [iterateByValue]\n",
+                      errout_str());
     }
 
     void knownConditionFloating()
@@ -13093,6 +14120,90 @@ class TestOther : public TestFixture {
             "[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'i > +1' is always false. [knownConditionTrueFalse]\n",
             errout_str());
     }
+
+    void unionZeroInitBasic() {
+        check(
+            "union bad_union_0 {\n"
+            "  char c;\n"
+            "  long long i64;\n"
+            "  void *p;\n"
+            "};\n"
+            "\n"
+            "typedef union {\n"
+            "  char c;\n"
+            "  int i;\n"
+            "} bad_union_1;\n"
+            "\n"
+            "extern void e(union bad_union_0 *);\n"
+            "\n"
+            "void\n"
+            "foo(void)\n"
+            "{\n"
+            "  union { int i; char c; } good0 = {0};\n"
+            "  union { int i; char c; } good1 = {};\n"
+            "\n"
+            "  union { char c; int i; } bad0 = {0};\n"
+            "  union bad_union_0 bad1 = {0};\n"
+            "  e(&bad1);\n"
+            "  bad_union_1 bad2 = {0};\n"
+            "}\n");
+        const std::string exp = unionZeroInitMessage(20, 28, "bad0", "i") +
+                                unionZeroInitMessage(21, 21, "bad1", "i64") +
+                                unionZeroInitMessage(23, 15, "bad2", "i");
+        ASSERT_EQUALS(exp, errout_str());
+    }
+
+    void unionZeroInitArrayMember() {
+        check(
+            "void foo(void) {\n"
+            " union { int c; char s8[2]; } u = {0};\n"
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void unionZeroInitStructMember() {
+        check(
+            "void foo(void) {\n"
+            "  union {\n"
+            "    int c;\n"
+            "     struct {\n"
+            "       char x;\n"
+            "       struct {\n"
+            "         char y;\n"
+            "       } s1;\n"
+            "    } s0;\n"
+            "  } u = {0};\n"
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void unionZeroInitUnknownType() {
+        check(
+            "union u {\n"
+            "  Unknown x;\n"
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void unionZeroInitBitfields() {
+        check(
+            "typedef union Evex {\n"
+            "  int u32;\n"
+            "  struct {\n"
+            "    char mmm:3,\n"
+            "         b4:1,\n"
+            "         r4:1,\n"
+            "         b3:1,\n"
+            "         x3:1,\n"
+            "         r3:1;\n"
+            "  } extended;\n"
+            "} Evex;\n"
+            "\n"
+            "void foo(void) {\n"
+            "  Evex evex = {0};\n"
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
 };
 
 REGISTER_TEST(TestOther)
diff --git a/test/testpath.cpp b/test/testpath.cpp
index 44d5f10a30b..0ebe343685f 100644
--- a/test/testpath.cpp
+++ b/test/testpath.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -57,6 +57,7 @@ class TestPath : public TestFixture {
         TEST_CASE(getAbsolutePath);
         TEST_CASE(exists);
         TEST_CASE(fromNativeSeparators);
+        TEST_CASE(isRelative);
     }
 
     void removeQuotationMarks() const {
@@ -172,11 +173,38 @@ class TestPath : public TestFixture {
     }
 
     void join() const {
+        ASSERT_EQUALS("", Path::join("", ""));
+        ASSERT_EQUALS("b", Path::join("", "b"));
+        ASSERT_EQUALS("/b", Path::join("", "/b"));
+        ASSERT_EQUALS("/b", Path::join("", "\\b"));
+
         ASSERT_EQUALS("a", Path::join("a", ""));
-        ASSERT_EQUALS("a", Path::join("", "a"));
         ASSERT_EQUALS("a/b", Path::join("a", "b"));
-        ASSERT_EQUALS("a/b", Path::join("a/", "b"));
         ASSERT_EQUALS("/b", Path::join("a", "/b"));
+        ASSERT_EQUALS("/b", Path::join("a", "\\b"));
+
+        ASSERT_EQUALS("a/", Path::join("a/", ""));
+        ASSERT_EQUALS("a/b", Path::join("a/", "b"));
+        ASSERT_EQUALS("/b", Path::join("a/", "/b"));
+        ASSERT_EQUALS("/b", Path::join("a/", "\\b"));
+
+        ASSERT_EQUALS("a/", Path::join("a\\", ""));
+        ASSERT_EQUALS("a/b", Path::join("a\\", "b"));
+        ASSERT_EQUALS("/b", Path::join("a\\", "/b"));
+        ASSERT_EQUALS("/b", Path::join("a\\", "\\b"));
+
+        // TODO: how to absolute Windows path in path2?
+        //ASSERT_EQUALS("", Path::join("a", "s:/b"));
+
+        //ASSERT_EQUALS("", Path::join("S:\\a", "S:/b"));
+        //ASSERT_EQUALS("", Path::join("S:\\a", "S:\\b"));
+        //ASSERT_EQUALS("", Path::join("S:\\a", "/b"));
+
+        //ASSERT_EQUALS("", Path::join("S:/a", "S:/b"));
+        //ASSERT_EQUALS("", Path::join("S:/a", "S:\\b"));
+        //ASSERT_EQUALS("", Path::join("S:/a", "/b"));
+
+        ASSERT_EQUALS("a/b/c", Path::join("a", "b", "c"));
     }
 
     void isDirectory() const {
@@ -290,7 +318,7 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS(Standards::Language::CPP, Path::identify("/mnt/c/foo/index.cpp", false));
         ASSERT_EQUALS(Standards::Language::CPP, Path::identify("/mnt/c/foo/index.Cpp", false));
 
-        // TODO: check for case-insenstive filesystem instead
+        // TODO: check for case-insensitive filesystem instead
         // In unix .C is considered C++
 #if !defined(_WIN32) && !(defined(__APPLE__) && defined(__MACH__))
         ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.C", false));
@@ -488,7 +516,8 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS(expected, Path::getAbsoluteFilePath(Path::join(cwd, "testabspath.txt")));
 
         std::string cwd_up = Path::getPathFromFilename(cwd);
-        cwd_up.pop_back(); // remove trailing slash
+        if (cwd_up != "/")
+            cwd_up.pop_back(); // remove trailing slash
         ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, "..")));
         ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, "../")));
         ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, "..\\")));
@@ -508,7 +537,7 @@ class TestPath : public TestFixture {
 
 #ifndef _WIN32
         // the underlying realpath() call only returns something if the path actually exists
-        ASSERT_THROW_EQUALS_2(Path::getAbsoluteFilePath("testabspath2.txt"), std::runtime_error, "path 'testabspath2.txt' does not exist");
+        ASSERT_THROW_EQUALS(Path::getAbsoluteFilePath("testabspath2.txt"), std::runtime_error, "path 'testabspath2.txt' does not exist");
 #else
         ASSERT_EQUALS(Path::toNativeSeparators(Path::join(cwd, "testabspath2.txt")), Path::getAbsoluteFilePath("testabspath2.txt"));
 #endif
@@ -547,7 +576,7 @@ class TestPath : public TestFixture {
 #endif
 
 #ifndef _WIN32
-        ASSERT_THROW_EQUALS_2(Path::getAbsoluteFilePath("C:\\path\\files.txt"), std::runtime_error, "path 'C:\\path\\files.txt' does not exist");
+        ASSERT_THROW_EQUALS(Path::getAbsoluteFilePath("C:\\path\\files.txt"), std::runtime_error, "path 'C:\\path\\files.txt' does not exist");
 #endif
 
         // TODO: test UNC paths
@@ -593,6 +622,33 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS("//lib/file.c", Path::fromNativeSeparators("\\\\lib\\file.c"));
         ASSERT_EQUALS("./lib/file.c", Path::fromNativeSeparators(".\\lib\\file.c"));
     }
+
+    void isRelative() const {
+        ASSERT_EQUALS(true, Path::isRelative("dir/file"));
+        ASSERT_EQUALS(true, Path::isRelative("dir\\file"));
+
+        // TODO: is this expected?
+        ASSERT_EQUALS(true, Path::isRelative("file/"));
+        ASSERT_EQUALS(true, Path::isRelative("file\\"));
+
+        ASSERT_EQUALS(false, Path::isRelative("file"));
+
+#ifdef _WIN32
+        // this is a relative path on Windows
+        ASSERT_EQUALS(true, Path::isRelative("/dir/file"));
+#else
+        ASSERT_EQUALS(false, Path::isRelative("/dir/file"));
+#endif
+
+#ifdef _WIN32
+        // TODO: this is not detected as absolute path in _WIN32 builds
+        ASSERT_EQUALS(false, Path::isRelative("c:\\dir\\file"));
+        ASSERT_EQUALS(false, Path::isRelative("c:/dir/file"));
+#else
+        ASSERT_EQUALS(true, Path::isRelative("c:\\dir\\file"));
+        ASSERT_EQUALS(true, Path::isRelative("c:/dir/file"));
+#endif
+    }
 };
 
 REGISTER_TEST(TestPath)
diff --git a/test/testpathmatch.cpp b/test/testpathmatch.cpp
index 45fbde54d58..7e721502a11 100644
--- a/test/testpathmatch.cpp
+++ b/test/testpathmatch.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -20,7 +20,6 @@
 #include "fixture.h"
 
 #include <string>
-#include <utility>
 #include <vector>
 
 
@@ -29,10 +28,24 @@ class TestPathMatch : public TestFixture {
     TestPathMatch() : TestFixture("TestPathMatch") {}
 
 private:
-    const PathMatch emptyMatcher{std::vector<std::string>()};
-    const PathMatch srcMatcher{std::vector<std::string>(1, "src/")};
-    const PathMatch fooCppMatcher{std::vector<std::string>(1, "foo.cpp")};
-    const PathMatch srcFooCppMatcher{std::vector<std::string>(1, "src/foo.cpp")};
+    class PathMatchTest final : public PathMatch
+    {
+        friend class TestPathMatch;
+    };
+
+    static constexpr auto unix = PathMatch::Syntax::unix;
+    static constexpr auto windows = PathMatch::Syntax::windows;
+    static constexpr auto ifreg = PathMatch::Filemode::regular;
+    static constexpr auto ifdir = PathMatch::Filemode::directory;
+#ifdef _WIN32
+    const std::string basepath{"C:\\test"};
+#else
+    const std::string basepath{"/test"};
+#endif
+    const PathMatch emptyMatcher{{}, basepath};
+    const PathMatch srcMatcher{{"src/"}, basepath};
+    const PathMatch fooCppMatcher{{"foo.cpp"}, basepath};
+    const PathMatch srcFooCppMatcher{{"src/foo.cpp"}, basepath};
 
     void run() override {
         TEST_CASE(emptymaskemptyfile);
@@ -67,6 +80,11 @@ class TestPathMatch : public TestFixture {
         TEST_CASE(filemaskpath3);
         TEST_CASE(filemaskpath4);
         TEST_CASE(mixedallmatch);
+        TEST_CASE(glob1);
+        TEST_CASE(glob2);
+        TEST_CASE(globstar1);
+        TEST_CASE(globstar2);
+        TEST_CASE(pathiterator);
     }
 
     // Test empty PathMatch
@@ -75,16 +93,16 @@ class TestPathMatch : public TestFixture {
     }
 
     void emptymaskpath1() const {
-        ASSERT(!emptyMatcher.match("src/"));
+        ASSERT(!emptyMatcher.match("src/", ifdir));
     }
 
     void emptymaskpath2() const {
-        ASSERT(!emptyMatcher.match("../src/"));
+        ASSERT(!emptyMatcher.match("../src/", ifdir));
     }
 
     void emptymaskpath3() const {
-        ASSERT(!emptyMatcher.match("/home/user/code/src/"));
-        ASSERT(!emptyMatcher.match("d:/home/user/code/src/"));
+        ASSERT(!emptyMatcher.match("/home/user/code/src/", ifdir));
+        ASSERT(!emptyMatcher.match("d:/home/user/code/src/", ifdir));
     }
 
     // Test PathMatch containing "src/"
@@ -93,18 +111,20 @@ class TestPathMatch : public TestFixture {
     }
 
     void onemasksamepath() const {
-        ASSERT(srcMatcher.match("src/"));
+        ASSERT(srcMatcher.match("src/", ifdir));
+        ASSERT(!srcMatcher.match("src/", ifreg));
     }
 
     void onemasksamepathdifferentslash() const {
-        const PathMatch srcMatcher2{std::vector<std::string>(1, "src\\")};
-        ASSERT(srcMatcher2.match("src/"));
+        PathMatch srcMatcher2({"src\\"}, basepath, windows);
+        ASSERT(srcMatcher2.match("src/", ifdir));
+        ASSERT(!srcMatcher2.match("src/", ifreg));
     }
 
     void onemasksamepathdifferentcase() const {
-        std::vector<std::string> masks(1, "sRc/");
-        PathMatch match(std::move(masks), false);
-        ASSERT(match.match("srC/"));
+        PathMatch match({"sRc/"}, basepath, windows);
+        ASSERT(match.match("srC/", ifdir));
+        ASSERT(!match.match("srC/", ifreg));
     }
 
     void onemasksamepathwithfile() const {
@@ -115,9 +135,9 @@ class TestPathMatch : public TestFixture {
         const std::string longerExclude("longersrc/");
         const std::string shorterToMatch("src/");
         ASSERT(shorterToMatch.length() < longerExclude.length());
-        PathMatch match(std::vector<std::string>(1, longerExclude));
-        ASSERT(match.match(longerExclude));
-        ASSERT(!match.match(shorterToMatch));
+        PathMatch match({longerExclude});
+        ASSERT(match.match(longerExclude, ifdir));
+        ASSERT(!match.match(shorterToMatch, ifdir));
     }
 
     void onemaskdifferentdir1() const {
@@ -137,44 +157,43 @@ class TestPathMatch : public TestFixture {
     }
 
     void onemasklongerpath1() const {
-        ASSERT(srcMatcher.match("/tmp/src/"));
-        ASSERT(srcMatcher.match("d:/tmp/src/"));
+        ASSERT(srcMatcher.match("/tmp/src/", ifdir));
+        ASSERT(srcMatcher.match("d:/tmp/src/", ifdir));
     }
 
     void onemasklongerpath2() const {
-        ASSERT(srcMatcher.match("src/module/"));
+        ASSERT(srcMatcher.match("src/module/", ifdir));
     }
 
     void onemasklongerpath3() const {
-        ASSERT(srcMatcher.match("project/src/module/"));
+        ASSERT(srcMatcher.match("project/src/module/", ifdir));
     }
 
     void onemaskcwd() const {
-        ASSERT(!srcMatcher.match("./src"));
+        ASSERT(srcMatcher.match("./src", ifdir));
     }
 
     void twomasklongerpath1() const {
-        std::vector<std::string> masks = { "src/", "module/" };
-        PathMatch match(std::move(masks));
-        ASSERT(!match.match("project/"));
+        PathMatch match({ "src/", "module/" });
+        ASSERT(!match.match("project/", ifdir));
     }
 
     void twomasklongerpath2() const {
-        std::vector<std::string> masks = { "src/", "module/" };
-        PathMatch match(std::move(masks));
-        ASSERT(match.match("project/src/"));
+        PathMatch match({ "src/", "module/" });
+        ASSERT(match.match("project/src/", ifdir));
+        ASSERT(!match.match("project/src/", ifreg));
     }
 
     void twomasklongerpath3() const {
-        std::vector<std::string> masks = { "src/", "module/" };
-        PathMatch match(std::move(masks));
-        ASSERT(match.match("project/module/"));
+        PathMatch match({ "src/", "module/" });
+        ASSERT(match.match("project/module/", ifdir));
+        ASSERT(!match.match("project/module/", ifreg));
     }
 
     void twomasklongerpath4() const {
-        std::vector<std::string> masks = { "src/", "module/" };
-        PathMatch match(std::move(masks));
-        ASSERT(match.match("project/src/module/"));
+        PathMatch match({ "src/", "module/" });
+        ASSERT(match.match("project/src/module/", ifdir));
+        ASSERT(match.match("project/src/module/", ifreg));
     }
 
     // Test PathMatch containing "foo.cpp"
@@ -183,8 +202,7 @@ class TestPathMatch : public TestFixture {
     }
 
     void filemaskdifferentcase() const {
-        std::vector<std::string> masks(1, "foo.cPp");
-        PathMatch match(std::move(masks), false);
+        PathMatch match({"foo.cPp"}, basepath, windows);
         ASSERT(match.match("fOo.cpp"));
     }
 
@@ -219,11 +237,77 @@ class TestPathMatch : public TestFixture {
 
     void mixedallmatch() const { // #13570
         // when trying to match a directory against a directory entry it erroneously modified a local variable also used for file matching
-        std::vector<std::string> masks = { "tests/", "file.c" };
-        PathMatch match(std::move(masks));
-        ASSERT(match.match("tests/"));
+        PathMatch match({ "tests/", "file.c" });
+        ASSERT(match.match("tests/", ifdir));
+        ASSERT(!match.match("tests/", ifreg));
         ASSERT(match.match("lib/file.c"));
     }
+
+    void glob1() const {
+        PathMatch match({"test?.cpp"});
+        ASSERT(match.match("test1.cpp"));
+        ASSERT(match.match("src/test1.cpp"));
+        ASSERT(match.match("test1.cpp/src"));
+        ASSERT(!match.match("test1.c"));
+        ASSERT(!match.match("test.cpp"));
+    }
+
+    void glob2() const {
+        PathMatch match({"test*.cpp"});
+        ASSERT(match.match("test1.cpp"));
+        ASSERT(match.match("src/test1.cpp"));
+        ASSERT(match.match("test1.cpp/src"));
+        ASSERT(!match.match("test1.c"));
+        ASSERT(match.match("test.cpp"));
+    }
+
+    void globstar1() const {
+        PathMatch match({"src/**/foo.c"});
+        ASSERT(match.match("src/lib/foo/foo.c"));
+        ASSERT(match.match("src/lib/foo/bar/foo.c"));
+        ASSERT(!match.match("src/lib/foo/foo.cpp"));
+        ASSERT(!match.match("src/lib/foo/bar/foo.cpp"));
+        ASSERT(!match.match("src/foo.c"));
+    }
+
+    void globstar2() const {
+        PathMatch match({"./src/**/foo.c"});
+        ASSERT(match.match("src/lib/foo/foo.c"));
+        ASSERT(match.match("src/lib/foo/bar/foo.c"));
+        ASSERT(!match.match("src/lib/foo/foo.cpp"));
+        ASSERT(!match.match("src/lib/foo/bar/foo.cpp"));
+        ASSERT(!match.match("src/foo.c"));
+    }
+
+    void pathiterator() const {
+        /* See https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats
+         * for information on Windows path syntax. */
+        using PathIterator = PathMatchTest::PathIterator;
+        ASSERT_EQUALS("/", PathIterator("/", nullptr, unix).read());
+        ASSERT_EQUALS("/", PathIterator("//", nullptr, unix).read());
+        ASSERT_EQUALS("/", PathIterator("/", "/", unix).read());
+        ASSERT_EQUALS("/hello/world", PathIterator("/hello/universe/.", "../world//", unix).read());
+        ASSERT_EQUALS("/", PathIterator("//./..//.///.", "../../..///", unix).read());
+        ASSERT_EQUALS("/foo/bar", PathIterator(nullptr, "/foo/bar/.", unix).read());
+        ASSERT_EQUALS("/foo/bar", PathIterator("/foo/bar/.", nullptr, unix).read());
+        ASSERT_EQUALS("/foo/bar", PathIterator("/foo", "bar", unix).read());
+        ASSERT_EQUALS("", PathIterator("", "", unix).read());
+        ASSERT_EQUALS("", PathIterator("", nullptr, unix).read());
+        ASSERT_EQUALS("", PathIterator(nullptr, "", unix).read());
+        ASSERT_EQUALS("", PathIterator(nullptr, nullptr, unix).read());
+        ASSERT_EQUALS("c:", PathIterator("C:", nullptr, windows).read());
+        /* C: without slash is a bit ambiguous. It should probably not be considered a root because it's
+         * not fully qualified (it designates the current directory on the C drive),
+         * so this test could be considered to be unspecified behavior. */
+        ASSERT_EQUALS("c:", PathIterator("C:", "../..", windows).read());
+        ASSERT_EQUALS("c:/windows/system32", PathIterator("C:", "Windows\\System32\\Drivers\\..\\.", windows).read());
+        ASSERT_EQUALS("c:/", PathIterator("C:\\Program Files\\", "..", windows).read());
+        ASSERT_EQUALS("//./", PathIterator("\\\\.\\C:\\", "../..", windows).read());
+        ASSERT_EQUALS("//./", PathIterator("\\\\.\\", "..\\..", windows).read());
+        ASSERT_EQUALS("//?/", PathIterator("\\\\?\\", "..\\..", windows).read());
+        /* The server and share should actually be considered part of the root and not be removed */
+        ASSERT_EQUALS("//", PathIterator("\\\\Server\\Share\\Directory", "../..\\../..", windows).read());
+    }
 };
 
 REGISTER_TEST(TestPathMatch)
diff --git a/test/testplatform.cpp b/test/testplatform.cpp
index d01eefcb812..ccb7d9b41a8 100644
--- a/test/testplatform.cpp
+++ b/test/testplatform.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -37,11 +37,12 @@ class TestPlatform : public TestFixture {
         TEST_CASE(valid_config_win32w);
         TEST_CASE(valid_config_unix32);
         TEST_CASE(valid_config_win64);
+        // TODO: test native and unspecified
         TEST_CASE(valid_config_file_1);
         TEST_CASE(valid_config_file_2);
-        TEST_CASE(valid_config_file_3);
         TEST_CASE(valid_config_file_4);
         TEST_CASE(invalid_config_file_1);
+        TEST_CASE(invalid_config_file_2);
         TEST_CASE(empty_elements);
         TEST_CASE(default_platform);
         TEST_CASE(limitsDefines);
@@ -50,7 +51,12 @@ class TestPlatform : public TestFixture {
         TEST_CASE(wrong_root_node);
     }
 
-    static bool readPlatform(Platform& platform, const char* xmldata) {
+    class PlatformTest final : public Platform
+    {
+        friend class TestPlatform;
+    };
+
+    static bool readPlatform(PlatformTest& platform, const char* xmldata) {
         tinyxml2::XMLDocument doc;
         return (doc.Parse(xmldata) == tinyxml2::XML_SUCCESS) && platform.loadFromXmlDocument(&doc);
     }
@@ -58,7 +64,7 @@ class TestPlatform : public TestFixture {
     void empty() const {
         // An empty platform file does not change values, only the type.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n<platform/>";
-        Platform platform;
+        PlatformTest platform;
         // TODO: this should fail - platform files need to be complete
         TODO_ASSERT(!readPlatform(platform, xmldata));
     }
@@ -80,7 +86,7 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(2, platform.sizeof_wchar_t);
         ASSERT_EQUALS(4, platform.sizeof_size_t);
         ASSERT_EQUALS(4, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
@@ -105,12 +111,15 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(4, platform.sizeof_wchar_t);
         ASSERT_EQUALS(8, platform.sizeof_size_t);
         ASSERT_EQUALS(8, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
         ASSERT_EQUALS(64, platform.long_bit);
         ASSERT_EQUALS(64, platform.long_long_bit);
+        ASSERT_EQUALS(32, platform.float_bit);
+        ASSERT_EQUALS(64, platform.double_bit);
+        ASSERT_EQUALS(128, platform.long_double_bit);
     }
 
     void valid_config_win32w() const {
@@ -130,12 +139,15 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(2, platform.sizeof_wchar_t);
         ASSERT_EQUALS(4, platform.sizeof_size_t);
         ASSERT_EQUALS(4, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
         ASSERT_EQUALS(32, platform.long_bit);
         ASSERT_EQUALS(64, platform.long_long_bit);
+        ASSERT_EQUALS(32, platform.float_bit);
+        ASSERT_EQUALS(64, platform.double_bit);
+        ASSERT_EQUALS(64, platform.long_double_bit);
     }
 
     void valid_config_unix32() const {
@@ -155,12 +167,15 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(4, platform.sizeof_wchar_t);
         ASSERT_EQUALS(4, platform.sizeof_size_t);
         ASSERT_EQUALS(4, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
         ASSERT_EQUALS(32, platform.long_bit);
         ASSERT_EQUALS(64, platform.long_long_bit);
+        ASSERT_EQUALS(32, platform.float_bit);
+        ASSERT_EQUALS(64, platform.double_bit);
+        ASSERT_EQUALS(96, platform.long_double_bit);
     }
 
     void valid_config_win64() const {
@@ -180,12 +195,15 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(2, platform.sizeof_wchar_t);
         ASSERT_EQUALS(8, platform.sizeof_size_t);
         ASSERT_EQUALS(8, platform.sizeof_pointer);
-        ASSERT_EQUALS('\0', platform.defaultSign);
+        ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS(16, platform.short_bit);
         ASSERT_EQUALS(32, platform.int_bit);
         ASSERT_EQUALS(32, platform.long_bit);
         ASSERT_EQUALS(64, platform.long_long_bit);
+        ASSERT_EQUALS(32, platform.float_bit);
+        ASSERT_EQUALS(64, platform.double_bit);
+        ASSERT_EQUALS(64, platform.long_double_bit);
     }
 
     void valid_config_file_1() const {
@@ -193,6 +211,7 @@ class TestPlatform : public TestFixture {
         // Similar to the avr8 platform file.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>false</windows>\n"
                                    "  <char_bit>8</char_bit>\n"
                                    "  <default-sign>unsigned</default-sign>\n"
                                    "  <sizeof>\n"
@@ -209,7 +228,7 @@ class TestPlatform : public TestFixture {
                                    "    <wchar_t>2</wchar_t>\n"
                                    "  </sizeof>\n"
                                    " </platform>";
-        Platform platform;
+        PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
         ASSERT_EQUALS(Platform::Type::File, platform.type);
         ASSERT(!platform.isWindows());
@@ -237,6 +256,7 @@ class TestPlatform : public TestFixture {
         // char_bit > 8.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>true</windows>\n"
                                    "  <char_bit>20</char_bit>\n"
                                    "  <default-sign>signed</default-sign>\n"
                                    "  <sizeof>\n"
@@ -253,10 +273,10 @@ class TestPlatform : public TestFixture {
                                    "    <wchar_t>11</wchar_t>\n"
                                    "  </sizeof>\n"
                                    " </platform>";
-        Platform platform;
+        PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
         ASSERT_EQUALS(Platform::Type::File, platform.type);
-        ASSERT(!platform.isWindows());
+        ASSERT(platform.isWindows());
         ASSERT_EQUALS(20, platform.char_bit);
         ASSERT_EQUALS('s', platform.defaultSign);
         ASSERT_EQUALS(1, platform.sizeof_bool);
@@ -276,11 +296,12 @@ class TestPlatform : public TestFixture {
         ASSERT_EQUALS(100, platform.long_long_bit);
     }
 
-    void valid_config_file_3() const {
-        // Valid platform configuration without any usable information.
+    void invalid_config_file_2() const {
+        // Invalid platform configuration without any usable information.
         // Similar like an empty file.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows1>true</windows1>\n"
                                    "  <char_bit1>8</char_bit1>\n"
                                    "  <default-sign1>unsigned</default-sign1>\n"
                                    "  <sizeof1>\n"
@@ -297,7 +318,7 @@ class TestPlatform : public TestFixture {
                                    "    <wchar_t1>11</wchar_t1>\n"
                                    "  </sizeof1>\n"
                                    " </platform>";
-        Platform platform;
+        PlatformTest platform;
         // TODO: needs to fail - files need to be complete
         TODO_ASSERT(!readPlatform(platform, xmldata));
     }
@@ -307,6 +328,7 @@ class TestPlatform : public TestFixture {
         // set to 0.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>true</windows>\n"
                                    "  <char_bit>0</char_bit>\n"
                                    "  <default-sign>z</default-sign>\n"
                                    "  <sizeof>\n"
@@ -323,10 +345,10 @@ class TestPlatform : public TestFixture {
                                    "    <wchar_t>0</wchar_t>\n"
                                    "  </sizeof>\n"
                                    " </platform>";
-        Platform platform;
+        PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
         ASSERT_EQUALS(Platform::Type::File, platform.type);
-        ASSERT(!platform.isWindows());
+        ASSERT(platform.isWindows());
         ASSERT_EQUALS(0, platform.char_bit);
         ASSERT_EQUALS('z', platform.defaultSign);
         ASSERT_EQUALS(0, platform.sizeof_bool);
@@ -350,6 +372,7 @@ class TestPlatform : public TestFixture {
         // Invalid XML file: mismatching elements "boolt" vs "bool".
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows>false</windows>\n"
                                    "  <char_bit>8</char_bit>\n"
                                    "  <default-sign>unsigned</default-sign>\n"
                                    "  <sizeof>\n"
@@ -366,7 +389,7 @@ class TestPlatform : public TestFixture {
                                    "    <wchar_t>2</wchar_t>\n"
                                    "  </sizeof>\n"
                                    " </platform>";
-        Platform platform;
+        PlatformTest platform;
         ASSERT(!readPlatform(platform, xmldata));
     }
 
@@ -375,6 +398,7 @@ class TestPlatform : public TestFixture {
         // Similar like an empty file.
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platform>\n"
+                                   "  <windows></windows>\n"
                                    "  <char_bit></char_bit>\n"
                                    "  <default-sign></default-sign>\n"
                                    "  <sizeof>\n"
@@ -391,7 +415,7 @@ class TestPlatform : public TestFixture {
                                    "    <wchar_t></wchar_t>\n"
                                    "  </sizeof>\n"
                                    " </platform>";
-        Platform platform;
+        PlatformTest platform;
         ASSERT(!readPlatform(platform, xmldata));
     }
 
@@ -422,14 +446,14 @@ class TestPlatform : public TestFixture {
 
     void no_root_node() const {
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>";
-        Platform platform;
+        PlatformTest platform;
         ASSERT(!readPlatform(platform, xmldata));
     }
 
     void wrong_root_node() const {
         constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
                                    "<platforms/>";
-        Platform platform;
+        PlatformTest platform;
         ASSERT(!readPlatform(platform, xmldata));
     }
 };
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
index 9e95fabc949..85568c974ac 100644
--- a/test/testpostfixoperator.cpp
+++ b/test/testpostfixoperator.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -38,8 +38,7 @@ class TestPostfixOperator : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for postfix operators..
-        CheckPostfixOperator checkPostfixOperator(&tokenizer, &settings, this);
+        CheckPostfixOperatorImpl checkPostfixOperator(&tokenizer, settings, *this);
         checkPostfixOperator.postfixOperator();
     }
 
@@ -72,7 +71,7 @@ class TestPostfixOperator : public TestFixture {
               "    k--;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};"
@@ -83,7 +82,7 @@ class TestPostfixOperator : public TestFixture {
               "    k++;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("struct K {};"
@@ -91,14 +90,14 @@ class TestPostfixOperator : public TestFixture {
               "{\n"
               "    K k(0);\n"
               "    k++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("struct K {};\n"
               "void foo(K& k)\n"
               "{\n"
               "    k++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("union K {};"
@@ -106,7 +105,7 @@ class TestPostfixOperator : public TestFixture {
               "{\n"
               "    K k(0);\n"
               "    k++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
@@ -119,7 +118,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
@@ -133,7 +132,7 @@ class TestPostfixOperator : public TestFixture {
               "    k++;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
 
@@ -145,7 +144,7 @@ class TestPostfixOperator : public TestFixture {
               "    k--;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
@@ -156,7 +155,7 @@ class TestPostfixOperator : public TestFixture {
               "    ++k;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};"
@@ -167,7 +166,7 @@ class TestPostfixOperator : public TestFixture {
               "    --k;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #9042
@@ -178,7 +177,7 @@ class TestPostfixOperator : public TestFixture {
               "};\n"
               "template <class T>\n"
               "class s {};\n"
-              "using BOOL = char;");
+              "using BOOL = char;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -189,7 +188,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};\n"
@@ -199,7 +198,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:28]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};\n"
@@ -209,7 +208,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class K {};\n"
@@ -219,7 +218,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};\n"
@@ -229,7 +228,7 @@ class TestPostfixOperator : public TestFixture {
               "         std::cout << i << std::endl;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string &s) {\n" // #7731
@@ -247,7 +246,7 @@ class TestPostfixOperator : public TestFixture {
               "    k++;\n"
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
     }
 
@@ -262,7 +261,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    v.clear();\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:64]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
@@ -276,7 +275,7 @@ class TestPostfixOperator : public TestFixture {
               "       it++;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
@@ -289,7 +288,7 @@ class TestPostfixOperator : public TestFixture {
               "       it++;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
@@ -303,14 +302,14 @@ class TestPostfixOperator : public TestFixture {
               "       rit--;\n"
               "    }\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
     }
 
     void test2168() {
         ASSERT_THROW_INTERNAL(check("--> declare allocator lock here\n"
-                                    "int main(){}"),
+                                    "int main(){}\n"),
                               AST);
     }
 
@@ -318,7 +317,7 @@ class TestPostfixOperator : public TestFixture {
         check("void f(int* p){\n"
               "    p++;\n"
               "    std::cout << *p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -328,7 +327,7 @@ class TestPostfixOperator : public TestFixture {
               "\n"
               "void f() {\n"
               "    p++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -336,7 +335,7 @@ class TestPostfixOperator : public TestFixture {
         check("bool foo() {\n"
               "    std::vector<FilterConfigCacheEntry>::iterator aIter(aImport.begin());\n"
               "    aIter++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
     }
 
@@ -345,14 +344,14 @@ class TestPostfixOperator : public TestFixture {
               "    class A {}; class B {A a;};\n"
               "    B b;\n"
               "    b.a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("bool foo() {\n"
               "    class A {}; class B {A a;};\n"
               "    B b;\n"
               "    foo(b.a++);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -361,7 +360,7 @@ class TestPostfixOperator : public TestFixture {
               "    class A {};\n"
               "    A a;\n"
               "    i++, a++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("bool foo(int i) {\n"
@@ -369,7 +368,7 @@ class TestPostfixOperator : public TestFixture {
               "    A a;\n"
               "    foo(i, a++);\n"
               "    foo(a++, i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -381,7 +380,7 @@ class TestPostfixOperator : public TestFixture {
               "        a += i;\n"
               "    }\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 91caca5b8af..4b4285ab159 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,6 +21,7 @@
 // the code for a known configuration, it generates the code for each configuration.
 
 #include "errortypes.h"
+#include "library.h"
 #include "path.h"
 #include "platform.h"
 #include "preprocessor.h"
@@ -31,11 +32,12 @@
 #include "fixture.h"
 #include "helpers.h"
 
+#include <algorithm>
 #include <cstring>
+#include <iterator>
 #include <list>
 #include <map>
 #include <set>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <utility>
@@ -50,18 +52,21 @@ class TestPreprocessor : public TestFixture {
     TestPreprocessor() : TestFixture("TestPreprocessor") {}
 
 private:
-    std::string expandMacros(const char code[], ErrorLogger &errorLogger) const {
-        std::istringstream istr(code);
+    #define expandMacros(...) expandMacros_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string expandMacros_(const char* file, int line, const char (&code)[size], ErrorLogger &errorLogger) const {
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
-        const simplecpp::TokenList tokens1 = simplecpp::TokenList(istr, files, "file.cpp", &outputList);
-        Preprocessor p(settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
-        simplecpp::TokenList tokens2 = p.preprocess(tokens1, "", files, true);
-        p.reportOutput(outputList, true);
+        simplecpp::TokenList tokens1 = simplecpp::TokenList(code, files, "file.cpp", {}, &outputList);
+        Preprocessor p(tokens1, settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
+        ASSERT_LOC(p.loadAllIncludes(files), file, line);
+        simplecpp::TokenList tokens2 = p.preprocess("", files, outputList);
+        (void)p.reportOutput(outputList, true);
         return tokens2.stringify();
     }
 
-    static void preprocess(const char code[], std::vector<std::string> &files, const std::string& file0, TokenList& tokenlist, const simplecpp::DUI& dui)
+    template<size_t size>
+    void preprocess(const char (&code)[size], std::vector<std::string> &files, const std::string& file0, TokenList& tokenlist, const simplecpp::DUI& dui)
     {
         if (!files.empty())
             throw std::runtime_error("file list not empty");
@@ -69,27 +74,86 @@ class TestPreprocessor : public TestFixture {
         if (tokenlist.front())
             throw std::runtime_error("token list not empty");
 
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, file0);
+        simplecpp::OutputList outputList;
+        const simplecpp::TokenList tokens1(code, files, file0, dui, &outputList);
 
         // Preprocess..
         simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        // TODO: provide and handle outputList
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, dui);
+        simplecpp::FileDataCache cache;
+        simplecpp::preprocess(tokens2, tokens1, files, cache, dui, &outputList);
+        Preprocessor preprocessor(tokens2, settingsDefault, *this, Standards::Language::C);
+        (void)preprocessor.reportOutput(outputList, true);
 
         // Tokenizer..
         tokenlist.createTokens(std::move(tokens2));
     }
 
-    std::vector<RemarkComment> getRemarkComments(const char code[], ErrorLogger& errorLogger) const
+    template<size_t size>
+    std::vector<RemarkComment> getRemarkComments(const char (&code)[size], ErrorLogger& errorLogger) const
     {
         std::vector<std::string> files;
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, "test.cpp");
+        simplecpp::TokenList tokens1(code, files, "test.cpp");
+
+        const Preprocessor preprocessor(tokens1, settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
+        return preprocessor.getRemarkComments();
+    }
+
+    static std::string getcodeforcfg(const Settings& settings, ErrorLogger& errorlogger, const char* code, std::size_t size, const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression = nullptr)
+    {
+        std::map<std::string, std::string> cfgcode = getcode(settings, errorlogger, code, size, std::set<std::string>{cfg}, filename, inlineSuppression);
+        const auto it = cfgcode.find(cfg);
+        if (it == cfgcode.end())
+            return "";
+        return it->second;
+    }
+
+    template<size_t size>
+    static std::string getcodeforcfg(const Settings& settings, ErrorLogger& errorlogger, const char (&code)[size], const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression = nullptr)
+    {
+        return getcodeforcfg(settings, errorlogger, code, size-1, cfg, filename, inlineSuppression);
+    }
+
+    template<size_t size>
+    static std::map<std::string, std::string> getcode(const Settings& settings, ErrorLogger& errorlogger, const char (&code)[size], const std::string &filename = "file.c")
+    {
+        return getcode(settings, errorlogger, code, size-1, {}, filename, nullptr);
+    }
+
+    static std::map<std::string, std::string> getcode(const Settings& settings, ErrorLogger& errorlogger, const char* code, std::size_t size, std::set<std::string> cfgs, const std::string &filename, SuppressionList *inlineSuppression)
+    {
+        simplecpp::OutputList outputList;
+        std::vector<std::string> files;
+
+        simplecpp::TokenList tokens({code, size}, files, Path::simplifyPath(filename), {}, &outputList);
+
+        // TODO: we should be using the actual Preprocessor implementation
+        Preprocessor preprocessor(tokens, settings, errorlogger, Path::identify(tokens.getFiles()[0], false));
+
+        // TODO: should be possible without a Preprocessor instance
+        if (preprocessor.reportOutput(outputList, true))
+            return {};
+
+        if (inlineSuppression)
+            preprocessor.inlineSuppressions(*inlineSuppression);
+        preprocessor.removeComments();
+        preprocessor.simplifyPragmaAsm();
+
+        std::map<std::string, std::string> cfgcode;
+        if (cfgs.empty()) {
+            cfgs.insert("");
+            std::set<std::string> configDefines = { "__cplusplus" };
+            preprocessor.getConfigs(configDefines, cfgs);
+        }
+        for (const std::string & config : cfgs) {
+            try {
+                const bool writeLocs = (strstr(code, "#include") != nullptr);
+                cfgcode[config] = preprocessor.getcode(config, files, writeLocs);
+            } catch (const simplecpp::Output &) {
+                cfgcode[config] = "";
+            }
+        }
 
-        const Preprocessor preprocessor(settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
-        return preprocessor.getRemarkComments(tokens1);
+        return cfgcode;
     }
 
     const Settings settings0 = settingsBuilder().severity(Severity::information).build();
@@ -223,6 +287,7 @@ class TestPreprocessor : public TestFixture {
 
         // inline suppression, missingInclude/missingIncludeSystem
         TEST_CASE(inline_suppressions);
+        TEST_CASE(inline_suppressions_not_next_line);
 
         // remark comment
         TEST_CASE(remarkComment1);
@@ -238,6 +303,9 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(predefine5);  // automatically define __cplusplus
         TEST_CASE(predefine6);  // automatically define __STDC_VERSION__
 
+
+        TEST_CASE(strictAnsi);
+
         TEST_CASE(invalidElIf); // #2942 segfault
 
         // Preprocessor::getConfigs
@@ -255,6 +323,17 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(getConfigs8);  // #if A==1  => cfg: A=1
         TEST_CASE(getConfigs10); // #5139
         TEST_CASE(getConfigs11); // #9832 - include guards
+        TEST_CASE(getConfigs12); // #14222
+        TEST_CASE(getConfigs13); // #14222
+        TEST_CASE(getConfigs_gte); // #1059
+        TEST_CASE(getConfigs_lte); // #1059
+        TEST_CASE(getConfigs_gt); // #1059
+        TEST_CASE(getConfigs_lt); // #1059
+        TEST_CASE(getConfigs_eq_compound); // #1059
+        TEST_CASE(getConfigs_gte_compound); // #1059
+        TEST_CASE(getConfigs_lte_compound); // #1059
+        TEST_CASE(getConfigs_gt_compound); // #1059
+        TEST_CASE(getConfigs_lt_compound); // #1059
         TEST_CASE(getConfigsError);
 
         TEST_CASE(getConfigsD1);
@@ -267,6 +346,11 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(getConfigsU6);
         TEST_CASE(getConfigsU7);
 
+        TEST_CASE(getConfigsAndCodeIssue14317);
+        TEST_CASE(getConfigsMostGeneralConfigIssue14317);
+
+        TEST_CASE(getConfigsInvalid); // #14732
+
         TEST_CASE(if_sizeof);
 
         TEST_CASE(invalid_ifs); // #5909
@@ -289,40 +373,74 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(testMissingIncludeMixed);
         TEST_CASE(testMissingIncludeCheckConfig);
 
+        TEST_CASE(testLazyInclude);
+
+        TEST_CASE(hasInclude);
+
         TEST_CASE(limitsDefines);
 
         TEST_CASE(hashCalculation);
 
         TEST_CASE(standard);
+
+        TEST_CASE(writeLocations);
+
+        TEST_CASE(pragmaAsm);
+
+        TEST_CASE(dumpPreprocessor);
     }
 
-    std::string getConfigsStr(const char filedata[], const char *arg = nullptr) {
+    template<size_t size>
+    std::string getConfigsStr(const char (&code)[size], const char *arg = nullptr, const char *library = nullptr) {
         Settings settings;
         if (arg && std::strncmp(arg,"-D",2)==0)
             settings.userDefines = arg + 2;
         if (arg && std::strncmp(arg,"-U",2)==0)
             settings.userUndefs.insert(arg+2);
+        if (library)
+            ASSERT(settings.library.load("", library, false).errorcode == Library::ErrorCode::OK);
         std::vector<std::string> files;
-        std::istringstream istr(filedata);
-        // TODO: this adds an empty filename
-        simplecpp::TokenList tokens(istr,files);
-        tokens.removeComments();
-        Preprocessor preprocessor(settings, *this, Standards::Language::C); // TODO: do we need to consider #file?
-        const std::set<std::string> configs = preprocessor.getConfigs(tokens);
+        simplecpp::OutputList outputList;
+        simplecpp::TokenList tokens(code, files, "test.c", {}, &outputList);
+        Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C);
+        std::set<std::string> configs = { "" };
+        std::set<std::string> configDefines = { "__cplusplus" };
+        const auto getDefineName = [](const std::string &defineString) {
+            return defineString.substr(0, defineString.find_first_of("( "));
+        };
+        std::transform(settings.library.defines().begin(),
+                       settings.library.defines().end(),
+                       std::inserter(configDefines, configDefines.end()),
+                       getDefineName);
+        preprocessor.setLoadCallback([&](simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::removeComments(data.tokens);
+                preprocessor.getConfigs(data.filename, data.tokens, configDefines, configs);
+            }
+        });
+        preprocessor.removeComments();
+        preprocessor.getConfigs(configDefines, configs);
+        ASSERT(preprocessor.loadAllIncludes(files));
+        ASSERT(!preprocessor.reportOutput(outputList, true));
         std::string ret;
         for (const std::string & config : configs)
             ret += config + '\n';
         return ret;
     }
 
-    std::size_t getHash(const char filedata[]) {
+    template<size_t size>
+    std::size_t getHash(const char (&code)[size]) {
         std::vector<std::string> files;
-        std::istringstream istr(filedata);
-        // TODO: this adds an empty filename
-        simplecpp::TokenList tokens(istr,files);
-        tokens.removeComments();
-        Preprocessor preprocessor(settingsDefault, *this, Standards::Language::C); // TODO: do we need to consider #file?
-        return preprocessor.calculateHash(tokens, "");
+        simplecpp::TokenList tokens(code,files,"test.c");
+        Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C);
+        preprocessor.setLoadCallback([](simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::removeComments(data.tokens);
+            }
+        });
+        preprocessor.removeComments();
+        ASSERT(preprocessor.loadAllIncludes(files));
+        return preprocessor.calculateHash("");
     }
 
     void Bug2190219() {
@@ -330,11 +448,11 @@ class TestPreprocessor : public TestFixture {
                                 "cpp\n"
                                 "#else\n"
                                 "c\n"
-                                "#endif";
+                                "#endif\n";
 
         {
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata, "file.cpp");
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata, "file.cpp");
 
             // Compare results..
             ASSERT_EQUALS(1U, actual.size());
@@ -344,7 +462,7 @@ class TestPreprocessor : public TestFixture {
         {
             // Ticket #7102 - skip __cplusplus in C code
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata, "file.c");
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata, "file.c");
 
             // Compare results..
             ASSERT_EQUALS(1U, actual.size());
@@ -358,7 +476,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "#error abcd\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A\n", getConfigsStr(filedata));
     }
 
     void error2() {
@@ -375,27 +493,30 @@ class TestPreprocessor : public TestFixture {
 
     void error3() {
         const auto settings = dinit(Settings, $.userDefines = "__cplusplus");
-        const std::string code("#error hello world!\n");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "X", "test.c");
-        ASSERT_EQUALS("[test.c:1:0]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
+        const char code[] = "#error hello world!\n";
+        (void)getcodeforcfg(settings, *this, code, "X", "test.c");
+        ASSERT_EQUALS("[test.c:1:2]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
     }
 
     // Ticket #2919 - wrong filename reported for #error
     void error4() {
         // In included file
         {
+            ScopedFile header("ab.h", "#error hello world!\n");
             const auto settings = dinit(Settings, $.userDefines = "TEST");
-            const std::string code("#file \"ab.h\"\n#error hello world!\n#endfile");
-            (void)PreprocessorHelper::getcode(settings, *this, code, "TEST", "test.c");
-            ASSERT_EQUALS("[ab.h:1:0]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
+            const char code[] = "#include \"ab.h\"\n";
+            (void)getcodeforcfg(settings, *this, code, "TEST", "test.c");
+            ASSERT_EQUALS("[ab.h:1:2]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
         }
 
         // After including a file
         {
+            ScopedFile header("ab.h", "");
             const auto settings = dinit(Settings, $.userDefines = "TEST");
-            const std::string code("#file \"ab.h\"\n\n#endfile\n#error aaa");
-            (void)PreprocessorHelper::getcode(settings, *this, code, "TEST", "test.c");
-            ASSERT_EQUALS("[test.c:2:0]: (error) #error aaa [preprocessorErrorDirective]\n", errout_str());
+            const char code[] = "#include \"ab.h\"\n"
+                                "#error aaa\n";
+            (void)getcodeforcfg(settings, *this, code, "TEST", "test.c");
+            ASSERT_EQUALS("[test.c:2:2]: (error) #error aaa [preprocessorErrorDirective]\n", errout_str());
         }
     }
 
@@ -404,8 +525,8 @@ class TestPreprocessor : public TestFixture {
         const auto settings = dinit(Settings,
                                     $.userDefines = "TEST",
                                         $.force = true);
-        const std::string code("#error hello world!\n");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "X", "test.c");
+        const char code[] = "#error hello world!\n";
+        (void)getcodeforcfg(settings, *this, code, "X", "test.c");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -418,7 +539,7 @@ class TestPreprocessor : public TestFixture {
                                  "#else\n"
                                  "#error 2\n"
                                  "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B\nB\n", getConfigsStr(filedata1));
+        ASSERT_EQUALS("\nA=A\nA=A;B=B\nB=B\n", getConfigsStr(filedata1));
 
         const char filedata2[] = "#ifndef A\n"
                                  "#error 1\n"
@@ -450,7 +571,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "#error \"2\"\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nB\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nB=B\n", getConfigsStr(filedata));
     }
 
     void error8() {
@@ -462,8 +583,8 @@ class TestPreprocessor : public TestFixture {
                                 "\n"
                                 "#ifndef C\n"
                                 "#error aa\n"
-                                "#endif";
-        ASSERT_EQUALS("A;B;C\nA;C\nC\n", getConfigsStr(filedata));
+                                "#endif\n";
+        ASSERT_EQUALS("A=A;B=B;C\nA=A;C\nC\n", getConfigsStr(filedata));
     }
 
     void setPlatformInfo() {
@@ -473,67 +594,68 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "2\n"
                                 "#endif\n";
-        std::istringstream istr(filedata);
-        std::vector<std::string> files;
-        simplecpp::TokenList tokens(istr, files, "test.c");
 
         // preprocess code with unix32 platform..
         {
+            std::vector<std::string> files;
+            simplecpp::TokenList tokens(filedata, files, "test.c");
             const Settings settings = settingsBuilder().platform(Platform::Type::Unix32).build();
-            Preprocessor::setPlatformInfo(tokens, settings);
-            Preprocessor preprocessor(settings, *this, Path::identify(tokens.getFiles()[0], false));
-            ASSERT_EQUALS("\n1", preprocessor.getcode(tokens, "", files, false));
+            Preprocessor preprocessor(tokens, settings, *this, Path::identify(tokens.getFiles()[0], false));
+            preprocessor.setPlatformInfo();
+            ASSERT_EQUALS("\n1", preprocessor.getcode("", files, false));
         }
 
         // preprocess code with unix64 platform..
         {
+            std::vector<std::string> files;
+            simplecpp::TokenList tokens(filedata, files, "test.c");
             const Settings settings = settingsBuilder().platform(Platform::Type::Unix64).build();
-            Preprocessor::setPlatformInfo(tokens, settings);
-            Preprocessor preprocessor(settings, *this, Path::identify(tokens.getFiles()[0], false));
-            ASSERT_EQUALS("\n\n\n2", preprocessor.getcode(tokens, "", files, false));
+            Preprocessor preprocessor(tokens, settings, *this, Path::identify(tokens.getFiles()[0], false));
+            preprocessor.setPlatformInfo();
+            ASSERT_EQUALS("\n\n\n2", preprocessor.getcode("", files, false));
         }
     }
 
     void includeguard1() {
+        ScopedFile header("abc.h",
+                          "#ifndef abcH\n"
+                          "#define abcH\n"
+                          "#endif\n");
         // Handling include guards..
-        const char filedata[] = "#file \"abc.h\"\n"
-                                "#ifndef abcH\n"
-                                "#define abcH\n"
-                                "#endif\n"
-                                "#endfile\n"
+        const char filedata[] = "#include \"abc.h\"\n"
                                 "#ifdef ABC\n"
-                                "#endif";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+                                "#endif\n";
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void includeguard2() {
+        ScopedFile header("abc.h",
+                          "foo\n"
+                          "#ifdef ABC\n"
+                          "\n"
+                          "#endif\n");
         // Handling include guards..
-        const char filedata[] = "#file \"abc.h\"\n"
-                                "foo\n"
-                                "#ifdef ABC\n"
-                                "\n"
-                                "#endif\n"
-                                "#endfile\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        const char filedata[] = "#include \"abc.h\"\n";
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
 
     void ifdefwithfile() {
+        ScopedFile header("abc.h", "class A{};/*\n\n\n\n\n\n\n*/\n");
+
         // Handling include guards..
         const char filedata[] = "#ifdef ABC\n"
-                                "#file \"abc.h\"\n"
-                                "class A{};/*\n\n\n\n\n\n\n*/\n"
-                                "#endfile\n"
+                                "#include \"abc.h\"\n"
                                 "#endif\n"
                                 "int main() {}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Expected configurations: "" and "ABC"
         ASSERT_EQUALS(2, actual.size());
         ASSERT_EQUALS("\n\n\nint main ( ) { }", actual.at(""));
-        ASSERT_EQUALS("\n#line 1 \"abc.h\"\nclass A { } ;\n#line 4 \"file.c\"\n int main ( ) { }", actual.at("ABC"));
+        ASSERT_EQUALS("\n#line 1 \"abc.h\"\nclass A { } ;\n#line 4 \"file.c\"\n int main ( ) { }", actual.at("ABC=ABC"));
     }
 
     void if0() {
@@ -570,7 +692,7 @@ class TestPreprocessor : public TestFixture {
                                     "#else\n"
                                     "GHI\n"
                                     "#endif\n";
-            ASSERT_EQUALS("\nDEF1\nDEF2\n", getConfigsStr(filedata));
+            ASSERT_EQUALS("\nDEF1=DEF1\nDEF2=DEF2\n", getConfigsStr(filedata));
         }
     }
 
@@ -580,7 +702,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "    B\n"
                                 "#endif\n";
-        TODO_ASSERT_EQUALS("\nLIBVER=101\n", "\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nLIBVER=101\n", getConfigsStr(filedata));
     }
 
     void if_cond2() {
@@ -590,7 +712,7 @@ class TestPreprocessor : public TestFixture {
                                 "#if defined(A) && defined(B)\n"
                                 "ab\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A\nA=A;B=B\n", getConfigsStr(filedata));
 
         if_cond2b();
         if_cond2c();
@@ -607,7 +729,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "a\n"
                                 "#endif\n";
-        TODO_ASSERT_EQUALS("\nA;B\n", "\nA\nB\n", getConfigsStr(filedata));
+        TODO_ASSERT_EQUALS("\nA;B=B\n", "\nA\nB=B\n", getConfigsStr(filedata));
     }
 
     void if_cond2c() {
@@ -621,7 +743,7 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "a\n"
                                 "#endif\n";
-        TODO_ASSERT_EQUALS("\nA\nA;B\n", "\nA\nB\n", getConfigsStr(filedata));
+        TODO_ASSERT_EQUALS("\nA\nA;B=B\n", "\nA\nB=B\n", getConfigsStr(filedata));
     }
 
     void if_cond2d() {
@@ -640,7 +762,7 @@ class TestPreprocessor : public TestFixture {
                                 "!b\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B\nB\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA\nA;B=B\nB=B\n", getConfigsStr(filedata));
     }
 
     void if_cond2e() {
@@ -659,7 +781,7 @@ class TestPreprocessor : public TestFixture {
                                 "abc\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA\nA;B;C\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A\nA=A;B=B;C=C\n", getConfigsStr(filedata));
     }
 
     void if_cond4() {
@@ -680,7 +802,7 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n"
                                     "}\n"
                                     "#endif\n";
-            ASSERT_EQUALS("\nA\nA;B\n", getConfigsStr(filedata));
+            ASSERT_EQUALS("\nA\nA;B=B\n", getConfigsStr(filedata));
         }
 
         {
@@ -715,20 +837,20 @@ class TestPreprocessor : public TestFixture {
                                 "#if defined(B) && defined(A)\n"
                                 "ef\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA;B\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A;B=B\n", getConfigsStr(filedata));
     }
 
     void if_cond6() {
         const char filedata[] = "\n"
                                 "#if defined(A) && defined(B))\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nA;B\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nA=A;B=B\n", getConfigsStr(filedata));
     }
 
     void if_cond8() {
         const char filedata[] = "#if defined(A) + defined(B) + defined(C) != 1\n"
                                 "#endif\n";
-        TODO_ASSERT_EQUALS("\nA\n", "\nA;B;C\n", getConfigsStr(filedata));
+        TODO_ASSERT_EQUALS("\nA=A\n", "\nA=A;B=B;C=C\n", getConfigsStr(filedata));
     }
 
 
@@ -746,7 +868,7 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => don't crash..
-        (void)PreprocessorHelper::getcode(settings0, *this, filedata);
+        (void)getcode(settings0, *this, filedata);
     }
 
     void if_cond11() {
@@ -755,7 +877,7 @@ class TestPreprocessor : public TestFixture {
                                 "#elif FLT_MANT_DIG < W_TYPE_SIZE\n"
                                 "#endif\n"
                                 "#endif\n";
-        (void)PreprocessorHelper::getcode(settings0, *this, filedata);
+        (void)getcode(settings0, *this, filedata);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -787,7 +909,7 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#if defined(DEF_10) || defined(DEF_11)\n"
                                 "a1;\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nDEF_10;DEF_11\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nDEF_10=DEF_10;DEF_11=DEF_11\n", getConfigsStr(filedata));
     }
 
     void if_or_2() {
@@ -798,48 +920,48 @@ class TestPreprocessor : public TestFixture {
     }
 
     void if_macro_eq_macro() {
-        const char *code = "#define A B\n"
-                           "#define B 1\n"
-                           "#define C 1\n"
-                           "#if A == C\n"
-                           "Wilma\n"
-                           "#else\n"
-                           "Betty\n"
-                           "#endif\n";
+        const char code[] = "#define A B\n"
+                            "#define B 1\n"
+                            "#define C 1\n"
+                            "#if A == C\n"
+                            "Wilma\n"
+                            "#else\n"
+                            "Betty\n"
+                            "#endif\n";
         ASSERT_EQUALS("\n", getConfigsStr(code));
     }
 
     void ticket_3675() {
-        const char* code = "#ifdef YYSTACKSIZE\n"
-                           "#define YYMAXDEPTH YYSTACKSIZE\n"
-                           "#else\n"
-                           "#define YYSTACKSIZE YYMAXDEPTH\n"
-                           "#endif\n"
-                           "#if YYDEBUG\n"
-                           "#endif\n";
-        (void)PreprocessorHelper::getcode(settings0, *this, code);
+        const char code[] = "#ifdef YYSTACKSIZE\n"
+                            "#define YYMAXDEPTH YYSTACKSIZE\n"
+                            "#else\n"
+                            "#define YYSTACKSIZE YYMAXDEPTH\n"
+                            "#endif\n"
+                            "#if YYDEBUG\n"
+                            "#endif\n";
+        (void)getcode(settings0, *this, code);
 
         // There's nothing to assert. It just needs to not hang.
     }
 
     void ticket_3699() {
-        const char* code = "#define INLINE __forceinline\n"
-                           "#define inline __forceinline\n"
-                           "#define __forceinline inline\n"
-                           "#if !defined(_WIN32)\n"
-                           "#endif\n"
-                           "INLINE inline __forceinline\n";
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, code);
+        const char code[] = "#define INLINE __forceinline\n"
+                            "#define inline __forceinline\n"
+                            "#define __forceinline inline\n"
+                            "#if !defined(_WIN32)\n"
+                            "#endif\n"
+                            "INLINE inline __forceinline\n";
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, code);
 
         // First, it must not hang. Second, inline must becomes inline, and __forceinline must become __forceinline.
         ASSERT_EQUALS("\n\n\n\n\n$__forceinline $inline $__forceinline", actual.at(""));
     }
 
     void ticket_4922() { // #4922
-        const char* code = "__asm__ \n"
-                           "{ int extern __value) 0; (double return (\"\" } extern\n"
-                           "__typeof __finite (__finite) __finite __inline \"__GI___finite\");";
-        (void)PreprocessorHelper::getcode(settings0, *this, code);
+        const char code[] = "__asm__ \n"
+                            "{ int extern __value) 0; (double return (\"\" } extern\n"
+                            "__typeof __finite (__finite) __finite __inline \"__GI___finite\");\n";
+        (void)getcode(settings0, *this, code);
     }
 
     void macro_simple1() {
@@ -949,7 +1071,7 @@ class TestPreprocessor : public TestFixture {
 
     void macro_simple16() {  // # 4703
         const char filedata[] = "#define MACRO( A, B, C ) class A##B##C##Creator {};\n"
-                                "MACRO( B\t, U , G )";
+                                "MACRO( B\t, U , G )\n";
         ASSERT_EQUALS("\nclass BUGCreator { } ;", expandMacros(filedata, *this));
     }
 
@@ -957,41 +1079,41 @@ class TestPreprocessor : public TestFixture {
         // It would probably be OK if the generated code was
         // "\n123+$123" since the first 123 comes from the source code
         const char filedata[] = "#define MACRO(A) A+123\n"
-                                "MACRO(123)";
+                                "MACRO(123)\n";
         ASSERT_EQUALS("\n123 + 123", expandMacros(filedata, *this));
     }
 
     void macro_simple18() {  // (1e-7)
         const char filedata1[] = "#define A (1e-7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1e-7 ) ;", expandMacros(filedata1, *this));
 
         const char filedata2[] = "#define A (1E-7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1E-7 ) ;", expandMacros(filedata2, *this));
 
         const char filedata3[] = "#define A (1e+7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1e+7 ) ;", expandMacros(filedata3, *this));
 
         const char filedata4[] = "#define A (1.e+7)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1.e+7 ) ;", expandMacros(filedata4, *this));
 
         const char filedata5[] = "#define A (1.7f)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1.7f ) ;", expandMacros(filedata5, *this));
 
         const char filedata6[] = "#define A (.1)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( .1 ) ;", expandMacros(filedata6, *this));
 
         const char filedata7[] = "#define A (1.)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 1. ) ;", expandMacros(filedata7, *this));
 
         const char filedata8[] = "#define A (8.0E+007)\n"
-                                 "a=A;";
+                                 "a=A;\n";
         ASSERT_EQUALS("\na = ( 8.0E+007 ) ;", expandMacros(filedata8, *this));
     }
 
@@ -1163,8 +1285,8 @@ class TestPreprocessor : public TestFixture {
 
     void macro_NULL() {
         // See ticket #4482 - UB when passing NULL to variadic function
-        ASSERT_EQUALS("\n0", expandMacros("#define null 0\nnull", *this));
-        TODO_ASSERT_EQUALS("\nNULL", "\n0", expandMacros("#define NULL 0\nNULL", *this)); // TODO: Let the tokenizer handle NULL?
+        ASSERT_EQUALS("\n0", expandMacros("#define null 0\nnull\n", *this));
+        TODO_ASSERT_EQUALS("\nNULL\n", "\n0", expandMacros("#define NULL 0\nNULL\n", *this)); // TODO: Let the tokenizer handle NULL?
     }
 
     void string1() {
@@ -1174,7 +1296,7 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1214,7 +1336,7 @@ class TestPreprocessor : public TestFixture {
                                     "#undef z\n"
                                     "int z;\n"
                                     "z = 0;\n";
-            ASSERT_EQUALS("\n\nint z ;\nz = 0 ;", PreprocessorHelper::getcode(settings0, *this, filedata, "", "test.c"));
+            ASSERT_EQUALS("\n\nint z ;\nz = 0 ;", getcodeforcfg(settings0, *this, filedata, "", "test.c"));
         }
     }
 
@@ -1276,7 +1398,7 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1336,7 +1458,7 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1399,7 +1521,7 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1414,10 +1536,10 @@ class TestPreprocessor : public TestFixture {
                                 "#pragma asm foo\n"
                                 "    mov r1, 11\n"
                                 "#pragma endasm bar\n"
-                                "bbb";
+                                "bbb\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1428,10 +1550,10 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#pragma asm\n"
                                 "    mov @w1, 11\n"
                                 "#pragma endasm ( temp=@w1 )\n"
-                                "bbb";
+                                "bbb\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1445,13 +1567,13 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(2, actual.size());
         const std::string expected("void f ( ) {\n\n\n}");
         ASSERT_EQUALS(expected, actual.at(""));
-        ASSERT_EQUALS(expected, actual.at("A"));
+        ASSERT_EQUALS(expected, actual.at("A=A"));
     }
 
     void handle_error() {
@@ -1465,10 +1587,10 @@ class TestPreprocessor : public TestFixture {
                                     "}\n";
 
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             ASSERT_EQUALS(0, actual.size());
-            ASSERT_EQUALS("[file.c:2:0]: (error) No pair for character ('). Can't process file. File is either invalid or unicode, which is currently not supported. [preprocessorErrorDirective]\n", errout_str());
+            ASSERT_EQUALS("[file.c:2:14]: (error) No pair for character ('). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
         }
     }
 
@@ -1483,33 +1605,20 @@ class TestPreprocessor : public TestFixture {
             const std::string actual(expandMacros(filedata, *this));
 
             ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[file.cpp:3:0]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [preprocessorErrorDirective]\n", errout_str());
-        }
-
-        {
-            const char filedata[] = "#file \"abc.h\"\n"
-                                    "#define a\n"
-                                    "\"\n"
-                                    "#endfile\n";
-
-            // expand macros..
-            const std::string actual(expandMacros(filedata, *this));
-
-            ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[abc.h:2:0]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [preprocessorErrorDirective]\n", errout_str());
+            ASSERT_EQUALS("[file.cpp:3:1]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
         }
 
         {
-            const char filedata[] = "#file \"abc.h\"\n"
-                                    "#define a\n"
-                                    "#endfile\n"
+            ScopedFile header("abc.h",
+                              "#define a\n");
+            const char filedata[] = "#include \"abc.h\"\n"
                                     "\"\n";
 
             // expand macros..
             const std::string actual(expandMacros(filedata, *this));
 
             ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[file.cpp:2:0]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [preprocessorErrorDirective]\n", errout_str());
+            ASSERT_EQUALS("[file.cpp:2:1]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
         }
 
         {
@@ -1521,7 +1630,7 @@ class TestPreprocessor : public TestFixture {
             const std::string actual(expandMacros(filedata, *this));
 
             ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[file.cpp:2:0]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [preprocessorErrorDirective]\n", errout_str());
+            ASSERT_EQUALS("[file.cpp:2:11]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
         }
 
         {
@@ -1537,7 +1646,7 @@ class TestPreprocessor : public TestFixture {
             // expand macros..
             (void)expandMacros(filedata, *this);
 
-            ASSERT_EQUALS("[file.cpp:7:0]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [preprocessorErrorDirective]\n", errout_str());
+            ASSERT_EQUALS("[file.cpp:7:12]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported. [syntaxError]\n", errout_str());
         }
     }
 
@@ -1549,7 +1658,7 @@ class TestPreprocessor : public TestFixture {
                                 "  }\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1563,15 +1672,15 @@ class TestPreprocessor : public TestFixture {
                                 "#else\n"
                                 "#define N 20\n"
                                 "#endif\n"
-                                "N";
+                                "N\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(2, actual.size());
         ASSERT_EQUALS("\n\n\n\n\n$20", actual.at(""));
-        ASSERT_EQUALS("\n\n\n\n\n$10", actual.at("A"));
+        ASSERT_EQUALS("\n\n\n\n\n$10", actual.at("A=A"));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1585,12 +1694,12 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
         ASSERT_EQUALS("", actual.at(""));
-        ASSERT_EQUALS("[file.c:6:0]: (error) failed to expand 'BC', Wrong number of parameters for macro 'BC'. [preprocessorErrorDirective]\n", errout_str());
+        ASSERT_EQUALS("[file.c:6:3]: (error) failed to expand 'BC', Wrong number of parameters for macro 'BC'. [syntaxError]\n", errout_str());
     }
 
     void newline_in_macro() {
@@ -1601,7 +1710,7 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1618,12 +1727,12 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(2, actual.size());
         ASSERT_EQUALS("", actual.at(""));
-        ASSERT_EQUALS("\nA\n\n\nA", actual.at("ABC"));
+        ASSERT_EQUALS("\nA\n\n\nA", actual.at("ABC=ABC"));
     }
 
     void define_if1() {
@@ -1631,15 +1740,15 @@ class TestPreprocessor : public TestFixture {
             const char filedata[] = "#define A 0\n"
                                     "#if A\n"
                                     "FOO\n"
-                                    "#endif";
-            ASSERT_EQUALS("", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                    "#endif\n";
+            ASSERT_EQUALS("", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
         {
             const char filedata[] = "#define A 1\n"
                                     "#if A==1\n"
                                     "FOO\n"
-                                    "#endif";
-            ASSERT_EQUALS("\n\nFOO", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                    "#endif\n";
+            ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
     }
 
@@ -1648,24 +1757,24 @@ class TestPreprocessor : public TestFixture {
                                 "#define B A\n"
                                 "#if (B==A) || (B==C)\n"
                                 "FOO\n"
-                                "#endif";
-        ASSERT_EQUALS("\n\n\nFOO", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                "#endif\n";
+        ASSERT_EQUALS("\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
     void define_if3() {
         const char filedata[] = "#define A 0\n"
                                 "#if (A==0)\n"
                                 "FOO\n"
-                                "#endif";
-        ASSERT_EQUALS("\n\nFOO", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                "#endif\n";
+        ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
     void define_if4() {
         const char filedata[] = "#define X +123\n"
                                 "#if X==123\n"
                                 "FOO\n"
-                                "#endif";
-        ASSERT_EQUALS("\n\nFOO", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                "#endif\n";
+        ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
     void define_if5() { // #4516 - #define B (A & 0x00f0)
@@ -1674,8 +1783,8 @@ class TestPreprocessor : public TestFixture {
                                     "#define B (A & 0x00f0)\n"
                                     "#if B==0x0010\n"
                                     "FOO\n"
-                                    "#endif";
-            ASSERT_EQUALS("\n\n\nFOO", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                    "#endif\n";
+            ASSERT_EQUALS("\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
         {
             const char filedata[] = "#define A 0x00f0\n"
@@ -1683,15 +1792,15 @@ class TestPreprocessor : public TestFixture {
                                     "#define C (B & A)\n"
                                     "#if C==0x0010\n"
                                     "FOO\n"
-                                    "#endif";
-            ASSERT_EQUALS("\n\n\n\nFOO", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                    "#endif\n";
+            ASSERT_EQUALS("\n\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
         {
             const char filedata[] = "#define A (1+A)\n" // don't hang for recursive macros
                                     "#if A==1\n"
                                     "FOO\n"
-                                    "#endif";
-            ASSERT_EQUALS("\n\nFOO", PreprocessorHelper::getcode(settings0, *this, filedata,"","test.c"));
+                                    "#endif\n";
+            ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
     }
 
@@ -1707,10 +1816,10 @@ class TestPreprocessor : public TestFixture {
                                 "#if B >= 0\n"
                                 "456\n"
                                 "#endif\n";
-        const std::string actualA0 = PreprocessorHelper::getcode(settings0, *this, filedata, "A=0", "test.c");
+        const std::string actualA0 = getcodeforcfg(settings0, *this, filedata, "A=0", "test.c");
         ASSERT_EQUALS(true,  actualA0.find("123") != std::string::npos);
         ASSERT_EQUALS(false, actualA0.find("456") != std::string::npos);
-        const std::string actualA1 = PreprocessorHelper::getcode(settings0, *this, filedata, "A=1", "test.c");
+        const std::string actualA1 = getcodeforcfg(settings0, *this, filedata, "A=1", "test.c");
         ASSERT_EQUALS(false, actualA1.find("123") != std::string::npos);
         ASSERT_EQUALS(true,  actualA1.find("456") != std::string::npos);
     }
@@ -1725,7 +1834,7 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
             ASSERT_EQUALS(1, actual.size());
@@ -1739,7 +1848,7 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
             ASSERT_EQUALS(1, actual.size());
@@ -1753,7 +1862,7 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
             ASSERT_EQUALS(1, actual.size());
@@ -1767,7 +1876,7 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
             ASSERT_EQUALS(1, actual.size());
@@ -1782,7 +1891,7 @@ class TestPreprocessor : public TestFixture {
                                     "A\n";
 
             // Preprocess => actual result..
-            const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
             ASSERT_EQUALS(1, actual.size());
@@ -1797,7 +1906,7 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1U, actual.size());
@@ -1814,18 +1923,18 @@ class TestPreprocessor : public TestFixture {
                                 "B me;\n";
 
         // Preprocess => actual result..
-        ASSERT_EQUALS("\n\n\n\n\n\n$int me ;", PreprocessorHelper::getcode(settings0, *this, filedata, "", "a.cpp"));
-        ASSERT_EQUALS("\n\n\n\n\n\n$char me ;", PreprocessorHelper::getcode(settings0, *this, filedata, "A", "a.cpp"));
+        ASSERT_EQUALS("\n\n\n\n\n\n$int me ;", getcodeforcfg(settings0, *this, filedata, "", "a.cpp"));
+        ASSERT_EQUALS("\n\n\n\n\n\n$char me ;", getcodeforcfg(settings0, *this, filedata, "A", "a.cpp"));
     }
 
     void ifndef_define() {
         const char filedata[] = "#ifndef A\n"
                                 "#define A(x) x\n"
                                 "#endif\n"
-                                "A(123);";
+                                "A(123);\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         ASSERT_EQUALS(1U, actual.size());
         ASSERT_EQUALS("\n\n\n123 ;", actual.at(""));
@@ -1838,8 +1947,8 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        ASSERT_EQUALS("", PreprocessorHelper::getcode(settings0, *this, filedata, "", "a.cpp"));
-        ASSERT_EQUALS("", PreprocessorHelper::getcode(settings0, *this, filedata, "A", "a.cpp"));
+        ASSERT_EQUALS("", getcodeforcfg(settings0, *this, filedata, "", "a.cpp"));
+        ASSERT_EQUALS("", getcodeforcfg(settings0, *this, filedata, "A", "a.cpp"));
     }
 
     void redundant_config() {
@@ -1859,14 +1968,14 @@ class TestPreprocessor : public TestFixture {
 
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(4, actual.size());
         ASSERT(actual.find("") != actual.end());
-        ASSERT(actual.find("BAR") != actual.end());
-        ASSERT(actual.find("FOO") != actual.end());
-        ASSERT(actual.find("BAR;FOO") != actual.end());
+        ASSERT(actual.find("BAR=BAR") != actual.end());
+        ASSERT(actual.find("FOO=FOO") != actual.end());
+        ASSERT(actual.find("BAR=BAR;FOO=FOO") != actual.end());
     }
 
 
@@ -1876,7 +1985,7 @@ class TestPreprocessor : public TestFixture {
                                 "#include \"notfound.h\"\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
@@ -1894,38 +2003,38 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, filedata);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // B will always be defined if A is defined; the following test
         // cases should be fixed whenever this other bug is fixed
         ASSERT_EQUALS(2U, actual.size());
 
-        ASSERT_EQUALS_MSG(true, (actual.find("A") != actual.end()), "A is expected to be checked but it was not checked");
+        ASSERT_EQUALS_MSG(true, (actual.find("A=A") != actual.end()), "A is expected to be checked but it was not checked");
 
-        ASSERT_EQUALS_MSG(true, (actual.find("A;A;B") == actual.end()), "A;A;B is expected to NOT be checked but it was checked");
+        ASSERT_EQUALS_MSG(true, (actual.find("A=A;A=A;B=B") == actual.end()), "A;A;B is expected to NOT be checked but it was checked");
     }
 
     void invalid_define_1() {
-        (void)PreprocessorHelper::getcode(settings0, *this, "#define =\n");
-        ASSERT_EQUALS("[file.c:1:0]: (error) Failed to parse #define [preprocessorErrorDirective]\n", errout_str());
+        (void)getcode(settings0, *this, "#define =\n");
+        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define, bad macro syntax [syntaxError]\n", errout_str());
     }
 
     void invalid_define_2() {  // #4036
-        (void)PreprocessorHelper::getcode(settings0, *this, "#define () {(int f(x) }\n");
-        ASSERT_EQUALS("[file.c:1:0]: (error) Failed to parse #define [preprocessorErrorDirective]\n", errout_str());
+        (void)getcode(settings0, *this, "#define () {(int f(x) }\n");
+        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define, bad macro syntax [syntaxError]\n", errout_str());
     }
 
     void inline_suppressions() {
-        /*const*/ Settings settings;
-        settings.inlineSuppressions = true;
-        settings.checks.enable(Checks::missingInclude);
-
-        const std::string code("// cppcheck-suppress missingInclude\n"
-                               "#include \"missing.h\"\n"
-                               "// cppcheck-suppress missingIncludeSystem\n"
-                               "#include <missing2.h>\n");
+        const auto settings = dinit(Settings,
+                                    $.inlineSuppressions = true,
+                                        $.checks.enable (Checks::missingInclude));
+
+        const char code[] = "// cppcheck-suppress missingInclude\n"
+                            "#include \"missing.h\"\n"
+                            "// cppcheck-suppress missingIncludeSystem\n"
+                            "#include <missing2.h>\n";
         SuppressionList inlineSuppr;
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c", &inlineSuppr);
+        (void)getcodeforcfg(settings, *this, code, "", "test.c", &inlineSuppr);
 
         auto suppressions = inlineSuppr.getSuppressions();
         ASSERT_EQUALS(2, suppressions.size());
@@ -1949,6 +2058,38 @@ class TestPreprocessor : public TestFixture {
         ignore_errout(); // we are not interested in the output
     }
 
+    void inline_suppressions_not_next_line() {
+        const auto settings = dinit(Settings,
+                                    $.inlineSuppressions = true,
+                                        $.checks.enable (Checks::missingInclude));
+
+        const char code[] = "// cppcheck-suppress missingInclude\n"
+                            "// some other comment\n"
+                            "#include \"missing.h\"\n"
+                            "// cppcheck-suppress missingIncludeSystem\n"
+                            "\n" // Empty line
+                            "#include <missing2.h>\n";
+        SuppressionList inlineSuppr;
+        (void)getcodeforcfg(settings, *this, code, "", "test.c", &inlineSuppr);
+
+        auto suppressions = inlineSuppr.getSuppressions();
+        ASSERT_EQUALS(2, suppressions.size());
+
+        auto suppr = suppressions.front();
+        suppressions.pop_front();
+        ASSERT_EQUALS("missingInclude", suppr.errorId);
+        ASSERT_EQUALS("test.c", suppr.fileName);
+        ASSERT_EQUALS(3, suppr.lineNumber);
+
+        suppr = suppressions.front();
+        suppressions.pop_front();
+        ASSERT_EQUALS("missingIncludeSystem", suppr.errorId);
+        ASSERT_EQUALS("test.c", suppr.fileName);
+        ASSERT_EQUALS(6, suppr.lineNumber);
+
+        ignore_errout();
+    }
+
     void remarkComment1() {
         const char code[] = "// REMARK: assignment with 1\n"
                             "x=1;\n";
@@ -1976,31 +2117,31 @@ class TestPreprocessor : public TestFixture {
     }
 
     void remarkComment4() {
-        const char code[] = "//REMARK /";
+        const char code[] = "//REMARK /\n";
         const auto remarkComments = getRemarkComments(code, *this);
         ASSERT_EQUALS(0, remarkComments.size());
     }
 
     void predefine1() {
-        const std::string src("#if defined X || Y\n"
-                              "Fred & Wilma\n"
-                              "#endif\n");
-        std::string actual = PreprocessorHelper::getcode(settings0, *this, src, "X=1", "test.c");
+        const char code[] = "#if defined X || Y\n"
+                            "Fred & Wilma\n"
+                            "#endif\n";
+        std::string actual = getcodeforcfg(settings0, *this, code, "X=1", "test.c");
 
         ASSERT_EQUALS("\nFred & Wilma", actual);
     }
 
     void predefine2() {
-        const std::string src("#if defined(X) && Y\n"
-                              "Fred & Wilma\n"
-                              "#endif\n");
+        const char code[] = "#if defined(X) && Y\n"
+                            "Fred & Wilma\n"
+                            "#endif\n";
         {
-            std::string actual = PreprocessorHelper::getcode(settings0, *this, src, "X=1", "test.c");
+            std::string actual = getcodeforcfg(settings0, *this, code, "X=1", "test.c");
             ASSERT_EQUALS("", actual);
         }
 
         {
-            std::string actual = PreprocessorHelper::getcode(settings0, *this, src, "X=1;Y=2", "test.c");
+            std::string actual = getcodeforcfg(settings0, *this, code, "X=1;Y=2", "test.c");
             ASSERT_EQUALS("\nFred & Wilma", actual);
         }
     }
@@ -2012,36 +2153,53 @@ class TestPreprocessor : public TestFixture {
                             "#if (X == Y)\n"
                             "Fred & Wilma\n"
                             "#endif\n";
-        const std::string actual = PreprocessorHelper::getcode(settings0, *this, code, "TEST", "test.c");
+        const std::string actual = getcodeforcfg(settings0, *this, code, "TEST", "test.c");
         ASSERT_EQUALS("\n\n\nFred & Wilma", actual);
     }
 
     void predefine4() {
         // #3577
         const char code[] = "char buf[X];\n";
-        const std::string actual = PreprocessorHelper::getcode(settings0, *this, code, "X=123", "test.c");
+        const std::string actual = getcodeforcfg(settings0, *this, code, "X=123", "test.c");
         ASSERT_EQUALS("char buf [ $123 ] ;", actual);
     }
 
     void predefine5() {  // #3737, #5119 - automatically define __cplusplus
         // #3737...
-        const char code[] = "#ifdef __cplusplus\n123\n#endif";
-        ASSERT_EQUALS("",      PreprocessorHelper::getcode(settings0, *this, code, "", "test.c"));
-        ASSERT_EQUALS("\n123", PreprocessorHelper::getcode(settings0, *this, code, "", "test.cpp"));
+        const char code[] = "#ifdef __cplusplus\n123\n#endif\n";
+        ASSERT_EQUALS("",      getcodeforcfg(settings0, *this, code, "", "test.c"));
+        ASSERT_EQUALS("\n123", getcodeforcfg(settings0, *this, code, "", "test.cpp"));
     }
 
     void predefine6() { // automatically define __STDC_VERSION__
-        const char code[] = "#ifdef __STDC_VERSION__\n123\n#endif";
-        ASSERT_EQUALS("\n123", PreprocessorHelper::getcode(settings0, *this, code, "", "test.c"));
-        ASSERT_EQUALS("",      PreprocessorHelper::getcode(settings0, *this, code, "", "test.cpp"));
+        const char code[] = "#ifdef __STDC_VERSION__\n123\n#endif\n";
+        ASSERT_EQUALS("\n123", getcodeforcfg(settings0, *this, code, "", "test.c"));
+        ASSERT_EQUALS("",      getcodeforcfg(settings0, *this, code, "", "test.cpp"));
+    }
+
+    void strictAnsi() {
+        const char code[] = "#ifdef __STRICT_ANSI__\n123\n#endif\n";
+        Settings settings;
+
+        settings.standards.setStd("gnu99");
+        ASSERT_EQUALS("", getcodeforcfg(settings, *this, code, "", "test.c"));
+
+        settings.standards.setStd("c99");
+        ASSERT_EQUALS("\n123", getcodeforcfg(settings, *this, code, "", "test.c"));
+
+        settings.standards.setStd("gnu++11");
+        ASSERT_EQUALS("", getcodeforcfg(settings, *this, code, "", "test.cpp"));
+
+        settings.standards.setStd("c++11");
+        ASSERT_EQUALS("\n123", getcodeforcfg(settings, *this, code, "", "test.cpp"));
     }
 
     void invalidElIf() {
         // #2942 - segfault
         const char code[] = "#elif (){\n";
-        const std::string actual = PreprocessorHelper::getcode(settings0, *this, code, "TEST", "test.c");
+        const std::string actual = getcodeforcfg(settings0, *this, code, "TEST", "test.c");
         ASSERT_EQUALS("", actual);
-        ASSERT_EQUALS("[test.c:1:0]: (error) #elif without #if [preprocessorErrorDirective]\n", errout_str());
+        ASSERT_EQUALS("[test.c:1:2]: (error) #elif without #if [syntaxError]\n", errout_str());
     }
 
     void getConfigs1() {
@@ -2051,7 +2209,7 @@ class TestPreprocessor : public TestFixture {
                                 "    qwerty\n"
                                 "#endif  \n";
 
-        ASSERT_EQUALS("\nWIN32\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nWIN32=WIN32\n", getConfigsStr(filedata));
     }
 
     void getConfigs2() {
@@ -2072,7 +2230,7 @@ class TestPreprocessor : public TestFixture {
                                 "c\n"
                                 "#endif\n";
 
-        ASSERT_EQUALS("\nABC\nABC;DEF\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\nABC=ABC;DEF=DEF\n", getConfigsStr(filedata));
     }
 
     void getConfigs4() {
@@ -2082,7 +2240,7 @@ class TestPreprocessor : public TestFixture {
                                 "#ifdef ABC\n"
                                 "A\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs5() {
@@ -2094,7 +2252,7 @@ class TestPreprocessor : public TestFixture {
                                 "C\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\nDEF\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\nDEF=DEF\n", getConfigsStr(filedata));
     }
 
     void getConfigs7() {
@@ -2104,7 +2262,7 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7a() {
@@ -2124,7 +2282,7 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7c() {
@@ -2134,7 +2292,7 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7d() {
@@ -2144,20 +2302,20 @@ class TestPreprocessor : public TestFixture {
                                 "B\n"
                                 "#endif\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs7e() {
+        ScopedFile header("test.h",
+                          "#ifndef test_h\n"
+                          "#define test_h\n"
+                          "#ifdef ABC\n"
+                          "#endif\n"
+                          "#endif\n");
         const char filedata[] = "#ifdef ABC\n"
-                                "#file \"test.h\"\n"
-                                "#ifndef test_h\n"
-                                "#define test_h\n"
-                                "#ifdef ABC\n"
-                                "#endif\n"
-                                "#endif\n"
-                                "#endfile\n"
+                                "#include \"test.h\"\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nABC\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nABC=ABC\n", getConfigsStr(filedata));
     }
 
     void getConfigs8() {
@@ -2172,20 +2330,289 @@ class TestPreprocessor : public TestFixture {
                                 "#define bar foo\n"
                                 "#define baz bar+0\n"
                                 "#if 0\n"
-                                "#endif";
+                                "#endif\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata));
     }
 
     void getConfigs11() { // #9832 - include guards
-        const char filedata[] = "#file \"test.h\"\n"
-                                "#if !defined(test_h)\n"
-                                "#define test_h\n"
-                                "123\n"
-                                "#endif\n"
-                                "#endfile\n";
+        ScopedFile header("test.h",
+                          "#if !defined(test_h)\n"
+                          "#define test_h\n"
+                          "123\n"
+                          "#endif\n");
+        const char filedata[] = "#include \"test.h\"\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata));
     }
 
+    void getConfigs12() { // #14222
+        const char filedata[] = "#ifdef INT8_MAX\n"
+                                "INT8_MAX\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\n", getConfigsStr(filedata, nullptr, "std.cfg"));
+    }
+
+    void getConfigs13() { // #14222
+        const char filedata[] = "#ifdef __builtin_bswap16\n"
+                                "__builtin_bswap16(x);\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\n", getConfigsStr(filedata, nullptr, "gnu.cfg"));
+    }
+
+    void getConfigs_gte() { // #1059
+        {
+            const char filedata[] = "#if A >= 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A >= 201112L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A >= 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483647\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_lte() { // #1059
+        {
+            const char filedata[] = "#if A <= 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A <= 201112L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A <= 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483647\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_gt() { // #1059
+        {
+            const char filedata[] = "#if A > 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1U\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1UL\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1Z\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 0x1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 01\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 0b1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 1t\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_THROW_INTERNAL_EQUALS(getConfigsStr(filedata), INTERNAL, "Internal Error. MathLib::toBigNumber: input was not completely consumed: 1t");
+        }
+        {
+            const char filedata[] = "#if A > 1.0\n"
+                                    "1\n"
+                                    "#endif\n";
+            TODO_ASSERT_THROW(getConfigsStr(filedata), InternalError); // floating point literals are not allowed
+        }
+        {
+            const char filedata[] = "#if A > 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483648\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_lt() { // #1059
+        {
+            const char filedata[] = "#if A < 1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1L\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1U\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1UL\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1Z\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 0x1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 01\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 0b1\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 1t\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_THROW_INTERNAL_EQUALS(getConfigsStr(filedata), INTERNAL, "Internal Error. MathLib::toBigNumber: input was not completely consumed: 1t");
+        }
+        {
+            const char filedata[] = "#if A < 1.0\n"
+                                    "1\n"
+                                    "#endif\n";
+            TODO_ASSERT_THROW(getConfigsStr(filedata), InternalError); // floating point literals are not allowed
+        }
+        {
+            const char filedata[] = "#if A < 12147483647\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=12147483646\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_eq_compound() { // #1059
+        {
+            const char filedata[] = "#if A == 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A == 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_gte_compound() { // #1059
+        {
+            const char filedata[] = "#if A >= 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A >= 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_lte_compound() { // #1059
+        {
+            const char filedata[] = "#if A <= 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=1;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A <= 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201112L;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_gt_compound() { // #1059
+        {
+            const char filedata[] = "#if A > 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=2;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A > 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201113;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
+    void getConfigs_lt_compound() { // #1059
+        {
+            const char filedata[] = "#if A < 1 && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=0;B=B\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if A < 201112L && defined(B)\n"
+                                    "1\n"
+                                    "#endif\n";
+            ASSERT_EQUALS("\nA=201111;B=B\n", getConfigsStr(filedata));
+        }
+    }
+
     void getConfigsError() {
         const char filedata1[] = "#ifndef X\n"
                                  "#error \"!X\"\n"
@@ -2197,7 +2624,7 @@ class TestPreprocessor : public TestFixture {
                                  "#error \"!Y\"\n"
                                  "#endif\n"
                                  "#endif\n";
-        ASSERT_EQUALS("\nX;Y\nY\n", getConfigsStr(filedata2));
+        ASSERT_EQUALS("\nX=X;Y\nY\n", getConfigsStr(filedata2));
     }
 
     void getConfigsD1() {
@@ -2207,14 +2634,14 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n"
                                 "#endif\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata, "-DX"));
-        ASSERT_EQUALS("\nX\nY\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nX=X\nY=Y\n", getConfigsStr(filedata));
     }
 
     void getConfigsU1() {
         const char filedata[] = "#ifdef X\n"
                                 "#endif\n";
         ASSERT_EQUALS("\n", getConfigsStr(filedata, "-UX"));
-        ASSERT_EQUALS("\nX\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nX=X\n", getConfigsStr(filedata));
     }
 
     void getConfigsU2() {
@@ -2238,8 +2665,8 @@ class TestPreprocessor : public TestFixture {
         const char filedata[] = "#if defined(X) || defined(Y) || defined(Z)\n"
                                 "#else\n"
                                 "#endif\n";
-        ASSERT_EQUALS("\nY;Z\n", getConfigsStr(filedata, "-UX"));
-        ASSERT_EQUALS("\nX;Y;Z\n", getConfigsStr(filedata));
+        ASSERT_EQUALS("\nY=Y;Z=Z\n", getConfigsStr(filedata, "-UX"));
+        ASSERT_EQUALS("\nX=X;Y=Y;Z=Z\n", getConfigsStr(filedata));
     }
 
     void getConfigsU5() {
@@ -2263,15 +2690,89 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS("\nY\n", getConfigsStr(code, "-DX"));
     }
 
+    void getConfigsAndCodeIssue14317() {
+        const char filedata[] = "bool test() {\n"
+                                "return\n"
+                                "#if defined(isless)\n"
+                                "0 != isless(1.0, 2.0)\n"
+                                "#else\n"
+                                "0\n"
+                                "#endif\n"
+                                ";\n"
+                                "}\n";
+        // Test getConfigsStr()
+        ASSERT_EQUALS("\nisless=isless\n", getConfigsStr(filedata));
+
+        // Test getcode()
+        // Preprocess => actual result..
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
+
+        // Expected configurations: "" and "ABC"
+        ASSERT_EQUALS(2, actual.size());
+        ASSERT_EQUALS("bool test ( ) {\nreturn\n\n\n\n0\n\n;\n}", actual.at(""));
+        ASSERT_EQUALS("bool test ( ) {\nreturn\n\n0 != $isless ( 1.0 , 2.0 )\n\n\n\n;\n}", actual.at("isless=isless"));
+    }
+
+    void getConfigsMostGeneralConfigIssue14317() {
+        // Verifies that the most general X (out of X=X and X) and Y=Y is returned
+        // For Z: First Z=Z is added to ret, then the ifndef else branch replaces Z=Z with the more general Z
+        const char filedata[] = "#ifdef X\n"
+                                "print(X);\n"
+                                "#endif\n"
+                                "#if X\n"
+                                "print(X+1);\n"
+                                "#endif\n"
+                                "#if defined(Y)\n"
+                                "print(Y);\n"
+                                "#endif\n"
+                                "#ifdef Z\n"
+                                "print(Z);\n"
+                                "#endif\n"
+                                "#ifndef Z\n"
+                                "print(Z+1);\n"
+                                "#else\n"
+                                "print(Z+2);\n"
+                                "#endif\n";
+        // Test getConfigsStr()
+        ASSERT_EQUALS("\nX\nY=Y\nZ\n", getConfigsStr(filedata));
+    }
+
+    void getConfigsInvalid() { // #14732
+        {
+            const char filedata[] = "#if<\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if>\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if==\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if<=\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if>=\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+        {
+            const char filedata[] = "#if!\n";
+            ASSERT_EQUALS("\n", getConfigsStr(filedata));
+        }
+    }
+
     void if_sizeof() { // #4071
-        static const char* code = "#if sizeof(unsigned short) == 2\n"
-                                  "Fred & Wilma\n"
-                                  "#elif sizeof(unsigned short) == 4\n"
-                                  "Fred & Wilma\n"
-                                  "#else\n"
-                                  "#endif";
-
-        const std::map<std::string, std::string> actual = PreprocessorHelper::getcode(settings0, *this, code);
+        const char code[] = "#if sizeof(unsigned short) == 2\n"
+                            "Fred & Wilma\n"
+                            "#elif sizeof(unsigned short) == 4\n"
+                            "Fred & Wilma\n"
+                            "#else\n"
+                            "#endif\n";
+
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, code);
         ASSERT_EQUALS("\nFred & Wilma", actual.at(""));
     }
 
@@ -2288,232 +2789,246 @@ class TestPreprocessor : public TestFixture {
                                 "int x;\n";
 
         // Preprocess => don't crash..
-        (void)PreprocessorHelper::getcode(settings0, *this, filedata);
+        (void)getcode(settings0, *this, filedata);
         ASSERT_EQUALS(
-            "[file.c:1:0]: (error) Syntax error in #ifdef [preprocessorErrorDirective]\n"
-            "[file.c:1:0]: (error) Syntax error in #ifdef [preprocessorErrorDirective]\n", errout_str());
+            "[file.c:1:2]: (error) Syntax error in #ifdef [syntaxError]\n"
+            "[file.c:1:2]: (error) Syntax error in #ifdef [syntaxError]\n", errout_str());
     }
 
     void garbage() {
         const char filedata[] = "V\n"
                                 "#define X b   #endif #line 0 \"x\"  ;\n"
-                                "#if ! defined ( Y )    #endif";
+                                "#if ! defined ( Y )    #endif\n";
 
         // Preprocess => don't crash..
-        (void)PreprocessorHelper::getcode(settings0, *this, filedata);
+        (void)getcode(settings0, *this, filedata);
     }
 
     void wrongPathOnErrorDirective() {
         const auto settings = dinit(Settings, $.userDefines = "foo");
-        const std::string code("#error hello world!\n");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "X", "./././test.c");
-        ASSERT_EQUALS("[test.c:1:0]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
+        const char code[] = "#error hello world!\n";
+        (void)getcodeforcfg(settings, *this, code, "X", "./././test.c");
+        ASSERT_EQUALS("[test.c:1:2]: (error) #error hello world! [preprocessorErrorDirective]\n", errout_str());
     }
 
     // test for existing local include
     void testMissingInclude() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
 
-        std::string code("#include \"header.h\"");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        const char code[] = "#include \"header.h\"\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     // test for missing local include
     void testMissingInclude2() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
-        std::string code("#include \"header.h\"");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        const char code[] = "#include \"header.h\"\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: \"header.h\" not found. [missingInclude]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: \"header.h\" not found. [missingInclude]\n", errout_str());
     }
 
     // test for missing local include - no include path given
     void testMissingInclude3() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", "inc");
 
-        std::string code("#include \"header.h\"");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        const char code[] = "#include \"header.h\"\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: \"header.h\" not found. [missingInclude]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: \"header.h\" not found. [missingInclude]\n", errout_str());
     }
 
     // test for existing local include - include path provided
     void testMissingInclude4() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("inc");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("inc"),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", "inc");
 
-        std::string code("#include \"inc/header.h\"");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        const char code[] = "#include \"inc/header.h\"\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     // test for existing local include - absolute path
     void testMissingInclude5() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("inc");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("inc"),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
 
-        std::string code("#include \"" + header.path() + "\"");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        std::string code("#include \"" + header.path() + "\"\n");
+        (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     // test for missing local include - absolute path
     void testMissingInclude6() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
 
-        std::string code("#include \"" + header + "\"");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        std::string code("#include \"" + header + "\"\n");
+        (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: \"" + header + "\" not found. [missingInclude]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: \"" + header + "\" not found. [missingInclude]\n", errout_str());
     }
 
     // test for missing system include - system includes are not searched for in relative path
     void testMissingSystemInclude() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
 
-        std::string code("#include <header.h>");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        const char code[] = "#include <header.h>\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing system include
     void testMissingSystemInclude2() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
-        std::string code("#include <header.h>");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        const char code[] = "#include <header.h>\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for existing system include in system include path
     void testMissingSystemInclude3() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple", // has no effect
+                                        $.includePaths.emplace_back ("system")
+                                    );
         setTemplateFormat("simple");
-        settings.includePaths.emplace_back("system");
 
         ScopedFile header("header.h", "", "system");
 
-        std::string code("#include <header.h>");
-        (void)PreprocessorHelper::getcode(settings0, *this, code, "", "test.c");
+        const char code[] = "#include <header.h>\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     // test for existing system include - absolute path
     void testMissingSystemInclude4() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("inc");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("inc");
+                                    $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
 
-        std::string code("#include <" + header.path() + ">");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        std::string code("#include <" + header.path() + ">\n");
+        (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     // test for missing system include - absolute path
     void testMissingSystemInclude5() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
 
-        std::string code("#include <" + header + ">");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        std::string code("#include <" + header + ">\n");
+        (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <" + header + "> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing local and system include
     void testMissingIncludeMixed() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
         ScopedFile header2("header2.h", "");
 
-        std::string code("#include \"missing.h\"\n"
-                         "#include <header.h>\n"
-                         "#include <missing2.h>\n"
-                         "#include \"header2.h\"");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        const char code[] = "#include \"missing.h\"\n"
+                            "#include <header.h>\n"
+                            "#include <missing2.h>\n"
+                            "#include \"header2.h\"\n";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: \"missing.h\" not found. [missingInclude]\n"
-                      "test.c:2:0: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
-                      "test.c:3:0: information: Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: \"missing.h\" not found. [missingInclude]\n"
+                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     void testMissingIncludeCheckConfig() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("system");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("system");
+                                    $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
@@ -2537,22 +3052,69 @@ class TestPreprocessor : public TestFixture {
                          "#include \"" + missing3 + "\"\n"
                          "#include <" + header6.path() + ">\n"
                          "#include <" + missing4 + ">\n");
-        (void)PreprocessorHelper::getcode(settings, *this, code, "", "test.c");
+        (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
+
+        ASSERT_EQUALS("test.c:1:2: information: Include file: \"missing.h\" not found. [missingInclude]\n"
+                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
+                      "test.c:6:2: information: Include file: \"header4.h\" not found. [missingInclude]\n"
+                      "test.c:9:2: information: Include file: \"" + missing3 + "\" not found. [missingInclude]\n"
+                      "test.c:11:2: information: Include file: <" + missing4 + "> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
+    }
+
+    void testLazyInclude() {
+        const char *code = "#ifdef CONFIG1\n"
+                           "#include \"header1.h\"\n"
+                           "#include \"missing1.h\"\n"
+                           "#else\n"
+                           "#include \"header2.h\"\n"
+                           "#include \"missing2.h\"\n"
+                           "#endif\n";
+
+        std::vector<std::string> files;
+        simplecpp::TokenList tokens(code, files, "test.c");
+
+        ScopedFile header1("header1.h", "1\n");
+        ScopedFile header2("header2.h", "2\n");
+
+        Settings settings;
+        Preprocessor preprocessor(tokens, settings, *this, Standards::Language::CPP);
+
+        simplecpp::OutputList outputList;
+        simplecpp::TokenList tokens2 = preprocessor.preprocess("CONFIG1", files, outputList);
+        std::string out = tokens2.stringify();
+
+        const simplecpp::FileDataCache &cache = preprocessor.mFileCache;
+
+        ASSERT_EQUALS("\n#line 1 \"header1.h\"\n1", out);
+        ASSERT_EQUALS(1, outputList.size());
+        ASSERT_EQUALS("Header not found: \"missing1.h\"", outputList.begin()->msg);
+        ASSERT_EQUALS(1, cache.size());
+    }
+
+    void hasInclude() {
+        const char code[] = "#if __has_include(<directory/non-existent-header.h>)\n123\n#endif\n";
+        Settings settings;
+
+        settings.standards.setStd("c++11");
+        ASSERT_EQUALS("", getcodeforcfg(settings, *this, code, "", "test.cpp"));
+        ASSERT_EQUALS("[test.cpp:1:2]: (error) failed to evaluate #if condition, undefined function-like macro invocation: __has_include( ... ) [syntaxError]\n", errout_str()); // TODO: use individual ID
+
+        settings.standards.setStd("c++17");
+        ASSERT_EQUALS("", getcodeforcfg(settings, *this, code, "", "test.cpp"));
+        ASSERT_EQUALS("", errout_str());
 
-        ASSERT_EQUALS("test.c:1:0: information: Include file: \"missing.h\" not found. [missingInclude]\n"
-                      "test.c:2:0: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
-                      "test.c:3:0: information: Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
-                      "test.c:6:0: information: Include file: \"header4.h\" not found. [missingInclude]\n"
-                      "test.c:9:0: information: Include file: \"" + missing3 + "\" not found. [missingInclude]\n"
-                      "test.c:11:0: information: Include file: <" + missing4 + "> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        settings.standards.setStd("gnu++11");
+        ASSERT_EQUALS("", getcodeforcfg(settings, *this, code, "", "test.cpp"));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void limitsDefines() {
         // #11928 / #10045
         const char code[] = "void f(long l) {\n"
                             "  if (l > INT_MAX) {}\n"
-                            "}";
-        const std::string actual = PreprocessorHelper::getcode(settings0, *this, code, "", "test.c");
+                            "}\n";
+        const std::string actual = getcodeforcfg(settings0, *this, code, "", "test.c");
         ASSERT_EQUALS("void f ( long l ) {\n"
                       "if ( l > $2147483647 ) { }\n"
                       "}", actual);
@@ -2560,9 +3122,9 @@ class TestPreprocessor : public TestFixture {
 
     void hashCalculation() {
         // #12383
-        const char code[] = "int a;";
-        const char code2[] = "int  a;"; // extra space
-        const char code3[] = "\n\nint a;"; // extra new line
+        const char code[] = "int a;\n";
+        const char code2[] = "int  a;\n"; // extra space
+        const char code3[] = "\n\nint a;\n"; // extra new line
 
         ASSERT_EQUALS(getHash(code), getHash(code));
         ASSERT_EQUALS(getHash(code2), getHash(code2));
@@ -2572,9 +3134,9 @@ class TestPreprocessor : public TestFixture {
         ASSERT(getHash(code2) != getHash(code3));
     }
 
-    void standard() const {
+    void standard() {
 
-        const char code[] = "int a;";
+        const char code[] = "int a;\n";
         // TODO: this bypasses the standard determined from the settings - the parameter should not be exposed
         simplecpp::DUI dui;
 
@@ -2614,10 +3176,60 @@ class TestPreprocessor : public TestFixture {
             dui.std = "gnu77";
             std::vector<std::string> files;
             TokenList tokenlist{settingsDefault, Standards::Language::CPP};
-            preprocess(code, files, "test.cpp", tokenlist, dui);
+            // TODO: can this happen from application code? if yes we need to turn it into a proper error
+            ASSERT_THROW_EQUALS(preprocess(code, files, "test.cpp", tokenlist, dui), std::runtime_error, "unexpected simplecpp::Output type 12");
             ASSERT(!tokenlist.front()); // nothing is tokenized when an unknown standard is provided
         }
     }
+
+    void writeLocations()
+    {
+        const char inc[] = "class A {\n"
+                           "public:\n"
+                           "    void f() {}\n"
+                           "};\n";
+        const char code[] = "#include \"test.h\"\n";
+        ScopedFile header("test.h", inc);
+        const std::string processed = getcodeforcfg(settingsDefault, *this, code, "", "test.cpp");
+        ASSERT_EQUALS(
+            "\n"
+            "#line 1 \"test.h\"\n"
+            "class A {\n"
+            "public :\n"
+            "void f ( ) { }\n"
+            "} ;",
+            processed);
+    }
+
+    void pragmaAsm()
+    {
+        const char code[] = "#pragma asm\n";
+        ASSERT_THROW_INTERNAL(getcodeforcfg(settingsDefault, *this, code, "", "test.cpp"), InternalError::SYNTAX);
+    }
+
+    void dumpPreprocessor() {
+        const char code[] = "#if M == 0\n"
+                            "#endif\n;\n";
+        std::vector<std::string> files;
+        simplecpp::OutputList outputList;
+
+        Settings settings;
+        settings.relativePaths = true;
+        settings.basePaths.emplace_back("/some/path");
+
+        simplecpp::TokenList tokens1(code, files, "/some/path/test.cpp", {}, &outputList);
+        Preprocessor preprocessor(tokens1, settings, *this, Standards::Language::CPP);
+        (void)preprocessor.preprocess("", files, outputList);
+        (void)preprocessor.reportOutput(outputList, true);
+
+        std::ostringstream ostr;
+        preprocessor.dump(ostr);
+        ASSERT_EQUALS(
+            "  <simplecpp-if-cond>\n"
+            "    <if-cond file=\"test.cpp\" line=\"1\" column=\"2\" E=\"M == 0\" result=\"1\"/>\n"
+            "  </simplecpp-if-cond>\n",
+            ostr.str());
+    }
 };
 
 REGISTER_TEST(TestPreprocessor)
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index f634587e76c..87b03d915f8 100644
--- a/test/testprocessexecutor.cpp
+++ b/test/testprocessexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,8 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "filesettings.h"
+#include "config.h"
 #include "fixture.h"
+
+#ifdef HAS_THREADING_MODEL_FORK
+#include "filesettings.h"
 #include "helpers.h"
 #include "processexecutor.h"
 #include "redirect.h"
@@ -33,13 +36,22 @@
 #include <string>
 #include <utility>
 #include <vector>
+#endif // HAS_THREADING_MODEL_FORK
 
 class TestProcessExecutorBase : public TestFixture {
 public:
-    TestProcessExecutorBase(const char * const name, bool useFS) : TestFixture(name), useFS(useFS) {}
+    TestProcessExecutorBase(const char * const name, bool useFS)
+        : TestFixture(name)
+#ifdef HAS_THREADING_MODEL_FORK
+        , useFS(useFS)
+#endif // HAS_THREADING_MODEL_FORK
+    {
+        (void)useFS;
+    }
 
 private:
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+#ifdef HAS_THREADING_MODEL_FORK
+    /*const*/ Settings settings;
     bool useFS;
 
     std::string fprefix() const
@@ -51,15 +63,10 @@ class TestProcessExecutorBase : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool quiet = true;
-        SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        Settings::ShowTime showtime = Settings::ShowTime::NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;
-        bool clangTidy = false;
-        bool executeCommandCalled = false;
-        std::string exe;
-        std::vector<std::string> args;
     };
 
     /**
@@ -72,19 +79,19 @@ class TestProcessExecutorBase : public TestFixture {
         std::list<FileWithDetails> filelist;
         if (opt.filesList.empty()) {
             for (int i = 1; i <= files; ++i) {
-                std::string f_s = fprefix() + "_" + std::to_string(i) + ".cpp";
-                filelist.emplace_back(f_s, Standards::Language::CPP, data.size());
+                std::string f_s = fprefix() + "_" + std::to_string(i) + ".c";
+                filelist.emplace_back(f_s, Standards::Language::C, data.size());
                 if (useFS) {
-                    fileSettings.emplace_back(std::move(f_s), Standards::Language::CPP, data.size());
+                    fileSettings.emplace_back(std::move(f_s), Standards::Language::C, data.size());
                 }
             }
         }
         else {
             for (const auto& f : opt.filesList)
             {
-                filelist.emplace_back(f, Standards::Language::CPP, data.size());
+                filelist.emplace_back(f, Standards::Language::C, data.size());
                 if (useFS) {
-                    fileSettings.emplace_back(f, Standards::Language::CPP, data.size());
+                    fileSettings.emplace_back(f, Standards::Language::C, data.size());
                 }
             }
         }
@@ -97,15 +104,12 @@ class TestProcessExecutorBase : public TestFixture {
             s.plistOutput = opt.plistOutput;
         s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}";
         Suppressions supprs;
+        std::unique_ptr<TimerResults> timerResults;
+        if (s.showtime != Settings::ShowTime::NONE)
+            timerResults.reset(new TimerResults);
 
-        bool executeCommandCalled = false;
-        std::string exe;
-        std::vector<std::string> args;
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
-        auto executeFn = [&executeCommandCalled, &exe, &args](std::string e,std::vector<std::string> a,std::string,std::string&){
-            executeCommandCalled = true;
-            exe = std::move(e);
-            args = std::move(a);
+        auto executeFn = [](std::string,std::vector<std::string>,std::string,std::string&){
             return EXIT_SUCCESS;
         };
 
@@ -118,20 +122,14 @@ class TestProcessExecutorBase : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ProcessExecutor executor(filelist, fileSettings, s, supprs, *this, executeFn);
+        ProcessExecutor executor(filelist, fileSettings, s, supprs, *this, timerResults.get(), executeFn);
         ASSERT_EQUALS(result, executor.check());
-        ASSERT_EQUALS(opt.executeCommandCalled, executeCommandCalled);
-        ASSERT_EQUALS(opt.exe, exe);
-        ASSERT_EQUALS(opt.args.size(), args.size());
-        for (std::size_t i = 0; i < args.size(); ++i)
-        {
-            ASSERT_EQUALS(opt.args[i], args[i]);
-        }
     }
+#endif // HAS_THREADING_MODEL_FORK
 
     void run() override {
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
         mNewTemplate = true;
+#ifdef HAS_THREADING_MODEL_FORK
         TEST_CASE(deadlock_with_many_errors);
         TEST_CASE(many_threads);
         TEST_CASE(many_threads_showtime);
@@ -141,27 +139,24 @@ class TestProcessExecutorBase : public TestFixture {
         TEST_CASE(no_errors_equal_amount_files);
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
-        TEST_CASE(clangTidy);
         TEST_CASE(showtime_top5_file);
-        TEST_CASE(showtime_top5_summary);
         TEST_CASE(showtime_file);
-        TEST_CASE(showtime_summary);
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
-#endif // !WIN32
+#endif // HAS_THREADING_MODEL_FORK
     }
 
+#ifdef HAS_THREADING_MODEL_FORK
     void deadlock_with_many_errors() {
         std::ostringstream oss;
-        oss << "int main()\n"
+        oss << "void f()\n"
             << "{\n";
         const int num_err = 1;
         for (int i = 0; i < num_err; i++) {
-            oss << "  {int i = *((int*)0);}\n";
+            oss << "  (void)(*((int*)0));\n";
         }
-        oss << "  return 0;\n"
-            << "}\n";
+        oss << "}\n";
         const int num_files = 3;
         check(2, num_files, num_files, oss.str());
         ASSERT_EQUALS(1LL * num_err * num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
@@ -170,10 +165,9 @@ class TestProcessExecutorBase : public TestFixture {
     void many_threads() {
         const int num_files = 100;
         check(16, num_files, num_files,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
         ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
@@ -182,11 +176,10 @@ class TestProcessExecutorBase : public TestFixture {
     void many_threads_showtime() {
         SUPPRESS;
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}", dinit(CheckOptions, $.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions, $.showtime = Settings::ShowTime::SUMMARY));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -196,10 +189,9 @@ class TestProcessExecutorBase : public TestFixture {
         ScopedFile plistFile("dummy", "", plistOutput);
 
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
         // we are not interested in the results - so just consume them
         ignore_errout();
@@ -231,53 +223,23 @@ class TestProcessExecutorBase : public TestFixture {
 
     void one_error_less_files() {
         check(2, 1, 1,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {int i = *((int*)0);}\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
-        ASSERT_EQUALS("[" + fprefix() + "_1.cpp:3:14]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
+        ASSERT_EQUALS("[" + fprefix() + "_1.c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     void one_error_several_files() {
         const int num_files = 20;
         check(2, num_files, num_files,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {int i = *((int*)0);}\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
         ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
-    void clangTidy() {
-        // TODO: we currently only invoke it with ImportProject::FileSettings
-        if (!useFS)
-            return;
-
-#ifdef _WIN32
-        constexpr char exe[] = "clang-tidy.exe";
-#else
-        constexpr char exe[] = "clang-tidy";
-#endif
-        (void)exe;
-
-        const std::string file = fprefix() + "_1.cpp";
-        // TODO: the invocation cannot be checked as the code is called in the forked process
-        check(2, 1, 0,
-              "int main()\n"
-              "{\n"
-              "  return 0;\n"
-              "}",
-              dinit(CheckOptions,
-                    $.quiet = false,
-                        $.clangTidy = true /*,
-                                              $.executeCommandCalled = true,
-                                              $.exe = exe,
-                                              $.args = {"-quiet", "-checks=*,-clang-analyzer-*,-llvm*", file, "--"}*/));
-        ASSERT_EQUALS("Checking " + file + " ...\n", output_str());
-    }
-
     // TODO: provide data which actually shows values above 0
 
     // TODO: should this be logged only once like summary?
@@ -286,25 +248,10 @@ class TestProcessExecutorBase : public TestFixture {
         check(2, 2, 0,
               "int main() {}",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE));
-        // for each file: top5 results + overall + empty line
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall + empty line
-        TODO_ASSERT_EQUALS(static_cast<long long>(5 + 1 + 1) * 2, 0, cppcheck::count_all_of(output_s, '\n'));
-    }
-
-    void showtime_top5_summary() {
-        REDIRECT;
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY));
+                    $.showtime = Settings::ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall + empty line
-        TODO_ASSERT_EQUALS(5 + 1 + 1, 2, cppcheck::count_all_of(output_s, '\n'));
-        // should only report the top5 once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        // for each file: top5 results + check time
+        TODO_ASSERT_EQUALS(static_cast<long long>(5 + 1) * 2, 0, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_file() {
@@ -312,44 +259,31 @@ class TestProcessExecutorBase : public TestFixture {
         check(2, 2, 0,
               "int main() {}",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_FILE));
+                    $.showtime = Settings::ShowTime::FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         TODO_ASSERT_EQUALS(2, 0, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
-    void showtime_summary() {
-        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // should only report the actual summary once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
-    }
-
     void showtime_file_total() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
               "int main() {}",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL));
+                    $.showtime = Settings::ShowTime::FILE_TOTAL));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_1.cpp: ") != std::string::npos);
-        TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_2.cpp: ") != std::string::npos);
+        TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_1.c: ") != std::string::npos);
+        TODO_ASSERT(output_s.find("Check time: " + fprefix() + "_2.c: ") != std::string::npos);
     }
 
     void suppress_error_library() {
         SUPPRESS;
         const Settings settingsOld = settings; // TODO: get rid of this
-        const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
+        const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
         settings = settingsBuilder().libraryxml(xmldata).build();
         check(2, 1, 0,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
         ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
@@ -360,15 +294,16 @@ class TestProcessExecutorBase : public TestFixture {
         ScopedFile inc_h(fprefix() + ".h",
                          "inline void f()\n"
                          "{\n"
-                         "  (void)*((int*)0);\n"
+                         "  (void)(*((int*)0));\n"
                          "}");
         check(2, 2, 2,
               "#include \"" + inc_h.name() +"\"");
         // this is made unique by the executor
-        ASSERT_EQUALS("[" + inc_h.name() + ":3:11]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
+        ASSERT_EQUALS("[" + inc_h.name() + ":3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     // TODO: test whole program analysis
+#endif // HAS_THREADING_MODEL_FORK
 };
 
 class TestProcessExecutorFiles : public TestProcessExecutorBase {
diff --git a/test/testprogrammemory.cpp b/test/testprogrammemory.cpp
index 63682e0f10a..c37431de608 100644
--- a/test/testprogrammemory.cpp
+++ b/test/testprogrammemory.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,8 +21,11 @@
 #include "helpers.h"
 #include "token.h"
 #include "programmemory.h"
+#include "utils.h"
 #include "vfvalue.h"
 
+#include <stdexcept>
+
 class TestProgramMemory : public TestFixture {
 public:
     TestProgramMemory() : TestFixture("TestProgramMemory") {}
@@ -30,10 +33,13 @@ class TestProgramMemory : public TestFixture {
 private:
     void run() override {
         TEST_CASE(copyOnWrite);
+        TEST_CASE(hasValue);
+        TEST_CASE(getValue);
+        TEST_CASE(at);
     }
 
     void copyOnWrite() const {
-        SimpleTokenList tokenlist("1+1;");
+        SimpleTokenList tokenlist("1+1;\n");
         Token* tok = tokenlist.front();
         const nonneg int id = 123;
         tok->exprId(id);
@@ -79,6 +85,22 @@ class TestProgramMemory : public TestFixture {
         ASSERT(v);
         ASSERT_EQUALS(41, v->intvalue);
     }
+
+    void hasValue() const {
+        ProgramMemory pm;
+        ASSERT(!pm.hasValue(123));
+    }
+
+    void getValue() const {
+        ProgramMemory pm;
+        ASSERT(!pm.getValue(123));
+    }
+
+    void at() const {
+        ProgramMemory pm;
+        ASSERT_THROW_EQUALS(pm.at(123), std::out_of_range, "ProgramMemory::at");
+        ASSERT_THROW_EQUALS(utils::as_const(pm).at(123), std::out_of_range, "ProgramMemory::at");
+    }
 };
 
 REGISTER_TEST(TestProgramMemory)
diff --git a/test/testregex.cpp b/test/testregex.cpp
new file mode 100644
index 00000000000..f26a9fee4fa
--- /dev/null
+++ b/test/testregex.cpp
@@ -0,0 +1,208 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+#ifdef HAVE_RULES
+
+#include "fixture.h"
+#include "regex.h"
+
+#include <list>
+#include <memory>
+#include <string>
+#include <utility>
+
+class TestRegExBase : public TestFixture {
+public:
+    TestRegExBase(const char * const name, Regex::Engine engine) : TestFixture(name), mEngine(engine) {}
+
+private:
+    Regex::Engine mEngine;
+
+    void run() override {
+        TEST_CASE(match);
+        TEST_CASE(nomatch);
+        TEST_CASE(compileError);
+        TEST_CASE(copy);
+        TEST_CASE(multimatch);
+        TEST_CASE(partialmatch);
+        TEST_CASE(exactmatch);
+    }
+
+#define assertRegex(...) assertRegex_(__FILE__, __LINE__, __VA_ARGS__)
+    std::shared_ptr<Regex> assertRegex_(const char* file, int line, std::string pattern, const std::string& exp_err = "") const {
+        std::string regex_err;
+        auto r = Regex::create(std::move(pattern), mEngine, regex_err);
+        if (exp_err.empty()) {
+            ASSERT_LOC(!!r.get(), file, line);
+            ASSERT_EQUALS_ENUM_LOC(mEngine, r->engine(), file, line);
+        }
+        else
+            ASSERT_LOC(!r.get(), file, line); // only not set if we encountered an error
+        ASSERT_EQUALS_LOC(exp_err, regex_err, file, line);
+        return r;
+    }
+
+    void match() const {
+        const auto r = assertRegex("begin.*end");
+        int called = 0;
+        int s = -1;
+        int e = -1;
+        auto f = [&](int start, int end) {
+            ++called;
+            s = start;
+            e = end;
+        };
+        ASSERT_EQUALS("", r->match("begin-123-end", std::move(f)));
+        ASSERT_EQUALS(1, called);
+        ASSERT_EQUALS(0, s);
+        ASSERT_EQUALS(13, e);
+    }
+
+    void nomatch() const {
+        const auto r = assertRegex("begin.*end");
+        int called = 0;
+        auto f = [&](int /*start*/, int /*end*/) {
+            ++called;
+        };
+        ASSERT_EQUALS("", r->match("end-123-begin", std::move(f)));
+        ASSERT_EQUALS(0, called);
+    }
+
+    void compileError() const {
+        std::string exp;
+        if (mEngine == Regex::Engine::Pcre)
+            exp = "missing terminating ] for character class";
+
+        (void)assertRegex("[", exp);
+    }
+
+    void copy() const {
+        const auto r = assertRegex("begin.*end");
+
+        int called = 0;
+        int s = -1;
+        int e = -1;
+        auto f = [&](int start, int end) {
+            ++called;
+            s = start;
+            e = end;
+        };
+
+        {
+            // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
+            auto r2 = r;
+            ASSERT_EQUALS("", r2->match("begin-123-end", f));
+            ASSERT_EQUALS(1, called);
+            ASSERT_EQUALS(0, s);
+            ASSERT_EQUALS(13, e);
+        }
+
+        called = 0;
+        s = -1;
+        e = -1;
+        ASSERT_EQUALS("", r->match("begin-123-end", f));
+        ASSERT_EQUALS(1, called);
+        ASSERT_EQUALS(0, s);
+        ASSERT_EQUALS(13, e);
+    }
+
+    void multimatch() const {
+        const auto r = assertRegex("info:.*");
+
+        std::string input =
+            "info: start\n"
+            "info: init\n"
+            "warn: missing\n"
+            "warn: invalid\n"
+            "info: done\n"
+            "error: notclean\n";
+
+        std::list<std::string> matches;
+        auto f = [&](int start, int end) {
+            matches.push_back(input.substr(start, end - start));
+        };
+        ASSERT_EQUALS("", r->match(input, std::move(f)));
+        ASSERT_EQUALS(3, matches.size());
+        auto it = matches.cbegin();
+        ASSERT_EQUALS("info: start", *it);
+        ASSERT_EQUALS("info: init", *(++it));
+        ASSERT_EQUALS("info: done", *(++it));
+    }
+
+    void partialmatch() const {
+        const auto r = assertRegex("123");
+        int called = 0;
+        int s = -1;
+        int e = -1;
+        auto f = [&](int start, int end) {
+            ++called;
+            s = start;
+            e = end;
+        };
+        ASSERT_EQUALS("", r->match("begin-123-end", std::move(f)));
+        ASSERT_EQUALS(1, called);
+        ASSERT_EQUALS(6, s);
+        ASSERT_EQUALS(9, e);
+    }
+
+    void exactmatch() const {
+        const auto r = assertRegex("^123$");
+
+        int called = 0;
+        int s = -1;
+        int e = -1;
+        auto f = [&](int start, int end) {
+            ++called;
+            s = start;
+            e = end;
+        };
+
+        ASSERT_EQUALS("", r->match("begin-123-end", f));
+        ASSERT_EQUALS(0, called);
+        ASSERT_EQUALS(-1, s);
+        ASSERT_EQUALS(-1, e);
+
+        ASSERT_EQUALS("", r->match("123\n123", f));
+        ASSERT_EQUALS(0, called);
+        ASSERT_EQUALS(-1, s);
+        ASSERT_EQUALS(-1, e);
+
+        ASSERT_EQUALS("", r->match("123123", f));
+        ASSERT_EQUALS(0, called);
+        ASSERT_EQUALS(-1, s);
+        ASSERT_EQUALS(-1, e);
+
+        ASSERT_EQUALS("", r->match("123", f));
+        ASSERT_EQUALS(1, called);
+        ASSERT_EQUALS(0, s);
+        ASSERT_EQUALS(3, e);
+    }
+
+    // TODO: how to provoke a match() error?
+
+#undef assertRegex
+};
+
+class TestRegExPcre : public TestRegExBase {
+public:
+    TestRegExPcre() : TestRegExBase("TestRegExPcre", Regex::Engine::Pcre) {}
+};
+
+REGISTER_TEST(TestRegExPcre)
+
+#endif // HAVE_RULES
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index 2f44ad4395f..1c5230c5535 100755
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -34,6 +34,7 @@
     <ClCompile Include="..\cli\singleexecutor.cpp" />
     <ClCompile Include="..\cli\stacktrace.cpp" />
     <ClCompile Include="..\cli\threadexecutor.cpp" />
+    <ClCompile Include="..\frontend\frontend.cpp" />
     <ClCompile Include="fixture.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -52,6 +53,7 @@
     <ClCompile Include="testbufferoverrun.cpp" />
     <ClCompile Include="testcharvar.cpp" />
     <ClCompile Include="testcheck.cpp" />
+    <ClCompile Include="testcheckersreport.cpp" />
     <ClCompile Include="testclangimport.cpp" />
     <ClCompile Include="testclass.cpp" />
     <ClCompile Include="testcmdlineparser.cpp" />
@@ -64,6 +66,7 @@
     <ClCompile Include="testexecutor.cpp" />
     <ClCompile Include="testfilelister.cpp" />
     <ClCompile Include="testfilesettings.cpp" />
+    <ClCompile Include="testfrontend.cpp" />
     <ClCompile Include="testfunctions.cpp" />
     <ClCompile Include="testgarbage.cpp" />
     <ClCompile Include="testimportproject.cpp" />
@@ -84,6 +87,8 @@
     <ClCompile Include="testpreprocessor.cpp" />
     <ClCompile Include="testprocessexecutor.cpp" />
     <ClCompile Include="testprogrammemory.cpp" />
+    <ClCompile Include="testregex.cpp" />
+    <ClCompile Include="testsarifreport.cpp" />
     <ClCompile Include="testsettings.cpp" />
     <ClCompile Include="testsimplifytemplate.cpp" />
     <ClCompile Include="testsimplifytokens.cpp" />
@@ -125,6 +130,7 @@
     <ClInclude Include="..\cli\singleexecutor.h" />
     <ClInclude Include="..\cli\stacktrace.h" />
     <ClInclude Include="..\cli\threadexecutor.h" />
+    <ClInclude Include="..\frontend\frontend.h" />
     <ClInclude Include="fixture.h" />
     <ClInclude Include="helpers.h" />
     <ClInclude Include="options.h" />
@@ -198,11 +204,11 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\cli;..\frontend;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;$(HaveBoost);_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
@@ -227,11 +233,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\cli;..\frontend;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;$(HaveBoost);HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
@@ -256,10 +262,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\cli;..\frontend;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;$(HaveBoost);NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -296,10 +302,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\cli;..\frontend;..\lib;..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;$(BoostInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;$(HaveBoost);NDEBUG;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
diff --git a/test/testrunner.vcxproj.filters b/test/testrunner.vcxproj.filters
index 81ab11f1f3c..b02e6b97fa6 100644
--- a/test/testrunner.vcxproj.filters
+++ b/test/testrunner.vcxproj.filters
@@ -136,9 +136,6 @@
     <ClCompile Include="testio.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="testboost.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="testinternal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -220,9 +217,6 @@
     <ClCompile Include="testclangimport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cli\cppcheckexecutorseh.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\cli\signalhandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -268,6 +262,24 @@
     <ClCompile Include="teststandards.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\cli\sehwrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="testexecutor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="testvfvalue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\frontend\frontend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="testfrontend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="testregex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup Label="HeaderFiles">
     <ClInclude Include="options.h">
@@ -291,9 +303,6 @@
     <ClInclude Include="..\cli\cppcheckexecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cli\cppcheckexecutorseh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\cli\signalhandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -315,5 +324,11 @@
     <ClInclude Include="helpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\cli\sehwrapper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\frontend\frontend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/testsarifreport.cpp b/test/testsarifreport.cpp
new file mode 100644
index 00000000000..e9fc56d736d
--- /dev/null
+++ b/test/testsarifreport.cpp
@@ -0,0 +1,906 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2026 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/>.
+ */
+
+#include "sarifreport.h"
+#include "errorlogger.h"
+#include "errortypes.h"
+#include "fixture.h"
+
+#include <cmath>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "json.h"
+
+class TestSarifReport : public TestFixture
+{
+public:
+    TestSarifReport() : TestFixture("TestSarifReport")
+    {}
+
+private:
+    void run() override
+    {
+        TEST_CASE(emptyReport);
+        TEST_CASE(singleError);
+        TEST_CASE(multipleErrors);
+        TEST_CASE(errorWithoutLocation);
+        TEST_CASE(errorWithMultipleLocations);
+        TEST_CASE(differentSeverityLevels);
+        TEST_CASE(securityRelatedErrors);
+        TEST_CASE(cweTagsPresent);
+        TEST_CASE(noCweNoSecurity);
+        TEST_CASE(inconclusiveCertainty);
+        TEST_CASE(criticalErrorId);
+        TEST_CASE(emptyDescriptions);
+        TEST_CASE(locationBoundaryValues);
+        TEST_CASE(duplicateRuleIds);
+        TEST_CASE(customProductName);
+        TEST_CASE(versionHandling);
+        TEST_CASE(securitySeverityMapping);
+        TEST_CASE(versionWithSpace);
+        TEST_CASE(customProductNameAndVersion);
+        TEST_CASE(normalizeLineColumnToOne);
+        TEST_CASE(internalAndDebugSeverity);
+        TEST_CASE(problemSeverityMapping);
+        TEST_CASE(mixedLocationAndNoLocation);
+    }
+
+    // Helper to create an ErrorMessage
+    static ErrorMessage createErrorMessage(const std::string& id,
+                                           Severity severity,
+                                           const std::string& msg,
+                                           const std::string& file = "test.cpp",
+                                           int line                = 10,
+                                           int column              = 5,
+                                           int cweId               = 0,
+                                           Certainty certainty     = Certainty::normal)
+    {
+        ErrorMessage::FileLocation loc(file, line, column);
+        ErrorMessage errorMessage({loc}, file, severity, msg, id, certainty);
+        if (cweId > 0)
+        {
+            errorMessage.cwe = CWE(cweId);
+        }
+        return errorMessage;
+    }
+
+    // Helper to parse JSON and validate structure
+    static bool parseAndValidateJson(const std::string& json, picojson::value& root)
+    {
+        std::string parseError = picojson::parse(root, json);
+        return parseError.empty() && root.is<picojson::object>();
+    }
+
+    void emptyReport()
+    {
+        SarifReport report;
+        std::string sarif = report.serialize("TestProduct");
+
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root = json.get<picojson::object>();
+        ASSERT_EQUALS("2.1.0", root.at("version").get<std::string>());
+        ASSERT(root.at("$schema").get<std::string>().find("sarif-schema-2.1.0") != std::string::npos);
+
+        // From SARIF specification (https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/sarif-v2.1.0-errata01-os-complete.html#_Toc141790730):
+        // Although the order in which properties appear in a JSON object value is not semantically significant, the version property SHOULD appear first.
+        ASSERT_EQUALS("{\n  \"version\": \"2.1.0\"", sarif.substr(0,22));
+
+        const picojson::array& runs = root.at("runs").get<picojson::array>();
+        ASSERT_EQUALS(1U, runs.size());
+
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+        ASSERT_EQUALS(0U, results.size());
+
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+        ASSERT_EQUALS(0U, rules.size());
+    }
+
+    void singleError()
+    {
+        SarifReport report;
+        report.addFinding(createErrorMessage("nullPointer", Severity::error, "Null pointer dereference"));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root = json.get<picojson::object>();
+        const picojson::array& runs  = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run  = runs[0].get<picojson::object>();
+
+        // Check results
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+        ASSERT_EQUALS(1U, results.size());
+
+        const picojson::object& result = results[0].get<picojson::object>();
+        ASSERT_EQUALS("nullPointer", result.at("ruleId").get<std::string>());
+        ASSERT_EQUALS("error", result.at("level").get<std::string>());
+
+        const picojson::object& message = result.at("message").get<picojson::object>();
+        ASSERT_EQUALS("Null pointer dereference", message.at("text").get<std::string>());
+
+        // Check rules
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+        ASSERT_EQUALS(1U, rules.size());
+
+        const picojson::object& rule = rules[0].get<picojson::object>();
+        ASSERT_EQUALS("nullPointer", rule.at("id").get<std::string>());
+    }
+
+    void multipleErrors()
+    {
+        SarifReport report;
+        report.addFinding(createErrorMessage("error1", Severity::error, "Error 1", "file1.cpp", 10, 5));
+        report.addFinding(createErrorMessage("error2", Severity::warning, "Error 2", "file2.cpp", 20, 10));
+        report.addFinding(createErrorMessage("error3", Severity::style, "Error 3", "file3.cpp", 30, 15));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root = json.get<picojson::object>();
+        const picojson::array& runs  = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run  = runs[0].get<picojson::object>();
+
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+        ASSERT_EQUALS(3U, results.size());
+
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+        ASSERT_EQUALS(3U, rules.size());
+    }
+
+    void errorWithoutLocation()
+    {
+        SarifReport report;
+
+        // Create error without location (empty callStack)
+        ErrorMessage errorMessage(
+            {}, "test.cpp", Severity::error, "Error without location", "testError", Certainty::normal);
+        report.addFinding(errorMessage);
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root = json.get<picojson::object>();
+        const picojson::array& runs  = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run  = runs[0].get<picojson::object>();
+
+        // Should have no results (GitHub doesn't support findings without locations)
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+        ASSERT_EQUALS(0U, results.size());
+
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+        ASSERT_EQUALS(0U, rules.size());
+    }
+
+    void errorWithMultipleLocations()
+    {
+        SarifReport report;
+
+        ErrorMessage::FileLocation loc1("test1.cpp", 10, 5);
+        ErrorMessage::FileLocation loc2("test2.cpp", 20, 10);
+        ErrorMessage::FileLocation loc3("test3.cpp", 30, 15);
+
+        ErrorMessage errorMessage({loc1, loc2, loc3},
+                                  "test1.cpp",
+                                  Severity::error,
+                                  "Error with multiple locations",
+                                  "multiLocError",
+                                  Certainty::normal);
+        report.addFinding(errorMessage);
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+
+        ASSERT_EQUALS(1U, results.size());
+
+        const picojson::object& result   = results[0].get<picojson::object>();
+        const picojson::array& locations = result.at("locations").get<picojson::array>();
+        ASSERT_EQUALS(3U, locations.size());
+
+        // Verify each location
+        const picojson::object& loc1Obj  = locations[0].get<picojson::object>();
+        const picojson::object& physLoc1 = loc1Obj.at("physicalLocation").get<picojson::object>();
+        const picojson::object& region1  = physLoc1.at("region").get<picojson::object>();
+        ASSERT_EQUALS(10, static_cast<int>(region1.at("startLine").get<double>()));
+        ASSERT_EQUALS(5, static_cast<int>(region1.at("startColumn").get<double>()));
+    }
+
+    void differentSeverityLevels()
+    {
+        SarifReport report;
+
+        report.addFinding(createErrorMessage("error1", Severity::error, "Error severity"));
+        report.addFinding(createErrorMessage("warning1", Severity::warning, "Warning severity"));
+        report.addFinding(createErrorMessage("style1", Severity::style, "Style severity"));
+        report.addFinding(createErrorMessage("perf1", Severity::performance, "Performance severity"));
+        report.addFinding(createErrorMessage("port1", Severity::portability, "Portability severity"));
+        report.addFinding(createErrorMessage("info1", Severity::information, "Information severity"));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root = json.get<picojson::object>();
+        const picojson::array& runs  = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run  = runs[0].get<picojson::object>();
+
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+        ASSERT_EQUALS(6U, results.size());
+
+        // Check severity mappings
+        ASSERT_EQUALS("error", results[0].get<picojson::object>().at("level").get<std::string>());    // error
+        ASSERT_EQUALS("error", results[1].get<picojson::object>().at("level").get<std::string>());    // warning
+        ASSERT_EQUALS("warning", results[2].get<picojson::object>().at("level").get<std::string>());  // style
+        ASSERT_EQUALS("warning", results[3].get<picojson::object>().at("level").get<std::string>());  // performance
+        ASSERT_EQUALS("warning", results[4].get<picojson::object>().at("level").get<std::string>());  // portability
+        ASSERT_EQUALS("note", results[5].get<picojson::object>().at("level").get<std::string>());     // information
+    }
+
+    void securityRelatedErrors()
+    {
+        SarifReport report;
+
+        // Add errors with CWE IDs
+        report.addFinding(createErrorMessage("nullPointer", Severity::error, "Null pointer", "test.cpp", 10, 5, 476));
+        report.addFinding(
+            createErrorMessage("bufferOverflow", Severity::error, "Buffer overflow", "test.cpp", 20, 5, 121));
+        report.addFinding(createErrorMessage("memleak", Severity::warning, "Memory leak", "test.cpp", 30, 5, 401));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+
+        for (const auto& rule : rules)
+        {
+            const picojson::object& r     = rule.get<picojson::object>();
+            const picojson::object& props = r.at("properties").get<picojson::object>();
+
+            // Should have security-severity
+            ASSERT(props.find("security-severity") != props.end());
+
+            // Should have tags with security and CWE
+            ASSERT(props.find("tags") != props.end());
+            const picojson::array& tags = props.at("tags").get<picojson::array>();
+
+            bool hasSecurityTag = false;
+            bool hasCweTag      = false;
+            for (const auto& tag : tags)
+            {
+                const std::string& tagStr = tag.get<std::string>();
+                if (tagStr == "security")
+                    hasSecurityTag = true;
+                if (tagStr.find("external/cwe/cwe-") == 0)
+                    hasCweTag = true;
+            }
+
+            ASSERT(hasSecurityTag);
+            ASSERT(hasCweTag);
+        }
+    }
+
+    void cweTagsPresent()
+    {
+        SarifReport report;
+
+        report.addFinding(createErrorMessage("testError", Severity::error, "Test error", "test.cpp", 10, 5, 119));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+
+        ASSERT_EQUALS(1U, rules.size());
+
+        const picojson::object& rule  = rules[0].get<picojson::object>();
+        const picojson::object& props = rule.at("properties").get<picojson::object>();
+        const picojson::array& tags   = props.at("tags").get<picojson::array>();
+
+        bool foundCwe119 = false;
+        for (const auto& tag : tags)
+        {
+            if (tag.get<std::string>() == "external/cwe/cwe-119")
+                foundCwe119 = true;
+        }
+
+        ASSERT(foundCwe119);
+    }
+
+    void noCweNoSecurity()
+    {
+        SarifReport report;
+
+        // Error without CWE ID should not have security properties
+        report.addFinding(createErrorMessage("styleError", Severity::style, "Style error", "test.cpp", 10, 5, 0));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+
+        ASSERT_EQUALS(1U, rules.size());
+
+        const picojson::object& rule  = rules[0].get<picojson::object>();
+        const picojson::object& props = rule.at("properties").get<picojson::object>();
+
+        // Should NOT have security-severity
+        ASSERT(props.find("security-severity") == props.end());
+
+        // Should NOT have tags (or if present, no security tag)
+        if (props.find("tags") != props.end())
+        {
+            const picojson::array& tags = props.at("tags").get<picojson::array>();
+            for (const auto& tag : tags)
+            {
+                ASSERT(tag.get<std::string>() != "security");
+            }
+        }
+    }
+
+    void inconclusiveCertainty()
+    {
+        SarifReport report;
+
+        report.addFinding(
+            createErrorMessage("test1", Severity::error, "Conclusive", "test.cpp", 10, 5, 0, Certainty::normal));
+        report.addFinding(createErrorMessage(
+                              "test2", Severity::error, "Inconclusive", "test.cpp", 20, 5, 0, Certainty::inconclusive));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+
+        ASSERT_EQUALS(2U, rules.size());
+
+        // Check precision values
+        const picojson::object& rule1  = rules[0].get<picojson::object>();
+        const picojson::object& props1 = rule1.at("properties").get<picojson::object>();
+        ASSERT_EQUALS("high", props1.at("precision").get<std::string>());
+
+        const picojson::object& rule2  = rules[1].get<picojson::object>();
+        const picojson::object& props2 = rule2.at("properties").get<picojson::object>();
+        ASSERT_EQUALS("medium", props2.at("precision").get<std::string>());
+    }
+
+    void criticalErrorId()
+    {
+        SarifReport report;
+
+        // Use a critical error ID (from ErrorLogger::isCriticalErrorId)
+        report.addFinding(createErrorMessage("syntaxError", Severity::error, "Syntax error"));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+
+        ASSERT_EQUALS(1U, results.size());
+
+        const picojson::object& result = results[0].get<picojson::object>();
+        // Critical errors should always map to "error" level
+        ASSERT_EQUALS("error", result.at("level").get<std::string>());
+    }
+
+    void emptyDescriptions()
+    {
+        SarifReport report;
+
+        report.addFinding(createErrorMessage("testError", Severity::error, "Test error"));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+
+        ASSERT_EQUALS(1U, rules.size());
+
+        const picojson::object& rule = rules[0].get<picojson::object>();
+
+        // All descriptions should be empty for GitHub integration
+        ASSERT_EQUALS("", rule.at("name").get<std::string>());
+        ASSERT_EQUALS("", rule.at("shortDescription").get<picojson::object>().at("text").get<std::string>());
+        ASSERT_EQUALS("", rule.at("fullDescription").get<picojson::object>().at("text").get<std::string>());
+        ASSERT_EQUALS("", rule.at("help").get<picojson::object>().at("text").get<std::string>());
+    }
+
+    void locationBoundaryValues()
+    {
+        SarifReport report;
+
+        // Test with line/column values that are 0
+        // Note: Negative values don't work correctly if FileLocation uses unsigned types
+        ErrorMessage::FileLocation loc1("test.cpp", 0, 0);
+        ErrorMessage::FileLocation loc2("test.cpp", 1, 1);
+
+        ErrorMessage errorMessage1({loc1}, "test.cpp", Severity::error, "Error at 0,0", "error1", Certainty::normal);
+        ErrorMessage errorMessage2({loc2}, "test.cpp", Severity::error, "Error at 1,1", "error2", Certainty::normal);
+
+        report.addFinding(errorMessage1);
+        report.addFinding(errorMessage2);
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+
+        ASSERT_EQUALS(2U, results.size());
+
+        // Check first result (0,0 should be normalized to 1,1)
+        {
+            const picojson::object& res      = results[0].get<picojson::object>();
+            const picojson::array& locations = res.at("locations").get<picojson::array>();
+            const picojson::object& loc      = locations[0].get<picojson::object>();
+            const picojson::object& physLoc  = loc.at("physicalLocation").get<picojson::object>();
+            const picojson::object& region   = physLoc.at("region").get<picojson::object>();
+
+            int line   = static_cast<int>(region.at("startLine").get<double>());
+            int column = static_cast<int>(region.at("startColumn").get<double>());
+
+            // 0 should be normalized to 1
+            ASSERT_EQUALS(1, line);
+            ASSERT_EQUALS(1, column);
+        }
+
+        // Check second result (1,1 should stay as 1,1)
+        {
+            const picojson::object& res      = results[1].get<picojson::object>();
+            const picojson::array& locations = res.at("locations").get<picojson::array>();
+            const picojson::object& loc      = locations[0].get<picojson::object>();
+            const picojson::object& physLoc  = loc.at("physicalLocation").get<picojson::object>();
+            const picojson::object& region   = physLoc.at("region").get<picojson::object>();
+
+            int line   = static_cast<int>(region.at("startLine").get<double>());
+            int column = static_cast<int>(region.at("startColumn").get<double>());
+
+            ASSERT_EQUALS(1, line);
+            ASSERT_EQUALS(1, column);
+        }
+    }
+
+    void duplicateRuleIds()
+    {
+        SarifReport report;
+
+        // Add multiple errors with the same rule ID
+        report.addFinding(createErrorMessage("duplicateId", Severity::error, "First error", "file1.cpp", 10, 5));
+        report.addFinding(createErrorMessage("duplicateId", Severity::error, "Second error", "file2.cpp", 20, 10));
+        report.addFinding(createErrorMessage("duplicateId", Severity::error, "Third error", "file3.cpp", 30, 15));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root = json.get<picojson::object>();
+        const picojson::array& runs  = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run  = runs[0].get<picojson::object>();
+
+        // Should have 3 results but only 1 rule
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+        ASSERT_EQUALS(3U, results.size());
+
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+        ASSERT_EQUALS(1U, rules.size());
+
+        const picojson::object& rule = rules[0].get<picojson::object>();
+        ASSERT_EQUALS("duplicateId", rule.at("id").get<std::string>());
+    }
+
+    void customProductName()
+    {
+        SarifReport report;
+        report.addFinding(createErrorMessage("testError", Severity::error, "Test error"));
+
+        // Test with custom product name
+        std::string sarif = report.serialize("CustomChecker");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+
+        // Should use "Cppcheck" as default when custom name doesn't parse
+        ASSERT_EQUALS("Cppcheck", driver.at("name").get<std::string>());
+    }
+
+    void versionHandling()
+    {
+        SarifReport report;
+        report.addFinding(createErrorMessage("testError", Severity::error, "Test error"));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+
+        // Should have a semantic version
+        ASSERT(driver.find("semanticVersion") != driver.end());
+        const std::string version = driver.at("semanticVersion").get<std::string>();
+
+        // Version should not contain spaces (they should be stripped)
+        ASSERT(version.find(' ') == std::string::npos);
+    }
+
+    void securitySeverityMapping()
+    {
+        // Test the detailed security-severity mapping for different severity levels with CWE
+        SarifReport report;
+
+        // Error with CWE should get 9.9 (critical)
+        report.addFinding(createErrorMessage("error1", Severity::error, "Error with CWE", "test.cpp", 10, 5, 119));
+
+        // Warning with CWE should get 8.5 (high)
+        report.addFinding(
+            createErrorMessage("warning1", Severity::warning, "Warning with CWE", "test.cpp", 20, 5, 120));
+
+        // Style/Performance/Portability with CWE should get 5.5 (medium)
+        report.addFinding(createErrorMessage("style1", Severity::style, "Style with CWE", "test.cpp", 30, 5, 398));
+        report.addFinding(
+            createErrorMessage("perf1", Severity::performance, "Performance with CWE", "test.cpp", 40, 5, 407));
+        report.addFinding(
+            createErrorMessage("port1", Severity::portability, "Portability with CWE", "test.cpp", 50, 5, 562));
+
+        // Information with CWE should get 2.0 (low)
+        report.addFinding(createErrorMessage("info1", Severity::information, "Info with CWE", "test.cpp", 60, 5, 561));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+
+        // Check each rule's security-severity value
+        for (const auto& rule : rules)
+        {
+            const picojson::object& r     = rule.get<picojson::object>();
+            const std::string& id         = r.at("id").get<std::string>();
+            const picojson::object& props = r.at("properties").get<picojson::object>();
+
+            ASSERT(props.find("security-severity") != props.end());
+            const std::string& severity = props.at("security-severity").get<std::string>();
+            double severityValue        = std::stod(severity);
+
+            if (id == "error1")
+            {
+                // Use a tolerance for floating-point comparison to avoid warning
+                ASSERT(std::abs(severityValue - 9.9) < 0.01);
+            }
+            else if (id == "warning1")
+            {
+                ASSERT(std::abs(severityValue - 8.5) < 0.01);
+            }
+            else if (id == "style1" || id == "perf1" || id == "port1")
+            {
+                ASSERT(std::abs(severityValue - 5.5) < 0.01);
+            }
+            else if (id == "info1")
+            {
+                ASSERT(std::abs(severityValue - 2.0) < 0.01);
+            }
+        }
+    }
+
+    void versionWithSpace()
+    {
+        // Test that version strings with spaces are properly truncated
+        SarifReport report;
+        report.addFinding(createErrorMessage("testError", Severity::error, "Test error"));
+
+        // This test would need a way to inject a version with a space
+        // The current implementation gets version from CppCheck::version()
+        // This test verifies the space-trimming logic works
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+
+        const std::string& version = driver.at("semanticVersion").get<std::string>();
+        // Version should not contain any spaces
+        ASSERT(version.find(' ') == std::string::npos);
+    }
+
+    void customProductNameAndVersion()
+    {
+        // Test custom product name that includes version info
+        SarifReport report;
+        report.addFinding(createErrorMessage("testError", Severity::error, "Test error"));
+
+        // Test with product name that might parse differently
+        std::string sarif = report.serialize("MyChecker-1.0.0");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+
+        // Should have a name (either parsed or default)
+        ASSERT(driver.find("name") != driver.end());
+        ASSERT(driver.find("semanticVersion") != driver.end());
+    }
+
+    void normalizeLineColumnToOne()
+    {
+        SarifReport report;
+
+        // Test with 0 values
+        ErrorMessage::FileLocation loc0("test.cpp", 0, 0);
+        ErrorMessage errorMessage0({loc0}, "test.cpp", Severity::error, "Error at 0", "error0", Certainty::normal);
+        report.addFinding(errorMessage0);
+
+        // Test with positive values
+        ErrorMessage::FileLocation locPos("test.cpp", 10, 5);
+        ErrorMessage errorMessagePos(
+            {locPos}, "test.cpp", Severity::error, "Error at positive", "errorPos", Certainty::normal);
+        report.addFinding(errorMessagePos);
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+
+        ASSERT_EQUALS(2U, results.size());
+
+        // Check first result with 0,0
+        const picojson::object& res0      = results[0].get<picojson::object>();
+        const picojson::array& locations0 = res0.at("locations").get<picojson::array>();
+        const picojson::object& loc0_obj  = locations0[0].get<picojson::object>();
+        const picojson::object& physLoc0  = loc0_obj.at("physicalLocation").get<picojson::object>();
+        const picojson::object& region0   = physLoc0.at("region").get<picojson::object>();
+
+        int line0   = static_cast<int>(region0.at("startLine").get<double>());
+        int column0 = static_cast<int>(region0.at("startColumn").get<double>());
+
+        // 0 values should be normalized to 1
+        ASSERT(line0 == 1);
+        ASSERT(column0 == 1);
+
+        // Check second result with positive values
+        const picojson::object& res1      = results[1].get<picojson::object>();
+        const picojson::array& locations1 = res1.at("locations").get<picojson::array>();
+        const picojson::object& loc1_obj  = locations1[0].get<picojson::object>();
+        const picojson::object& physLoc1  = loc1_obj.at("physicalLocation").get<picojson::object>();
+        const picojson::object& region1   = physLoc1.at("region").get<picojson::object>();
+
+        ASSERT_EQUALS(10, static_cast<int>(region1.at("startLine").get<double>()));
+        ASSERT_EQUALS(5, static_cast<int>(region1.at("startColumn").get<double>()));
+    }
+
+    void internalAndDebugSeverity()
+    {
+        // Test internal and debug severity levels
+        // Based on the implementation in sarifSeverity():
+        // - internal -> error
+        // - debug -> note
+        // - none -> note
+        SarifReport report;
+
+        // Create errors with internal and debug severities
+        ErrorMessage::FileLocation loc1("test.cpp", 10, 5);
+        ErrorMessage::FileLocation loc2("test.cpp", 20, 10);
+        ErrorMessage::FileLocation loc3("test.cpp", 30, 15);
+
+        ErrorMessage internal(
+            {loc1}, "test.cpp", Severity::internal, "Internal message", "internalError", Certainty::normal);
+        ErrorMessage debug({loc2}, "test.cpp", Severity::debug, "Debug message", "debugError", Certainty::normal);
+        ErrorMessage none({loc3}, "test.cpp", Severity::none, "None message", "noneError", Certainty::normal);
+
+        report.addFinding(internal);
+        report.addFinding(debug);
+        report.addFinding(none);
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+
+        ASSERT_EQUALS(3U, results.size());
+
+        // Check the actual mapping
+        const picojson::object& res0 = results[0].get<picojson::object>();
+        const picojson::object& res1 = results[1].get<picojson::object>();
+        const picojson::object& res2 = results[2].get<picojson::object>();
+
+        const std::string level0 = res0.at("level").get<std::string>();
+        const std::string level1 = res1.at("level").get<std::string>();
+        const std::string level2 = res2.at("level").get<std::string>();
+
+        // Actual implementation behavior:
+        ASSERT_EQUALS("error", level0);  // internal -> error
+        ASSERT_EQUALS("note", level1);   // debug -> note
+        ASSERT_EQUALS("note", level2);   // none -> note
+    }
+
+    void problemSeverityMapping()
+    {
+        // Test that problem.severity property matches the SARIF severity
+        SarifReport report;
+
+        report.addFinding(createErrorMessage("error1", Severity::error, "Error"));
+        report.addFinding(createErrorMessage("warning1", Severity::warning, "Warning"));
+        report.addFinding(createErrorMessage("style1", Severity::style, "Style"));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root   = json.get<picojson::object>();
+        const picojson::array& runs    = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run    = runs[0].get<picojson::object>();
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+
+        for (const auto& rule : rules)
+        {
+            const picojson::object& r             = rule.get<picojson::object>();
+            const picojson::object& props         = r.at("properties").get<picojson::object>();
+            const picojson::object& defaultConfig = r.at("defaultConfiguration").get<picojson::object>();
+
+            // problem.severity should match defaultConfiguration.level
+            const std::string& problemSeverity = props.at("problem.severity").get<std::string>();
+            const std::string& defaultLevel    = defaultConfig.at("level").get<std::string>();
+
+            ASSERT_EQUALS(defaultLevel, problemSeverity);
+        }
+    }
+
+    void mixedLocationAndNoLocation()
+    {
+        // Test a mix of findings with and without locations
+        SarifReport report;
+
+        // Add findings with locations
+        report.addFinding(createErrorMessage("withLoc1", Severity::error, "Error with location", "test.cpp", 10, 5));
+        report.addFinding(
+            createErrorMessage("withLoc2", Severity::warning, "Warning with location", "test.cpp", 20, 5));
+
+        // Add findings without locations
+        ErrorMessage noLoc1({}, "test.cpp", Severity::error, "Error without location", "noLoc1", Certainty::normal);
+        ErrorMessage noLoc2({}, "test.cpp", Severity::warning, "Warning without location", "noLoc2", Certainty::normal);
+
+        report.addFinding(noLoc1);
+        report.addFinding(noLoc2);
+
+        // Add more with locations
+        report.addFinding(createErrorMessage("withLoc3", Severity::style, "Style with location", "test.cpp", 30, 5));
+
+        std::string sarif = report.serialize("Cppcheck");
+        picojson::value json;
+        ASSERT(parseAndValidateJson(sarif, json));
+
+        const picojson::object& root = json.get<picojson::object>();
+        const picojson::array& runs  = root.at("runs").get<picojson::array>();
+        const picojson::object& cur_run  = runs[0].get<picojson::object>();
+
+        // Should only have results for findings with locations
+        const picojson::array& results = cur_run.at("results").get<picojson::array>();
+        ASSERT_EQUALS(3U, results.size());
+
+        // Should only have rules for findings with locations
+        const picojson::object& tool   = cur_run.at("tool").get<picojson::object>();
+        const picojson::object& driver = tool.at("driver").get<picojson::object>();
+        const picojson::array& rules   = driver.at("rules").get<picojson::array>();
+        ASSERT_EQUALS(3U, rules.size());
+
+        // Verify the rule IDs are only for findings with locations
+        std::set<std::string> ruleIds;
+        for (const auto& rule : rules)
+        {
+            const picojson::object& r = rule.get<picojson::object>();
+            ruleIds.insert(r.at("id").get<std::string>());
+        }
+
+        ASSERT(ruleIds.find("withLoc1") != ruleIds.end());
+        ASSERT(ruleIds.find("withLoc2") != ruleIds.end());
+        ASSERT(ruleIds.find("withLoc3") != ruleIds.end());
+        ASSERT(ruleIds.find("noLoc1") == ruleIds.end());
+        ASSERT(ruleIds.find("noLoc2") == ruleIds.end());
+    }
+};
+
+REGISTER_TEST(TestSarifReport)
diff --git a/test/testsettings.cpp b/test/testsettings.cpp
index d8a501dc866..ddd11de3273 100644
--- a/test/testsettings.cpp
+++ b/test/testsettings.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -33,8 +33,15 @@ class TestSettings : public TestFixture {
         TEST_CASE(loadCppcheckCfg);
         TEST_CASE(loadCppcheckCfgSafety);
         TEST_CASE(getNameAndVersion);
-        TEST_CASE(ruleTexts);
         TEST_CASE(checkLevelDefault);
+
+        TEST_CASE(getMaxConfigsDefault);
+        TEST_CASE(getMaxConfigsOpt);
+        TEST_CASE(getMaxConfigsForce);
+        TEST_CASE(getMaxConfigsOptAndForce);
+        TEST_CASE(getMaxConfigsDefines);
+        TEST_CASE(getMaxConfigsDefinesAndOpt);
+        TEST_CASE(getMaxConfigsOptAndProject);
     }
 
     void simpleEnableGroup() const {
@@ -229,6 +236,21 @@ class TestSettings : public TestFixture {
                             R"({"suppressions": [1]}\n)");
             ASSERT_EQUALS("'suppressions' array entry is not a string", Settings::loadCppcheckCfg(s, supprs));
         }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"manualUrl": "https://docs.notcppcheck.com/manual.pdf"})");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS("https://docs.notcppcheck.com/manual.pdf", s.manualUrl);
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"manualUrl": 0}\n)");
+            ASSERT_EQUALS("'manualUrl' is not a string", Settings::loadCppcheckCfg(s, supprs));
+        }
 
         // TODO: test with FILESDIR
     }
@@ -251,7 +273,7 @@ class TestSettings : public TestFixture {
             Suppressions supprs;
             ScopedFile file("cppcheck.cfg", "{\"safety\": false}");
             ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
-            ASSERT_EQUALS(true, s.safety);
+            ASSERT_EQUALS(false, s.safety);
         }
 
         {
@@ -279,15 +301,6 @@ class TestSettings : public TestFixture {
         }
     }
 
-    void ruleTexts() const
-    {
-        Settings s;
-        s.setMisraRuleTexts("1.1 text 1\n1.2 text 2\n1.3 text 3\r\n");
-        ASSERT_EQUALS("text 1", s.getMisraRuleText("misra-c2012-1.1", "---"));
-        ASSERT_EQUALS("text 2", s.getMisraRuleText("misra-c2012-1.2", "---"));
-        ASSERT_EQUALS("text 3", s.getMisraRuleText("misra-c2012-1.3", "---"));
-    }
-
     void checkLevelDefault() const
     {
         Settings s;
@@ -297,6 +310,52 @@ class TestSettings : public TestFixture {
         ASSERT_EQUALS(true, s.vfOptions.doConditionExpressionAnalysis);
         ASSERT_EQUALS(-1, s.vfOptions.maxForwardBranches);
     }
+
+    void getMaxConfigsDefault() const {
+        Settings s;
+        ASSERT_EQUALS(12, s.getMaxConfigs());
+    }
+
+    void getMaxConfigsOpt() const {
+        Settings s;
+        s.maxConfigsOption = 1;
+        ASSERT_EQUALS(1, s.getMaxConfigs());
+    }
+
+    void getMaxConfigsForce() const {
+        Settings s;
+        s.force = true;
+        ASSERT(s.getMaxConfigs() > 1000);
+    }
+
+    void getMaxConfigsOptAndForce() const {
+        Settings s;
+        s.maxConfigsOption = 1;
+        s.force = true;
+        ASSERT(s.getMaxConfigs() > 1000);
+    }
+
+    void getMaxConfigsDefines() const {
+        Settings s;
+        s.userDefines = "X=1";
+        ASSERT_EQUALS(1, s.getMaxConfigs());
+    }
+
+    void getMaxConfigsDefinesAndOpt() const {
+        Settings s;
+        s.userDefines = "X=1";
+        s.maxConfigsOption = 3;
+        ASSERT_EQUALS(3, s.getMaxConfigs());
+    }
+
+    void getMaxConfigsOptAndProject() const {
+        Settings s;
+        s.maxConfigsOption = 3;
+        s.maxConfigsProject = 1;
+        ASSERT_EQUALS(3, s.getMaxConfigs());
+        s.maxConfigsProject = 10;
+        ASSERT_EQUALS(3, s.getMaxConfigs());
+    }
 };
 
 REGISTER_TEST(TestSettings)
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index 083104c2e13..475d03c696d 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -19,8 +19,8 @@
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
-#include "path.h"
 #include "settings.h"
+#include "standards.h"
 #include "templatesimplifier.h"
 #include "token.h"
 #include "tokenize.h"
@@ -32,13 +32,16 @@
 #include <utility>
 #include <vector>
 
+class ErrorLogger;
+
 class TestSimplifyTemplate : public TestFixture {
 public:
     TestSimplifyTemplate() : TestFixture("TestSimplifyTemplate") {}
 
 private:
-    // If there are unused templates, keep those
     const Settings settings = settingsBuilder().severity(Severity::portability).build();
+    const Settings settings1 = settingsBuilder(settings).library("std.cfg").build();
+    const Settings settings1_d = settingsBuilder(settings1).debugwarnings().build();
 
     void run() override {
         TEST_CASE(template1);
@@ -220,6 +223,9 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(template179);
         TEST_CASE(template180);
         TEST_CASE(template181);
+        TEST_CASE(template182); // #13770
+        TEST_CASE(template183);
+        TEST_CASE(template184);
         TEST_CASE(template_specialization_1);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_2);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_3);
@@ -308,31 +314,65 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(requires3);
         TEST_CASE(requires4);
         TEST_CASE(requires5);
+        TEST_CASE(requires6);
 
         TEST_CASE(explicitBool1);
         TEST_CASE(explicitBool2);
+
+        TEST_CASE(templateArgPreserveType); // #13882 - type of template argument
+
+        TEST_CASE(template_shift_negative); // shift folding with a negative operand
+
+        TEST_CASE(dumpTemplateArgFrom);
     }
 
+    class TemplateSimplifierTest final : public TemplateSimplifier
+    {
+        friend class TestSimplifyTemplate;
+    };
+
+    class TokenizerTest final : public Tokenizer
+    {
+        friend class TestSimplifyTemplate;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool debugwarnings = false;
     };
 
 #define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string tok_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(settings).library("std.cfg").debugwarnings(options.debugwarnings).build();
-        SimpleTokenizer tokenizer(settings1, *this);
+        const Settings& s = options.debugwarnings ? settings1_d : settings1;
+        SimpleTokenizer tokenizer(s, *this);
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr, true);
     }
 
+#define dump(...) dump_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string dump_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
+        const Settings& s = options.debugwarnings ? settings1_d : settings1;
+        SimpleTokenizer tokenizer(s, *this);
+
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        std::ostringstream ostr;
+        (tokenizer.dump)(ostr);
+
+        return ostr.str();
+    }
+
     void template1() {
         const char code[] = "template <class T> T f(T val) { T a; }\n"
-                            "f<int>(10);";
+                            "f<int>(10);\n";
 
         const char expected[] = "int f<int> ( int val ) ; "
                                 "f<int> ( 10 ) ; "
@@ -343,7 +383,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template2() {
         const char code[] = "template <class T> class Fred { T a; };\n"
-                            "Fred<int> fred;";
+                            "Fred<int> fred;\n";
 
         const char expected[] = "class Fred<int> ; "
                                 "Fred<int> fred ; "
@@ -354,7 +394,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template3() {
         const char code[] = "template <class T, int sz> class Fred { T data[sz]; };\n"
-                            "Fred<float,4> fred;";
+                            "Fred<float,4> fred;\n";
 
         const char expected[] = "class Fred<float,4> ; "
                                 "Fred<float,4> fred ; "
@@ -365,7 +405,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template4() {
         const char code[] = "template <class T> class Fred { Fred(); };\n"
-                            "Fred<float> fred;";
+                            "Fred<float> fred;\n";
 
         const char expected[] = "class Fred<float> ; "
                                 "Fred<float> fred ; "
@@ -377,7 +417,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template5() {
         const char code[] = "template <class T> class Fred { };\n"
                             "template <class T> Fred<T>::Fred() { }\n"
-                            "Fred<float> fred;";
+                            "Fred<float> fred;\n";
 
         const char expected[] = "class Fred<float> ; "
                                 "Fred<float> fred ; "
@@ -390,7 +430,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template6() {
         const char code[] = "template <class T> class Fred { };\n"
                             "Fred<float> fred1;\n"
-                            "Fred<float> fred2;";
+                            "Fred<float> fred2;\n";
 
         const char expected[] = "class Fred<float> ; "
                                 "Fred<float> fred1 ; "
@@ -491,7 +531,7 @@ class TestSimplifyTemplate : public TestFixture {
                       "template < typename T > class A { void f ( ) { B < T > a ; a = B < T > :: g ( ) ; T b ; b = 0 ; if ( b ) { b = 0 ; } } } ; "
                       "template < typename T > B < T > h ( ) { return B < T > ( ) ; }", tok(code));
 
-        ASSERT_EQUALS("class A { template < typename T > int foo ( T d ) ; } ;", tok("class A{ template<typename T> int foo(T d);};"));
+        ASSERT_EQUALS("class A { template < typename T > int foo ( T d ) ; } ;", tok("class A{ template<typename T> int foo(T d);};\n"));
     }
 
     void template9() {
@@ -596,7 +636,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    y(AA<CC>::create(new CC(AA<BB>(), 0)))\n"
                             "    {}\n"
                             "\n"
-                            "int yy[AA<CC>::size()];";
+                            "int yy[AA<CC>::size()];\n";
         const char expected[] = "class BB { } ; "
                                 "class AA<BB> ; "
                                 "class AA<CC> ; "
@@ -672,12 +712,12 @@ class TestSimplifyTemplate : public TestFixture {
                              "  vec(const vec<n-1>& v) {}\n" // <- never used don't instantiate
                              "};\n"
                              "\n"
-                             "vec<4> v;";
+                             "vec<4> v;\n";
         const char expected2[] = "struct vec<4> ; "
                                  "vec<4> v ; "
                                  "struct vec<4> { "
                                  "vec<4> ( ) { } "
-                                 "vec<4> ( const vec < 4 - 1 > & v ) { } "
+                                 "vec<4> ( const vec < ( int ) 4 - 1 > & v ) { } "
                                  "} ;";
 
         ASSERT_EQUALS(expected2, tok(code2));
@@ -730,7 +770,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template18() {
         const char code[] = "template <class T> class foo { T a; };\n"
-                            "foo<int> *f;";
+                            "foo<int> *f;\n";
 
         const char expected[] = "class foo<int> ; "
                                 "foo<int> * f ; "
@@ -775,7 +815,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template21() {
         {
             const char code[] = "template <class T> struct Fred { T a; };\n"
-                                "Fred<int> fred;";
+                                "Fred<int> fred;\n";
 
             const char expected[] = "struct Fred<int> ; "
                                     "Fred<int> fred ; "
@@ -786,7 +826,7 @@ class TestSimplifyTemplate : public TestFixture {
 
         {
             const char code[] = "template <class T, int sz> struct Fred { T data[sz]; };\n"
-                                "Fred<float,4> fred;";
+                                "Fred<float,4> fred;\n";
 
             const char expected[] = "struct Fred<float,4> ; "
                                     "Fred<float,4> fred ; "
@@ -797,7 +837,7 @@ class TestSimplifyTemplate : public TestFixture {
 
         {
             const char code[] = "template <class T> struct Fred { Fred(); };\n"
-                                "Fred<float> fred;";
+                                "Fred<float> fred;\n";
 
             const char expected[] = "struct Fred<float> ; "
                                     "Fred<float> fred ; "
@@ -809,7 +849,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "template <class T> struct Fred { };\n"
                                 "Fred<float> fred1;\n"
-                                "Fred<float> fred2;";
+                                "Fred<float> fred2;\n";
 
             const char expected[] = "struct Fred<float> ; "
                                     "Fred<float> fred1 ; "
@@ -822,7 +862,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template22() {
         const char code[] = "template <class T> struct Fred { T a; };\n"
-                            "Fred<std::string> fred;";
+                            "Fred<std::string> fred;\n";
 
         const char expected[] = "struct Fred<std::string> ; "
                                 "Fred<std::string> fred ; "
@@ -835,7 +875,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <class T> void foo() { }\n"
                             "void bar() {\n"
                             "    std::cout << (foo<double>());\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "void foo<double> ( ) ; "
                                 "void bar ( ) {"
@@ -856,7 +896,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<int x> class bitset: B<sizeof(int)>\n"
                             "{};\n"
                             "\n"
-                            "bitset<1> z;";
+                            "bitset<1> z;\n";
         const char expected[] = "struct B<4> ; "
                                 "class bitset<1> ; "
                                 "bitset<1> z ; "
@@ -874,7 +914,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<int x> class bitset: B<((sizeof(int)) ? : 1)>\n"
                             "{};\n"
                             "\n"
-                            "bitset<1> z;";
+                            "bitset<1> z;\n";
         const char expected[] = "struct B<4> ; "
                                 "class bitset<1> ; "
                                 "bitset<1> z ; "
@@ -897,7 +937,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template27() {
         // #3350 - template inside macro call
-        const char code[] = "X(template<class T> class Fred);";
+        const char code[] = "X(template<class T> class Fred);\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
@@ -914,19 +954,19 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template30() {
         // #3529 - template < template < ..
-        const char code[] = "template<template<class> class A, class B> void f(){}";
+        const char code[] = "template<template<class> class A, class B> void f(){}\n";
         ASSERT_EQUALS("template < template < class > class A , class B > void f ( ) { }", tok(code));
     }
 
     void template31() {
         // #4010 - template reference type
-        const char code[] = "template<class T> struct A{}; A<int&> a;";
+        const char code[] = "template<class T> struct A{}; A<int&> a;\n";
         ASSERT_EQUALS("struct A<int&> ; "
                       "A<int&> a ; "
                       "struct A<int&> { } ;", tok(code));
 
         // #7409 - rvalue
-        const char code2[] = "template<class T> struct A{}; A<int&&> a;";
+        const char code2[] = "template<class T> struct A{}; A<int&&> a;\n";
         ASSERT_EQUALS("struct A<int&&> ; "
                       "A<int&&> a ; "
                       "struct A<int&&> { } ;", tok(code2));
@@ -956,7 +996,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template<class T> struct A { };\n"
                                 "template<class T> struct B { };\n"
                                 "template<class T> struct C { A<B<X<T> > > ab; };\n"
-                                "C<int> c;";
+                                "C<int> c;\n";
             ASSERT_EQUALS("struct A<B<X<int>>> ; "
                           "struct B<X<int>> ; "
                           "struct C<int> ; "
@@ -971,7 +1011,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "struct A { };\n"
                                 "template<class T> struct B { };\n"
                                 "template<class T> struct C { };\n"
-                                "C< B<A> > c;";
+                                "C< B<A> > c;\n";
             ASSERT_EQUALS("struct A { } ; "
                           "template < class T > struct B { } ; "  // <- redundant.. but nevermind
                           "struct C<B<A>> ; "
@@ -986,13 +1026,13 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "namespace abc {\n"
                             "template <typename T> struct X { void f(X<T> &x) {} };\n"
                             "}\n"
-                            "template <> int X<int>::Y(0);";
+                            "template <> int X<int>::Y(0);\n";
         (void)tok(code);
     }
 
     void template35() { // #4074 - "A<'x'> a;" is not recognized as template instantiation
         const char code[] = "template <char c> class A {};\n"
-                            "A <'x'> a;";
+                            "A <'x'> a;\n";
         ASSERT_EQUALS("class A<'x'> ; "
                       "A<'x'> a ; "
                       "class A<'x'> { } ;", tok(code));
@@ -1001,7 +1041,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template36() { // #4310 - Passing unknown template instantiation as template argument
         const char code[] = "template <class T> struct X { T t; };\n"
                             "template <class C> struct Y { Foo < X< Bar<C> > > _foo; };\n" // <- Bar is unknown
-                            "Y<int> bar;";
+                            "Y<int> bar;\n";
         ASSERT_EQUALS("struct X<Bar<int>> ; "
                       "struct Y<int> ; "
                       "Y<int> bar ; "
@@ -1015,7 +1055,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "class A { };\n"
                                 "template<class T> class B {};\n"
                                 "B<class A> b1;\n"
-                                "B<A> b2;";
+                                "B<A> b2;\n";
             ASSERT_EQUALS("class A { } ; class B<A> ; B<A> b1 ; B<A> b2 ; class B<A> { } ;",
                           tok(code));
         }
@@ -1023,7 +1063,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "struct A { };\n"
                                 "template<class T> class B {};\n"
                                 "B<struct A> b1;\n"
-                                "B<A> b2;";
+                                "B<A> b2;\n";
             ASSERT_EQUALS("struct A { } ; class B<A> ; B<A> b1 ; B<A> b2 ; class B<A> { } ;",
                           tok(code));
         }
@@ -1031,7 +1071,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "enum A { };\n"
                                 "template<class T> class B {};\n"
                                 "B<enum A> b1;\n"
-                                "B<A> b2;";
+                                "B<A> b2;\n";
             ASSERT_EQUALS("enum A { } ; class B<A> ; B<A> b1 ; B<A> b2 ; class B<A> { } ;",
                           tok(code));
         }
@@ -1039,7 +1079,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_unhandled() {
         // An unhandled template usage should not be simplified..
-        ASSERT_EQUALS("x < int > ( ) ;", tok("x<int>();"));
+        ASSERT_EQUALS("x < int > ( ) ;", tok("x<int>();\n"));
     }
 
     void template38() { // #4832 - Crash on C++11 right angle brackets
@@ -1073,21 +1113,21 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template39() { // #4742 - Used to freeze in 1.60
-        const char code[] = "template<typename T> struct vector {"
-                            "  operator T() const;"
-                            "};"
-                            "void f() {"
-                            "  vector<vector<int>> v;"
-                            "  const vector<int> vi = static_cast<vector<int>>(v);"
-                            "}";
+        const char code[] = "template<typename T> struct vector {\n"
+                            "  operator T() const;\n"
+                            "};\n"
+                            "void f() {\n"
+                            "  vector<vector<int>> v;\n"
+                            "  const vector<int> vi = static_cast<vector<int>>(v);\n"
+                            "}\n";
         (void)tok(code);
     }
 
     void template40() { // #5055 - false negatives when there is template specialization outside struct
-        const char code[] = "struct A {"
-                            "  template<typename T> struct X { T t; };"
-                            "};"
-                            "template<> struct A::X<int> { int *t; };";
+        const char code[] = "struct A {\n"
+                            "  template<typename T> struct X { T t; };\n"
+                            "};\n"
+                            "template<> struct A::X<int> { int *t; };\n";
         const char expected[] = "struct A { "
                                 "struct X<int> ; "
                                 "template < typename T > struct X { T t ; } ; "
@@ -1098,13 +1138,13 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template41() { // #4710 - const in template instantiation not handled perfectly
         const char code1[] = "template<class T> struct X { };\n"
-                             "void f(const X<int> x) { }";
+                             "void f(const X<int> x) { }\n";
         ASSERT_EQUALS("struct X<int> ; "
                       "void f ( const X<int> x ) { } "
                       "struct X<int> { } ;", tok(code1));
 
         const char code2[] = "template<class T> T f(T t) { return t; }\n"
-                             "int x() { return f<int>(123); }";
+                             "int x() { return f<int>(123); }\n";
         ASSERT_EQUALS("int f<int> ( int t ) ; "
                       "int x ( ) { return f<int> ( 123 ) ; } "
                       "int f<int> ( int t ) { return t ; }", tok(code2));
@@ -1118,7 +1158,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "  }() + ^ {\n"
                             "    return sizeof...(args);\n"
                             "  }();\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
@@ -1136,7 +1176,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main(void) {\n"
                             "    C<A> ca;\n"
                             "    return 0;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "struct E<void*> ; "
                                 "struct C<B<A>> ; "
                                 "struct C<A> ; "
@@ -1175,14 +1215,14 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template44() { // #5297
-        const char code[] = "template<class T> struct StackContainer {"
-                            "  void foo(int i) {"
-                            "    if (0 >= 1 && i<0) {}"
-                            "  }"
-                            "};"
-                            "template<class T> class ZContainer : public StackContainer<T> {};"
-                            "struct FGSTensor {};"
-                            "class FoldedZContainer : public ZContainer<FGSTensor> {};";
+        const char code[] = "template<class T> struct StackContainer {\n"
+                            "  void foo(int i) {\n"
+                            "    if (0 >= 1 && i<0) {}\n"
+                            "  }\n"
+                            "};\n"
+                            "template<class T> class ZContainer : public StackContainer<T> {};\n"
+                            "struct FGSTensor {};\n"
+                            "class FoldedZContainer : public ZContainer<FGSTensor> {};\n";
         const char expected[] = "struct StackContainer<FGSTensor> ; "
                                 "class ZContainer<FGSTensor> ; "
                                 "struct FGSTensor { } ; "
@@ -1197,14 +1237,14 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template45() { // #5814
-        const char code[] = "namespace Constants { const int fourtytwo = 42; } "
-                            "template <class T, int U> struct TypeMath { "
-                            "  static const int mult = sizeof(T) * U; "
-                            "}; "
-                            "template <class T> struct FOO { "
-                            "  enum { value = TypeMath<T, Constants::fourtytwo>::mult }; "
-                            "}; "
-                            "FOO<int> foo;";
+        const char code[] = "namespace Constants { const int fourtytwo = 42; }\n"
+                            "template <class T, int U> struct TypeMath {\n"
+                            "  static const int mult = sizeof(T) * U;\n"
+                            "};\n"
+                            "template <class T> struct FOO {\n"
+                            "  enum { value = TypeMath<T, Constants::fourtytwo>::mult };\n"
+                            "};\n"
+                            "FOO<int> foo;\n";
         const char expected[] = "namespace Constants { const int fourtytwo = 42 ; } "
                                 "struct TypeMath<int,Constants::fourtytwo> ; "
                                 "struct FOO<int> ; "
@@ -1220,32 +1260,32 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template46() { // #5816
-        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; }; "
-                            "template <class T> struct B { "
-                            "  enum { value = A<typename T::type, int>::value }; "
-                            "};"));
+        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; };\n"
+                            "template <class T> struct B {\n"
+                            "  enum { value = A<typename T::type, int>::value };\n"
+                            "};\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_NO_THROW(tok("template <class T, class U> struct A {}; "
-                            "enum { e = sizeof(A<int, int>) }; "
-                            "template <class T, class U> struct B {};"));
+        ASSERT_NO_THROW(tok("template <class T, class U> struct A {};\n"
+                            "enum { e = sizeof(A<int, int>) };\n"
+                            "template <class T, class U> struct B {};\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; }; "
-                            "template<class T> struct B { typedef int type; }; "
-                            "template <class T> struct C { "
-                            "  enum { value = A<typename B<T>::type, int>::value }; "
-                            "};"));
+        ASSERT_NO_THROW(tok("template<class T, class U> struct A { static const int value = 0; };\n"
+                            "template<class T> struct B { typedef int type; };\n"
+                            "template <class T> struct C {\n"
+                            "  enum { value = A<typename B<T>::type, int>::value };\n"
+                            "};\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void template47() { // #6023
-        ASSERT_NO_THROW(tok("template <typename T1, typename T2 = T3<T1> > class C1 {}; "
-                            "class C2 : public C1<C2> {};"));
+        ASSERT_NO_THROW(tok("template <typename T1, typename T2 = T3<T1> > class C1 {};\n"
+                            "class C2 : public C1<C2> {};\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void template48() { // #6134 (hang)
-        (void)tok("template <int> int f( {  } ); "
-                  "int foo = f<1>(0);");
+        (void)tok("template <int> int f( {  } );\n"
+                  "int foo = f<1>(0);\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1287,22 +1327,22 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template52() { // #6437
-        const char code[] = "template <int value> int sum() { "
-                            "  return value + sum<value/2>(); "
-                            "} "
-                            "template<int x, int y> int calculate_value() { "
-                            "  if (x != y) { "
-                            "    return sum<x - y>(); "
-                            "  } else { "
-                            "    return 0; "
-                            "  } "
-                            "} "
-                            "int value = calculate_value<1,1>();";
+        const char code[] = "template <int value> int sum() {\n"
+                            "  return value + sum<value/2>();\n"
+                            "}\n"
+                            "template<int x, int y> int calculate_value() {\n"
+                            "  if (x != y) {\n"
+                            "    return sum<x - y>();\n"
+                            "  } else {\n"
+                            "    return 0;\n"
+                            "  }\n"
+                            "}\n"
+                            "int value = calculate_value<1,1>();\n";
         const char expected[] = "int sum<0> ( ) ; "
                                 "int calculate_value<1,1> ( ) ; "
                                 "int value ; value = calculate_value<1,1> ( ) ; "
                                 "int calculate_value<1,1> ( ) { "
-                                "if ( 1 != 1 ) { "
+                                "if ( ( int ) 1 != ( int ) 1 ) { "
                                 "return sum<0> ( ) ; "
                                 "} else { "
                                 "return 0 ; "
@@ -1315,13 +1355,13 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template53() { // #4335
-        const char code[] = "template<int N> struct Factorial { "
-                            "  enum { value = N * Factorial<N - 1>::value }; "
-                            "};"
-                            "template <> struct Factorial<0> { "
-                            "  enum { value = 1 }; "
-                            "};"
-                            "const int x = Factorial<4>::value;";
+        const char code[] = "template<int N> struct Factorial {\n"
+                            "  enum { value = N * Factorial<N - 1>::value };\n"
+                            "};\n"
+                            "template <> struct Factorial<0> {\n"
+                            "  enum { value = 1 };\n"
+                            "};\n"
+                            "const int x = Factorial<4>::value;\n";
         const char expected[] = "struct Factorial<0> ; "
                                 "struct Factorial<4> ; "
                                 "struct Factorial<3> ; "
@@ -1332,28 +1372,28 @@ class TestSimplifyTemplate : public TestFixture {
                                 "} ; "
                                 "const int x = Factorial<4> :: value ; "
                                 "struct Factorial<4> { "
-                                "enum Anonymous0 { value = 4 * Factorial<3> :: value } ; "
+                                "enum Anonymous0 { value = ( int ) 4 * Factorial<3> :: value } ; "
                                 "} ; "
                                 "struct Factorial<3> { "
-                                "enum Anonymous0 { value = 3 * Factorial<2> :: value } ; "
+                                "enum Anonymous0 { value = ( int ) 3 * Factorial<2> :: value } ; "
                                 "} ; "
                                 "struct Factorial<2> { "
-                                "enum Anonymous0 { value = 2 * Factorial<1> :: value } ; "
+                                "enum Anonymous0 { value = ( int ) 2 * Factorial<1> :: value } ; "
                                 "} ; "
                                 "struct Factorial<1> { "
-                                "enum Anonymous0 { value = 1 * Factorial<0> :: value } ; "
+                                "enum Anonymous0 { value = ( int ) 1 * Factorial<0> :: value } ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code, dinit(CheckOptions, $.debugwarnings = true)));
         ASSERT_EQUALS("", errout_str());
     }
 
     void template54() { // #6587 (use-after-free)
-        (void)tok("template<typename _Tp> _Tp* fn(); "
-                  "template <class T> struct A { "
-                  "  template <class U, class S = decltype(fn<T>())> "
-                  "  struct B { }; "
-                  "}; "
-                  "A<int> a;");
+        (void)tok("template<typename _Tp> _Tp* fn();\n"
+                  "template <class T> struct A {\n"
+                  "  template <class U, class S = decltype(fn<T>())>\n"
+                  "  struct B { };\n"
+                  "};\n"
+                  "A<int> a;\n");
     }
 
     void template55() { // #6604
@@ -1367,7 +1407,7 @@ class TestSimplifyTemplate : public TestFixture {
                 "{\n"
                 "    friend struct ConstCastHelper<AtSmartPtr<const T>, T>;\n"
                 "    AtSmartPtr(const AtSmartPtr<T>& r);\n"
-                "};"));
+                "};\n"));
 
         // Similar problem can also happen with ...
         ASSERT_EQUALS(
@@ -1387,16 +1427,16 @@ class TestSimplifyTemplate : public TestFixture {
                 "        (A<T...>*)(p);\n"
                 "    }\n"
                 "};\n"
-                "A<int> a(0);"));
+                "A<int> a(0);\n"));
     }
 
     void template56() { // #7117
-        const char code[] = "template<bool B> struct Foo { "
-                            "  std::array<int, B ? 1 : 2> mfoo; "
-                            "}; "
-                            "void foo() { "
-                            "  Foo<true> myFoo; "
-                            "}";
+        const char code[] = "template<bool B> struct Foo {\n"
+                            "  std::array<int, B ? 1 : 2> mfoo;\n"
+                            "};\n"
+                            "void foo() {\n"
+                            "  Foo<true> myFoo;\n"
+                            "}\n";
         const char expected[] = "struct Foo<true> ; "
                                 "void foo ( ) { "
                                 "Foo<true> myFoo ; "
@@ -1409,7 +1449,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template57() { // #7891
         const char code[] = "template<class T> struct Test { Test(T); };\n"
-                            "Test<unsigned long> test( 0 );";
+                            "Test<unsigned long> test( 0 );\n";
         const char exp[] = "struct Test<unsignedlong> ; "
                            "Test<unsignedlong> test ( 0 ) ; "
                            "struct Test<unsignedlong> { Test<unsignedlong> ( unsigned long ) ; } ;";
@@ -1423,7 +1463,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void foo() {\n"
                             "  TestArithmetic<int>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void TestArithmetic<int> ( ) ; "
                            "void foo ( ) {"
                            " TestArithmetic<int> ( ) ; "
@@ -1449,7 +1489,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "int main () {\n"
                             "    return diagonalGroupTest<4>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct Factorial<0> ; "
                            "struct Factorial<4> ; "
                            "struct Factorial<3> ; "
@@ -1459,10 +1499,10 @@ class TestSimplifyTemplate : public TestFixture {
                            "int diagonalGroupTest<4> ( ) ; "
                            "int main ( ) { return diagonalGroupTest<4> ( ) ; } "
                            "int diagonalGroupTest<4> ( ) { return Factorial<4> :: value ; } "
-                           "struct Factorial<4> { enum FacHelper { value = 4 * Factorial<3> :: value } ; } ; "
-                           "struct Factorial<3> { enum FacHelper { value = 3 * Factorial<2> :: value } ; } ; "
-                           "struct Factorial<2> { enum FacHelper { value = 2 * Factorial<1> :: value } ; } ; "
-                           "struct Factorial<1> { enum FacHelper { value = 1 * Factorial<0> :: value } ; } ;";
+                           "struct Factorial<4> { enum FacHelper { value = ( int ) 4 * Factorial<3> :: value } ; } ; "
+                           "struct Factorial<3> { enum FacHelper { value = ( int ) 3 * Factorial<2> :: value } ; } ; "
+                           "struct Factorial<2> { enum FacHelper { value = ( int ) 2 * Factorial<1> :: value } ; } ; "
+                           "struct Factorial<1> { enum FacHelper { value = ( int ) 1 * Factorial<0> :: value } ; } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
 
@@ -1471,7 +1511,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T> void f() {}\n"
                             "template <typename T> void h() { f<typename S<T>::type(0)>(); }\n"
                             "\n"
-                            "void j() { h<int>(); }";
+                            "void j() { h<int>(); }\n";
         const char exp[] = "struct S<int> ; "
                            "void f<S<int>::type(0)> ( ) ; "
                            "void h<int> ( ) ; "
@@ -1494,7 +1534,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "  void f1(Bar<T> x) {}\n"
                             "  Foo<Bar<T>> f2() { }\n"
                             "};\n"
-                            "Bar<int> c;";
+                            "Bar<int> c;\n";
         const char exp[] = "struct Foo<Bar<int>> ; "
                            "struct Bar<int> ; "
                            "Bar<int> c ; "
@@ -1511,7 +1551,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class T> void f() { x = y ? C1<int>::allocate(1) : 0; }\n"
                             "template <class T, unsigned S> class C3 {};\n"
                             "template <class T, unsigned S> C3<T, S>::C3(const C3<T, S> &v) { C1<T *> c1; }\n"
-                            "C3<int,6> c3;";
+                            "C3<int,6> c3;\n";
         const char exp[] = "struct C1<int*> ; "
                            "template < class T > void f ( ) { x = y ? ( C1 < int > :: allocate ( 1 ) ) : 0 ; } "
                            "class C3<int,6> ; "
@@ -1523,8 +1563,8 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template63() { // #8576
-        const char code[] = "template<class T> struct TestClass { T m_hi; };"
-                            "TestClass<std::auto_ptr<v>> objTest3;";
+        const char code[] = "template<class T> struct TestClass { T m_hi; };\n"
+                            "TestClass<std::auto_ptr<v>> objTest3;\n";
         const char exp[] = "struct TestClass<std::auto_ptr<v>> ; "
                            "TestClass<std::auto_ptr<v>> objTest3 ; "
                            "struct TestClass<std::auto_ptr<v>> { std :: auto_ptr < v > m_hi ; } ;";
@@ -1545,7 +1585,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    t_func<0>();\n"
                             "    t_func<1>();\n"
                             "}\n"
-                            "};";
+                            "};\n";
         const char exp[] = "bool foo<int> ( ) ; "
                            "struct A { "
                            "void t_func<0> ( ) ; "
@@ -1558,11 +1598,11 @@ class TestSimplifyTemplate : public TestFixture {
                            "} ; "
                            "void A :: t_func<0> ( ) "
                            "{ "
-                           "if ( 0 != 0 || foo<int> ( ) ) { ; } "
+                           "if ( ( int ) 0 != 0 || foo<int> ( ) ) { ; } "
                            "} "
                            "void A :: t_func<1> ( ) "
                            "{ "
-                           "if ( 1 != 0 || foo<int> ( ) ) { ; } "
+                           "if ( ( int ) 1 != 0 || foo<int> ( ) ) { ; } "
                            "} "
                            "bool foo<int> ( ) { return true ; }";
         ASSERT_EQUALS(exp, tok(code));
@@ -1583,7 +1623,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "  AssociationDAGlobalGraphObserver<string,unsigned int> grObs;\n"
                             " return 1;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace bpp "
                            "{ "
                            "class AssociationDAGraphImplObserver<string,unsignedint,DAGlobalGraph> ; "
@@ -1603,7 +1643,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    const int ** foo();\n"
                             "};\n"
                             "template <class T> const int ** Fred<T>::foo() { return nullptr; }\n"
-                            "Fred<int> fred;";
+                            "Fred<int> fred;\n";
         const char exp[] = "struct Fred<int> ; "
                            "Fred<int> fred ; "
                            "struct Fred<int> { "
@@ -1626,7 +1666,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class T> Container<T>::Container(const Container & x) { nElements = x.nElements; c = x.c; }\n"
                             "template <class T> Container<T> & Container<T>::operator = (const Container & x) { mElements = x.mElements; c = x.c; return *this; }\n"
                             "template <class T> Container<T>::~Container() {}\n"
-                            "Container<int> intContainer;";
+                            "Container<int> intContainer;\n";
 
         const char expected[] = "struct Container<int> ; "
                                 "Container<int> intContainer ; "
@@ -1651,7 +1691,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    char dummy[sizeof(T)];\n"
                             "    T value;\n"
                             "};\n"
-                            "Fred<int> fred;";
+                            "Fred<int> fred;\n";
         const char exp[] = "union Fred<int> ; "
                            "Fred<int> fred ; "
                            "union Fred<int> { "
@@ -1666,7 +1706,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    int test;\n"
                             "    template <class T> T lookup() { return test; }\n"
                             "    int Fun() { return lookup<int>(); }\n"
-                            "};";
+                            "};\n";
         const char exp[] = "class Test { "
                            "int test ; "
                            "int lookup<int> ( ) ; "
@@ -1684,7 +1724,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<typename K, typename V, int KeySize>\n"
                             "class Bar : private Bar<void, void> {\n"
                             "   void foo() { }\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < typename T , typename V , int KeySize = 0 > class Bar ; "
                            "class Bar<void,void> ; "
                            "class Bar<void,void> { "
@@ -1716,7 +1756,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    return f1(pInterface, interface_type::static_type());\n"
                             "}\n"
                             "\n"
-                            "Reference< class XPropertyList > dostuff();";
+                            "Reference< class XPropertyList > dostuff();\n";
         const char exp[] = "int f1 ( int * pInterface , int x ) { return 0 ; } "
                            "class Reference<XPropertyList> ; "
                            "Reference<XPropertyList> dostuff ( ) ; "
@@ -1729,7 +1769,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <typename N, typename P> class Tokenizer;\n"
                             "const Tokenizer<Node, Path> *tokenizer() const;\n"
                             "template <typename N, typename P>\n"
-                            "Tokenizer<N, P>::Tokenizer() { }";
+                            "Tokenizer<N, P>::Tokenizer() { }\n";
         const char exp[] = "template < typename N , typename P > class Tokenizer ; "
                            "const Tokenizer < Node , Path > * tokenizer ( ) const ; "
                            "template < typename N , typename P > "
@@ -1741,7 +1781,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template<typename T>\n"
                             "void keep_range(T& value, const T mini, const T maxi){}\n"
                             "template void keep_range<float>(float& v, const float l, const float u);\n"
-                            "template void keep_range<int>(int& v, const int l, const int u);";
+                            "template void keep_range<int>(int& v, const int l, const int u);\n";
         const char exp[] = "void keep_range<float> ( float & value , const float mini , const float maxi ) ; "
                            "void keep_range<int> ( int & value , const int mini , const int maxi ) ; "
                            "void keep_range<float> ( float & value , const float mini , const float maxi ) { } "
@@ -1754,7 +1794,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "class PushBackStreamBuf {\n"
                             "public:\n"
                             "    void pushBack(const BTlist<int> &vec);\n"
-                            "};";
+                            "};\n";
         const char exp[] = "class BTlist<int> ; "
                            "class PushBackStreamBuf { "
                            "public: "
@@ -1767,7 +1807,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template75() {
         const char code[] = "template<typename T>\n"
                             "T foo(T& value){ return value; }\n"
-                            "template std::vector<std::vector<int>> foo<std::vector<std::vector<int>>>(std::vector<std::vector<int>>& v);";
+                            "template std::vector<std::vector<int>> foo<std::vector<std::vector<int>>>(std::vector<std::vector<int>>& v);\n";
         const char exp[] = "std :: vector < std :: vector < int > > foo<std::vector<std::vector<int>>> ( std :: vector < std :: vector < int > > & value ) ; "
                            "std :: vector < std :: vector < int > > foo<std::vector<std::vector<int>>> ( std :: vector < std :: vector < int > > & value ) { return value ; }";
         ASSERT_EQUALS(exp, tok(code));
@@ -1797,7 +1837,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "    std::cout << is_void<char>::value << std::endl;\n"
                             "    std::cout << is_void<void>::value << std::endl;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct is_void<void> ; "
                            "struct is_void<char> ; "
                            "struct is_void<void> : std :: true_type { } ; "
@@ -1812,7 +1852,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template78() {
         const char code[] = "template <typename>\n"
                             "struct Base { };\n"
-                            "struct S : Base <void>::Type { };";
+                            "struct S : Base <void>::Type { };\n";
         const char exp[] = "struct Base<void> ; "
                            "struct S : Base<void> :: Type { } ; "
                            "struct Base<void> { } ;";
@@ -1830,7 +1870,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void some_func() {\n"
                             "    Foo x;\n"
                             "    x.foo<int>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class Foo { "
                            "public: "
                            "void foo<int> ( ) ; "
@@ -1851,7 +1891,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "class Fred {\n"
                             "    template <typename T> T foo(T t) const { return t; }\n"
                             "};\n"
-                            "const void * p = Fred::foo<const void *>(nullptr);";
+                            "const void * p = Fred::foo<const void *>(nullptr);\n";
         const char exp[] = "class Fred { "
                            "const void * foo<constvoid*> ( const void * t ) const ; "
                            "} ; "
@@ -1869,7 +1909,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "SortWith<Type>::SortWith(Type) {}\n"
                             "int main() {\n"
                             "    SortWith<int>(0);\n"
-                            "}";
+                            "}\n";
         const char exp[] = "template < typename Type > "
                            "struct SortWith { "
                            "SortWith ( Type ) ; "
@@ -1899,7 +1939,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "  swizzle<1>(tt2);\n"
                             "  tvec3<f16> tt3;\n"
                             "  swizzle<2,3>(tt3);\n"
-                            "}";
+                            "}\n";
         const char exp[] = "const int f16 = 16 ; "
                            "class tvec2<f16> ; "
                            "class tvec3<f16> ; "
@@ -1930,7 +1970,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "MultiConsumer<Task>::MultiConsumer() : sizeBuffer(0) {}\n"
                             "MultiReads::MultiReads() {\n"
                             "    mc = new MultiConsumer<reads_packet>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "template < typename Task > " // TODO: this should be expanded
                            "class MultiConsumer { "
                            "MultiConsumer ( ) ; "
@@ -1948,7 +1988,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template <class b, int c, class>\n"
                                 "auto d() -> typename a<decltype(b{})>::e {\n"
                                 "  d<int, c, int>();\n"
-                                "}";
+                                "}\n";
             const char exp[] = "template < class b , int c , class > "
                                "auto d ( ) . a < decltype ( b { } ) > :: e { "
                                "d < int , c , int > ( ) ; "
@@ -1959,8 +1999,8 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template <class b, int c, class>\n"
                                 "auto d() -> typename a<decltype(b{})>::e {\n"
                                 "  d<int, c, int>();\n"
-                                "}"
-                                "void foo() { d<char, 1, int>(); }";
+                                "}\n"
+                                "void foo() { d<char, 1, int>(); }\n";
             const char exp[] = "auto d<char,1,int> ( ) . a < char > :: e ; "
                                "auto d<int,1,int> ( ) . a < int > :: e ; "
                                "void foo ( ) { d<char,1,int> ( ) ; } "
@@ -1984,7 +2024,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "extern template void C<int>::foo<int, nullptr>();\n"
                             "template<typename T>\n"
                             "template<typename U, typename std::enable_if<(!std::is_fundamental<U>::value)>::type>\n"
-                            "void C<T>::foo() {}";
+                            "void C<T>::foo() {}\n";
         // @todo the output is very wrong but we are only worried about the crash for now
         (void)tok(code);
     }
@@ -2000,7 +2040,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T>\n"
                             "S<T> U<T>::u;\n"
                             "template S<int> U<int>::u;\n"
-                            "S<int> &i = U<int>::u;";
+                            "S<int> &i = U<int>::u;\n";
         (void)tok(code);
     }
 
@@ -2008,7 +2048,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template<typename T>\n"
                             "T f1(T t) { return t; }\n"
                             "template const char * f1<const char *>(const char *);\n"
-                            "template const char & f1<const char &>(const char &);";
+                            "template const char & f1<const char &>(const char &);\n";
         const char exp[] = "const char * f1<constchar*> ( const char * t ) ; "
                            "const char & f1<constchar&> ( const char & t ) ; "
                            "const char * f1<constchar*> ( const char * t ) { return t ; } "
@@ -2035,7 +2075,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "    CTest::Greeting<bool>(true);\n"
                             "    return 0;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class CTest { "
                            "public: "
                            "static void Greeting<bool> ( bool ) ; "
@@ -2065,7 +2105,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template void Fred::foo<char>();\n"
                             "template void Fred::foo<float>();\n"
                             "template <> void Fred::foo<bool>() { }\n"
-                            "template <> void Fred::foo<int>() { }";
+                            "template <> void Fred::foo<int>() { }\n";
         const char exp[] = "struct Fred { "
                            "static void foo<int> ( ) ; "
                            "static void foo<bool> ( ) ; "
@@ -2083,7 +2123,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <typename T> struct S1 {};\n"
                             "void f(S1<double>) {}\n"
                             "template <typename T>\n"
-                            "decltype(S1<T>().~S1<T>()) fun1() {};";
+                            "decltype(S1<T>().~S1<T>()) fun1() {};\n";
         const char exp[] = "struct S1<double> ; "
                            "void f ( S1<double> ) { } "
                            "template < typename T > "
@@ -2098,7 +2138,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template<> char foo<char>(char a) { return a; }\n"
                                 "template<> int foo<int>(int a) { return a; }\n"
                                 "template float foo<float>(float);\n"
-                                "template double foo<double>(double);";
+                                "template double foo<double>(double);\n";
             const char exp[] = "int foo<int> ( int a ) ; "
                                "char foo<char> ( char a ) ; "
                                "float foo<float> ( float t ) ; "
@@ -2116,7 +2156,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    template<> int foo<int>(int a) { return a; }\n"
                                 "};\n"
                                 "template float Fred::foo<float>(float);\n"
-                                "template double Fred::foo<double>(double);";
+                                "template double Fred::foo<double>(double);\n";
             const char exp[] = "struct Fred { "
                                "int foo<int> ( int a ) ; "
                                "char foo<char> ( char a ) ; "
@@ -2141,7 +2181,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    template float NS2::foo<float>(float);\n"
                                 "    template bool NS1::NS2::foo<bool>(bool);\n"
                                 "}\n"
-                                "template double NS1::NS2::foo<double>(double);";
+                                "template double NS1::NS2::foo<double>(double);\n";
             const char exp[] = "namespace NS1 { "
                                "namespace NS2 { "
                                "int foo<int> ( int a ) ; "
@@ -2174,7 +2214,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    template float NS::foo<float>(float);\n"
                                 "    template bool NS1::NS::foo<bool>(bool);\n"
                                 "}\n"
-                                "template double NS1::NS::foo<double>(double);";
+                                "template double NS1::NS::foo<double>(double);\n";
             const char exp[] = "namespace NS1 { "
                                "namespace NS { "
                                "int foo<int> ( int a ) ; "
@@ -2205,7 +2245,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    foo<int>(2);\n"
                             "    foo<double>(3.14);\n"
                             "    foo<float>(3.14f);\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void foo<double> ( const double & d ) ; "
                            "void foo<float> ( const float & t ) ; "
                            "void foo<int> ( const int & t ) ; "
@@ -2234,7 +2274,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void Vector2<Type>::process() {\n"
                             "    ForEach<iterator>();\n"
                             "}\n"
-                            "Vector2<string> c;";
+                            "Vector2<string> c;\n";
         const char exp[] = "void ForEach<iterator> ( ) ; "
                            "class Vector2<string> ; "
                            "Vector2<string> c ; "
@@ -2264,7 +2304,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "Array<T> matmul() {\n"
                             "    return foo<T>( );\n"
                             "}\n"
-                            "template Array<std::complex<float>> matmul<std::complex<float>>();";
+                            "template Array<std::complex<float>> matmul<std::complex<float>>();\n";
         const char exp[] = "class Array<double> ; "
                            "class Array<std::complex<float>> ; "
                            "class Array<float> ; "
@@ -2292,7 +2332,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<>\n"
                             "int Value<int> = 456;\n"
                             "float f = Value<float>;\n"
-                            "int i = Value<int>;";
+                            "int i = Value<int>;\n";
         const char exp[] = "float Value<float> ; Value<float> = 123 ; "
                            "int Value<int> ; Value<int> = 456 ; "
                            "float f ; f = Value<float> ; "
@@ -2311,7 +2351,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "long f0 = fib<0>;\n"
                                 "long f1 = fib<1>;\n"
                                 "long f2 = fib<2>;\n"
-                                "long f3 = fib<3>;";
+                                "long f3 = fib<3>;\n";
             const char exp[] = "constexpr long fib<2> = fib<1> + fib<0> ; "
                                "constexpr long fib<3> = fib<2> + fib<1> ; "
                                "constexpr long fib<0> = 0 ; "
@@ -2371,7 +2411,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "using namespace NS1::NS2::NS3::NS4;\n"
                             "Fred<bool> fred_bool1;\n"
-                            "NS1::NS2::NS3::NS4::Fred<int> fred_int1;";
+                            "NS1::NS2::NS3::NS4::Fred<int> fred_int1;\n";
         const char exp[] = "namespace NS1 { "
                            "namespace NS2 { "
                            "namespace NS3 { "
@@ -2449,7 +2489,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    unique_ptr_with_deleter<A> tmp(new A(), [](A* a) {\n"
                             "        delete a;\n"
                             "    });\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class A { } ; "
                            "static void func ( ) { "
                            "std :: unique_ptr < A , std :: function < void ( A * ) > > tmp ( new A ( ) , [ ] ( A * a ) { "
@@ -2497,7 +2537,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    using ArrayType = std::vector<int>;\n"
                             "    void func(typename ArrayType::size_type i) {\n"
                             "    }\n"
-                            "};";
+                            "};\n";
 
         const char exp[] = "class A { "
                            "public: "
@@ -2518,7 +2558,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void f() {\n"
                             "    if(std::is_floating_point<float>::value) {}\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace ns { "
                            "template < class T > "
                            "struct is_floating_point "
@@ -2543,7 +2583,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    return t;\n"
                             "  }\n"
                             "}\n"
-                            "sample::Sample<int> s1;";
+                            "sample::Sample<int> s1;\n";
         const char exp[] = "namespace sample { "
                            "class Sample<int> ; "
                            "} "
@@ -2569,7 +2609,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    BOOST_HANA_CONSTANT_CHECK ( hana :: equal (\n"
                             "        hana :: at_key ( hana :: make_map ( p < 0 , 0 > ( ) ) , key < 0 > ( ) ) ,\n"
                             "        val < 0 > ( ) ) ) ;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "auto key<0> ( ) ; "
                            "auto val<0> ( ) ; "
                            "auto p<0,0> ( ) ; "
@@ -2589,7 +2629,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <template <typename> class TOUT>\n"
                             "class ObjectCache { };\n"
                             "template <typename T> class Fred {};\n"
-                            "ObjectCache<Fred> _cache;";
+                            "ObjectCache<Fred> _cache;\n";
         const char exp[] = "class ObjectCache<Fred> ; "
                            "template < typename T > class Fred { } ; "
                            "ObjectCache<Fred> _cache ; class ObjectCache<Fred> { } ;";
@@ -2604,7 +2644,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<template<class T, class U> class V> class B {\n"
                             "   V<char, char> i;\n"
                             "};\n"
-                            "B<A> c;";
+                            "B<A> c;\n";
         const char exp[] = "class A<char,char> ; "
                            "class B<A> ; "
                            "B<A> c ; "
@@ -2630,7 +2670,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "void foo() {\n"
                             "  f<C3, long>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void f<C3,long> ( ) ; "
                            "struct C3 { "
                            "class T3<long> ; "
@@ -2681,7 +2721,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "  bool h = f::h;\n"
                                 "};\n"
                                 "template <typename i> using j = typename e<i>::g;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace { "
                                "template < typename > struct a ; "
                                "template < typename > struct b { } ; "
@@ -2709,7 +2749,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "template <typename i> using j = typename e<i>::g;\n"
                                 "}\n"
-                                "j<int> foo;";
+                                "j<int> foo;\n";
             const char exp[] = "namespace { "
                                "template < typename > struct a ; "
                                "struct b<c<int>::g> ; "
@@ -2795,7 +2835,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<typename T> using A<T*> = char;\n"
                             "template<> using A<char> = char;\n"
                             "template using A<char> = char;\n"
-                            "using A<char> = char;";
+                            "using A<char> = char;\n";
         const char exp[] = "template < typename T > using A = int ; "
                            "template < typename T > using A < T * > = char ; "
                            "template < > using A < char > = char ; "
@@ -2806,7 +2846,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template111() { // crash
         const char code[] = "template<typename T, typename U> struct pair;\n"
-                            "template<typename T> using cell = pair<T*, cell<T>*>;";
+                            "template<typename T> using cell = pair<T*, cell<T>*>;\n";
         const char exp[] = "template < typename T , typename U > struct pair ; "
                            "template < typename T > using cell = pair < T * , cell < T > * > ;";
         ASSERT_EQUALS(exp, tok(code));
@@ -2816,7 +2856,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <int> struct a;\n"
                             "template <class, class b> using c = typename a<int{b::d}>::e;\n"
                             "template <class> struct f;\n"
-                            "template <class b> using g = typename f<c<int, b>>::e;";
+                            "template <class b> using g = typename f<c<int, b>>::e;\n";
         const char exp[] = "template < int > struct a ; "
                            "template < class , class b > using c = typename a < int { b :: d } > :: e ; "
                            "template < class > struct f ; "
@@ -2827,7 +2867,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template113() {
         {
             const char code[] = "template <class> class A { void f(); };\n"
-                                "A<int> a;";
+                                "A<int> a;\n";
             const char exp[] = "class A<int> ; "
                                "A<int> a ; "
                                "class A<int> { void f ( ) ; } ;";
@@ -2835,7 +2875,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <struct> struct A { void f(); };\n"
-                                "A<int> a;";
+                                "A<int> a;\n";
             const char exp[] = "struct A<int> ; "
                                "A<int> a ; "
                                "struct A<int> { void f ( ) ; } ;";
@@ -2849,7 +2889,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename> struct c;\n"
                                 "template <typename> struct d : b<bool, std::is_polymorphic<int>{}> {};\n"
                                 "template <bool> struct e;\n"
-                                "template <typename a> using f = typename e<c<d<a>>::g>::h;";
+                                "template <typename a> using f = typename e<c<d<a>>::g>::h;\n";
             const char exp[] =  "template < typename a , a > struct b { } ; "
                                "template < typename > struct c ; "
                                "template < typename > struct d : b < bool , std :: is_polymorphic < int > { } > { } ; "
@@ -2881,7 +2921,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    }\n"
                             "    template <class c> using g = b::f<e<int, c>>;\n"
                             "}\n"
-                            "g<int> g1;";
+                            "g<int> g1;\n";
         const char exp[] = "namespace { "
                            "namespace b { "
                            "struct B<0> ; "
@@ -2898,7 +2938,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template116() { // #9178
         {
             const char code[] = "template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>);\n"
-                                "template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){}";
+                                "template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){}\n";
             const char exp[] = "template < class , class a > auto b ( ) . decltype ( a { } . template b < void ( int , int ) > ) ; "
                                "template < class , class a > auto b ( ) . decltype ( a { } . template b < void ( int , int ) > ) { }";
             ASSERT_EQUALS(exp, tok(code));
@@ -2909,7 +2949,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "struct c {\n"
                                 "  template <class> void b();\n"
                                 "};\n"
-                                "void d() { b<c, c>(); }";
+                                "void d() { b<c, c>(); }\n";
             const char exp[] = "auto b<c,c> ( ) . decltype ( c { } . template b < void ( int , int ) > ( ) ) ; "
                                "struct c { "
                                "template < class > void b ( ) ; "
@@ -2922,7 +2962,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template117() {
         const char code[] = "template<typename T = void> struct X {};\n"
-                            "X<X<>> x;";
+                            "X<X<>> x;\n";
         const char exp[] = "struct X<void> ; "
                            "struct X<X<void>> ; "
                            "X<X<void>> x ; "
@@ -2933,7 +2973,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template118() {
         const char code[] = "template<int> struct S { void f(int i); };\n"
-                            "S<1> s;";
+                            "S<1> s;\n";
         const char exp[] = "struct S<1> ; "
                            "S<1> s ; struct S<1> { "
                            "void f ( int i ) ; "
@@ -2948,7 +2988,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename T>\n"
                                 "constexpr auto funcBraced = [](auto x){ return T{x};};\n"
                                 "double f(int x) { return func<double>(x); }\n"
-                                "double fBraced(int x) { return funcBraced<int>(x); }";
+                                "double fBraced(int x) { return funcBraced<int>(x); }\n";
             const char exp[] = "constexpr auto func<double> = [ ] ( auto x ) { return double ( x ) ; } ; "
                                "constexpr auto funcBraced<int> = [ ] ( auto x ) { return int { x } ; } ; "
                                "double f ( int x ) { return func<double> ( x ) ; } "
@@ -2961,7 +3001,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "void foo() {\n"
                                 "    func<int>(x);\n"
                                 "    func<double>(x);\n"
-                                "}";
+                                "}\n";
             const char exp[] = "constexpr auto func<int> = [ ] ( auto x ) { return int ( x ) ; } ; "
                                "constexpr auto func<double> = [ ] ( auto x ) { return double ( x ) ; } ; "
                                "void foo ( ) { "
@@ -2985,7 +3025,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    template<typename This>\n"
                             "    struct result<This()> : lambda_context<tuple<> > {};\n"
                             "};\n"
-                            "lambda<int> l;";
+                            "lambda<int> l;\n";
         const char exp[] = "template < typename Tuple > "
                            "struct lambda_context { "
                            "template < typename Sig > struct result ; "
@@ -3004,7 +3044,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template121() { // #9193
         const char code[] = "template <class VALUE_T, class LIST_T = std::list<VALUE_T>>\n"
                             "class TestList { };\n"
-                            "TestList<std::shared_ptr<int>> m_test;";
+                            "TestList<std::shared_ptr<int>> m_test;\n";
         const char exp[] = "class TestList<std::shared_ptr<int>,std::list<std::shared_ptr<int>>> ; "
                            "TestList<std::shared_ptr<int>,std::list<std::shared_ptr<int>>> m_test ; "
                            "class TestList<std::shared_ptr<int>,std::list<std::shared_ptr<int>>> { } ;";
@@ -3018,7 +3058,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <template <class> class c, class... f, template <class...> class d>\n"
                             "struct b<c<f...>, d<>>;\n"
                             "}\n"
-                            "void e() { using c = a<>; }";
+                            "void e() { using c = a<>; }\n";
         const char exp[] = "template < class ... > struct a ; "
                            "namespace { "
                            "template < class , class > struct b ; "
@@ -3040,7 +3080,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void fn1() {\n"
                             "  using c = a<>;\n"
                             "  using e = a<>;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "template < class ... > struct a ; "
                            "namespace { "
                            "template < class , class , class , class > "
@@ -3059,7 +3099,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename> struct e;\n"
                             "template <typename> struct h {\n"
                             "  template <typename... f, c<h<e<typename f::d...>>::g>> void i();\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < bool > struct a ; "
                            "template < bool b > using c = typename a < b > :: d ; "
                            "template < typename > struct e ; "
@@ -3077,12 +3117,12 @@ class TestSimplifyTemplate : public TestFixture {
                                   "};\n"
                                   "int main() {\n"
                                   "  GCD< 1, 0 >::val;\n"
-                                  "}"), INSTANTIATION);
+                                  "}\n"), INSTANTIATION);
     }
 
     void template126() { // #9217
         const char code[] = "template <typename b> using d = a<b>;\n"
-                            "static_assert(i<d<l<b>>>{}, \"\");";
+                            "static_assert(i<d<l<b>>>{}, \"\");\n";
         const char exp[] = "static_assert ( i < a < l < b > > > { } , \"\" ) ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3095,7 +3135,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "a<int> c;\n"
                                 "template <typename d>\n"
                                 "template <typename b>\n"
-                                "constexpr decltype(auto) a<d>::operator()(b &&) const {}";
+                                "constexpr decltype(auto) a<d>::operator()(b &&) const {}\n";
             const char exp[] = "struct a<int> ; "
                                "a<int> c ; "
                                "template < typename d > "
@@ -3123,7 +3163,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename d>\n"
                                 "template <typename b>\n"
                                 "void a<d>::foo() {}\n"
-                                "void bar() { a<int>::foo<char>(); }";
+                                "void bar() { a<int>::foo<char>(); }\n";
             const char exp[] = "struct a<int> ; "
                                "a<int> c ; "
                                "template < typename d > "
@@ -3154,7 +3194,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename d>\n"
                                 "template <typename b>\n"
                                 "void a<d>::foo() {}\n"
-                                "void bar() { a<int>::foo<char>(); }";
+                                "void bar() { a<int>::foo<char>(); }\n";
             const char exp[] = "struct a<int> ; "
                                "template < typename d > "
                                "template < typename b > "
@@ -3180,7 +3220,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template128() { // #9224
         const char code[] = "template <typename> struct a { };\n"
                             "template <typename j> void h() { k.h<a<j>>; }\n"
-                            "void foo() { h<int>(); }";
+                            "void foo() { h<int>(); }\n";
         const char exp[] = "struct a<int> ; "
                            "void h<int> ( ) ; "
                            "void foo ( ) { h<int> ( ) ; } "
@@ -3197,7 +3237,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "void setupLuaBindingsDNSQuestion() {\n"
                             "  g_lua.registerFunction<void (DNSQuestion ::*)(std ::string, std ::string)>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class LuaContext { "
                            "public: "
                            "template < typename TFunctionType , typename TType > "
@@ -3214,7 +3254,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename, typename> using b = a<>;\n"
                             "template <typename, typename> void c();\n"
                             "template <typename d, typename> void e() { c<b<d, int>, int>; }\n"
-                            "void f() { e<int(int, ...), int>(); }";
+                            "void f() { e<int(int, ...), int>(); }\n";
         const char exp[] = "template < typename , typename > void c ( ) ; "
                            "void e<int(int,...),int> ( ) ; "
                            "void f ( ) { e<int(int,...),int> ( ) ; } "
@@ -3225,7 +3265,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template131() { // #9249
         {
             const char code[] = "template <long a, bool = 0 == a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,false> ; "
                                "b<1,false> b1 ; "
                                "struct b<1,false> { } ;";
@@ -3233,7 +3273,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = 0 != a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3241,7 +3281,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = a < 0> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,false> ; "
                                "b<1,false> b1 ; "
                                "struct b<1,false> { } ;";
@@ -3249,7 +3289,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = 0 < a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3257,7 +3297,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = 0 <= a> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3265,7 +3305,7 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             const char code[] = "template <long a, bool = a >= 0> struct b {};\n"
-                                "b<1> b1;";
+                                "b<1> b1;\n";
             const char exp[] = "struct b<1,true> ; "
                                "b<1,true> b1 ; "
                                "struct b<1,true> { } ;";
@@ -3284,7 +3324,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "int f1() {\n"
                             "  return foo<TrueFalse>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct TrueFalse { "
                            "static constexpr bool v ( ) { return true ; } "
                            "} ; "
@@ -3309,7 +3349,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "bar<short> bs;\n"
                             "bar<std::array<int,4>> ba;\n"
                             "bar<short> b1 = bar<short>::foo<std::array<int,4>>(ba);\n"
-                            "bar<std::array<int,4>> b2 = bar<std::array<int,4>>::foo<short>(bs);";
+                            "bar<std::array<int,4>> b2 = bar<std::array<int,4>>::foo<short>(bs);\n";
         const char act[] = "struct bar<short> ; struct bar<std::array<int,4>> ; "
                            "bar<short> bs ; "
                            "bar<std::array<int,4>> ba ; "
@@ -3351,7 +3391,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <int a> class e { };\n"
                             "template <int a> class b { e<(c > a ? 1 : 0)> d; };\n"
                             "b<0> b0;\n"
-                            "b<1> b1;";
+                            "b<1> b1;\n";
         const char exp[] = "class e<(c>0)> ; class e<(c>1)> ; "
                            "class b<0> ; class b<1> ; "
                            "b<0> b0 ; "
@@ -3363,7 +3403,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template135() {
         const char code[] = "template <int> struct a { template <int b> void c(a<b>); };\n"
-                            "a<2> d;";
+                            "a<2> d;\n";
         const char exp[] = "struct a<2> ; "
                            "a<2> d ; "
                            "struct a<2> { template < int b > void c ( a < b > ) ; } ;";
@@ -3382,7 +3422,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "namespace hana = a;\n"
                             "using e = int;\n"
-                            "void l(hana::d<hana::i<e>>);";
+                            "void l(hana::d<hana::i<e>>);\n";
         const char exp[] = "namespace a { "
                            "template < typename > struct b ; "
                            "template < int > struct c ; "
@@ -3402,7 +3442,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class, template <class> class, class> struct e;\n"
                             "template <class f, class g, class... h>\n"
                             "using i = typename e<f, g::template fn, h...>::d;\n"
-                            "template <class... j> struct k : c<sizeof...(j), int>::template fn<j...> {};";
+                            "template <class... j> struct k : c<sizeof...(j), int>::template fn<j...> {};\n";
         const char exp[] = "template < bool > struct a ; "
                            "template < bool b , class > using c = typename a < b > :: d ; "
                            "template < class , template < class > class , class > struct e ; "
@@ -3423,7 +3463,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3444,7 +3484,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3466,7 +3506,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3487,7 +3527,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "};\n"
                                 "int main() {\n"
                                 "  return 0;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "struct inferior { "
                                "template < typename T > "
                                "bool operator() ( const T & a , const T & b ) const { "
@@ -3506,7 +3546,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template<typename T>\n"
                                 "struct Foo {\n"
                                 "  template<typename> friend struct Foo;\n"
-                                "};";
+                                "};\n";
             const char exp[] = "template < typename T > "
                                "struct Foo { "
                                "template < typename > friend struct Foo ; "
@@ -3518,7 +3558,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "struct Foo {\n"
                                 "  template<typename> friend struct Foo;\n"
                                 "} ;\n"
-                                "Foo<int> foo;";
+                                "Foo<int> foo;\n";
             const char exp[] = "struct Foo<int> ; "
                                "Foo<int> foo ; "
                                "struct Foo<int> { "
@@ -3535,7 +3575,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    d();\n"
                                 "    d(d<a<b>> e);\n"
                                 "};\n"
-                                "void foo() { d<char> c; }";
+                                "void foo() { d<char> c; }\n";
             const char exp[] = "struct a<char> ; "
                                "struct d<char> ; "
                                "void foo ( ) { d<char> c ; } "
@@ -3552,7 +3592,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template <typename> constexpr bool e() { return false; }\n"
                                 "template <typename b> class f { f(f<c<b>>); };\n"
                                 "static_assert(!e<f<char>>());\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace a { "
                                "constexpr bool e<f<char>> ( ) ; "
                                "class f<char> ; "
@@ -3567,7 +3607,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "struct a {\n"
                             "  int c;\n"
                             "  template <typename b> void d(b e) const { c < *e; }\n"
-                            "};";
+                            "};\n";
         const char exp[] = "struct a { "
                            "int c ; "
                            "template < typename b > void d ( b e ) const { c < * e ; } "
@@ -3580,7 +3620,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename b, typename c, typename... d> struct a<b c::*, d...> {\n"
                             "  using typename b ::e;\n"
                             "  static_assert(e::f ? sizeof...(d) : sizeof...(d), \"\");\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < typename ... > struct a ; "
                            "template < typename b , typename c , typename ... d > struct a < b c :: * , d ... > { "
                            "using e = b :: e ; "
@@ -3598,7 +3638,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "A2<bool> a2;\n"
                             "template<class T>\n"
                             "using A3 = enum B3 {b = 0};\n"
-                            "A3<int> a3;";
+                            "A3<int> a3;\n";
         const char exp[] = "template < int N > "
                            "using A1 = struct B1 { static auto constexpr value = N ; } ; "
                            "A1 < 0 > a1 ; "
@@ -3620,7 +3660,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T>\n"
                             "struct promote <T, typename std::enable_if< std::is_integral<T>::value && sizeof(T) < sizeof(int) >::type>{\n"
                             "};\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace a { "
                            "template < typename T , typename enable = void > "
                            "struct promote { "
@@ -3634,7 +3674,7 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template145() { // syntax error
-        const char code[] = "template<template<typename, Ts = 0> class ...Cs, Cs<Ts> ...Vs> struct B { };";
+        const char code[] = "template<template<typename, Ts = 0> class ...Cs, Cs<Ts> ...Vs> struct B { };\n";
         const char exp[] = "template < template < typename , Ts = 0 > class ... Cs , Cs < Ts > ... Vs > struct B { } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3644,7 +3684,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<class T, template<class TT_T0, template<class TT_T1> class TT_TT> class TT, class U = TT<int, C> >\n"
                             "struct S {\n"
                             "  void foo(TT<T, C>);\n"
-                            "};";
+                            "};\n";
         const char exp[] = "template < class T > struct C { } ; "
                            "template < class T , template < class TT_T0 , template < class TT_T1 > class TT_TT > class TT , class U = TT < int , C > > "
                            "struct S { "
@@ -3654,7 +3694,7 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template147() { // syntax error
-        const char code[] = "template <template <typename> class C, typename X, C<X>*> struct b { };";
+        const char code[] = "template <template <typename> class C, typename X, C<X>*> struct b { };\n";
         const char exp[] = "template < template < typename > class C , typename X , C < X > * > struct b { } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3662,7 +3702,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template148() { // syntax error
         const char code[] = "static_assert(var<S1<11, 100>> == var<S1<199, 23>> / 2\n"
                             "  && var<S1<50, 120>> == var<S1<150, var<S1<10, 10>>>>\n"
-                            "  && var<S1<53, 23>> != 222, \"\");";
+                            "  && var<S1<53, 23>> != 222, \"\");\n";
         const char exp[] = "static_assert ( var < S1 < 11 , 100 > > == var < S1 < 199 , 23 > > / 2 "
                            "&& var < S1 < 50 , 120 > > == var < S1 < 150 , var < S1 < 10 , 10 > > > > "
                            "&& var < S1 < 53 , 23 > > != 222 , \"\" ) ;";
@@ -3672,7 +3712,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template149() { // unknown macro
         const char code[] = "BEGIN_VERSIONED_NAMESPACE_DECL\n"
                             "template<typename T> class Fred { };\n"
-                            "END_VERSIONED_NAMESPACE_DECL";
+                            "END_VERSIONED_NAMESPACE_DECL\n";
         ASSERT_THROW_INTERNAL_EQUALS(tok(code), UNKNOWN_MACRO, "There is an unknown macro here somewhere. Configuration is required. If BEGIN_VERSIONED_NAMESPACE_DECL is a macro then please configure it.");
     }
 
@@ -3684,7 +3724,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void foo() {\n"
                             "  Test test;\n"
                             "  const string type = test.operator[]<string>(\"type\");\n"
-                            "}";
+                            "}\n";
         const char exp[] = "struct Test { "
                            "string & operator[]<string> ( string ) ; "
                            "} ; "
@@ -3707,7 +3747,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "class GenericConfigurationHandler {\n"
                                 "  data_container<int, std::allocator<int>> m_target_configurations;\n"
                                 "};\n"
-                                "class TargetConfigurationHandler : public GenericConfigurationHandler<int> { };";
+                                "class TargetConfigurationHandler : public GenericConfigurationHandler<int> { };\n";
             const char exp[] = "class SimulationComponentGroupGenerator { "
                                "std :: list < int , std :: allocator < int > > build ( ) const ; "
                                "} ; "
@@ -3721,7 +3761,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "std::list<std::allocator<int>> a;\n"
                                 "template <class, template <class> class allocator = std::allocator> class b {};\n"
-                                "class c : b<int> {};";
+                                "class c : b<int> {};\n";
             const char exp[] = "std :: list < std :: allocator < int > > a ; "
                                "class b<int,std::allocator> ; "
                                "class c : b<int,std::allocator> { } ; "
@@ -3732,7 +3772,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template <typename> class a {};\n"
                                 "template class a<char>;\n"
                                 "template <class, template <class> class a = a> class b {};\n"
-                                "class c : b<int> {};";
+                                "class c : b<int> {};\n";
             const char exp[] = "class a<char> ; "
                                "class b<int,a> ; "
                                "class c : b<int,a> { } ; "
@@ -3756,7 +3796,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int global() {\n"
                             "  int bar = 1;\n"
                             "  return bar;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "class Foo { "
                            "bool bar<9> ( ) ; "
                            "template < unsigned int i > "
@@ -3775,13 +3815,13 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template153() { // #9483
-        const char code[] = "template <class = b<decltype(a<h>())...>> void i();";
+        const char code[] = "template <class = b<decltype(a<h>())...>> void i();\n";
         const char exp[] = "template < class = b < decltype ( a < h > ( ) ) ... > > void i ( ) ;";
         ASSERT_EQUALS(exp, tok(code));
     }
 
     void template154() { // #9495
-        const char code[] = "template <typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);";
+        const char code[] = "template <typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);\n";
         const char exp[] = "template < typename S , enable_if_t < ( is_compile_string < S > :: value ) , int > > void i ( S s ) ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3794,7 +3834,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void c() {\n"
                             "  b d;\n"
                             "  d[a<0>];\n"
-                            "}";
+                            "}\n";
         const char exp[] = "int a<0> ; "
                            "a<0> = 0 ; "
                            "struct b { "
@@ -3817,7 +3857,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename j> using k = e<i<j>::d>;\n"
                             "template <typename j> using l = h<k<j>::d, e<1 < (j)0>, f>;\n"
                             "template <typename> void m(int, int, int) { l<int> d; }\n"
-                            "void n() { m<int>(0, 4, 5); }";
+                            "void n() { m<int>(0, 4, 5); }\n";
         (void)tok(code); // don't crash
     }
 
@@ -3833,7 +3873,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "b3<0> var3;\n"
                             "b4<0> var4;\n"
                             "b5<0> var5;\n"
-                            "b6<0> var6;";
+                            "b6<0> var6;\n";
         const char exp[] = "struct b1<0,true> ; "
                            "struct b2<0,false> ; "
                            "struct b3<0,false> ; "
@@ -4058,7 +4098,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "b<a97<int>> d97;\n"
                             "b<a98<int>> d98;\n"
                             "b<a99<int>> d99;\n"
-                            "b<a100<int>> d100;";
+                            "b<a100<int>> d100;\n";
         // don't bother checking the output because this is not instantiated properly
         (void)tok(code); // don't crash
 
@@ -4090,7 +4130,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "tester<impl*, int> ti;\n"
                             "template<class T, class U, class = decltype(impl::create<T>()->impl::create<U>())>\n"
                             "int test() { return 0; }\n"
-                            "int i = test<impl*, int>();";
+                            "int i = test<impl*, int>();\n";
         const char exp[]  = "struct impl { template < class T > static T create ( ) ; } ; "
                             "struct tester<impl*,int,decltype(impl::create<impl*>().impl::create<int>())> ; "
                             "tester<impl*,int,decltype(impl::create<impl*>().impl::create<int>())> ti ; "
@@ -4109,7 +4149,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template void Fred::foo<char>();\n"
                             "template <> void Fred::foo<bool>() { }\n"
                             "template void Fred::foo<float>(float);\n"
-                            "template <> void Fred::foo<int>(int) { }";
+                            "template <> void Fred::foo<int>(int) { }\n";
         const char exp[]  = "struct Fred { "
                             "static void foo<bool> ( ) ; "
                             "static void foo<char> ( ) ; "
@@ -4132,7 +4172,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "void foo() {\n"
                             "   auto notifyJob = std::make_shared<adapter<JobEntry>> ();\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "???";
         const char act[]  = "struct JobEntry { } ; "
                             "struct adapter<JobEntry> ; "
@@ -4150,12 +4190,12 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <std::size_t N>\n"
                             "struct CountryCode {\n"
                             "    CountryCode(std::string cc);\n"
-                            "};"
+                            "};\n"
                             "template <std::size_t N>\n"
                             "CountryCode<N>::CountryCode(std::string cc) : m_String{std::move(cc)} {\n"
                             "}\n"
                             "template class CountryCode<2>;\n"
-                            "template class CountryCode<3>;";
+                            "template class CountryCode<3>;\n";
         const char exp[]  = "struct CountryCode<2> ; "
                             "struct CountryCode<3> ; "
                             "struct CountryCode<2> { "
@@ -4172,7 +4212,7 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template163() { // #9685 syntax error
-        const char code[] = "extern \"C++\" template < typename T > T * test ( ) { return nullptr ; }";
+        const char code[] = "extern \"C++\" template < typename T > T * test ( ) { return nullptr ; }\n";
         const char expected[] = "template < typename T > T * test ( ) { return nullptr ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -4191,7 +4231,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <class TYPE>\n"
                             "void A<TYPE>::f() { }\n"
                             "template class A<int>;\n"
-                            "template class A<float>;";
+                            "template class A<float>;\n";
         const char exp[]  = "struct A<int> ; "
                             "struct A<float> ; "
                             "struct A<int> { "
@@ -4219,7 +4259,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    bool operator()(const T& l, const T& r) const {\n"
                             "        return l.first < r.first;\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         const char exp[]  = "struct MyStruct { "
                             "template < class T > "
                             "bool operator() ( const T & l , const T & r ) const { "
@@ -4232,7 +4272,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template166() { // #10081 hang
         const char code[] = "template <typename T, size_t k = (T::s < 3) ? 0 : 3>\n"
                             "void foo() {}\n"
-                            "foo<T>();";
+                            "foo<T>();\n";
         const char exp[]  = "void foo<T,(T::s<3)?0:3> ( ) ; "
                             "foo<T,(T::s<3)?0:3> ( ) ; "
                             "void foo<T,(T::s<3)?0:3> ( ) { }";
@@ -4251,7 +4291,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void foo() {\n"
                             "    std::string str = MathLib::toString(1.0);\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "struct MathLib { "
                             "static std :: string toString<double> ( double value ) ; "
                             "template < class T > static std :: string toString ( T value ) { "
@@ -4281,7 +4321,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template < > struct type < long long, long long > {};\n"
                             "template < > struct type < double, double > {};\n"
                             "template < > struct type < float, float > {};\n"
-                            "template < > struct type < long double, long double > {};";
+                            "template < > struct type < long double, long double > {};\n";
         const char exp[]  = "struct type<longdouble,longdouble> ; "
                             "struct type<float,float> ; "
                             "struct type<double,double> ; "
@@ -4329,7 +4369,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "CImgList < last < long long > > c12;\n"
                             "CImgList < last < float > > c13;\n"
                             "CImgList < last < double > > c14;\n"
-                            "CImgList < last < long double > > c15;";
+                            "CImgList < last < long double > > c15;\n";
         const char exp[]  = "struct last<bool> ; "
                             "struct last<signedchar> ; "
                             "struct last<unsignedchar> ; "
@@ -4413,7 +4453,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "void c() {\n"
                             "  a<1>;\n"
                             "  [](auto b) {};\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "int a<1> ; a<1> = 0 ; "
                             "void c ( ) { "
                             "a<1> ; "
@@ -4426,7 +4466,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <int> struct c { enum { b }; };\n"
                             "template <int> struct h { enum { d }; enum { e }; };\n"
                             "template <int f, long = h<f>::d, int g = h<f>::e> class i { enum { e = c<g>::b }; };\n"
-                            "void j() { i<2> a; }";
+                            "void j() { i<2> a; }\n";
         const char exp[]  = "struct c<h<2>::e> ; "
                             "struct h<2> ; "
                             "class i<2,h<2>::d,h<2>::e> ; "
@@ -4446,7 +4486,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template172() { // #10258 crash
         const char code[] = "template<typename T, typename... Args>\n"
                             "void bar(T t, Args&&... args) { }\n"
-                            "void foo() { bar<int>(0, 1); }";
+                            "void foo() { bar<int>(0, 1); }\n";
         const char exp[]  = "void bar<int> ( int t , Args && ... args ) ; "
                             "void foo ( ) { bar<int> ( 0 , 1 ) ; } "
                             "void bar<int> ( int t , Args && ... args ) { }";
@@ -4462,7 +4502,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "namespace std {\n"
                             "template <> void swap<a::d>(a::d &, a::d &) {}\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "namespace a { "
                             "template < typename , typename > struct b ; "
                             "template < template < typename , typename > class > class c ; "
@@ -4523,7 +4563,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template177() {
         const char code[] = "template <typename Encoding, typename Allocator>\n"
                             "class C { xyz<Encoding, Allocator> x; };\n"
-                            "C<UTF8<>, MemoryPoolAllocator<>> c;";
+                            "C<UTF8<>, MemoryPoolAllocator<>> c;\n";
         const char exp[] = "class C<UTF8<>,MemoryPoolAllocator<>> ; "
                            "C<UTF8<>,MemoryPoolAllocator<>> c ; "
                            "class C<UTF8<>,MemoryPoolAllocator<>> { xyz < UTF8 < > , MemoryPoolAllocator < > > x ; } ;";
@@ -4537,7 +4577,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}\n"
                             "void f() {\n"
                             "    g<int>();\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void g<int> ( ) ; void f ( ) { g<int> ( ) ; } void g<int> ( ) { for ( int i = 0 ; i < int { 3 } ; ++ i ) { } }";
         ASSERT_EQUALS(exp, tok(code));
 
@@ -4552,7 +4592,7 @@ class TestSimplifyTemplate : public TestFixture {
                              "void f() {\n"
                              "    S<char> s{};\n"
                              "    s.g<int>();\n"
-                             "}";
+                             "}\n";
         const char exp2[] = "struct S<char> ; void f ( ) { S<char> s { } ; s . g<int> ( ) ; } struct S<char> { char c ; void g<int> ( ) ; } ; "
                             "void S<char> :: g<int> ( ) { for ( int i = 0 ; i < int { 3 } ; ++ i ) { } }";
         ASSERT_EQUALS(exp2, tok(code2));
@@ -4634,11 +4674,65 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(exp2, tok(code2));
     }
 
+    void template182() {
+        const char code[] = "template <class...>\n"
+                            "auto f() {\n"
+                            "    return [](auto&&...) {};\n"
+                            "}\n";
+        const char exp[] = "template < class ... > auto f ( ) { return [ ] ( auto && ... ) { } ; }";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void template183() { // #11498
+        const char code[] = "template <typename T>\n"
+                            "struct S {\n"
+                            "    void f();\n"
+                            "    using X = decltype(&S<T>::f);\n"
+                            "private:\n"
+                            "    X x;\n"
+                            "};\n"
+                            "S<int> s;\n";
+        const char exp[] = "struct S<int> ; "
+                           "S<int> s ; "
+                           "struct S<int> { "
+                           "void f ( ) ; "
+                           "private: "
+                           "decltype ( & S<int> :: f ) x ; "
+                           "} ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void template184() {
+        const char code[] = "template <typename T>\n"
+                            "T g(T x) {\n"
+                            "  return x;\n"
+                            "}\n"
+                            "template <>\n"
+                            "float g<float>(float x) {\n"
+                            "  return x + 1.0f;\n"
+                            "}\n"
+                            "void f(int i) {\n"
+                            "  g(i);\n"
+                            "  g(1.0f);\n"
+                            "}\n";
+        const char exp[] = "float g<float> ( float x ) ; "
+                           "template < typename T > "
+                           "T g ( T x ) { return x ; } "
+                           "float g<float> ( float x ) {"
+                           " return x + 1.0f ; "
+                           "} "
+                           "void f ( int i ) {"
+                           " g ( i ) ;"
+                           " g<float> ( 1.0f ) ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code)); // TODO: instantiate g<int>(int)
+    }
+
     void template_specialization_1() {  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         const char code[] = "template <typename T> struct C {};\n"
                             "template <typename T> struct S {a};\n"
                             "template <typename T> struct S<C<T>> {b};\n"
-                            "S<int> s;";
+                            "S<int> s;\n";
         const char exp[]  = "template < typename T > struct C { } ; struct S<int> ; template < typename T > struct S < C < T > > { b } ; S<int> s ; struct S<int> { a } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -4647,7 +4741,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <typename T> struct C {};\n"
                             "template <typename T> struct S {a};\n"
                             "template <typename T> struct S<C<T>> {b};\n"
-                            "S<C<int>> s;";
+                            "S<C<int>> s;\n";
         const char exp[]  = "template < typename T > struct C { } ; template < typename T > struct S { a } ; struct S<C<int>> ; S<C<int>> s ; struct S<C<int>> { b } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -4671,43 +4765,43 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template_enum() {
-        const char code1[] = "template <class T>\n"
-                             "struct Unconst {\n"
-                             "    typedef T type;\n"
-                             "};\n"
-                             "template <class T>\n"
-                             "struct Unconst<const T> {\n"
-                             "    typedef T type;\n"
-                             "};\n"
-                             "template <class T>\n"
-                             "struct Unconst<const T&> {\n"
-                             "    typedef T& type;\n"
-                             "};\n"
-                             "template <class T>\n"
-                             "struct Unconst<T* const> {\n"
-                             "    typedef T* type;\n"
-                             "};\n"
-                             "template <class T1, class T2>\n"
-                             "struct type_equal {\n"
-                             "    enum {  value = 0   };\n"
-                             "};\n"
-                             "template <class T>\n"
-                             "struct type_equal<T, T> {\n"
-                             "    enum {  value = 1   };\n"
-                             "};\n"
-                             "template<class T>\n"
-                             "struct template_is_const\n"
-                             "{\n"
-                             "    enum {value = !type_equal<T, typename Unconst<T>::type>::value  };\n"
-                             "};";
-        const char exp1[] = "template < class T > struct Unconst { } ; "
-                            "template < class T > struct Unconst < const T > { } ; "
-                            "template < class T > struct Unconst < const T & > { } ; "
-                            "template < class T > struct Unconst < T * const > { } ; "
-                            "template < class T1 , class T2 > struct type_equal { enum Anonymous0 { value = 0 } ; } ; "
-                            "template < class T > struct type_equal < T , T > { enum Anonymous1 { value = 1 } ; } ; "
-                            "template < class T > struct template_is_const { enum Anonymous2 { value = ! type_equal < T , Unconst < T > :: type > :: value } ; } ;";
-        ASSERT_EQUALS(exp1, tok(code1));
+        const char code[] = "template <class T>\n"
+                            "struct Unconst {\n"
+                            "    typedef T type;\n"
+                            "};\n"
+                            "template <class T>\n"
+                            "struct Unconst<const T> {\n"
+                            "    typedef T type;\n"
+                            "};\n"
+                            "template <class T>\n"
+                            "struct Unconst<const T&> {\n"
+                            "    typedef T& type;\n"
+                            "};\n"
+                            "template <class T>\n"
+                            "struct Unconst<T* const> {\n"
+                            "    typedef T* type;\n"
+                            "};\n"
+                            "template <class T1, class T2>\n"
+                            "struct type_equal {\n"
+                            "    enum {  value = 0   };\n"
+                            "};\n"
+                            "template <class T>\n"
+                            "struct type_equal<T, T> {\n"
+                            "    enum {  value = 1   };\n"
+                            "};\n"
+                            "template<class T>\n"
+                            "struct template_is_const\n"
+                            "{\n"
+                            "    enum {value = !type_equal<T, typename Unconst<T>::type>::value  };\n"
+                            "};\n";
+        const char exp[] = "template < class T > struct Unconst { } ; "
+                           "template < class T > struct Unconst < const T > { } ; "
+                           "template < class T > struct Unconst < const T & > { } ; "
+                           "template < class T > struct Unconst < T * const > { } ; "
+                           "template < class T1 , class T2 > struct type_equal { enum Anonymous0 { value = 0 } ; } ; "
+                           "template < class T > struct type_equal < T , T > { enum Anonymous1 { value = 1 } ; } ; "
+                           "template < class T > struct template_is_const { enum Anonymous2 { value = ! type_equal < T , Unconst < T > :: type > :: value } ; } ;";
+        ASSERT_EQUALS(exp, tok(code));
     }
 
     void template_default_parameter() {
@@ -4765,15 +4859,15 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    A<int,(int)2> a1;\n"
                                 "    A<int> a2;\n"
                                 "}\n";
-            const char expected[] = "class A<int,(int)2> ; "
+            const char expected[] = "class A<int,2> ; "
                                     "class A<int,3> ; "
                                     "void f ( ) "
                                     "{ "
-                                    "A<int,(int)2> a1 ; "
+                                    "A<int,2> a1 ; "
                                     "A<int,3> a2 ; "
                                     "} "
-                                    "class A<int,(int)2> "
-                                    "{ int ar [ ( int ) 2 ] ; } ; "
+                                    "class A<int,2> "
+                                    "{ int ar [ 2 ] ; } ; "
                                     "class A<int,3> "
                                     "{ int ar [ 3 ] ; } ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -4782,7 +4876,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "class A { }; "
                                 "template<class T> class B { }; "
                                 "template<class T1, class T2 = B<T1>> class C { }; "
-                                "template<class T1 = A, typename T2 = B<A>> class D { };";
+                                "template<class T1 = A, typename T2 = B<A>> class D { };\n";
             ASSERT_EQUALS("class A { } ; "
                           "template < class T > class B { } ; "
                           "template < class T1 , class T2 = B < T1 > > class C { } ; "
@@ -4790,9 +4884,9 @@ class TestSimplifyTemplate : public TestFixture {
         }
         {
             // #7548
-            const char code[] = "template<class T, class U> class DefaultMemory {}; "
-                                "template<class Key, class Val, class Mem=DefaultMemory<Key,Val> > class thv_table_c  {}; "
-                                "thv_table_c<void *,void *> id_table_m;";
+            const char code[] = "template<class T, class U> class DefaultMemory {};\n"
+                                "template<class Key, class Val, class Mem=DefaultMemory<Key,Val> > class thv_table_c  {};\n"
+                                "thv_table_c<void *,void *> id_table_m;\n";
             const char exp[] = "template < class T , class U > class DefaultMemory { } ; "
                                "class thv_table_c<void*,void*,DefaultMemory<void*,void*>> ; "
                                "thv_table_c<void*,void*,DefaultMemory<void*,void*>> id_table_m ; "
@@ -4807,7 +4901,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "void f() {\n"
                                 "  a<> b;\n"
                                 "  b.a<>::c();\n"
-                                "}";
+                                "}\n";
             ASSERT_EQUALS("struct a<void> ; "
                           "void f ( ) { "
                           "a<void> b ; "
@@ -4836,7 +4930,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    B b;\n"
                                 "    b.A<>::Print();\n"
                                 "    return 0;\n"
-                                "}";
+                                "}\n";
             ASSERT_EQUALS("class A<void> ; "
                           "template < typename T0 > class A ; "
                           "class A<void> { "
@@ -4916,7 +5010,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "struct ei_solve_triangular_selector<Lhs,UpLo> {\n"
                                 "};\n"
                                 "template<typename Lhs, int TriangularPart>\n"
-                                "struct ei_solve_triangular_selector { };";
+                                "struct ei_solve_triangular_selector { };\n";
 
             const char exp[] = "template < typename Lhs , int TriangularPart = ( int ( Lhs :: Flags ) & LowerTriangularBit ) > "
                                "struct ei_solve_triangular_selector ; "
@@ -4942,7 +5036,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "{\n"
                                 "  return T{};\n"
                                 "}\n"
-                                "Foo<> f;";
+                                "Foo<> f;\n";
             const char exp[] = "class Foo<128,wchar_t> ; Foo<128,wchar_t> f ; "
                                "class Foo<128,wchar_t> { public: wchar_t operator[] ( int Index ) const ; } ; "
                                "wchar_t Foo<128,wchar_t> :: operator[] ( int Index ) const { return wchar_t { } ; }";
@@ -4983,7 +5077,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "template <class T>\n"
                                 "void foo(typename T::t *)\n"
-                                "{ }";
+                                "{ }\n";
 
             // The expected result..
             const char expected[] = "template < class T > void foo ( T :: t * ) { }";
@@ -4994,7 +5088,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    x(sizeof typename);\n"
                                 "    type = 0;\n"
-                                "}";
+                                "}\n";
 
             ASSERT_EQUALS("void f ( ) { x ( sizeof ( typename ) ) ; type = 0 ; }", tok(code));
         }
@@ -5005,37 +5099,37 @@ class TestSimplifyTemplate : public TestFixture {
         //         "no constructor" false positives
         const char code[] = "class Fred {\n"
                             "    template<class T> explicit Fred(T t) { }\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("class Fred { template < class T > explicit Fred ( T t ) { } } ;", tok(code));
 
         // #3532
         const char code2[] = "class Fred {\n"
                              "    template<class T> Fred(T t) { }\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("class Fred { template < class T > Fred ( T t ) { } } ;", tok(code2));
     }
 
     void syntax_error_templates_1() {
         // ok code.. using ">" for a comparison
-        ASSERT_NO_THROW(tok("x<y>z> xyz;"));
+        ASSERT_NO_THROW(tok("x<y>z> xyz;\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code
-        ASSERT_NO_THROW(tok("template<class T> operator<(T a, T b) { }"));
+        ASSERT_NO_THROW(tok("template<class T> operator<(T a, T b) { }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #1984)
         ASSERT_NO_THROW(tok("void f(a) int a;\n"
-                            "{ ;x<y; }"));
+                            "{ ;x<y; }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #1985)
         ASSERT_NO_THROW(tok("void f()\n"
-                            "{ try { ;x<y; } }"));
+                            "{ try { ;x<y; } }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #3183)
-        ASSERT_NO_THROW(tok("MACRO(({ i < x }))"));
+        ASSERT_NO_THROW(tok("MACRO(({ i < x }))\n"));
         ASSERT_EQUALS("", errout_str());
 
         // bad code.. missing ">"
@@ -5058,7 +5152,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    }\n"
                             "private:\n"
                             "    A a;\n"
-                            "};"));
+                            "};\n"));
         ASSERT_EQUALS("", errout_str());
 
         //both of these should work but in cppcheck 2.1 only the first option will work (ticket #9843)
@@ -5076,30 +5170,30 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template_member_ptr() { // Ticket #5786 (segmentation fault)
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() const> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() volatile> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() const volatile> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
-        (void)tok("struct A {}; "
-                  "struct B { "
-                  "template <void (A::*)() volatile const> struct BB {}; "
-                  "template <bool BT> static bool foo(int) { return true; } "
-                  "void bar() { bool b = foo<true>(0); }"
-                  "};");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() const> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() volatile> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() const volatile> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
+        (void)tok("struct A {};\n"
+                  "struct B {\n"
+                  "template <void (A::*)() volatile const> struct BB {};\n"
+                  "template <bool BT> static bool foo(int) { return true; }\n"
+                  "void bar() { bool b = foo<true>(0); }\n"
+                  "};\n");
     }
 
     void template_namespace_1() {
@@ -5107,7 +5201,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "namespace {\n"
                             "  template<class T> void Fred(T value) { }\n"
                             "}\n"
-                            "Fred<int>(123);";
+                            "Fred<int>(123);\n";
         ASSERT_EQUALS("namespace { "
                       "void Fred<int> ( int value ) ; "
                       "} "
@@ -5120,7 +5214,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "namespace X {\n"
                             "  template<class T> struct S { };\n"
                             "}\n"
-                            "X::S<int> s;";
+                            "X::S<int> s;\n";
         ASSERT_EQUALS("namespace X { "
                       "struct S<int> ; "
                       "} "
@@ -5134,7 +5228,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    static void *bar();\n"
                             "  };\n"
                             "  void *test() { return foo<int>::bar(); }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("namespace test16 {"
                       " struct foo<int> ;"
                       " void * test ( ) {"
@@ -5154,7 +5248,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "      A<int>::dostuff();\n"
                             "    }\n"
                             "  };\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("namespace foo {"
                       " class A<int> ;"
                       " struct S : public A<int> {"
@@ -5168,7 +5262,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_namespace_5() {
         const char code[] = "template<class C> struct S {};\n"
-                            "namespace X { S<int> s; }";
+                            "namespace X { S<int> s; }\n";
         ASSERT_EQUALS("struct S<int> ; "
                       "namespace X { S<int> s ; } "
                       "struct S<int> { } ;", tok(code));
@@ -5189,7 +5283,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T> NS::C<T>::C() {}\n"
                             "template <typename T> NS::C<T>::~C() {}\n"
                             "template <typename T> NS::C<T>::C(const NS::C<T> &) {}\n"
-                            "template <typename T> NS::C<T> & NS::C<T>::operator=(const NS::C<T> &) {}";
+                            "template <typename T> NS::C<T> & NS::C<T>::operator=(const NS::C<T> &) {}\n";
         ASSERT_EQUALS("namespace NS { "
                       "union C<int> ; "
                       "} "
@@ -5219,7 +5313,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "N2::CT<int> ct2;\n"
                             "}\n"
                             "N1::N2::C c3;\n"
-                            "N1::N2::CT<int> ct3;";
+                            "N1::N2::CT<int> ct3;\n";
         ASSERT_EQUALS("namespace N1 { "
                       "namespace N2 { "
                       "struct C { } ; "
@@ -5254,7 +5348,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    Fred<T>::~Fred() { }\n"
                             "}\n"
                             "}\n"
-                            "NS1::NS2::Fred<int> fred;";
+                            "NS1::NS2::Fred<int> fred;\n";
         ASSERT_EQUALS("namespace NS1 { "
                       "namespace NS2 { "
                       "struct Fred<int> ; "
@@ -5310,7 +5404,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};\n"
                             "}\n"
                             "}\n"
-                            "NS1::NS2::Fred<int> fred;";
+                            "NS1::NS2::Fred<int> fred;\n";
         ASSERT_EQUALS("namespace NS1 { "
                       "namespace NS2 { "
                       "class Fred<int> ; "
@@ -5337,7 +5431,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    template< typename T > T TemplatedMethod(T);\n"
                             "};\n"
                             "template< typename T > T TestClass::TemplatedMethod(T t) { return t; }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("namespace MyNamespace { "
                       "class TestClass { "
                       "public: "
@@ -5391,7 +5485,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_pointer_type() {
         const char code[] = "template<class T> void foo(const T x) {}\n"
-                            "void bar() { foo<int*>(0); }";
+                            "void bar() { foo<int*>(0); }\n";
         ASSERT_EQUALS("void foo<int*> ( int * const x ) ; "
                       "void bar ( ) { foo<int*> ( 0 ) ; } "
                       "void foo<int*> ( int * const x ) { }", tok(code));
@@ -5405,12 +5499,12 @@ class TestSimplifyTemplate : public TestFixture {
                           "void bar() {\n"
                           "  int y[3];\n"
                           "  foo<int[]>(y);\n"
-                          "}"));
+                          "}\n"));
         ASSERT_EQUALS("struct A<int[2]> ; "
                       "A<int[2]> y ; "
                       "struct A<int[2]> { int [ 2 ] x ; } ;",
                       tok("template <class T> struct A { T x; };\n"
-                          "A<int[2]> y;"));
+                          "A<int[2]> y;\n"));
 
         // Previously resulted in:
         //   test.cpp:2:33: error: Syntax Error: AST broken, binary operator '>' doesn't have two operands. [internalAstError]
@@ -5424,16 +5518,16 @@ class TestSimplifyTemplate : public TestFixture {
                       tok("template <class  > struct A {};\n"
                           "template <class T> struct B { A<T[]> x; };\n"
                           "template <class T> struct C : B<T> {};\n"
-                          "C<B<int>> y;"));
+                          "C<B<int>> y;\n"));
     }
 
-    unsigned int templateParameters(const char code[]) {
+    template<size_t size>
+    unsigned int templateParameters(const char (&data)[size]) {
         TokenList tokenlist{settings, Standards::Language::CPP};
-        std::istringstream istr(code);
         tokenlist.appendFileIfNew("test.cpp");
-        if (!tokenlist.createTokens(istr))
+        if (!tokenlist.createTokensFromString(data))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5447,63 +5541,63 @@ class TestSimplifyTemplate : public TestFixture {
 
     void templateParameters() {
         // Test that the function TemplateSimplifier::templateParameters works
-        ASSERT_EQUALS(1U, templateParameters("X<struct C> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<union C> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<const int> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<int const *> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<const struct C> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<len>>x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<typename> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<...> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<class T...> x;")); // Invalid syntax
-        ASSERT_EQUALS(1U, templateParameters("X<class... T> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<class, typename T...> x;")); // Invalid syntax
-        ASSERT_EQUALS(2U, templateParameters("X<class, typename... T> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<int(&)(), class> x;"));
-        ASSERT_EQUALS(3U, templateParameters("X<char, int(*)(), bool> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<int...> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<class, typename...> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<1, T> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<T[]> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<T[2]> x;"));
-        ASSERT_EQUALS(1U, templateParameters("X<i == 0> x;"));
-        ASSERT_EQUALS(2U, templateParameters("X<int, i>=0> x;"));
-        ASSERT_EQUALS(3U, templateParameters("X<int, i>=0, i - 2> x;"));
-        ASSERT_EQUALS(0U, templateParameters("var1<1> x;"));
-        ASSERT_EQUALS(0U, templateParameters("X<1>2;"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...>> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...> > x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<typename>...Foo> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<typename>> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<template<typename>>> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<typename>>>> x;"));
-        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<template<typename>>>>> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<typename>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<template<typename>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<typename>>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<template<typename>>>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<template<typename>...Foo,template<template<template<typename>>>> x;"));
-        ASSERT_EQUALS(3U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>> x;"));
-        ASSERT_EQUALS(4U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>,int> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);"));
-        ASSERT_EQUALS(2U, templateParameters("template<typename c, b<(c::d), int>> void e();"));
-        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&...>> constexpr void f() {}")); // #11351
-        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&&...>> void f() {}"));
-        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args*...>> void f() {}"));
-        ASSERT_EQUALS(1U, templateParameters("S<4 < sizeof(uintptr_t)> x;"));
-        ASSERT_EQUALS(2U, templateParameters("template <typename... Ts, typename = std::enable_if_t<std::is_same<Ts..., int>::value>> void g() {}")); // #11915
-        ASSERT_EQUALS(1U, templateParameters("S<N::M<O<\"A\"_I>>> s;")); // #10837
+        ASSERT_EQUALS(1U, templateParameters("X<struct C> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<union C> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<const int> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<int const *> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<const struct C> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<len>>x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<typename> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<...> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<class T...> x;\n")); // Invalid syntax
+        ASSERT_EQUALS(1U, templateParameters("X<class... T> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<class, typename T...> x;\n")); // Invalid syntax
+        ASSERT_EQUALS(2U, templateParameters("X<class, typename... T> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<int(&)(), class> x;\n"));
+        ASSERT_EQUALS(3U, templateParameters("X<char, int(*)(), bool> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<int...> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<class, typename...> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<1, T> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<T[]> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<T[2]> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("X<i == 0> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("X<int, i>=0> x;\n"));
+        ASSERT_EQUALS(3U, templateParameters("X<int, i>=0, i - 2> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("var1<1> x;\n"));
+        ASSERT_EQUALS(0U, templateParameters("X<1>2;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...>> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename...B,typename=SameSize<B...> > x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<typename>...Foo> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<typename>> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<template<typename>>> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<typename>>>> x;\n"));
+        ASSERT_EQUALS(1U, templateParameters("template<template<template<template<template<typename>>>>> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<typename>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<template<typename>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<typename>>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<template<template<template<typename>>>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<template<typename>...Foo,template<template<template<typename>>>> x;\n"));
+        ASSERT_EQUALS(3U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>> x;\n"));
+        ASSERT_EQUALS(4U, templateParameters("template<template<typename>...Foo,int,template<template<template<typename>>>,int> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename S, enable_if_t<(is_compile_string<S>::value), int>> void i(S s);\n"));
+        ASSERT_EQUALS(2U, templateParameters("template<typename c, b<(c::d), int>> void e();\n"));
+        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&...>> constexpr void f() {}\n")); // #11351
+        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&&...>> void f() {}\n"));
+        ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args*...>> void f() {}\n"));
+        ASSERT_EQUALS(1U, templateParameters("S<4 < sizeof(uintptr_t)> x;\n"));
+        ASSERT_EQUALS(2U, templateParameters("template <typename... Ts, typename = std::enable_if_t<std::is_same<Ts..., int>::value>> void g() {}\n")); // #11915
+        ASSERT_EQUALS(1U, templateParameters("S<N::M<O<\"A\"_I>>> s;\n")); // #10837
     }
 
     // Helper function to unit test TemplateSimplifier::getTemplateNamePosition
-    int templateNamePositionHelper(const char code[], unsigned offset = 0) {
+    template<size_t size>
+    int templateNamePositionHelper(const char (&data)[size], unsigned offset = 0) {
         TokenList tokenlist{settings, Standards::Language::CPP};
 
-        std::istringstream istr(code);
         tokenlist.appendFileIfNew("test.cpp");
-        if (!tokenlist.createTokens(istr))
+        if (!tokenlist.createTokensFromString(data))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5515,66 +5609,66 @@ class TestSimplifyTemplate : public TestFixture {
 
     void templateNamePosition() {
         // Template class
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A {};", 4));
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A {};", 4));
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A : B {};", 4));
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A : B {};", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A {};\n", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A {};\n", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> class A : B {};\n", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> struct A : B {};\n", 4));
         // Template function definitions
-        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> unsigned foo() { return 0; }", 4));
-        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> unsigned* foo() { return 0; }", 4));
-        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> unsigned** foo() { return 0; }", 4));
+        ASSERT_EQUALS(2, templateNamePositionHelper("template<class T> unsigned foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> unsigned* foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> unsigned** foo() { return 0; }\n", 4));
 
-        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> const unsigned foo() { return 0; }", 4));
-        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> const unsigned& foo() { return 0; }", 4));
-        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> const unsigned** foo() { return 0; }", 4));
+        ASSERT_EQUALS(3, templateNamePositionHelper("template<class T> const unsigned foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> const unsigned& foo() { return 0; }\n", 4));
+        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> const unsigned** foo() { return 0; }\n", 4));
 
-        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> std::string foo() { static str::string str; return str; }", 4));
-        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> std::string & foo() { static str::string str; return str; }", 4));
-        ASSERT_EQUALS(6, templateNamePositionHelper("template<class T> const std::string & foo() { static str::string str; return str; }", 4));
+        ASSERT_EQUALS(4, templateNamePositionHelper("template<class T> std::string foo() { static str::string str; return str; }\n", 4));
+        ASSERT_EQUALS(5, templateNamePositionHelper("template<class T> std::string & foo() { static str::string str; return str; }\n", 4));
+        ASSERT_EQUALS(6, templateNamePositionHelper("template<class T> const std::string & foo() { static str::string str; return str; }\n", 4));
 
-        ASSERT_EQUALS(9, templateNamePositionHelper("template<class T> std::map<int, int> foo() { static std::map<int, int> m; return m; }", 4));
-        ASSERT_EQUALS(10, templateNamePositionHelper("template<class T> std::map<int, int> & foo() { static std::map<int, int> m; return m; }", 4));
-        ASSERT_EQUALS(11, templateNamePositionHelper("template<class T> const std::map<int, int> & foo() { static std::map<int, int> m; return m; }", 4));
+        ASSERT_EQUALS(9, templateNamePositionHelper("template<class T> std::map<int, int> foo() { static std::map<int, int> m; return m; }\n", 4));
+        ASSERT_EQUALS(10, templateNamePositionHelper("template<class T> std::map<int, int> & foo() { static std::map<int, int> m; return m; }\n", 4));
+        ASSERT_EQUALS(11, templateNamePositionHelper("template<class T> const std::map<int, int> & foo() { static std::map<int, int> m; return m; }\n", 4));
         // Class template members
         ASSERT_EQUALS(4, templateNamePositionHelper(
-                          "class A { template<class T> unsigned foo(); }; "
-                          "template<class T> unsigned A::foo() { return 0; }", 19));
+                          "class A { template<class T> unsigned foo(); };\n"
+                          "template<class T> unsigned A::foo() { return 0; }\n", 19));
         ASSERT_EQUALS(5, templateNamePositionHelper(
-                          "class A { template<class T> const unsigned foo(); }; "
-                          "template<class T> const unsigned A::foo() { return 0; }", 20));
+                          "class A { template<class T> const unsigned foo(); };\n"
+                          "template<class T> const unsigned A::foo() { return 0; }\n", 20));
         ASSERT_EQUALS(7, templateNamePositionHelper(
-                          "class A { class B { template<class T> const unsigned foo(); }; } ; "
-                          "template<class T> const unsigned A::B::foo() { return 0; }", 25));
+                          "class A { class B { template<class T> const unsigned foo(); }; } ;\n"
+                          "template<class T> const unsigned A::B::foo() { return 0; }\n", 25));
         ASSERT_EQUALS(8, templateNamePositionHelper(
-                          "class A { class B { template<class T> const unsigned * foo(); }; } ; "
-                          "template<class T> const unsigned * A::B::foo() { return 0; }", 26));
+                          "class A { class B { template<class T> const unsigned * foo(); }; } ;\n"
+                          "template<class T> const unsigned * A::B::foo() { return 0; }\n", 26));
         ASSERT_EQUALS(9, templateNamePositionHelper(
-                          "class A { class B { template<class T> const unsigned ** foo(); }; } ; "
-                          "template<class T> const unsigned ** A::B::foo() { return 0; }", 27));
+                          "class A { class B { template<class T> const unsigned ** foo(); }; } ;\n"
+                          "template<class T> const unsigned ** A::B::foo() { return 0; }\n", 27));
         // Template class member
         ASSERT_EQUALS(6, templateNamePositionHelper(
-                          "template<class T> class A { A(); }; "
-                          "template<class T> A<T>::A() {}", 18));
+                          "template<class T> class A { A(); };\n"
+                          "template<class T> A<T>::A() {}\n", 18));
         ASSERT_EQUALS(8, templateNamePositionHelper(
-                          "template<class T, class U> class A { A(); }; "
-                          "template<class T, class U> A<T, U>::A() {}", 24));
+                          "template<class T, class U> class A { A(); };\n"
+                          "template<class T, class U> A<T, U>::A() {}\n", 24));
         ASSERT_EQUALS(7, templateNamePositionHelper(
-                          "template<class T> class A { unsigned foo(); }; "
-                          "template<class T> unsigned A<T>::foo() { return 0; }", 19));
+                          "template<class T> class A { unsigned foo(); };\n"
+                          "template<class T> unsigned A<T>::foo() { return 0; }\n", 19));
         ASSERT_EQUALS(9, templateNamePositionHelper(
-                          "template<class T, class U> class A { unsigned foo(); }; "
-                          "template<class T, class U> unsigned A<T, U>::foo() { return 0; }", 25));
+                          "template<class T, class U> class A { unsigned foo(); };\n"
+                          "template<class T, class U> unsigned A<T, U>::foo() { return 0; }\n", 25));
         ASSERT_EQUALS(12, templateNamePositionHelper(
-                          "template<> unsigned A<int, v<char> >::foo() { return 0; }", 2));
+                          "template<> unsigned A<int, v<char> >::foo() { return 0; }\n", 2));
     }
 
     // Helper function to unit test TemplateSimplifier::findTemplateDeclarationEnd
-    bool findTemplateDeclarationEndHelper(const char code[], const char pattern[], unsigned offset = 0) {
+    template<size_t size>
+    bool findTemplateDeclarationEndHelper(const char (&data)[size], const char pattern[], unsigned offset = 0) {
         TokenList tokenlist{settings, Standards::Language::CPP};
-        std::istringstream istr(code);
-        if (!TokenListHelper::createTokens(tokenlist, istr, "test.cpp"))
+        if (!TokenListHelper::createTokensFromString(tokenlist, data, "test.cpp"))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5588,29 +5682,29 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void findTemplateDeclarationEnd() {
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> class Fred { }; int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> void Fred() { } int x;", "} int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> int Fred = 0; int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename T> constexpr auto func = [](auto x){ return T(x);}; int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>); int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){} int x;", "} int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(); int x;", "; int x ;"));
-        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(){} int x;", "} int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> class Fred { }; int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> void Fred() { } int x;\n", "} int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> int Fred = 0; int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename T> constexpr auto func = [](auto x){ return T(x);}; int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>); int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <class, class a> auto b() -> decltype(a{}.template b<void(int, int)>){} int x;\n", "} int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(); int x;\n", "; int x ;"));
+        ASSERT(findTemplateDeclarationEndHelper("template <typename... f, c<h<e<typename f::d...>>::g>> void i(){} int x;\n", "} int x ;"));
     }
 
     // Helper function to unit test TemplateSimplifier::getTemplateParametersInDeclaration
-    bool getTemplateParametersInDeclarationHelper(const char code[], const std::vector<std::string> & params) {
+    template<size_t size>
+    bool getTemplateParametersInDeclarationHelper(const char (&data)[size], const std::vector<std::string> & params) {
         TokenList tokenlist{settings, Standards::Language::CPP};
 
-        std::istringstream istr(code);
-        if (!TokenListHelper::createTokens(tokenlist, istr, "test.cpp"))
+        if (!TokenListHelper::createTokensFromString(tokenlist, data, "test.cpp"))
             return false;
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
         std::vector<const Token *> typeParametersInDeclaration;
-        TemplateSimplifier::getTemplateParametersInDeclaration(tokenizer.tokens()->tokAt(2), typeParametersInDeclaration);
+        TemplateSimplifierTest::getTemplateParametersInDeclaration(tokenizer.tokens()->tokAt(2), typeParametersInDeclaration);
 
         if (params.size() != typeParametersInDeclaration.size())
             return false;
@@ -5623,22 +5717,22 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void getTemplateParametersInDeclaration() {
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T> class Fred {};", std::vector<std::string> {"T"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int> class Fred {};", std::vector<std::string> {"T"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U> class Fred {};", std::vector<std::string> {"T","U"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U=int> class Fred {};", std::vector<std::string> {"T","U"}));
-        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int,typename U=int> class Fred {};", std::vector<std::string> {"T","U"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T> class Fred {};\n", std::vector<std::string> {"T"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int> class Fred {};\n", std::vector<std::string> {"T"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U> class Fred {};\n", std::vector<std::string> {"T","U"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T,typename U=int> class Fred {};\n", std::vector<std::string> {"T","U"}));
+        ASSERT(getTemplateParametersInDeclarationHelper("template<typename T=int,typename U=int> class Fred {};\n", std::vector<std::string> {"T","U"}));
     }
 
     void expandSpecialized1() {
-        ASSERT_EQUALS("class A<int> { } ;", tok("template<> class A<int> {};"));
-        ASSERT_EQUALS("class A<int> : public B { } ;", tok("template<> class A<int> : public B {};"));
-        ASSERT_EQUALS("class A<int> { A<int> ( ) ; ~ A<int> ( ) ; } ;", tok("template<> class A<int> { A(); ~A(); };"));
-        ASSERT_EQUALS("class A<int> { A<int> ( ) { } ~ A<int> ( ) { } } ;", tok("template<> class A<int> { A() {} ~A() {} };"));
+        ASSERT_EQUALS("class A<int> { } ;", tok("template<> class A<int> {};\n"));
+        ASSERT_EQUALS("class A<int> : public B { } ;", tok("template<> class A<int> : public B {};\n"));
+        ASSERT_EQUALS("class A<int> { A<int> ( ) ; ~ A<int> ( ) ; } ;", tok("template<> class A<int> { A(); ~A(); };\n"));
+        ASSERT_EQUALS("class A<int> { A<int> ( ) { } ~ A<int> ( ) { } } ;", tok("template<> class A<int> { A() {} ~A() {} };\n"));
         ASSERT_EQUALS("class A<int> { A<int> ( ) ; ~ A<int> ( ) ; } ; A<int> :: A<int> ( ) { } ~ A<int> :: A<int> ( ) { }",
-                      tok("template<> class A<int> { A(); ~A(); }; A<int>::A() { } ~A<int>::A() {}"));
+                      tok("template<> class A<int> { A(); ~A(); }; A<int>::A() { } ~A<int>::A() {}\n"));
         ASSERT_EQUALS("class A<int> { A<int> ( ) ; A<int> ( const A<int> & ) ; A<int> foo ( ) ; } ; A<int> :: A<int> ( ) { } A<int> :: A<int> ( const A<int> & ) { } A<int> A<int> :: foo ( ) { A<int> a ; return a ; }",
-                      tok("template<> class A<int> { A(); A(const A &) ; A foo(); }; A<int>::A() { } A<int>::A(const A &) { } A<int> A<int>::foo() { A a; return a; }"));
+                      tok("template<> class A<int> { A(); A(const A &) ; A foo(); }; A<int>::A() { } A<int>::A(const A &) { } A<int> A<int>::foo() { A a; return a; }\n"));
     }
 
     void expandSpecialized2() {
@@ -5670,7 +5764,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "   C(const C &) { }\n"
                                 "   ~C() { }\n"
                                 "   C & operator=(const C &) { return *this; }\n"
-                                "};";
+                                "};\n";
             const char expected[] = "class C<float> { "
                                     "public: "
                                     "C<float> ( ) { } "
@@ -5720,7 +5814,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "C::C() { }\n"
                                 "C::C(const C &) { }\n"
                                 "C::~C() { }\n"
-                                "C & C::operator=(const C &) { return *this; }";
+                                "C & C::operator=(const C &) { return *this; }\n";
             const char expected[] = "class C<float> { "
                                     "public: "
                                     "C<float> ( ) ; "
@@ -5742,7 +5836,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    void operator()(unsigned short) const;\n"
                             "private:\n"
                             "    std::basic_ostream<unsigned char> &outputStream_;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "struct OutputU16<unsignedchar> { "
                                 "explicit OutputU16<unsignedchar> ( std :: basic_ostream < unsigned char > & t ) : outputStream_ ( t ) { } "
                                 "void operator() ( unsigned short ) const ; "
@@ -5755,7 +5849,7 @@ class TestSimplifyTemplate : public TestFixture {
     void expandSpecialized4() {
         {
             const char code[] = "template<> class C<char> { };\n"
-                                "map<int> m;";
+                                "map<int> m;\n";
             const char expected[] = "class C<char> { } ; "
                                     "map < int > m ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -5763,7 +5857,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "template<> class C<char> { };\n"
                                 "map<int> m;\n"
-                                "C<char> c;";
+                                "C<char> c;\n";
             const char expected[] = "class C<char> { } ; "
                                     "map < int > m ; "
                                     "C<char> c ;";
@@ -5783,7 +5877,7 @@ class TestSimplifyTemplate : public TestFixture {
             const char code[] = "template<typename T> class C { };\n"
                                 "template<> class C<char> { };\n"
                                 "map<int> m;\n"
-                                "C<int> i;";
+                                "C<int> i;\n";
             const char expected[] = "class C<char> ; "
                                     "class C<int> ; "
                                     "class C<char> { } ; "
@@ -5797,7 +5891,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "template<> class C<char> { };\n"
                                 "map<int> m;\n"
                                 "C<int> i;\n"
-                                "C<char> c;";
+                                "C<char> c;\n";
             const char expected[] = "class C<char> ; "
                                     "class C<int> ; "
                                     "class C<char> { } ; "
@@ -5875,7 +5969,7 @@ class TestSimplifyTemplate : public TestFixture {
     void templateAlias3() { // #8315
         const char code[] = "template <int> struct Tag {};\n"
                             "template <int ID> using SPtr = std::shared_ptr<void(Tag<ID>)>;\n"
-                            "SPtr<0> s;";
+                            "SPtr<0> s;\n";
         const char expected[] = "struct Tag<0> ; "
                                 "std :: shared_ptr < void ( Tag<0> ) > s ; "
                                 "struct Tag<0> { } ;";
@@ -5886,7 +5980,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <class T>\n"
                             "using IntrusivePtr = boost::intrusive_ptr<T>;\n"
                             "template <class T> class Vertex { };\n"
-                            "IntrusivePtr<Vertex<int>> p;";
+                            "IntrusivePtr<Vertex<int>> p;\n";
         const char expected[] = "class Vertex<int> ; "
                                 "boost :: intrusive_ptr < Vertex<int> > p ; "
                                 "class Vertex<int> { } ;";
@@ -5897,7 +5991,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template<typename T> using A = int;\n"
                             "template<typename T> using B = T;\n"
                             "A<char> a;\n"
-                            "B<char> b;";
+                            "B<char> b;\n";
         const char expected[] = "int a ; "
                                 "char b ;";
         ASSERT_EQUALS(expected, tok(code));
@@ -5910,31 +6004,31 @@ class TestSimplifyTemplate : public TestFixture {
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        return (TemplateSimplifier::instantiateMatch)(tokenizer.tokens(), numberOfArguments, false, patternAfter);
+        return (TemplateSimplifierTest::instantiateMatch)(tokenizer.tokens(), numberOfArguments, false, patternAfter);
     }
 
     void instantiateMatchTest() {
         // Ticket #8175
         ASSERT_EQUALS(false,
-                      instantiateMatch("ConvertHelper < From, To > c ;",
+                      instantiateMatch("ConvertHelper < From, To > c ;\n",
                                        2, ":: %name% ("));
         ASSERT_EQUALS(true,
-                      instantiateMatch("ConvertHelper < From, To > :: Create ( ) ;",
+                      instantiateMatch("ConvertHelper < From, To > :: Create ( ) ;\n",
                                        2, ":: %name% ("));
         ASSERT_EQUALS(false,
-                      instantiateMatch("integral_constant < bool, sizeof ( ConvertHelper < From, To > :: Create ( ) ) > ;",
+                      instantiateMatch("integral_constant < bool, sizeof ( ConvertHelper < From, To > :: Create ( ) ) > ;\n",
                                        2, ":: %name% ("));
         ASSERT_EQUALS(false,
-                      instantiateMatch("integral_constant < bool, sizeof ( ns :: ConvertHelper < From, To > :: Create ( ) ) > ;",
+                      instantiateMatch("integral_constant < bool, sizeof ( ns :: ConvertHelper < From, To > :: Create ( ) ) > ;\n",
                                        2, ":: %name% ("));
     }
 
     void templateParameterWithoutName() {
-        ASSERT_EQUALS(1U, templateParameters("template<typename = void> struct s;"));
+        ASSERT_EQUALS(1U, templateParameters("template<typename = void> struct s;\n"));
         ASSERT_EQUALS(1U, templateParameters("template<template<typename = float> typename T> struct A {\n"
                                              "    void f();\n"
                                              "    void g();\n"
-                                             "};n"));
+                                             "};n\n"));
     }
 
     void templateTypeDeduction1() { // #8962
@@ -5963,7 +6057,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    f(L\"string\");\n"
                             "    f(true);\n"
                             "    f(false);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f<int> ( int n ) ; "
                                 "void f<unsignedint> ( unsigned int n ) ; "
                                 "void f<long> ( long n ) ; "
@@ -6027,7 +6121,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "static void func() {\n"
                             "    f(0, 0.0);\n"
                             "    f(0.0, 0);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "void f<int,double> ( int t , double u ) ; "
                                 "void f<double,int> ( double t , int u ) ; "
@@ -6056,7 +6150,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "int main() {\n"
                             "    A a;\n"
                             "    a.f();\n"
-                            "}";
+                            "}\n";
         const char exp[]  = "struct A { "
                             "int a ; a = 1 ; "
                             "void f ( ) { g<int> ( 1 ) ; } "
@@ -6073,7 +6167,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T> void f(T x, T y) { a = x + y; }\n"
-                                "void test() { f(0, 0); }";
+                                "void test() { f(0, 0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( int x , int y ) ; "
                                 "void test ( ) { f<int> ( 0 , 0 ) ; } "
@@ -6083,7 +6177,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T> void f(T x, double y) { a = x + y; }\n"
-                                "void test() { f(0, 0.0); }";
+                                "void test() { f(0, 0.0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( int x , double y ) ; "
                                 "void test ( ) { f<int> ( 0 , 0.0 ) ; } "
@@ -6093,7 +6187,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T> void f(double x, T y) { a = x + y; }\n"
-                                "void test() { f(0.0, 0); }";
+                                "void test() { f(0.0, 0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( double x , int y ) ; "
                                 "void test ( ) { f<int> ( 0.0 , 0 ) ; } "
@@ -6110,7 +6204,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "    f(0.0, 0);\n"
                                 "    f(0, 0.0);\n"
                                 "    f(0.0, 0.0);\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int> ( int x , int y ) ; "
                                 "void f<int> ( double x , int y ) ; "
@@ -6143,7 +6237,7 @@ class TestSimplifyTemplate : public TestFixture {
         {
             const char code[] = "int a = 1;\n"
                                 "template <typename T, typename U> void f(T x, U y) { a = x + y; }\n"
-                                "void test() { f(0, 0.0); }";
+                                "void test() { f(0, 0.0); }\n";
             const char exp[]  = "int a ; a = 1 ; "
                                 "void f<int,double> ( int x , double y ) ; "
                                 "void test ( ) { f<int,double> ( 0 , 0.0 ) ; } "
@@ -6164,7 +6258,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "Fred fred1 = Fred(0);\n"
                                 "Fred fred2 = Fred(0.0);\n"
                                 "Fred fred3 = Fred(\"zero\");\n"
-                                "Fred fred4 = Fred(false);";
+                                "Fred fred4 = Fred(false);\n";
             const char exp[]  = "class Fred { "
                                 "public: "
                                 "Fred<int> ( int t ) ; "
@@ -6223,26 +6317,26 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void simplifyTemplateArgs1() {
-        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 2 ) >;"));
-        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < 1 + 1 >;"));
-        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 1 + 1 ) >;"));
+        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 2 ) >;\n"));
+        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < 1 + 1 >;\n"));
+        ASSERT_EQUALS("foo<2> = 2 ; foo<2> ;", tok("template<int N> foo = N; foo < ( 1 + 1 ) >;\n"));
 
-        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 2 ), ( 2 ) >;"));
-        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < 1 + 1, 1 + 1 >;"));
-        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 1 + 1 ), ( 1 + 1 ) >;"));
+        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 2 ), ( 2 ) >;\n"));
+        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < 1 + 1, 1 + 1 >;\n"));
+        ASSERT_EQUALS("foo<2,2> = 4 ; foo<2,2> ;", tok("template<int N, int M> foo = N * M; foo < ( 1 + 1 ), ( 1 + 1 ) >;\n"));
 
-        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < true ? true : false >;"));
-        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < false ? true : false >;"));
-        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < 1 ? true : false >;"));
-        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < 0 ? true : false >;"));
-        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < (1 + 1 ) ? true : false >;"));
-        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < ( 1 - 1) ? true : false >;"));
+        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < true ? true : false >;\n"));
+        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < false ? true : false >;\n"));
+        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < 1 ? true : false >;\n"));
+        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < 0 ? true : false >;\n"));
+        ASSERT_EQUALS("foo<true> = true ; foo<true> ;", tok("template<bool N> foo = N; foo < (1 + 1 ) ? true : false >;\n"));
+        ASSERT_EQUALS("foo<false> = false ; foo<false> ;", tok("template<bool N> foo = N; foo < ( 1 - 1) ? true : false >;\n"));
     }
 
     void simplifyTemplateArgs2() {
         const char code[] = "template<bool T> struct a_t { static const bool t = T; };\n"
                             "typedef a_t<sizeof(void*) == sizeof(char)> a;\n"
-                            "void foo() { bool b = a::t; }";
+                            "void foo() { bool b = a::t; }\n";
         const char expected[] = "struct a_t<false> ; "
                                 "void foo ( ) { bool b ; b = a_t<false> :: t ; } "
                                 "struct a_t<false> { static const bool t = false ; } ;";
@@ -6280,7 +6374,7 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_variadic_1() { // #9144
         const char code[] = "template <typename...> struct e {};\n"
-                            "static_assert(sizeof(e<>) == sizeof(e<int,int>), \"\");";
+                            "static_assert(sizeof(e<>) == sizeof(e<int,int>), \"\");\n";
         const char expected[] = "struct e<> ; struct e<int,int> ; "
                                 "static_assert ( sizeof ( e<> ) == sizeof ( e<int,int> ) , \"\" ) ; "
                                 "struct e<> { } ; struct e<int,int> { } ;";
@@ -6293,7 +6387,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "\n"
                             "int main() {\n"
                             "    printf<int, float>(\"\", foo, bar);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void printf<int,float> ( const char * s , int value , float ) ; "
                                 "int main ( ) { printf<int,float> ( \"\" , foo , bar ) ; } "
                                 "void printf<int,float> ( const char * s , int value , float ) { }";
@@ -6301,17 +6395,17 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template_variadic_3() { // #6172
-        const char code[] = "template<int N, int ... M> struct A { "
-                            "  static void foo() { "
-                            "    int i = N; "
-                            "  } "
-                            "}; "
-                            "void bar() { "
-                            "  A<0>::foo(); "
-                            "}";
+        const char code[] = "template<int N, int ... M> struct A {\n"
+                            "  static void foo() {\n"
+                            "    int i = N;\n"
+                            "  }\n"
+                            "};\n"
+                            "void bar() {\n"
+                            "  A<0>::foo();\n"
+                            "}\n";
         const char expected[] = "struct A<0> ; "
                                 "void bar ( ) { A<0> :: foo ( ) ; } "
-                                "struct A<0> { static void foo ( ) { int i ; i = 0 ; } } ;";
+                                "struct A<0> { static void foo ( ) { int i ; i = ( int ) 0 ; } } ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
@@ -6328,37 +6422,63 @@ class TestSimplifyTemplate : public TestFixture {
                                 "class E<1,3> { "
                                 "template < int ... I > "
                                 "int f ( int n , std :: integer_sequence < int , I ... > ) { "
-                                "return ( ( ( I == n ) ? : 0 ) + ... ) ; "
+                                "return ( ( ( I == n ) ? ( 1 , 3 ) : 0 ) + ... ) ; "  // TODO the simplification is not quite correct
                                 "} "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
+
+        const char code2[] = "template <typename T>\n" // #13929
+                             "struct S {};\n"
+                             "template <typename T, template<typename...> typename C = S>\n"
+                             "struct A {\n"
+                             "    using x = C<T>;\n"
+                             "};\n"
+                             "A<int> a;\n";
+        const char expected2[] = "template < typename T > "
+                                 "struct S { } ; "
+                                 "struct A<int,S> ; "
+                                 "A<int,S> a ; "
+                                 "struct A<int,S> { } ;";
+        ASSERT_EQUALS(expected2, tok(code2));
+
+        const char code3[] = "template <int... N>\n" // #14477
+                             "    int f() {\n"
+                             "    return (0 | ... | (1, 2, 4));\n"
+                             "}\n"
+                             "int main() {\n"
+                             "    return f<1, 2, 4>();\n"
+                             "}\n";
+        const char expected3[] = "int f<1,2,4> ( ) ; "
+                                 "int main ( ) { return f<1,2,4> ( ) ; } "
+                                 "int f<1,2,4> ( ) { return ( 0 | ... | ( 1 , 2 , 4 ) ) ; }";
+        ASSERT_EQUALS(expected3, tok(code3));
     }
 
     void template_variable_1() {
         {
             const char code[] = "template <int N> const int foo = N*N;\n"
-                                "int x = foo<7>;";
+                                "int x = foo<7>;\n";
             const char expected[] = "const int foo<7> = 49 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template <int> const int foo = 7;\n"
-                                "int x = foo<7>;";
+                                "int x = foo<7>;\n";
             const char expected[] = "const int foo<7> = 7 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template <int N = 7> const int foo = N*N;\n"
-                                "int x = foo<7>;";
+                                "int x = foo<7>;\n";
             const char expected[] = "const int foo<7> = 49 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template <int N = 7> const int foo = N*N;\n"
-                                "int x = foo<>;";
+                                "int x = foo<>;\n";
             const char expected[] = "const int foo<7> = 49 ; "
                                     "int x ; x = foo<7> ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -6368,28 +6488,28 @@ class TestSimplifyTemplate : public TestFixture {
     void template_variable_2() {
         {
             const char code[] = "template<class T> constexpr T pi = T(3.1415926535897932385L);\n"
-                                "float x = pi<float>;";
+                                "float x = pi<float>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class> constexpr float pi = float(3.1415926535897932385L);\n"
-                                "float x = pi<float>;";
+                                "float x = pi<float>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float> constexpr T pi = T(3.1415926535897932385L);\n"
-                                "float x = pi<float>;";
+                                "float x = pi<float>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float> constexpr T pi = T(3.1415926535897932385L);\n"
-                                "float x = pi<>;";
+                                "float x = pi<>;\n";
             const char expected[] = "constexpr float pi<float> = float ( 3.1415926535897932385L ) ; "
                                     "float x ; x = pi<float> ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -6399,35 +6519,35 @@ class TestSimplifyTemplate : public TestFixture {
     void template_variable_3() {
         {
             const char code[] = "template<class T, int N> constexpr T foo = T(N*N);\n"
-                                "float x = foo<float,7>;";
+                                "float x = foo<float,7>;\n";
             const char expected[] = "constexpr float foo<float,7> = float ( 49 ) ; "
                                     "float x ; x = foo<float,7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class,int> constexpr float foo = float(7);\n"
-                                "float x = foo<float,7>;";
+                                "float x = foo<float,7>;\n";
             const char expected[] = "constexpr float foo<float,7> = float ( 7 ) ; "
                                     "float x ; x = foo<float,7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float, int N = 7> constexpr T foo = T(7);\n"
-                                "double x = foo<double, 14>;";
+                                "double x = foo<double, 14>;\n";
             const char expected[] = "constexpr double foo<double,14> = double ( 7 ) ; "
                                     "double x ; x = foo<double,14> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float, int N = 7> constexpr T foo = T(7);\n"
-                                "float x = foo<>;";
+                                "float x = foo<>;\n";
             const char expected[] = "constexpr float foo<float,7> = float ( 7 ) ; "
                                     "float x ; x = foo<float,7> ;";
             ASSERT_EQUALS(expected, tok(code));
         }
         {
             const char code[] = "template<class T = float, int N = 7> constexpr T foo = T(7);\n"
-                                "double x = foo<double>;";
+                                "double x = foo<double>;\n";
             const char expected[] = "constexpr double foo<double,7> = double ( 7 ) ; "
                                     "double x ; x = foo<double,7> ;";
             ASSERT_EQUALS(expected, tok(code));
@@ -6437,7 +6557,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template_variable_4() {
         const char code[] = "template<typename T> void test() { }\n"
                             "template<typename T> decltype(test<T>)* foo = &(test<T>);\n"
-                            "void bar() { foo<int>(); }";
+                            "void bar() { foo<int>(); }\n";
         const char expected[] = "void test<int> ( ) ; "
                                 "decltype ( test<int> ) * foo<int> = & ( test<int> ) ; "
                                 "void bar ( ) { foo<int> ( ) ; } "
@@ -6456,7 +6576,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "type<decltype(0ULL)> ull;\n"
                             "type<decltype(0.0)> d;\n"
                             "type<decltype(0.0F)> f;\n"
-                            "type<decltype(0.0L)> ld;";
+                            "type<decltype(0.0L)> ld;\n";
         const char expected[] = "class type<bool> ; "
                                 "class type<int> ; "
                                 "class type<unsignedint> ; "
@@ -6495,7 +6615,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename TC> class Base {};\n"
                             "template <typename TC> class Derived : private Base<TC> {};\n"
                             "typedef Derived<C<static_cast<int>(-1)> > C_;\n"
-                            "class C3 { C_ c; };";
+                            "class C3 { C_ c; };\n";
         const char expected[] = "template < int N > class C { } ; "
                                 "class Base<C<static_cast<int>(-1)>> ; "
                                 "class Derived<C<static_cast<int>(-1)>> ; "
@@ -6507,63 +6627,63 @@ class TestSimplifyTemplate : public TestFixture {
 
     void fold_expression_1() {
         const char code[] = "template<typename... Args> bool all(Args... args) { return (... && args); }\n"
-                            "x=all(true,false,true,true);";
+                            "x=all(true,false,true,true);\n";
         const char expected[] = "template < typename ... Args > bool all ( Args ... args ) { return ( __cppcheck_fold_&&__ ( args ... ) ) ; } x = all ( true , false , true , true ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void fold_expression_2() {
         const char code[] = "template<typename... Args> bool all(Args... args) { return (args && ...); }\n"
-                            "x=all(true,false,true,true);";
+                            "x=all(true,false,true,true);\n";
         const char expected[] = "template < typename ... Args > bool all ( Args ... args ) { return ( __cppcheck_fold_&&__ ( args ... ) ) ; } x = all ( true , false , true , true ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void fold_expression_3() {
         const char code[] = "template<typename... Args> int foo(Args... args) { return (12 * ... * args); }\n"
-                            "x=foo(1,2);";
+                            "x=foo(1,2);\n";
         const char expected[] = "template < typename ... Args > int foo ( Args ... args ) { return ( __cppcheck_fold_*__ ( args ... ) ) ; } x = foo ( 1 , 2 ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void fold_expression_4() {
         const char code[] = "template<typename... Args> int foo(Args... args) { return (args * ... * 123); }\n"
-                            "x=foo(1,2);";
+                            "x=foo(1,2);\n";
         const char expected[] = "template < typename ... Args > int foo ( Args ... args ) { return ( __cppcheck_fold_*__ ( args ... ) ) ; } x = foo ( 1 , 2 ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void concepts1() {
         const char code[] = "template <my_concept T> void f(T v) {}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires1() {
         const char code[] = "template <class T> requires my_concept<T> void f(T v) {}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires2() {
         const char code[] = "template<class T> requires (sizeof(T) > 1 && get_value<T>()) void f(T v){}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires3() {
         const char code[] = "template<class T> requires c1<T> && c2<T> void f(T v){}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void requires4() {
         const char code[] = "template <class T> void f(T v) requires my_concept<T> {}\n"
-                            "f<int>(123);";
+                            "f<int>(123);\n";
         const char expected[] = "void f<int> ( int v ) ; f<int> ( 123 ) ; void f<int> ( int v ) { }";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -6572,20 +6692,86 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "template <class T>\n"
                             "  requires requires (T x) { x + x; }\n"
                             "  T add(T a, T b) { return a + b; }\n"
-                            "add<int>(123,456);";
+                            "add<int>(123,456);\n";
         const char expected[] = "int add<int> ( int a , int b ) ; add<int> ( 123 , 456 ) ; int add<int> ( int a , int b ) { return a + b ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
+    void requires6() {
+        const char code[] = "template <int N>\n" // #14982
+                            "struct S {\n"
+                            "  static void f() noexcept\n"
+                            "    requires(N >= 5) {}\n"
+                            "  void g() const\n"
+                            "    requires(N >= 5) {}\n"
+                            "};";
+        const char expected[] = "template < int N > "
+                                "struct S { "
+                                "static void f ( ) noexcept { } "
+                                "void g ( ) const { } "
+                                "} ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void explicitBool1() {
-        const char code[] = "class Fred { explicit(true) Fred(int); };";
+        const char code[] = "class Fred { explicit(true) Fred(int); };\n";
         ASSERT_EQUALS("class Fred { explicit Fred ( int ) ; } ;", tok(code));
     }
 
     void explicitBool2() {
-        const char code[] = "class Fred { explicit(false) Fred(int); };";
+        const char code[] = "class Fred { explicit(false) Fred(int); };\n";
         ASSERT_EQUALS("class Fred { Fred ( int ) ; } ;", tok(code));
     }
+
+    void templateArgPreserveType() { // #13882 - type of template argument
+        const char code[] = "template <uint32_t x> class Test {\n"
+                            "    uint32_t i = x;\n"
+                            "};\n"
+                            "Test<64> test;\n";
+        ASSERT_EQUALS("class Test<64> ; "
+                      "Test<64> test ; "
+                      "class Test<64> { uint32_t i ; i = ( uint32_t ) 64 ; } ;",
+                      tok(code));
+    }
+
+    void template_shift_negative() {
+        // a large hex literal is not negative as a string but parses to a negative
+        // bigint, so folding the shift in simplifyNumericCalculations would left-shift
+        // a negative value / shift by a negative count, both UB. the operand must be
+        // returned unchanged. parentheses are needed so the numeric folding is reached.
+        const char code[] = "template <long long> struct S { };\n"
+                            "S<(0x8000000000000000 << 1)> s1;\n"
+                            "S<(1 << 0x8000000000000000)> s2;\n"
+                            "S<(1 >> 0x8000000000000000)> s3;\n";
+        const char expected[] = "struct S<9223372036854775808U> ; struct S<1> ; "
+                                "S<9223372036854775808U> s1 ; S<1> s2 ; S<1> s3 ; "
+                                "struct S<9223372036854775808U> { } ; struct S<1> { } ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
+    void dumpTemplateArgFrom() {
+        const char code[] = "template<class T> void foo(T t) {}\n"
+                            "foo<int>(23);\n";
+        const std::string d = dump(code);
+        ASSERT(!d.empty());
+
+        // Assert that first 'int' token has templateArg location info
+        const std::string::size_type strpos1 = d.find(" str=\"int\" ");
+        ASSERT(strpos1 < d.size());
+        const std::string::size_type endpos1 = d.find('>', strpos1);
+        const std::string::size_type templateArgPos1 = d.find(" templateArgFileIndex=\"0\" templateArgLineNumber=\"2\" templateArgColumn=\"5\"");
+        ASSERT(templateArgPos1 > strpos1 && templateArgPos1 < endpos1);
+
+        // Assert that second 'int' token has templateArg location info
+        const std::string::size_type strpos2 = d.find(" str=\"int\" ", endpos1);
+        ASSERT(strpos2 < d.size());
+        const std::string::size_type endpos2 = d.find('>', strpos2);
+        const std::string::size_type templateArgPos2 = d.find(" templateArgFileIndex=\"0\" templateArgLineNumber=\"2\" templateArgColumn=\"5\"", endpos1);
+        ASSERT(templateArgPos2 > strpos2 && templateArgPos2 < endpos2);
+
+        // Assert there is no further unexpected templateArg location info
+        ASSERT(d.find(" templateArg", endpos2) == std::string::npos);
+    }
 };
 
 REGISTER_TEST(TestSimplifyTemplate)
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index 065b8184425..8d941c06464 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,6 +39,7 @@ class TestSimplifyTokens : public TestFixture {
     const Settings settings_windows = settingsBuilder().library("windows.cfg").severity(Severity::portability).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(combine_strings);
         TEST_CASE(combine_wstrings);
         TEST_CASE(combine_ustrings);
@@ -165,7 +166,6 @@ class TestSimplifyTokens : public TestFixture {
 
     struct TokOptions
     {
-        TokOptions() = default;
         bool cpp = true;
         Platform::Type type = Platform::Type::Native;
     };
@@ -183,7 +183,6 @@ class TestSimplifyTokens : public TestFixture {
 
     struct TokenizeAndStringifyOptions
     {
-        TokenizeAndStringifyOptions() = default;
         Platform::Type platform = Platform::Type::Native;
         bool cpp = true;
     };
@@ -209,7 +208,7 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // result..
-        return tokenizer.tokens()->stringifyList(true);
+        return tokenizer.tokens()->stringifyList(true, false, true, true, true);
     }
 
 
@@ -233,10 +232,10 @@ class TestSimplifyTokens : public TestFixture {
                              "}\n";
         ASSERT_EQUALS(tok(code2), tok(code1));
 
-        const char code3[] = "x = L\"1\" TEXT(\"2\") L\"3\";";
+        const char code3[] = "x = L\"1\" TEXT(\"2\") L\"3\";\n";
         ASSERT_EQUALS("x = L\"123\" ;", tok(code3, dinit(TokOptions, $.type = Platform::Type::Win64)));
 
-        const char code4[] = "x = TEXT(\"1\") L\"2\";";
+        const char code4[] = "x = TEXT(\"1\") L\"2\";\n";
         ASSERT_EQUALS("x = L\"1\" L\"2\" ;", tok(code4, dinit(TokOptions, $.type = Platform::Type::Win64)));
     }
 
@@ -252,7 +251,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_ustrings() {
-        const char code[] =  "abcd = u\"ab\" u\"cd\";";
+        const char code[] =  "abcd = u\"ab\" u\"cd\";\n";
 
         const char expected[] =  "abcd = u\"abcd\" ;";
 
@@ -263,7 +262,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_Ustrings() {
-        const char code[] =  "abcd = U\"ab\" U\"cd\";";
+        const char code[] =  "abcd = U\"ab\" U\"cd\";\n";
 
         const char expected[] =  "abcd = U\"abcd\" ;";
 
@@ -274,7 +273,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_u8strings() {
-        const char code[] =  "abcd = u8\"ab\" u8\"cd\";";
+        const char code[] =  "abcd = u8\"ab\" u8\"cd\";\n";
 
         const char expected[] =  "abcd = u8\"abcd\" ;";
 
@@ -285,7 +284,7 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void combine_mixedstrings() {
-        const char code[] = "abcdef = \"ab\" L\"cd\" \"ef\";";
+        const char code[] = "abcdef = \"ab\" L\"cd\" \"ef\";\n";
 
         const char expected[] =  "abcdef = L\"abcdef\" ;";
 
@@ -463,24 +462,25 @@ class TestSimplifyTokens : public TestFixture {
 
 
     void declareVar() {
-        const char code[] = "void f ( ) { char str [ 100 ] = \"100\" ; }";
-        ASSERT_EQUALS(code, tok(code));
+        const char code[] = "void f ( ) { char str [ 100 ] = \"100\" ; }\n";
+        const char expected[] = "void f ( ) { char str [ 100 ] = \"100\" ; }";
+        ASSERT_EQUALS(expected, tok(code));
     }
 
     void declareArray() {
-        const char code1[] = "void f ( ) { char str [ ] = \"100\" ; }";
+        const char code1[] = "void f ( ) { char str [ ] = \"100\" ; }\n";
         const char expected1[] = "void f ( ) { char str [ 4 ] = \"100\" ; }";
         ASSERT_EQUALS(expected1, tok(code1));
 
-        const char code2[] = "char str [ ] = \"\\x00\";";
+        const char code2[] = "char str [ ] = \"\\x00\";\n";
         const char expected2[] = "char str [ 2 ] = \"\\0\" ;";
         ASSERT_EQUALS(expected2, tok(code2));
 
-        const char code3[] = "char str [ ] = \"\\0\";";
+        const char code3[] = "char str [ ] = \"\\0\";\n";
         const char expected3[] = "char str [ 2 ] = \"\\0\" ;";
         ASSERT_EQUALS(expected3, tok(code3));
 
-        const char code4[] = "char str [ ] = \"\\n\\n\";";
+        const char code4[] = "char str [ ] = \"\\n\\n\";\n";
         const char expected4[] = "char str [ 3 ] = \"\\n\\n\" ;";
         ASSERT_EQUALS(expected4, tok(code4));
     }
@@ -513,11 +513,11 @@ class TestSimplifyTokens : public TestFixture {
 
 
     void elseif1() {
-        const char code[] = "void f(){ if(x) {} else if(ab) { cd } else { ef }gh; }";
+        const char code[] = "void f(){ if(x) {} else if(ab) { cd } else { ef }gh; }\n";
         ASSERT_EQUALS("\n\n##file 0\n1: void f ( ) { if ( x ) { } else { if ( ab ) { cd } else { ef } } gh ; }\n", tokenizeDebugListing(code));
 
         // syntax error: assert there is no segmentation fault
-        ASSERT_EQUALS("\n\n##file 0\n1: void f ( ) { if ( x ) { } else { if ( x ) { } } }\n", tokenizeDebugListing("void f(){ if(x) {} else if (x) { } }"));
+        ASSERT_EQUALS("\n\n##file 0\n1: void f ( ) { if ( x ) { } else { if ( x ) { } } }\n", tokenizeDebugListing("void f(){ if(x) {} else if (x) { } }\n"));
 
         {
             const char src[] =  "void f(int g,int f) {\n"
@@ -528,7 +528,7 @@ class TestSimplifyTokens : public TestFixture {
                                " else if( f==1)\n"
                                "  goo();\n"
                                "}\n"
-                               "}";
+                               "}\n";
 
             const char expected[] = "void f ( int g , int f ) "
                                     "{ "
@@ -545,23 +545,23 @@ class TestSimplifyTokens : public TestFixture {
                                     "} "
                                     "} "
                                     "} "
-                                    "}";
+                                    "}\n";
             ASSERT_EQUALS(tok(expected), tok(src));
         }
 
         // Ticket #6860 - lambdas
         {
-            const char src[] = "( []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() );";
+            const char src[] = "( []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() );\n";
             const char expected[] = "\n\n##file 0\n1: ( [ ] { if ( ab ) { cd } else { if ( ef ) { gh } else { ij } } kl } ( ) ) ;\n";
             ASSERT_EQUALS(expected, tokenizeDebugListing(src));
         }
         {
-            const char src[] = "[ []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() ];";
+            const char src[] = "[ []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() ];\n";
             const char expected[] = "\n\n##file 0\n1: [ [ ] { if ( ab ) { cd } else { if ( ef ) { gh } else { ij } } kl } ( ) ] ;\n";
             ASSERT_EQUALS(expected, tokenizeDebugListing(src));
         }
         {
-            const char src[] = "= { []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() }";
+            const char src[] = "= { []{if (ab) {cd}else if(ef) { gh } else { ij }kl}() }\n";
             const char expected[] = "\n\n##file 0\n1: = { [ ] { if ( ab ) { cd } else { if ( ef ) { gh } else { ij } } kl } ( ) }\n";
             ASSERT_EQUALS(expected, tokenizeDebugListing(src));
         }
@@ -570,19 +570,19 @@ class TestSimplifyTokens : public TestFixture {
 
     void namespaces() {
         {
-            const char code[] = "namespace std { }";
+            const char code[] = "namespace std { }\n";
 
             ASSERT_EQUALS(";", tok(code));
         }
 
         {
-            const char code[] = "; namespace std { }";
+            const char code[] = "; namespace std { }\n";
 
             ASSERT_EQUALS(";", tok(code));
         }
 
         {
-            const char code[] = "using namespace std; namespace a{ namespace b{ void f(){} } }";
+            const char code[] = "using namespace std; namespace a{ namespace b{ void f(){} } }\n";
 
             const char expected[] = "namespace a { namespace b { void f ( ) { } } }";
 
@@ -590,7 +590,7 @@ class TestSimplifyTokens : public TestFixture {
         }
 
         {
-            const char code[] = "namespace b{ void f(){} }";
+            const char code[] = "namespace b{ void f(){} }\n";
 
             const char expected[] = "namespace b { void f ( ) { } }";
 
@@ -598,78 +598,78 @@ class TestSimplifyTokens : public TestFixture {
         }
 
         {
-            const char code[] = "void f(int namespace) { }";
+            const char code[] = "void f(int namespace) { }\n";
 
             ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
         }
     }
 
     void not1() {
-        ASSERT_EQUALS("void f ( ) { if ( ! p ) { ; } }", tok("void f() { if (not p); }", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }", tok("void f() { if (p && not q); }", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { a = ! ( p && q ) ; }", tok("void f() { a = not(p && q); }", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! p ) { ; } }", tok("void f() { if (not p); }\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }", tok("void f() { if (p && not q); }\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { a = ! ( p && q ) ; }", tok("void f() { a = not(p && q); }\n", dinit(TokOptions, $.cpp = false)));
         // Don't simplify 'not' or 'compl' if they are defined as a type;
         // in variable declaration and in function declaration/definition
-        ASSERT_EQUALS("struct not { int x ; } ;", tok("struct not { int x; };", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void f ( ) { not p ; compl c ; }", tok(" void f() { not p; compl c; }", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( not i ) ;", tok("void foo(not i);", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int foo ( not i ) { return g ( i ) ; }", tok("int foo(not i) { return g(i); }", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("struct not { int x ; } ;", tok("struct not { int x; };\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { not p ; compl c ; }", tok(" void f() { not p; compl c; }\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( not i ) ;", tok("void foo(not i);\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int foo ( not i ) { return g ( i ) ; }", tok("int foo(not i) { return g(i); }\n", dinit(TokOptions, $.cpp = false)));
     }
 
     void and1() {
         ASSERT_EQUALS("void f ( ) { if ( p && q ) { ; } }",
-                      tok("void f() { if (p and q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p and q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && q ) { ; } }",
-                      tok("void f() { if (foo() and q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() and q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() and bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() and bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p && bar ( ) ) { ; } }",
-                      tok("void f() { if (p and bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p and bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }",
-                      tok("void f() { if (p and not q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p and not q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = a && b ; }",
-                      tok("void f() { r = a and b; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = a and b; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = ( a || b ) && ( c || d ) ; }",
-                      tok("void f() { r = (a || b) and (c || d); }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = (a || b) and (c || d); }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( test1 [ i ] == 'A' && test2 [ i ] == 'C' ) { } }",
-                      tok("void f() { if (test1[i] == 'A' and test2[i] == 'C') {} }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (test1[i] == 'A' and test2[i] == 'C') {} }\n", dinit(TokOptions, $.cpp = false)));
     }
 
     void or1() {
         ASSERT_EQUALS("void f ( ) { if ( p || q ) { ; } }",
-                      tok("void f() { if (p or q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p or q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || q ) { ; } }",
-                      tok("void f() { if (foo() or q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() or q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() or bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (foo() or bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p || bar ( ) ) { ; } }",
-                      tok("void f() { if (p or bar()) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p or bar()) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p || ! q ) { ; } }",
-                      tok("void f() { if (p or not q) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { if (p or not q) ; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = a || b ; }",
-                      tok("void f() { r = a or b; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = a or b; }\n", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = ( a && b ) || ( c && d ) ; }",
-                      tok("void f() { r = (a && b) or (c && d); }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { r = (a && b) or (c && d); }\n", dinit(TokOptions, $.cpp = false)));
     }
 
     void cAlternativeTokens() {
         ASSERT_EQUALS("void f ( ) { err |= ( ( r & s ) && ! t ) ; }",
-                      tok("void f() { err or_eq ((r bitand s) and not t); }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() { err or_eq ((r bitand s) and not t); }\n", dinit(TokOptions, $.cpp = false)));
         ASSERT_EQUALS("void f ( ) const { r = f ( a [ 4 ] | 0x0F , ~ c , ! d ) ; }",
-                      tok("void f() const { r = f(a[4] bitor 0x0F, compl c, not d) ; }", dinit(TokOptions, $.cpp = false)));
+                      tok("void f() const { r = f(a[4] bitor 0x0F, compl c, not d) ; }\n", dinit(TokOptions, $.cpp = false)));
 
     }
 
@@ -790,8 +790,9 @@ class TestSimplifyTokens : public TestFixture {
 
         {
             // #4786 - don't replace , with ; in ".. : public B, C .." code
-            const char code[] = "template < class T = X > class A : public B , C { } ;";
-            ASSERT_EQUALS(code, tok(code));
+            const char code[] = "template < class T = X > class A : public B , C { } ;\n";
+            const char expected[] = "template < class T = X > class A : public B , C { } ;";
+            ASSERT_EQUALS(expected, tok(code));
         }
     }
 
@@ -829,12 +830,12 @@ class TestSimplifyTokens : public TestFixture {
                           "};\n"
                           "TClass::TClass(const TClass &other) {\n"
                           "    operator=(other);\n"
-                          "}"));
+                          "}\n"));
     }
 
     void simplifyArrayAccessSyntax() {
         ASSERT_EQUALS("\n\n##file 0\n"
-                      "1: int a@1 ; a@1 [ 13 ] ;\n", tokenizeDebugListing("int a; 13[a];"));
+                      "1: int a@1 ; a@1 [ 13 ] ;\n", tokenizeDebugListing("int a; 13[a];\n"));
     }
 
 
@@ -894,282 +895,282 @@ class TestSimplifyTokens : public TestFixture {
 
     void simplifyStructDecl1() {
         {
-            const char code[] = "struct ABC { } abc;";
+            const char code[] = "struct ABC { } abc;\n";
             const char expected[] = "struct ABC { } ; struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } * pabc;";
+            const char code[] = "struct ABC { } * pabc;\n";
             const char expected[] = "struct ABC { } ; struct ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } abc[4];";
+            const char code[] = "struct ABC { } abc[4];\n";
             const char expected[] = "struct ABC { } ; struct ABC abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } abc, def;";
+            const char code[] = "struct ABC { } abc, def;\n";
             const char expected[] = "struct ABC { } ; struct ABC abc ; struct ABC def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { } abc, * pabc;";
+            const char code[] = "struct ABC { } abc, * pabc;\n";
             const char expected[] = "struct ABC { } ; struct ABC abc ; struct ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { struct DEF {} def; } abc;";
+            const char code[] = "struct ABC { struct DEF {} def; } abc;\n";
             const char expected[] = "struct ABC { struct DEF { } ; struct DEF def ; } ; struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc;";
+            const char code[] = "struct { } abc;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } * pabc;";
+            const char code[] = "struct { } * pabc;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc[4];";
+            const char code[] = "struct { } abc[4];\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct {int a;} const array[3] = {0};";
+            const char code[] = "struct {int a;} const array[3] = {0};\n";
             const char expected[] = "struct Anonymous0 { int a ; } ; struct Anonymous0 const array [ 3 ] = { 0 } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "static struct {int a;} const array[3] = {0};";
+            const char code[] = "static struct {int a;} const array[3] = {0};\n";
             const char expected[] = "struct Anonymous0 { int a ; } ; static struct Anonymous0 const array [ 3 ] = { 0 } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc, def;";
+            const char code[] = "struct { } abc, def;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc ; struct Anonymous0 def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { } abc, * pabc;";
+            const char code[] = "struct { } abc, * pabc;\n";
             const char expected[] = "struct Anonymous0 { } ; struct Anonymous0 abc ; struct Anonymous0 * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { struct DEF {} def; } abc;";
+            const char code[] = "struct { struct DEF {} def; } abc;\n";
             const char expected[] = "struct Anonymous0 { struct DEF { } ; struct DEF def ; } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { struct {} def; } abc;";
+            const char code[] = "struct ABC { struct {} def; } abc;\n";
             const char expected[] = "struct ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ; struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { struct {} def; } abc;";
+            const char code[] = "struct { struct {} def; } abc;\n";
             const char expected[] = "struct Anonymous0 { struct Anonymous1 { } ; struct Anonymous1 def ; } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "union ABC { int i; float f; } abc;";
+            const char code[] = "union ABC { int i; float f; } abc;\n";
             const char expected[] = "union ABC { int i ; float f ; } ; union ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC { struct {} def; };";
+            const char code[] = "struct ABC { struct {} def; };\n";
             const char expected[] = "struct ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct ABC : public XYZ { struct {} def; };";
+            const char code[] = "struct ABC : public XYZ { struct {} def; };\n";
             const char expected[] = "struct ABC : public XYZ { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { int x; }; int y;";
+            const char code[] = "struct { int x; }; int y;\n";
             const char expected[] = "int x ; int y ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { int x; };";
+            const char code[] = "struct { int x; };\n";
             const char expected[] = "int x ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { };";
+            const char code[] = "struct { };\n";
             const char expected[] = ";";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { struct { struct { } ; } ; };";
+            const char code[] = "struct { struct { struct { } ; } ; };\n";
             const char expected[] = ";";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         // ticket 2464
         {
-            const char code[] = "static struct ABC { } abc ;";
+            const char code[] = "static struct ABC { } abc ;\n";
             const char expected[] = "struct ABC { } ; static struct ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         // ticket #980
         {
-            const char code[] = "void f() { int A(1),B(2),C=3,D,E(5),F=6; }";
+            const char code[] = "void f() { int A(1),B(2),C=3,D,E(5),F=6; }\n";
             const char expected[] = "void f ( ) { int A ( 1 ) ; int B ( 2 ) ; int C ; C = 3 ; int D ; int E ( 5 ) ; int F ; F = 6 ; }";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         // ticket #8284
         {
-            const char code[] = "void f() { class : foo<int> { } abc; }";
+            const char code[] = "void f() { class : foo<int> { } abc; }\n";
             const char expected[] = "void f ( ) { class Anonymous0 : foo < int > { } ; Anonymous0 abc ; }";
             ASSERT_EQUALS(expected, tok(code));
         }
     }
 
     void simplifyStructDecl2() { // ticket #2479 (segmentation fault)
-        const char code[] = "struct { char c; }";
+        const char code[] = "struct { char c; }\n";
         const char expected[] = "struct { char c ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void simplifyStructDecl3() {
         {
-            const char code[] = "class ABC { } abc;";
+            const char code[] = "class ABC { } abc;\n";
             const char expected[] = "class ABC { } ; ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } * pabc;";
+            const char code[] = "class ABC { } * pabc;\n";
             const char expected[] = "class ABC { } ; ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } abc[4];";
+            const char code[] = "class ABC { } abc[4];\n";
             const char expected[] = "class ABC { } ; ABC abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } abc, def;";
+            const char code[] = "class ABC { } abc, def;\n";
             const char expected[] = "class ABC { } ; ABC abc ; ABC def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { } abc, * pabc;";
+            const char code[] = "class ABC { } abc, * pabc;\n";
             const char expected[] = "class ABC { } ; ABC abc ; ABC * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { class DEF {} def; } abc;";
+            const char code[] = "class ABC { class DEF {} def; } abc;\n";
             const char expected[] = "class ABC { class DEF { } ; DEF def ; } ; ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc;";
+            const char code[] = "class { } abc;\n";
             const char expected[] = "class { } abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } * pabc;";
+            const char code[] = "class { } * pabc;\n";
             const char expected[] = "class { } * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc[4];";
+            const char code[] = "class { } abc[4];\n";
             const char expected[] = "class { } abc [ 4 ] ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc, def;";
+            const char code[] = "class { } abc, def;\n";
             const char expected[] = "class { } abc , def ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { } abc, * pabc;";
+            const char code[] = "class { } abc, * pabc;\n";
             const char expected[] = "class { } abc , * pabc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "struct { class DEF {} def; } abc;";
+            const char code[] = "struct { class DEF {} def; } abc;\n";
             const char expected[] = "struct Anonymous0 { class DEF { } ; DEF def ; } ; struct Anonymous0 abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { struct {} def; } abc;";
+            const char code[] = "class ABC { struct {} def; } abc;\n";
             const char expected[] = "class ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ; ABC abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { class {} def; } abc;";
+            const char code[] = "class { class {} def; } abc;\n";
             const char expected[] = "class { class { } def ; } abc ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC { struct {} def; };";
+            const char code[] = "class ABC { struct {} def; };\n";
             const char expected[] = "class ABC { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class ABC : public XYZ { struct {} def; };";
+            const char code[] = "class ABC : public XYZ { struct {} def; };\n";
             const char expected[] = "class ABC : public XYZ { struct Anonymous0 { } ; struct Anonymous0 def ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { int x; }; int y;";
+            const char code[] = "class { int x; }; int y;\n";
             const char expected[] = "class { int x ; } ; int y ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { int x; };";
+            const char code[] = "class { int x; };\n";
             const char expected[] = "class { int x ; } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
 
         {
-            const char code[] = "class { };";
+            const char code[] = "class { };\n";
             const char expected[] = "class { } ;";
             ASSERT_EQUALS(expected, tok(code));
         }
@@ -1208,28 +1209,28 @@ class TestSimplifyTokens : public TestFixture {
                       "} ; struct A arrays ; arrays = { { 0 } } ;",
                       tok("struct A {\n"
                           "    char integers[X];\n"
-                          "} arrays = {{0}};"));
+                          "} arrays = {{0}};\n"));
     }
 
     void simplifyStructDecl7() {
         ASSERT_EQUALS("struct Anonymous0 { char x ; } ; struct Anonymous0 a [ 2 ] ;",
-                      tok("struct { char x; } a[2];"));
+                      tok("struct { char x; } a[2];\n"));
         ASSERT_EQUALS("struct Anonymous0 { char x ; } ; static struct Anonymous0 a [ 2 ] ;",
-                      tok("static struct { char x; } a[2];"));
+                      tok("static struct { char x; } a[2];\n"));
     }
 
     void simplifyStructDecl8() {
-        ASSERT_EQUALS("enum A { x , y , z } ; enum A a ; a = x ;", tok("enum A { x, y, z } a(x);"));
-        ASSERT_EQUALS("enum B { x , y , z } ; enum B b ; b = x ;", tok("enum B { x , y, z } b{x};"));
-        ASSERT_EQUALS("struct C { int i ; } ; struct C c ; c = C { 0 } ;", tok("struct C { int i; } c{0};"));
-        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 d ; d = x ;", tok("enum { x, y, z } d(x);"));
-        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 e ; e = x ;", tok("enum { x, y, z } e{x};"));
-        ASSERT_EQUALS("struct Anonymous0 { int i ; } ; struct Anonymous0 f ; f = Anonymous0 { 0 } ;", tok("struct { int i; } f{0};"));
-        ASSERT_EQUALS("struct Anonymous0 { } ; struct Anonymous0 x ; x = { 0 } ;", tok("struct {} x = {0};"));
-        ASSERT_EQUALS("enum G : short { x , y , z } ; enum G g ; g = x ;", tok("enum G : short { x, y, z } g(x);"));
-        ASSERT_EQUALS("enum H : short { x , y , z } ; enum H h ; h = x ;", tok("enum H : short { x, y, z } h{x};"));
-        ASSERT_EQUALS("enum class I : short { x , y , z } ; enum I i ; i = x ;", tok("enum class I : short { x, y, z } i(x);"));
-        ASSERT_EQUALS("enum class J : short { x , y , z } ; enum J j ; j = x ;", tok("enum class J : short { x, y, z } j{x};"));
+        ASSERT_EQUALS("enum A { x , y , z } ; enum A a ; a = x ;", tok("enum A { x, y, z } a(x);\n"));
+        ASSERT_EQUALS("enum B { x , y , z } ; enum B b ; b = x ;", tok("enum B { x , y, z } b{x};\n"));
+        ASSERT_EQUALS("struct C { int i ; } ; struct C c ; c = C { 0 } ;", tok("struct C { int i; } c{0};\n"));
+        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 d ; d = x ;", tok("enum { x, y, z } d(x);\n"));
+        ASSERT_EQUALS("enum Anonymous0 { x , y , z } ; enum Anonymous0 e ; e = x ;", tok("enum { x, y, z } e{x};\n"));
+        ASSERT_EQUALS("struct Anonymous0 { int i ; } ; struct Anonymous0 f ; f = Anonymous0 { 0 } ;", tok("struct { int i; } f{0};\n"));
+        ASSERT_EQUALS("struct Anonymous0 { } ; struct Anonymous0 x ; x = { 0 } ;", tok("struct {} x = {0};\n"));
+        ASSERT_EQUALS("enum G : short { x , y , z } ; enum G g ; g = x ;", tok("enum G : short { x, y, z } g(x);\n"));
+        ASSERT_EQUALS("enum H : short { x , y , z } ; enum H h ; h = x ;", tok("enum H : short { x, y, z } h{x};\n"));
+        ASSERT_EQUALS("enum class I : short { x , y , z } ; enum I i ; i = x ;", tok("enum class I : short { x, y, z } i(x);\n"));
+        ASSERT_EQUALS("enum class J : short { x , y , z } ; enum J j ; j = x ;", tok("enum class J : short { x, y, z } j{x};\n"));
     }
 
     void simplifyStructDecl9() {
@@ -1290,74 +1291,74 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void removeUnwantedKeywords() {
-        ASSERT_EQUALS("int var ;", tok("register int var ;"));
-        ASSERT_EQUALS("short var ;", tok("register short int var ;"));
-        ASSERT_EQUALS("int foo ( ) { }", tok("inline int foo ( ) { }"));
-        ASSERT_EQUALS("int foo ( ) { }", tok("__inline int foo ( ) { }"));
-        ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }"));
-        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("constexpr int foo() { }"));
-        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("consteval int foo() { }"));
-        ASSERT_EQUALS("int x ; x = 0 ;", tok("constinit int x = 0;"));
-        ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }"));
-        ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int * p ;", tok("int * restrict p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("void foo ( int restrict ) ;", tok("void foo(int restrict);"));
-        ASSERT_EQUALS("int * p ;", tok("typedef int * __restrict__ rint; rint p;", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int var ;", tok("register int var ;\n"));
+        ASSERT_EQUALS("short var ;", tok("register short int var ;\n"));
+        ASSERT_EQUALS("int foo ( ) { }", tok("inline int foo ( ) { }\n"));
+        ASSERT_EQUALS("int foo ( ) { }", tok("__inline int foo ( ) { }\n"));
+        ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }\n"));
+        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("constexpr int foo() { }\n"));
+        ASSERT_EQUALS("constexpr int foo ( ) { }", tok("consteval int foo() { }\n"));
+        ASSERT_EQUALS("int x ; x = 0 ;", tok("constinit int x = 0;\n"));
+        ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }\n"));
+        ASSERT_EQUALS("int * p ;", tok("int * __restrict p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int * p ;", tok("int * restrict p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("void foo ( int restrict ) ;", tok("void foo(int restrict);\n"));
+        ASSERT_EQUALS("int * p ;", tok("typedef int * __restrict__ rint; rint p;\n", dinit(TokOptions, $.cpp = false)));
 
         // don't remove struct members:
-        ASSERT_EQUALS("a = b . _inline ;", tok("a = b._inline;"));
+        ASSERT_EQUALS("a = b . _inline ;", tok("a = b._inline;\n"));
 
-        ASSERT_EQUALS("int i ; i = 0 ;", tok("auto int i = 0;", dinit(TokOptions, $.cpp = false)));
-        ASSERT_EQUALS("auto i ; i = 0 ;", tok("auto i = 0;"));
+        ASSERT_EQUALS("int i ; i = 0 ;", tok("auto int i = 0;\n", dinit(TokOptions, $.cpp = false)));
+        ASSERT_EQUALS("auto i ; i = 0 ;", tok("auto i = 0;\n"));
     }
 
     void simplifyCallingConvention() {
-        ASSERT_EQUALS("int f ( ) ;", tok("int __cdecl f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __stdcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __fastcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __clrcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __thiscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __syscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __pascal f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __fortran f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __cdecl f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __stdcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fastcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __clrcall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __thiscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __syscall f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __pascal f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fortran f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("int WINAPI f();", dinit(TokOptions, $.type = Platform::Type::Win32A)));
-        ASSERT_EQUALS("int f ( ) ;", tok("int APIENTRY f();", dinit(TokOptions, $.type = Platform::Type::Win32A)));
-        ASSERT_EQUALS("int f ( ) ;", tok("int CALLBACK f();", dinit(TokOptions, $.type = Platform::Type::Win32A)));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __cdecl f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __stdcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __fastcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __clrcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __thiscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __syscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __pascal f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __fortran f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __cdecl f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __stdcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fastcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __clrcall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __thiscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __syscall f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __pascal f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int __far __fortran f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("int WINAPI f();\n", dinit(TokOptions, $.type = Platform::Type::Win32A)));
+        ASSERT_EQUALS("int f ( ) ;", tok("int APIENTRY f();\n", dinit(TokOptions, $.type = Platform::Type::Win32A)));
+        ASSERT_EQUALS("int f ( ) ;", tok("int CALLBACK f();\n", dinit(TokOptions, $.type = Platform::Type::Win32A)));
 
         // don't simplify Microsoft defines in unix code (#7554)
-        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", dinit(TokOptions, $.type = Platform::Type::Unix32)));
+        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;\n", dinit(TokOptions, $.type = Platform::Type::Unix32)));
     }
 
     void simplifyAttribute() {
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) int f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__((visibility(\"default\"))) int f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute ((visibility(\"default\"))) int f();"));
-        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) __attribute__ ((warn_unused_result)) int f();"));
-        ASSERT_EQUALS("blah :: blah f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) blah::blah f();"));
-        ASSERT_EQUALS("template < T > Result < T > f ( ) ;", tok("template<T> __attribute__ ((warn_unused_result)) Result<T> f();"));
-        ASSERT_EQUALS("template < T , U > Result < T , U > f ( ) ;", tok("template<T, U> __attribute__ ((warn_unused_result)) Result<T, U> f();"));
-        ASSERT_EQUALS("void ( * fp ) ( ) ; fp = nullptr ;", tok("typedef void (*fp_t)() __attribute__((noreturn)); fp_t fp = nullptr;")); // #12137
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) int f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__((visibility(\"default\"))) int f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute ((visibility(\"default\"))) int f();\n"));
+        ASSERT_EQUALS("int f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) __attribute__ ((warn_unused_result)) int f();\n"));
+        ASSERT_EQUALS("blah :: blah f ( ) ;", tok("__attribute__ ((visibility(\"default\"))) blah::blah f();\n"));
+        ASSERT_EQUALS("template < T > Result < T > f ( ) ;", tok("template<T> __attribute__ ((warn_unused_result)) Result<T> f();\n"));
+        ASSERT_EQUALS("template < T , U > Result < T , U > f ( ) ;", tok("template<T, U> __attribute__ ((warn_unused_result)) Result<T, U> f();\n"));
+        ASSERT_EQUALS("void ( * fp ) ( ) ; fp = nullptr ;", tok("typedef void (*fp_t)() __attribute__((noreturn)); fp_t fp = nullptr;\n")); // #12137
     }
 
     void simplifyFunctorCall() {
-        ASSERT_EQUALS("IncrementFunctor ( ) ( a ) ;", tok("IncrementFunctor()(a);"));
+        ASSERT_EQUALS("IncrementFunctor ( ) ( a ) ;", tok("IncrementFunctor()(a);\n"));
     }
 
     // #ticket #5339 (simplify function pointer after comma)
     void simplifyFunctionPointer() {
-        ASSERT_EQUALS("f ( double x , double ( * y ) ( ) ) ;", tok("f (double x, double (*y) ());"));
+        ASSERT_EQUALS("f ( double x , double ( * y ) ( ) ) ;", tok("f (double x, double (*y) ());\n"));
     }
 
     void simplifyFunctionReturn() {
@@ -1369,7 +1370,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    void ( * get2 ( ) ) ( ) { return 0 ; }\n"
                                 "    testfp get3();\n"
                                 "    void ( * get4 ( ) ) ( );\n"
-                                "};";
+                                "};\n";
             const char expected[] = "struct Fred "
                                     "{ "
                                     "void * get1 ( ) { return 0 ; } "
@@ -1384,7 +1385,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    std::string s;\n"
                                 "    const std::string & foo();\n"
                                 "};\n"
-                                "const std::string & Fred::foo() { return \"\"; }";
+                                "const std::string & Fred::foo() { return \"\"; }\n";
             const char expected[] = "class Fred { "
                                     "std :: string s ; "
                                     "const std :: string & foo ( ) ; "
@@ -1413,16 +1414,17 @@ class TestSimplifyTokens : public TestFixture {
                                 "int main() {\n"
                                 "  fact2<3> ();\n"
                                 "  fact2<2> ();\n"
-                                "}";
+                                "}\n";
             (void)tok(code);
         }
     }
 
     void consecutiveBraces() {
-        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{}}"));
-        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{{}}}"));
-        ASSERT_EQUALS("void f ( ) { for ( ; ; ) { } }", tok("void f () { for(;;){} }"));
-        ASSERT_EQUALS("void f ( ) { { scope_lock lock ; foo ( ) ; } { scope_lock lock ; bar ( ) ; } }", tok("void f () { {scope_lock lock; foo();} {scope_lock lock; bar();} }"));
+        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{}}\n"));
+        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{{}}}\n"));
+        ASSERT_EQUALS("void f ( ) { for ( ; ; ) { } }", tok("void f () { for(;;){} }\n"));
+        ASSERT_EQUALS("void f ( ) { { scope_lock lock ; foo ( ) ; } { scope_lock lock ; bar ( ) ; } }", tok("void f () { {scope_lock lock; foo();} {scope_lock lock; bar();} }\n"));
+        ASSERT_EQUALS("std :: map < int , int > m { { } } ;", tok("std::map<int, int> m{ {} };\n"));
     }
 
     void simplifyOverride() { // ticket #5069
@@ -1435,35 +1437,35 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void simplifyNestedNamespace() {
-        ASSERT_EQUALS("namespace A { namespace B { namespace C { int i ; } } }", tok("namespace A::B::C { int i; }"));
+        ASSERT_EQUALS("namespace A { namespace B { namespace C { int i ; } } }", tok("namespace A::B::C { int i; }\n"));
     }
 
     void simplifyNamespaceAliases1() {
         ASSERT_EQUALS(";",
-                      tok("namespace ios = boost::iostreams;"));
+                      tok("namespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS("boost :: iostreams :: istream foo ( \"foo\" ) ;",
-                      tok("namespace ios = boost::iostreams; ios::istream foo(\"foo\");"));
+                      tok("namespace ios = boost::iostreams; ios::istream foo(\"foo\");\n"));
         ASSERT_EQUALS("boost :: iostreams :: istream foo ( \"foo\" ) ;",
-                      tok("using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\");"));
+                      tok("using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\");\n"));
         ASSERT_EQUALS(";",
-                      tok("using namespace std; namespace ios = boost::iostreams;"));
+                      tok("using namespace std; namespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS("namespace NS { boost :: iostreams :: istream foo ( \"foo\" ) ; }",
-                      tok("namespace NS { using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\"); }"));
+                      tok("namespace NS { using namespace std; namespace ios = boost::iostreams; ios::istream foo(\"foo\"); }\n"));
 
         // duplicate namespace aliases
         ASSERT_EQUALS(";",
-                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;"));
+                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS(";",
-                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;"));
+                      tok("namespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\nnamespace ios = boost::iostreams;\n"));
         ASSERT_EQUALS("namespace A { namespace B { void foo ( ) { bar ( A :: B :: ab ( ) ) ; } } }",
-                      tok("namespace A::B {"
-                          "namespace AB = A::B;"
-                          "void foo() {"
-                          "    namespace AB = A::B;" // duplicate declaration
-                          "    bar(AB::ab());"
-                          "}"
-                          "namespace AB = A::B;" //duplicate declaration
-                          "}"));
+                      tok("namespace A::B {\n"
+                          "namespace AB = A::B;\n"
+                          "void foo() {\n"
+                          "    namespace AB = A::B;\n" // duplicate declaration
+                          "    bar(AB::ab());\n"
+                          "}\n"
+                          "namespace AB = A::B;\n" //duplicate declaration
+                          "}\n"));
         ASSERT_EQUALS(";",
                       tok("namespace p = boost::python;\n"
                           "namespace np = boost::numpy;\n"));
@@ -1471,19 +1473,19 @@ class TestSimplifyTokens : public TestFixture {
         // redeclared nested namespace aliases
         TODO_ASSERT_EQUALS("namespace A { namespace B { void foo ( ) { bar ( A :: B :: ab ( ) ) ; { baz ( A :: a ( ) ) ; } bar ( A :: B :: ab ( ) ) ; } } }",
                            "namespace A { namespace B { void foo ( ) { bar ( A :: B :: ab ( ) ) ; { baz ( A :: B :: a ( ) ) ; } bar ( A :: B :: ab ( ) ) ; } } }",
-                           tok("namespace A::B {"
-                               "namespace AB = A::B;"
-                               "void foo() {"
-                               "    namespace AB = A::B;" // duplicate declaration
-                               "    bar(AB::ab());"
-                               "    {"
-                               "         namespace AB = A;"
-                               "         baz(AB::a());" // redeclaration OK
-                               "    }"
-                               "    bar(AB::ab());"
-                               "}"
-                               "namespace AB = A::B;" //duplicate declaration
-                               "}"));
+                           tok("namespace A::B {\n"
+                               "namespace AB = A::B;\n"
+                               "void foo() {\n"
+                               "    namespace AB = A::B;\n" // duplicate declaration
+                               "    bar(AB::ab());\n"
+                               "    {\n"
+                               "         namespace AB = A;\n"
+                               "         baz(AB::a());\n" // redeclaration OK
+                               "    }\n"
+                               "    bar(AB::ab());\n"
+                               "}\n"
+                               "namespace AB = A::B;\n" //duplicate declaration
+                               "}\n"));
 
         // variable and namespace alias with same name
         ASSERT_EQUALS("namespace external { namespace ns { "
@@ -1495,16 +1497,16 @@ class TestSimplifyTokens : public TestFixture {
                       "namespace external { namespace ns { "
                       "void A :: f ( const std :: string & json ) { } "
                       "} }",
-                      tok("namespace external::ns {"
-                          "    class A {"
-                          "    public:"
-                          "        static void f(const std::string& json);"
-                          "    };"
-                          "}"
-                          "namespace json = rapidjson;"
-                          "namespace external::ns {"
-                          "    void A::f(const std::string& json) { }"
-                          "}"));
+                      tok("namespace external::ns {\n"
+                          "    class A {\n"
+                          "    public:\n"
+                          "        static void f(const std::string& json);\n"
+                          "    };\n"
+                          "}\n"
+                          "namespace json = rapidjson;\n"
+                          "namespace external::ns {\n"
+                          "    void A::f(const std::string& json) { }\n"
+                          "}\n"));
     }
 
     void simplifyNamespaceAliases2() {
@@ -1512,11 +1514,11 @@ class TestSimplifyTokens : public TestFixture {
                       "{ "
                       "int maxResults ; maxResults = :: a :: b :: c :: d :: ef :: MAX ; "
                       "}",
-                      tok("namespace ef = ::a::b::c::d::ef;"
-                          "void foo()"
-                          "{"
-                          "  int maxResults = ::a::b::c::d::ef::MAX;"
-                          "}"));
+                      tok("namespace ef = ::a::b::c::d::ef;\n"
+                          "void foo()\n"
+                          "{\n"
+                          "  int maxResults = ::a::b::c::d::ef::MAX;\n"
+                          "}\n"));
     }
 
     void simplifyNamespaceAliases3() {
@@ -1608,33 +1610,34 @@ class TestSimplifyTokens : public TestFixture {
 
     void simplifyKnownVariables14() {
         // ticket #753
-        const char code[] = "void f ( ) { int n ; n = 1 ; do { ++ n ; } while ( n < 10 ) ; }";
-        ASSERT_EQUALS(code, simplifyKnownVariables(code));
+        const char code[] = "void f ( ) { int n ; n = 1 ; do { ++ n ; } while ( n < 10 ) ; }\n";
+        const char expected[] = "void f ( ) { int n ; n = 1 ; do { ++ n ; } while ( n < 10 ) ; }";
+        ASSERT_EQUALS(expected, simplifyKnownVariables(code));
     }
 
     void simplifyKnownVariables16() {
         // ticket #807 - segmentation fault when macro isn't found
-        const char code[] = "void f ( ) { int n = 1; DISPATCH(while); }";
+        const char code[] = "void f ( ) { int n = 1; DISPATCH(while); }\n";
         ASSERT_THROW_INTERNAL(simplifyKnownVariables(code), UNKNOWN_MACRO);
     }
 
     void simplifyKnownVariables17() {
         // ticket #807 - segmentation fault when macro isn't found
-        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; p++; }";
+        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; p++; }\n";
         ASSERT_EQUALS(
             "void f ( ) { char * s ; s = malloc ( 100 ) ; mp_ptr p ; p = s ; p ++ ; }",
             simplifyKnownVariables(code));
     }
 
     void simplifyKnownVariables18() {
-        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; ++p; }";
+        const char code[] = "void f ( ) { char *s = malloc(100);mp_ptr p = s; ++p; }\n";
         ASSERT_EQUALS(
             "void f ( ) { char * s ; s = malloc ( 100 ) ; mp_ptr p ; p = s ; ++ p ; }",
             simplifyKnownVariables(code));
     }
 
     void simplifyKnownVariables19() {
-        const char code[] = "void f ( ) { int i=0; do { if (i>0) { a(); } i=b(); } while (i != 12); }";
+        const char code[] = "void f ( ) { int i=0; do { if (i>0) { a(); } i=b(); } while (i != 12); }\n";
         ASSERT_EQUALS(
             "void f ( ) { int i ; i = 0 ; do { if ( i > 0 ) { a ( ) ; } i = b ( ) ; } while ( i != 12 ) ; }",
             simplifyKnownVariables(code));
@@ -1643,7 +1646,7 @@ class TestSimplifyTokens : public TestFixture {
     void simplifyKnownVariables21() {
         ASSERT_EQUALS(
             "void foo ( int i ) { int n ; n = i ; for ( i = 0 ; i < n ; ++ i ) { } }",
-            simplifyKnownVariables("void foo(int i) { int n = i; for (i = 0; i < n; ++i) { } }"));
+            simplifyKnownVariables("void foo(int i) { int n = i; for (i = 0; i < n; ++i) { } }\n"));
     }
 
     void simplifyKnownVariables25() {
@@ -2052,18 +2055,21 @@ class TestSimplifyTokens : public TestFixture {
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin\n",
+            "[test.cpp:3:10]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void simplifyKnownVariables36() {
 
         // Ticket #5972
-        const char code2[] = "void f() {"
-                             "  char buf[10] = \"ab\";"
-                             "    memset(buf, 0, 10);"
-                             "}";
-        const char expected2[] = "void f ( ) { char buf [ 10 ] = \"ab\" ; memset ( buf , 0 , 10 ) ; }";
+        const char code2[] = "void f() {\n"
+                             "  char buf[10] = \"ab\";\n"
+                             "    memset(buf, 0, 10);\n"
+                             "}\n";
+        const char expected2[] = "void f ( ) {\n"
+                                 "char buf [ 10 ] = \"ab\" ;\n"
+                                 "memset ( buf , 0 , 10 ) ;\n"
+                                 "}";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
 
@@ -2073,7 +2079,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "   char a[10];\n"
                                 "   strcpy(a, \"hello\");\n"
                                 "   strcat(a, \"!\");\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "char a [ 10 ] ;\n"
                                     "strcpy ( a , \"hello\" ) ;\n"
@@ -2083,27 +2089,27 @@ class TestSimplifyTokens : public TestFixture {
         }
 
         {
-            const char code[] = "void f() {"
-                                "    char *s = malloc(10);"
-                                "    strcpy(s, \"\");"
-                                "    free(s);"
-                                "}";
-            const char expected[] = "void f ( ) {"
-                                    " char * s ; s = malloc ( 10 ) ;"
-                                    " strcpy ( s , \"\" ) ;"
-                                    " free ( s ) ; "
+            const char code[] = "void f() {\n"
+                                "    char *s = malloc(10);\n"
+                                "    strcpy(s, \"\");\n"
+                                "    free(s);\n"
+                                "}\n";
+            const char expected[] = "void f ( ) {\n"
+                                    "char * s ; s = malloc ( 10 ) ;\n"
+                                    "strcpy ( s , \"\" ) ;\n"
+                                    "free ( s ) ;\n"
                                     "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void f(char *p, char *q) {"
-                                "    strcpy(p, \"abc\");"
-                                "    q = p;"
-                                "}";
-            const char expected[] = "void f ( char * p , char * q ) {"
-                                    " strcpy ( p , \"abc\" ) ;"
-                                    " q = p ; "
+            const char code[] = "void f(char *p, char *q) {\n"
+                                "    strcpy(p, \"abc\");\n"
+                                "    q = p;\n"
+                                "}\n";
+            const char expected[] = "void f ( char * p , char * q ) {\n"
+                                    "strcpy ( p , \"abc\" ) ;\n"
+                                    "q = p ;\n"
                                     "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
@@ -2114,7 +2120,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    char s[10];\n"
                                 "    strcpy(s, \"123\");\n"
                                 "    if (s[6] == ' ');\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "char s [ 10 ] ;\n"
                                     "strcpy ( s , \"123\" ) ;\n"
@@ -2130,7 +2136,7 @@ class TestSimplifyTokens : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int a, *p; p = &a;\n"
                                 "    { int a = *p; }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "int a ; int * p ; p = & a ;\n"
                                     "{ int a ; a = * p ; }\n"
@@ -2142,7 +2148,7 @@ class TestSimplifyTokens : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int *a, **p; p = &a;\n"
                                 "    { int *a = *p; }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "int * a ; int * * p ; p = & a ;\n"
                                     "{ int * a ; a = * p ; }\n"
@@ -2155,7 +2161,7 @@ class TestSimplifyTokens : public TestFixture {
         const char code[] = "void a() {\n"
                             "    static int i = 10;\n"
                             "    b(i++);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void a ( ) {\n"
                                 "static int i = 10 ;\n"
                                 "b ( i ++ ) ;\n"
@@ -2168,7 +2174,7 @@ class TestSimplifyTokens : public TestFixture {
                             "    int x = 0;\n"
                             "    cin >> x;\n"
                             "    return x;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "void f ( ) {\n"
                                 "int x ; x = 0 ;\n"
@@ -2177,7 +2183,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin\n",
+            "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
@@ -2186,14 +2192,14 @@ class TestSimplifyTokens : public TestFixture {
         const char code[] = "void f() {\n"
                             "    int x = 0;\n"
                             "    cin >> std::hex >> x;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( ) {\n"
                                 "int x ; x = 0 ;\n"
                                 "cin >> std :: hex >> x ;\n"
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin\n",
+            "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
@@ -2202,12 +2208,13 @@ class TestSimplifyTokens : public TestFixture {
         const char code[] = "void f(int sz) {\n"
                             "    int i;\n"
                             "    for (i = 0; ((i<sz) && (sz>3)); ++i) { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( int sz ) {\n"
                                 "int i ;\n"
                                 "for ( i = 0 ; ( i < sz ) && ( sz > 3 ) ; ++ i ) { }\n"
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeAndStringifyOptions, $.cpp = false)));
+        ignore_errout();
     }
 
     void simplifyKnownVariables49() { // #3691
@@ -2216,7 +2223,7 @@ class TestSimplifyTokens : public TestFixture {
                             "    case 1: sz = 2; continue;\n"
                             "    case 2: x = sz; break;\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( int sz ) {\n"
                                 "switch ( x ) {\n"
                                 "case 1 : ; sz = 2 ; continue ;\n"
@@ -2225,7 +2232,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeAndStringifyOptions, $.cpp = false)));
         ASSERT_EQUALS(
-            "[test.c:2]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x\n",
+            "[test.c:2:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
@@ -2247,10 +2254,27 @@ class TestSimplifyTokens : public TestFixture {
                                 "v = { & x6 } ;\n"
                                 "const char x7 = 'b' ;\n"
                                 "return & x7 ;\n"
-                                "}";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+                                "}\n";
+
+            const char expected[] = "const char * foo ( ) {\n"
+                                    "const char x1 = 'b' ;\n"
+                                    "f ( & x1 ) ;\n"
+                                    "const char x2 = 'b' ;\n"
+                                    "f ( y , & x2 ) ;\n"
+                                    "const char x3 = 'b' ;\n"
+                                    "t = & x3 ;\n"
+                                    "const char x4 = 'b' ;\n"
+                                    "t = y + & x4 ;\n"
+                                    "const char x5 = 'b' ;\n"
+                                    "z [ & x5 ] = y ;\n"
+                                    "const char x6 = 'b' ;\n"
+                                    "v = { & x6 } ;\n"
+                                    "const char x7 = 'b' ;\n"
+                                    "return & x7 ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y\n",
+                "[test.cpp:5:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
         }
         {
@@ -2270,10 +2294,27 @@ class TestSimplifyTokens : public TestFixture {
                                 "v = { & x6 } ;\n"
                                 "const int x7 = 1 ;\n"
                                 "return & x7 ;\n"
-                                "}";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+                                "}\n";
+
+            const char expected[] = "const int * foo ( ) {\n"
+                                    "const int x1 = 1 ;\n"
+                                    "f ( & x1 ) ;\n"
+                                    "const int x2 = 1 ;\n"
+                                    "f ( y , & x2 ) ;\n"
+                                    "const int x3 = 1 ;\n"
+                                    "t = & x3 ;\n"
+                                    "const int x4 = 1 ;\n"
+                                    "t = y + & x4 ;\n"
+                                    "const int x5 = 1 ;\n"
+                                    "z [ & x5 ] = y ;\n"
+                                    "const int x6 = 1 ;\n"
+                                    "v = { & x6 } ;\n"
+                                    "const int x7 = 1 ;\n"
+                                    "return & x7 ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y\n",
+                "[test.cpp:5:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
         }
     }
@@ -2283,19 +2324,19 @@ class TestSimplifyTokens : public TestFixture {
                             "  TYPE *x=&x, **p=x, **q = NULL;\n"
                             "  BENCH1(q = _mhz_M(n); n = 1;)\n"
                             "  use_pointer(q);\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), UNKNOWN_MACRO);
     }
 
     void simplifyKnownVariables54() { // #4913
-        ASSERT_EQUALS("void f ( int * p ) { * -- p = 0 ; * p = 0 ; }", tokenizeAndStringify("void f(int*p) { *--p=0; *p=0; }"));
+        ASSERT_EQUALS("void f ( int * p ) { * -- p = 0 ; * p = 0 ; }", tokenizeAndStringify("void f(int*p) { *--p=0; *p=0; }\n"));
     }
 
     void simplifyKnownVariables56() { // ticket #5301 - >>
         ASSERT_EQUALS("void f ( ) { int a ; a = 0 ; int b ; b = 0 ; * p >> a >> b ; return a / b ; }",
-                      tokenizeAndStringify("void f() { int a=0,b=0; *p>>a>>b; return a/b; }"));
+                      tokenizeAndStringify("void f() { int a=0,b=0; *p>>a>>b; return a/b; }\n"));
         ASSERT_EQUALS(
-            "[test.cpp:1]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p\n",
+            "[test.cpp:1:26]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
@@ -2308,7 +2349,7 @@ class TestSimplifyTokens : public TestFixture {
                             "} "
                             "int baz() { "
                             "  return sizeof(arr_t); "
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("enum e { VAL1 = 1 , VAL2 } ; "
                       "int foo ( int ) ; "
                       "void bar ( ) { "
@@ -2325,7 +2366,7 @@ class TestSimplifyTokens : public TestFixture {
                             "  for(i = 0, j = 1; i < 3, j < 12; i++,j++) {\n"
                             "    a[i] = 0;\n"
                             "  }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "int a [ 3 ] ; int i ; int j ;\n"
                       "for ( i = 0 , j = 1 ; i < 3 , j < 12 ; i ++ , j ++ ) {\n"
@@ -2343,7 +2384,7 @@ class TestSimplifyTokens : public TestFixture {
                                              "    Other\n"
                                              "  };\n"
                                              "  enum { XX };\n"
-                                             "};"));
+                                             "};\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2355,7 +2396,7 @@ class TestSimplifyTokens : public TestFixture {
                       tokenizeAndStringify("void foo(std::string str) {\n"
                                            "  char *p = &str[0];\n"
                                            "  *p = 0;\n"
-                                           "}"));
+                                           "}\n"));
     }
 
     void simplifyKnownVariables63() { // #10798
@@ -2377,7 +2418,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x\n",
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
             filter_valueflow(errout_str()));
     }
 
@@ -2393,7 +2434,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable nr\n",
+            "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable nr [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
@@ -2456,7 +2497,7 @@ class TestSimplifyTokens : public TestFixture {
                             "}\n";
         (void)tokenizeAndStringify(code);
         ASSERT_EQUALS(
-            "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x\n",
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
             filter_valueflow(errout_str())); // no debug warnings
     }
 
@@ -2501,24 +2542,33 @@ class TestSimplifyTokens : public TestFixture {
 
     void simplifyKnownVariablesFunctionCalls() {
         {
-            const char code[] = "void a(int &x);" // <- x is passed by reference
-                                "void b() {"
-                                "    int x = 123;"
-                                "    a(x);"       // <- don't replace with a(123);
-                                "}";
-            const char expected[] = "void a ( int & x ) ; void b ( ) { int x ; x = 123 ; a ( x ) ; }";
+            const char code[] = "void a(int &x);\n" // <- x is passed by reference
+                                "void b() {\n"
+                                "    int x = 123;\n"
+                                "    a(x);\n"       // <- don't replace with a(123);
+                                "}\n";
+            const char expected[] = "void a ( int & x ) ;\n"
+                                    "void b ( ) {\n"
+                                    "int x ; x = 123 ;\n"
+                                    "a ( x ) ;\n"
+                                    "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
     }
 
     void simplifyKnownVariablesGlobalVars() {
         // #8054
-        const char code[] = "static int x;"
-                            "void f() {"
-                            "    x = 123;"
-                            "    while (!x) { dostuff(); }"
-                            "}";
-        ASSERT_EQUALS("static int x ; void f ( ) { x = 123 ; while ( ! x ) { dostuff ( ) ; } }", tokenizeAndStringify(code));
+        const char code[] = "static int x;\n"
+                            "void f() {\n"
+                            "    x = 123;\n"
+                            "    while (!x) { dostuff(); }\n"
+                            "}\n";
+        const char expected[] = "static int x ;\n"
+                                "void f ( ) {\n"
+                                "x = 123 ;\n"
+                                "while ( ! x ) { dostuff ( ) ; }\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
@@ -2618,7 +2668,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "void bar ( ) {\n"
                                 "foo < 1 ? 0 ? 1 : 6 : 2 > x ;\n"
                                 "foo < 1 ? 0 : 2 > y ;\n"
-                                "}";
+                                "}\n";
             const char exp[] = "template < class T > struct foo ; "
                                "void bar ( ) { "
                                "foo < 6 > x ; "
@@ -2627,7 +2677,7 @@ class TestSimplifyTokens : public TestFixture {
             ASSERT_EQUALS(exp, tok(code));
         }
         {
-            const char code[] = "bool b = true ? false : 1 > 2 ;";
+            const char code[] = "bool b = true ? false : 1 > 2 ;\n";
             const char exp[] = "bool b ; b = true ? false : 1 > 2 ;";
             ASSERT_EQUALS(exp, tok(code));
         }
@@ -2636,12 +2686,12 @@ class TestSimplifyTokens : public TestFixture {
     void simplifyVarDeclInitLists()
     {
         {
-            const char code[] = "std::vector<int> v{a * b, 1};";
+            const char code[] = "std::vector<int> v{a * b, 1};\n";
             const char exp[] = "std :: vector < int > v { a * b , 1 } ;";
             ASSERT_EQUALS(exp, tok(code));
         }
         {
-            const char code[] = "enum E { E0 } e{};";
+            const char code[] = "enum E { E0 } e{};\n";
             const char exp[] = "enum E { E0 } ; enum E e ; e = { } ;";
             ASSERT_EQUALS(exp, tok(code));
         }
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index f77ad41889e..957a1d9e831 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -26,10 +26,11 @@
 #include "tokenlist.h"
 
 #include <cstddef>
-#include <sstream>
 #include <string>
 #include <utility>
 
+class ErrorLogger;
+
 class TestSimplifyTypedef : public TestFixture {
 public:
     TestSimplifyTypedef() : TestFixture("TestSimplifyTypedef") {}
@@ -40,6 +41,7 @@ class TestSimplifyTypedef : public TestFixture {
     const Settings settings1 = settingsBuilder().severity(Severity::portability).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(c1);
         TEST_CASE(c2);
         TEST_CASE(canreplace1);
@@ -111,7 +113,9 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef38);
         TEST_CASE(simplifyTypedef43); // ticket #1588
         TEST_CASE(simplifyTypedef44);
+        mNewTemplate = false;
         TEST_CASE(simplifyTypedef45); // ticket #1613
+        mNewTemplate = true;
         TEST_CASE(simplifyTypedef46);
         TEST_CASE(simplifyTypedef47);
         TEST_CASE(simplifyTypedef48); // ticket #1673
@@ -203,7 +207,9 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef136);
         TEST_CASE(simplifyTypedef137);
         TEST_CASE(simplifyTypedef138);
+        mNewTemplate = false;
         TEST_CASE(simplifyTypedef139);
+        mNewTemplate = true;
         TEST_CASE(simplifyTypedef140); // #10798
         TEST_CASE(simplifyTypedef141); // #10144
         TEST_CASE(simplifyTypedef142); // T() when T is a pointer type
@@ -223,6 +229,12 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef156);
         TEST_CASE(simplifyTypedef157);
         TEST_CASE(simplifyTypedef158);
+        TEST_CASE(simplifyTypedef159);
+        TEST_CASE(simplifyTypedef160);
+        TEST_CASE(simplifyTypedef161);
+        TEST_CASE(simplifyTypedef162);
+        TEST_CASE(simplifyTypedef163);
+        TEST_CASE(simplifyTypedef164);
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -242,7 +254,11 @@ class TestSimplifyTypedef : public TestFixture {
 
         TEST_CASE(simplifyTypedefMacro);
 
-        TEST_CASE(simplifyTypedefOriginalName);
+        TEST_CASE(simplifyTypedefOriginalName1);
+        TEST_CASE(simplifyTypedefOriginalName2);
+        TEST_CASE(simplifyTypedefOriginalName3);
+        TEST_CASE(simplifyTypedefOriginalName4);
+        TEST_CASE(simplifyTypedefOriginalName5);
 
         TEST_CASE(simplifyTypedefTokenColumn1);
         TEST_CASE(simplifyTypedefTokenColumn2);
@@ -251,11 +267,20 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(typedefInfo1);
         TEST_CASE(typedefInfo2);
         TEST_CASE(typedefInfo3);
+        TEST_CASE(typedefInfo4);
     }
 
+    class TokenizerTest final : public Tokenizer
+    {
+        friend class TestSimplifyTypedef;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
     struct TokOptions
     {
-        TokOptions() = default;
         bool simplify = true;
         bool debugwarnings = true;
     };
@@ -272,20 +297,20 @@ class TestSimplifyTypedef : public TestFixture {
         return tokenizer.tokens()->stringifyList(nullptr, !options.simplify);
     }
 
-    std::string simplifyTypedef(const char code[]) {
+    template<size_t size>
+    std::string simplifyTypedef(const char (&data)[size]) {
         TokenList tokenlist{settings1, Standards::Language::CPP};
-        std::istringstream istr(code);
-        if (!tokenlist.createTokens(istr))
+        if (!tokenlist.createTokensFromString(data))
             return "";
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
 
-
-    std::string simplifyTypedefP(const char code[]) {
+    template<size_t size>
+    std::string simplifyTypedefP(const char (&code)[size]) {
         SimpleTokenizer2 tokenizer(settings0, *this, code, "test.cpp");
 
         // Tokenize..
@@ -306,13 +331,13 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
 
-    std::string simplifyTypedefC(const char code[]) {
+    template<size_t size>
+    std::string simplifyTypedefC(const char (&data)[size]) {
         TokenList tokenlist{settings1, Standards::Language::C};
 
-        std::istringstream istr(code);
-        if (!TokenListHelper::createTokens(tokenlist, istr, "file.c"))
+        if (!TokenListHelper::createTokensFromString(tokenlist, data, "file.c"))
             return "";
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
         try {
@@ -323,12 +348,12 @@ class TestSimplifyTypedef : public TestFixture {
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
 
-    std::string dumpTypedefInfo(const char code[]) {
+    template<size_t size>
+    std::string dumpTypedefInfo(const char (&code)[size]) {
         TokenList tokenlist{settings1, Standards::Language::C};
-        std::istringstream istr(code);
-        if (!TokenListHelper::createTokens(tokenlist, istr, "file.c"))
+        if (!TokenListHelper::createTokensFromString(tokenlist, code, "file.c"))
             return {};
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
         try {
@@ -341,7 +366,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void c1() {
         const char code[] = "typedef int t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("int x ;", simplifyTypedefC(code));
     }
 
@@ -392,56 +417,56 @@ class TestSimplifyTypedef : public TestFixture {
 
     void cconst() {
         const char code1[] = "typedef void* HWND;\n"
-                             "const HWND x;";
+                             "const HWND x;\n";
         ASSERT_EQUALS("void * const x ;", simplifyTypedef(code1));
 
         const char code2[] = "typedef void (*fp)();\n"
-                             "const fp x;";
+                             "const fp x;\n";
         ASSERT_EQUALS("void ( * const x ) ( ) ;", simplifyTypedef(code2));
     }
 
     void cstruct1() {
         const char code[] = "typedef struct { int a; int b; } t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("struct t { int a ; int b ; } ; struct t x ;", simplifyTypedef(code));
         ASSERT_EQUALS("struct t { int a ; int b ; } ; struct t x ;", simplifyTypedefC(code));
     }
 
     void cstruct2() {
         const char code[] = "typedef enum { A, B } t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("enum t { A , B } ; enum t x ;", simplifyTypedef(code));
         ASSERT_EQUALS("enum t { A , B } ; enum t x ;", simplifyTypedefC(code));
     }
 
     void cstruct3() {
         const char code[] = "typedef struct s { int a; int b; } t;\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("struct s { int a ; int b ; } ; struct s x ;", simplifyTypedefC(code));
     }
 
     void cstruct4() {
         const char code[] = "typedef struct s { int a; int b; } t;\n"
-                            "struct t x{};";
+                            "struct t x{};\n";
         ASSERT_EQUALS("struct s { int a ; int b ; } ; struct s x { } ;", simplifyTypedefC(code));
     }
 
     void cenum1() {
         const char code[] = "typedef enum { a, b } E;\n"
-                            "E e;";
+                            "E e;\n";
         ASSERT_EQUALS("enum E { a , b } ; enum E e ;", simplifyTypedefC(code));
     }
 
     void cfunction1() {
         const char code[] = "typedef int callback(int);\n"
-                            "callback* cb;";
+                            "callback* cb;\n";
         ASSERT_EQUALS("int ( * cb ) ( int ) ;", simplifyTypedefC(code));
     }
 
     void cfunction2() {
         const char code[] = "typedef int callback(int);\n"
                             "typedef callback* callbackPtr;\n"
-                            "callbackPtr cb;";
+                            "callbackPtr cb;\n";
         ASSERT_EQUALS("int ( * cb ) ( int ) ;", simplifyTypedefC(code));
     }
 
@@ -449,7 +474,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef int f(int);\n"
                             "typedef const f cf;\n";
         (void)simplifyTypedefC(code);
-        ASSERT_EQUALS("[file.c:2]: (portability) It is unspecified behavior to const qualify a function type.\n", errout_str());
+        ASSERT_EQUALS("[file.c:2:9]: (portability) It is unspecified behavior to const qualify a function type. [invalidConstFunctionType]\n", errout_str());
     }
 
     void cfunction4() {
@@ -460,33 +485,33 @@ class TestSimplifyTypedef : public TestFixture {
 
     void cfp1() {
         const char code[] = "typedef void (*fp)(void * p);\n"
-                            "fp x;";
+                            "fp x;\n";
         ASSERT_EQUALS("void ( * x ) ( void * p ) ;", simplifyTypedefC(code));
     }
 
     void cfp2() {
         const char code[] = "typedef void (*const fp)(void * p);\n"
-                            "fp x;";
+                            "fp x;\n";
         ASSERT_EQUALS("void ( * const x ) ( void * p ) ;", simplifyTypedefC(code));
     }
 
     void cfp4() {
         const char code[] = "typedef struct S Stype ;\n"
                             "typedef void ( * F ) ( Stype * ) ;\n"
-                            "F func;";
+                            "F func;\n";
         ASSERT_EQUALS("void ( * func ) ( struct S * ) ;", simplifyTypedefC(code));
     }
 
     void cfp5() {
         const char code[] = "typedef void (*fp)(void);\n"
                             "typedef fp t;\n"
-                            "void foo(t p);";
+                            "void foo(t p);\n";
         ASSERT_EQUALS("void foo ( void ( * p ) ( void ) ) ;", simplifyTypedef(code));
     }
 
     void cfp6() {
         const char code[] = "typedef void (*fp)(void);\n"
-                            "fp a[10];";
+                            "fp a[10];\n";
         ASSERT_EQUALS("void ( * a [ 10 ] ) ( void ) ;", simplifyTypedef(code));
     }
 
@@ -499,28 +524,27 @@ class TestSimplifyTypedef : public TestFixture {
 
     void carray1() {
         const char code[] = "typedef int t[20];\n"
-                            "t x;";
+                            "t x;\n";
         ASSERT_EQUALS("int x [ 20 ] ;", simplifyTypedefC(code));
     }
 
     void carray2() {
         const char code[] = "typedef double t[4];\n"
-                            "t x[10];";
+                            "t x[10];\n";
         ASSERT_EQUALS("double x [ 10 ] [ 4 ] ;", simplifyTypedef(code));
     }
 
     void carray3() {
-        const char* code{};
-        code = "typedef int a[256];\n" // #11689
-               "typedef a b[256];\n"
-               "b* p;\n";
+        const char code[] = "typedef int a[256];\n" // #11689
+                            "typedef a b[256];\n"
+                            "b* p;\n";
         ASSERT_EQUALS("int ( * p ) [ 256 ] [ 256 ] ;", simplifyTypedef(code));
 
-        code = "typedef int a[1];\n"
-               "typedef a b[2];\n"
-               "typedef b c[3];\n"
-               "c* p;\n";
-        ASSERT_EQUALS("int ( * p ) [ 3 ] [ 2 ] [ 1 ] ;", simplifyTypedef(code));
+        const char code1[] = "typedef int a[1];\n"
+                             "typedef a b[2];\n"
+                             "typedef b c[3];\n"
+                             "c* p;\n";
+        ASSERT_EQUALS("int ( * p ) [ 3 ] [ 2 ] [ 1 ] ;", simplifyTypedef(code1));
     }
 
     void carray4() {
@@ -531,7 +555,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void cdonotreplace1() {
         const char code[] = "typedef int t;\n"
-                            "int* t;";
+                            "int* t;\n";
         ASSERT_EQUALS("int * t ;", simplifyTypedefC(code));
     }
 
@@ -539,13 +563,13 @@ class TestSimplifyTypedef : public TestFixture {
     void cppfp1() {
         const char code[] = "typedef void (*fp)(void);\n"
                             "typedef fp t;\n"
-                            "void foo(t p);";
+                            "void foo(t p);\n";
         ASSERT_EQUALS("void foo ( void ( * p ) ( void ) ) ;", tok(code));
     }
 
     void Generic1() {
         const char code[] = "typedef void func(void);\n"
-                            "_Generic((x), func: 1, default: 2);";
+                            "_Generic((x), func: 1, default: 2);\n";
         ASSERT_EQUALS("_Generic ( x , void ( ) : 1 , default : 2 ) ;", tok(code));
     }
 
@@ -562,7 +586,7 @@ class TestSimplifyTypedef : public TestFixture {
                             " duplicate a;\n"
                             " a.foo();\n"
                             " A::duplicate c = 0;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A "
@@ -588,7 +612,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "public:\n"
                             "typedef wchar_t duplicate;\n"
                             "duplicate foo() { wchar_t b; return b; }\n"
-                            "};";
+                            "};\n";
 
         const char expected[] =
             "class A ; "
@@ -613,7 +637,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "int main()\n"
                             "{\n"
                             "duplicate b;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A { } ; "
@@ -638,7 +662,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    s32 ivar = -2;\n"
                             "    u32 uvar = 2;\n"
                             "    return uvar / ivar;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -657,7 +681,7 @@ class TestSimplifyTypedef : public TestFixture {
             "void f()\n"
             "{\n"
             "    YY_BUFFER_STATE state;\n"
-            "}";
+            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -674,7 +698,7 @@ class TestSimplifyTypedef : public TestFixture {
             "namespace VL {\n"
             "    typedef float float_t ;\n"
             "    inline VL::float_t fast_atan2(VL::float_t y, VL::float_t x){}\n"
-            "}";
+            "}\n";
         const char expected[] =
             "namespace VL { "
             ""
@@ -691,8 +715,8 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef7() {
-        const char code[] = "typedef int abc ; "
-                            "Fred :: abc f ;";
+        const char code[] = "typedef int abc ;\n"
+                            "Fred :: abc f ;\n";
         const char expected[] = "Fred :: abc f ;";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
@@ -713,7 +737,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "RINT tri;\n"
                             "RUINT trui;\n"
                             "RCINT trci;\n"
-                            "RCUINT trcui;";
+                            "RCUINT trcui;\n";
 
         const char expected[] =
             "int ti ; "
@@ -738,7 +762,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "T t;\n"
                             "TP tp;\n"
                             "U u;\n"
-                            "V v;";
+                            "V v;\n";
 
         const char expected[] =
             "struct t { int a ; } ; "
@@ -764,7 +788,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "T t;\n"
                             "TP tp;\n"
                             "U u;\n"
-                            "V v;";
+                            "V v;\n";
 
         const char expected[] =
             "union t { int a ; float b ; } ; "
@@ -784,7 +808,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef enum { a = 0 , b = 1 , c = 2 } abc;\n"
                             "typedef enum xyz { x = 0 , y = 1 , z = 2 } XYZ;\n"
                             "abc e1;\n"
-                            "XYZ e2;";
+                            "XYZ e2;\n";
 
         const char expected[] = "enum abc { a = 0 , b = 1 , c = 2 } ; "
                                 "enum xyz { x = 0 , y = 1 , z = 2 } ; "
@@ -802,7 +826,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "V1 v1;\n"
                             "V2 v2;\n"
                             "V3 v3;\n"
-                            "IntListIterator iter;";
+                            "IntListIterator iter;\n";
 
         const char expected[] =
             "vector < int > v1 ; "
@@ -815,9 +839,9 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef13() {
         // ticket # 1167 (InternalError)
-        const char code[] = "typedef std::pair<int(*)(void*), void*> Func;"
-                            "typedef std::vector<Func> CallQueue;"
-                            "int main() {}";
+        const char code[] = "typedef std::pair<int(*)(void*), void*> Func;\n"
+                            "typedef std::vector<Func> CallQueue;\n"
+                            "int main() {}\n";
 
         // Tokenize and check output..
         ASSERT_NO_THROW(tok(code));
@@ -826,17 +850,17 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef14() {
         // ticket # 1232
-        const char code[] = "template <typename F, unsigned int N> struct E"
-                            "{"
-                            "    typedef E<F,(N>0)?(N-1):0> v;"
-                            "    typedef typename add<v,v>::val val;"
-                            "    FP_M(val);"
-                            "};"
-                            "template <typename F> struct E <F,0>"
-                            "{"
-                            "    typedef typename D<1>::val val;"
-                            "    FP_M(val);"
-                            "};";
+        const char code[] = "template <typename F, unsigned int N> struct E\n"
+                            "{\n"
+                            "    typedef E<F,(N>0)?(N-1):0> v;\n"
+                            "    typedef typename add<v,v>::val val;\n"
+                            "    FP_M(val);\n"
+                            "};\n"
+                            "template <typename F> struct E <F,0>\n"
+                            "{\n"
+                            "    typedef typename D<1>::val val;\n"
+                            "    FP_M(val);\n"
+                            "};\n";
 
         // Tokenize and check output..
         TODO_ASSERT_THROW(tok(code, dinit(TokOptions, $.debugwarnings = false)), InternalError); // TODO: Do not throw exception
@@ -846,7 +870,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef15() {
         {
             const char code[] = "typedef char frame[10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "char f [ 10 ] ;";
 
@@ -855,7 +879,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef unsigned char frame[10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "unsigned char f [ 10 ] ;";
 
@@ -869,7 +893,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef  MOT8 CHFOO[4096];\n"
                             "typedef struct {\n"
                             "   CHFOO freem;\n"
-                            "} STRFOO;";
+                            "} STRFOO;\n";
 
         // Tokenize and check output..
         ASSERT_NO_THROW(tok(code));
@@ -879,7 +903,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef17() {
         const char code[] = "typedef char * PCHAR, CHAR;\n"
                             "PCHAR pc;\n"
-                            "CHAR c;";
+                            "CHAR c;\n";
 
         const char expected[] =
             "char * pc ; "
@@ -890,7 +914,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef18() {
         const char code[] = "typedef vector<int[4]> a;\n"
-                            "a b;";
+                            "a b;\n";
         ASSERT_EQUALS("vector < int [ 4 ] > b ;", tok(code));
     }
 
@@ -900,7 +924,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef struct {} A, *B, **C;\n"
                                 "A a;\n"
                                 "B b;\n"
-                                "C c;";
+                                "C c;\n";
 
             const char expected[] =
                 "struct A { } ; "
@@ -914,7 +938,7 @@ class TestSimplifyTypedef : public TestFixture {
         {
             const char code[] = "typedef struct {} A, *********B;\n"
                                 "A a;\n"
-                                "B b;";
+                                "B b;\n";
 
             const char expected[] =
                 "struct A { } ; "
@@ -928,7 +952,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef struct {} **********A, *B, C;\n"
                                 "A a;\n"
                                 "B b;\n"
-                                "C c;";
+                                "C c;\n";
 
             const char expected[] =
                 "struct Unnamed0 { } ; "
@@ -942,7 +966,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef20() {
         // ticket #1284
-        const char code[] = "typedef jobject invoke_t (jobject, Proxy *, Method *, JArray< jobject > *);";
+        const char code[] = "typedef jobject invoke_t (jobject, Proxy *, Method *, JArray< jobject > *);\n";
         ASSERT_EQUALS(";", tok(code));
     }
 
@@ -950,7 +974,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef void (* PF)();\n"
                             "typedef void * (* PFV)(void *);\n"
                             "PF pf;\n"
-                            "PFV pfv;";
+                            "PFV pfv;\n";
 
         const char expected[] =
             ""
@@ -967,7 +991,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef void (*testfp)();\n"
                                 "    testfp get() { return test; }\n"
                                 "    static void test() { }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -984,7 +1008,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef void * (*testfp)(void *);\n"
                                 "    testfp get() { return test; }\n"
                                 "    static void * test(void * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -1001,7 +1025,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef unsigned int * (*testfp)(unsigned int *);\n"
                                 "    testfp get() { return test; }\n"
                                 "    static unsigned int * test(unsigned int * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -1018,7 +1042,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef const unsigned int * (*testfp)(const unsigned int *);\n"
                                 "    testfp get() { return test; }\n"
                                 "    static const unsigned int * test(const unsigned int * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             // static const gets changed to const static
             const char expected[] =
@@ -1036,7 +1060,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef void * (*testfp)(void *);\n"
                                 "    testfp get(int i) { return test; }\n"
                                 "    static void * test(void * p) { return p; }\n"
-                                "};";
+                                "};\n";
 
             const char expected[] =
                 "class Fred { "
@@ -1052,7 +1076,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef23() {
         const char code[] = "typedef bool (*Callback) (int i);\n"
                             "void    addCallback(Callback callback) { }\n"
-                            "void    addCallback1(Callback callback, int j) { }";
+                            "void    addCallback1(Callback callback, int j) { }\n";
 
         const char expected[] =
             "void addCallback ( bool ( * callback ) ( int ) ) { } "
@@ -1067,7 +1091,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void g( fp f )\n"
                                 "{\n"
                                 "  fp f2 = (fp)f;\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "void g ( int ( * f ) ( ) ) "
@@ -1083,7 +1107,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void g( fp f )\n"
                                 "{\n"
                                 "  fp f2 = static_cast<fp>(f);\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "void g ( int ( * f ) ( ) ) "
@@ -1101,7 +1125,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef void (*fill_names_f) (const char *);\n"
                                 "struct vfs_class {\n"
                                 "    void (*fill_names) (struct vfs_class *me, fill_names_f);\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "struct vfs_class { "
@@ -1115,7 +1139,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef void (*fill_names_f) (const char *);\n"
                                 "struct vfs_class {\n"
                                 "    void (*fill_names) (fill_names_f, struct vfs_class *me);\n"
-                                "}";
+                                "}\n";
 
             const char expected[] =
                 "struct vfs_class { "
@@ -1129,7 +1153,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef26() {
         {
             const char code[] = "typedef void (*Callback) ();\n"
-                                "void    addCallback(Callback (*callback)());";
+                                "void    addCallback(Callback (*callback)());\n";
 
             const char expected[] = "void addCallback ( void ( * ( * callback ) ( ) ) ( ) ) ;";
 
@@ -1141,7 +1165,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef void (*pc_video_update_proc)(bitmap_t *bitmap,\n"
                                 "struct mscrtc6845 *crtc);\n"
                                 "\n"
-                                "struct mscrtc6845 *pc_video_start(pc_video_update_proc (*choosevideomode)(running_machine *machine, int *width, int *height, struct mscrtc6845 *crtc));";
+                                "struct mscrtc6845 *pc_video_start(pc_video_update_proc (*choosevideomode)(running_machine *machine, int *width, int *height, struct mscrtc6845 *crtc));\n";
 
             const char expected[] = "struct mscrtc6845 * pc_video_start ( void ( * ( * choosevideomode ) ( running_machine * machine , int * width , int * height , struct mscrtc6845 * crtc ) ) ( bitmap_t * bitmap , struct mscrtc6845 * crtc ) ) ;";
 
@@ -1155,7 +1179,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "{\n"
                             "    typedef int (*func_ptr)(float, double);\n"
                             "    VERIFY((is_same<result_of<func_ptr(char, float)>::type, int>::value));\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "int main ( ) "
@@ -1166,13 +1190,13 @@ class TestSimplifyTypedef : public TestFixture {
 
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         ASSERT_EQUALS(
-            "[test.cpp:4]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable value\n",
+            "[test.cpp:4:67]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable value [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void simplifyTypedef28() {
         const char code[] = "typedef std::pair<double, double> (*F)(double);\n"
-                            "F f;";
+                            "F f;\n";
 
         const char expected[] = "std :: pair < double , double > ( * f ) ( double ) ;";
 
@@ -1188,7 +1212,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "array1 a1;\n"
                             "array2 a2;\n"
                             "int_t t;\n"
-                            "int_array ia;";
+                            "int_array ia;\n";
 
         const char expected[] =
             "int a [ ice_or < is_int < int > :: value , is_int < UDT > :: value > :: value ? 1 : -1 ] ; "
@@ -1206,7 +1230,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef ::std::list<int> int_list_array[10];\n"
                             "int_list il;\n"
                             "int_list_iterator ili;\n"
-                            "int_list_array ila;";
+                            "int_list_array ila;\n";
 
         const char expected[] =
             ":: std :: list < int > il ; "
@@ -1226,7 +1250,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    INT a;\n"
                                 "};\n"
                                 "A::INT A::get() const { return a; }\n"
-                                "A::INT i = A::a;";
+                                "A::INT i = A::a;\n";
 
             const char expected[] = "class A { "
                                     "public: "
@@ -1249,7 +1273,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    INT a;\n"
                                 "};\n"
                                 "A::INT A::get() const { return a; }\n"
-                                "A::INT i = A::a;";
+                                "A::INT i = A::a;\n";
 
             const char expected[] = "struct A { "
                                     ""
@@ -1270,10 +1294,10 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef const CHAR * LPCSTR;\n"
                             "CHAR c;\n"
                             "LPSTR cp;\n"
-                            "LPCSTR ccp;";
+                            "LPCSTR ccp;\n";
 
         const char expected[] =
-            "; char c ; "
+            "char c ; "
             "char * cp ; "
             "const char * ccp ;";
 
@@ -1306,8 +1330,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "};\n"
                             "A::CHAR_A A::funA() { return a; }\n"
                             "A::B::SHRT_B A::B::funB() { return b; }\n"
-                            "A::B::C::INT_C A::B::C::funC() { return c; }"
-                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }";
+                            "A::B::C::INT_C A::B::C::funC() { return c; }\n"
+                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }\n";
 
         const char codeFullSpecified[] = "class A {\n"
                                          "public:\n"
@@ -1334,8 +1358,8 @@ class TestSimplifyTypedef : public TestFixture {
                                          "};\n"
                                          "A::CHAR_A A::funA() { return a; }\n"
                                          "A::B::SHRT_B A::B::funB() { return b; }\n"
-                                         "A::B::C::INT_C A::B::C::funC() { return c; }"
-                                         "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }";
+                                         "A::B::C::INT_C A::B::C::funC() { return c; }\n"
+                                         "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }\n";
 
         const char codePartialSpecified[] = "class A {\n"
                                             "public:\n"
@@ -1362,8 +1386,8 @@ class TestSimplifyTypedef : public TestFixture {
                                             "};\n"
                                             "A::CHAR_A A::funA() { return a; }\n"
                                             "A::B::SHRT_B A::B::funB() { return b; }\n"
-                                            "A::B::C::INT_C A::B::C::funC() { return c; }"
-                                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }";
+                                            "A::B::C::INT_C A::B::C::funC() { return c; }\n"
+                                            "A::B::C::D::LONG_D A::B::C::D::funD() { return d; }\n";
 
         const char expected[] =
             "class A { "
@@ -1406,7 +1430,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "int main()\n"
                             "{\n"
                             "    foofunc *Foo = new foofunc[2];\n"
-                            "}";
+                            "}\n";
         const char expected[] =
             "class X { } ; "
             "int main ( ) "
@@ -1454,7 +1478,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    A a = 0;\n"
                             "    S::A s = fun1(a) + fun2(a) - fun3(a);\n"
                             "    return a + s;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "class S "
                                 "{ "
@@ -1499,7 +1523,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void f(va_list ap)\n"
                             "{\n"
                             "    *va_arg(ap, TIFFFaxFillFunc*) = 0;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( va_list ap ) "
                                 "{ "
                                 "* va_arg ( ap , void ( * * ) ( ) ) = 0 ; "
@@ -1512,7 +1536,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void f()\n"
                             "{\n"
                             "    INT i; { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( ) "
                                 "{ "
                                 "int i ; { } "
@@ -1522,7 +1546,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef38() {
         const char code[] = "typedef C A;\n"
-                            "struct AB : public A, public B { };";
+                            "struct AB : public A, public B { };\n";
         const char expected[] = "struct AB : public C , public B { } ;";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         ASSERT_EQUALS("", errout_str());
@@ -1535,7 +1559,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "struct A\n"
                                 "{\n"
                                 "    int alloclen;\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "struct A "
@@ -1551,7 +1575,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "union A\n"
                                 "{\n"
                                 "    int alloclen;\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "union A "
@@ -1567,7 +1591,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "class A\n"
                                 "{\n"
                                 "    int alloclen;\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class A "
@@ -1584,7 +1608,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef std::map<std::string, int> Map;\n"
                                 "class MyMap : public Map\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class MyMap : public std :: map < std :: string , int > "
@@ -1598,7 +1622,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef std::map<std::string, int> Map;\n"
                                 "class MyMap : protected Map\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class MyMap : protected std :: map < std :: string , int > "
@@ -1612,7 +1636,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef std::map<std::string, int> Map;\n"
                                 "class MyMap : private Map\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class MyMap : private std :: map < std :: string , int > "
@@ -1626,7 +1650,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef struct foo { } A;\n"
                                 "struct MyA : public A\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "struct foo { } ; "
@@ -1641,7 +1665,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "typedef class foo { } A;\n"
                                 "class MyA : public A\n"
                                 "{\n"
-                                "};";
+                                "};\n";
 
             // The expected result..
             const char expected[] = "class foo { } ; "
@@ -1683,7 +1707,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "void fn() {\n"
                             "    typedef foo<> bar;\n"
                             "    while (0 > bar(1)) {}\n"
-                            "}";
+                            "}\n";
 
         checkSimplifyTypedef(code);
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
@@ -1694,7 +1718,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef46() {
         const char code[] = "typedef const struct A { int a; } * AP;\n"
-                            "AP ap;";
+                            "AP ap;\n";
 
         // The expected result..
         const char expected[] = "struct A { int a ; } ; "
@@ -1705,7 +1729,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef47() {
         {
             const char code[] = "typedef std::pair<int, int> const I;\n"
-                                "I i;";
+                                "I i;\n";
 
             // The expected result..
             const char expected[] = "const std :: pair < int , int > i ;";
@@ -1714,7 +1738,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (X:: *F)();\n"
-                                "F f;";
+                                "F f;\n";
 
             // The expected result..
             const char expected[] = "void ( * f ) ( ) ;";
@@ -1727,7 +1751,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void foo (LIST *module_name)\n"
                             "{\n"
                             "    bar(module_name ? module_name->string : 0);\n"
-                            "}";
+                            "}\n";
 
         // The expected result..
         const char expected[] = "struct string { } ; "
@@ -1743,7 +1767,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef const Class & Const_Reference;\n"
                             "void some_method (Const_Reference x) const {}\n"
                             "void another_method (Const_Reference x) const {}\n"
-                            "};";
+                            "};\n";
 
         // The expected result..
         const char expected[] = "class Class2 { "
@@ -1763,7 +1787,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "type1 (*tp1)[2];\n"
                             "type2 t2;\n"
                             "type3 t3;\n"
-                            "type4 t4;";
+                            "type4 t4;\n";
 
         // The expected result..
         const char expected[] = "char ( * t1 ) [ 10 ] ; "
@@ -1777,7 +1801,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef51() {
         const char code[] = "class A { public: int i; };\n"
                             "typedef const char (A :: * type1);\n"
-                            "type1 t1 = &A::i;";
+                            "type1 t1 = &A::i;\n";
 
         // The expected result..
         const char expected[] = "class A { public: int i ; } ; "
@@ -1788,7 +1812,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef52() { // ticket #1782
         {
             const char code[] = "typedef char (* type1)[10];\n"
-                                "type1 foo() { }";
+                                "type1 foo() { }\n";
 
             // The expected result..
             const char expected[] = "char ( * foo ( ) ) [ 10 ] { }";
@@ -1798,7 +1822,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef char (* type1)[10];\n"
-                                "LOCAL(type1) foo() { }";
+                                "LOCAL(type1) foo() { }\n";
 
             // this is invalid C, assert that an "unknown macro" warning is written
             ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code), UNKNOWN_MACRO);
@@ -1817,7 +1841,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    {\n"
                             "        pthread_exit (0);\n"
                             "    }\n"
-                            "}";
+                            "}\n";
 
         checkSimplifyTypedef(code);
         ASSERT_EQUALS("", errout_str());
@@ -1829,7 +1853,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef int*const *_Iterator;\n"
                             "hwreg_t v1;\n"
                             "t1 v2;\n"
-                            "_Iterator v3;";
+                            "_Iterator v3;\n";
 
         // The expected result..
         const char expected[] = "volatile long * const v1 ; "
@@ -1847,7 +1871,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    typedef void (*fptr)();\n"
                             "    const fptr pr;\n"
                             "    operator const fptr& () { return pr; }\n"
-                            "};";
+                            "};\n";
 
         // The expected result..
         const char expected[] = "struct C { "
@@ -1863,7 +1887,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "void foo() {\n"
                             "    typedef int A;\n"
                             "    A a = A(1) * A(2);\n"
-                            "};";
+                            "};\n";
 
         // The expected result..
         const char expected[] = "void foo ( ) { "
@@ -1877,7 +1901,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef58() { // ticket #1963
         {
             const char code[] = "typedef int vec2_t[2];\n"
-                                "vec2_t coords[4] = {1,2,3,4,5,6,7,8};";
+                                "vec2_t coords[4] = {1,2,3,4,5,6,7,8};\n";
 
             // The expected result..
             const char expected[] = "int coords [ 4 ] [ 2 ] = { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 } ;";
@@ -1887,7 +1911,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef int vec2_t[2];\n"
-                                "vec2_t coords[4][5][6+1] = {1,2,3,4,5,6,7,8};";
+                                "vec2_t coords[4][5][6+1] = {1,2,3,4,5,6,7,8};\n";
 
             // The expected result..
             const char expected[] = "int coords [ 4 ] [ 5 ] [ 6 + 1 ] [ 2 ] = { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 } ;";
@@ -1899,7 +1923,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef59() { // ticket #2011
         const char code[] = "template<typename DISPATCHER> class SomeTemplateClass {\n"
                             "    typedef void (SomeTemplateClass<DISPATCHER>::*MessageDispatcherFunc)(SerialInputMessage&);\n"
-                            "};";
+                            "};\n";
         // The expected result..
         const char expected[] = "template < typename DISPATCHER > class SomeTemplateClass { } ;";
         ASSERT_EQUALS(expected, tok(code));
@@ -1913,7 +1937,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "{\n"
                             "    qboolean b;\n"
                             "    localEntitiyAddFunc_t f;\n"
-                            "}";
+                            "}\n";
         // The expected result..
         const char expected[] = "enum qboolean { qfalse , qtrue } ; void f ( ) { enum qboolean b ; enum qboolean ( * f ) ( struct le_s * , entity_t * ) ; }";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -1922,14 +1946,14 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef61() { // ticket #2074 and 2075
         const char code1[] = "typedef       unsigned char   (*Mf_GetIndexByte_Func)          (void);\n"
-                             "typedef const unsigned char * (*Mf_GetPointerToCurrentPos_Func)(void);";
+                             "typedef const unsigned char * (*Mf_GetPointerToCurrentPos_Func)(void);\n";
 
         // Check for output..
         checkSimplifyTypedef(code1);
         ASSERT_EQUALS("", errout_str());
 
         const char code2[] = "typedef unsigned long uint32_t;\n"
-                             "typedef uint32_t (*write_type_t) (uint32_t);";
+                             "typedef uint32_t (*write_type_t) (uint32_t);\n";
 
         // Check for output..
         checkSimplifyTypedef(code2);
@@ -1941,7 +1965,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a, b;\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected1[] = "void f ( ) { char a [ 256 ] ; char b [ 256 ] ; }";
@@ -1952,7 +1976,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a = { 0 }, b = { 0 };\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected2[] = "void f ( ) { char a [ 256 ] = { 0 } ; char b [ 256 ] = { 0 } ; }";
@@ -1963,7 +1987,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a = \"\", b = \"\";\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected3[] = "void f ( ) { char a [ 256 ] ; a = \"\" ; char b [ 256 ] ; b = \"\" ; }";
@@ -1974,7 +1998,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "void f()\n"
                              "{\n"
                              "    TString a = \"1234\", b = \"5678\";\n"
-                             "}";
+                             "}\n";
 
         // The expected tokens..
         const char expected4[] = "void f ( ) { char a [ 256 ] ; a = \"1234\" ; char b [ 256 ] ; b = \"5678\" ; }";
@@ -1984,7 +2008,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef63() { // ticket #2175 'typedef float x[3];'
         const char code[] = "typedef float x[3];\n"
-                            "x a,b,c;";
+                            "x a,b,c;\n";
         const std::string actual(tok(code));
         ASSERT_EQUALS("float a [ 3 ] ; float b [ 3 ] ; float c [ 3 ] ;", actual);
         ASSERT_EQUALS("", errout_str());
@@ -1992,7 +2016,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef64() {
         const char code[] = "typedef typeof(__type1() + __type2()) __type;"
-                            "__type t;";
+                            "__type t;\n";
         const std::string actual(tok(code));
         ASSERT_EQUALS("typeof ( __type1 ( ) + __type2 ( ) ) t ;", actual);
         ASSERT_EQUALS("", errout_str());
@@ -2003,7 +2027,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "int main() {\n"
                             "    Foo b(0);\n"
                             "    return b > Foo(10);\n"
-                            "}";
+                            "}\n";
         const std::string actual(tok(code, dinit(TokOptions, $.debugwarnings = false)));
         ASSERT_EQUALS("int main ( ) { BAR < int > b ( 0 ) ; return b > BAR < int > ( 10 ) ; }", actual);
         ASSERT_EQUALS("", errout_str());
@@ -2011,7 +2035,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef66() { // ticket #2341
         const char code[] = "typedef long* GEN;\n"
-                            "extern GEN (*foo)(long);";
+                            "extern GEN (*foo)(long);\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -2020,7 +2044,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef int ( * Function ) ( ) ;\n"
                             "void f ( ) {\n"
                             "    ((Function * (*) (char *, char *, int, int)) global[6]) ( \"assoc\", \"eggdrop\", 106, 0);\n"
-                            "}";
+                            "}\n";
         // TODO should it be simplified as below instead?
         // "( ( int ( * * ( * ) ( char * , char * , int , int ) ) ( ) ) global [ 6 ] ) ( \"assoc\" , \"eggdrop\" , 106 , 0 ) ; "
         const char expected[] = "void f ( ) { "
@@ -2028,13 +2052,13 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS(
-            "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable global\n",
+            "[test.cpp:3:50]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable global [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void simplifyTypedef68() { // ticket #2355
         const char code[] = "typedef FMAC1 void (* a) ();\n"
-                            "void *(*b) ();";
+                            "void *(*b) ();\n";
         const std::string actual(tok(code));
         ASSERT_EQUALS("void * ( * b ) ( ) ;", actual);
         ASSERT_EQUALS("", errout_str());
@@ -2045,7 +2069,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef struct VirtualMachine\n"
                             "{\n"
                             "    CompilerHook *(*compilerHookVector)(void);\n"
-                            "}VirtualMachine;";
+                            "}VirtualMachine;\n";
         const char expected[] = "struct VirtualMachine "
                                 "{ "
                                 "int ( * * ( * compilerHookVector ) ( void ) ) ( ) ; "
@@ -2056,7 +2080,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef70() { // ticket #2348
         const char code[] = "typedef int pread_f ( int ) ;\n"
-                            "pread_f *(*test_func)(char *filename);";
+                            "pread_f *(*test_func)(char *filename);\n";
         const char expected[] = "int ( * ( * test_func ) ( char * filename ) ) ( int ) ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2065,14 +2089,14 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef71() { // ticket #2348
         {
             const char code[] = "typedef int RexxFunctionHandler();\n"
-                                "RexxFunctionHandler *(efuncs[1]);";
+                                "RexxFunctionHandler *(efuncs[1]);\n";
             const char expected[] = "int ( * ( efuncs [ 1 ] ) ) ( ) ;";
             ASSERT_EQUALS(expected, tok(code));
             ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "typedef int RexxFunctionHandler();\n"
-                                "RexxFunctionHandler *(efuncs[]) = { NULL, NULL };";
+                                "RexxFunctionHandler *(efuncs[]) = { NULL, NULL };\n";
             const char expected[] = "int ( * ( efuncs [ ] ) ) ( ) = { NULL , NULL } ;";
             ASSERT_EQUALS(expected, tok(code));
             ASSERT_EQUALS("", errout_str());
@@ -2085,7 +2109,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class Fred {\n"
                                 "    typedef int* (Fred::*F);\n"
                                 "    operator F() const { }\n"
-                                "};";
+                                "};\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "operatorint** ( ) const { } "
@@ -2098,7 +2122,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class Fred {\n"
                                 "    typedef int INT;\n"
                                 "    void f1() const { INT i; }\n"
-                                "};";
+                                "};\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "void f1 ( ) const { int i ; } "
@@ -2112,7 +2136,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef int INT;\n"
                                 "    void f1() const;\n"
                                 "};\n"
-                                "void Fred::f1() const { INT i; f(i); }";
+                                "void Fred::f1() const { INT i; f(i); }\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "void f1 ( ) const ; "
@@ -2127,7 +2151,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    typedef int* (Fred::*F);\n"
                                 "    operator F() const;\n"
                                 "};\n"
-                                "Fred::operator F() const { }";
+                                "Fred::operator F() const { }\n";
             const char expected[] = "class Fred { "
                                     ""
                                     "operatorint** ( ) const ; "
@@ -2142,7 +2166,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "struct B {};\n"
                             "typedef struct A : public B {\n"
                             "    void f();\n"
-                            "} a, *aPtr;";
+                            "} a, *aPtr;\n";
         const char expected[] = "struct B { } ; "
                                 "struct A : public B { "
                                 "void f ( ) ; "
@@ -2155,7 +2179,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef long (*state_func_t)(void);\n"
                             "typedef state_func_t (*state_t)(void);\n"
                             "state_t current_state = death;\n"
-                            "static char get_runlevel(const state_t);";
+                            "static char get_runlevel(const state_t);\n";
         const char expected[] = "long ( * ( * current_state ) ( void ) ) ( void ) ; current_state = death ; "
                                 "static char get_runlevel ( long ( * ( * const ) ( void ) ) ( void ) ) ;";
         ASSERT_EQUALS(expected, tok(code));
@@ -2163,17 +2187,17 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef75() { // ticket #2426
-        const char code[] = "typedef _Packed struct S { long l; };";
+        const char code[] = "typedef _Packed struct S { long l; };\n";
         ASSERT_EQUALS(";", tok(code, dinit(TokOptions, $.debugwarnings = false)));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef76() { // ticket #2453 segmentation fault
-        ASSERT_THROW_INTERNAL(checkSimplifyTypedef("void f1(typedef int x) {}"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef("void f1(typedef int x) {}\n"), SYNTAX);
     }
 
     void simplifyTypedef77() { // ticket #2554
-        const char code[] = "typedef char Str[10]; int x = sizeof(Str);";
+        const char code[] = "typedef char Str[10]; int x = sizeof(Str);\n";
         const char expected[] = "int x ; x = sizeof ( char [ 10 ] ) ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -2182,7 +2206,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct A A_t;\n"
                             "A_t a;\n"
                             "typedef struct A { } A_t;\n"
-                            "A_t a1;";
+                            "A_t a1;\n";
         const char expected[] = "struct A a ; struct A { } ; struct A a1 ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -2192,7 +2216,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef struct LangVtab\n"
                             "{\n"
                             "    Tcl_ObjCmdProc * (*V_LangOptionCommand);\n"
-                            "} LangVtab;";
+                            "} LangVtab;\n";
         const char expected[] = "struct LangVtab "
                                 "{ "
                                 "int ( * ( * V_LangOptionCommand ) ) ( int x ) ; "
@@ -2204,7 +2228,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct s { };\n"
                             "void f() {\n"
                             "    sizeof(struct s);\n"
-                            "};";
+                            "};\n";
         const char expected[] = "struct s { } ; "
                                 "void f ( ) { "
                                 "sizeof ( struct s ) ; "
@@ -2232,13 +2256,13 @@ class TestSimplifyTypedef : public TestFixture {
                              "{\n"
                              "  B * b = new B;\n"
                              "  b->f = new A::F * [ 10 ];\n"
-                             "}");
+                             "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef83() { // ticket #2620
         const char code[] = "typedef char Str[10];\n"
-                            "void f(Str &cl) { }";
+                            "void f(Str &cl) { }\n";
 
         // The expected result..
         const char expected[] = "void f ( char ( & cl ) [ 10 ] ) { }";
@@ -2247,18 +2271,18 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef84() { // ticket #2630 (segmentation fault)
-        const char code1[] = "typedef y x () x";
+        const char code1[] = "typedef y x () x\n";
         ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code1), SYNTAX);
 
-        const char code2[] = "typedef struct template <>";
+        const char code2[] = "typedef struct template <>\n";
         ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code2), SYNTAX);
 
-        const char code3[] = "typedef ::<>";
+        const char code3[] = "typedef ::<>\n";
         ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code3), SYNTAX);
     }
 
     void simplifyTypedef85() { // ticket #2651
-        const char code[] = "typedef FOO ((BAR)(void, int, const int, int*));";
+        const char code[] = "typedef FOO ((BAR)(void, int, const int, int*));\n";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2270,7 +2294,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "public:\n"
                             "    operator safe_bool() const;\n"
                             "    safe_bool operator!() const;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class relational { "
                                 ""
                                 "public: "
@@ -2282,14 +2306,14 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef87() { // ticket #2651
-        const char code[] = "typedef FOO (*(*BAR)(void, int, const int, int*));";
+        const char code[] = "typedef FOO (*(*BAR)(void, int, const int, int*));\n";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef88() { // ticket #2675
-        const char code[] = "typedef short int (*x)(...);";
+        const char code[] = "typedef short int (*x)(...);\n";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2299,7 +2323,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "class Fred {\n"
                             "    typedef void f(int) const;\n"
                             "    f func;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class Fred { void func ( int ) const ; } ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2307,7 +2331,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef90() { // ticket #2718
         const char code[] = "typedef int IA[2];\n"
-                            "void f(const IA&) {};";
+                            "void f(const IA&) {};\n";
         const char expected[] = "void f ( const int ( & ) [ 2 ] ) { } ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2322,7 +2346,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "}\n"
                              "namespace NS {\n"
                              "    T A::f() {}\n"
-                             "}";
+                             "}\n";
         const char expected1[] = "namespace NS { "
                                  ""
                                  "class A { "
@@ -2341,7 +2365,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "        T f();\n"
                              "    };\n"
                              "}\n"
-                             "NS::T NS::A::f() {}";
+                             "NS::T NS::A::f() {}\n";
         const char expected2[] = "namespace NS { "
                                  ""
                                  "class A { "
@@ -2364,7 +2388,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    namespace NS2 {\n"
                              "        T A::f() {}\n"
                              "    }\n"
-                             "}";
+                             "}\n";
         const char expected3[] = "namespace NS1 { "
                                  "namespace NS2 { "
                                  ""
@@ -2391,7 +2415,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "}\n"
                              "namespace NS1 {\n"
                              "    NS2::T NS2::A::f() {}\n"
-                             "}";
+                             "}\n";
         const char expected4[] = "namespace NS1 { "
                                  "namespace NS2 { "
                                  ""
@@ -2410,14 +2434,14 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef92() { // ticket #2736 (segmentation fault)
         const char code[] = "typedef long Long;\n"
                             "namespace NS {\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS(";", tok(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef93() { // ticket #2738 (syntax error)
         const char code[] = "struct s { double x; };\n"
-                            "typedef struct s (*binop) (struct s, struct s);";
+                            "typedef struct s (*binop) (struct s, struct s);\n";
         const char expected[] = "struct s { double x ; } ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2430,7 +2454,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    int a[4];\n"
                              "  } data;\n"
                              "};\n"
-                             "A::data d;";
+                             "A::data d;\n";
         const char expected1[] = "class A { "
                                  "public: "
                                  "struct data { "
@@ -2447,7 +2471,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    int a[4];\n"
                              "  } data;\n"
                              "};\n"
-                             "::A::data d;";
+                             "::A::data d;\n";
         const char expected2[] = "class A { "
                                  "public: "
                                  "struct data { "
@@ -2464,7 +2488,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "    int a[4];\n"
                              "  } data;\n"
                              "};\n"
-                             "class B : public ::A::data { };";
+                             "class B : public ::A::data { };\n";
         const char expected3[] = "class A { "
                                  "public: "
                                  "struct data { "
@@ -2481,7 +2505,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "public:\n"
                             "  typedef expression_error::error_code (*valid_func)(void *cbparam, const char *name, expression_space space);\n"
                             "  valid_func f;\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class symbol_table { "
                                 "public: "
                                 "expression_error :: error_code ( * f ) ( void * , const char * , expression_space ) ; "
@@ -2491,25 +2515,25 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef96() { // ticket #2886 (segmentation fault)
-        const char code[] = "typedef struct x { }";
+        const char code[] = "typedef struct x { }\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void simplifyTypedef97() { // ticket #2983 (segmentation fault)
         const char code[] = "typedef x y\n"
-                            "(A); y";
+                            "(A); y\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef99() { // ticket #2999
         const char code[] = "typedef struct Fred Fred;\n"
-                            "struct Fred { };";
+                            "struct Fred { };\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
 
         const char code1[] = "struct Fred { };\n"
-                             "typedef struct Fred Fred;";
+                             "typedef struct Fred Fred;\n";
         (void)tok(code1);
         ASSERT_EQUALS("", errout_str());
     }
@@ -2520,14 +2544,14 @@ class TestSimplifyTypedef : public TestFixture {
                             "    Fred *fred;\n"
                             "    fred = se_alloc(sizeof(struct Fred));\n"
                             "    return fred;\n"
-                            "}";
+                            "}\n";
         (void)tok(code);
         ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout_str());
     }
 
     void simplifyTypedef101() { // ticket #3003 (segmentation fault)
         const char code[] = "typedef a x[];\n"
-                            "y = x";
+                            "y = x\n";
         ASSERT_EQUALS("y = x", tok(code));
     }
 
@@ -2536,7 +2560,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void foo()\n"
                             "{\n"
                             "    Fred * Fred;\n"
-                            "}";
+                            "}\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -2546,29 +2570,29 @@ class TestSimplifyTypedef : public TestFixture {
                             "void foo()\n"
                             "{\n"
                             "    Fred Fred;\n"
-                            "}";
+                            "}\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef104() { // ticket #3070
-        const char code[] = "typedef int (*in_func) (void FAR *, unsigned char FAR * FAR *);";
+        const char code[] = "typedef int (*in_func) (void FAR *, unsigned char FAR * FAR *);\n";
         ASSERT_EQUALS(";", tok(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef105() { // ticket #3616 (segmentation fault)
-        const char code[] = "( int typedef char x; ){}";
+        const char code[] = "( int typedef char x; ){}\n";
         ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void simplifyTypedef106() { // ticket #3619 (segmentation fault)
-        const char code[] = "typedef void f ();\ntypedef { f }";
+        const char code[] = "typedef void f ();\ntypedef { f }\n";
         ASSERT_THROW_INTERNAL_EQUALS(tok(code), INTERNAL, "Internal error. AST cyclic dependency.");
     }
 
     void simplifyTypedef107() { // ticket #3963 (bad code => segmentation fault)
-        const char code[] = "typedef int x[]; int main() { return x }";
+        const char code[] = "typedef int x[]; int main() { return x }\n";
         ASSERT_EQUALS("int main ( ) { return x }", tok(code));
         ignore_errout(); // we do not care about the output
     }
@@ -2578,7 +2602,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void sort_factor(GEN *y, long n) {\n"
                             "    GEN a, b;\n"
                             "    foo(a, b);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void sort_factor ( long * * y , long n ) { "
                                 "long * a ; long * b ; "
                                 "foo ( a , b ) ; "
@@ -2588,7 +2612,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef109() {
         const char code[] = "typedef int&& rref;\n"
-                            "rref var = 0;";
+                            "rref var = 0;\n";
         const char expected[] = "int && var = 0 ;";
         ASSERT_EQUALS(expected, tok(code));
         ASSERT_EQUALS("", errout_str());
@@ -2623,7 +2647,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "            C::D::DKIPtr membervariable5;\n"
                             "        };\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "namespace A { "
                                 "namespace B { "
                                 "struct ZClass { "
@@ -2704,7 +2728,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    enum  {\n"
                             "      domain_dim = TrafoEvaluator::domain_dim,\n"
                             "    };\n"
-                            "};";
+                            "};\n";
 
         const char expected[] = "template < "
                                 "typename DataType , "
@@ -2720,14 +2744,14 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef113() {     // ticket #7030
         const char code[] = "typedef int T;\n"
-                            "void f() { T:; }";
+                            "void f() { T:; }\n";
         const char expected[] = "void f ( ) { T : ; }";
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void simplifyTypedef114() {     // ticket #7058
         const char code[] = "typedef struct { enum {A,B}; } AB;\n"
-                            "x=AB::B;";
+                            "x=AB::B;\n";
         const char expected[] = "struct AB { enum Anonymous0 { A , B } ; } ; x = AB :: B ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -2735,7 +2759,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef115() {     // ticket #6998
         const char code[] = "typedef unsigned unsignedTypedef;\n"
                             "unsignedTypedef t1 ;\n"
-                            "unsigned t2 ;";
+                            "unsigned t2 ;\n";
         const char expected[] = "unsigned int t1 ; "
                                 "unsigned int t2 ;";
         ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2748,7 +2772,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    CharacterToConversion c2c;\n"
                             "    for (CharacterToConversion::iterator it = c2c.begin(); it != c2c.end(); ++it) {}\n"
                             "    CharacterToConversion().swap(c2c);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void fn ( ) { "
                                 "std :: vector < CharacterConversion > c2c ; "
                                 "for ( std :: vector < CharacterConversion > :: iterator it = c2c . begin ( ) ; it != c2c . end ( ) ; ++ it ) { } "
@@ -2762,7 +2786,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct bstr {} bstr;\n"
                             "struct bstr bstr0(const char *s) {\n"
                             "    return (struct bstr) { (unsigned char *)s, s ? strlen(s) : 0 };\n"
-                            "}";
+                            "}\n";
         const char expected[] = "struct bstr { } ; "
                                 "struct bstr bstr0 ( const char * s ) { "
                                 "return ( struct bstr ) { ( unsigned char * ) s , s ? strlen ( s ) : 0 } ; "
@@ -2777,7 +2801,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef int (ClassyClass::*funky_type);\n"
                             "operator funky_type() {\n"
                             "return &ClassyClass::id;\n"
-                            "}}";
+                            "}}\n";
         const char expected[] = "struct ClassyClass { "
                                 "int id ; "
                                 "operatorintClassyClass::* ( ) { "
@@ -2793,7 +2817,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "  typedef T1 XX;\n"
                             "}\n"
                             "namespace Baz { }\n"
-                            "enum Bar { XX = 1 };";
+                            "enum Bar { XX = 1 };\n";
         const char exp[] = "enum Bar { XX = 1 } ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
         ASSERT_EQUALS("", errout_str());
@@ -2802,7 +2826,7 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef120() { // #8357
         const char code[] = "typedef char test_utf8_char[5];\n"
                             "static test_utf8_char const bad_chars[] = { };\n"
-                            "static void report_good(bool passed, test_utf8_char const c) { };";
+                            "static void report_good(bool passed, test_utf8_char const c) { };\n";
         const char exp[] = "static const char bad_chars [ ] [ 5 ] = { } ; "
                            "static void report_good ( bool passed , const char c [ 5 ] ) { } ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2826,7 +2850,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "vec3 & Fred::v() { return v3; }\n"
                             "mat3x3 & Fred::m() { return m3x3; }\n"
                             "const vec3 & Fred::vc() const { return v3; }\n"
-                            "const mat3x3 & Fred::mc() const { return m3x3; }";
+                            "const mat3x3 & Fred::mc() const { return m3x3; }\n";
         const char exp[] = "float v3 [ 3 ] ; "
                            "float m3x3 [ 3 ] [ 3 ] ; "
                            "const float * & gv ( ) { return v3 ; } "
@@ -2847,14 +2871,14 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef122() { // segmentation fault
-        const char code[] = "int result = [] { return git_run_cmd(\"update-index\",\"update-index -q --refresh\"); }();";
+        const char code[] = "int result = [] { return git_run_cmd(\"update-index\",\"update-index -q --refresh\"); }();\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef123() { // ticket #7406
         const char code[] = "typedef int intvec[1];\n"
-                            "Dummy<intvec> y;";
+                            "Dummy<intvec> y;\n";
         const char exp[] = "Dummy < int [ 1 ] > y ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
         ASSERT_EQUALS("", errout_str());
@@ -2862,15 +2886,15 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef124() { // ticket #7792
         const char code[] = "typedef long unsigned int size_t;\n"
-                            "typedef size_t (my_func)(char *, size_t, size_t, void *);"
-                            "size_t f(size_t s);";
+                            "typedef size_t (my_func)(char *, size_t, size_t, void *);\n"
+                            "size_t f(size_t s);\n";
 
         const char exp[] = "long f ( long s ) ;";
         ASSERT_EQUALS(exp, tok(code));
         ASSERT_EQUALS("", errout_str());
 
         const char code1[] = "typedef long unsigned int uint32_t;\n"
-                             "typedef uint32_t (my_func)(char *, uint32_t, uint32_t, void *);";
+                             "typedef uint32_t (my_func)(char *, uint32_t, uint32_t, void *);\n";
 
         // Check for output..
         checkSimplifyTypedef(code1);
@@ -2880,22 +2904,22 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef125() { // #8749
         const char code[] = "typedef char A[3];\n"
-                            "char (*p)[3] = new A[4];";
+                            "char (*p)[3] = new A[4];\n";
         const char exp[] = "char ( * p ) [ 3 ] = new char [ 4 ] [ 3 ] ;";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef126() { // #5953
         const char code[] = "typedef char automap_data_t[100];\n"
-                            "void write_array(automap_data_t *data) {}";
+                            "void write_array(automap_data_t *data) {}\n";
         const char exp[] = "void write_array ( char ( * data ) [ 100 ] ) { }";
         ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef127() { // #8878
-        const char code[] = "class a; typedef int (a::*b); "
-                            "template <long, class> struct c; "
-                            "template <int g> struct d { enum { e = c<g, b>::f }; };";
+        const char code[] = "class a; typedef int (a::*b);\n"
+                            "template <long, class> struct c;\n"
+                            "template <int g> struct d { enum { e = c<g, b>::f }; };\n";
         const char exp[] = "class a ; "
                            "template < long , class > struct c ; "
                            "template < int g > struct d { enum Anonymous0 { e = c < g , int ( a :: * ) > :: f } ; } ;";
@@ -2906,7 +2930,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef int d[4];\n"
                             "void f() {\n"
                             "    dostuff((const d){1,2,3,4});\n"
-                            "}";
+                            "}\n";
         const char exp[] = "void f ( ) { "
                            "dostuff ( ( const int [ 4 ] ) { 1 , 2 , 3 , 4 } ) ; "
                            "}";
@@ -2918,7 +2942,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class c {\n"
                                 "  typedef char foo[4];\n"
                                 "  foo &f ;\n"
-                                "};";
+                                "};\n";
 
             const char exp[] = "class c { char ( & f ) [ 4 ] ; } ;";
             ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2928,7 +2952,7 @@ class TestSimplifyTypedef : public TestFixture {
             const char code[] = "class c {\n"
                                 "  typedef char foo[4];\n"
                                 "  const foo &f;\n"
-                                "};";
+                                "};\n";
 
             const char exp[] = "class c { const char ( & f ) [ 4 ] ; } ;";
             ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2939,7 +2963,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "  typedef char foo[4];\n"
                                 "  foo _a;\n"
                                 "  constexpr const foo &c_str() const noexcept { return _a; }\n"
-                                "};";
+                                "};\n";
 
             const char exp[] = "class c { char _a [ 4 ] ; const constexpr char ( & c_str ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
             ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
@@ -2950,7 +2974,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "  typedef char foo[4];\n"
                                 "  foo _a;\n"
                                 "  constexpr operator foo &() noexcept { return _a; }\n"
-                                "};";
+                                "};\n";
 
             const char actual[] = "class c { char _a [ 4 ] ; constexpr char ( & operatorchar ( ) noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
             const char exp[] = "class c { char _a [ 4 ] ; char ( & operatorchar ( ) noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
@@ -2962,7 +2986,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "  typedef char foo[4];\n"
                                 "  foo _a;\n"
                                 "  constexpr operator const foo &() const noexcept { return _a; }\n"
-                                "};";
+                                "};\n";
 
             const char actual[] = "class c { char _a [ 4 ] ; constexpr const char ( & operatorconstchar ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
             const char exp[] = "class c { char _a [ 4 ] ; const char ( & operatorconstchar ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
@@ -2974,7 +2998,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "template <class, class> void a() {\n"
                             "  typedef int(*b)[10];\n"
                             "  a<b, b>();\n"
-                            "}";
+                            "}\n";
 
         const char exp[] = "template < class , class > void a ( ) { "
                            "a < int ( * ) [ 10 ] , int ( * ) [ 10 ] > ( ) ; "
@@ -2988,7 +3012,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "a4 a4obj;\n"
                             "a4 &&  a4_rref = std::move(a4obj);\n"
                             "a4* a4p = &(a4obj);\n"
-                            "a4*&& a4p_rref = std::move(a4p);";
+                            "a4*&& a4p_rref = std::move(a4p);\n";
 
         const char exp[] = "unsigned char a4obj [ 4 ] ; "
                            "unsigned char ( && a4_rref ) [ 4 ] = std :: move ( a4obj ) ; "
@@ -3010,7 +3034,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "\n"
                             "using NamespaceA::MySpecialType;\n"
                             "\n"
-                            "void A::DoSomething( MySpecialType wrongName ) {}";
+                            "void A::DoSomething( MySpecialType wrongName ) {}\n";
 
         const char exp[] = "class A { "
                            "void DoSomething ( int special ) ; "
@@ -3025,14 +3049,14 @@ class TestSimplifyTypedef : public TestFixture {
                             "using array_p = const array_t *;\n"
                             "array_p x;\n";
         ASSERT_EQUALS("using array_p = const unsigned char ( * ) [ 16 ] ; array_p x ;", tok(code, dinit(TokOptions, $.simplify = false)));
-        ASSERT_EQUALS("[test.cpp:2]: (debug) Failed to parse 'using array_p = const unsigned char ( * ) [ 16 ] ;'. The checking continues anyway.\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:1]: (debug) Failed to parse 'using array_p = const unsigned char ( * ) [ 16 ] ;'. The checking continues anyway. [simplifyUsing]\n", errout_str());
     }
 
     void simplifyTypedef134() {
         const char code[] = "namespace foo { typedef long long int64; }\n"
                             "typedef int int32;\n"
                             "namespace foo { int64 i; }\n"
-                            "int32 j;";
+                            "int32 j;\n";
         ASSERT_EQUALS("; namespace foo { long long i ; } int j ;", tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
@@ -3052,7 +3076,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    AstNodePtr range;\n"
                             "    range->createTokens();\n"
                             "}\n"
-                            "void clangimport::AstNode::createScope(const std::vector<AstNodePtr> & children2) { }";
+                            "void clangimport::AstNode::createScope(const std::vector<AstNodePtr> & children2) { }\n";
         const char expected[] = "namespace clangimport { "
                                 "class AstNode ; "
                                 "class AstNode { "
@@ -3081,7 +3105,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "S1 s1;\n"
                             "S2 s2;\n"
                             "S3 s3;\n"
-                            "S4 s4;";
+                            "S4 s4;\n";
 
         const char expected[] = "class C1 { } ; "
                                 "class S1 { } ; "
@@ -3113,7 +3137,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3147,7 +3171,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3181,7 +3205,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3213,7 +3237,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
             TODO_ASSERT_EQUALS(exp, act, tok(code));
-            TODO_ASSERT_EQUALS("", "[test.cpp:14]: (debug) Executable scope 'f' with unknown function.\n", errout_str());
+            TODO_ASSERT_EQUALS("", "[test.cpp:14:13]: (debug) Executable scope 'f' with unknown function. [symbolDatabaseWarning]\n", errout_str());
         }
         {
             // using "namespace external::ns1;" without redundant qualification on declaration and definition
@@ -3231,7 +3255,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -3278,7 +3302,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "struct B<1> ; "
                                 "} "
@@ -3308,7 +3332,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "struct B<1> ; "
                                 "namespace ns { "
                                 "struct A { "
@@ -3668,7 +3692,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "Y y;\n"
                             "Yp yp;\n"
                             "Ya ya;\n";
-        exp = "long y ; long * yp ; long ya [ 3 ] ;";
+        exp = "; long y ; long * yp ; long ya [ 3 ] ;";
         ASSERT_EQUALS(exp, tok(code));
     }
 
@@ -3789,10 +3813,89 @@ class TestSimplifyTypedef : public TestFixture {
         TODO_ASSERT_EQUALS(exp, cur, tok(code));
     }
 
+    void simplifyTypedef159() {
+        const char code[] = "typedef void (*const func_t)();\n" // #14387
+                            "func_t g() { return nullptr; }\n";
+        const char exp[] = "void * const g ( ) { return nullptr ; }";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef160() {
+        const char code[] = "struct S1 {};\n"
+                            "typedef struct S1 S2;\n"
+                            "namespace N {\n"
+                            "    struct B {\n"
+                            "        explicit B(int& i);\n"
+                            "    };\n"
+                            "    struct S2 : B {\n"
+                            "        explicit S2(int& i) : B(i) {}\n"
+                            "    };\n"
+                            "}\n";
+        const char exp[] = "struct S1 { } ; " // #12623
+                           "namespace N { "
+                           "struct B { "
+                           "explicit B ( int & i ) ; } ; "
+                           "struct S2 : B { "
+                           "explicit S2 ( int & i ) : B ( i ) { } "
+                           "} ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code));
+
+        const char code2[] = "typedef struct T* T;\n" // #14669
+                             "struct T {\n"
+                             "    T p;\n"
+                             "};\n";
+        const char exp2[] = "struct T { struct T * p ; } ;";
+        ASSERT_EQUALS(exp2, simplifyTypedefC(code2));
+    }
+
+    void simplifyTypedef161() {
+        const char code[] = "namespace N {\n" // #11775
+                            "    typedef int A[3];\n"
+                            "    p = new A*[n];\n"
+                            "}\n";
+        const char cur[] = "namespace N { p = new int ( * [ n ] ) [ 3 ] ; }";
+        const char exp[] = "namespace N { p = new ( int ( * [ n ] ) [ 3 ] ) ; }";
+        TODO_ASSERT_EQUALS(exp, cur, tok(code));
+
+        const char code2[] = "typedef int A[3];\n"
+                             "p = new A*[n];\n";
+        const char cur2[] = "p = new int ( * ) [ n ] [ 3 ] ;";
+        const char exp2[] = "p = new ( int ( * [ n ] ) [ 3 ] ) ;";
+        TODO_ASSERT_EQUALS(exp2, cur2, tok(code2));
+    }
+
+    void simplifyTypedef162() {
+        const char code[] = "using std::vector;\n" // #12041
+                            "typedef vector<int> ints;\n"
+                            "void f(ints v);\n";
+        const char exp[] = "void f ( std :: vector < int > v ) ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef163() {
+        const char code[] = "typedef v *v;\n";
+        ASSERT_THROW_INTERNAL(tok(code), INTERNAL);
+    }
+
+    void simplifyTypedef164() {
+        const char code[] = "typedef struct D{x;}y y;\n";
+        ASSERT_THROW_INTERNAL(tok(code), INTERNAL);
+
+        const char code2[] = "typedef struct { int t; } t;"; // #14966
+        ASSERT_EQUALS("struct t { int t ; } ;", tok(code2));
+
+        const char code3[] = "typedef struct S { S() {} } S;"; // #14971
+        ASSERT_EQUALS("struct S { S ( ) { } } ;", tok(code3));
+
+        const char code4[] = "typedef struct S { S& operator=(const S&) = delete; } S;"; // #14977
+        ASSERT_EQUALS("struct S { S & operator= ( const S & ) = delete ; } ;", tok(code4));
+    }
+
     void simplifyTypedefFunction1() {
         {
             const char code[] = "typedef void (*my_func)();\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3802,7 +3905,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (*my_func)(void);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3812,7 +3915,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (*my_func)(int);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3822,7 +3925,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (*my_func)(int*);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -3833,7 +3936,7 @@ class TestSimplifyTypedef : public TestFixture {
         {
             // ticket # 1615
             const char code[] = "typedef void (*my_func)(arg_class*);\n"
-                                "std::queue<my_func> func_queue;";
+                                "std::queue<my_func> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -3844,7 +3947,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)();\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3854,7 +3957,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(void);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3864,7 +3967,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(int);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3874,7 +3977,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(int*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -3884,7 +3987,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func)(arg_class*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -3895,7 +3998,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func();\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3905,7 +4008,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(void);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3915,7 +4018,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(int);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3925,7 +4028,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(int*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -3935,7 +4038,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void my_func(arg_class*);\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -3946,7 +4049,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func());\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
@@ -3956,7 +4059,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(void));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
@@ -3966,7 +4069,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(int));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
@@ -3976,7 +4079,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(int*));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
@@ -3986,7 +4089,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         {
             const char code[] = "typedef void (my_func(arg_class*));\n"
-                                "std::queue<my_func *> func_queue;";
+                                "std::queue<my_func *> func_queue;\n";
 
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
@@ -3997,7 +4100,7 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedefFunction2() { // ticket #1685
         const char code[] = "typedef void voidfn (int);\n"
-                            "voidfn xxx;";
+                            "voidfn xxx;\n";
 
         // The expected result..
         const char expected[] = "void xxx ( int ) ;";
@@ -4019,7 +4122,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "C f1 ( ) ; "
@@ -4047,7 +4150,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             // C const -> const C
@@ -4076,7 +4179,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "const C f1 ( ) ; "
@@ -4104,7 +4207,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "C * f1 ( ) ; "
@@ -4132,7 +4235,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             const char expected[] = "const C * f1 ( ) ; "
@@ -4160,7 +4263,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func4 f4;\n"
                                 "func5 f5;\n"
                                 "func6 f6;\n"
-                                "func7 f7;";
+                                "func7 f7;\n";
 
             // The expected result..
             // C const -> const C
@@ -4182,7 +4285,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef int ( * type3 ( bool ) ) ( int , int ) ;\n"
                             "type1 t1;\n"
                             "type2 t2;\n"
-                            "type3 t3;";
+                            "type3 t3;\n";
 
         // The expected result..
         const char expected[] = "int ( * ( * t1 ) ( bool ) ) ( int , int ) ; "
@@ -4216,7 +4319,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "type9 t9;\n"
                             "type10 t10;\n"
                             "type11 t11;\n"
-                            "type12 t12;";
+                            "type12 t12;\n";
 
         // The expected result..
         const char expected[] = "int ( * t1 ) ( float ) ; "
@@ -4245,7 +4348,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    void ( * get4 ( ) ) ( );\n"
                             "};\n"
                             "testfp Fred::get3() { return 0; }\n"
-                            "void ( * Fred::get4 ( ) ) ( ) { return 0 ; }";
+                            "void ( * Fred::get4 ( ) ) ( ) { return 0 ; }\n";
 
         // The expected result..
         const char expected[] = "struct Fred "
@@ -4263,8 +4366,8 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedefFunction7() {
-        const char code[] = "typedef void ( __gnu_cxx :: _SGIAssignableConcept < _Tp > :: * _func_Tp_SGIAssignableConcept ) () ;"
-                            "_func_Tp_SGIAssignableConcept X;";
+        const char code[] = "typedef void ( __gnu_cxx :: _SGIAssignableConcept < _Tp > :: * _func_Tp_SGIAssignableConcept ) () ;\n"
+                            "_func_Tp_SGIAssignableConcept X;\n";
 
         // The expected result..
         const char expected[] = "void ( __gnu_cxx :: _SGIAssignableConcept < _Tp > :: * X ) ( ) ;";
@@ -4276,9 +4379,9 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedefFunction8() {
         // #2376 - internal error
         const char code[] = "typedef int f_expand(const nrv_byte *);\n"
-                            "void f(f_expand *(*get_fexp(int))){}";
+                            "void f(f_expand *(*get_fexp(int))){}\n";
         checkSimplifyTypedef(code);
-        TODO_ASSERT_EQUALS("", "[test.cpp:2]: (debug) Function::addArguments found argument 'int' with varid 0.\n", errout_str());  // make sure that there is no internal error
+        TODO_ASSERT_EQUALS("", "[test.cpp:2:29]: (debug) Function::addArguments found argument 'int' with varid 0. [varid0]\n", errout_str());  // make sure that there is no internal error
     }
 
     void simplifyTypedefFunction9() {
@@ -4290,7 +4393,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = ":: C ( :: C :: * f1 ) ( ) ; "
@@ -4309,7 +4412,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = "B :: C ( * f1 ) ( ) ; "
@@ -4328,7 +4431,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = ":: B :: C ( :: B :: C :: * f1 ) ( ) ; "
@@ -4347,7 +4450,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "func1 f1;\n"
                                 "func2 f2;\n"
                                 "func3 f3;\n"
-                                "func4 f4;";
+                                "func4 f4;\n";
 
             // The expected result..
             const char expected[] = "A :: B :: C ( * f1 ) ( ) ; "
@@ -4367,7 +4470,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef Format_E1 (**PtrToFunPtr_Type1)();\n"
                             "typedef MySpace::Format_E2 (**PtrToFunPtr_Type2)();\n"
                             "PtrToFunPtr_Type1 t1;\n"
-                            "PtrToFunPtr_Type2 t2;";
+                            "PtrToFunPtr_Type2 t2;\n";
         ASSERT_EQUALS("enum Format_E1 { FORMAT11 , FORMAT12 } ; enum Format_E1 Format_T1 ; "
                       "namespace MySpace { "
                       "enum Format_E2 { FORMAT21 , FORMAT22 } ; enum Format_E2 Format_T2 ; "
@@ -4400,15 +4503,15 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedefStruct() {
         const char code1[] = "typedef struct S { int x; } xyz;\n"
-                             "xyz var;";
+                             "xyz var;\n";
         ASSERT_EQUALS("struct S { int x ; } ; struct S var ;", tok(code1,dinit(TokOptions, $.simplify = false)));
 
         const char code2[] = "typedef const struct S { int x; } xyz;\n"
-                             "xyz var;";
+                             "xyz var;\n";
         ASSERT_EQUALS("struct S { int x ; } ; const struct S var ;", tok(code2,dinit(TokOptions, $.simplify = false)));
 
         const char code3[] = "typedef volatile struct S { int x; } xyz;\n"
-                             "xyz var;";
+                             "xyz var;\n";
         ASSERT_EQUALS("struct S { int x ; } ; volatile struct S var ;", tok(code3,dinit(TokOptions, $.simplify = false)));
     }
 
@@ -4416,7 +4519,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef struct { int x; } xyz;;\n"
                             "void f(){\n"
                             "    int abc, xyz;\n" // <- shadow variable
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("struct xyz { int x ; } ; void f ( ) { int abc ; int xyz ; }",
                       tok(code,dinit(TokOptions, $.simplify = false)));
     }
@@ -4428,35 +4531,34 @@ class TestSimplifyTypedef : public TestFixture {
                             "\n"
                             "void foo(index_t prev_segment) {\n"
                             "    if(prev_segment==NO_SEGMENT) {}\n" // <- test that index_t is replaced with uint32_t in the expanded tokens
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void foo ( uint32_t prev_segment ) { if ( prev_segment == ( ( uint32_t ) 12 ) ) { } }",
                       simplifyTypedefP(code));
     }
 
-    void simplifyTypedefOriginalName() {
-        const char code[] = "typedef unsigned char uint8_t;"
-                            "typedef float (*rFunctionPointer_fp)(uint8_t, uint8_t);"
-                            "typedef enum eEnumDef {"
-                            "  ABC = 0,"
-                            "}eEnum_t;"
-                            "typedef enum {"
-                            "  ABC = 0,"
-                            "}eEnum2_t;"
-                            "typedef short int16_t;"
-                            "typedef struct stStructDef {"
-                            "  int16_t swA;"
-                            "}stStruct_t;"
-                            "double endOfTypeDef;"
-                            "eEnum2_t enum2Type;"
-                            "stStruct_t structType;"
-                            "eEnum_t enumType;"
-                            "uint8_t t;"
-                            "void test(rFunctionPointer_fp functionPointer);";
+    void simplifyTypedefOriginalName1() {
+        const char code[] = "typedef unsigned char uint8_t;\n"
+                            "typedef float (*rFunctionPointer_fp)(uint8_t, uint8_t);\n"
+                            "typedef enum eEnumDef {\n"
+                            "  ABC = 0,\n"
+                            "}eEnum_t;\n"
+                            "typedef enum {\n"
+                            "  ABC = 0,\n"
+                            "}eEnum2_t;\n"
+                            "typedef short int16_t;\n"
+                            "typedef struct stStructDef {\n"
+                            "  int16_t swA;\n"
+                            "}stStruct_t;\n"
+                            "double endOfTypeDef;\n"
+                            "eEnum2_t enum2Type;\n"
+                            "stStruct_t structType;\n"
+                            "eEnum_t enumType;\n"
+                            "uint8_t t;\n"
+                            "void test(rFunctionPointer_fp functionPointer);\n";
 
         TokenList tokenlist{settings1, Standards::Language::C};
-        std::istringstream istr(code);
-        ASSERT(TokenListHelper::createTokens(tokenlist, istr, "file.c"));
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
@@ -4485,21 +4587,85 @@ class TestSimplifyTypedef : public TestFixture {
         // Search for the simplified short token and check its original Name, start from front to get the variable in the struct
         token = Token::findsimplematch(tokenizer.list.front(), "short", tokenizer.list.back());
         ASSERT_EQUALS("int16_t", token->originalName());
-        // Search for the simplified * token -> function pointer gets "(*" tokens infront of it
+        // Search for the simplified * token -> function pointer gets "(*" tokens in front of it
         token = Token::findsimplematch(endOfTypeDef, "*", tokenizer.list.back());
         ASSERT_EQUALS("rFunctionPointer_fp", token->originalName());
     }
 
+    void simplifyTypedefOriginalName2() {
+        const char code[] = "typedef unsigned short uint16;\n"
+                            "typedef uint16 A;\n"
+                            "A a;\n";
+        TokenList tokenlist{ settings1, Standards::Language::C };
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+
+        try {
+            tokenizer.validate();
+        }
+        catch (const InternalError&) {
+            ASSERT_EQUALS_MSG(false, true, "Validation of Tokenizer failed");
+        }
+        const Token* token = Token::findsimplematch(tokenizer.list.front(), "short");
+        ASSERT_EQUALS("A", token->originalName());
+    }
+
+    void simplifyTypedefOriginalName3() {
+        const char code[] = "void f(void) {\n"
+                            "    typedef int A;\n"
+                            "    A a;\n"
+                            "}\n";
+        TokenList tokenlist{ settings1, Standards::Language::C };
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+        ASSERT_NO_THROW(tokenizer.validate());
+        const Token* token = Token::findsimplematch(tokenizer.list.front(), "int");
+        ASSERT_EQUALS("A", token->originalName());
+    }
+
+    void simplifyTypedefOriginalName4() {
+        const char code[] = "void f(void) {\n"
+                            "    typedef unsigned int A;\n"
+                            "    A a;\n"
+                            "}\n";
+        TokenList tokenlist{ settings1, Standards::Language::C };
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+        ASSERT_NO_THROW(tokenizer.validate());
+        const Token* token = Token::findsimplematch(tokenizer.list.front(), "int");
+        ASSERT_EQUALS("A", token->originalName());
+    }
+
+    void simplifyTypedefOriginalName5() {
+        const char code[] = "void f(void) {\n"
+                            "    typedef void (*A)(int);\n"
+                            "    A a;\n"
+                            "}\n";
+        TokenList tokenlist{ settings1, Standards::Language::C };
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+        ASSERT_NO_THROW(tokenizer.validate());
+        const Token* token = Token::findsimplematch(tokenizer.list.front(), "int");
+        ASSERT_EQUALS("A", token->originalName());
+    }
+
     void simplifyTypedefTokenColumn1() {  // #13155
         const char code[] = "void foo(void) {\n"
                             "    typedef signed int MY_INT;\n"
                             "    MY_INT x = 0;\n"
-                            "}";
+                            "}\n";
 
         TokenList tokenlist{settings1, Standards::Language::C};
-        std::istringstream istr(code);
-        ASSERT(TokenListHelper::createTokens(tokenlist, istr, "file.c"));
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
@@ -4513,12 +4679,11 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "void foo(void) {\n"
                             "    typedef signed int (*F)(int);\n"
                             "    F x = 0;\n"
-                            "}";
+                            "}\n";
 
         TokenList tokenlist{settings1, Standards::Language::C};
-        std::istringstream istr(code);
-        ASSERT(TokenListHelper::createTokens(tokenlist, istr, "file.c"));
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
@@ -4543,9 +4708,9 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void typedefInfo1() {
-        const std::string xml = dumpTypedefInfo("typedef int A;\nA x;");
+        const std::string xml = dumpTypedefInfo("typedef int A;\nA x;\n");
         ASSERT_EQUALS("  <typedef-info>\n"
-                      "    <info name=\"A\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "    <info name=\"A\" file=\"file.c\" line=\"1\" column=\"13\" used=\"1\" isFunctionPointer=\"0\"/>\n"
                       "  </typedef-info>\n",
                       xml);
     }
@@ -4557,9 +4722,38 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "   typedef fp16 ( *pfp16 ) ( void );\n"
                                                 "}\n");
         ASSERT_EQUALS("  <typedef-info>\n"
-                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"1\" used=\"1\" isFunctionPointer=\"1\"/>\n"
-                      "    <info name=\"int16_t\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
-                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"20\" used=\"0\" isFunctionPointer=\"1\"/>\n"
+                      "    <info name=\"fp16\" file=\"file.c\" line=\"2\" column=\"17\" used=\"1\" isFunctionPointer=\"1\">\n"
+                      "      <token line=\"2\" column=\"1\" str=\"typedef\"/>\n"
+                      "      <token line=\"2\" column=\"9\" str=\"void\"/>\n"
+                      "      <token line=\"2\" column=\"14\" str=\"(\"/>\n"
+                      "      <token line=\"2\" column=\"16\" str=\"*\"/>\n"
+                      "      <token line=\"2\" column=\"17\" str=\"fp16\"/>\n"
+                      "      <token line=\"2\" column=\"22\" str=\")\"/>\n"
+                      "      <token line=\"2\" column=\"23\" str=\"(\"/>\n"
+                      "      <token line=\"2\" column=\"25\" str=\"int16_t\"/>\n"
+                      "      <token line=\"2\" column=\"33\" str=\"n\"/>\n"
+                      "      <token line=\"2\" column=\"35\" str=\")\"/>\n"
+                      "    </info>\n"
+                      "    <info name=\"int16_t\" file=\"file.c\" line=\"1\" column=\"22\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"4\" used=\"0\" isFunctionPointer=\"1\">\n"
+                      "      <token line=\"4\" column=\"4\" str=\"typedef\"/>\n"
+                      "      <token line=\"4\" column=\"12\" str=\"void\"/>\n"
+                      "      <token line=\"4\" column=\"12\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"12\" str=\"*\"/>\n"
+                      "      <token line=\"4\" column=\"17\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"19\" str=\"*\"/>\n"
+                      "      <token line=\"4\" column=\"20\" str=\"pfp16\"/>\n"
+                      "      <token line=\"4\" column=\"26\" str=\")\"/>\n"
+                      "      <token line=\"4\" column=\"28\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"30\" str=\"void\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\")\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\")\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"(\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"signed\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"short\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\"n\"/>\n"
+                      "      <token line=\"4\" column=\"35\" str=\")\"/>\n"
+                      "    </info>\n"
                       "  </typedef-info>\n",xml);
     }
 
@@ -4570,6 +4764,17 @@ class TestSimplifyTypedef : public TestFixture {
                                                 "}\n");
         ASSERT_EQUALS("",xml);
     }
+
+    void typedefInfo4() {
+        const std::string xml = dumpTypedefInfo("typedef struct coord {\n"
+                                                "    uint16_t x;\n"
+                                                "    uint16_t y;\n"
+                                                "} coord;\n"
+                                                "coord c;\n");
+        ASSERT_EQUALS("  <typedef-info>\n"
+                      "    <info name=\"coord\" originalName=\"coord\" file=\"file.c\" line=\"4\" column=\"3\" tagline=\"1\" tagcolumn=\"16\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "  </typedef-info>\n", xml);
+    }
 };
 
 REGISTER_TEST(TestSimplifyTypedef)
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index a9cd23d0a54..e3c714803cb 100644
--- a/test/testsimplifyusing.cpp
+++ b/test/testsimplifyusing.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -21,6 +21,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
+#include "standards.h"
 #include "token.h"
 #include "utils.h"
 
@@ -36,6 +37,7 @@ class TestSimplifyUsing : public TestFixture {
     const Settings settings0 = settingsBuilder().severity(Severity::style).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(simplifyUsing1);
         TEST_CASE(simplifyUsing2);
         TEST_CASE(simplifyUsing3);
@@ -71,6 +73,12 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing33);
         TEST_CASE(simplifyUsing34);
         TEST_CASE(simplifyUsing35);
+        TEST_CASE(simplifyUsing36);
+        TEST_CASE(simplifyUsing37);
+        TEST_CASE(simplifyUsing38);
+        TEST_CASE(simplifyUsing39);
+        TEST_CASE(simplifyUsing40);
+        TEST_CASE(simplifyUsing41);
 
         TEST_CASE(simplifyUsing8970);
         TEST_CASE(simplifyUsing8971);
@@ -92,6 +100,7 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing10335);
         TEST_CASE(simplifyUsing10720);
         TEST_CASE(simplifyUsing13873); // function declaration
+        TEST_CASE(simplifyUsing14877);
 
         TEST_CASE(scopeInfo1);
         TEST_CASE(scopeInfo2);
@@ -99,16 +108,17 @@ class TestSimplifyUsing : public TestFixture {
 
     struct TokOptions
     {
-        TokOptions() = default;
         Platform::Type type = Platform::Type::Native;
         bool debugwarnings = true;
         bool preprocess = false;
+        Standards::cppstd_t cppstd = Standards::CPPLatest;
     };
 
 #define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string tok_(const char* file, int line, const char (&code)[size], const TokOptions& options = make_default_obj()) {
-        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(options.debugwarnings).platform(options.type).build();
+        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(options.debugwarnings)
+                                  .platform(options.type).cpp(options.cppstd).build();
 
         if (options.preprocess) {
             SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
@@ -136,7 +146,7 @@ class TestSimplifyUsing : public TestFixture {
                             " duplicate a;\n"
                             " a.foo();\n"
                             " A::duplicate c = 0;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A "
@@ -162,7 +172,7 @@ class TestSimplifyUsing : public TestFixture {
                             "public:\n"
                             "using duplicate = wchar_t;\n"
                             "duplicate foo() { wchar_t b; return b; }\n"
-                            "};";
+                            "};\n";
 
         const char expected[] =
             "class A ; "
@@ -187,7 +197,7 @@ class TestSimplifyUsing : public TestFixture {
                             "int main()\n"
                             "{\n"
                             "duplicate b;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "class A { } ; "
@@ -212,7 +222,7 @@ class TestSimplifyUsing : public TestFixture {
                             "    s32 ivar = -2;\n"
                             "    u32 uvar = 2;\n"
                             "    return uvar / ivar;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -230,7 +240,7 @@ class TestSimplifyUsing : public TestFixture {
             "void f()\n"
             "{\n"
             "    YY_BUFFER_STATE state;\n"
-            "}";
+            "}\n";
 
         const char expected[] =
             "void f ( ) "
@@ -246,7 +256,7 @@ class TestSimplifyUsing : public TestFixture {
             "namespace VL {\n"
             "    using float_t = float;\n"
             "    inline VL::float_t fast_atan2(VL::float_t y, VL::float_t x){}\n"
-            "}";
+            "}\n";
 
         const char expected[] =
             "namespace VL { "
@@ -258,8 +268,8 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing7() {
-        const char code[] = "using abc = int; "
-                            "Fred :: abc f ;";
+        const char code[] = "using abc = int;\n"
+                            "Fred :: abc f ;\n";
         const char expected[] = "Fred :: abc f ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -280,7 +290,7 @@ class TestSimplifyUsing : public TestFixture {
                             "RINT tri;\n"
                             "RUINT trui;\n"
                             "RCINT trci;\n"
-                            "RCUINT trcui;";
+                            "RCUINT trcui;\n";
 
         const char expected[] =
             "int ti ; "
@@ -309,7 +319,7 @@ class TestSimplifyUsing : public TestFixture {
                             "TP tp;\n"
                             "U u;\n"
                             "V v;\n"
-                            "W w;";
+                            "W w;\n";
 
         const char expected[] =
             "struct t { int a ; } ; "
@@ -340,7 +350,7 @@ class TestSimplifyUsing : public TestFixture {
                             "TP tp;\n"
                             "U u;\n"
                             "V v;\n"
-                            "W w;";
+                            "W w;\n";
 
         const char expected[] =
             "union t { int a ; float b ; } ; "
@@ -361,7 +371,7 @@ class TestSimplifyUsing : public TestFixture {
         const char code[] = "using abc = enum { a = 0 , b = 1 , c = 2 };\n"
                             "using XYZ = enum xyz { x = 0 , y = 1 , z = 2 };\n"
                             "abc e1;\n"
-                            "XYZ e2;";
+                            "XYZ e2;\n";
 
         const char expected[] = "enum abc { a = 0 , b = 1 , c = 2 } ; "
                                 "enum xyz { x = 0 , y = 1 , z = 2 } ; "
@@ -379,7 +389,7 @@ class TestSimplifyUsing : public TestFixture {
                             "V1 v1;\n"
                             "V2 v2;\n"
                             "V3 v3;\n"
-                            "IntListIterator iter;";
+                            "IntListIterator iter;\n";
 
         const char expected[] = "vector < int > v1 ; "
                                 "std :: vector < int > v2 ; "
@@ -394,7 +404,7 @@ class TestSimplifyUsing : public TestFixture {
                             "using CallQueue = std::vector<Func>;\n"
                             "int main() {\n"
                             " CallQueue q;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "int main ( ) { "
                                 "std :: vector < std :: pair < int ( * ) ( void * ) , void * > > q ; "
@@ -415,7 +425,7 @@ class TestSimplifyUsing : public TestFixture {
                             "{"
                             "    using nal = typename D<1>::val;"
                             "    FP_M(val);"
-                            "};";
+                            "};\n";
 
         TODO_ASSERT_THROW(tok(code, dinit(TokOptions, $.debugwarnings = false)), InternalError); // TODO: Do not throw AST validation exception
         //ASSERT_EQUALS("", errout_str());
@@ -424,7 +434,7 @@ class TestSimplifyUsing : public TestFixture {
     void simplifyUsing15() {
         {
             const char code[] = "using frame = char [10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "char f [ 10 ] ;";
 
@@ -433,7 +443,7 @@ class TestSimplifyUsing : public TestFixture {
 
         {
             const char code[] = "using frame = unsigned char [10];\n"
-                                "frame f;";
+                                "frame f;\n";
 
             const char expected[] = "unsigned char f [ 10 ] ;";
 
@@ -447,7 +457,7 @@ class TestSimplifyUsing : public TestFixture {
                             "using STRFOO = struct {\n"
                             "   CHFOO freem;\n"
                             "};\n"
-                            "STRFOO s;";
+                            "STRFOO s;\n";
 
         const char expected[] = "struct STRFOO { "
                                 "char freem [ 4096 ] ; "
@@ -467,7 +477,7 @@ class TestSimplifyUsing : public TestFixture {
                             "S1 s1;\n"
                             "S2 s2;\n"
                             "S3 s3;\n"
-                            "S4 s4;";
+                            "S4 s4;\n";
 
         const char expected[] = "class C1 { } ; "
                                 "class S1 { } ; "
@@ -483,7 +493,7 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing18() {
-        const char code[] = "{ { { using a = a; using a; } } }";
+        const char code[] = "{ { { using a = a; using a; } } }\n";
         (void)tok(code); // don't crash
     }
 
@@ -495,7 +505,7 @@ class TestSimplifyUsing : public TestFixture {
                             "void foo::e() {\n"
                             "   using b = float;\n"
                             "}\n"
-                            "}";
+                            "}\n";
         (void)tok(code); // don't hang
         ignore_errout(); // we are not interested in the output
     }
@@ -540,14 +550,14 @@ class TestSimplifyUsing : public TestFixture {
                             "   };\n"
                             "   return nullptr;\n"
                             "}\n"
-                            "}}}}}}}";
+                            "}}}}}}}\n";
         (void)tok(code); // don't hang
         ignore_errout(); // we do not care about the output
     }
 
     void simplifyUsing21() {
         const char code[] = "using a = b;\n"
-                            "enum {}";
+                            "enum {}\n";
         (void)tok(code); // don't crash
     }
 
@@ -564,7 +574,7 @@ class TestSimplifyUsing : public TestFixture {
                             "fff::fff() : m_icm(icm) {\n"
                             "    using ESdk = aa::bb::sdk::common::api::Sdk::ESdk;\n"
                             "}\n"
-                            "}}}}}";
+                            "}}}}}\n";
         const char expected[] = "namespace aa { namespace bb { namespace cc { namespace dd { namespace ee { "
                                 "class fff { "
                                 "public: "
@@ -591,7 +601,7 @@ class TestSimplifyUsing : public TestFixture {
                             "   : m_icm(icm)\n"
                             "   , m_rt{rt::UNKNOWN_} {\n"
                             "  using escs = yy::zz::aa::bb::cc::dd::ee;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "class cmcch { "
                                 "public: "
                                 "cmcch ( const icmsp & icm , Rtnf && rtnf = { } ) ; "
@@ -609,7 +619,7 @@ class TestSimplifyUsing : public TestFixture {
 
     void simplifyUsing24() {
         const char code[] = "using value_type = const ValueFlow::Value;\n"
-                            "value_type vt;";
+                            "value_type vt;\n";
         const char expected[] = "const ValueFlow :: Value vt ;";
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -622,7 +632,7 @@ class TestSimplifyUsing : public TestFixture {
                             "namespace vtkm {\n"
                             "template <>\n"
                             "struct VecTraits<UnusualType> : VecTraits<UnusualType::T> { };\n"
-                            "}";
+                            "}\n";
         const char expected[] = "struct UnusualType { "
                                 "vtkm :: Id X ; "
                                 "} ; "
@@ -748,7 +758,7 @@ class TestSimplifyUsing : public TestFixture {
                                     "}";
             ASSERT_EQUALS(expected, tok(code));
             ASSERT_EQUALS(
-                "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cout\n",
+                "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cout [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
         }
         {
@@ -814,7 +824,7 @@ class TestSimplifyUsing : public TestFixture {
                                  "auto S :: get ( ) . int & { return i ; }";
         ASSERT_EQUALS(expected2, tok(code2));
         TODO_ASSERT_EQUALS("",
-                           "[test.cpp:6]: (debug) auto token with no type.\n"
+                           "[test.cpp:6:1]: (debug) auto token with no type. [autoNoType]\n"
                            "", errout_str());
 
         const char code3[] = "using V = int*;\n"
@@ -822,7 +832,7 @@ class TestSimplifyUsing : public TestFixture {
         const char expected3[] = "auto g ( ) . const volatile int * { return { } ; }";
         ASSERT_EQUALS(expected3, tok(code3));
         TODO_ASSERT_EQUALS("",
-                           "[test.cpp:2]: (debug) auto token with no type.\n"
+                           "[test.cpp:2:1]: (debug) auto token with no type. [autoNoType]\n"
                            "", errout_str());
     }
 
@@ -873,11 +883,84 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void simplifyUsing36() {
+        const char code[] = "using A::a;\n"
+                            "int c = B<int>::a;\n";
+        const char expected[] = "int c ; c = B < int > :: a ;";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing37() {
+        const char code1[] = "using fp1_t = int(*)(int);\n"
+                             "using fp2_t = int(* const)(int);\n"
+                             "fp1_t fp1;\n"
+                             "fp2_t fp2;\n";
+        const char expected1[] = "int ( * fp1 ) ( int ) ; int ( * const fp2 ) ( int ) ;";
+        ASSERT_EQUALS(expected1, tok(code1));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code2[] = "using f_t = int(int);\n"
+                             "f_t* fp1;\n"
+                             "f_t* const fp2;\n";
+        const char expected2[] = "int ( * fp1 ) ( int ) ; int ( * const fp2 ) ( int ) ;";
+        ASSERT_EQUALS(expected2, tok(code2));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code3[] = "using FP = std::string (*)();\n" // #14421
+                             "using FPC = std::string (*const)();\n"
+                             "FP fp;\n"
+                             "FPC fpc{};\n";
+        const char expected3[] = "std :: string ( * fp ) ( ) ; std :: string ( * const fpc ) ( ) { } ;";
+        ASSERT_EQUALS(expected3, tok(code3));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code4[] = "using F = void(*)(char);\n" // #14429
+                             "F f(int);\n";
+        const char expected4[] = "void * f ( char ) ;";
+        ASSERT_EQUALS(expected4, tok(code4));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing38() {
+        const char code[] = "using std::begin;\n" // #14424
+                            "using std::end;\n"
+                            "Unknown begin;\n"
+                            "int end;\n";
+        const char expected[] = "Unknown begin ; int end ;";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing39() {
+        const char code[] = "using std::wstring;\n" // #14578
+                            "wstring ws;\n";
+        const char expected[] = "std :: wstring ws ;";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.cppstd = Standards::CPP03)));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing40() {
+        const char code[] = "uint8_t f();\n" // #14876
+                            "using ::std::uint8_t;\n";
+        const char expected[] = "uint8_t f ( ) ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
+    void simplifyUsing41() {
+        const char code[] = "using FpHandler = void(*)(const SourceLocation&);\n"
+                            "inline FpHandler AssertImpl::m_fpHandler = nullptr;\n";
+        const char expected[] = "void ( * AssertImpl :: m_fpHandler ) ( const SourceLocation & ) ; m_fpHandler = nullptr ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void simplifyUsing8970() {
         const char code[] = "using V = std::vector<int>;\n"
                             "struct A {\n"
                             "    V p;\n"
-                            "};";
+                            "};\n";
 
         const char expected[] = "struct A { "
                                 "std :: vector < int > p ; "
@@ -896,7 +979,7 @@ class TestSimplifyUsing : public TestFixture {
                             "private:\n"
                             "    A::V v_;\n"
                             "    V v2_;\n"
-                            "};";
+                            "};\n";
 
         const char expected[] = "class A { "
                                 "public: "
@@ -911,7 +994,7 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing8976() {
-        const char code[] = "using mystring = std::string;";
+        const char code[] = "using mystring = std::string;\n";
 
         const char exp[] = ";";
 
@@ -919,7 +1002,7 @@ class TestSimplifyUsing : public TestFixture {
     }
 
     void simplifyUsing9040() {
-        const char code[] = "using BOOL = unsigned; int i;";
+        const char code[] = "using BOOL = unsigned; int i;\n";
 
         const char exp[] = "int i ;";
 
@@ -938,7 +1021,7 @@ class TestSimplifyUsing : public TestFixture {
                             "};\n"
                             "template <class T>\n"
                             "class s {};\n"
-                            "using BOOL = char;";
+                            "using BOOL = char;\n";
 
         const char exp[] = "template < class T > "
                            "class c { "
@@ -963,7 +1046,7 @@ class TestSimplifyUsing : public TestFixture {
                             "void f2() {\n"
                             "  using namespace NS1::NS2;\n"
                             "  _LONG A;\n"
-                            "}";
+                            "}\n";
 
         const char exp[] = "void f1 ( ) { "
                            "using namespace NS1 ; "
@@ -988,7 +1071,7 @@ class TestSimplifyUsing : public TestFixture {
                             "    };\n"
                             "    void A::func(UniqueResultPtr) {\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace ns { "
                            "class Result ; "
                            "class A { "
@@ -1013,7 +1096,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "};\n"
                                 "A::A(Foo) { }\n"
                                 "A::~A() { Foo foo; }\n"
-                                "void A::func(Foo) { }";
+                                "void A::func(Foo) { }\n";
             const char exp[] = "class A { "
                                "public: "
                                "A ( int foo ) ; "
@@ -1037,7 +1120,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "};\n"
                                 "A::B::B(Foo) { }\n"
                                 "A::B::~B() { Foo foo; }\n"
-                                "void A::B::func(Foo) { }";
+                                "void A::B::func(Foo) { }\n";
             const char exp[] = "class A { "
                                "public: "
                                "struct B { "
@@ -1060,7 +1143,7 @@ class TestSimplifyUsing : public TestFixture {
                             "    A(Type&);\n"
                             "    Type& t_;\n"
                             "};\n"
-                            "A::A(Type& t) : t_(t) { }";
+                            "A::A(Type& t) : t_(t) { }\n";
         const char exp[] = "class A { "
                            "public: "
                            "A ( int & ) ; "
@@ -1073,7 +1156,7 @@ class TestSimplifyUsing : public TestFixture {
     void simplifyUsing9518() {
         const char code[] = "namespace a {\n"
                             "using a = enum {};\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace a { "
                            "enum a { } ; "
                            "}";
@@ -1086,7 +1169,7 @@ class TestSimplifyUsing : public TestFixture {
                             "template<> class MappedType<Type_t::Nil> { using type = void; };\n"
                             "std::string to_string (Example::Type_t type) {\n"
                             "   switch (type) {}\n"
-                            "}";
+                            "}\n";
         const char exp[] = "enum class Type_t { Nil = 0 } ; "
                            "class MappedType<Type_t::Nil> ; "
                            "template < Type_t type > class MappedType { } ; "
@@ -1103,7 +1186,7 @@ class TestSimplifyUsing : public TestFixture {
                             "using namespace ns;\n"
                             "static void f() {\n"
                             "    const ArrayType arr;\n"
-                            "}";
+                            "}\n";
         const char exp[] = "using namespace ns ; "
                            "static void f ( ) { "
                            "const std :: vector < int > arr ; "
@@ -1128,7 +1211,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1162,7 +1245,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1196,7 +1279,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "using namespace external::ns1;\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1231,7 +1314,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "namespace ns1 { "
                                 "struct B<1> ; "
@@ -1264,7 +1347,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace external { "
                                 "struct B<1> ; "
                                 "} "
@@ -1294,7 +1377,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void A::f(external::ns1::V) {}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "struct B<1> ; "
                                 "namespace ns { "
                                 "struct A { "
@@ -1321,7 +1404,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "public:\n"
                                 "    void f(const V&) const override;\n"
                                 "};\n"
-                                "void A::f(const std::vector<char>&) const { }";
+                                "void A::f(const std::vector<char>&) const { }\n";
             const char exp[]  = "class B { "
                                 "public: "
                                 "virtual void f ( const std :: vector < char > & ) const = 0 ; "
@@ -1362,7 +1445,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "    NS1::B::V v;\n"
                                 "    a.f(v);\n"
                                 "    c.f(v);\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace NS1 { "
                                 "class B { "
                                 "public: "
@@ -1417,7 +1500,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "   using MLSource = foo::s::Literal;\n"
                                 "   auto ret = foo::ResultCodes_e::NO_ERROR;\n"
                                 "   return ret;\n"
-                                "}";
+                                "}\n";
             (void)tok(code); // don't crash
             ignore_errout(); // we do not care about the output
         }
@@ -1437,7 +1520,7 @@ class TestSimplifyUsing : public TestFixture {
                             "}\n"
                             "namespace ns {\n"
                             "    void B::f(const std::vector<unsigned char>&) const { }\n"
-                            "}";
+                            "}\n";
         const char exp[] = "namespace ns { "
                            "class A { "
                            "public: "
@@ -1468,7 +1551,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "namespace ns {\n"
                                 "    void B::f(h) { }\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace ns { "
                                "class A { "
                                "public: "
@@ -1499,7 +1582,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "namespace external {\n"
                                 "void B::f(h) {}\n"
                                 "}\n"
-                                "}";
+                                "}\n";
             const char exp[] = "namespace ns { "
                                "namespace external { "
                                "class A { "
@@ -1531,7 +1614,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}\n"
                                 "void bar() {\n"
                                 "   Pr<st> p;\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "std :: ostream & operator<< ( std :: ostream & s , const Pr < st > p ) { "
                                 "return s ; "
                                 "} "
@@ -1555,7 +1638,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "void xxx::foobar() {\n"
                                 "   using NS1 = v1::l;\n"
                                 "}\n"
-                                "}";
+                                "}\n";
             const char exp[]  = "namespace defsa { "
                                 "void xxx :: foo ( ) { "
                                 "} "
@@ -1571,7 +1654,7 @@ class TestSimplifyUsing : public TestFixture {
 
     void simplifyUsing10335() {
         const char code[] = "using uint8_t = unsigned char;\n"
-                            "enum E : uint8_t { E0 };";
+                            "enum E : uint8_t { E0 };\n";
         const char exp[]  = "enum E : unsigned char { E0 } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -1601,13 +1684,19 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("namespace NS1 { void * f ( ) ; }", tok(code3));
     }
 
+    void simplifyUsing14877() {
+        const char code[] = "using C = struct C { C() {} };\n";
+        const char expected[] = "struct C { C ( ) { } } ;";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void scopeInfo1() {
         const char code[] = "struct A {\n"
                             "    enum class Mode { UNKNOWN, ENABLED, NONE, };\n"
                             "};\n"
                             "\n"
                             "namespace spdlog { class logger; }\n"
-                            "using LoggerPtr = std::shared_ptr<spdlog::logger>;";
+                            "using LoggerPtr = std::shared_ptr<spdlog::logger>;\n";
         (void)tok(code);
         ASSERT_EQUALS("", errout_str());
     }
diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
index 1c5c9c159d9..fe5cdf8181d 100644
--- a/test/testsingleexecutor.cpp
+++ b/test/testsingleexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,7 +39,7 @@ class TestSingleExecutorBase : public TestFixture {
     TestSingleExecutorBase(const char * const name, bool useFS) : TestFixture(name), useFS(useFS) {}
 
 private:
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    /*const*/ Settings settings;
     bool useFS;
 
     std::string fprefix() const
@@ -60,15 +60,10 @@ class TestSingleExecutorBase : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool quiet = true;
-        SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        Settings::ShowTime showtime = Settings::ShowTime::NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;
-        bool clangTidy = false;
-        bool executeCommandCalled = false;
-        std::string exe;
-        std::vector<std::string> args;
     };
 
     void check(int files, int result, const std::string &data, const CheckOptions& opt = make_default_obj{}) {
@@ -77,19 +72,19 @@ class TestSingleExecutorBase : public TestFixture {
         std::list<FileWithDetails> filelist;
         if (opt.filesList.empty()) {
             for (int i = 1; i <= files; ++i) {
-                std::string f_s = fprefix() + "_" + zpad3(i) + ".cpp";
-                filelist.emplace_back(f_s, Standards::Language::CPP, data.size());
+                std::string f_s = fprefix() + "_" + zpad3(i) + ".c";
+                filelist.emplace_back(f_s, Standards::Language::C, data.size());
                 if (useFS) {
-                    fileSettings.emplace_back(std::move(f_s), Standards::Language::CPP, data.size());
+                    fileSettings.emplace_back(std::move(f_s), Standards::Language::C, data.size());
                 }
             }
         }
         else {
             for (const auto& f : opt.filesList)
             {
-                filelist.emplace_back(f, Standards::Language::CPP, data.size());
+                filelist.emplace_back(f, Standards::Language::C, data.size());
                 if (useFS) {
-                    fileSettings.emplace_back(f, Standards::Language::CPP, data.size());
+                    fileSettings.emplace_back(f, Standards::Language::C, data.size());
                 }
             }
         }
@@ -99,19 +94,15 @@ class TestSingleExecutorBase : public TestFixture {
         s.quiet = opt.quiet;
         if (opt.plistOutput)
             s.plistOutput = opt.plistOutput;
-        s.clangTidy = opt.clangTidy;
-        s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: remove when we only longer rely on toString() in unique message handling?
+        s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}\n"; // TODO: remove when we only longer rely on toString() in unique message handling?
 
         Suppressions supprs;
+        std::unique_ptr<TimerResults> timerResults;
+        if (s.showtime != Settings::ShowTime::NONE)
+            timerResults.reset(new TimerResults);
 
-        bool executeCommandCalled = false;
-        std::string exe;
-        std::vector<std::string> args;
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
-        CppCheck cppcheck(s, supprs, *this, true, [&executeCommandCalled, &exe, &args](std::string e,std::vector<std::string> a,std::string,std::string&){
-            executeCommandCalled = true;
-            exe = std::move(e);
-            args = std::move(a);
+        CppCheck cppcheck(s, supprs, *this, timerResults.get(), true, [](std::string,std::vector<std::string>,std::string,std::string&){
             return EXIT_SUCCESS;
         });
 
@@ -124,15 +115,8 @@ class TestSingleExecutorBase : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        SingleExecutor executor(cppcheck, filelist, fileSettings, s, supprs, *this);
+        SingleExecutor executor(cppcheck, filelist, fileSettings, s, supprs, *this, timerResults.get());
         ASSERT_EQUALS(result, executor.check());
-        ASSERT_EQUALS(opt.executeCommandCalled, executeCommandCalled);
-        ASSERT_EQUALS(opt.exe, exe);
-        ASSERT_EQUALS(opt.args.size(), args.size());
-        for (std::size_t i = 0; i < args.size(); ++i)
-        {
-            ASSERT_EQUALS(opt.args[i], args[i]);
-        }
     }
 
     void run() override {
@@ -145,11 +129,8 @@ class TestSingleExecutorBase : public TestFixture {
         TEST_CASE(no_errors_equal_amount_files);
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
-        TEST_CASE(clangTidy);
         TEST_CASE(showtime_top5_file);
-        TEST_CASE(showtime_top5_summary);
         TEST_CASE(showtime_file);
-        TEST_CASE(showtime_summary);
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
@@ -158,16 +139,15 @@ class TestSingleExecutorBase : public TestFixture {
     void many_files() {
         const int num_files = 100;
         check(num_files, num_files,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}", dinit(CheckOptions,
-                         $.quiet = false));
+              "  (void)(*((int*)0));\n"
+              "}\n", dinit(CheckOptions,
+                           $.quiet = false));
         {
             std::string expected;
             for (int i = 1; i <= num_files; ++i) {
-                expected += "Checking " + fprefix() + "_" + zpad3(i) + ".cpp ...\n";
+                expected += "Checking " + fprefix() + "_" + zpad3(i) + ".c ...\n";
                 expected += std::to_string(i) + "/100 files checked " + std::to_string(i) + "% done\n";
             }
             ASSERT_EQUALS(expected, output_str());
@@ -175,7 +155,7 @@ class TestSingleExecutorBase : public TestFixture {
         {
             std::string expected;
             for (int i = 1; i <= num_files; ++i) {
-                expected += "[" + fprefix() + "_" + zpad3(i) + ".cpp:3:13]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
+                expected += "[" + fprefix() + "_" + zpad3(i) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
             }
             ASSERT_EQUALS(expected, errout_str());
         }
@@ -184,11 +164,10 @@ class TestSingleExecutorBase : public TestFixture {
     void many_files_showtime() {
         SUPPRESS;
         check(100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}", dinit(CheckOptions, $.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
+              "  (void)(*((int*)0));\n"
+              "}\n", dinit(CheckOptions, $.showtime = Settings::ShowTime::SUMMARY));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -198,11 +177,10 @@ class TestSingleExecutorBase : public TestFixture {
         ScopedFile plistFile("dummy", "", plistOutput);
 
         check(100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
+              "  (void)(*((int*)0));\n"
+              "}\n", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -212,7 +190,7 @@ class TestSingleExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_less_files() {
@@ -220,7 +198,7 @@ class TestSingleExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_equal_amount_files() {
@@ -228,133 +206,78 @@ class TestSingleExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void one_error_less_files() {
         check(1, 1,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {int i = *((int*)0);}\n"
-              "  return 0;\n"
-              "}");
-        ASSERT_EQUALS("[" + fprefix() + "_" + zpad3(1) + ".cpp:3:14]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
+              "  (void)(*((int*)0));\n"
+              "}\n");
+        ASSERT_EQUALS("[" + fprefix() + "_" + zpad3(1) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     void one_error_several_files() {
         const int num_files = 20;
         check(num_files, num_files,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {int i = *((int*)0);}\n"
-              "  return 0;\n"
-              "}");
+              "  (void)(*((int*)0));\n"
+              "}\n");
         {
             std::string expected;
             for (int i = 1; i <= num_files; ++i) {
-                expected += "[" + fprefix() + "_" + zpad3(i) + ".cpp:3:14]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
+                expected += "[" + fprefix() + "_" + zpad3(i) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
             }
             ASSERT_EQUALS(expected, errout_str());
         }
     }
 
-    void clangTidy() {
-        // TODO: we currently only invoke it with ImportProject::FileSettings
-        if (!useFS)
-            return;
-
-#ifdef _WIN32
-        constexpr char exe[] = "clang-tidy.exe";
-#else
-        constexpr char exe[] = "clang-tidy";
-#endif
-
-        const std::string file = fprefix() + "_001.cpp";
-        check(1, 0,
-              "int main()\n"
-              "{\n"
-              "  return 0;\n"
-              "}",
-              dinit(CheckOptions,
-                    $.quiet = false,
-                        $.clangTidy = true,
-                        $.executeCommandCalled = true,
-                        $.exe = exe,
-                        $.args = {"-quiet", "-checks=*,-clang-analyzer-*,-llvm*", file, "--"}));
-        ASSERT_EQUALS("Checking " + file + " ...\n", output_str());
-    }
-
 // TODO: provide data which actually shows values above 0
 
     void showtime_top5_file() {
         REDIRECT;
         check(2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall + empty line
-        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
-    }
-
-    void showtime_top5_summary() {
-        REDIRECT;
-        check(2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY));
+                    $.showtime = Settings::ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall + empty line
-        ASSERT_EQUALS(5 + 1 + 1, cppcheck::count_all_of(output_s, '\n'));
-        // should only report the top5 once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        // for each file: top5 results + check time
+        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_file() {
         REDIRECT;
         check(2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_FILE));
+                    $.showtime = Settings::ShowTime::FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        ASSERT_EQUALS(2, cppcheck::count_all_of(output_s, "Overall time:"));
-    }
-
-    void showtime_summary() {
-        REDIRECT;
-        check(2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // should only report the actual summary once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        ASSERT_EQUALS(0, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
     void showtime_file_total() {
         REDIRECT;
         check(2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL));
+                    $.showtime = Settings::ShowTime::FILE_TOTAL));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(1) + ".cpp: ") != std::string::npos);
-        ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(2) + ".cpp: ") != std::string::npos);
+        ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(1) + ".c: ") != std::string::npos);
+        ASSERT(output_s.find("Check time: " + fprefix() + "_" + zpad3(2) + ".c: ") != std::string::npos);
     }
 
     void suppress_error_library() {
         SUPPRESS;
         const Settings settingsOld = settings; // TODO: get rid of this
-        const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
+        const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
         settings = settingsBuilder().libraryxml(xmldata).build();
         check(1, 0,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}");
+              "  (void)(*((int*)0));\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
     }
@@ -364,14 +287,14 @@ class TestSingleExecutorBase : public TestFixture {
         ScopedFile inc_h(fprefix() + ".h",
                          "inline void f()\n"
                          "{\n"
-                         "  (void)*((int*)0);\n"
-                         "}");
+                         "  (void)(*((int*)0));\n"
+                         "}\n");
         check(2, 2,
-              "#include \"" + inc_h.name() + "\"");
+              "#include \"" + inc_h.name() + "\"\n");
         // these are not actually made unique by the implementation. That needs to be done by the given ErrorLogger
         ASSERT_EQUALS(
-            "[" + inc_h.name() + ":3:11]: (error) Null pointer dereference: (int*)0 [nullPointer]\n"
-            "[" + inc_h.name() + ":3:11]: (error) Null pointer dereference: (int*)0 [nullPointer]\n",
+            "[" + inc_h.name() + ":3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n"
+            "[" + inc_h.name() + ":3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n",
             errout_str());
     }
 
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index e063ad22505..0367c993951 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -24,7 +24,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestSizeof : public TestFixture {
 public:
@@ -55,8 +54,8 @@ class TestSizeof : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check...
-        runChecks<CheckSizeof>(tokenizer, this);
+        CheckSizeof check;
+        runChecks(check, tokenizer, *this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -67,56 +66,56 @@ class TestSizeof : public TestFixture {
         // Tokenize..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check...
-        runChecks<CheckSizeof>(tokenizer, this);
+        CheckSizeof check;
+        runChecks(check, tokenizer, *this);
     }
 
     void sizeofsizeof() {
         check("void foo()\n"
               "{\n"
               "    int i = sizeof sizeof char;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Calling 'sizeof' on 'sizeof'. [sizeofsizeof]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int i = sizeof (sizeof long);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Calling 'sizeof' on 'sizeof'. [sizeofsizeof]\n", errout_str());
 
         check("void foo(long *p)\n"
               "{\n"
               "    int i = sizeof (sizeof (p));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (warning) Calling 'sizeof' on 'sizeof'. [sizeofsizeof]\n", errout_str());
     }
 
     void sizeofCalculation() {
-        check("int a, b; int a,sizeof(a+b)");
+        check("int a, b; int a,sizeof(a+b)\n");
         ASSERT_EQUALS("[test.cpp:1:25]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("int a, b; sizeof(a*b)");
+        check("int a, b; sizeof(a*b)\n");
         ASSERT_EQUALS("[test.cpp:1:19]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("int a, b; sizeof(-a)");
+        check("int a, b; sizeof(-a)\n");
         ASSERT_EQUALS("[test.cpp:1:18]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("int a, b; sizeof(*a)");
+        check("int a, b; sizeof(*a)\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(void * const)");
+        check("sizeof(void * const)\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(int*[2])");
+        check("sizeof(int*[2])\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(Fred**)");
+        check("sizeof(Fred**)\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("sizeof(foo++)");
+        check("sizeof(foo++)\n");
         ASSERT_EQUALS("[test.cpp:1:11]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
-        check("sizeof(--foo)");
+        check("sizeof(--foo)\n");
         ASSERT_EQUALS("[test.cpp:1:8]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         // #6888
@@ -130,7 +129,7 @@ class TestSizeof : public TestFixture {
                "  VOIDCAST2(SIZEOF1);\n"
                "  VOIDCAST2(SIZEOF2);\n"
                "  return i + foo(1);\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkP("#define SIZEOF1   sizeof(i != 2)\n"
@@ -139,12 +138,12 @@ class TestSizeof : public TestFixture {
                "  SIZEOF1;\n"
                "  SIZEOF2;\n"
                "  return i + foo(1);\n"
-               "}");
+               "}\n");
         ASSERT_EQUALS("[test.cpp:4:3]: (warning, inconclusive) Found calculation inside sizeof(). [sizeofCalculation]\n"
                       "[test.cpp:5:3]: (warning, inconclusive) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         checkP("#define MACRO(data)  f(data, sizeof(data))\n"
-               "x = MACRO((unsigned int *)data + 4);");
+               "x = MACRO((unsigned int *)data + 4);\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
     }
 
@@ -153,7 +152,7 @@ class TestSizeof : public TestFixture {
               "{\n"
               "    int bar() { return 1; };\n"
               "}\n"
-              "Foo f;int a=sizeof(f.bar());");
+              "Foo f;int a=sizeof(f.bar());\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
         check("class Foo\n"
@@ -161,35 +160,35 @@ class TestSizeof : public TestFixture {
               "    int bar() { return 1; };\n"
               "    int bar() const { return 1; };\n"
               "}\n"
-              "Foo f;int a=sizeof(f.bar());");
+              "Foo f;int a=sizeof(f.bar());\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo\n"
               "{\n"
               "    int bar() { return 1; };\n"
               "}\n"
-              "Foo * fp;int a=sizeof(fp->bar());");
+              "Foo * fp;int a=sizeof(fp->bar());\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
-        check("int a=sizeof(foo());");
+        check("int a=sizeof(foo());\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int foo() { return 1; }; int a=sizeof(foo());");
+        check("int foo() { return 1; }; int a=sizeof(foo());\n");
         ASSERT_EQUALS("[test.cpp:1:32]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
-        check("int foo() { return 1; }; sizeof(decltype(foo()));");
+        check("int foo() { return 1; }; sizeof(decltype(foo()));\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int foo(int) { return 1; }; int a=sizeof(foo(0))");
+        check("int foo(int) { return 1; }; int a=sizeof(foo(0))\n");
         ASSERT_EQUALS("[test.cpp:1:35]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
-        check("char * buf; int a=sizeof(*buf);");
+        check("char * buf; int a=sizeof(*buf);\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int a=sizeof(foo())");
+        check("int a=sizeof(foo())\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("int foo(int) { return 1; }; char buf[1024]; int a=sizeof(buf), foo(0)");
+        check("int foo(int) { return 1; }; char buf[1024]; int a=sizeof(buf), foo(0)\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
@@ -205,15 +204,20 @@ class TestSizeof : public TestFixture {
               "        Y = sizeof(f(g() << h())) == sizeof(A),\n"
               "        Z = X & Y\n"
               "    };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int g();\n"
+              "size_t f1() { return sizeof(x[0]); }\n"
+              "size_t f2() { return sizeof(g()); }\n");
+        ASSERT_EQUALS("[test.cpp:3:22]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
     }
 
     void sizeofForArrayParameter() {
         check("void f() {\n"
               "    int a[10];\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -221,7 +225,7 @@ class TestSizeof : public TestFixture {
               "    unsigned int b = 2;\n"
               "    int c[(a+b)];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -229,7 +233,7 @@ class TestSizeof : public TestFixture {
               "    unsigned int b[] = { 0 };\n"
               "    int c[a[b[0]]];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -238,36 +242,36 @@ class TestSizeof : public TestFixture {
               "    unsigned int b = 2;\n"
               "    int c[(a[0]+b)];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[] = { 1, 2, 3 };\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[3] = { 1, 2, 3 };\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f( int a[]) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         check("void f( int a[]) {\n"
               "    std::cout << sizeof a / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         check("void f( int a[3] ) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
@@ -275,19 +279,19 @@ class TestSizeof : public TestFixture {
               "int f2(Fixname& f2v) {\n"
               "  int i = sizeof(f2v);\n"
               "  printf(\"sizeof f2v %d\", i);\n"
-              "   }");
+              "   }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    p[0] = 0;\n"
               "    int unused = sizeof(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char p[] = \"test\";\n"
               "    int unused = sizeof(p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2495
@@ -301,56 +305,64 @@ class TestSizeof : public TestFixture {
               "      {1,0,1},\n"
               "    };\n"
               "    const int COL_MAX=sizeof(col)/sizeof(col[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #155
         check("void f() {\n"
               "    char buff1[1024*64],buff2[sizeof(buff1)*2];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #2510
         check("void f( int a[], int b) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         // ticket #2510
         check("void f( int a[3] , int b[2] ) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Using 'sizeof' on array given as "
                       "function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n", errout_str());
 
         // ticket #2510
         check("void f() {\n"
               "    char buff1[1024*64],buff2[sizeof(buff1)*(2+1)];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
+        check("int f(std::array<int, 2> a) {\n" // #14860
+              "    return sizeof(a);\n"
+              "}\n"
+              "int g(std::string a[2]) {\n"
+              "    return sizeof(a);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:12]: (warning) Using 'sizeof' on array given as function argument returns size of a pointer. [sizeofwithsilentarraypointer]\n",
+                      errout_str());
     }
 
     void sizeofForNumericParameter() {
         check("void f() {\n"
               "    std::cout << sizeof(10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << sizeof(-10) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << sizeof 10  << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
 
         check("void f() {\n"
               "    std::cout << sizeof -10  << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
     }
 
@@ -358,51 +370,51 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "  int* p;\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (warning, inconclusive) Division of result of sizeof() on pointer type. [divideSizeof]\n", errout_str());
 
         check("void f() {\n"
               "  unknown p;\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return sizeof(unknown)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int p;\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int* p[5];\n"
               "  return sizeof(p)/5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
         check("void f() {\n"
               "  return sizeof(foo)*sizeof(bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning, inconclusive) Multiplying sizeof() with sizeof() indicates a logic error. [multiplySizeof]\n", errout_str());
 
         check("void f() {\n"
               "  return (foo)*sizeof(bar);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return sizeof(foo)*bar;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return (end - source) / sizeof(encode_block_type) * sizeof(encode_block_type);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S { T* t; };\n" // #10179
@@ -459,49 +471,49 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "    char *x = malloc(10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(*x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = (int*)malloc(sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = static_cast<int*>(malloc(sizeof(x)));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(&x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int*));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
@@ -509,155 +521,155 @@ class TestSizeof : public TestFixture {
               "    free(x);\n"
               "    int **y = malloc(sizeof(int*));\n"
               "    free(y);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(100 * sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(x) * 100);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof *x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(100 * sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof(*x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof *x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof(int));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char x[10];\n"
               "    memset(x, 0, sizeof(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* x[10];\n"
               "    memset(x, 0, sizeof(x));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char x[10];\n"
               "    memset(x, 0, sizeof x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(int));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(*x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof *x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof x);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(x));\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof(x) * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof x * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Size of pointer 'x' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof(*x) * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof *x * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int) * 10);\n"
               "    memset(x, 0, sizeof(int) * 10);\n"
               "    free(x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check(
@@ -665,18 +677,18 @@ class TestSizeof : public TestFixture {
             "{\n"
             "  const char *buf1_ex = \"foobarbaz\";\n"
             "  return strncmp(buf1, buf1_ex, sizeof(buf1_ex)) == 0;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:4:24]: (warning) Size of pointer 'buf1_ex' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check(
             "int fun(const char *buf1) {\n"
             "  return strncmp(buf1, foo(buf2), sizeof(buf1)) == 0;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (warning) Size of pointer 'buf1' used instead of size of its data. [pointerSize]\n", errout_str());
 
         check("int fun(const char *buf2) {\n"
               "  return strncmp(buf1, buf2, sizeof(char*)) == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:24]: (warning) Size of pointer 'buf2' used instead of size of its data. [pointerSize]\n", errout_str());
 
         // #ticket 3874
@@ -684,25 +696,25 @@ class TestSizeof : public TestFixture {
               "{\n"
               " int * pIntArray[10];\n"
               " memset(pIntArray, 0, sizeof(pIntArray));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void FreeFileName(const char *s) {\n"
               "  CxString tbuf;\n"
               "  const char *p;\n"
               "  memcpy(s, siezof(s));\n" // non-standard memcpy
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "  module_config_t *tab = module;\n"
               "  memset(tab + confsize, 0, sizeof(tab[confsize]));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(char* aug) {\n"
               "  memmove(aug + extra_string, aug, buf - (bfd_byte *)aug);\n" // #7100
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7518
@@ -710,13 +722,19 @@ class TestSizeof : public TestFixture {
               "  cpp_token *token;\n"
               "  cpp_hashnode **params = malloc(sizeof(cpp_hashnode *) * macro->paramc);\n"
               "  memcpy(params, macro->params, sizeof(cpp_hashnode *) * macro->paramc);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "  void* AtomName = malloc(sizeof(char *) * 34);\n"
               "  return AtomName;\n"
-              "}");
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void* f(size_t n) {\n" // #11754
+              "    char* p = malloc(n * sizeof(void*));\n"
+              "    return p;\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -724,7 +742,7 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "    struct foo *ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -732,7 +750,7 @@ class TestSizeof : public TestFixture {
               "        char bar[10];\n"
               "    }* ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -740,27 +758,27 @@ class TestSizeof : public TestFixture {
               "        char *bar;\n"
               "    }* ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (warning) Size of pointer 'bar' used instead of size of its data. [pointerSize]\n", errout_str());
     }
 
     void sizeofDivisionMemset() {
         check("void foo(memoryMapEntry_t* entry, memoryMapEntry_t* memoryMapEnd) {\n"
               "    memmove(entry, entry + 1, (memoryMapEnd - entry) / sizeof(entry));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:56]: (warning, inconclusive) Division of result of sizeof() on pointer type. [divideSizeof]\n"
                       "[test.cpp:2:54]: (warning) Division by result of sizeof(). memmove() expects a size in bytes, did you intend to multiply instead? [sizeofDivisionMemfunc]\n",
                       errout_str());
 
         check("Foo* allocFoo(int num) {\n"
               "    return malloc(num / sizeof(Foo));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (warning) Division by result of sizeof(). malloc() expects a size in bytes, did you intend to multiply instead? [sizeofDivisionMemfunc]\n", errout_str());
 
         check("void f() {\n"
               "  char str[100];\n"
               "  strncpy(str, xyz, sizeof(str)/sizeof(str[0]));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #9648
@@ -775,13 +793,13 @@ class TestSizeof : public TestFixture {
     void sizeofVoid() {
         check("void f() {\n"
               "  int size = sizeof(void);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (portability) Behaviour of 'sizeof(void)' is not covered by the ISO C standard. [sizeofVoid]\n", errout_str());
 
         check("void f() {\n"
               "  void* p;\n"
               "  int size = sizeof(*p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (portability) '*p' is of type 'void', the behaviour of 'sizeof(void)' is not covered by the ISO C standard. [sizeofDereferencedVoidPointer]\n", errout_str());
 
         check("void f() {\n"
@@ -789,7 +807,7 @@ class TestSizeof : public TestFixture {
               "  int* p2 = p + 4;\n"
               "  int* p3 = p - 1;\n"
               "  int* p4 = 1 + p;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:4:15]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:5:15]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
@@ -799,7 +817,7 @@ class TestSizeof : public TestFixture {
               "  void* p2 = malloc(5);\n"
               "  p1--;\n"
               "  p2++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) 'p1' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:5:5]: (portability) 'p2' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
@@ -808,7 +826,7 @@ class TestSizeof : public TestFixture {
               "  void* p2 = malloc(5);\n"
               "  p1-=4;\n"
               "  p2+=4;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (portability) 'p1' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:5:5]: (portability) 'p2' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
@@ -816,54 +834,54 @@ class TestSizeof : public TestFixture {
               "  void* p = malloc(10);\n"
               "  int* p2 = &p + 4;\n"
               "  int* p3 = &p - 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void** p1 = malloc(10);\n"
               "  p1--;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void** p1;\n"
               "  int j = sizeof(*p1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void* p1[5];\n"
               "  int j = sizeof(*p1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Calculations on void* with casts
 
         check("void f(void *data) {\n"
               "  *((unsigned char *)data + 1) = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void *data) {\n"
               "  *((unsigned char *)(data) + 1) = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(void *data) {\n"
               "  unsigned char* c = (unsigned char *)(data + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:45]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         check("void f(void *data) {\n"
               "  unsigned char* c = (unsigned char *)data++;\n"
               "  unsigned char* c2 = (unsigned char *)++data;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:43]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:3:40]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         check("void f(void *data) {\n"
               "  void* data2 = data + 1;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         // #4908 (void pointer as a member of a struct/class)
@@ -874,7 +892,7 @@ class TestSizeof : public TestFixture {
               "  char x = *((char*)(foo.data+1));\n"
               "  foo.data++;\n"
               "  return x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:30]: (portability) 'foo.data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n"
                       "[test.cpp:6:11]: (portability) 'foo.data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
@@ -898,7 +916,7 @@ class TestSizeof : public TestFixture {
               "};\n"
               "void f4(struct BOO* boo) {\n"
               "  char c = *((char*)boo->data.data + 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct FOO {\n"
@@ -906,7 +924,7 @@ class TestSizeof : public TestFixture {
               "};\n"
               "char f(struct FOO* foo) {\n"
               "  *(foo[1].data + 1) = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:17]: (portability) 'foo[1].data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         check("struct FOO {\n"
@@ -914,12 +932,12 @@ class TestSizeof : public TestFixture {
               "};\n"
               "void f2(struct FOO* foo) {\n"
               "  (foo[0]).data++;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (portability) '(foo[0]).data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined. [arithOperationsOnVoidPointer]\n", errout_str());
 
         // #6050 arithmetic on void**
         check("void* array[10];\n"
-              "void** b = array + 3;");
+              "void** b = array + 3;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -928,7 +946,7 @@ class TestSizeof : public TestFixture {
         check("char strncat ();\n"
               "int main () {\n"
               "  return strncat ();\n"
-              "}");
+              "}\n");
     }
 
 };
diff --git a/test/teststl.cpp b/test/teststl.cpp
index b102f979ca3..197cc3fafa7 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -32,7 +32,9 @@ class TestStl : public TestFixture {
     TestStl() : TestFixture("TestStl") {}
 
 private:
-    /*const*/ Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).severity(Severity::performance).library("std.cfg").build();
+    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).severity(Severity::performance).library("std.cfg").build();
+    const Settings settings_i = settingsBuilder(settings).certainty(Certainty::inconclusive).build();
+    const Settings settingsCpp03 = settingsBuilder(settings).cpp(Standards::CPP03).build();
 
     void run() override {
         mNewTemplate = true;
@@ -40,6 +42,7 @@ class TestStl : public TestFixture {
         TEST_CASE(outOfBoundsSymbolic);
         TEST_CASE(outOfBoundsIndexExpression);
         TEST_CASE(outOfBoundsIterator);
+        TEST_CASE(outOfBoundsErrorPath);
 
         TEST_CASE(iterator1);
         TEST_CASE(iterator2);
@@ -76,6 +79,7 @@ class TestStl : public TestFixture {
         TEST_CASE(iteratorSameExpression);
         TEST_CASE(mismatchingContainerIterator);
         TEST_CASE(eraseIteratorOutOfBounds);
+        TEST_CASE(algorithmOutOfBounds);
 
         TEST_CASE(dereference);
         TEST_CASE(dereference_break);  // #3644 - handle "break"
@@ -180,22 +184,25 @@ class TestStl : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool inconclusive = false;
-        Standards::cppstd_t cppstandard = Standards::CPPLatest;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, options.inconclusive).cpp(options.cppstandard).build();
+        const Settings& s = options.inconclusive ? settings_i : settings;
 
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this);
+        check_(file, line, code, s);
+    }
+
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& s) {
+        SimpleTokenizer tokenizer(s, *this);
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckStl>(tokenizer, this);
+        CheckStl check;
+        runChecks(check, tokenizer, *this);
     }
 
     // TODO: get rid of this
@@ -205,18 +212,19 @@ class TestStl : public TestFixture {
 
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckStl>(tokenizer, this);
+        CheckStl check;
+        runChecks(check, tokenizer, *this);
     }
 
-#define checkNormal(code) checkNormal_(code, __FILE__, __LINE__)
+#define checkNormal(...) checkNormal_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    void checkNormal_(const char (&code)[size], const char* file, int line) {
+    void checkNormal_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckStl>(tokenizer, this);
+        CheckStl check;
+        runChecks(check, tokenizer, *this);
     }
 
     void outOfBounds() {
@@ -243,19 +251,19 @@ class TestStl : public TestFixture {
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  s[10] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: error: Out of bounds access in expression 's[10]' because 's' is empty. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s = \"abcd\";\n"
                     "  s[10] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:4]: error: Out of bounds access in 's[10]', if 's' size is 4 and '10' is 10 [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f(std::vector<int> v) {\n"
                     "    v.front();\n"
                     "    if (v.empty()) {}\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: warning: Either the condition 'v.empty()' is redundant or expression 'v.front()' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:3:16]: note: condition 'v.empty()'\n"
                       "[test.cpp:2:12]: note: Access out of bounds\n", errout_str());
@@ -263,7 +271,7 @@ class TestStl : public TestFixture {
         checkNormal("void f(std::vector<int> v) {\n"
                     "    if (v.size() == 3) {}\n"
                     "    v[16] = 0;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: warning: Either the condition 'v.size()==3' is redundant or size of 'v' can be 3. Expression 'v[16]' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:2:18]: note: condition 'v.size()==3'\n"
                       "[test.cpp:3:6]: note: Access out of bounds\n", errout_str());
@@ -273,7 +281,7 @@ class TestStl : public TestFixture {
                     "    if (v.size() == 3) {\n"
                     "        v[i] = 0;\n"
                     "    }\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: warning: Either the condition 'v.size()==3' is redundant or size of 'v' can be 3. Expression 'v[i]' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:3:18]: note: condition 'v.size()==3'\n"
                       "[test.cpp:4:10]: note: Access out of bounds\n", errout_str());
@@ -281,19 +289,19 @@ class TestStl : public TestFixture {
         checkNormal("void f(std::vector<int> v, int i) {\n"
                     "    if (v.size() == 3 || i == 16) {}\n"
                     "    v[i] = 0;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::map<int,int> x) {\n"
                     "    if (x.empty()) { x[1] = 2; }\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "    if (s.size() == 1) {\n"
                     "        s[2] = 0;\n"
                     "    }\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: warning: Either the condition 's.size()==1' is redundant or size of 's' can be 1. Expression 's[2]' causes access out of bounds. [containerOutOfBounds]\n"
                       "[test.cpp:2:18]: note: condition 's.size()==1'\n"
                       "[test.cpp:3:10]: note: Access out of bounds\n", errout_str());
@@ -303,25 +311,25 @@ class TestStl : public TestFixture {
                     "  std::string b[];\n"
                     "  for (auto c : b)\n"
                     "    c.data();\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("std::string f(std::string x) {\n"
                     "  if (x.empty()) return {};\n"
                     "  x[0];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("std::string f(std::string x) {\n"
                     "  if (x.empty()) return std::string{};\n"
                     "  x[0];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  x = s.begin() + 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:17]: error: Out of bounds access in expression 's.begin()+1' because 's' is empty. [containerOutOfBounds]\n"
             "[test.cpp:3:17]: error: Out of bounds access in expression 's.begin()+1' because 's' is empty. [containerOutOfBounds]\n",   // duplicate
@@ -330,29 +338,29 @@ class TestStl : public TestFixture {
         checkNormal("void f(int x) {\n"
                     "  std::string s;\n"
                     "  auto it = s.begin() + x;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: error: Out of bounds access in expression 's.begin()+x' because 's' is empty and 'x' may be non-zero. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("char fstr1(){const std::string s = \"<a><b>\"; return s[42]; }\n"
-                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[42]; }");
+                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[42]; }\n");
         ASSERT_EQUALS("[test.cpp:1:54]: error: Out of bounds access in 's[42]', if 's' size is 6 and '42' is 42 [containerOutOfBounds]\n"
                       "[test.cpp:2:60]: error: Out of bounds access in 's[42]', if 's' size is 6 and '42' is 42 [containerOutOfBounds]\n", errout_str());
 
         checkNormal("char fstr1(){const std::string s = \"<a><b>\"; return s[1]; }\n"
-                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[1]; }");
+                    "wchar_t fwstr1(){const std::wstring s = L\"<a><b>\"; return s[1]; }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("int f() {\n"
                     "    std::vector<int> v;\n"
                     "    std::vector<int> * pv = &v;\n"
                     "    return (*pv)[42];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:4:17]: error: Out of bounds access in expression '(*pv)[42]' because '*pv' is empty. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  ++abc[s];\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9274
@@ -361,14 +369,16 @@ class TestStl : public TestFixture {
                     "    int x = 6;\n"
                     "    if(b) ++x;\n"
                     "    return s[x];\n"
-                    "}");
-        ASSERT_EQUALS("[test.cpp:5:13]: error: Out of bounds access in 's[x]', if 's' size is 6 and 'x' is 6 [containerOutOfBounds]\n", errout_str());
+                    "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:13]: error: Out of bounds access in 's[x]', if 's' size is 6 and 'x' is 7 [containerOutOfBounds]\n",
+            errout_str());
 
         checkNormal("void f() {\n"
                     "    static const int N = 4;\n"
                     "    std::array<int, N> x;\n"
                     "    x[0] = 0;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(bool b) {\n"
@@ -607,7 +617,7 @@ class TestStl : public TestFixture {
                     "            return i;\n"
                     "    return 0;\n"
                     "}\n");
-        ASSERT_EQUALS("[test.cpp:8:0]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:13]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         checkNormal("bool g();\n"
                     "int f(int x) {\n"
@@ -620,7 +630,7 @@ class TestStl : public TestFixture {
                     "            return i;\n"
                     "    return 0;\n"
                     "}\n");
-        ASSERT_EQUALS("[test.cpp:8:0]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:8:13]: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         checkNormal("bool g();\n"
                     "void f(int x) {\n"
@@ -941,6 +951,71 @@ class TestStl : public TestFixture {
                     "    (void)v[0];\n"
                     "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkNormal("int f(const std::vector<int>& v) {\n" // #8983
+                    "    return v[2];\n"
+                    "}\n"
+                    "int g() {\n"
+                    "    return f({});\n"
+                    "}\n"
+                    "int h() {\n"
+                    "    return f({ 1, 2 });\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:2:13]: error: Out of bounds access in 'v[2]', if 'v' size is 2 and '2' is 2 [containerOutOfBounds]\n"
+                      "[test.cpp:2:13]: error: Out of bounds access in expression 'v[2]' because 'v' is empty. [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("int f(int x, const std::vector<int>& v) {\n"
+                    "    return x + v[0];\n"
+                    "}\n"
+                    "int g() {\n"
+                    "    return f(1, {});\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: error: Out of bounds access in expression 'v[0]' because 'v' is empty. [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("bool f(const std::string_view s) { return s[500] == 'x'; }\n" // #12046
+                    "bool g() { return f(\" \"); }\n");
+        ASSERT_EQUALS("[test.cpp:1:44]: error: Out of bounds access in 's[500]', if 's' size is 1 and '500' is 500 [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("int main() {\n" // #14342
+                    "    const int a[] = { 1, 2, 3 };\n"
+                    "    std::span<const int> x{ a };\n"
+                    "    return x[3];\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:4:13]: error: Out of bounds access in 'x[3]', if 'x' size is 1 and '3' is 3 [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("int main() {\n"
+                    "    const char a[] = \"abc\";\n"
+                    "    std::string_view x{ a };\n"
+                    "    return x[5];\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:4:13]: error: Out of bounds access in 'x[5]', if 'x' size is 4 and '5' is 5 [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("int f(const std::string& v) {\n"
+                    "    return v[2];\n"
+                    "}\n"
+                    "int main() {\n"
+                    "    std::string_view x{ \"a\" };\n"
+                    "    return f(std::string(x));\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:2:13]: error: Out of bounds access in 'v[2]', if 'v' size is 1 and '2' is 2 [containerOutOfBounds]\n",
+                      errout_str());
+
+        checkNormal("std::string f(const std::string& str) {\n" // do not warn, the copy has the same size as 'str'
+                    "    std::string outStr = str;\n"
+                    "    if (!outStr.empty())\n"
+                    "        outStr[0] = 'a';\n"
+                    "    for (int i = 0; i < str.size(); ++i) {\n"
+                    "        if (outStr[i] == '_')\n"
+                    "            outStr[i] = ' ';\n"
+                    "    }\n"
+                    "    return outStr;\n"
+                    "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void outOfBoundsSymbolic()
@@ -953,6 +1028,12 @@ class TestStl : public TestFixture {
         ASSERT_EQUALS(
             "[test.cpp:2:12] -> [test.cpp:4:21]: (warning) Either the condition 'col>textline.size()' is redundant or 'col' can have the value textline.size(). Expression 'textline[col]' causes access out of bounds. [containerOutOfBounds]\n",
             errout_str());
+
+        check("void f(const std::vector<int>& v) {\n" // #12742
+              "    for (unsigned i = 0; i < v.size();)\n"
+              "        (void)v[i++];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void outOfBoundsIndexExpression() {
@@ -960,22 +1041,22 @@ class TestStl : public TestFixture {
 
         checkNormal("void f(std::string s) {\n"
                     "  s[s.size()] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index 's.size()' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "  s[s.size()+1] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index 's.size()+1' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "  s[1+s.size()] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index '1+s.size()' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "  s[x*s.size()] = 1;\n"
-                    "}");
+                    "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: error: Out of bounds access of s, index 'x*s.size()' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
 
         checkNormal("bool f(std::string_view& sv) {\n" // #10031
@@ -1044,6 +1125,23 @@ class TestStl : public TestFixture {
                       errout_str());
     }
 
+    void outOfBoundsErrorPath() {
+        setMultiline();
+        Settings s = settings;
+        s.templateLocation = "{file}:{line}:note:{info}";
+
+        check("int f(int i) {\n"
+              "    std::string s = \"abc\";\n"
+              "    if (i > 5)\n"
+              "        return 0;\n"
+              "    return s[i];\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:5:13]: warning: Either the condition 'i>5' is redundant or 'i' can have the value 5. Expression 's[i]' causes access out of bounds. [containerOutOfBounds]\n"
+                      "[test.cpp:3:11]: note: Assuming that condition 'i>5' is not redundant\n"
+                      "[test.cpp:5:13]: note: Access out of bounds\n",
+                      errout_str());
+    }
+
     void iterator1() {
         check("void f()\n"
               "{\n"
@@ -1051,7 +1149,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    for (std::list<int>::iterator it = l1.begin(); it != l2.end(); ++it)\n"
               "    { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:40]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1061,7 +1159,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    for (std::list<int>::iterator it = l1.begin(); l2.end() != it; ++it)\n"
               "    { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:52]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1071,7 +1169,7 @@ class TestStl : public TestFixture {
               "    for (it = l1.begin(); it != l1.end(); ++it) { }\n"
               "    C c;\n"
               "    for (it = c.l1.begin(); it != c.l1.end(); ++it) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Same check with reverse iterator
@@ -1081,7 +1179,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    for (std::list<int>::const_reverse_iterator it = l1.rbegin(); it != l2.rend(); ++it)\n"
               "    { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:54]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1096,7 +1194,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:35]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1109,7 +1207,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1121,7 +1219,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Same iterator is used with different containers 'l1' and 'l2'. [iterators1]\n"
                       "[test.cpp:6:5]: (error) Iterator 'it' referring to container 'l1' is used with container 'l2'. [mismatchingContainerIterator]\n",
                       errout_str());
@@ -1131,7 +1229,7 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it, l1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #7658
@@ -1140,7 +1238,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator it = l1.begin();\n"
               "    std::list<int>::iterator end = l1.end();\n"
               "    l2.insert(it, end);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // only warn for insert when there are preciself 2 arguments.
@@ -1149,14 +1247,14 @@ class TestStl : public TestFixture {
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void foo() {\n"
               "    std::list<int> l1;\n"
               "    std::list<int> l2;\n"
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it,0,1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -1171,7 +1269,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        result.insert(cit->size());\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1179,7 +1277,7 @@ class TestStl : public TestFixture {
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find(ints1.begin(), ints2.end(), 22);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:47]: (error) Iterators of different containers 'ints1' and 'ints2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1192,7 +1290,7 @@ class TestStl : public TestFixture {
               "    std::set<int>::iterator it1 = ints1.begin();\n"
               "    std::set<int>::iterator it2 = ints1.end();\n"
               "    ints2.insert(it1, it2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const std::set<int> &ints1)\n"
@@ -1201,7 +1299,7 @@ class TestStl : public TestFixture {
               "    std::set<int>::iterator it1 = ints1.begin();\n"
               "    std::set<int>::iterator it2 = ints2.end();\n"
               "    ints2.insert(it1, it2);\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers are used together.\n", "", errout_str());
     }
 
@@ -1209,14 +1307,14 @@ class TestStl : public TestFixture {
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::inplace_merge(ints1.begin(), std::advance(ints1.rbegin(), 5), ints2.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:56]: (error) Iterators of different containers 'ints1' and 'ints2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::inplace_merge(ints1.begin(), std::advance(ints2.rbegin(), 5), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1224,28 +1322,28 @@ class TestStl : public TestFixture {
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(ints1.begin(), ints2.end(), ints1.begin(), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:56]: (error) Iterators of different containers 'ints1' and 'ints2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(ints1.begin(), ints1.end(), ints2.begin(), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:84]: (error) Iterators of different containers 'ints2' and 'ints1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(foo.bar.begin(), foo.bar.end()-6, ints2.begin(), ints1.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:90]: (error) Iterators of different containers 'ints2' and 'ints1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void foo(std::vector<int> ints1, std::vector<int> ints2)\n"
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(ints1.begin(), ints1.end(), ints2.begin(), ints2.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6839
@@ -1256,7 +1354,7 @@ class TestStl : public TestFixture {
               "    const std::u32string tp4(b.begin(), a.end());\n"
               "    const std::string fp1 = std::string(a.begin(), a.end());\n"
               "    const std::string tp2(a.begin(), a.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS( // TODO "[test.cpp:2]: (error) Iterators of different containers are used together.\n"
             // TODO "[test.cpp:3]: (error) Iterators of different containers are used together.\n"
             "[test.cpp:4:26]: (error) Iterators of different containers 'tp3' and 'a' are used together. [mismatchingContainers]\n"
@@ -1278,7 +1376,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "        ++aI;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2481
@@ -1294,7 +1392,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "        ++aI;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Execution path checking..
@@ -1313,7 +1411,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "        ++aI;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:14] (error) After insert(), the iterator 'aI' may be invalid.", "", errout_str());
     }
 
@@ -1328,7 +1426,7 @@ class TestStl : public TestFixture {
               "        if (true) { }\n"
               "        if (it != s2.end()) continue;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:39]: (error) Iterators of different containers 's1' and 's2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1340,7 +1438,7 @@ class TestStl : public TestFixture {
               "    vector<string> myVector;\n"
               "    for(vector<int>::iterator x = myVector.begin(); x != myVector.end(); x++)\n"
               "        myMap.erase(*x);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1350,8 +1448,8 @@ class TestStl : public TestFixture {
               "    std::map<int, int> map1;\n"
               "    std::map<int, int> map2;\n"
               "    std::map<int, int>::const_iterator it = map1.find(123);\n"
-              "    if (it == map2.end()) { }"
-              "}");
+              "    if (it == map2.end()) { }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:45]: (error) Iterators of different containers 'map1' and 'map2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1359,8 +1457,8 @@ class TestStl : public TestFixture {
               "    std::map<int, int> map1;\n"
               "    std::map<int, int> map2;\n"
               "    std::map<int, int>::const_iterator it = map1.find(123);\n"
-              "    if (map2.end() == it) { }"
-              "}");
+              "    if (map2.end() == it) { }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (error) Iterators of different containers 'map2' and 'map1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1368,7 +1466,7 @@ class TestStl : public TestFixture {
               "    int pos = s.find(x);\n"
               "    s.erase(pos);\n"
               "    s.erase(pos);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1383,7 +1481,7 @@ class TestStl : public TestFixture {
               "    it = t.begin();\n"
               "    while (it!=a.end())\n"
               "        ++it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:10]: (error) Iterators of different containers 't' and 'a' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1398,7 +1496,7 @@ class TestStl : public TestFixture {
               "    it = t.begin();\n"
               "    while (it!=t.end())\n"
               "        ++it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -1413,7 +1511,7 @@ class TestStl : public TestFixture {
               "        ++it;\n"
               "    while (!z && it!=t.end())\n"
               "        ++it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1422,7 +1520,7 @@ class TestStl : public TestFixture {
               "    std::map<int,Foo> x;\n"
               "    std::map<int,Foo>::const_iterator it;\n"
               "    for (it = x.find(0)->second.begin(); it != x.find(0)->second.end(); ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1430,7 +1528,7 @@ class TestStl : public TestFixture {
         check("void f(C1* x, std::list<int> a) {\n"
               "  std::list<int>::iterator pos = a.begin();\n"
               "  for(pos = x[0]->plist.begin(); pos != x[0]->plist.end(); ++pos) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1445,7 +1543,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1459,7 +1557,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it2;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1473,7 +1571,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1487,7 +1585,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:35]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1504,7 +1602,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1519,7 +1617,7 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "    it2 = l2.end();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1534,7 +1632,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
@@ -1550,7 +1648,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
                       errout_str());
     }
@@ -1563,7 +1661,7 @@ class TestStl : public TestFixture {
               "    while (++it1 != --it2)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::list<int> l1, std::list<int> l2)\n"
@@ -1573,7 +1671,7 @@ class TestStl : public TestFixture {
               "    while (it1++ != --it2)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::list<int> l1, std::list<int> l2)\n"
@@ -1583,7 +1681,7 @@ class TestStl : public TestFixture {
               "    if (--it2 > it1++)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:5:15]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
     }
 
@@ -1598,7 +1696,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:7:13] -> [test.cpp:4:36]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n",
             errout_str());
@@ -1613,7 +1711,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS(
             "[test.cpp:7] -> [test.cpp:4]: (error) Same iterator is used with containers 'l1' that are defined in different scopes.\n",
             "[test.cpp:7:19] -> [test.cpp:7:13]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n"
@@ -1631,7 +1729,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:8:13] -> [test.cpp:4:36]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n",
             errout_str());
@@ -1647,7 +1745,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:8:13] -> [test.cpp:7:40]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes. [iterators3]\n",
             errout_str());
@@ -1687,7 +1785,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1707,7 +1805,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        ++it1;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:13] -> [test.cpp:10] -> [test.cpp:11]: (error) Comparison of iterators from containers 'l1' and 'l2'.\n", "", errout_str());
 
     }
@@ -1725,7 +1823,7 @@ class TestStl : public TestFixture {
               "    if (it2 != it1)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n"
                       "[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
                       errout_str());
@@ -1739,7 +1837,7 @@ class TestStl : public TestFixture {
               "    if (it1 != it2 && it1 != it2)\n"
               "    {\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n"
                       "[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n", // duplicate
                       errout_str());
@@ -1750,7 +1848,7 @@ class TestStl : public TestFixture {
               "    std::list<int> &l = x.l;\n"
               "    std::list<int>::iterator it = l.find(123);\n"
               "    x.l.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1765,7 +1863,7 @@ class TestStl : public TestFixture {
               "};\n"
               "bool A::B::operator==(const A::B& b) const {\n"
               "    return std::tie(x, y, z) == std::tie(b.x, b.y, b.z);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1773,29 +1871,29 @@ class TestStl : public TestFixture {
         // #9556
         check("void f(int a, int b) {\n"
               "  if (&a == &b) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (std::for_each(&a, &b + 1, [](auto) {})) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Iterators of different containers 'a' and 'b' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (std::for_each(&a, &b, [](auto) {})) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (error) Iterators of different containers 'a' and 'b' are used together. [mismatchingContainers]\n",
                       errout_str());
 
         check("void f(int a) {\n"
               "  if (std::for_each(&a, &a, [](auto) {})) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("void f(int a) {\n"
               "  if (std::for_each(&a, &a + 1, [](auto) {})) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1808,7 +1906,7 @@ class TestStl : public TestFixture {
               "    bool operator()(const S& lhs, const S& rhs) const {\n"
               "        return &lhs.v != &rhs.v;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1936,7 +2034,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    (void)std::find(f().begin(), g().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1944,7 +2042,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    if(f().begin() == g().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1952,7 +2050,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    auto size = f().end() - g().begin();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
                       errout_str());
 
@@ -1962,7 +2060,7 @@ class TestStl : public TestFixture {
               "};\n"
               "void foo() {\n"
               "    (void)std::find(A().f().begin(), A().g().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:6:26]: (error) Iterators of different containers 'A().f()' and 'A().g()' are used together. [mismatchingContainers]\n",
             errout_str());
@@ -1973,7 +2071,7 @@ class TestStl : public TestFixture {
               "};\n"
               "void foo() {\n"
               "    (void)std::find(A{} .f().begin(), A{} .g().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:6:27]: (error) Iterators of different containers 'A{}.f()' and 'A{}.g()' are used together. [mismatchingContainers]\n",
             errout_str());
@@ -1982,7 +2080,7 @@ class TestStl : public TestFixture {
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    (void)std::find(begin(f()), end(g()), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:28]: (warning) Iterators to containers from different expressions 'f()' and 'g()' are used together. [mismatchingContainerExpression]\n", errout_str());
 
         check("struct A {\n"
@@ -1991,14 +2089,14 @@ class TestStl : public TestFixture {
               "};\n"
               "void foo() {\n"
               "    (void)std::find(A().f().begin(), A().f().end(), 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>& f();\n"
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    if(bar(f().begin()) == g().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>& f();\n"
@@ -2022,7 +2120,7 @@ class TestStl : public TestFixture {
               "    (void)std::find(begin(f()) + 1, end(f()), 0);\n"
               "    (void)std::find(begin(f()), end(f()) - 1, 0);\n"
               "    (void)std::find(begin(f()) + 1, end(f()) - 1, 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:30]: (error) Dereference of an invalid iterator: f().end()+1 [derefInvalidIterator]\n", errout_str());
 
         check("std::vector<int>& f();\n"
@@ -2031,7 +2129,7 @@ class TestStl : public TestFixture {
               "    if(f().begin() == f().end()+1) {}\n"
               "    if(f().begin()+1 == f().end()) {}\n"
               "    if(f().begin()+1 == f().end()+1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:32]: (error) Dereference of an invalid iterator: f().end()+1 [derefInvalidIterator]\n"
                       "[test.cpp:6:34]: (error) Dereference of an invalid iterator: f().end()+1 [derefInvalidIterator]\n",
                       errout_str());
@@ -2042,7 +2140,7 @@ class TestStl : public TestFixture {
               "    if(std::begin(f()) == std::end(f())+1) {}\n"
               "    if(std::begin(f())+1 == std::end(f())) {}\n"
               "    if(std::begin(f())+1 == std::end(f())+1) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (error) Dereference of an invalid iterator: std::end(f())+1 [derefInvalidIterator]\n"
                       "[test.cpp:6:42]: (error) Dereference of an invalid iterator: std::end(f())+1 [derefInvalidIterator]\n",
                       errout_str());
@@ -2051,23 +2149,23 @@ class TestStl : public TestFixture {
               "std::vector<int>& f();\n"
               "void foo() {\n"
               "    if(f<1>().begin() == f<1>().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  if (a.begin().x == b.begin().x) {}\n"
               "  if (begin(a).x == begin(b).x) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::list<int*> a, std::list<int*> b) {\n"
               "  if (*a.begin() == *b.begin()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if(f().begin(1) == f().end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(const uint8_t* data, const uint32_t dataLength) {\n"
@@ -2097,35 +2195,35 @@ class TestStl : public TestFixture {
     void iteratorSameExpression() {
         check("void f(std::vector<int> v) {\n"
               "    std::for_each(v.begin(), v.begin(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("std::vector<int>& g();\n"
               "void f() {\n"
               "    std::for_each(g().begin(), g().begin(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("void f(std::vector<int> v) {\n"
               "    std::for_each(v.end(), v.end(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:24]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("std::vector<int>& g();\n"
               "void f() {\n"
               "    std::for_each(g().end(), g().end(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("std::vector<int>::iterator g();\n"
               "void f(std::vector<int> v) {\n"
               "    std::for_each(g(), g(), [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
 
         check("void f(std::vector<int>::iterator it) {\n"
               "    std::for_each(it, it, [](int){});\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:19]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
     }
 
@@ -2134,13 +2232,13 @@ class TestStl : public TestFixture {
               "    std::vector<int> a, b;\n"
               "    a.insert(b.end(), value);\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Iterator 'b.end()' referring to container 'b' is used with container 'a'. [mismatchingContainerIterator]\n", errout_str());
 
         check("std::vector<int> f(std::vector<int> a, std::vector<int> b) {\n"
               "    a.erase(b.begin());\n"
               "    return a;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (error) Iterator 'b.begin()' referring to container 'b' is used with container 'a'. [mismatchingContainerIterator]\n", errout_str());
 
         // #9973
@@ -2280,6 +2378,15 @@ class TestStl : public TestFixture {
               "    }   \n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("std::string g1();\n" // #12520
+              "const std::string& g2();\n"
+              "void f() {\n"
+              "    g1().erase(g1().begin());\n"
+              "    g2().erase(g2().begin());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Iterator 'g1().begin()' referring to temporary container 'g1()' is used with temporary container 'g1()'. [mismatchingContainerIterator]\n",
+                      errout_str());
     }
 
     void eraseIteratorOutOfBounds() {
@@ -2345,28 +2452,409 @@ class TestStl : public TestFixture {
                       errout_str());
     }
 
-    // Dereferencing invalid pointer
-    void dereference() {
-        check("void f()\n"
-              "{\n"
-              "    std::vector<int> ints{1,2,3,4,5};\n"
-              "    std::vector<int>::iterator iter;\n"
-              "    iter = ints.begin() + 2;\n"
-              "    ints.erase(iter);\n"
-              "    std::cout << (*iter) << std::endl;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
-        TODO_ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:6] -> [test.cpp:3] -> [test.cpp:7]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:5:22] -> [test.cpp:6:10] -> [test.cpp:3:22] -> [test.cpp:7:20]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
+    void algorithmOutOfBounds()
+    {
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6,7,8,9,10};\n"
+              "    const std::deque<int> d1{1,2,3,4,5,6};\n"
+              "    if(std::equal(d0.cbegin(), d0.cend(), d1.cbegin())) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:52]: (error) The algorithm 'std::equal' accesses 10 elements through the iterator 'd1.cbegin()' but only 6 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
 
-        // #6554 "False positive eraseDereference - erase in while() loop"
-        check("typedef std::map<Packet> packetMap;\n"
-              "packetMap waitingPackets;\n"
-              "void ProcessRawPacket() {\n"
-              "    packetMap::iterator wpi;\n"
-              "    while ((wpi = waitingPackets.find(lastInOrder + 1)) != waitingPackets.end()) {\n"
-              "        waitingPackets.erase(wpi);\n"
-              "        for (unsigned pos = 0; pos < buf.size(); ) {     }\n"
-              "    }\n"
-              "}");
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6};\n"
+              "    const std::deque<int> d1{1,2,3,4,5,6};\n"
+              "    if(std::equal(d0.cbegin(), d0.cend(), d1.cbegin())) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // two-range overload does not access the second range out of bounds
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6,7,8,9,10};\n"
+              "    const std::deque<int> d1{1,2,3,4,5,6};\n"
+              "    if(std::equal(d0.cbegin(), d0.cend(), d1.cbegin(), d1.cend())) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:45]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // iterator arithmetic
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(6);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin() + 3);\n"
+              "    std::copy(v0.begin() + 3, v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:48]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()+3' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // don't warn when using iterator adaptors
+        check("void f() {\n"
+              "    const std::deque<int> d0{1,2,3,4,5,6,7,8,9,10};\n"
+              "    std::deque<int> d1;\n"
+              "    std::copy(d0.cbegin(), d0.cend(), std::back_inserter(d1));\n"
+              "    std::copy(d0.cbegin(), d0.cend(), std::inserter(d1, d1.begin()));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // algorithms that access at most last-first elements are inconclusive
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy_if(v0.begin(), v0.end(), v1.begin(), [](int i) { return i != 3; });\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy_if(v0.begin(), v0.end(), v1.begin(), [](int i) { return i != 3; });\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:4:48]: (warning, inconclusive) The algorithm 'std::copy_if' may access up to 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::transform(v0.begin(), v0.end(), v1.begin(), [](int i) { return i * 2; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:50]: (error) The algorithm 'std::transform' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // binary transform reads the third argument and writes the fourth argument
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    const std::vector<int> v1{1,2,3};\n"
+              "    std::vector<int> v2(5);\n"
+              "    std::transform(v0.begin(), v0.end(), v1.begin(), v2.begin(), [](int a, int b) { return a + b; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:50]: (error) The algorithm 'std::transform' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    const std::vector<int> v1{1,2,3,4,5};\n"
+              "    std::vector<int> v2(3);\n"
+              "    std::transform(v0.begin(), v0.end(), v1.begin(), v2.begin(), [](int a, int b) { return a + b; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:62]: (error) The algorithm 'std::transform' accesses 5 elements through the iterator 'v2.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // copying a range within the same container
+        check("void f() {\n"
+              "    std::vector<int> v{1,2,3,4,5,6,7,8,9,10};\n"
+              "    std::copy(v.begin(), v.begin() + 3, v.begin() + 7);\n"
+              "    std::copy(v.begin(), v.begin() + 4, v.begin() + 7);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:51]: (error) The algorithm 'std::copy' accesses 4 elements through the iterator 'v.begin()+7' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // unknown container sizes
+        check("void f(const std::vector<int>& v0, std::vector<int>& v1) {\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // don't warn for iterator variables when the container size changes before the algorithm is called
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::list<int> l1(3);\n"
+              "    auto it = l1.begin();\n"
+              "    l1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // iterator variables carry the container size
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    auto it = v1.begin();\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:37]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'it' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // ..and the size is the size at the call, not at the creation of the iterator
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::list<int> l1(10);\n"
+              "    auto it = l1.begin();\n"
+              "    l1.resize(3);\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:6:37]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'it' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // conditional container size
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() == 3)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:18] -> [test.cpp:4:48]: (warning) Either the condition 'v.size()==3' is redundant or the algorithm 'std::copy' accesses 5 elements through the iterator 'v.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() < 5)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:18] -> [test.cpp:4:48]: (warning) Either the condition 'v.size()<5' is redundant or the algorithm 'std::copy' accesses 5 elements through the iterator 'v.begin()' but only 4 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() >= 5)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // writing through the end iterator
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3};\n"
+              "    std::vector<int> v1(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.end());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:43]: (error) The algorithm 'std::copy' accesses 3 elements through the iterator 'v1.end()' but only 0 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // the source range is known even when the container size is not
+        check("void f(const std::vector<int>& v) {\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy(v.begin(), v.begin() + 5, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:49]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // count-based algorithms access both iterator arguments <count> times
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(3);\n"
+              "    std::copy_n(v0.begin(), 5, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:40]: (error) The algorithm 'std::copy_n' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(10);\n"
+              "    std::copy_n(v0.begin(), 10, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:25]: (error) The algorithm 'std::copy_n' accesses 10 elements through the iterator 'v0.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy_n(v0.begin(), 5, v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(5);\n"
+              "    std::fill_n(v.begin(), 10, 0);\n"
+              "    std::fill_n(v.begin() + 3, 3, 0);\n"
+              "    std::fill_n(v.begin(), 5, 0);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:24]: (error) The algorithm 'std::fill_n' accesses 10 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n"
+            "[test.cpp:4:27]: (error) The algorithm 'std::fill_n' accesses 3 elements through the iterator 'v.begin()+3' but only 2 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v;\n"
+              "    std::fill_n(std::back_inserter(v), 10, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v(5);\n"
+              "    std::generate_n(v.begin(), 6, [] { return 1; });\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:28]: (error) The algorithm 'std::generate_n' accesses 6 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // conditional count
+        check("void f(std::vector<int>& v, int n) {\n"
+              "    if (v.size() == 5 && n > 5)\n"
+              "        std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:28] -> [test.cpp:3:28]: (warning) Either the condition 'n>5' is redundant or the algorithm 'std::fill_n' accesses 6 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // an upper bound of the count cannot tell whether the access is out of bounds
+        check("void f(int n) {\n"
+              "    std::vector<int> v(3);\n"
+              "    if (n < 5)\n"
+              "        std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // a lower bound of the container size cannot tell whether the access is out of bounds
+        check("void f(std::vector<int>& v) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    if (v.size() >= 4)\n"
+              "        std::copy(v0.begin(), v0.end(), v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // unknown count
+        check("void f(std::vector<int>& v, int n) {\n"
+              "    std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all container size values are checked, not only the first one
+        check("void f(bool b) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1;\n"
+              "    if (b)\n"
+              "        v1.resize(3);\n"
+              "    else\n"
+              "        v1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:8:45]: (error) The algorithm 'std::copy' accesses 5 elements through the iterator 'v1.begin()' but only 3 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(bool b) {\n"
+              "    const std::vector<int> v0{1,2,3,4,5};\n"
+              "    std::vector<int> v1;\n"
+              "    if (b)\n"
+              "        v1.resize(5);\n"
+              "    else\n"
+              "        v1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all iterator position values are checked as well
+        check("void f(bool b) {\n"
+              "    const std::vector<int> v0{1,2,3,4};\n"
+              "    std::vector<int> v1(5);\n"
+              "    auto it = b ? v1.begin() : v1.begin() + 3;\n"
+              "    std::copy(v0.begin(), v0.end(), it);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:37]: (error) The algorithm 'std::copy' accesses 4 elements through the iterator 'it' but only 2 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // do not combine possible values on both sides
+        check("void f(bool b, std::vector<int>& v0, std::vector<int>& v1) {\n"
+              "    if (b) v0.resize(5); else v0.resize(2);\n"
+              "    if (b) v1.resize(3); else v1.resize(10);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all source range values are checked against the preferred destination values
+        check("void f(bool b) {\n"
+              "    std::vector<int> v0;\n"
+              "    if (b)\n"
+              "        v0.resize(3);\n"
+              "    else\n"
+              "        v0.resize(10);\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:8:45]: (error) The algorithm 'std::copy' accesses 10 elements through the iterator 'v1.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        check("void f(bool b) {\n"
+              "    std::vector<int> v0;\n"
+              "    if (b)\n"
+              "        v0.resize(3);\n"
+              "    else\n"
+              "        v0.resize(5);\n"
+              "    std::vector<int> v1(5);\n"
+              "    std::copy(v0.begin(), v0.end(), v1.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // all count values are checked as well
+        check("void f(bool b) {\n"
+              "    std::vector<int> v(5);\n"
+              "    const int n = b ? 3 : 10;\n"
+              "    std::fill_n(v.begin(), n, 0);\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:24]: (error) The algorithm 'std::fill_n' accesses 10 elements through the iterator 'v.begin()' but only 5 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
+
+        // an iterator into a nested container does not carry the outer container's size
+        check("std::array<std::array<int, 16>, 1> f(const std::array<int, 16>& a) {\n"
+              "    std::array<std::array<int, 16>, 1> res;\n"
+              "    std::copy(a.begin(), a.end(), res[0].begin());\n"
+              "    return res;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const std::vector<int> v0{1,2,3};\n"
+              "    std::vector<std::vector<int>> v1(1, std::vector<int>(5));\n"
+              "    std::copy(v0.begin(), v0.end(), v1[0].begin());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    // Dereferencing invalid pointer
+    void dereference() {
+        check("void f()\n"
+              "{\n"
+              "    std::vector<int> ints{1,2,3,4,5};\n"
+              "    std::vector<int>::iterator iter;\n"
+              "    iter = ints.begin() + 2;\n"
+              "    ints.erase(iter);\n"
+              "    std::cout << (*iter) << std::endl;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        TODO_ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:6] -> [test.cpp:3] -> [test.cpp:7]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:5:22] -> [test.cpp:6:10] -> [test.cpp:3:22] -> [test.cpp:7:20]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
+
+        // #6554 "False positive eraseDereference - erase in while() loop"
+        check("typedef std::map<Packet> packetMap;\n"
+              "packetMap waitingPackets;\n"
+              "void ProcessRawPacket() {\n"
+              "    packetMap::iterator wpi;\n"
+              "    while ((wpi = waitingPackets.find(lastInOrder + 1)) != waitingPackets.end()) {\n"
+              "        waitingPackets.erase(wpi);\n"
+              "        for (unsigned pos = 0; pos < buf.size(); ) {     }\n"
+              "    }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8509 Uniform initialization ignored for iterator
@@ -2374,7 +2862,7 @@ class TestStl : public TestFixture {
               "  std::vector<int> ints;\n"
               "  std::vector<int>::const_iterator iter {ints.cbegin()};\n"
               "  std::cout << (*iter) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2391,7 +2879,7 @@ class TestStl : public TestFixture {
               "            break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2403,7 +2891,7 @@ class TestStl : public TestFixture {
               "    iter = ints.begin();\n"
               "    ints.erase(iter);\n"
               "    std::cout << iter->first << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:18] -> [test.cpp:6:5]: (error) Iterator 'iter' used after element has been erased. [eraseDereference]\n"
                       "[test.cpp:6:10]: (error) Calling function 'erase()' on the iterator 'iter' which is out of bounds. [eraseIteratorOutOfBounds]\n",
                       errout_str());
@@ -2416,7 +2904,7 @@ class TestStl : public TestFixture {
               "    iter = ints.rbegin();\n"
               "    ints.erase(iter);\n"
               "    std::cout << iter->first << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:18] -> [test.cpp:6:5]: (error) Iterator 'iter' used after element has been erased. [eraseDereference]\n"
                       "[test.cpp:6:10]: (error) Calling function 'erase()' on the iterator 'iter' which is out of bounds. [eraseIteratorOutOfBounds]\n",
                       errout_str());
@@ -2429,14 +2917,14 @@ class TestStl : public TestFixture {
               "    auto iter = ints.begin() + 2;\n"
               "    ints.erase(iter);\n"
               "    std::cout << (*iter) << std::endl;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:4:27] -> [test.cpp:5:10] -> [test.cpp:3:22] -> [test.cpp:6:20]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f() {\n"
               "    auto x = *myList.begin();\n"
               "    myList.erase(x);\n"
               "    auto b = x.first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("const CXXRecordDecl *CXXRecordDecl::getTemplateInstantiationPattern() const {\n"
@@ -2444,7 +2932,7 @@ class TestStl : public TestFixture {
               "        auto From = TD->getInstantiatedFrom();\n"
               "    }\n"
               "    return nullptr;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2456,7 +2944,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "       foo[ii] = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:6:11]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty. [containerOutOfBounds]\n",
             errout_str());
@@ -2465,21 +2953,21 @@ class TestStl : public TestFixture {
               "    for (unsigned int ii = 0; ii <= foo.size(); ++ii) {\n"
               "       foo.at(ii) = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo.at(ii) is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo) {\n"
               "    for (unsigned int ii = 0; ii <= foo.length(); ++ii) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo, unsigned int ii) {\n"
               "    if (ii <= foo.length()) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo, unsigned int ii) {\n"
@@ -2487,7 +2975,7 @@ class TestStl : public TestFixture {
               "       foo[ii] = 'x';\n"
               "       ++i;\n"
               "    } while(ii <= foo.length());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo(std::string& foo, unsigned int ii) {\n"
@@ -2495,7 +2983,7 @@ class TestStl : public TestFixture {
               "    } else if (ii <= foo.length()) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
         check("void foo()\n"
@@ -2507,19 +2995,19 @@ class TestStl : public TestFixture {
               "    }\n"
               "    int ii = 0;\n"
               "    foo[ii] = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    for (B b : D()) {}\n" // Don't crash on range-based for-loop
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::vector<int> foo) {\n"
               "    for (unsigned int ii = 0; ii <= foo.size() + 1; ++ii) {\n"
               "       foo.at(ii) = 0;\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo.at(ii) is out of bounds. [stlOutOfBounds]\n", "", errout_str());
     }
 
@@ -2532,7 +3020,7 @@ class TestStl : public TestFixture {
                   "    {\n"
                   "       foo[ii] = 0;\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2543,7 +3031,7 @@ class TestStl : public TestFixture {
                   "    for (unsigned int ii = 0; ii <= foo.size(); ++ii)\n"
                   "    {\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2561,7 +3049,7 @@ class TestStl : public TestFixture {
                   "            foo[ii] = 0;\n"
                   "        }\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS(
                 "[test.cpp:11:16]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty. [containerOutOfBounds]\n",
                 errout_str());
@@ -2572,7 +3060,7 @@ class TestStl : public TestFixture {
                   "    int i = x;"
                   "    for (int i = 5; i <= data.size(); i++)\n"
                   "        data[i] = 0;\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2581,7 +3069,7 @@ class TestStl : public TestFixture {
                   "    for (unsigned int ii = 0; ii <= foo.size() - 1; ++ii) {\n"
                   "       foo.at(ii) = 0;\n"
                   "    }\n"
-                  "}");
+                  "}\n");
             ASSERT_EQUALS("", errout_str());
         }
     }
@@ -2589,7 +3077,7 @@ class TestStl : public TestFixture {
     void negativeIndex() {
         check("void f(const std::vector<int> &v) {\n"
               "  v[-11] = 123;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Array index -11 is out of bounds. [negativeContainerIndex]\n", errout_str());
 
         check("int f(int x, const std::vector<int>& a) {\n"
@@ -2597,7 +3085,7 @@ class TestStl : public TestFixture {
               "        return a[x - 5];\n"
               "    else\n"
               "        return a[4 - x];\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,6> values;\n"
@@ -2637,21 +3125,19 @@ class TestStl : public TestFixture {
               "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        const auto oldSettings = settings; // TODO: get rid of this
-        settings.daca = true;
+        Settings s = settings;
+        s.daca = true;
 
         check("void f() {\n"
               "    const char a[][5] = { \"1\", \"true\", \"on\", \"yes\" };\n"
-              "}\n");
+              "}\n", s);
         ASSERT_EQUALS("", errout_str());
-
-        settings = oldSettings;
     }
 
     void negativeIndexMultiline() {
         setMultiline();
-        const auto oldSettings = settings; // TODO: get rid of this
-        settings.verbose = true;
+        Settings s = settings;
+        s.verbose = true;
 
         check("bool valid(int);\n" // #11697
               "void f(int i, const std::vector<int>& v) {\n"
@@ -2661,14 +3147,12 @@ class TestStl : public TestFixture {
               "}\n"
               "void g(const std::vector<int>& w) {\n"
               "    f(-1, w);\n"
-              "}\n");
+              "}\n", s);
         ASSERT_EQUALS("[test.cpp:5:9]: warning: Array index -1 is out of bounds. [negativeContainerIndex]\n"
                       "[test.cpp:8:8]: note: Calling function 'f', 1st argument '-1' value is -1\n"
                       "[test.cpp:3:9]: note: Assuming condition is false\n"
                       "[test.cpp:5:9]: note: Negative array index\n",
                       errout_str());
-
-        settings = oldSettings;
     }
 
     void erase1() {
@@ -2681,7 +3165,7 @@ class TestStl : public TestFixture {
               "    for (it = foo.begin(); it != foo.end(); ++it) {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:5:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n"
                       "[test.cpp:7:5] -> [test.cpp:8:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
@@ -2690,7 +3174,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator i = ints.begin();\n"
               "    i = ints.erase(i);\n"
               "    *i = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2698,7 +3182,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator i;\n"
               "    while (i != x.y.end())\n"
               "        i = x.y.erase(i);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #2101
@@ -2709,7 +3193,7 @@ class TestStl : public TestFixture {
               "        if (*it % 2)\n"
               "            it = ints[i].erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2722,7 +3206,7 @@ class TestStl : public TestFixture {
               "        next++;\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2732,7 +3216,7 @@ class TestStl : public TestFixture {
               "    std::list<abc>::iterator it = foo.begin();\n"
               "    foo.erase(it->a);\n"
               "    if (it->b);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2744,7 +3228,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2754,7 +3238,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2764,7 +3248,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2774,7 +3258,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(++it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
@@ -2788,7 +3272,7 @@ class TestStl : public TestFixture {
               "        if (*it == 123)\n"
               "            foo.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:8:22]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
@@ -2801,7 +3285,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        vec.erase(it);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2814,7 +3298,7 @@ class TestStl : public TestFixture {
               "        if (x)"
               "            break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:5:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f()\n"
@@ -2826,7 +3310,7 @@ class TestStl : public TestFixture {
               "            break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int x)\n"
@@ -2837,7 +3321,7 @@ class TestStl : public TestFixture {
               "        if (x)"
               "            return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:5:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
     }
@@ -2854,7 +3338,7 @@ class TestStl : public TestFixture {
               "            continue;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<uint32, uint32> my_map) {\n" // #7365
@@ -2867,7 +3351,7 @@ class TestStl : public TestFixture {
               "    itr->second = 1;\n"
               "    break;\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2881,7 +3365,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "        return;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2901,7 +3385,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2920,7 +3404,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -2936,7 +3420,7 @@ class TestStl : public TestFixture {
               "                *it = 0;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS(
             "[test.cpp:5] -> [test.cpp:7] -> [test.cpp:8] -> [test.cpp:8] -> [test.cpp:7] -> [test.cpp:5] -> [test.cpp:9] -> [test.cpp:3] -> [test.cpp:5]: (error) Using iterator to local container 'foo' that may be invalid.\n",
             "[test.cpp:5:24] -> [test.cpp:7:13] -> [test.cpp:8:17] -> [test.cpp:8:17] -> [test.cpp:7:13] -> [test.cpp:5:31] -> [test.cpp:9:21] -> [test.cpp:3:22] -> [test.cpp:5:28]: (error, inconclusive) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n",
@@ -2952,7 +3436,7 @@ class TestStl : public TestFixture {
               "        goto abc;\n"
               "    }\n"
               "bar:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2964,7 +3448,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "        it = foo.begin();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2982,7 +3466,7 @@ class TestStl : public TestFixture {
               "            ++it;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2991,7 +3475,7 @@ class TestStl : public TestFixture {
               "    std::list<std::list<int> >::const_iterator i = l.begin();\n"
               "    std::list<int>::const_iterator j = (*i).begin();\n"
               "    cout << *j << endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3000,14 +3484,14 @@ class TestStl : public TestFixture {
               "  std::list<int>::const_iterator it = data.begin();\n"
               "  it = data.erase(it);\n"
               "  it = data.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(Data data) {\n"
               "  std::list<int>::const_iterator it = data.ints.begin();\n"
               "  it = data.ints.erase(it);\n"
               "  it = data.ints.erase(it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3016,7 +3500,7 @@ class TestStl : public TestFixture {
               "    std::list<foo>::const_iterator i;\n"
               "    bar(i);\n"
               "    cout << *i;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3027,7 +3511,7 @@ class TestStl : public TestFixture {
               "    iter = ints.begin() + 2;\n"
               "    ints.erase(iter);\n"
               "    ints.erase(iter);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:4] -> [test.cpp:5] -> [test.cpp:1] -> [test.cpp:6]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:1:31] -> [test.cpp:4:22] -> [test.cpp:5:10] -> [test.cpp:1:27] -> [test.cpp:6:16]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3039,21 +3523,21 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.erase(*it);\n"
               "    }\n"
-              "}");
+              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Iterator 'it' becomes invalid when deleted by value from 'foo'\n", "", errout_str());
 
         check("int f(std::set<int> foo) {\n"
               "    std::set<int>::iterator it = foo.begin();\n"
               "    foo.erase(*it);\n"
               "    return *it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12] -> [test.cpp:3:5]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
         check("void f(std::set<int> foo)\n"
               "{\n"
               "    std::set<int>::iterator it = foo.begin();\n"
               "    foo.erase(*it);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5669
@@ -3061,14 +3545,14 @@ class TestStl : public TestFixture {
               "    HashSet_Ref::iterator aIt = m_ImplementationMap.find( xEle );\n"
               "    m_SetLoadedFactories.erase(*aIt);\n"
               "    m_SetLoadedFactories.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::list<int>& m_ImplementationMap) {\n"
               "    std::list<int>::iterator aIt = m_ImplementationMap.begin();\n"
               "    m_ImplementationMap.erase(*aIt);\n"
               "    m_ImplementationMap.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Invalid iterator: aIt [invalidIterator1]\n", errout_str());
 
         check("void f(const std::list<int>& m_ImplementationMap) {\n"
@@ -3076,7 +3560,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator bIt = m_ImplementationMap.begin();\n"
               "    m_ImplementationMap.erase(*bIt);\n"
               "    m_ImplementationMap.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3090,7 +3574,7 @@ class TestStl : public TestFixture {
               "                 return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5] -> [test.cpp:4:26]: (error) Iterator 'str' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
@@ -3099,7 +3583,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator aIt = v.begin();\n"
               "    v.erase(something(unknown));\n" // All iterators become invalidated when erasing from std::vector
               "    v.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:45] -> [test.cpp:3:7] -> [test.cpp:1:26] -> [test.cpp:4:13]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
@@ -3107,7 +3591,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator bIt = v.begin();\n"
               "    v.erase(bIt);\n" // All iterators become invalidated when erasing from std::vector
               "    aIt = v.erase(aIt);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:45] -> [test.cpp:4:7] -> [test.cpp:1:26] -> [test.cpp:5:19]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3117,7 +3601,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::const_iterator it = foo.begin();\n"
               "    foo.push_back(123);\n"
               "    *it;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:35] -> [test.cpp:3:52] -> [test.cpp:4:9] -> [test.cpp:1:32] -> [test.cpp:5:6]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3130,7 +3614,7 @@ class TestStl : public TestFixture {
               "        int *it = &foo[0];\n"
               "        *it = 456;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3144,7 +3628,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.push_back(123);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:24] -> [test.cpp:6:31] -> [test.cpp:8:13] -> [test.cpp:3:22] -> [test.cpp:6:28]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3156,7 +3640,7 @@ class TestStl : public TestFixture {
               "    int *first = &ints[0];\n"
               "    ints.push_back(2);\n"
               "    *first;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18] -> [test.cpp:6:10] -> [test.cpp:3:22] -> [test.cpp:7:6]: (error) Using pointer to local variable 'ints' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3173,7 +3657,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        v.push_back(*i);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3189,7 +3673,7 @@ class TestStl : public TestFixture {
               "        if (*it == 1)\n"
               "            v.push_back(10);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:49] -> [test.cpp:8:17] -> [test.cpp:8:17] -> [test.cpp:6:56] -> [test.cpp:9:15] -> [test.cpp:3:22] -> [test.cpp:6:53]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f()\n"
@@ -3202,7 +3686,7 @@ class TestStl : public TestFixture {
               "        if (*it == 1)\n"
               "            v.push_back(10);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:49] -> [test.cpp:8:17] -> [test.cpp:8:17] -> [test.cpp:6:56] -> [test.cpp:9:15] -> [test.cpp:3:22] -> [test.cpp:6:53]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3216,7 +3700,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.push_back(123);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:24] -> [test.cpp:6:31] -> [test.cpp:8:13] -> [test.cpp:3:22] -> [test.cpp:6:28]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3232,7 +3716,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        sum += *it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:13]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n"
                       "[test.cpp:4:52] -> [test.cpp:5:10] -> [test.cpp:3:22] -> [test.cpp:8:35]: (error) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n",
                       errout_str());
@@ -3254,7 +3738,7 @@ class TestStl : public TestFixture {
               "        a.ints.push_back(*i);\n"
               "        ++i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3264,7 +3748,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::const_iterator it = foo.begin();\n"
               "    foo.reserve(100);\n"
               "    *it = 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:29] -> [test.cpp:3:52] -> [test.cpp:4:9] -> [test.cpp:1:26] -> [test.cpp:5:6]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
 
         // in loop
@@ -3277,7 +3761,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "        foo.reserve(123);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:24] -> [test.cpp:6:31] -> [test.cpp:8:13] -> [test.cpp:3:22] -> [test.cpp:6:28]: (error) Using iterator to local container 'foo' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3291,7 +3775,7 @@ class TestStl : public TestFixture {
               "    } else {\n"
               "        ints.insert(it,0);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3307,7 +3791,7 @@ class TestStl : public TestFixture {
               "        {}\n"
               "        *it;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:54] -> [test.cpp:6:13] -> [test.cpp:3:25] -> [test.cpp:9:10]: (error, inconclusive) Using iterator to local container 'vec' that may be invalid. [invalidContainer]\n",
             errout_str());
@@ -3319,7 +3803,7 @@ class TestStl : public TestFixture {
               "    FilenameBuffer.resize(PreAppendSize + CurTok.getLength());\n"
               "    const char *BufPtr = &FilenameBuffer[PreAppendSize];\n"
               "    return true;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3329,7 +3813,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator iter = ints.begin() + 5;\n"
               "    ints.insert(ints.begin(), 1);\n"
               "    ++iter;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:30] -> [test.cpp:3:49] -> [test.cpp:4:10] -> [test.cpp:1:26] -> [test.cpp:5:7]: (error) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f()\n"
@@ -3337,7 +3821,7 @@ class TestStl : public TestFixture {
               "    std::vector<int> ints;\n"
               "    std::vector<int>::iterator iter = ints.begin();\n"
               "    ints.insert(iter, 1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -3346,7 +3830,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator iter = ints.begin();\n"
               "    ints.insert(iter, 1);\n"
               "    ints.insert(iter, 2);\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         TODO_ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'ints' that may be invalid.\n", "[test.cpp:4:49] -> [test.cpp:5:10] -> [test.cpp:3:22] -> [test.cpp:6:17]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void* f(const std::vector<Bar>& bars) {\n"
@@ -3354,21 +3838,21 @@ class TestStl : public TestFixture {
               "    bars.insert(Bar());\n"
               "    void* v = &i->foo;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:37] -> [test.cpp:2:46] -> [test.cpp:3:10] -> [test.cpp:1:33] -> [test.cpp:4:16]: (error) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("Foo f(const std::vector<Bar>& bars) {\n"
               "    std::vector<Bar>::iterator i = bars.begin();\n"
               "    bars.insert(Bar());\n"
               "    return i->foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:35] -> [test.cpp:2:46] -> [test.cpp:3:10] -> [test.cpp:1:31] -> [test.cpp:4:12]: (error) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f(const std::vector<Bar>& bars) {\n"
               "    for(std::vector<Bar>::iterator i = bars.begin(); i != bars.end(); ++i) {\n"
               "        i = bars.insert(i, bar);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: This shouldn't be inconclusive
@@ -3377,7 +3861,7 @@ class TestStl : public TestFixture {
               "        bars.insert(i, bar);\n"
               "        i = bars.insert(i, bar);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:36] -> [test.cpp:2:50] -> [test.cpp:3:14] -> [test.cpp:1:32] -> [test.cpp:4:25]: (error, inconclusive) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
 
         // TODO: This shouldn't be inconclusive
@@ -3387,7 +3871,7 @@ class TestStl : public TestFixture {
               "    i = bars.insert(i, Bar());\n"
               "    void* v = &i->foo;\n"
               "    return v;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:1:37] -> [test.cpp:2:46] -> [test.cpp:3:10] -> [test.cpp:1:33] -> [test.cpp:4:21]: (error, inconclusive) Using iterator to local container 'bars' that may be invalid. [invalidContainer]\n", errout_str());
     }
 
@@ -3399,7 +3883,7 @@ class TestStl : public TestFixture {
               "        vec.insert(iter, 0);\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> &vec) {\n"
@@ -3410,7 +3894,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3450,7 +3934,7 @@ class TestStl : public TestFixture {
                   "    std::" + stlCont[i] + "<int>::iterator it;\n"
                   "    for (it = ab.begin(); it < ab.end(); ++it)\n"
                   "        ;\n"
-                  "}");
+                  "}\n");
 
             ASSERT_EQUALS_MSG("[test.cpp:4:25]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str(), stlCont[i]);
         }
@@ -3458,14 +3942,14 @@ class TestStl : public TestFixture {
         check("void f() {\n"
               "    std::forward_list<int>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:36]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
 
         // #5926 no FP Dangerous comparison using operator< on iterator on std::deque
         check("void f() {\n"
               "    std::deque<int>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3476,7 +3960,7 @@ class TestStl : public TestFixture {
               "    std::vector<std::string>::const_iterator it;\n"
               "    for (it = files.begin(); it < files.end(); it++) { }\n"
               "    for (it = files.begin(); it < files.end(); it++) { };\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3490,14 +3974,14 @@ class TestStl : public TestFixture {
               "    {\n"
               "       assert(*current < 100)\n"
               "    }\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    static set<Foo>::const_iterator current;\n"
               "    return 25 > current->bar;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Invalid iterator 'current' used. [eraseDereference]\n", errout_str());
     }
 
@@ -3506,13 +3990,13 @@ class TestStl : public TestFixture {
         check("void f() {\n"
               "    std::forward_list<std::vector<std::vector<int>>>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:36]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
 
         // don't crash
         check("void f() {\n"
               "    if (list < 0) ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -3520,7 +4004,7 @@ class TestStl : public TestFixture {
               "        std::forward_list<std::vector<std::vector<int>>>::iterator it;\n"
               "        for (it = ab.begin(); ab.end() > it; ++it) {}\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:40]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
     }
 
@@ -3529,7 +4013,7 @@ class TestStl : public TestFixture {
               "int foo() {\n"
               "    iterator i;\n"
               "    return i.foo();;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
         check("class iterator {\n"
@@ -3540,7 +4024,7 @@ class TestStl : public TestFixture {
               "int foo() {\n"
               "    iterator i;\n"
               "    return i.foo();;\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:8:12]: (error, inconclusive) Invalid iterator 'i' used. [eraseDereference]\n", errout_str());
     }
 
@@ -3551,7 +4035,7 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.inconclusive = true));
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3565,109 +4049,109 @@ class TestStl : public TestFixture {
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (s.find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if ((*s).find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if (s->find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (array-like pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (array)
         check("void f(std::set<int> s [10])\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (undefined length array)
         check("void f(std::set<int> s [])\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (vector)
         check("void f(std::vector<std::set<int> > s)\n"
               "{\n"
               "    if (s[0].find(12)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // error (assignment)
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (a || (x = s.find(12))) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // ok (simple)
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (s.find(123) != s.end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if ((*s).find(12) != s.end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (array-like pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if (s[0].find(12) != s->end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (array)
         check("void f(std::set<int> s [10])\n"
               "{\n"
               "    if (s[0].find(123) != s->end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (undefined length array)
         check("void f(std::set<int> s [])\n"
               "{\n"
               "    if (s[0].find(123) != s->end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (assignment)
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (a || (x = s.find(12)) != s.end()) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (dereference, #6402)
         check("void f(std::set<Foo> s) {\n"
               "    if (s.find(12).member) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::set<int> s) {\n"
               "    if (auto result = s.find(123); result != s.end()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ---------------------------
@@ -3678,33 +4162,33 @@ class TestStl : public TestFixture {
         check("void f()\n"
               "{\n"
               "    if (std::find(a,b,c)) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked. [stlIfFind]\n", errout_str());
 
         // ok
         check("void f()\n"
               "{\n"
               "    if (std::find(a,b,c) != c) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ok (less than comparison, #6217)
         check("void f(std::vector<int> s)\n"
               "{\n"
               "    if (std::find(a, b, c) < d) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3714 - segmentation fault for syntax error
         ASSERT_THROW_INTERNAL(check("void f() {\n"
                                     "    if (()) { }\n"
-                                    "}"),
+                                    "}\n"),
                               AST);
 
         // #3865
         check("void f() {\n"
               "    if ((std::find(a,b,c)) != b) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3713,57 +4197,57 @@ class TestStl : public TestFixture {
         check("void f(const std::string &s)\n"
               "{\n"
               "    if (s.find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // error (pointer)
         check("void f(const std::string *s)\n"
               "{\n"
               "    if ((*s).find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // error (pointer)
         check("void f(const std::string *s)\n"
               "{\n"
               "    if (s->find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // error (vector)
         check("void f(const std::vector<std::string> &s)\n"
               "{\n"
               "    if (s[0].find(\"abc\")) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // #3162
         check("void f(const std::string& s1, const std::string& s2)\n"
               "{\n"
               "    if ((!s1.empty()) && (0 == s1.find(s2))) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:32]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster. [stlIfStrFind]\n", errout_str());
 
         // #4102
         check("void f(const std::string &define) {\n"
               "    if (define.find(\"=\") + 1U == define.size());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string a, std::string b) {\n"  // #4480
               "    if (a.find(\"<\") < b.find(\">\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string &s) {\n"
               "    if (foo(s.find(\"abc\"))) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7349 - std::string::find_first_of
         check("void f(const std::string &s) {\n"
               "    if (s.find_first_of(\"abc\")==0) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 10153
@@ -3774,7 +4258,7 @@ class TestStl : public TestFixture {
               "      return 1;\n"
               "  }\n"
               "  return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3788,8 +4272,8 @@ class TestStl : public TestFixture {
                                 "void Fred::foo()\n"
                                 "{\n"
                                 "    if (x.size() == 0) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:7:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3800,8 +4284,8 @@ class TestStl : public TestFixture {
                                 "void f()\n"
                                 "{\n"
                                 "    if (x.size() == 0) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3812,8 +4296,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() == 0) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3824,8 +4308,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (0 == x.size()) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3836,8 +4320,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() != 0) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3848,8 +4332,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (0 != x.size()) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3860,8 +4344,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() > 0) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3872,8 +4356,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (0 < x.size()) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:13]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3884,8 +4368,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() >= 1) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3896,8 +4380,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size() < 1) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3908,8 +4392,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (1 <= x.size()) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3920,8 +4404,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (1 > x.size()) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:13]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3932,8 +4416,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (x.size()) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:9]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3944,8 +4428,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    if (!x.size()) {}\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:10]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3955,7 +4439,7 @@ class TestStl : public TestFixture {
               "{\n"
               "    std::list<int> x;\n"
               "    fun(x.size());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -3963,8 +4447,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    fun(!x.size());\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:10]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3975,8 +4459,8 @@ class TestStl : public TestFixture {
                                 "{\n"
                                 "    std::list<int> x;\n"
                                 "    fun(a && x.size());\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS("[test.cpp:4:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n", errout_str());
             check(code);
             ASSERT_EQUALS("", errout_str());
@@ -3985,19 +4469,19 @@ class TestStl : public TestFixture {
         check("void f() {\n" // #4039
               "    std::list<int> x;\n"
               "    fun(width % x.size() != 0);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4584
         check("void f() {\n"
               "    std::list<int> x;\n"
               "    if (foo + 1 > x.size()) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         check("void f() {\n"
               "    std::list<int> x;\n"
               "    if (x.size() < 1 + foo) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4012,8 +4496,8 @@ class TestStl : public TestFixture {
                             "void Wilma::foo()\n"
                             "{\n"
                             "    if (f.x.size() == 0) {}\n"
-                            "}";
-        check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                            "}\n";
+        check(code, settingsCpp03);
         ASSERT_EQUALS(
             "[test.cpp:10:11]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n"
             "[test.cpp:10:11]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n",   // duplicate
@@ -4035,8 +4519,8 @@ class TestStl : public TestFixture {
                                 "Zzz * zzz;\n"
                                 "int main() {\n"
                                 "    if (zzz->x.size() > 0) { }\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS(
                 "[test.cpp:10:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n"
                 "[test.cpp:10:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n",   // duplicate
@@ -4054,8 +4538,8 @@ class TestStl : public TestFixture {
                                 "int main() {\n"
                                 "    Zzz * zzz;\n"
                                 "    if (zzz->x.size() > 0) { }\n"
-                                "}";
-            check(code, dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                                "}\n";
+            check(code, settingsCpp03);
             ASSERT_EQUALS(
                 "[test.cpp:10:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n"
                 "[test.cpp:10:14]: (performance) Possible inefficient checking for 'x' emptiness. [stlSize]\n",   // duplicate
@@ -4069,17 +4553,17 @@ class TestStl : public TestFixture {
     void size4() { // #2652 - don't warn about vector/deque
         check("void f(std::vector<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::deque<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::array<int,3> &a) {\n"
               "    if (a.size() > 0U) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4088,8 +4572,18 @@ class TestStl : public TestFixture {
               "{\n"
               "    if (haystack.find(needle) != haystack.end())\n"
               "        haystack.remove(needle);"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Redundant checking of STL container element existence before removing it. [redundantIfRemove]\n", errout_str());
+
+        check("void g(const std::string&);\n" // #14725
+              "std::set<std::string> g_s;\n"
+              "void f(const std::string& k) {\n"
+              "    if (g_s.find(k) != g_s.end()) {\n"
+              "        g_s.erase(k);\n"
+              "        g(k);\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void missingInnerComparison1() {
@@ -4099,14 +4593,14 @@ class TestStl : public TestFixture {
               "            it++;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:2:71]: (warning) Missing bounds check for extra iterator increment in loop. [StlMissingComparison]\n", errout_str());
 
         check("void f(std::map<int,int> &ints) {\n"
               "    for (std::map<int,int>::iterator it = ints.begin(); it != ints.end(); ++it) {\n"
               "        ++it->second;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<std::string> &v) {\n"
@@ -4117,7 +4611,7 @@ class TestStl : public TestFixture {
               "            ++it;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4130,7 +4624,7 @@ class TestStl : public TestFixture {
               "                return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4140,7 +4634,7 @@ class TestStl : public TestFixture {
               "        for (std::set<int>::iterator it = ints2.begin(); it != ints2.end(); ++it)\n"
               "        { }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4152,7 +4646,7 @@ class TestStl : public TestFixture {
               "            break;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("function f1(std::list<int> &l1) {\n"
@@ -4162,7 +4656,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "        }\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
     }
 
@@ -4171,7 +4665,7 @@ class TestStl : public TestFixture {
               "    for(it = map1.begin(); it != map1.end(); it++) {\n"
               "        str[i++] = (*it).first;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4180,7 +4674,7 @@ class TestStl : public TestFixture {
               "    for(string::iterator it = s.begin(); it != s.end(); it++) {\n"
               "        it = s.insert(++it, 0);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4188,50 +4682,50 @@ class TestStl : public TestFixture {
         check("void f() {\n"
               "    std::string errmsg;\n"
               "    throw errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after throwing exception. [stlcstrthrow]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::ostringstream errmsg;\n"
               "    return errmsg.str().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return std::string(\"ERROR: \" + errmsg).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return (\"ERROR: \" + errmsg).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char *get_msg() {\n"
               "    std::string errmsg;\n"
               "    return (\"ERROR: \" + std::string(\"crash me\")).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("void f() {\n"
               "    std::ostringstream errmsg;\n"
               "    const char *c = errmsg.str().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("std::string f();\n"
               "\n"
               "void foo() {\n"
               "    const char *c = f().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:17]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("class Foo {\n"
@@ -4240,7 +4734,7 @@ class TestStl : public TestFixture {
               "const char *Foo::f() {\n"
               "    std::string s;\n"
               "    return s.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("class Foo {\n"
@@ -4249,27 +4743,27 @@ class TestStl : public TestFixture {
               "const char *f() {\n"
               "    Foo f;\n"
               "    return f.GetVal().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("const char* foo() {\n"
               "    static std::string text;\n"
               "    text = \"hello world\\n\";\n"
               "    return text.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str()); // #3427
 
         // Implicit conversion back to std::string
         check("std::string get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("const std::string& get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("class Foo {\n"
@@ -4278,19 +4772,19 @@ class TestStl : public TestFixture {
               "std::string f() {\n"
               "    Foo f;\n"
               "    return f.GetVal().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("std::string get_msg() {\n"
               "    std::string errmsg;\n"
               "    return errmsg;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string get_msg() {\n" // #3678
               "    MyStringClass errmsg;\n"
               "    return errmsg.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Foo1(const std::string& str) {}\n"
@@ -4310,7 +4804,7 @@ class TestStl : public TestFixture {
               "    Foo4(str, str.c_str());\n"
               "    Foo4(ss.str(), ss.str().c_str());\n"
               "    Foo4(str.c_str(), str.c_str());\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("[test.cpp:9:5]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n"
                       "[test.cpp:11:5]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 2 is slow and redundant. [stlcstrParam]\n"
@@ -4326,7 +4820,7 @@ class TestStl : public TestFixture {
               "    std::string str = \"bar\";\n"
               "    Foo1(str, foo);\n" // Don't crash
               "    Foo2(str.c_str());\n" // Don't crash
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {\n"
@@ -4340,7 +4834,7 @@ class TestStl : public TestFixture {
               "    func(str.c_str());\n"
               "    Foo::sfunc(str.c_str());\n"
               "    foo.func(str.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n"
                       "[test.cpp:10:10]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n"
                       "[test.cpp:11:9]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant. [stlcstrParam]\n",
@@ -4375,7 +4869,7 @@ class TestStl : public TestFixture {
               "    std::string str = \"bar\";\n"
               "    std::ofstream svgFile(filename.c_str(), std::ios::trunc);\n"
               "    svgFile << \"test\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Foo(const char* p) {}\n"
@@ -4384,12 +4878,12 @@ class TestStl : public TestFixture {
               "    std::string str = \"bar\";\n"
               "    Foo(str);\n"
               "    Foo(str.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int atoi(const std::string& str) {\n" // #3729: Don't suggest recursive call
               "    return atoi(str.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string hello()\n"
@@ -4400,7 +4894,7 @@ class TestStl : public TestFixture {
               "const char *f()\n"
               "{\n"
               "    return hello().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("class Fred {\n"
@@ -4414,7 +4908,7 @@ class TestStl : public TestFixture {
               "const char *Fred::f()\n"
               "{\n"
               "    return hello().c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:11:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         // #4183 - using MyStringClass.c_str()
@@ -4423,12 +4917,12 @@ class TestStl : public TestFixture {
               "void b() {\n"
               "    MyStringClass s;\n"
               "    a(s.c_str());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("std::string Format(const char * name) {\n" // #4938
               "    return String::Format(\"%s:\", name).c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7480
@@ -4438,7 +4932,7 @@ class TestStl : public TestFixture {
               "const char* GetMapAuthor(int index) {\n"
               "    const InternalMapInfo* mapInfo = &internal_getMapInfo;\n"
               "    return mapInfo->author.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct InternalMapInfo {\n"
@@ -4447,7 +4941,7 @@ class TestStl : public TestFixture {
               "std::string GetMapAuthor(int index) {\n"
               "    const InternalMapInfo* mapInfo = &internal_getMapInfo;\n"
               "    return mapInfo->author.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant. [stlcstrReturn]\n", errout_str());
 
         check("struct InternalMapInfo {\n"
@@ -4456,7 +4950,7 @@ class TestStl : public TestFixture {
               "const char* GetMapAuthor(int index) {\n"
               "    const InternalMapInfo mapInfo = internal_getMapInfo;\n"
               "    return mapInfo.author.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("struct S {\n" // #7656
@@ -4466,7 +4960,7 @@ class TestStl : public TestFixture {
               "const char* test() {\n"
               "    const struct S &s = getS();\n"
               "    return s.data.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #7930
@@ -4476,7 +4970,7 @@ class TestStl : public TestFixture {
               "    S s;\n"
               "    std::string &ref = s.data;\n"
               "    return ref.c_str();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call. [stlcstr]\n", errout_str());
 
         check("void f(const wchar_t* w, int i = 0, ...);\n" // #10357
@@ -4568,6 +5062,14 @@ class TestStl : public TestFixture {
                       "[test.cpp:14:10]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n",
                       errout_str());
 
+        check("void f(const std::string& s) {\n"
+              "    std::cout << s.c_str();\n"
+              "    std::cerr << s.c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:15]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n"
+                      "[test.cpp:3:15]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n",
+                      errout_str());
+
         check("struct S { std::string str; };\n"
               "struct T { S s; };\n"
               "struct U { T t[1]; };\n"
@@ -4613,6 +5115,52 @@ class TestStl : public TestFixture {
               "    return s->x.c_str();\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("std::string f(const std::string& s) {\n" // #14533
+              "    auto x = std::string(\"abc\") + s.c_str();\n"
+              "    auto y = s.c_str() + std::string(\"def\");\n"
+              "    return x + y;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:33]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n"
+                      "[test.cpp:3:24]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n",
+                      errout_str());
+
+        check("std::string get();\n"
+              "std::string f(const std::string& s) {\n"
+              "    return get() + s.c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n",
+                      errout_str());
+
+        check("std::string get();\n" // #14536
+              "    std::string f(const std::string& s) {\n"
+              "    return s + get().c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:14]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n",
+                      errout_str());
+
+        check("std::string get();\n"
+              "std::string f(std::string & s) {\n"
+              "    s = get().c_str();\n"
+              "    std::string s2{ get().c_str() };\n"
+              "    return s2;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (performance) Assigning the result of c_str() to a std::string is slow and redundant. [stlcstrAssignment]\n"
+                      "[test.cpp:4:17]: (performance) Constructing a std::string from the result of c_str() is slow and redundant. [stlcstrConstructor]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    std::string s;\n"
+              "    auto a = + s.c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("std::string f(const std::string& a) {\n" // #14600
+              "    std::string b(a.c_str() + 1 + 2);\n"
+              "    return b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:17]: (performance) Constructing a std::string from the result of c_str() is slow and redundant. [stlcstrConstructor]\n",
+                      errout_str());
     }
 
     void uselessCalls() {
@@ -4621,7 +5169,7 @@ class TestStl : public TestFixture {
               "    string s1, s2;\n"
               "    s1.swap(s2);\n"
               "    s2.swap(s2);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -4629,7 +5177,7 @@ class TestStl : public TestFixture {
               "    std::string s1, s2;\n"
               "    s1.swap(s2);\n"
               "    s2.swap(s2);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:5]: (performance) It is inefficient to swap a object with itself by calling 's2.swap(s2)' [uselessCallsSwap]\n", errout_str());
 
         check("void f()\n"
@@ -4639,7 +5187,7 @@ class TestStl : public TestFixture {
               "    s2.compare(s2);\n"
               "    s1.compare(s2.c_str());\n"
               "    s1.compare(0, s1.size(), s1);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (warning) It is inefficient to call 's2.compare(s2)' as it always returns 0. [uselessCallsCompare]\n", errout_str());
 
         // #7370 False positive uselessCallsCompare on unknown type
@@ -4650,7 +5198,7 @@ class TestStl : public TestFixture {
               "    return (cmp);\n"
               "  }\n"
               "  WT_CURSOR *cursor_;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
@@ -4662,7 +5210,7 @@ class TestStl : public TestFixture {
               "    s1 = s2.substr(0, x);\n"
               "    s1 = s2.substr(0,std::string::npos);\n"
               "    s1 = s2.substr(x+5-n, 0);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (performance) Ineffective call of function \'substr\' because it returns a copy of "
                       "the object. Use operator= instead. [uselessCallsSubstr]\n"
                       "[test.cpp:8:10]: (performance) Ineffective call of function \'substr\' because it returns a copy of "
@@ -4678,26 +5226,26 @@ class TestStl : public TestFixture {
               "    s1 = s2.substr(0, x);\n"
               "    s1 = s2.substr(0,std::string::npos);\n"
               "    s1 = s2.substr(x+5-n, 0);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
               "    std::string str = \"a1b1\";\n"
               "    return str.find(str[1], 2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(std::vector<int>& v) {\n"
               "    v.empty();\n"
               "    return v.empty();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Ineffective call of function 'empty()'. Did you intend to call 'clear()' instead? [uselessCallsEmpty]\n", errout_str());
 
         check("void f() {\n" // #4938
               "    OdString str;\n"
               "    str.empty();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #4032
@@ -4705,7 +5253,7 @@ class TestStl : public TestFixture {
               "    const std::string::size_type npos = greeting.rfind(\" \");\n"
               "    if (npos != std::string::npos)\n"
               "        std::cout << greeting.substr(0, npos) << std::endl;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> a) {\n"
@@ -4715,21 +5263,27 @@ class TestStl : public TestFixture {
               "    x = std::remove(a.begin(), a.end(), val);\n"
               "    a.erase(std::remove(a.begin(), a.end(), val));\n"
               "    std::remove(\"foo.txt\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (warning) Return value of std::remove() ignored. Elements remain in container. [uselessCallsRemove]\n"
                       "[test.cpp:3:5]: (warning) Return value of std::remove_if() ignored. Elements remain in container. [uselessCallsRemove]\n"
                       "[test.cpp:4:5]: (warning) Return value of std::unique() ignored. Elements remain in container. [uselessCallsRemove]\n", errout_str());
 
+        check("void f(std::string& s) {\n" // #14764
+              "    auto it{ std::remove(s.begin(), s.end(), 'a') };\n"
+              "    s.erase(it, s.end());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
         // #4431 - fp
         check("bool f() {\n"
               "    return x ? true : (y.empty());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8360
         check("void f(std::string s) {\n"
               "    for (;s.empty();) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11166
@@ -4794,7 +5348,7 @@ class TestStl : public TestFixture {
               "        EffectivityRange<int> er;\n"
               "    }\n"
               "    void shift() { EffectivityRangeData<int>::iterator it;  }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4804,7 +5358,7 @@ class TestStl : public TestFixture {
               "    if (std::isalpha(*i) && i != str.end()) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void foo(std::string::iterator& i) {\n"
@@ -4812,7 +5366,7 @@ class TestStl : public TestFixture {
               "    else if (std::isalpha(*i) && i != str.end()) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:27]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test suggested correction doesn't report an error
@@ -4820,7 +5374,7 @@ class TestStl : public TestFixture {
               "    if (i != str.end() && std::isalpha(*i)) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test "while" with "&&" case
@@ -4829,7 +5383,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void foo(std::string::iterator& i) {\n"
@@ -4837,7 +5391,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    } while (std::isalpha(*i) && i != str.end());\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:27]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test "while" with "||" case
@@ -4846,7 +5400,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:28]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test fix for "while" with "||" case
@@ -4855,7 +5409,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test "for" with "&&" case
@@ -4864,7 +5418,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test "for" with "||" case
@@ -4873,7 +5427,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test that a dereference outside the condition part of a "for"
@@ -4883,7 +5437,7 @@ class TestStl : public TestFixture {
               "        std::cout << c;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test that other "&&" terms in the condition don't invalidate the check
@@ -4891,7 +5445,7 @@ class TestStl : public TestFixture {
               "    if (*c && std::isalpha(*i) && i != str.end()) {\n"
               "        std::cout << *i;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:28]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test that dereference of different variable doesn't trigger a false positive
@@ -4899,7 +5453,7 @@ class TestStl : public TestFixture {
               "    if (std::isalpha(*c) && i != str.end()) {\n"
               "        std::cout << *c;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Test case involving "rend()" instead of "end()"
@@ -4908,7 +5462,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "        i ++;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test that mixed "&&" and "||" don't result in a false positive
@@ -4916,7 +5470,7 @@ class TestStl : public TestFixture {
               "    if ((i == str.end() || *i) || (isFoo() && i != str.end())) {\n"
               "        std::cout << \"foo\";\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
@@ -5139,7 +5693,7 @@ class TestStl : public TestFixture {
               "        return s.erase(it);\n"
               "    return s.end();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3:0]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         // #11381
         check("int f(std::map<int, int>& map) {\n"
@@ -5226,6 +5780,13 @@ class TestStl : public TestFixture {
               "    return it;\n"
               "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:18:5]: (error, inconclusive) Invalid iterator 'it' used. [eraseDereference]\n", errout_str());
+
+        check("int f(const std::vector<int>& v) {\n" // #11895
+              "    auto it = v.end();\n"
+              "    std::advance(it, -2);\n"
+              "    return *it;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loopAlgoElementAssign() {
@@ -5533,6 +6094,14 @@ class TestStl : public TestFixture {
               "}\n",
               dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(const std::vector<std::string>& v) {\n" // #14812
+              "    std::set<std::string> s;\n"
+              "    for (const std::string& a : v) {\n"
+              "        s.insert(a);\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::copy algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
     }
 
     void loopAlgoIncrement() {
@@ -5825,7 +6394,7 @@ class TestStl : public TestFixture {
               "            v1.erase(it1);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:9:0]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:9:17]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool f(const std::set<std::string>& set, const std::string& f) {\n" // #11595
               "    for (const std::string& s : set) {\n"
@@ -5873,6 +6442,28 @@ class TestStl : public TestFixture {
               "    return b;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("bool get_index(const std::vector<int>& items, int value, size_t& index) {\n" // #14047
+              "    size_t current_index = 0;\n"
+              "    for (size_t i = 0; i < items.size(); ++i) {\n"
+              "        if (items[i] == value) {\n"
+              "            if (current_index != index) {\n"
+              "                current_index++;\n"
+              "                continue;\n"
+              "            }\n"
+              "            index = i;\n"
+              "            return true;\n"
+              "        }\n"
+              "    }\n"
+              "    return false;\n"
+              "}\n"
+              "int main() {\n"
+              "    std::vector<int> items{ 0, 1, 1, 1 };\n"
+              "    size_t index = 2;\n"
+              "    get_index(items, 1, index);\n"
+              "    return index;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loopAlgoMinMax() {
@@ -6533,6 +7124,28 @@ class TestStl : public TestFixture {
         ASSERT_EQUALS(
             "[test.cpp:4:7] -> [test.cpp:7:5] -> [test.cpp:8:7]: (error) Calling 'add' while iterating the container is invalid. [invalidContainerLoop]\n",
             errout_str());
+
+        check("struct S { int i; };\n" // #14013
+              "void f() {\n"
+              "    std::vector<std::unique_ptr<S>> v;\n"
+              "    for (int i = 0; i < 5; ++i) {\n"
+              "        std::unique_ptr<S>& r = v.emplace_back(std::make_unique<S>());\n"
+              "        r->i = 1;\n"
+              "    }\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i; };\n"
+              "void f() {\n"
+              "    std::vector<std::unique_ptr<S>> v;\n"
+              "    for (int i = 0; i < 5; ++i) {\n"
+              "        std::unique_ptr<S>& r{ v.emplace_back(std::make_unique<S>()) };\n"
+              "        r->i = 1;\n"
+              "    }\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void findInsert() {
@@ -6758,20 +7371,26 @@ class TestStl : public TestFixture {
 
         // #9218 - not small type => do not warn if cpp standard is < c++17
         {
+            Settings s = settings;
             const char code[] = "void f1(std::set<LargeType>& s, const LargeType& x) {\n"
                                 "    if (s.find(x) == s.end()) {\n"
                                 "        s.insert(x);\n"
                                 "    }\n"
                                 "}\n";
-            check(code, dinit(CheckOptions, $.inconclusive = true, $.cppstandard = Standards::CPP11));
+            s.standards.cpp = Standards::CPP11;
+            check(code, s);
             ASSERT_EQUALS("", errout_str());
-            check(code, dinit(CheckOptions, $.inconclusive = true, $.cppstandard = Standards::CPP14));
+            s.standards.cpp = Standards::CPP14;
+            check(code, s);
             ASSERT_EQUALS("", errout_str());
-            check(code, dinit(CheckOptions, $.inconclusive = true, $.cppstandard = Standards::CPP17));
+            s.standards.cpp = Standards::CPP17;
+            check(code, s);
             ASSERT_EQUALS("[test.cpp:3:18]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
         }
 
         { // #10558
+            Settings s = settings;
+            s.standards.cpp = Standards::CPP03;
             check("void foo() {\n"
                   "   std::map<int, int> x;\n"
                   "   int data = 0;\n"
@@ -6780,9 +7399,10 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}", dinit(CheckOptions, $.cppstandard = Standards::CPP03));
+                  "}\n", s);
             ASSERT_EQUALS("", errout_str());
 
+            s.standards.cpp = Standards::CPP11;
             check("void foo() {\n"
                   "   std::map<int, int> x;\n"
                   "   int data = 0;\n"
@@ -6791,7 +7411,7 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}", dinit(CheckOptions, $.cppstandard = Standards::CPP11));
+                  "}\n", s);
             ASSERT_EQUALS("[test.cpp:7:17]: (performance) Searching before insertion is not necessary. Instead of 'x[5]=data' consider using 'x.emplace(5, data);'. [stlFindInsert]\n", errout_str());
 
             check("void foo() {\n"
@@ -6802,7 +7422,7 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}");
+                  "}\n"); // TODO: use s?
             ASSERT_EQUALS("[test.cpp:7:17]: (performance) Searching before insertion is not necessary. Instead of 'x[5]=data' consider using 'x.try_emplace(5, data);'. [stlFindInsert]\n", errout_str());
         }
     }
@@ -6849,7 +7469,10 @@ class TestStl : public TestFixture {
               "    std::copy(v1.begin(), v1.end(), v2.begin());\n"
               "}\n",
               dinit(CheckOptions, $.inconclusive = true));
-        ASSERT_EQUALS("[test.cpp:4:45]: (style) Using copy with iterator 'v2.begin()' that is always empty. [knownEmptyContainer]\n", errout_str());
+        ASSERT_EQUALS(
+            "[test.cpp:4:45]: (style) Using copy with iterator 'v2.begin()' that is always empty. [knownEmptyContainer]\n"
+            "[test.cpp:4:45]: (error) The algorithm 'std::copy' accesses 2 elements through the iterator 'v2.begin()' but only 0 elements are available. [algorithmOutOfBounds]\n",
+            errout_str());
 
         check("void f() {\n"
               "    std::vector<int> v;\n"
@@ -6891,7 +7514,7 @@ class TestStl : public TestFixture {
               "static void f() {\n"
               "    const ArrayType arr;\n"
               "    for (const auto &a : arr) {}\n"
-              "}",
+              "}\n",
               dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("[test.cpp:7:26]: (style) Iterating over container 'arr' that is always empty. [knownEmptyContainer]\n", errout_str());
 
@@ -7138,7 +7761,7 @@ class TestStl : public TestFixture {
               dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { int f = 0; auto g(f); g = g; }");
+        check("void foo() { int f = 0; auto g(f); g = g; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct foobar {\n"
diff --git a/test/teststring.cpp b/test/teststring.cpp
index 5d7a191afe4..e34950d127c 100644
--- a/test/teststring.cpp
+++ b/test/teststring.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,8 +23,8 @@
 #include "settings.h"
 #include "fixture.h"
 
+#include <cstddef>
 #include <string>
-#include <vector>
 
 class TestString : public TestFixture {
 public:
@@ -63,44 +63,44 @@ class TestString : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool cpp = true;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const CheckOptions& options = make_default_obj()) {
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
         SimpleTokenizer2 tokenizer(settings, *this, code, options.cpp ? "test.cpp" : "test.c");
 
         // Tokenize..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check char variable usage..
-        runChecks<CheckString>(tokenizer, this);
+        CheckString check;
+        runChecks(check, tokenizer, *this);
     }
 
     void stringLiteralWrite() {
         check("void f() {\n"
               "  char *abc = \"abc\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:15]: (error) Modifying string literal \"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  char *abc = \"abc\";\n"
               "  *abc = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:4] -> [test.cpp:2:15]: (error) Modifying string literal \"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  char *abc = \"A very long string literal\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:15]: (error) Modifying string literal \"A very long stri..\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  QString abc = \"abc\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo_FP1(char *p) {\n"
@@ -109,7 +109,7 @@ class TestString : public TestFixture {
               "void foo_FP2(void) {\n"
               "  char* s = \"Y\";\n"
               "  foo_FP1(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:3] -> [test.cpp:5:13]: (error) Modifying string literal \"Y\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n",
             errout_str());
@@ -120,19 +120,19 @@ class TestString : public TestFixture {
               "void foo_FP2(void) {\n"
               "  char s[10] = \"Y\";\n"
               "  foo_FP1(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  wchar_t *abc = L\"abc\";\n"
               "  abc[0] = u'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:18]: (error) Modifying string literal L\"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void f() {\n"
               "  char16_t *abc = u\"abc\";\n"
               "  abc[0] = 'a';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:3] -> [test.cpp:2:19]: (error) Modifying string literal u\"abc\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
 
         check("void foo() {\n" // #8332
@@ -142,7 +142,7 @@ class TestString : public TestFixture {
               "        p[i] = \'X\';\n" // <<
               "    }\n"
               "    printf(\"%s\\n\", p);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:3:16]: (error) Modifying string literal \"string literal\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n", errout_str());
     }
 
@@ -160,7 +160,7 @@ class TestString : public TestFixture {
               "  if (wmemcmp(L\"A\",L\"A\",1)){}\n"
               "  if (wcscmp(L\"A\",L\"A\")){}\n"
               "  if (wcscasecmp(L\"A\",L\"A\")){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
                       "[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
                       "[test.cpp:4:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
@@ -180,7 +180,7 @@ class TestString : public TestFixture {
               "     if (!memcmp(p + offset, p, 42)){}\n"
               "     if (!memcmp(offset + p, p, 42)){}\n"
               "     if (!memcmp(p, offset + p, 42)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // avoid false positives when the address is modified #6415
@@ -189,7 +189,7 @@ class TestString : public TestFixture {
               "     if (!memcmp(c + offset, c, 42)){}\n"
               "     if (!memcmp(offset + c, c, 42)){}\n"
               "     if (!memcmp(c, offset + c, 42)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // avoid false positives when the address is modified #6415
@@ -198,164 +198,164 @@ class TestString : public TestFixture {
               "     if (!memcmp(s.c_str() + offset, s.c_str(), 42)){}\n"
               "     if (!memcmp(offset + s.c_str(), s.c_str(), 42)){}\n"
               "     if (!memcmp(s.c_str(), offset + s.c_str(), 42)){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f(void) {\n" // #13527
               "    const wchar_t* str1 = L\"Hello\";\n"
               "    return wcsicmp(str1, str1);\n" // <<
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (warning) Comparison of identical string variables. [stringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (strcmp(\"00FF00\", \"00FF00\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (strcmp(\"00FF00\", \"00FF00\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("void f() {\n"
-              "  if (strcmp($\"00FF00\", \"00FF00\") == 0) {}"
-              "}");
+              "  if (strcmp($\"00FF00\", \"00FF00\") == 0) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
-              "  if ($strcmp(\"00FF00\", \"00FF00\") == 0) {}"
-              "}");
+              "  if ($strcmp(\"00FF00\", \"00FF00\") == 0) {}\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (stricmp(\"hotdog\",\"HOTdog\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (stricmp(\"hotdog\",\"HOTdog\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (QString::compare(\"Hamburger\", \"Hotdog\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (QString::compare(\"Hamburger\", \"Hotdog\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (QString::compare(argv[2], \"hotdog\") == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (QString::compare(argv[2], \"hotdog\") == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
-              "  if (strncmp(\"hotdog\",\"hotdog\", 6) == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (strncmp(\"hotdog\",\"hotdog\", 6) == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int foo(const char *buf)\n"
               "{\n"
-              "  if (strcmp(buf, buf) == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (strcmp(buf, buf) == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Comparison of identical string variables. [stringCompare]\n", errout_str());
 
         check("int foo(const std::string& buf)\n"
               "{\n"
-              "  if (stricmp(buf.c_str(), buf.c_str()) == 0)"
-              "  {"
-              "    std::cout << \"Equal\";"
-              "  }"
-              "}");
+              "  if (stricmp(buf.c_str(), buf.c_str()) == 0)\n"
+              "  {\n"
+              "    std::cout << \"Equal\";\n"
+              "  }\n"
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (warning) Comparison of identical string variables. [stringCompare]\n", errout_str());
 
         check("int main() {\n"
               "  if (\"str\" == \"str\") {\n"
               "    std::cout << \"Equal\";\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main() {\n"
               "  if (\"str\" != \"str\") {\n"
               "    std::cout << \"Equal\";\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main() {\n"
               "  if (a+\"str\" != \"str\"+b) {\n"
               "    std::cout << \"Equal\";\n"
               "  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousStringCompare() {
         check("bool foo(char* c) {\n"
               "    return c == \"x\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) String literal compared with variable 'c'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char** c) {\n"
               "    return c[3] == \"x\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) String literal compared with variable 'c[3]'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(wchar_t* c) {\n"
               "    return c == L\"x\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) String literal compared with variable 'c'. Did you intend to use wcscmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(const char* c) {\n"
               "    return \"x\" == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:16]: (warning) String literal compared with variable 'c'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return foo+\"x\" == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return \"x\" == c+foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return \"x\" == c+foo;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:16]: (warning) String literal compared with variable 'c+foo'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(Foo c) {\n"
               "    return \"x\" == c.foo;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(Foo c) {\n"
               "    return \"x\" == c.foo;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:2:16]: (warning) String literal compared with variable 'c.foo'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(const std::string& c) {\n"
               "    return \"x\" == c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(const Foo* c) {\n"
               "    return \"x\" == c->bar();\n" // #4314
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #4257
@@ -367,33 +367,33 @@ class TestString : public TestFixture {
         // Ticket #4257
         check("bool foo() {\n"
               "MyString *str=Getter();\n"
-              "return *str==\"bug\"; }");
+              "return *str==\"bug\"; }\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #4257
         check("bool foo() {\n"
               "MyString **str=OtherGetter();\n"
-              "return *str==\"bug\"; }", dinit(CheckOptions, $.cpp = false));
+              "return *str==\"bug\"; }\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (warning) String literal compared with variable '*str'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         // Ticket #4257
         check("bool foo() {\n"
               "MyString str=OtherGetter2();\n"
-              "return &str==\"bug\"; }", dinit(CheckOptions, $.cpp = false));
+              "return &str==\"bug\"; }\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:12]: (warning) String literal compared with variable '&str'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         // Ticket #5734
         check("int foo(char c) {\n"
-              "return c == '4';}");
+              "return c == '4';}\n");
         ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == '4';}", dinit(CheckOptions, $.cpp = false));
+              "return c == '4';}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == \"42\"[0];}");
+              "return c == \"42\"[0];}\n");
         ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == \"42\"[0];}", dinit(CheckOptions, $.cpp = false));
+              "return c == \"42\"[0];}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // 5639 String literal compared with char buffer in a struct
@@ -418,81 +418,81 @@ class TestString : public TestFixture {
         check("void f(std::vector<std::string> theArgs) {\n"
               "   std::string arg1(*theArgs.begin());\n"
               "   if(arg1 == \"aaa\") {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousStringCompare_char() {
         check("bool foo(char* c) {\n"
               "    return c == 'x';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(wchar_t* c) {\n"
               "    return c == L'x';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:14]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return '\\0' != c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char c) {\n"
               "    return c == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return c[0] == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char** c) {\n"
               "    return c[0] == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Char literal compared with pointer 'c[0]'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char** c) {\n"
               "    return *c == '\\0';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (warning) Char literal compared with pointer '*c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("bool foo(char c) {\n"
               "    return c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return *c == 0;\n"
-              "}", dinit(CheckOptions, $.cpp = false));
+              "}\n", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return *c == 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool foo(Foo* c) {\n"
               "    return 0 == c->x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* c) {\n"
               "    if(c == '\\0') bar();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("void f() {\n"
               "  struct { struct { char *str; } x; } a;\n"
               "  return a.x.str == '\\0';"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (warning) Char literal compared with pointer 'a.x.str'. Did you intend to dereference it? [charLiteralWithCharPtrCompare]\n", errout_str());
 
         check("void f() {\n"
               "  struct { struct { char *str; } x; } a;\n"
               "  return *a.x.str == '\\0';"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -502,7 +502,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    snprintf(buf,100,\"%s\",buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in snprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -511,7 +511,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf(buf,\"%s\",buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:22]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -520,7 +520,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf(buf,\"%i\",sizeof(buf));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -530,7 +530,7 @@ class TestString : public TestFixture {
               "    char buf[100];\n"
               "    sprintf(buf,\"%i\",sizeof(buf));\n"
               "    if (buf[0]);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -545,7 +545,7 @@ class TestString : public TestFixture {
               "    const char* filename = \"hello\";\n"
               "    struct A a;\n"
               "    snprintf(a.filename, 128, \"%s\", filename);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -558,7 +558,7 @@ class TestString : public TestFixture {
               "void foo(struct A *a)\n"
               "{\n"
               "    snprintf(a->filename, 128, \"%s\", a->filename);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:8:39]: (error) Undefined behavior: Variable 'a->filename' is used as parameter and destination in snprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -567,7 +567,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf((char*)buf,\"%s\",(char*)buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:29]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -576,7 +576,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char buf[100];\n"
               "    sprintf((char*)(void*)buf,\"%s\",(void*)(char*)buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:36]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -585,7 +585,7 @@ class TestString : public TestFixture {
               "{\n"
               "    wchar_t buf[100];\n"
               "    swprintf(buf,10, \"%s\",buf);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in swprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
@@ -594,7 +594,7 @@ class TestString : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    const char *p = \"/usr\" + '/';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:28]: (error) Unusual pointer arithmetic. A value of type 'char' is added to a string literal. [strPlusChar]\n", errout_str());
     }
 
@@ -604,7 +604,7 @@ class TestString : public TestFixture {
               "{\n"
               "    char ch = 1;\n"
               "    const char *p = ch + \"/usr\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Strange looking pointer arithmetic..
@@ -613,7 +613,7 @@ class TestString : public TestFixture {
               "    int i = 1;\n"
               "    const char* psz = \"Bla\";\n"
               "    const std::string str = i + psz;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -623,7 +623,7 @@ class TestString : public TestFixture {
               "{\n"
               "    std::string temp = \"/tmp\";\n"
               "    std::string path = temp + '/' + \"sub\" + '/';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -632,100 +632,100 @@ class TestString : public TestFixture {
         check("void foo()\n"
               "{\n"
               "    const wchar_t *p = L\"/usr\" + L'/';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:32]: (error) Unusual pointer arithmetic. A value of type 'wchar_t' is added to a string literal. [strPlusChar]\n", errout_str());
 
         check("void foo(wchar_t c)\n"
               "{\n"
               "    const wchar_t *p = L\"/usr\" + c;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:32]: (error) Unusual pointer arithmetic. A value of type 'wchar_t' is added to a string literal. [strPlusChar]\n", errout_str());
     }
 
     void incorrectStringCompare() {
         check("int f() {\n"
               "    return test.substr( 0 , 4 ) == \"Hello\" ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) String literal \"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return test.substr( 0 , 4 ) == L\"Hello\" ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) String literal L\"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return test.substr( 0 , 5 ) == \"Hello\" ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" == test.substr( 0 , 4 ) ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:28]: (warning) String literal \"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" == foo.bar<int>().z[1].substr(i+j*4, 4) ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:43]: (warning) String literal \"Hello\" doesn't match length argument for substr(). [incorrectStringCompare]\n", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" == test.substr( 0 , 5 ) ? 0 : 1 ;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    if (\"Hello\") { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    if (\"Hello\" && test) { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    if (test && \"Hello\") { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    while (\"Hello\") { }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:12]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    assert (test || \"Hello\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:21]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    assert (test && \"Hello\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    assert (\"Hello\" || test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:13]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
 
         check("int f() {\n"
               "    assert (\"Hello\" && test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    BOOST_ASSERT (\"Hello\" && test);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    return f2(\"Hello\");\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7750 warn about char literals in boolean expressions
@@ -734,7 +734,7 @@ class TestString : public TestFixture {
               "  if(L'b'){}\n"
               "  if(1 && 'c'){}\n"
               "  int x = 'd' ? 1 : 2;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Conversion of char literal 'a' to bool always evaluates to true. [incorrectCharBooleanError]\n"
                       "[test.cpp:3:6]: (warning) Conversion of char literal L'b' to bool always evaluates to true. [incorrectCharBooleanError]\n"
                       "[test.cpp:4:11]: (warning) Conversion of char literal 'c' to bool always evaluates to true. [incorrectCharBooleanError]\n"
@@ -744,7 +744,7 @@ class TestString : public TestFixture {
         check("void f() {\n"
               "  if('\\0'){}\n"
               "  if(L'\\0'){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Conversion of char literal '\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n"
                       "[test.cpp:3:6]: (warning) Conversion of char literal L'\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n",
                       errout_str());
@@ -752,7 +752,7 @@ class TestString : public TestFixture {
         check("void f() {\n"
               "  if('\\0' || cond){}\n"
               "  if(L'\\0' || cond){}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:6]: (warning) Conversion of char literal '\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n"
                       "[test.cpp:3:6]: (warning) Conversion of char literal L'\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n", errout_str());
 
@@ -824,17 +824,24 @@ class TestString : public TestFixture {
               "    if (strequ(p, \"ALL\")) {}\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::string_view);\n"
+              "void f(bool);\n"
+              "void g() {\n"
+              "    f(\"\"sv);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deadStrcmp() {
         check("void f(const char *str) {\n"
               "  if (strcmp(str, \"abc\") == 0 || strcmp(str, \"def\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:40]: (warning) The expression 'strcmp(str,\"def\") != 0' is suspicious. It overlaps 'strcmp(str,\"abc\") == 0'. [overlappingStrcmp]\n", errout_str());
 
         check("void f(const wchar_t *str) {\n"
               "  if (wcscmp(str, L\"abc\") == 0 || wcscmp(str, L\"def\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:41]: (warning) The expression 'wcscmp(str,L\"def\") != 0' is suspicious. It overlaps 'wcscmp(str,L\"abc\") == 0'. [overlappingStrcmp]\n", errout_str());
 
         check("struct X {\n"
@@ -843,7 +850,7 @@ class TestString : public TestFixture {
               "\n"
               "void f(const struct X *x) {\n"
               "  if (strcmp(x->str, \"abc\") == 0 || strcmp(x->str, \"def\")) {}\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:6:43]: (warning) The expression 'strcmp(x->str,\"def\") != 0' is suspicious. It overlaps 'strcmp(x->str,\"abc\") == 0'. [overlappingStrcmp]\n", errout_str());
     }
 };
diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
index 7896ffeb750..34f4ed3412e 100644
--- a/test/testsummaries.cpp
+++ b/test/testsummaries.cpp
@@ -45,15 +45,15 @@ class TestSummaries : public TestFixture {
     }
 
     void createSummaries1() {
-        ASSERT_EQUALS("foo\n", createSummaries("void foo() {}"));
+        ASSERT_EQUALS("foo\n", createSummaries("void foo() {}\n"));
     }
 
     void createSummariesGlobal() {
-        ASSERT_EQUALS("foo global:[x]\n", createSummaries("int x; void foo() { x=0; }"));
+        ASSERT_EQUALS("foo global:[x]\n", createSummaries("int x; void foo() { x=0; }\n"));
     }
 
     void createSummariesNoreturn() {
-        ASSERT_EQUALS("foo call:[bar] noreturn:[bar]\n", createSummaries("void foo() { bar(); }"));
+        ASSERT_EQUALS("foo call:[bar] noreturn:[bar]\n", createSummaries("void foo() { bar(); }\n"));
     }
 };
 
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 5176f2b60d6..de990c9fd91 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "addoninfo.h"
+#include "config.h"
 #include "cppcheck.h"
 #include "cppcheckexecutor.h"
 #include "errorlogger.h"
@@ -31,10 +33,12 @@
 #include "threadexecutor.h"
 
 #include <cstring>
+#include <initializer_list>
 #include <list>
 #include <map>
 #include <memory>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
@@ -45,10 +49,17 @@ class TestSuppressions : public TestFixture {
 
 private:
 
+    class CppCheckExecutorTest final : public CppCheckExecutor
+    {
+        friend class TestSuppressions;
+    };
+
     const std::string templateFormat{"{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"};
 
     void run() override {
         mNewTemplate = true;
+        TEST_CASE(parseLine);
+        TEST_CASE(parseLineInvalid);
         TEST_CASE(suppressionsBadId1);
         TEST_CASE(suppressionsDosFormat);     // Ticket #1836
         TEST_CASE(suppressionsFileNameWithColon);    // Ticket #1919 - filename includes colon
@@ -57,12 +68,14 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(suppressionsFileNameWithExtraPath);
         TEST_CASE(suppressionsSettingsFiles);
         TEST_CASE(suppressionsSettingsFS);
+#ifdef HAS_THREADING_MODEL_THREAD
         TEST_CASE(suppressionsSettingsThreadsFiles);
         TEST_CASE(suppressionsSettingsThreadsFS);
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#endif // HAS_THREADING_MODEL_THREAD
+#ifdef HAS_THREADING_MODEL_FORK
         TEST_CASE(suppressionsSettingsProcessesFiles);
         TEST_CASE(suppressionsSettingsProcessesFS);
-#endif
+#endif // HAS_THREADING_MODEL_FORK
         TEST_CASE(suppressionsMultiFileFiles);
         TEST_CASE(suppressionsMultiFileFS);
         TEST_CASE(suppressionsPathSeparator);
@@ -87,8 +100,8 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(suppressingSyntaxErrorsFS); // #7076
         TEST_CASE(suppressingSyntaxErrorsInlineFiles); // #5917
         TEST_CASE(suppressingSyntaxErrorsInlineFS); // #5917
-        TEST_CASE(suppressingSyntaxErrorsWhileFileReadFiles); // PR #1333
-        TEST_CASE(suppressingSyntaxErrorsWhileFileReadFS); // PR #1333
+        TEST_CASE(suppressingSimplecppErrorsWhileFileReadFiles); // PR #1333
+        TEST_CASE(suppressingSimplecppErrorsWhileFileReadFS); // PR #1333
         TEST_CASE(symbol);
 
         TEST_CASE(unusedFunctionFiles);
@@ -106,12 +119,92 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(addSuppressionLineMultiple);
 
         TEST_CASE(suppressionsParseXmlFile);
+        TEST_CASE(xmlMacroSuppressions);
 
         TEST_CASE(toString);
 
         TEST_CASE(suppressionFromErrorMessage);
 
         TEST_CASE(suppressionWildcard);
+
+        TEST_CASE(polyspaceParseRange);
+        TEST_CASE(polyspaceParseIds);
+
+        TEST_CASE(polyspaceMisraC2012);
+        TEST_CASE(polyspacePremiumMisraC2012);
+        TEST_CASE(polyspaceMisraC2023);
+        TEST_CASE(polyspaceMisraCpp2008);
+        TEST_CASE(polyspaceMisraCpp2023);
+        TEST_CASE(polyspaceCertC);
+        TEST_CASE(polyspaceCertCpp);
+        TEST_CASE(polyspaceAutosar);
+        TEST_CASE(polyspaceIgnored);
+        TEST_CASE(polyspaceMultiple1);
+        TEST_CASE(polyspaceMultiple2);
+        TEST_CASE(polyspaceMultiple3);
+        TEST_CASE(polyspaceRange);
+        TEST_CASE(polyspaceBlock);
+        TEST_CASE(polyspaceExtraComments);
+    }
+
+
+    void parseLine() const {
+        ASSERT_EQUALS("bad", SuppressionList::parseLine("bad").toString());
+        ASSERT_EQUALS("bad:test.c", SuppressionList::parseLine("bad:test.c").toString());
+        ASSERT_EQUALS("bad:test.c:1", SuppressionList::parseLine("bad:test.c:1").toString());
+
+        // symbol
+        ASSERT_EQUALS("bad\nsymbol=x", SuppressionList::parseLine("bad\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c\nsymbol=x", SuppressionList::parseLine("bad:test.c\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c:1\nsymbol=x", SuppressionList::parseLine("bad:test.c:1\nsymbol=x").toString());
+
+        // empty symbol
+        ASSERT_EQUALS("bad", SuppressionList::parseLine("bad\nsymbol=").toString());
+        ASSERT_EQUALS("bad:test.c", SuppressionList::parseLine("bad:test.c\nsymbol=").toString());
+        ASSERT_EQUALS("bad:test.c:1", SuppressionList::parseLine("bad:test.c:1\nsymbol=").toString());
+
+        // polyspace
+        ASSERT_EQUALS("bad\npolyspace=1", SuppressionList::parseLine("bad\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c\npolyspace=1", SuppressionList::parseLine("bad:test.c\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c:1\npolyspace=1", SuppressionList::parseLine("bad:test.c:1\npolyspace=1").toString());
+
+        // symbol + polyspace
+        ASSERT_EQUALS("bad\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad\nsymbol=x\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c\nsymbol=x\npolyspace=1").toString());
+        ASSERT_EQUALS("bad:test.c:1\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c:1\nsymbol=x\npolyspace=1").toString());
+
+        // polyspace + symbol
+        ASSERT_EQUALS("bad\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad\npolyspace=1\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c\npolyspace=1\nsymbol=x").toString());
+        ASSERT_EQUALS("bad:test.c:1\nsymbol=x\npolyspace=1", SuppressionList::parseLine("bad:test.c:1\npolyspace=1\nsymbol=x").toString());
+    }
+
+    void parseLineInvalid() const {
+        // missing filename
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:\n"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:\n1.c"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:#1.c"), std::runtime_error, "filename is missing"); // TODO: looks like a valid filename
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id://1.c"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id::"), std::runtime_error, "filename is missing");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id::1"), std::runtime_error, "filename is missing");
+
+        // missing/invalid line
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:\n"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:\n1"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:#1"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))"); // TODO: looks like a valid filename
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c://1"), std::runtime_error, "invalid line number (converting '' to integer failed - not an integer (invalid_argument))");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:zero"), std::runtime_error, "invalid line number (converting 'zero' to integer failed - not an integer (invalid_argument))");
+
+        // invalid extras
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\n"), std::runtime_error, "unexpected extra ''");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\nsym=x"), std::runtime_error, "unexpected extra 'sym=x'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\nsymbol:x"), std::runtime_error, "unexpected extra 'symbol:x'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\npolyspace=0"), std::runtime_error, "unexpected extra 'polyspace=0'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c:1\npolyspace:1"), std::runtime_error, "unexpected extra 'polyspace:1'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id\n:"), std::runtime_error, "unexpected extra ':'");
+        ASSERT_THROW_EQUALS(SuppressionList::parseLine("id:1.c\n:"), std::runtime_error, "unexpected extra ':'");
     }
 
     void suppressionsBadId1() const {
@@ -163,8 +256,8 @@ class TestSuppressions : public TestFixture {
         // Check for syntax errors in glob
         {
             SuppressionList suppressions;
-            std::istringstream s("errorid:**.cpp\n");
-            ASSERT_EQUALS("Failed to add suppression. Invalid glob pattern '**.cpp'.", suppressions.parseFile(s));
+            std::istringstream s("errorid:*?.cpp\n");
+            ASSERT_EQUALS("Failed to add suppression. Invalid glob pattern '*?.cpp'.", suppressions.parseFile(s));
         }
 
         // Check that globbing works
@@ -172,7 +265,9 @@ class TestSuppressions : public TestFixture {
             SuppressionList suppressions;
             std::istringstream s("errorid:x*.cpp\n"
                                  "errorid:y?.cpp\n"
-                                 "errorid:test.c*");
+                                 "errorid:test.c*\n"
+                                 "errorid:dir/**\n"
+                                 "errorid:**/abc**/xyz-??*.?pp\n");
             ASSERT_EQUALS("", suppressions.parseFile(s));
             ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "xyz.cpp", 1)));
             ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "xyz.cpp.cpp", 1)));
@@ -181,6 +276,13 @@ class TestSuppressions : public TestFixture {
             ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "y.cpp", 1)));
             ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "test.c", 1)));
             ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "test.cpp", 1)));
+
+            ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "dir/test.cpp", 1)));
+            ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "dir/deep/nested/test.cpp", 1)));
+            ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "yellow.cpp", 1)));
+            ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "foo/sub/abc/sub/xyz-22aaa.cpp", 1)));
+            ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "foo/sub/abc-xyz-22.cpp", 1)));
+            ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid", "x/abcxyz-11.cpp", 1)));
         }
 
         // Check that both a filename match and a glob match apply
@@ -273,15 +375,18 @@ class TestSuppressions : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        CppCheck cppCheck(settings, supprs, *this, true, nullptr);
-        SingleExecutor executor(cppCheck, filelist, fileSettings, settings, supprs, *this);
-        const unsigned int exitCode = executor.check();
+        CppCheck cppCheck(settings, supprs, *this, nullptr, true, nullptr);
+        SingleExecutor executor(cppCheck, filelist, fileSettings, settings, supprs, *this, nullptr);
+        unsigned int exitCode = executor.check();
 
-        CppCheckExecutor::reportSuppressions(settings, supprs.nomsg, false, filelist, fileSettings, *this); // TODO: check result
+        const bool err = CppCheckExecutorTest::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
+        if (err && exitCode == 0)
+            exitCode = 1;
 
         return exitCode;
     }
 
+#ifdef HAS_THREADING_MODEL_THREAD
     unsigned int checkSuppressionThreadsFiles(const char code[], const std::string &suppression = "") {
         return _checkSuppressionThreads(code, false, suppression);
     }
@@ -299,12 +404,12 @@ class TestSuppressions : public TestFixture {
             fileSettings.emplace_back("test.cpp", Standards::Language::CPP, strlen(code));
         }
 
-        /*const*/ auto settings = dinit(Settings,
-                                        $.jobs = 2,
-                                            $.quiet = true,
-                                            $.inlineSuppressions = true);
-        settings.severity.enable(Severity::information);
-        settings.templateFormat = templateFormat;
+        const auto settings = dinit(Settings,
+                                    $.jobs = 2,
+                                        $.quiet = true,
+                                        $.inlineSuppressions = true,
+                                        $.severity.enable (Severity::information),
+                                        $.templateFormat = templateFormat);
 
         Suppressions supprs;
         if (!suppression.empty()) {
@@ -320,15 +425,18 @@ class TestSuppressions : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ThreadExecutor executor(filelist, fileSettings, settings, supprs, *this, CppCheckExecutor::executeCommand);
-        const unsigned int exitCode = executor.check();
+        ThreadExecutor executor(filelist, fileSettings, settings, supprs, *this, nullptr, CppCheckExecutorTest::executeCommand);
+        unsigned int exitCode = executor.check();
 
-        CppCheckExecutor::reportSuppressions(settings, supprs.nomsg, false, filelist, fileSettings, *this); // TODO: check result
+        const bool err = CppCheckExecutorTest::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
+        if (err && exitCode == 0)
+            exitCode = 1;
 
         return exitCode;
     }
+#endif // HAS_THREADING_MODEL_THREAD
 
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#ifdef HAS_THREADING_MODEL_FORK
     unsigned int checkSuppressionProcessesFiles(const char code[], const std::string &suppression = "") {
         return _checkSuppressionProcesses(code, false, suppression);
     }
@@ -367,14 +475,16 @@ class TestSuppressions : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ProcessExecutor executor(filelist, fileSettings, settings, supprs, *this, CppCheckExecutor::executeCommand);
-        const unsigned int exitCode = executor.check();
+        ProcessExecutor executor(filelist, fileSettings, settings, supprs, *this, nullptr, CppCheckExecutorTest::executeCommand);
+        unsigned int exitCode = executor.check();
 
-        CppCheckExecutor::reportSuppressions(settings, supprs.nomsg, false, filelist, fileSettings, *this); // TODO: check result
+        const bool err = CppCheckExecutorTest::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
+        if (err && exitCode == 0)
+            exitCode = 1;
 
         return exitCode;
     }
-#endif
+#endif // HAS_THREADING_MODEL_FORK
 
     void runChecks(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
         // check to make sure the appropriate errors are present
@@ -403,22 +513,22 @@ class TestSuppressions : public TestFixture {
                                         "uninitvar"));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("void f() {\n"
-                       "    // cppcheck-suppress-file uninitvar\n"
-                       "    int a;\n"
-                       "    a++;\n"
-                       "}\n",
-                       "");
-        ASSERT_EQUALS("[test.cpp:2:0]: (error) File suppression should be at the top of the file [preprocessorErrorDirective]\n"
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    // cppcheck-suppress-file uninitvar\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) File suppression should be at the top of the file [invalidSuppression]\n"
                       "[test.cpp:4:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    a++;\n"
-                       "}\n"
-                       "// cppcheck-suppress-file uninitvar\n",
-                       "");
-        ASSERT_EQUALS("[test.cpp:5:0]: (error) File suppression should be at the top of the file [preprocessorErrorDirective]\n"
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "}\n"
+                                        "// cppcheck-suppress-file uninitvar\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) File suppression should be at the top of the file [invalidSuppression]\n"
                       "[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         ASSERT_EQUALS(0, (this->*check)("// cppcheck-suppress-file uninitvar\n"
@@ -446,31 +556,31 @@ class TestSuppressions : public TestFixture {
                                         ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("// cppcheck-suppress-file uninitvar\n"
-                       "void f() {\n"
-                       "    int a;\n"
-                       "    a++;\n"
-                       "    int b;\n"
-                       "    b++;\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("// cppcheck-suppress-file uninitvar\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar globally, without error present
-        ASSERT_EQUALS(0, (this->*check)("void f() {\n"
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
                                         "    int a;\n"
                                         "    b++;\n"
                                         "}\n",
                                         "uninitvar"));
         ASSERT_EQUALS("(information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
-        (this->*check)("// cppcheck-suppress-file uninitvar\n"
-                       "void f() {\n"
-                       "    int a;\n"
-                       "    b++;\n"
-                       "}\n",
-                       "");
-        ASSERT_EQUALS("[test.cpp:1:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-file uninitvar\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:1:1]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress uninitvar for this file only
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -481,12 +591,12 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar for this file only, without error present
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    b++;\n"
-                       "}\n",
-                       "uninitvar:test.cpp");
-        ASSERT_EQUALS("[test.cpp]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        "uninitvar:test.cpp"));
+        ASSERT_EQUALS("[test.cpp:0:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress all for this file only
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -497,12 +607,12 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         // suppress all for this file only, without error present
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    b++;\n"
-                       "}\n",
-                       "*:test.cpp");
-        ASSERT_EQUALS("[test.cpp]: (information) Unmatched suppression: * [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        "*:test.cpp"));
+        ASSERT_EQUALS("[test.cpp:0:0]: (information) Unmatched suppression: * [unmatchedSuppression]\n", errout_str());
 
         // suppress uninitvar for this file and line
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -513,11 +623,11 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar for this file and line, without error present
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    b++;\n"
-                       "}\n",
-                       "uninitvar:test.cpp:3");
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        "uninitvar:test.cpp:3"));
         ASSERT_EQUALS("[test.cpp:3:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress uninitvar inline
@@ -637,18 +747,18 @@ class TestSuppressions : public TestFixture {
                                         "    int a;\n"
                                         "    // cppcheck-suppress uninitvar\n"
                                         "    a++;\n"
-                                        "}",
+                                        "}\n",
                                         ""));
         ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline, without error present
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress uninitvar\n"
-                       "    b++;\n"
-                       "}\n",
-                       "");
-        ASSERT_EQUALS("[test.cpp:4:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress uninitvar\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:4:5]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress block inline checks
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -670,7 +780,7 @@ class TestSuppressions : public TestFixture {
                                         "    b++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:2:0]: (error) Suppress Begin: No matching end [preprocessorErrorDirective]\n"
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Suppress Begin: No matching end [invalidSuppression]\n"
                       "[test.cpp:4:5]: (error) Uninitialized variable: a [uninitvar]\n"
                       "[test.cpp:6:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
 
@@ -682,10 +792,57 @@ class TestSuppressions : public TestFixture {
                                         "    // cppcheck-suppress-end uninitvar\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:6:0]: (error) Suppress End: No matching begin [preprocessorErrorDirective]\n"
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Suppress End: No matching begin [invalidSuppression]\n"
                       "[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n"
                       "[test.cpp:5:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
 
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress: id\n"
+                                        "// cppcheck-suppress-unknown id\n"
+                                        "// cppcheck-suppress-begin-unknown id\n"
+                                        "// cppcheck-suppress-begin id4\n"
+                                        "void f() {}\n"
+                                        "// cppcheck-suppress-end-unknown id4\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:1:1]: (error) unknown suppression type 'cppcheck-suppress:' [invalidSuppression]\n"
+                      "[test.cpp:2:1]: (error) unknown suppression type 'cppcheck-suppress-unknown' [invalidSuppression]\n"
+                      "[test.cpp:3:1]: (error) unknown suppression type 'cppcheck-suppress-begin-unknown' [invalidSuppression]\n"
+                      "[test.cpp:6:1]: (error) unknown suppression type 'cppcheck-suppress-end-unknown' [invalidSuppression]\n"
+                      "[test.cpp:4:1]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-file\n"
+                                        "// cppcheck-suppress\n"
+                                        "// cppcheck-suppress \n"
+                                        "// cppcheck-suppress\t\n"
+                                        "// cppcheck-suppress []\n" // TODO
+                                        "// cppcheck-suppress-macro\n"
+                                        "// cppcheck-suppress-begin\n"
+                                        "// cppcheck-suppress-begin id0\n"
+                                        "void f() {}\n"
+                                        "// cppcheck-suppress-end\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:1:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:7:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:10:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:8:1]: (error) Suppress Begin: No matching end [invalidSuppression]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress:\n"
+                                        "// cppcheck-suppress-unknown\n"
+                                        "// cppcheck-suppress-begin-unknown\n"
+                                        "// cppcheck-suppress-begin\n"
+                                        "void f() {}\n"
+                                        "// cppcheck-suppress-end-unknown\n",
+                                        ""));
+        // TODO: actually these are all invalid types
+        ASSERT_EQUALS("[test.cpp:1:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:1]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:1]: (error) suppression without error ID [invalidSuppression]\n", errout_str());
+
         ASSERT_EQUALS(1, (this->*check)("void f() {\n"
                                         "    int a;\n"
                                         "    // cppcheck-suppress-begin uninitvar\n"
@@ -730,141 +887,141 @@ class TestSuppressions : public TestFixture {
                                         ""));
         ASSERT_EQUALS("[test.cpp:7:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
 
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    int b;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    b++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    int b;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    int b;\n"
-                       "    b++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("void f() {\n"
-                       "    // cppcheck-suppress-begin [uninitvar]\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    int b;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    b++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    // cppcheck-suppress-end [uninitvar]\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("void f() {\n"
+                                        "    // cppcheck-suppress-begin [uninitvar]\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    int b;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    // cppcheck-suppress-end [uninitvar]\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("void f() {\n"
-                       "    // cppcheck-suppress-begin [uninitvar, syntaxError]\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    int b;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    b++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    // cppcheck-suppress-end [uninitvar, syntaxError]\n"
-                       "}\n",
-                       "");
-        ASSERT_EQUALS("[test.cpp:2:0]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
-
-        (this->*check)("// cppcheck-suppress-begin [uninitvar, syntaxError]\n"
-                       "void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    int b;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    b++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "}\n"
-                       "// cppcheck-suppress-end [uninitvar, syntaxError]\n",
-                       "");
-        ASSERT_EQUALS("[test.cpp:1:0]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
-
-        (this->*check)("// cppcheck-suppress-begin [uninitvar, syntaxError]\n"
-                       "void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "    int b;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    b++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "}\n"
-                       "// cppcheck-suppress-end [uninitvar, syntaxError]",
-                       "");
-        ASSERT_EQUALS("[test.cpp:1:0]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    // cppcheck-suppress-begin [uninitvar, syntaxError]\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    int b;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    // cppcheck-suppress-end [uninitvar, syntaxError]\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:2:5]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-begin [uninitvar, syntaxError]\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    int b;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n"
+                                        "// cppcheck-suppress-end [uninitvar, syntaxError]\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:1:1]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-begin [uninitvar, syntaxError]\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    int b;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n"
+                                        "// cppcheck-suppress-end [uninitvar, syntaxError]\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:1:1]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
 
         // test of multiple suppression types
-        (this->*check)("// cppcheck-suppress-file uninitvar\n"
-                       "void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    // cppcheck-suppress uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("// cppcheck-suppress-file uninitvar\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    // cppcheck-suppress uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    // cppcheck-suppress uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    // cppcheck-suppress uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("// cppcheck-suppress-file uninitvar\n"
-                       "void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress uninitvar\n"
-                       "    a++;\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("// cppcheck-suppress-file uninitvar\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress uninitvar\n"
+                                        "    a++;\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("// cppcheck-suppress-file uninitvar\n"
-                       "void f() {\n"
-                       "    int a;\n"
-                       "    // cppcheck-suppress-begin uninitvar\n"
-                       "    a++;\n"
-                       "    // cppcheck-suppress-end uninitvar\n"
-                       "}\n",
-                       "");
+        ASSERT_EQUALS(0, (this->*check)("// cppcheck-suppress-file uninitvar\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n",
+                                        ""));
         ASSERT_EQUALS("", errout_str());
 
-        (this->*check)("// cppcheck-suppress-file uninitvar\n"
-                       "void f() {\n"
-                       "    // cppcheck-suppress uninitvar\n"
-                       "    int a;\n"
-                       "    a++;\n"
-                       "}\n",
-                       "");
-        ASSERT_EQUALS("[test.cpp:4:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS(1, (this->*check)("// cppcheck-suppress-file uninitvar\n"
+                                        "void f() {\n"
+                                        "    // cppcheck-suppress uninitvar\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:4:5]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // #5746 - exitcode
         ASSERT_EQUALS(1U,
@@ -881,29 +1038,30 @@ class TestSuppressions : public TestFixture {
                                      "uninitvar"));
         ASSERT_EQUALS("", errout_str());
 
-        // cppcheck-suppress-macro
+        // TODO: check result
         (this->*check)("// cppcheck-suppress-macro zerodiv\n"
                        "#define DIV(A,B) A/B\n"
                        "a = DIV(10,0);\n",
                        "");
         ASSERT_EQUALS("", errout_str());
 
+        // TODO: check result
         (this->*check)("// cppcheck-suppress-macro abc\n"
                        "#define DIV(A,B) A/B\n"
                        "a = DIV(10,1);\n",
                        "");
-        ASSERT_EQUALS("[test.cpp:2:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:1]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
     }
 
     void suppressionsSettingsFiles() {
         runChecks(&TestSuppressions::checkSuppressionFiles);
     }
 
-    static void suppressionsSettingsFS() {
-        // TODO
-        // runChecks(&TestSuppressions::checkSuppressionFS);
+    void suppressionsSettingsFS() {
+        runChecks(&TestSuppressions::checkSuppressionFS);
     }
 
+#ifdef HAS_THREADING_MODEL_THREAD
     void suppressionsSettingsThreadsFiles() {
         runChecks(&TestSuppressions::checkSuppressionThreadsFiles);
     }
@@ -911,8 +1069,9 @@ class TestSuppressions : public TestFixture {
     void suppressionsSettingsThreadsFS() {
         runChecks(&TestSuppressions::checkSuppressionThreadsFS);
     }
+#endif // HAS_THREADING_MODEL_THREAD
 
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#ifdef HAS_THREADING_MODEL_FORK
     void suppressionsSettingsProcessesFiles() {
         runChecks(&TestSuppressions::checkSuppressionProcessesFiles);
     }
@@ -920,7 +1079,7 @@ class TestSuppressions : public TestFixture {
     void suppressionsSettingsProcessesFS() {
         runChecks(&TestSuppressions::checkSuppressionProcessesFS);
     }
-#endif
+#endif // HAS_THREADING_MODEL_FORK
 
     void suppressionsMultiFileInternal(unsigned int (TestSuppressions::*check)(std::map<std::string, std::string> &f, const std::string &)) {
         std::map<std::string, std::string> files;
@@ -1014,6 +1173,17 @@ class TestSuppressions : public TestFixture {
         msg.clear();
         ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress id */", &msg));
         ASSERT_EQUALS("", msg);
+        ASSERT_EQUALS("", s.extraComment);
+
+        msg.clear();
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress id ; extra */", &msg));
+        ASSERT_EQUALS("", msg);
+        ASSERT_EQUALS("extra", s.extraComment);
+
+        msg.clear();
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress id // extra */", &msg));
+        ASSERT_EQUALS("", msg);
+        ASSERT_EQUALS("extra", s.extraComment);
 
         msg.clear();
         ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress-file id */", &msg));
@@ -1229,10 +1399,10 @@ class TestSuppressions : public TestFixture {
         Suppressions supprs;
         ASSERT_EQUALS("", supprs.nomsg.addSuppressionLine("uninitvar"));
 
-        CppCheck cppCheck(settings, supprs, *this, false, nullptr); // <- do not "use global suppressions". pretend this is a thread that just checks a file.
+        CppCheck cppCheck(settings, supprs, *this, nullptr, false, nullptr); // <- do not "use global suppressions". pretend this is a thread that just checks a file.
 
-        const char code[] = "int f() { int a; return a; }";
-        ASSERT_EQUALS(0, cppCheck.check(FileWithDetails("test.c", Standards::Language::C, 0), code)); // <- no unsuppressed error is seen
+        const char code[] = "int f() { int a; return a; }\n";
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("test.c", Standards::Language::C, 0),code, sizeof(code)-1)); // <- no unsuppressed error is seen
         ASSERT_EQUALS("[test.c:1:25]: (error) Uninitialized variable: a [uninitvar]\n", errout_str()); // <- report error so ThreadExecutor can suppress it and make sure the global suppression is matched.
     }
 
@@ -1241,20 +1411,16 @@ class TestSuppressions : public TestFixture {
         SuppressionList::Suppression suppression("unusedFunction", "test.c", 3);
         suppression.checked = true; // have to do this because fixes for #5704
         ASSERT_EQUALS("", suppressions.addSuppression(std::move(suppression)));
-        ASSERT_EQUALS(true, !suppressions.getUnmatchedLocalSuppressions(FileWithDetails("test.c", Standards::Language::C, 0), true).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedGlobalSuppressions(true).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedLocalSuppressions(FileWithDetails("test.c", Standards::Language::C, 0), false).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedGlobalSuppressions(false).empty());
+        ASSERT_EQUALS(true, !suppressions.getUnmatchedLocalSuppressions(FileWithDetails("test.c", Standards::Language::C, 0)).empty());
+        ASSERT_EQUALS(false, !suppressions.getUnmatchedGlobalSuppressions().empty());
     }
 
     void globalsuppress_unusedFunction() const { // #4946 - wrong report of "unmatchedSuppression" for "unusedFunction"
         SuppressionList suppressions;
         ASSERT_EQUALS("", suppressions.addSuppressionLine("unusedFunction:*"));
         ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid")));
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedLocalSuppressions(FileWithDetails("test.c", Standards::Language::C, 0), true).empty());
-        ASSERT_EQUALS(true, !suppressions.getUnmatchedGlobalSuppressions(true).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedLocalSuppressions(FileWithDetails("test.c", Standards::Language::C, 0), false).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedGlobalSuppressions(false).empty());
+        ASSERT_EQUALS(false, !suppressions.getUnmatchedLocalSuppressions(FileWithDetails("test.c", Standards::Language::C, 0)).empty());
+        ASSERT_EQUALS(true, !suppressions.getUnmatchedGlobalSuppressions().empty());
     }
 
     void suppressionWithRelativePaths() {
@@ -1274,9 +1440,9 @@ class TestSuppressions : public TestFixture {
             "    int x;\n"
             "    // cppcheck-suppress unusedStructMember\n"
             "    int y;\n"
-            "};";
-        CppCheck cppCheck(settings, supprs, *this, true, nullptr);
-        ASSERT_EQUALS(0, cppCheck.check(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), code));
+            "};\n";
+        CppCheck cppCheck(settings, supprs, *this, nullptr, true, nullptr);
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), code, sizeof(code)-1));
         ASSERT_EQUALS("",errout_str());
     }
 
@@ -1305,7 +1471,7 @@ class TestSuppressions : public TestFixture {
                             "   fld   TBYTE PTR [EAX]   ; load an extended real (10 bytes)\n"
                             "   fstp  QWORD PTR result  ; store a double (8 bytes)\n"
                             "   pop   EAX               ; restore EAX\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS(0, (this->*check)(code, ""));
         ASSERT_EQUALS("", errout_str());
     }
@@ -1318,7 +1484,7 @@ class TestSuppressions : public TestFixture {
         suppressingSyntaxErrorsInlineInternal(&TestSuppressions::checkSuppressionFS);
     }
 
-    void suppressingSyntaxErrorsWhileFileReadInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) { // syntaxError while file read should be suppressible (PR #1333)
+    void suppressingSimplecppErrorsWhileFileReadInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) { // syntaxError while file read should be suppressible (PR #1333)
         const char code[] = "CONST (genType, KS_CONST) genService[KS_CFG_NR_OF_NVM_BLOCKS] =\n"
                             "{\n"
                             "[!VAR \"BC\" = \"$BC + 1\"!][!//\n"
@@ -1336,12 +1502,12 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void suppressingSyntaxErrorsWhileFileReadFiles() {
-        suppressingSyntaxErrorsWhileFileReadInternal(&TestSuppressions::checkSuppressionFiles);
+    void suppressingSimplecppErrorsWhileFileReadFiles() {
+        suppressingSimplecppErrorsWhileFileReadInternal(&TestSuppressions::checkSuppressionFiles);
     }
 
-    void suppressingSyntaxErrorsWhileFileReadFS() {
-        suppressingSyntaxErrorsWhileFileReadInternal(&TestSuppressions::checkSuppressionFiles);
+    void suppressingSimplecppErrorsWhileFileReadFS() {
+        suppressingSimplecppErrorsWhileFileReadInternal(&TestSuppressions::checkSuppressionFiles);
     }
 
     // TODO: this tests an internal function - should it be private?
@@ -1371,7 +1537,7 @@ class TestSuppressions : public TestFixture {
     }
 
     void unusedFunctionInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
-        ASSERT_EQUALS(0, (this->*check)("void f() {}", "unusedFunction"));
+        ASSERT_EQUALS(0, (this->*check)("void f() {}\n", "unusedFunction"));
     }
 
     void unusedFunctionFiles() {
@@ -1383,7 +1549,7 @@ class TestSuppressions : public TestFixture {
     }
 
     void suppressingSyntaxErrorAndExitCodeInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
-        const char code[] = "fi if;";
+        const char code[] = "fi if;\n";
 
         ASSERT_EQUALS(0, (this->*check)(code, "*:test.cpp"));
         ASSERT_EQUALS("", errout_str());
@@ -1409,16 +1575,15 @@ class TestSuppressions : public TestFixture {
         suppressingSyntaxErrorAndExitCodeInternal(&TestSuppressions::checkSuppressionFiles);
     }
 
-    static void suppressingSyntaxErrorAndExitCodeFS() {
-        // TODO
-        // suppressingSyntaxErrorAndExitCodeInternal(&TestSuppressions::checkSuppressionFS);
+    void suppressingSyntaxErrorAndExitCodeFS() {
+        suppressingSyntaxErrorAndExitCodeInternal(&TestSuppressions::checkSuppressionFS);
     }
 
     void suppressingSyntaxErrorAndExitCodeMultiFileInternal(unsigned int (TestSuppressions::*check)(std::map<std::string, std::string> &f, const std::string &)) {
         // multi files, but only suppression one
         std::map<std::string, std::string> mfiles;
-        mfiles["test.cpp"] = "fi if;";
-        mfiles["test2.cpp"] = "fi if";
+        mfiles["test.cpp"] = "fi if;\n";
+        mfiles["test2.cpp"] = "fi if\n";
         ASSERT_EQUALS(1, (this->*check)(mfiles, "*:test.cpp"));
         ASSERT_EQUALS("[test2.cpp:1:4]: (error) syntax error [syntaxError]\n", errout_str());
     }
@@ -1427,9 +1592,8 @@ class TestSuppressions : public TestFixture {
         suppressingSyntaxErrorAndExitCodeMultiFileInternal(&TestSuppressions::checkSuppressionFiles);
     }
 
-    static void suppressingSyntaxErrorAndExitCodeMultiFileFS() {
-        // TODO
-        // suppressingSyntaxErrorAndExitCodeMultiFileInternal(&TestSuppressions::checkSuppressionFS);
+    void suppressingSyntaxErrorAndExitCodeMultiFileFS() {
+        suppressingSyntaxErrorAndExitCodeMultiFileInternal(&TestSuppressions::checkSuppressionFS);
     }
 
     void suppressLocal() const {
@@ -1447,55 +1611,76 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid2", "test2.cpp", 1), false));
     }
 
+    static void addCheckedSuppression(SuppressionList& supprs, SuppressionList::Suppression suppr)
+    {
+        suppr.checked = true;
+        supprs.addSuppression(std::move(suppr));
+    }
+
     void suppressUnmatchedSuppressions() {
-        std::list<SuppressionList::Suppression> suppressions;
+        const std::list<FileWithDetails> files = { {"a.c", Standards::Language::C, 0}};
+        const std::list<FileSettings> fs;
 
         // No unmatched suppression
-        suppressions.clear();
-        ASSERT_EQUALS(false, SuppressionList::reportUnmatchedSuppressions(suppressions, *this));
-        ASSERT_EQUALS("", errout_str());
+        {
+            SuppressionList suppressions;
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
 
         // suppress all unmatchedSuppression
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "*", SuppressionList::Suppression::NO_LINE);
-        ASSERT_EQUALS(false, SuppressionList::reportUnmatchedSuppressions(suppressions, *this));
-        ASSERT_EQUALS("", errout_str());
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "*", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
 
         // suppress all unmatchedSuppression (corresponds to "--suppress=unmatchedSuppression")
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "", SuppressionList::Suppression::NO_LINE);
-        ASSERT_EQUALS(false, SuppressionList::reportUnmatchedSuppressions(suppressions, *this));
-        ASSERT_EQUALS("", errout_str());
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
 
         // suppress all unmatchedSuppression in a.c
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", SuppressionList::Suppression::NO_LINE);
-        ASSERT_EQUALS(false, SuppressionList::reportUnmatchedSuppressions(suppressions, *this));
-        ASSERT_EQUALS("", errout_str());
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
 
         // suppress unmatchedSuppression in a.c at line 10
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", 10U);
-        ASSERT_EQUALS(false, SuppressionList::reportUnmatchedSuppressions(suppressions, *this));
-        ASSERT_EQUALS("", errout_str());
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", 10U});
+            ASSERT_EQUALS(false, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
 
         // don't suppress unmatchedSuppression when file is mismatching
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "b.c", SuppressionList::Suppression::NO_LINE);
-        ASSERT_EQUALS(true, SuppressionList::reportUnmatchedSuppressions(suppressions, *this));
-        ASSERT_EQUALS("[a.c:10:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "b.c", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(true, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("[a.c:10:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
+        }
 
         // don't suppress unmatchedSuppression when line is mismatching
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", 1U);
-        ASSERT_EQUALS(true, SuppressionList::reportUnmatchedSuppressions(suppressions, *this));
-        ASSERT_EQUALS("[a.c:10:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", 1U});
+            ASSERT_EQUALS(true, CppCheckExecutorTest::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("[a.c:10:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
+        }
     }
 
     void suppressionsParseXmlFile() const {
@@ -1521,6 +1706,25 @@ class TestSuppressions : public TestFixture {
             ASSERT_EQUALS("sym", suppr.symbolName);
         }
 
+        {
+            ScopedFile file("suppressparsexml.xml",
+                            "<suppressions>\n"
+                            "<suppress>\n"
+                            "<id>uninitvar</id>\n"
+                            "<macroName>MACRO_NAME</macroName>\n"
+                            "</suppress>\n"
+                            "</suppressions>");
+
+            SuppressionList supprList;
+            ASSERT_EQUALS("", supprList.parseXmlFile(file.path().c_str()));
+            const auto& supprs = supprList.getSuppressions();
+            ASSERT_EQUALS(1, supprs.size());
+            const auto& suppr = *supprs.cbegin();
+            ASSERT_EQUALS("uninitvar", suppr.errorId);
+            ASSERT_EQUALS("MACRO_NAME", suppr.macroName);
+            ASSERT_EQUALS_ENUM(SuppressionList::Type::macro, suppr.type);
+        }
+
         // no file specified
         {
             SuppressionList supprList;
@@ -1574,6 +1778,67 @@ class TestSuppressions : public TestFixture {
         }
     }
 
+    #define testXmlSuppressions(...) testXmlSuppressions_(__FILE__,__LINE__,__VA_ARGS__)
+    void testXmlSuppressions_(const char *thisfile,
+                              int thisline,
+                              const std::string &xml,
+                              const std::string &code,
+                              const std::string &expected)
+    {
+        const char *xmlpath = "testsupressions.xml";
+        const char *sourcepath = "test.c";
+
+        Suppressions supprs;
+        const ScopedFile xmlfile(xmlpath, xml);
+        ASSERT_EQUALS_LOC("", supprs.nomsg.parseXmlFile(xmlpath), thisfile, thisline);
+
+        Settings settings;
+        settings.templateFormat = templateFormat;
+        settings.quiet = true;
+
+        const FileWithDetails sourcefile(sourcepath, Standards::Language::C, 0);
+        CppCheck instance(settings, supprs, *this, nullptr, true, nullptr);
+        instance.checkBuffer(sourcefile, code.c_str(), code.size());
+
+        ASSERT_EQUALS_LOC(expected, errout_str(), thisfile, thisline);
+    }
+
+    void xmlMacroSuppressions()
+    {
+        testXmlSuppressions(
+            "<suppressions>\n"
+            "<suppress>\n"
+            "<id>uninitvar</id>\n"
+            "<macroName>VAR</macroName>\n"
+            "</suppress>\n"
+            "</suppressions>",
+
+            "#define VAR x\n"
+            "int f(void) {\n"
+            "    int VAR;\n"
+            "    return VAR;\n"
+            "}\n",
+
+            ""
+            );
+        testXmlSuppressions(
+            "<suppressions>\n"
+            "<suppress>\n"
+            "<id>uninitvar</id>\n"
+            "<macroName>WRONG</macroName>\n"
+            "</suppress>\n"
+            "</suppressions>",
+
+            "#define VAR x\n"
+            "int f(void) {\n"
+            "    int VAR;\n"
+            "    return VAR;\n"
+            "}\n",
+
+            "[test.c:4:12]: (error) Uninitialized variable: x [uninitvar]\n"
+            );
+    }
+
     void addSuppressionDuplicate() const {
         SuppressionList supprs;
 
@@ -1602,7 +1867,7 @@ class TestSuppressions : public TestFixture {
 
             ASSERT_EQUALS(true, supprs.updateSuppressionState(s));
 
-            const std::list<SuppressionList::Suppression> l = supprs.getUnmatchedGlobalSuppressions(false);
+            const std::list<SuppressionList::Suppression> l = supprs.getUnmatchedGlobalSuppressions();
             ASSERT_EQUALS(1, l.size());
         }
         {
@@ -1617,7 +1882,7 @@ class TestSuppressions : public TestFixture {
             s.matched = true;
             ASSERT_EQUALS(true, supprs.updateSuppressionState(s));
 
-            const std::list<SuppressionList::Suppression> l = supprs.getUnmatchedGlobalSuppressions(false);
+            const std::list<SuppressionList::Suppression> l = supprs.getUnmatchedGlobalSuppressions();
             ASSERT_EQUALS(0, l.size());
         }
     }
@@ -1691,7 +1956,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList::Suppression s;
             s.errorId = "unitvar";
             s.symbolName = "sym";
-            ASSERT_EQUALS("unitvar:sym", s.toString());
+            ASSERT_EQUALS("unitvar\nsymbol=sym", s.toString());
         }
     }
 
@@ -1742,7 +2007,7 @@ class TestSuppressions : public TestFixture {
                 ASSERT(!suppr->checked);
                 ASSERT(!suppr->matched);
             }
-            ASSERT(suppressions.getUnmatchedGlobalSuppressions(true).empty());
+            ASSERT(suppressions.getUnmatchedGlobalSuppressions().empty());
         }
 
         {
@@ -1756,7 +2021,7 @@ class TestSuppressions : public TestFixture {
                 ASSERT(suppr->checked);
                 ASSERT(!suppr->matched);
             }
-            ASSERT(!suppressions.getUnmatchedGlobalSuppressions(true).empty());
+            ASSERT(!suppressions.getUnmatchedGlobalSuppressions().empty());
         }
 
         {
@@ -1770,7 +2035,7 @@ class TestSuppressions : public TestFixture {
                 ASSERT(suppr->checked);
                 ASSERT(!suppr->matched);
             }
-            ASSERT(!suppressions.getUnmatchedGlobalSuppressions(true).empty());
+            ASSERT(!suppressions.getUnmatchedGlobalSuppressions().empty());
         }
 
         {
@@ -1783,7 +2048,7 @@ class TestSuppressions : public TestFixture {
                 ASSERT(suppr->checked);
                 ASSERT(suppr->matched);
             }
-            ASSERT(suppressions.getUnmatchedGlobalSuppressions(true).empty());
+            ASSERT(suppressions.getUnmatchedGlobalSuppressions().empty());
         }
 
         {
@@ -1797,9 +2062,264 @@ class TestSuppressions : public TestFixture {
                 ASSERT(suppr->checked);
                 ASSERT(!suppr->matched);
             }
-            ASSERT(!suppressions.getUnmatchedGlobalSuppressions(true).empty());
+            ASSERT(!suppressions.getUnmatchedGlobalSuppressions().empty());
+        }
+    }
+
+    static std::string polyspaceParseIdsResults(const std::string& comment, std::string::size_type pos) {
+        std::string ret;
+        for (const auto& fr: polyspace::Parser::parseFamilyRules(comment,pos)) {
+            if (!fr.second.empty())
+                ret += ',' + fr.first + ':' + fr.second;
+        }
+        return ret.empty() ? ret : ret.substr(1);
+    }
+
+    void polyspaceParseRange() const {
+        std::string::size_type pos;
+
+        // Happy case
+        pos = 0;
+        ASSERT_EQUALS(12, polyspace::Parser::parseRange(" +12 ",pos));
+        ASSERT_EQUALS(4U, pos);
+
+        // Invalid range => pos will point at the token
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" ",pos));
+        ASSERT_EQUALS(std::string::npos, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" test ",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +12",pos));
+        ASSERT_EQUALS(1U, pos);
+
+        pos = 0;
+        ASSERT_EQUALS(0, polyspace::Parser::parseRange(" +A ",pos));
+        ASSERT_EQUALS(1U, pos);
+    }
+
+    void polyspaceParseIds() const {
+        ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12",3));
+        ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12 [12]",3));
+        ASSERT_EQUALS("test:12", polyspaceParseIdsResults("abc test:12 */",3));
+        ASSERT_EQUALS("test:1*", polyspaceParseIdsResults("abc test:1* */",3));
+        ASSERT_EQUALS("test:*", polyspaceParseIdsResults("// abc test:*",6));
+        // -_.
+        ASSERT_EQUALS("test:1-2.3", polyspaceParseIdsResults("abc test:1-2.3",3));
+        ASSERT_EQUALS("t-e_s.t:12", polyspaceParseIdsResults("abc t-e_s.t : 12",3));
+        // multiple ids
+        ASSERT_EQUALS("d:1,d:2", polyspaceParseIdsResults("abc d:1,2",3));
+        ASSERT_EQUALS("d:1,d:2,e:3,e:4,f:6", polyspaceParseIdsResults("abc d:1,2 e: 3 , 4 f : 6 ",3));
+    }
+
+    struct PolyspaceComment {
+        std::string text;
+        int line;
+
+        PolyspaceComment(const std::string &&text, int line)
+            : text(text)
+            , line(line)
+        {}
+    };
+
+    struct PolyspaceParseResult {
+        std::string errorId;
+        int lineNumber;
+        std::string extraComment;
+        SuppressionList::Type type = SuppressionList::Type::unique;
+        int lineBegin = SuppressionList::Suppression::NO_LINE;
+        int lineEnd = SuppressionList::Suppression::NO_LINE;
+
+        PolyspaceParseResult(const std::string &&errorId,
+                             int lineNumber,
+                             const std::string &&extraComment = "",
+                             SuppressionList::Type type = SuppressionList::Type::unique,
+                             int lineBegin = SuppressionList::Suppression::NO_LINE,
+                             int lineEnd = SuppressionList::Suppression::NO_LINE)
+            : errorId(errorId)
+            , lineNumber(lineNumber)
+            , extraComment(extraComment)
+            , type(type)
+            , lineBegin(lineBegin)
+            , lineEnd(lineEnd)
+        {}
+    };
+
+    void testPolyspaceSuppression(const std::string& addon,
+                                  const std::string& premiumArgs,
+                                  const PolyspaceComment& comment,
+                                  std::initializer_list<PolyspaceParseResult> results) const
+    {
+        SuppressionList list;
+        Settings settings;
+        if (!addon.empty()) {
+            AddonInfo info;
+            info.name = addon;
+            settings.addonInfos.push_back(info);
+        }
+        settings.premiumArgs = premiumArgs;
+        polyspace::Parser parser(settings);
+
+        const std::string fileName = "file.c";
+        const auto supprs = parser.parse(comment.text, comment.line, fileName);
+
+        ASSERT_EQUALS(results.size(), supprs.size());
+
+        auto supprIt = supprs.cbegin();
+        const auto *resultIt = results.begin();
+
+        for (; supprIt != supprs.cend(); supprIt++, resultIt++) {
+            ASSERT(supprIt->isPolyspace);
+            ASSERT(supprIt->isInline);
+            ASSERT_EQUALS(fileName, supprIt->fileName);
+            ASSERT_EQUALS(resultIt->errorId, supprIt->errorId);
+            ASSERT_EQUALS(resultIt->extraComment, supprIt->extraComment);
+            ASSERT_EQUALS_ENUM(resultIt->type, supprIt->type);
+            ASSERT_EQUALS(resultIt->lineNumber, supprIt->lineNumber);
+            ASSERT_EQUALS(resultIt->lineBegin, supprIt->lineBegin);
+            ASSERT_EQUALS(resultIt->lineEnd, supprIt->lineEnd);
         }
     }
+
+    void polyspaceMisraC2012() const {
+        testPolyspaceSuppression(
+            "misra", "",
+            { "/* polyspace MISRA2012 : 2.7 */", 1 },
+            { { "misra-c2012-2.7", 1 } }
+            );
+    }
+
+    void polyspacePremiumMisraC2012() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1 } }
+            );
+    }
+
+    void polyspaceMisraC2023() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2023",
+            { "// polyspace MISRA-C-2023 : *", 2 },
+            { { "premium-misra-c-2023-*", 2 } }
+            );
+    }
+
+    void polyspaceMisraCpp2008() const {
+        testPolyspaceSuppression(
+            "", "--misra-cpp-2008",
+            { "// polyspace MISRA-CPP : 7-1-1", 1 },
+            { { "premium-misra-cpp-2008-7-1-1", 1 } }
+            );
+    }
+
+    void polyspaceMisraCpp2023() const {
+        testPolyspaceSuppression(
+            "", "--misra-cpp-2023",
+            { "// polyspace MISRA-CPP-2023 : 4.6.1", 1 },
+            { { "premium-misra-cpp-2023-4.6.1", 1 } }
+            );
+    }
+
+    void polyspaceCertC() const {
+        testPolyspaceSuppression(
+            "", "--cert-c",
+            { "// polyspace CERT-C : PRE30", 1 },
+            { { "premium-cert-c-PRE30", 1 } }
+            );
+    }
+
+    void polyspaceCertCpp() const {
+        testPolyspaceSuppression(
+            "", "--cert-cpp",
+            { "// polyspace CERT-CPP : CTR51", 1 },
+            { { "premium-cert-cpp-CTR51", 1 } }
+            );
+    }
+
+    void polyspaceAutosar() const {
+        testPolyspaceSuppression(
+            "", "--autosar",
+            { "// polyspace AUTOSAR-CPP14 : a2-10-1", 1 },
+            { { "premium-autosar-a2-10-1", 1 } }
+            );
+    }
+
+    void polyspaceIgnored() const {
+        testPolyspaceSuppression(
+            "", "",
+            { "// polyspace DEFECT : INT_OVFL AUTOSAR-CPP14 : a2-10-1", 1 },
+            {}
+            );
+    }
+
+    void polyspaceMultiple1() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace MISRA2012 : 2.7, 9.1 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1 },
+                { "premium-misra-c-2012-9.1", 1 } }
+            );
+    }
+
+    void polyspaceMultiple2() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012 --misra-cpp-2008",
+            { "/* polyspace MISRA2012 : 2.7 MISRA-CPP : 7-1-1 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1 },
+                { "premium-misra-cpp-2008-7-1-1", 1 } }
+            );
+    }
+
+    void polyspaceMultiple3() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012 --misra-cpp-2008",
+            { "/* polyspace MISRA2012 : 2.7 [Justified:Low] \"comment 1\" polyspace MISRA-CPP : 7-1-1 \"comment 2\"*/", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "comment 1" },
+                { "premium-misra-cpp-2008-7-1-1", 1, "comment 2" }, }
+            );
+    }
+
+    void polyspaceRange() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace +3 MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::block, 1, 4 } }
+            );
+    }
+
+    void polyspaceBlock() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace-begin MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::blockBegin } }
+            );
+
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace-end MISRA2012 : 2.7 */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::blockEnd } }
+            );
+
+    }
+
+    void polyspaceExtraComments() const {
+        testPolyspaceSuppression(
+            "", "--misra-c-2012 --misra-cpp-2008",
+            { "/* polyspace MISRA2012 : 2.7 MISRA-CPP : 7-1-1 \"comment 1\" polyspace MISRA2012 : 8.1, 8.3 \"comment 2\" */", 1 },
+            { { "premium-misra-c-2012-2.7", 1, "comment 1" },
+                { "premium-misra-cpp-2008-7-1-1", 1, "comment 1" },
+                { "premium-misra-c-2012-8.1", 1, "comment 2" },
+                { "premium-misra-c-2012-8.3", 1, "comment 2" }, }
+            );
+    }
 };
 
 REGISTER_TEST(TestSuppressions)
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index 809f2df64b2..dfb61665b8a 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -31,7 +31,6 @@
 #include <cstdint>
 #include <cstring>
 #include <iterator>
-#include <limits>
 #include <list>
 #include <set>
 #include <sstream>
@@ -164,6 +163,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(array);
         TEST_CASE(array_ptr);
         TEST_CASE(stlarray1);
@@ -204,6 +204,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(isVariableDeclarationRValueRef);
         TEST_CASE(isVariableDeclarationDoesNotIdentifyCase);
         TEST_CASE(isVariableDeclarationIf);
+        TEST_CASE(isVariableDeclarationSwitch);
         TEST_CASE(isVariableStlType);
         TEST_CASE(isVariablePointerToConstPointer);
         TEST_CASE(isVariablePointerToVolatilePointer);
@@ -220,6 +221,8 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(VariableValueType4); // smart pointer type
         TEST_CASE(VariableValueType5); // smart pointer type
         TEST_CASE(VariableValueType6); // smart pointer type
+        TEST_CASE(VariableValueType7);
+        TEST_CASE(VariableValueType8);
         TEST_CASE(VariableValueTypeReferences);
         TEST_CASE(VariableValueTypeTemplate);
 
@@ -231,6 +234,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(rangeBasedFor);
 
         TEST_CASE(memberVar1);
+        TEST_CASE(memberVar2);
         TEST_CASE(arrayMemberVar1);
         TEST_CASE(arrayMemberVar2);
         TEST_CASE(arrayMemberVar3);
@@ -303,6 +307,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(functionArgs19); // #10376
         TEST_CASE(functionArgs20);
         TEST_CASE(functionArgs21);
+        TEST_CASE(functionArgs22); // #13945
 
         TEST_CASE(functionImplicitlyVirtual);
         TEST_CASE(functionGetOverridden);
@@ -317,6 +322,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(namespaces2);
         TEST_CASE(namespaces3);  // #3854 - unknown macro
         TEST_CASE(namespaces4);
+        TEST_CASE(namespaces5); // #13967
         TEST_CASE(needInitialization);
 
         TEST_CASE(tryCatch1);
@@ -427,6 +433,8 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(symboldatabase109); // #13553
         TEST_CASE(symboldatabase110);
         TEST_CASE(symboldatabase111); // [[fallthrough]]
+        TEST_CASE(symboldatabase112); // explicit operator
+        TEST_CASE(symboldatabase113);
 
         TEST_CASE(createSymbolDatabaseFindAllScopes1);
         TEST_CASE(createSymbolDatabaseFindAllScopes2);
@@ -438,6 +446,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(createSymbolDatabaseFindAllScopes8); // #12761
         TEST_CASE(createSymbolDatabaseFindAllScopes9);
         TEST_CASE(createSymbolDatabaseFindAllScopes10);
+        TEST_CASE(createSymbolDatabaseFindAllScopes11);
 
         TEST_CASE(createSymbolDatabaseIncompleteVars);
 
@@ -460,6 +469,9 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(enum17);
         TEST_CASE(enum18);
         TEST_CASE(enum19);
+        TEST_CASE(enum20); // #14419
+
+        TEST_CASE(struct1);
 
         TEST_CASE(sizeOfType);
 
@@ -530,6 +542,10 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(findFunction58); // #13310
         TEST_CASE(findFunction59);
         TEST_CASE(findFunction60);
+        TEST_CASE(findFunction61);
+        TEST_CASE(findFunction62); // #14272 - pointer passed to function is const
+        TEST_CASE(findFunction63); // #14937 - member function of type returned by operator()
+        TEST_CASE(findFunction64); // overloaded operator()
         TEST_CASE(findFunctionRef1);
         TEST_CASE(findFunctionRef2); // #13328
         TEST_CASE(findFunctionContainer);
@@ -577,6 +593,8 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(valueType2);
         TEST_CASE(valueType3);
         TEST_CASE(valueTypeThis);
+        TEST_CASE(valueTypeChar);
+        TEST_CASE(valueTypeRValueReference);
 
         TEST_CASE(variadic1); // #7453
         TEST_CASE(variadic2); // #7649
@@ -617,10 +635,16 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(dumpFriend); // Check if isFriend added to dump file
 
         TEST_CASE(smartPointerLookupCtor); // #13719);
+
+        TEST_CASE(stdintFunction);
+
+        TEST_CASE(userDefinedLiteral);
+
+        TEST_CASE(dumpValueNegative);  // #14735 - dumping negative impossible value for unsigned expression
     }
 
     void array() {
-        GET_SYMBOL_DB_C("int a[10+2];");
+        GET_SYMBOL_DB_C("int a[10+2];\n");
         ASSERT(db != nullptr);
 
         ASSERT(db->variableList().size() == 2); // the first one is not used
@@ -634,7 +658,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void array_ptr() {
         GET_SYMBOL_DB("const char* a[] = { \"abc\" };\n"
-                      "const char* b[] = { \"def\", \"ghijkl\" };");
+                      "const char* b[] = { \"def\", \"ghijkl\" };\n");
         ASSERT(db != nullptr);
 
         ASSERT(db->variableList().size() == 3); // the first one is not used
@@ -656,7 +680,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void stlarray1() {
-        GET_SYMBOL_DB("std::array<int, 16 + 4> arr;");
+        GET_SYMBOL_DB("std::array<int, 16 + 4> arr;\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(2, db->variableList().size()); // the first one is not used
@@ -669,7 +693,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void stlarray2() {
-        GET_SYMBOL_DB("constexpr int sz = 16; std::array<int, sz + 4> arr;");
+        GET_SYMBOL_DB("constexpr int sz = 16; std::array<int, sz + 4> arr;\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(3, db->variableList().size()); // the first one is not used
@@ -734,7 +758,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationCanHandleNull() {
         reset();
-        GET_SYMBOL_DB("void main(){}");
+        GET_SYMBOL_DB("void main(){}\n");
         const bool result = db->scopeList.front().isVariableDeclaration(nullptr, vartok, typetok);
         ASSERT_EQUALS(false, result);
         ASSERT(nullptr == vartok);
@@ -744,7 +768,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesSimpleDeclaration() {
         reset();
-        GET_SYMBOL_DB("int x;");
+        GET_SYMBOL_DB("int x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -757,7 +781,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesInitialization() {
         reset();
-        GET_SYMBOL_DB("int x (1);");
+        GET_SYMBOL_DB("int x (1);\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -770,7 +794,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesCpp11Initialization() {
         reset();
-        GET_SYMBOL_DB("int x {1};");
+        GET_SYMBOL_DB("int x {1};\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -783,7 +807,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesScopedDeclaration() {
         reset();
-        GET_SYMBOL_DB("::int x;");
+        GET_SYMBOL_DB("::int x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -796,7 +820,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesStdDeclaration() {
         reset();
-        GET_SYMBOL_DB("std::string x;");
+        GET_SYMBOL_DB("std::string x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -809,7 +833,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesScopedStdDeclaration() {
         reset();
-        GET_SYMBOL_DB("::std::string x;");
+        GET_SYMBOL_DB("::std::string x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -822,7 +846,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesManyScopes() {
         reset();
-        GET_SYMBOL_DB("AA::BB::CC::DD::EE x;");
+        GET_SYMBOL_DB("AA::BB::CC::DD::EE x;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
@@ -836,7 +860,7 @@ class TestSymbolDatabase : public TestFixture {
     void test_isVariableDeclarationIdentifiesPointers() {
         {
             reset();
-            GET_SYMBOL_DB("int* p;");
+            GET_SYMBOL_DB("int* p;\n");
             const bool result1 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result1);
             ASSERT_EQUALS("p", vartok->str());
@@ -849,7 +873,7 @@ class TestSymbolDatabase : public TestFixture {
         {
             reset();
             SimpleTokenizer constpointer(*this);
-            ASSERT(constpointer.tokenize("const int* p;"));
+            ASSERT(constpointer.tokenize("const int* p;\n"));
             Variable v2(constpointer.tokens()->tokAt(3), constpointer.tokens()->next(), constpointer.tokens()->tokAt(2), 0, AccessControl::Public, nullptr, nullptr, settings1);
             ASSERT(false == v2.isArray());
             ASSERT(true == v2.isPointer());
@@ -858,7 +882,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("int* const p;");
+            GET_SYMBOL_DB("int* const p;\n");
             const bool result2 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result2);
             ASSERT_EQUALS("p", vartok->str());
@@ -876,7 +900,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void slurpInManifest() {\n"
                       "  std::string tmpiostring(*tI);\n"
                       "  if(tmpiostring==\"infoonly\"){}\n"
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "tmpiostring ==");
         ASSERT(tok->variable());
@@ -885,7 +909,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationDoesNotIdentifyConstness() {
         reset();
-        GET_SYMBOL_DB("const int* cp;");
+        GET_SYMBOL_DB("const int* cp;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(false, result);
         ASSERT(nullptr == vartok);
@@ -894,7 +918,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesFirstOfManyVariables() {
         reset();
-        GET_SYMBOL_DB("int first, second;");
+        GET_SYMBOL_DB("int first, second;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("first", vartok->str());
@@ -907,7 +931,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesScopedPointerDeclaration() {
         reset();
-        GET_SYMBOL_DB("AA::BB::CC::DD::EE* p;");
+        GET_SYMBOL_DB("AA::BB::CC::DD::EE* p;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("p", vartok->str());
@@ -920,7 +944,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesDeclarationWithIndirection() {
         reset();
-        GET_SYMBOL_DB("int** pp;");
+        GET_SYMBOL_DB("int** pp;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("pp", vartok->str());
@@ -933,7 +957,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesDeclarationWithMultipleIndirection() {
         reset();
-        GET_SYMBOL_DB("int***** p;");
+        GET_SYMBOL_DB("int***** p;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("p", vartok->str());
@@ -946,7 +970,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesArray() {
         reset();
-        GET_SYMBOL_DB("::std::string v[3];");
+        GET_SYMBOL_DB("::std::string v[3];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("v", vartok->str());
@@ -960,7 +984,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesPointerArray() {
         reset();
-        GET_SYMBOL_DB("A *a[5];");
+        GET_SYMBOL_DB("A *a[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -975,7 +999,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesOfArrayPointers1() {
         reset();
-        GET_SYMBOL_DB("A (*a)[5];");
+        GET_SYMBOL_DB("A (*a)[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -990,7 +1014,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesOfArrayPointers2() {
         reset();
-        GET_SYMBOL_DB("A (*const a)[5];");
+        GET_SYMBOL_DB("A (*const a)[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -1005,7 +1029,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesOfArrayPointers3() {
         reset();
-        GET_SYMBOL_DB("A (** a)[5];");
+        GET_SYMBOL_DB("A (** a)[5];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -1020,7 +1044,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void test_isVariableDeclarationIdentifiesArrayOfFunctionPointers() {
         reset();
-        GET_SYMBOL_DB("int (*a[])(int) = { g };"); // #11596
+        GET_SYMBOL_DB("int (*a[])(int) = { g };\n"); // #11596
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
@@ -1036,7 +1060,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedPointerVariable() {
         reset();
-        GET_SYMBOL_DB("std::set<char>* chars;");
+        GET_SYMBOL_DB("std::set<char>* chars;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("chars", vartok->str());
@@ -1049,7 +1073,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedPointerToPointerVariable() {
         reset();
-        GET_SYMBOL_DB("std::deque<int>*** ints;");
+        GET_SYMBOL_DB("std::deque<int>*** ints;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
@@ -1062,7 +1086,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedArrayVariable() {
         reset();
-        GET_SYMBOL_DB("std::deque<int> ints[3];");
+        GET_SYMBOL_DB("std::deque<int> ints[3];\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
@@ -1075,7 +1099,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedVariable() {
         reset();
-        GET_SYMBOL_DB("std::vector<int> ints;");
+        GET_SYMBOL_DB("std::vector<int> ints;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
@@ -1088,7 +1112,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesTemplatedVariableIterator() {
         reset();
-        GET_SYMBOL_DB("std::list<int>::const_iterator floats;");
+        GET_SYMBOL_DB("std::list<int>::const_iterator floats;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("floats", vartok->str());
@@ -1101,7 +1125,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationIdentifiesNestedTemplateVariable() {
         reset();
-        GET_SYMBOL_DB("std::deque<std::set<int> > intsets;");
+        GET_SYMBOL_DB("std::deque<std::set<int> > intsets;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("intsets", vartok->str());
@@ -1115,7 +1139,7 @@ class TestSymbolDatabase : public TestFixture {
     void isVariableDeclarationIdentifiesReference() {
         {
             reset();
-            GET_SYMBOL_DB("int& foo;");
+            GET_SYMBOL_DB("int& foo;\n");
             const bool result1 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result1);
             Variable v1(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1125,7 +1149,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("foo*& bar;");
+            GET_SYMBOL_DB("foo*& bar;\n");
             const bool result2 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result2);
             Variable v2(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1135,7 +1159,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("std::vector<int>& foo;");
+            GET_SYMBOL_DB("std::vector<int>& foo;\n");
             const bool result3 = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result3);
             Variable v3(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1147,21 +1171,21 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationDoesNotIdentifyTemplateClass() {
         reset();
-        GET_SYMBOL_DB("template <class T> class SomeClass{};");
+        GET_SYMBOL_DB("template <class T> class SomeClass{};\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(false, result);
     }
 
     void isVariableDeclarationDoesNotIdentifyCppCast() {
         reset();
-        GET_SYMBOL_DB("reinterpret_cast <char *> (code)[0] = 0;");
+        GET_SYMBOL_DB("reinterpret_cast <char *> (code)[0] = 0;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(false, result);
     }
 
     void isVariableDeclarationPointerConst() {
         reset();
-        GET_SYMBOL_DB("std::string const* s;");
+        GET_SYMBOL_DB("std::string const* s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens()->next(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1172,7 +1196,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableDeclarationRValueRef() {
         reset();
-        GET_SYMBOL_DB("int&& i;");
+        GET_SYMBOL_DB("int&& i;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1188,8 +1212,8 @@ class TestSymbolDatabase : public TestFixture {
                         "void f() {\n"
                         "  switch (c) {\n"
                         "    case b:;\n"
-                        "  }"
-                        "}");
+                        "  }\n"
+                        "}\n");
         const Variable* b = db->getVariableFromVarId(1);
         ASSERT_EQUALS("b", b->name());
         ASSERT_EQUALS("a", b->typeStartToken()->str());
@@ -1200,7 +1224,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    for (auto& elem : items) {\n"
                       "        if (auto x = bar()) { int y = 3; }\n"
                       "    }\n"
-                      "}");
+                      "}\n");
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(x);
         ASSERT(x->varId());
@@ -1212,9 +1236,20 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(y->variable());
     }
 
+    void isVariableDeclarationSwitch() {
+        GET_SYMBOL_DB("void foo(void) {\n"
+                      "    int x = 0;\n"
+                      "    switch (auto &s = x) {}\n"
+                      "}\n");
+        const Token *s = Token::findsimplematch(tokenizer.tokens(), "s");
+        ASSERT(s);
+        ASSERT(s->varId());
+        ASSERT(s->variable());
+    }
+
     void VariableValueType1() {
         GET_SYMBOL_DB("typedef uint8_t u8;\n"
-                      "static u8 x;");
+                      "static u8 x;\n");
         const Variable* x = db->getVariableFromVarId(1);
         ASSERT_EQUALS("x", x->name());
         ASSERT(x->valueType()->isIntegral());
@@ -1222,7 +1257,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void VariableValueType2() {
         GET_SYMBOL_DB("using u8 = uint8_t;\n"
-                      "static u8 x;");
+                      "static u8 x;\n");
         const Variable* x = db->getVariableFromVarId(1);
         ASSERT_EQUALS("x", x->name());
         ASSERT(x->valueType()->isIntegral());
@@ -1231,7 +1266,7 @@ class TestSymbolDatabase : public TestFixture {
     void VariableValueType3() {
         // std::string::size_type
         {
-            GET_SYMBOL_DB("void f(std::string::size_type x);");
+            GET_SYMBOL_DB("void f(std::string::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::string::size_type somehow.
@@ -1240,7 +1275,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         // std::wstring::size_type
         {
-            GET_SYMBOL_DB("void f(std::wstring::size_type x);");
+            GET_SYMBOL_DB("void f(std::wstring::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::wstring::size_type somehow.
@@ -1249,7 +1284,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         // std::u16string::size_type
         {
-            GET_SYMBOL_DB("void f(std::u16string::size_type x);");
+            GET_SYMBOL_DB("void f(std::u16string::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::u16string::size_type somehow.
@@ -1258,7 +1293,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         // std::u32string::size_type
         {
-            GET_SYMBOL_DB("void f(std::u32string::size_type x);");
+            GET_SYMBOL_DB("void f(std::u32string::size_type x);\n");
             const Variable* const x = db->getVariableFromVarId(1);
             ASSERT_EQUALS("x", x->name());
             // TODO: Configure std::u32string::size_type somehow.
@@ -1271,7 +1306,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("class C {\n"
                       "public:\n"
                       "  std::shared_ptr<C> x;\n"
-                      "};");
+                      "};\n");
 
         const Variable* const x = db->getVariableFromVarId(1);
         ASSERT(x->valueType());
@@ -1280,7 +1315,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void VariableValueType5() {
         GET_SYMBOL_DB("class C {};\n"
-                      "void foo(std::shared_ptr<C>* p) {}");
+                      "void foo(std::shared_ptr<C>* p) {}\n");
 
         const Variable* const p = db->getVariableFromVarId(1);
         ASSERT(p->valueType());
@@ -1290,7 +1325,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void VariableValueType6() {
         GET_SYMBOL_DB("struct Data{};\n"
-                      "void foo() { std::unique_ptr<Data> data = std::unique_ptr<Data>(new Data); }");
+                      "void foo() { std::unique_ptr<Data> data = std::unique_ptr<Data>(new Data); }\n");
 
         const Token* check = Token::findsimplematch(tokenizer.tokens(), "( new");
         ASSERT(check);
@@ -1298,6 +1333,71 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(check->valueType()->smartPointerTypeToken);
     }
 
+    void VariableValueType7() {
+        GET_SYMBOL_DB("void f() {\n"
+                      "    auto x0 = 0;\n"
+                      "    auto &x1 = x0;\n"
+                      "    auto &x2 {x0};\n"
+                      "    auto &&x3 = 0;\n"
+                      "    auto &&x4 {0};\n"
+                      "}\n");
+
+        const Token* x1 = Token::findsimplematch(tokenizer.tokens(), "x1");
+        const Token* x2 = Token::findsimplematch(tokenizer.tokens(), "x2");
+        const Token* x3 = Token::findsimplematch(tokenizer.tokens(), "x3");
+        const Token* x4 = Token::findsimplematch(tokenizer.tokens(), "x4");
+
+        ASSERT(x1);
+        ASSERT(x2);
+        ASSERT(x3);
+        ASSERT(x4);
+
+        ASSERT_EQUALS_ENUM(ValueType::INT, x1->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::INT, x2->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::INT, x3->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::INT, x4->valueType()->type);
+
+        ASSERT_EQUALS_ENUM(Reference::LValue, x1->valueType()->reference);
+        ASSERT_EQUALS_ENUM(Reference::LValue, x2->valueType()->reference);
+        ASSERT_EQUALS_ENUM(Reference::RValue, x3->valueType()->reference);
+        ASSERT_EQUALS_ENUM(Reference::RValue, x4->valueType()->reference);
+    }
+
+    void VariableValueType8() {
+        GET_SYMBOL_DB("void f() {\n"
+                      "    char buf[128];\n"
+                      "    const auto *const x0 {buf};\n"
+                      "    auto *const x1 {buf};\n"
+                      "    const auto *x2 {buf};\n"
+                      "    auto x3 {buf};\n"
+                      "}\n");
+
+        const Token* x0 = Token::findsimplematch(tokenizer.tokens(), "x0");
+        const Token* x1 = Token::findsimplematch(tokenizer.tokens(), "x1");
+        const Token* x2 = Token::findsimplematch(tokenizer.tokens(), "x2");
+        const Token* x3 = Token::findsimplematch(tokenizer.tokens(), "x3");
+
+        ASSERT(x0);
+        ASSERT(x1);
+        ASSERT(x2);
+        ASSERT(x3);
+
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x0->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x1->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x2->valueType()->type);
+        ASSERT_EQUALS_ENUM(ValueType::CHAR, x3->valueType()->type);
+
+        ASSERT_EQUALS(3, x0->valueType()->constness);
+        ASSERT_EQUALS(1, x1->valueType()->constness);
+        ASSERT_EQUALS(2, x2->valueType()->constness);
+        ASSERT_EQUALS(0, x3->valueType()->constness);
+
+        ASSERT_EQUALS(1, x0->valueType()->pointer);
+        ASSERT_EQUALS(1, x1->valueType()->pointer);
+        ASSERT_EQUALS(1, x2->valueType()->pointer);
+        ASSERT_EQUALS(1, x3->valueType()->pointer);
+    }
+
     void VariableValueTypeReferences() {
         {
             GET_SYMBOL_DB("void foo(int x) {}\n");
@@ -1533,7 +1633,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    struct A::B b;\n"
                       "    b.x = 1;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
 
         const Variable* bvar = db->getVariableFromVarId(1);
@@ -1559,7 +1659,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    struct B::C c;\n"
                       "    c.x = 1;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
 
         const Variable* cvar = db->getVariableFromVarId(3);
@@ -1579,7 +1679,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    struct A a;\n"
                       "    a.x = 1;\n"
-                      "}");
+                      "}\n");
         (void)db;
         const Variable* avar = Token::findsimplematch(tokenizer.tokens(), "a")->variable();
         ASSERT(avar);
@@ -1590,7 +1690,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("extern \"C\" { typedef int INT; }\n"
                       "void bar() {\n"
                       "    INT x = 3;\n"
-                      "}");
+                      "}\n");
         (void)db;
         const Variable* avar = Token::findsimplematch(tokenizer.tokens(), "x")->variable();
         ASSERT(avar);
@@ -1602,7 +1702,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void reset() {\n"
                       "    for(auto& e : array)\n"
                       "        foo(e);\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -1615,7 +1715,7 @@ class TestSymbolDatabase : public TestFixture {
     void isVariableStlType() {
         {
             reset();
-            GET_SYMBOL_DB("std::string s;");
+            GET_SYMBOL_DB("std::string s;\n");
             const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result);
             Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1628,7 +1728,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("std::vector<int> v;");
+            GET_SYMBOL_DB("std::vector<int> v;\n");
             const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result);
             Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1641,7 +1741,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             reset();
-            GET_SYMBOL_DB("SomeClass s;");
+            GET_SYMBOL_DB("SomeClass s;\n");
             const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
             ASSERT_EQUALS(true, result);
             Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1654,7 +1754,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariablePointerToConstPointer() {
         reset();
-        GET_SYMBOL_DB("char* const * s;");
+        GET_SYMBOL_DB("char* const * s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1665,7 +1765,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariablePointerToVolatilePointer() {
         reset();
-        GET_SYMBOL_DB("char* volatile * s;");
+        GET_SYMBOL_DB("char* volatile * s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1676,7 +1776,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariablePointerToConstVolatilePointer() {
         reset();
-        GET_SYMBOL_DB("char* const volatile * s;");
+        GET_SYMBOL_DB("char* const volatile * s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1687,7 +1787,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void isVariableMultiplePointersAndQualifiers() {
         reset();
-        GET_SYMBOL_DB("const char* const volatile * const volatile * const volatile * const volatile s;");
+        GET_SYMBOL_DB("const char* const volatile * const volatile * const volatile * const volatile s;\n");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens()->next(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
@@ -1698,7 +1798,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void variableVolatile() {
         GET_SYMBOL_DB("std::atomic<int> x;\n"
-                      "volatile int y;");
+                      "volatile int y;\n");
 
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(x);
@@ -1712,7 +1812,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void variableConstexpr() {
-        GET_SYMBOL_DB("constexpr int x = 16;");
+        GET_SYMBOL_DB("constexpr int x = 16;\n");
 
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(x);
@@ -1769,7 +1869,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Bar bar;\n"
                       "    bar.x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "x =");
@@ -1777,6 +1877,22 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(Token::simpleMatch(tok->variable()->typeStartToken(), "int x ;"));
     }
 
+    void memberVar2() {
+        GET_SYMBOL_DB( "struct S { void (*fp)(); };\n"
+                       "void g();\n"
+                       "void f() {\n"
+                       "    S s;\n"
+                       "    s.fp = g;\n"
+                       "    s.fp();\n"
+                       "}\n");
+
+        ASSERT(db != nullptr);
+        const Token *fp1 = Token::findsimplematch(tokenizer.tokens(), "fp =");
+        const Token *fp2 = Token::findsimplematch(tokenizer.tokens(), "fp (");
+        ASSERT(fp1->varId());
+        ASSERT_EQUALS(fp2->varId(), fp1->varId());
+    }
+
     void arrayMemberVar1() {
         GET_SYMBOL_DB("struct Foo {\n"
                       "    int x;\n"
@@ -1784,7 +1900,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Foo foo[10];\n"
                       "    foo[1].x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), ". x");
         tok = tok ? tok->next() : nullptr;
@@ -1800,7 +1916,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Foo foo[10][10];\n"
                       "    foo[1][2].x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), ". x");
         tok = tok ? tok->next() : nullptr;
@@ -1816,7 +1932,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "    struct Foo foo[10];\n"
                       "    (foo[1]).x = 123;\n"  // <- x should get a variable() pointer
-                      "}");
+                      "}\n");
 
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), ". x");
         tok = tok ? tok->next() : nullptr;
@@ -1842,7 +1958,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("class Foo {\n"
                       "    static const double d;\n"
                       "};\n"
-                      "const double Foo::d = 5.0;");
+                      "const double Foo::d = 5.0;\n");
 
         const Variable* v = db->getVariableFromVarId(1);
         ASSERT(v && db->variableList().size() == 2);
@@ -1851,7 +1967,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void getVariableFromVarIdBoundsCheck() {
         GET_SYMBOL_DB("int x;\n"
-                      "int y;");
+                      "int y;\n");
 
         const Variable* v = db->getVariableFromVarId(2);
         // three elements: varId 0 also counts via a fake-entry
@@ -1859,16 +1975,16 @@ class TestSymbolDatabase : public TestFixture {
 
         // TODO: we should provide our own error message
 #ifdef _MSC_VER
-        ASSERT_THROW_EQUALS_2(db->getVariableFromVarId(3), std::out_of_range, "invalid vector subscript");
+        ASSERT_THROW_EQUALS(db->getVariableFromVarId(3), std::out_of_range, "invalid vector subscript");
 #elif !defined(_LIBCPP_VERSION)
-        ASSERT_THROW_EQUALS_2(db->getVariableFromVarId(3), std::out_of_range, "vector::_M_range_check: __n (which is 3) >= this->size() (which is 3)");
+        ASSERT_THROW_EQUALS(db->getVariableFromVarId(3), std::out_of_range, "vector::_M_range_check: __n (which is 3) >= this->size() (which is 3)");
 #else
-        ASSERT_THROW_EQUALS_2(db->getVariableFromVarId(3), std::out_of_range, "vector");
+        ASSERT_THROW_EQUALS(db->getVariableFromVarId(3), std::out_of_range, "vector");
 #endif
     }
 
     void hasRegularFunction() {
-        GET_SYMBOL_DB("void func() { }");
+        GET_SYMBOL_DB("void func() { }\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2);
@@ -1889,7 +2005,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasRegularFunction_trailingReturnType() {
-        GET_SYMBOL_DB("auto func() -> int { }");
+        GET_SYMBOL_DB("auto func() -> int { }\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2);
@@ -1910,7 +2026,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasInlineClassFunction() {
-        GET_SYMBOL_DB("class Fred { void func() { } };");
+        GET_SYMBOL_DB("class Fred { void func() { } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -1937,7 +2053,7 @@ class TestSymbolDatabase : public TestFixture {
 
 
     void hasInlineClassFunction_trailingReturnType() {
-        GET_SYMBOL_DB("class Fred { auto func() -> int { } };");
+        GET_SYMBOL_DB("class Fred { auto func() -> int { } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -1963,7 +2079,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasMissingInlineClassFunction() {
-        GET_SYMBOL_DB("class Fred { void func(); };");
+        GET_SYMBOL_DB("class Fred { void func(); };\n");
 
         // 2 scopes: Global and Class (no Function scope because there is no function implementation)
         ASSERT(db && db->scopeList.size() == 2);
@@ -1982,7 +2098,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasInlineClassOperatorTemplate() {
-        GET_SYMBOL_DB("struct Fred { template<typename T> Foo & operator=(const Foo &) { return *this; } };");
+        GET_SYMBOL_DB("struct Fred { template<typename T> Foo & operator=(const Foo &) { return *this; } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2008,7 +2124,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasClassFunction() {
-        GET_SYMBOL_DB("class Fred { void func(); }; void Fred::func() { }");
+        GET_SYMBOL_DB("class Fred { void func(); }; void Fred::func() { }\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2030,7 +2146,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasClassFunction_trailingReturnType() {
-        GET_SYMBOL_DB("class Fred { auto func() -> int; }; auto Fred::func() -> int { }");
+        GET_SYMBOL_DB("class Fred { auto func() -> int; }; auto Fred::func() -> int { }\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2053,7 +2169,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void hasClassFunction_decltype_auto()
     {
-        GET_SYMBOL_DB("struct d { decltype(auto) f() {} };");
+        GET_SYMBOL_DB("struct d { decltype(auto) f() {} };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2074,7 +2190,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasRegularFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("void (*func(int f))(char) { }");
+        GET_SYMBOL_DB("void (*func(int f))(char) { }\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2);
@@ -2093,7 +2209,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasInlineClassFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("class Fred { void (*func(int f))(char) { } };");
+        GET_SYMBOL_DB("class Fred { void (*func(int f))(char) { } };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2112,7 +2228,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasMissingInlineClassFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); };");
+        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); };\n");
 
         // 2 scopes: Global and Class (no Function scope because there is no function implementation)
         ASSERT(db && db->scopeList.size() == 2);
@@ -2131,7 +2247,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasClassFunctionReturningFunctionPointer() {
-        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); }; void (*Fred::func(int f))(char) { }");
+        GET_SYMBOL_DB("class Fred { void (*func(int f))(char); }; void (*Fred::func(int f))(char) { }\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2150,7 +2266,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void methodWithRedundantScope() {
-        GET_SYMBOL_DB("class Fred { void Fred::func() {} };");
+        GET_SYMBOL_DB("class Fred { void Fred::func() {} };\n");
 
         // 3 scopes: Global, Class, and Function
         ASSERT(db && db->scopeList.size() == 3);
@@ -2178,7 +2294,7 @@ class TestSymbolDatabase : public TestFixture {
                       "float(*(*a2[10])(char))(long);\n"            // array 10 of pointer to func (char) returning pointer to func (long) returning float
                       "short(*(*(*a3[10])(char))(long))(double);\n" // array 10 of pointer to function (char) returning pointer to function (long) returning pointer to function (double) returning short
                       "::boost::rational(&r_)[9];\n"                // reference to array of ::boost::rational
-                      "::boost::rational<T>(&r_)[9];");             // reference to array of ::boost::rational<T> (template!)
+                      "::boost::rational<T>(&r_)[9];\n");             // reference to array of ::boost::rational<T> (template!)
 
         ASSERT(db != nullptr);
 
@@ -2198,7 +2314,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void pointerToMemberFunction() {
-        GET_SYMBOL_DB("bool (A::*pFun)();"); // Pointer to member function of A, returning bool and taking no parameters
+        GET_SYMBOL_DB("bool (A::*pFun)();\n"); // Pointer to member function of A, returning bool and taking no parameters
 
         ASSERT(db != nullptr);
 
@@ -2210,7 +2326,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasSubClassConstructor() {
-        GET_SYMBOL_DB("class Foo { class Sub; }; class Foo::Sub { Sub() {} };");
+        GET_SYMBOL_DB("class Foo { class Sub; }; class Foo::Sub { Sub() {} };\n");
         ASSERT(db != nullptr);
 
         bool seen_something = false;
@@ -2227,73 +2343,73 @@ class TestSymbolDatabase : public TestFixture {
 
     void testConstructors() {
         {
-            GET_SYMBOL_DB("class Foo { Foo(); };");
+            GET_SYMBOL_DB("class Foo { Foo(); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor && !ctor->isExplicit());
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { explicit Foo(Foo f); };");
+            GET_SYMBOL_DB("class Foo { explicit Foo(Foo f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(4)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor && ctor->isExplicit());
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Bar& f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Bar& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo& f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(const Foo &f); };");
+            GET_SYMBOL_DB("class Foo { Foo(const Foo &f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("template <T> class Foo { Foo(Foo<T>& f); };");
+            GET_SYMBOL_DB("template <T> class Foo { Foo(Foo<T>& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(7)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo& f, int default = 0); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo& f, int default = 0); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo& f, char noDefault); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo& f, char noDefault); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo&& f); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo&& f); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eMoveConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("class Foo { Foo(Foo&& f, int default = 1, bool defaultToo = true); };");
+            GET_SYMBOL_DB("class Foo { Foo(Foo&& f, int default = 1, bool defaultToo = true); };\n");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
             ASSERT(db && ctor && ctor->type == FunctionType::eMoveConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
-            GET_SYMBOL_DB("void f() { extern void f(); }");
+            GET_SYMBOL_DB("void f() { extern void f(); }\n");
             ASSERT(db && db->scopeList.size() == 2);
             const Function* f = findFunctionByName("f", &db->scopeList.back());
             ASSERT(f && f->type == FunctionType::eFunction);
@@ -2301,7 +2417,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionDeclarationTemplate() {
-        GET_SYMBOL_DB("std::map<int, string> foo() {}");
+        GET_SYMBOL_DB("std::map<int, string> foo() {}\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2 && findFunctionByName("foo", &db->scopeList.back()));
@@ -2317,7 +2433,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionDeclarations() {
-        GET_SYMBOL_DB("void foo();\nvoid foo();\nint foo(int i);\nvoid foo() {}");
+        GET_SYMBOL_DB("void foo();\nvoid foo();\nint foo(int i);\nvoid foo() {}\n");
 
         // 2 scopes: Global and Function
         ASSERT(db && db->scopeList.size() == 2 && findFunctionByName("foo", &db->scopeList.back()));
@@ -2342,7 +2458,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionDeclarations2() {
-        GET_SYMBOL_DB("std::array<int,2> foo(int x);");
+        GET_SYMBOL_DB("std::array<int,2> foo(int x);\n");
 
         // 1 scopes: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2363,7 +2479,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void constexprFunction() {
-        GET_SYMBOL_DB("constexpr int foo();");
+        GET_SYMBOL_DB("constexpr int foo();\n");
 
         // 1 scopes: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2382,7 +2498,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void constructorInitialization() {
         GET_SYMBOL_DB("std::string logfile;\n"
-                      "std::ofstream log(logfile.c_str(), std::ios::out);");
+                      "std::ofstream log(logfile.c_str(), std::ios::out);\n");
 
         // 1 scope: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2396,7 +2512,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void ScVbaValidation::getFormula1() {\n"
                       "    sal_uInt16 nFlags = 0;\n"
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2410,7 +2526,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void getFormula1() {\n"
                       "    sal_uInt16 nFlags = 0;\n"
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2428,7 +2544,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void ScVbaValidation::getFormula1() {\n"
                       "    sal_uInt16 nFlags = 0;\n"
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2443,7 +2559,7 @@ class TestSymbolDatabase : public TestFixture {
                       "extern void f3();\n"
                       "void f4();\n"
                       "extern void f5() { };\n"
-                      "void f6() { }");
+                      "void f6() { }\n");
 
         ASSERT(db && errout_str().empty());
 
@@ -2497,7 +2613,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void classWithFriend() {
-        GET_SYMBOL_DB("class Foo {}; class Bar1 { friend class Foo; }; class Bar2 { friend Foo; };");
+        GET_SYMBOL_DB("class Foo {}; class Bar1 { friend class Foo; }; class Bar2 { friend Foo; };\n");
         // 3 scopes: Global, 3 classes
         ASSERT(db && db->scopeList.size() == 4);
 
@@ -2514,7 +2630,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void parseFunctionCorrect() {
         // ticket 3188 - "if" statement parsed as function
-        GET_SYMBOL_DB("void func(i) int i; { if (i == 1) return; }");
+        GET_SYMBOL_DB("void func(i) int i; { if (i == 1) return; }\n");
         ASSERT(db != nullptr);
 
         // 3 scopes: Global, function, if
@@ -2527,7 +2643,7 @@ class TestSymbolDatabase : public TestFixture {
     void parseFunctionDeclarationCorrect() {
         GET_SYMBOL_DB("void func();\n"
                       "int bar() {}\n"
-                      "void func() {}");
+                      "void func() {}\n");
         ASSERT_EQUALS(3, db->findScopeByName("func")->bodyStart->linenr());
     }
 
@@ -2536,12 +2652,12 @@ class TestSymbolDatabase : public TestFixture {
                       "    std::vector<std::string> bar;\n"
                       "    Foo() : bar({\"a\", \"b\"})\n"
                       "    {}\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS(4, db->scopeList.front().nestedList.front()->nestedList.front()->bodyStart->linenr());
     }
 
     void hasGlobalVariables1() {
-        GET_SYMBOL_DB("int i;");
+        GET_SYMBOL_DB("int i;\n");
 
         ASSERT(db && db->scopeList.size() == 1);
 
@@ -2553,7 +2669,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasGlobalVariables2() {
-        GET_SYMBOL_DB("int array[2][2];");
+        GET_SYMBOL_DB("int array[2][2];\n");
 
         ASSERT(db && db->scopeList.size() == 1);
 
@@ -2566,7 +2682,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void hasGlobalVariables3() {
-        GET_SYMBOL_DB("int array[2][2] = { { 0, 0 }, { 0, 0 } };");
+        GET_SYMBOL_DB("int array[2][2] = { { 0, 0 }, { 0, 0 } };\n");
 
         ASSERT(db && db->scopeList.size() == 1);
 
@@ -2583,7 +2699,7 @@ class TestSymbolDatabase : public TestFixture {
                       "static const std::string j;\n"
                       "const std::string* k;\n"
                       "const char m[];\n"
-                      "void f(const char* const l) {}");
+                      "void f(const char* const l) {}\n");
 
         ASSERT(db && db->variableList().size() == 6 && db->getVariableFromVarId(1) && db->getVariableFromVarId(2) && db->getVariableFromVarId(3) && db->getVariableFromVarId(4) && db->getVariableFromVarId(5));
 
@@ -2612,12 +2728,12 @@ class TestSymbolDatabase : public TestFixture {
                       "    if (Diags.hasErrorOccurred())\n"
                       "      return;\n"
                       "  }\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("DiagnosticsEngine", db->getVariableFromVarId(1)->typeStartToken()->str());
     }
 
     void checkTypeStartEndToken3() {
-        GET_SYMBOL_DB("void f(const char) {}");
+        GET_SYMBOL_DB("void f(const char) {}\n");
 
         ASSERT(db && db->functionScopes.size()==1U);
 
@@ -2646,7 +2762,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void functionArgs1() {
         {
-            GET_SYMBOL_DB("void f(std::vector<std::string>, const std::vector<int> & v) { }");
+            GET_SYMBOL_DB("void f(std::vector<std::string>, const std::vector<int> & v) { }\n");
             ASSERT_EQUALS(1+1, db->variableList().size());
             const Variable* v = db->getVariableFromVarId(1);
             ASSERT(v && v->isReference() && v->isConst() && v->isArgument());
@@ -2657,7 +2773,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(std::map<std::string, std::vector<int> > m) { }");
+            GET_SYMBOL_DB("void g(std::map<std::string, std::vector<int> > m) { }\n");
             ASSERT_EQUALS(1+1, db->variableList().size());
             const Variable* m = db->getVariableFromVarId(1);
             ASSERT(m && !m->isReference() && !m->isConst() && m->isArgument() && m->isClass());
@@ -2666,25 +2782,25 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(std::map<int, int> m = std::map<int, int>()) { }");
+            GET_SYMBOL_DB("void g(std::map<int, int> m = std::map<int, int>()) { }\n");
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().index() == 0 && g->function->initializedArgCount() == 1);
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(int = 0) { }");
+            GET_SYMBOL_DB("void g(int = 0) { }\n");
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().hasDefault());
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(int*) { }"); // unnamed pointer argument (#8052)
+            GET_SYMBOL_DB("void g(int*) { }\n"); // unnamed pointer argument (#8052)
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().nameToken() == nullptr && g->function->argumentList.front().isPointer());
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("void g(int* const) { }"); // 'const' is not the name of the variable - #5882
+            GET_SYMBOL_DB("void g(int* const) { }\n"); // 'const' is not the name of the variable - #5882
             const Scope* g = db->findScopeByName("g");
             ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().nameToken() == nullptr);
             ASSERT_EQUALS("", errout_str());
@@ -2692,7 +2808,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs2() {
-        GET_SYMBOL_DB("void f(int a[][4]) { }");
+        GET_SYMBOL_DB("void f(int a[][4]) { }\n");
         const Variable *a = db->getVariableFromVarId(1);
         ASSERT_EQUALS("a", a->nameToken()->str());
         ASSERT_EQUALS(2UL, a->dimensions().size());
@@ -2703,7 +2819,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs4() {
-        GET_SYMBOL_DB("void f1(char [10], struct foo [10]);");
+        GET_SYMBOL_DB("void f1(char [10], struct foo [10]);\n");
         ASSERT_EQUALS(true, db->scopeList.front().functionList.size() == 1UL);
         const Function *func = &db->scopeList.front().functionList.front();
         ASSERT_EQUALS(true, func && func->argumentList.size() == 2UL);
@@ -2723,7 +2839,7 @@ class TestSymbolDatabase : public TestFixture {
                       "class Y {\n"
                       "  enum ABC {A,B,C};\n"
                       "  void f(enum ABC abc) {}\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( enum");
         ASSERT_EQUALS(true, f && f->function());
@@ -2738,7 +2854,7 @@ class TestSymbolDatabase : public TestFixture {
                       "class Y {\n"
                       "  enum ABC {A,B,C};\n"
                       "  void f(ABC abc) {}\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( ABC");
         ASSERT_EQUALS(true, f && f->function());
@@ -2755,7 +2871,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  struct AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2770,7 +2886,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  struct AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2785,7 +2901,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2800,7 +2916,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void bar() {\n"
                           "  AB ab;\n"
                           "  foo(&ab);\n"
-                          "};");
+                          "};\n");
             ASSERT_EQUALS(true, db != nullptr);
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( & ab");
             ASSERT_EQUALS(true, f && f->function());
@@ -2819,7 +2935,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void bar() {\n"
                       "  struct B b;\n"
                       "  foo(b);\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( b");
         ASSERT_EQUALS(true, f && f->function());
@@ -2835,7 +2951,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    enum C { };\n"
                       "  };\n"
                       "};\n"
-                      "void foo(A::B::C c) { }");
+                      "void foo(A::B::C c) { }\n");
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo (");
         ASSERT_EQUALS(true, f && f->function());
@@ -2850,7 +2966,7 @@ class TestSymbolDatabase : public TestFixture {
                       "public:\n"
                       "  Fred(Whitespace = PRESERVE_WHITESPACE);\n"
                       "};\n"
-                      "Fred::Fred(Whitespace whitespace) { }");
+                      "Fred::Fred(Whitespace whitespace) { }\n");
         ASSERT_EQUALS(true, db != nullptr);
         ASSERT_EQUALS(3, db->scopeList.size());
         auto scope = db->scopeList.cbegin();
@@ -2868,7 +2984,7 @@ class TestSymbolDatabase : public TestFixture {
                       "public:\n"
                       "  void foo(char a[16]);\n"
                       "};\n"
-                      "void Fred::foo(char b[16]) { }");
+                      "void Fred::foo(char b[16]) { }\n");
         ASSERT_EQUALS(true, db != nullptr);
         ASSERT_EQUALS(3, db->scopeList.size());
         auto scope = db->scopeList.cbegin();
@@ -2888,7 +3004,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "struct B : public A {\n"
                       "    void foo(B::E e) { }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo (");
@@ -2909,7 +3025,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    B(S s);\n"
                       "};\n"
                       "B::B(A::E e) { }\n"
-                      "B::B(A::S s) { }");
+                      "B::B(A::S s) { }\n");
 
         ASSERT_EQUALS(true, db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "B ( A :: E");
@@ -2928,7 +3044,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs14() { // #7697
-        GET_SYMBOL_DB("void f(int (&a)[10], int (&b)[10]);");
+        GET_SYMBOL_DB("void f(int (&a)[10], int (&b)[10]);\n");
         (void)db;
         const Function *func = tokenizer.tokens()->next()->function();
         ASSERT_EQUALS(true, func != nullptr);
@@ -2964,7 +3080,7 @@ class TestSymbolDatabase : public TestFixture {
     void functionArgs16() { // #9591
         const char code[] =
             "struct A { int var; };\n"
-            "void foo(int x, decltype(A::var) *&p) {}";
+            "void foo(int x, decltype(A::var) *&p) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db);
         const Scope *scope = db->functionScopes.front();
@@ -2977,7 +3093,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs17() {
-        const char code[] = "void f(int (*fp)(), int x, int y) {}";
+        const char code[] = "void f(int (*fp)(), int x, int y) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         const Scope *scope = db->functionScopes.front();
@@ -2986,7 +3102,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs18() {
-        const char code[] = "void f(int (*param1)[2], int param2) {}";
+        const char code[] = "void f(int (*param1)[2], int param2) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         const Scope *scope = db->functionScopes.front();
@@ -2995,7 +3111,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionArgs19() {
-        const char code[] = "void f(int (*fp)(int), int x, int y) {}";
+        const char code[] = "void f(int (*fp)(int), int x, int y) {}\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         const Scope *scope = db->functionScopes.front();
@@ -3005,7 +3121,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void functionArgs20() {
         {
-            const char code[] = "void f(void *(*g)(void *) = [](void *p) { return p; }) {}"; // #11769
+            const char code[] = "void f(void *(*g)(void *) = [](void *p) { return p; }) {}\n"; // #11769
             GET_SYMBOL_DB(code);
             ASSERT(db != nullptr);
             const Scope *scope = db->functionScopes.front();
@@ -3015,7 +3131,7 @@ class TestSymbolDatabase : public TestFixture {
             TODO_ASSERT(arg->hasDefault());
         }
         {
-            const char code[] = "void f() { auto g = [&](const std::function<int(int)>& h = [](int i) -> int { return i; }) {}; }"; // #12338
+            const char code[] = "void f() { auto g = [&](const std::function<int(int)>& h = [](int i) -> int { return i; }) {}; }\n"; // #12338
             GET_SYMBOL_DB(code);
             ASSERT(db != nullptr);
             ASSERT_EQUALS(3, db->scopeList.size());
@@ -3046,7 +3162,7 @@ class TestSymbolDatabase : public TestFixture {
                             "template<typename T>\n"
                             "struct S { using t = int; };\n"
                             "template<typename T>\n"
-                            "S<T> operator+(const S<T>&lhs, typename S<T>::t) { return lhs; }";
+                            "S<T> operator+(const S<T>&lhs, typename S<T>::t) { return lhs; }\n";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
         auto it = db->functionScopes.begin();
@@ -3063,10 +3179,26 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS("", arg->name());
     }
 
+    void functionArgs22() {
+        const char code[] = "typedef void (*callback_fn)(void);\n"
+                            "void ext_func(const callback_fn cb, size_t v) {}\n";
+        GET_SYMBOL_DB(code);
+        ASSERT(db != nullptr);
+        ASSERT_EQUALS(1U, db->functionScopes.size());
+        const auto it = db->functionScopes.cbegin();
+        const Function *func = (*it)->function;
+        ASSERT_EQUALS("ext_func", func->name());
+        ASSERT_EQUALS(2, func->argCount());
+        const Variable *arg = func->getArgumentVar(0);
+        ASSERT_EQUALS("cb", arg->name());
+        arg = func->getArgumentVar(1);
+        ASSERT_EQUALS("v", arg->name());
+    }
+
     void functionImplicitlyVirtual() {
         GET_SYMBOL_DB("class base { virtual void f(); };\n"
                       "class derived : base { void f(); };\n"
-                      "void derived::f() {}");
+                      "void derived::f() {}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4, db->scopeList.size());
         const Function *function = db->scopeList.back().function;
@@ -3092,7 +3224,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionIsInlineKeyword() {
-        GET_SYMBOL_DB("inline void fs() {}");
+        GET_SYMBOL_DB("inline void fs() {}\n");
         (void)db;
         const Function *func = db->scopeList.back().function;
         ASSERT(func);
@@ -3100,7 +3232,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionStatic() {
-        GET_SYMBOL_DB("static void fs() {  }");
+        GET_SYMBOL_DB("static void fs() {  }\n");
         (void)db;
         const Function *func = db->scopeList.back().function;
         ASSERT(func);
@@ -3108,7 +3240,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionReturnsReference() {
-        GET_SYMBOL_DB("Fred::Reference foo();");
+        GET_SYMBOL_DB("Fred::Reference foo();\n");
         ASSERT_EQUALS(1, db->scopeList.back().functionList.size());
         const Function &func = *db->scopeList.back().functionList.cbegin();
         ASSERT(!Function::returnsReference(&func, false));
@@ -3121,7 +3253,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        class X { X(int); };\n"
                       "    }\n"
                       "}\n"
-                      "namespace barney { X::X(int) { } }");
+                      "namespace barney { X::X(int) { } }\n");
 
         // Locate the scope for the class..
         auto it = std::find_if(db->scopeList.cbegin(), db->scopeList.cend(), [](const Scope& s) {
@@ -3152,7 +3284,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    namespace barney {\n"
                       "        X::X(int) { }\n"
                       "    }\n"
-                      "}");
+                      "}\n");
 
         // Locate the scope for the class..
         auto it = std::find_if(db->scopeList.cbegin(), db->scopeList.cend(), [](const Scope& s) {
@@ -3175,7 +3307,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void namespaces3() { // #3854 - namespace with unknown macro
         GET_SYMBOL_DB("namespace fred UNKNOWN_MACRO(default) {\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(2U, db->scopeList.size());
         ASSERT_EQUALS_ENUM(ScopeType::eGlobal, db->scopeList.front().type);
         ASSERT_EQUALS_ENUM(ScopeType::eNamespace, db->scopeList.back().type);
@@ -3184,13 +3316,26 @@ class TestSymbolDatabase : public TestFixture {
     void namespaces4() { // #4698 - type lookup
         GET_SYMBOL_DB("struct A { int a; };\n"
                       "namespace fred { struct A {}; }\n"
-                      "fred::A fredA;");
+                      "fred::A fredA;\n");
         const Variable *fredA = db->getVariableFromVarId(2U);
         ASSERT_EQUALS("fredA", fredA->name());
         const Type *fredAType = fredA->type();
         ASSERT_EQUALS(2U, fredAType->classDef->linenr());
     }
 
+    void namespaces5() { // #13967
+        GET_SYMBOL_DB("namespace test {\n"
+                      "  template <int S>\n"
+                      "  struct Test { int x[S]; };\n"
+                      "  const Test<64> test;\n"
+                      "}\n");
+        const Variable *x = db->getVariableFromVarId(2U);
+        ASSERT_EQUALS("x", x->name());
+        const Scope *scope = x->scope();
+        ASSERT(scope->nestedIn);
+        ASSERT_EQUALS("test", scope->nestedIn->className);
+    }
+
     void needInitialization() {
         {
             GET_SYMBOL_DB_DBG("template <typename T>\n" // #10259
@@ -3225,7 +3370,7 @@ class TestSymbolDatabase : public TestFixture {
                            "    catch (const X::Error2 & x) { }\n"
                            "    catch (Error3 x) { }\n"
                            "    catch (X::Error4 x) { }\n"
-                           "}";
+                           "}\n";
         GET_SYMBOL_DB(str);
         ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 5); // index 0 + 4 variables
@@ -3236,11 +3381,11 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase1() {
         check("namespace foo {\n"
               "    class bar;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo : public bar < int, int> {\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3248,13 +3393,13 @@ class TestSymbolDatabase : public TestFixture {
         check("class foo {\n"
               "public:\n"
               "foo() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class foo {\n"
               "class bar;\n"
               "foo() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3262,7 +3407,7 @@ class TestSymbolDatabase : public TestFixture {
         check("typedef void (func_type)();\n"
               "struct A {\n"
               "    friend func_type f : 2;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3270,15 +3415,15 @@ class TestSymbolDatabase : public TestFixture {
         check("static void function_declaration_before(void) __attribute__((__used__));\n"
               "static void function_declaration_before(void) {}\n"
               "static void function_declaration_after(void) {}\n"
-              "static void function_declaration_after(void) __attribute__((__used__));");
+              "static void function_declaration_after(void) __attribute__((__used__));\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("main(int argc, char *argv[]) { }", true, false);
+        check("main(int argc, char *argv[]) { }\n", true, false);
         ASSERT_EQUALS("", errout_str());
 
         const Settings s = settingsBuilder(settings1).severity(Severity::portability).build();
-        check("main(int argc, char *argv[]) { }", false, false, &s);
-        ASSERT_EQUALS("[test.c:1]: (portability) Omitted return type of function 'main' defaults to int, this is not supported by ISO C99 and later standards.\n",
+        check("main(int argc, char *argv[]) { }\n", false, false, &s);
+        ASSERT_EQUALS("[test.c:1:1]: (portability) Omitted return type of function 'main' defaults to int, this is not supported by ISO C99 and later standards. [returnImplicitInt]\n",
                       errout_str());
 
         check("namespace boost {\n"
@@ -3286,7 +3431,7 @@ class TestSymbolDatabase : public TestFixture {
               "    {\n"
               "        return std::locale();\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace X {\n"
@@ -3294,15 +3439,15 @@ class TestSymbolDatabase : public TestFixture {
               "    static void function_declaration_before(void) {}\n"
               "    static void function_declaration_after(void) {}\n"
               "    static void function_declaration_after(void) __attribute__((__used__));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("testing::testing()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:1]: (debug) Executable scope 'testing' with unknown function.\n"
-            "[test.cpp:1]: (debug) Executable scope 'testing' with unknown function.\n", // duplicate
+            "[test.cpp:1:10]: (debug) Executable scope 'testing' with unknown function. [symbolDatabaseWarning]\n"
+            "[test.cpp:1:10]: (debug) Executable scope 'testing' with unknown function. [symbolDatabaseWarning]\n", // duplicate
             errout_str());
     }
 
@@ -3310,7 +3455,7 @@ class TestSymbolDatabase : public TestFixture {
         // ticket #2178 - segmentation fault
         ASSERT_THROW_INTERNAL(check("int CL_INLINE_DECL(integer_decode_float) (int x) {\n"
                                     "    return (sign ? cl_I() : 0);\n"
-                                    "}"), UNKNOWN_MACRO);
+                                    "}\n"), UNKNOWN_MACRO);
     }
 
     void symboldatabase6() {
@@ -3336,7 +3481,7 @@ class TestSymbolDatabase : public TestFixture {
               "{\n"
               "public:\n"
               "    int f() { return C< ::D,int>::f(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3349,7 +3494,7 @@ class TestSymbolDatabase : public TestFixture {
               "    {\n"
               "        return vcl::unotools::createStandardColorSpace();\n"
               "    }\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3376,7 +3521,7 @@ class TestSymbolDatabase : public TestFixture {
               "};\n"
               "class B {\n"
               "  friend void A::f();\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3386,7 +3531,7 @@ class TestSymbolDatabase : public TestFixture {
         check("int g ();\n"
               "struct S {\n"
               "  int i : (false ? g () : 1);\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3395,7 +3540,7 @@ class TestSymbolDatabase : public TestFixture {
         // ticket #2547 - segmentation fault
         check("class foo {\n"
               "    void bar2 () = __null;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3404,7 +3549,7 @@ class TestSymbolDatabase : public TestFixture {
         // ticket #2577 - segmentation fault
         check("class foo {\n"
               "    void bar2 () = A::f;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3416,19 +3561,19 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase17() {
         // ticket #2657 - segmentation fault
-        check("{return f(){}}");
+        check("{return f(){}}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase19() {
         // ticket #2991 - segmentation fault
-        check("::y(){x}");
+        check("::y(){x}\n");
 
         ASSERT_EQUALS(
-            "[test.cpp:1]: (debug) Executable scope 'y' with unknown function.\n"
-            "[test.cpp:1]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x\n"
-            "[test.cpp:1]: (debug) Executable scope 'y' with unknown function.\n", // duplicate
+            "[test.cpp:1:3]: (debug) Executable scope 'y' with unknown function. [symbolDatabaseWarning]\n"
+            "[test.cpp:1:7]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n"
+            "[test.cpp:1:3]: (debug) Executable scope 'y' with unknown function. [symbolDatabaseWarning]\n", // duplicate
             errout_str());
     }
 
@@ -3444,7 +3589,7 @@ class TestSymbolDatabase : public TestFixture {
               "};\n"
               "Fred::func() const {\n"
               "    Foo foo;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -3452,13 +3597,13 @@ class TestSymbolDatabase : public TestFixture {
     // ticket 3437 (segmentation fault)
     void symboldatabase22() {
         check("template <class C> struct A {};\n"
-              "A<int> a;");
+              "A<int> a;\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     // ticket 3435 (std::vector)
     void symboldatabase23() {
-        GET_SYMBOL_DB("class A { std::vector<int*> ints; };");
+        GET_SYMBOL_DB("class A { std::vector<int*> ints; };\n");
         ASSERT_EQUALS(2U, db->scopeList.size());
         const Scope &scope = db->scopeList.back();
         ASSERT_EQUALS(1U, scope.varlist.size());
@@ -3474,7 +3619,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    Fred();\n"
                       "};\n"
                       "Fred::Fred() { }\n"
-                      "Fred::~Fred() { }");
+                      "Fred::~Fred() { }\n");
         // Global scope, Fred, Fred::Fred, Fred::~Fred
         ASSERT_EQUALS(4U, db->scopeList.size());
 
@@ -3511,7 +3656,7 @@ class TestSymbolDatabase : public TestFixture {
         const char str[] = "int main() {\n"
                            "    foo bar;\n"
                            "    throw bar;\n"
-                           "}";
+                           "}\n";
         GET_SYMBOL_DB(str);
         ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 2); // index 0 + 1 variable
@@ -3521,7 +3666,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase26() {
         const char str[] = "int main() {\n"
                            "    throw bar;\n"
-                           "}";
+                           "}\n";
         GET_SYMBOL_DB_C(str);
         ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 2); // index 0 + 1 variable
@@ -3533,13 +3678,13 @@ class TestSymbolDatabase : public TestFixture {
               "{\n"
               "    B1()\n"
               "    {} C(int) : B1() class\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase28() {
         GET_SYMBOL_DB("struct S {};\n"
-                      "void foo(struct S s) {}");
+                      "void foo(struct S s) {}\n");
         ASSERT(db && db->getVariableFromVarId(1) && db->getVariableFromVarId(1)->typeScope() && db->getVariableFromVarId(1)->typeScope()->className == "S");
     }
 
@@ -3547,13 +3692,13 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase29() {
         check("struct B : A {\n"
               "    B() : A {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase30() {
         GET_SYMBOL_DB("struct A { void foo(const int a); };\n"
-                      "void A::foo(int a) { }");
+                      "void A::foo(int a) { }\n");
         ASSERT(db && db->functionScopes.size() == 1 && db->functionScopes[0]->functionOf);
     }
 
@@ -3580,7 +3725,7 @@ class TestSymbolDatabase : public TestFixture {
                       "::Foo::Sub::Sub() { }\n"
                       "class Foo;\n"
                       "class Bar;\n"
-                      "class Sub;");
+                      "class Sub;\n");
         ASSERT(db && db->typeList.size() == 5);
 
         auto i = db->typeList.cbegin();
@@ -3603,7 +3748,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void foo() {}\n"
                       "};\n"
                       "class Deri : Base {\n"
-                      "};");
+                      "};\n");
         ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->definedType->getFunction("foo"));
     }
 
@@ -3613,7 +3758,7 @@ class TestSymbolDatabase : public TestFixture {
                       "static struct A::B u(0);\n"
                       "static struct A::B v{0};\n"
                       "static struct A::B w({0});\n"
-                      "void foo() { }");
+                      "void foo() { }\n");
         ASSERT(db && db->functionScopes.size() == 1);
     }
 
@@ -3622,19 +3767,18 @@ class TestSymbolDatabase : public TestFixture {
               "typedef _Atomic(int)&atomic_int_ref;\n"
               "struct S {\n"
               "  _Atomic union { int n; };\n"
-              "};");
-        ASSERT_EQUALS("[test.cpp:2]: (debug) Failed to parse 'typedef _Atomic ( int ) & atomic_int_ref ;'. The checking continues anyway.\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:2:1]: (debug) Failed to parse 'typedef _Atomic ( int ) & atomic_int_ref ;'. The checking continues anyway. [simplifyTypedef]\n", errout_str());
     }
 
     void symboldatabase35() { // ticket #4806 and #4841
         check("class FragmentQueue : public CL_NS(util)::PriorityQueue<CL_NS(util)::Deletor::Object<TextFragment> >\n"
-              "{};");
+              "{};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase36() { // ticket #4892
-        check("void struct ( ) { if ( 1 ) } int main ( ) { }");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_THROW_INTERNAL(check("void struct ( ) { if ( 1 ) } int main ( ) { }\n"), SYNTAX);
     }
 
     void symboldatabase37() {
@@ -3648,7 +3792,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    Fred(const struct Barney & b) { barney = b; }\n"
                       "private:\n"
                       "    struct Barney barney;\n"
-                      "};");
+                      "};\n");
         ASSERT(db && db->typeList.size() == 3);
 
         auto i = db->typeList.cbegin();
@@ -3674,24 +3818,24 @@ class TestSymbolDatabase : public TestFixture {
               "{\n"
               "  scoped_service( T* ptr ) : scoped_service<service>(ptr), m_ptr(ptr) {}\n"
               "  T* const m_ptr;\n"
-              "};");
+              "};\n");
     }
 
     void symboldatabase40() { // ticket #5153
         check("void f() {\n"
               "    try {  }\n"
               "    catch (std::bad_alloc) {  }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase41() { // ticket #5197 (unknown macro)
-        GET_SYMBOL_DB("struct X1 { MACRO1 f(int spd) MACRO2; };");
+        GET_SYMBOL_DB("struct X1 { MACRO1 f(int spd) MACRO2; };\n");
         ASSERT(db && db->findScopeByName("X1") && db->findScopeByName("X1")->functionList.size() == 1 && !db->findScopeByName("X1")->functionList.front().hasBody());
     }
 
     void symboldatabase42() { // only put variables in variable list
-        GET_SYMBOL_DB("void f() { extern int x(); }");
+        GET_SYMBOL_DB("void f() { extern int x(); }\n");
         ASSERT(db != nullptr);
         const Scope * const fscope = db ? db->findScopeByName("f") : nullptr;
         ASSERT(fscope != nullptr);
@@ -3701,7 +3845,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase43() { // ticket #4738
         check("void f() {\n"
               "    new int;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3711,7 +3855,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void foo() {\n"
                       "    int k { 1 };\n"
                       "    int l ( 1 );\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4U, db->variableList().size() - 1);
         ASSERT_EQUALS(2U, db->scopeList.size());
@@ -3732,7 +3876,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        .span = (S) { 0UL },\n"
                       "        .flags = (x ? 256 : 0),\n"
                       "    };\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4U, db->variableList().size() - 1);
@@ -3754,7 +3898,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct S { };\n"
                       "namespace {\n"
                       "    struct S { };\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4U, db->scopeList.size());
@@ -3780,7 +3924,7 @@ class TestSymbolDatabase : public TestFixture {
                       "using namespace NS;\n"
                       "MyClass::~MyClass() {\n"
                       "    delete Example;\n"
-                      "}");
+                      "}\n");
         ASSERT(db && !db->functionScopes.empty() && db->functionScopes.front()->function && db->functionScopes.front()->function->functionScope == db->functionScopes.front());
     }
 
@@ -3793,7 +3937,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n"
                       "using namespace NS;\n"
                       "MyClass::~MyClass() { }\n"
-                      "MyClass::MyClass() { }");
+                      "MyClass::MyClass() { }\n");
         ASSERT(db && !db->functionScopes.empty() && db->functionScopes.front()->function && db->functionScopes.front()->function->functionScope == db->functionScopes.front());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "MyClass ( ) ;");
@@ -3808,7 +3952,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("namespace Ns { class C; }\n"
                       "void f1() { char *p; *p = 0; }\n"
                       "class Ns::C* p;\n"
-                      "void f2() { char *p; *p = 0; }");
+                      "void f2() { char *p; *p = 0; }\n");
         ASSERT(db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "p ; void f2");
         ASSERT_EQUALS(true, db && f && f->variable());
@@ -3833,7 +3977,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    : object_(object),\n"
                       "      member_(member) {\n"
                       "  }\n"
-                      "};");
+                      "};\n");
         ASSERT(db != nullptr);
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "_ConstTessMemberResultCallback_0_0 (");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->isConstructor());
@@ -3845,7 +3989,7 @@ class TestSymbolDatabase : public TestFixture {
                       "static const float f3 = 2 * std::foo3(a, b);\n"
                       "static const float f4 = c * foo4(a, b);\n"
                       "static const int i1 = 2 & foo5(a, b);\n"
-                      "static const bool b1 = 2 > foo6(a, b);");
+                      "static const bool b1 = 2 > foo6(a, b);\n");
         ASSERT(db != nullptr);
         ASSERT(findFunctionByName("foo1", &db->scopeList.front()) == nullptr);
         ASSERT(findFunctionByName("foo2", &db->scopeList.front()) == nullptr);
@@ -3859,7 +4003,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void foo() {\n"
                       "    int i = 0;\n"
                       "    S s{ { i }, 0 };\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(2, db->scopeList.size());
@@ -3869,8 +4013,8 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase53() { // #7124
-        GET_SYMBOL_DB("int32_t x;"
-                      "std::int32_t y;");
+        GET_SYMBOL_DB("int32_t x;\n"
+                      "std::int32_t y;\n");
 
         ASSERT(db != nullptr);
         ASSERT(db->getVariableFromVarId(1) != nullptr);
@@ -3884,7 +4028,7 @@ class TestSymbolDatabase : public TestFixture {
                       "  void getReg() const override {\n"
                       "    assert(Kind == k_ShiftExtend);\n"
                       "  }\n"
-                      "};");
+                      "};\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(1U, db->functionScopes.size());
@@ -3895,7 +4039,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase55() { // #7767
         GET_SYMBOL_DB("PRIVATE S32 testfunc(void) {\n"
                       "    return 0;\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(1U, db->functionScopes.size());
@@ -3910,7 +4054,7 @@ class TestSymbolDatabase : public TestFixture {
                           "        virtual void f();\n"
                           "    };\n"
                           "    friend void NestedClass::f();\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(0U, db->functionScopes.size());
@@ -3921,7 +4065,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("class Class {\n"
                           "    friend void f1();\n"
                           "    friend void f2() { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(1U, db->functionScopes.size());
@@ -3930,7 +4074,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             GET_SYMBOL_DB_C("friend f1();\n"
-                            "friend f2() { }");
+                            "friend f2() { }\n");
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(2U, db->scopeList.size());
@@ -3945,7 +4089,7 @@ class TestSymbolDatabase : public TestFixture {
                       "         return 1;\n"
                       "    else\n"
                       "         return 1;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT(db->scopeList.size() == 4U);
         auto it = db->scopeList.cbegin();
@@ -3965,7 +4109,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    class A : public B\n"
                       "    {\n"
                       "    };\n"
-                      "};");
+                      "};\n");
         ASSERT(db != nullptr);
         ASSERT(db->typeList.size() == 3U);
         auto it = db->typeList.cbegin();
@@ -3980,13 +4124,13 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase59() { // #8465
         GET_SYMBOL_DB("struct A::B ab[10];\n"
-                      "void f() {}");
+                      "void f() {}\n");
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 2);
     }
 
     void symboldatabase60() { // #8470
-        GET_SYMBOL_DB("struct A::someType A::bar() { return 0; }");
+        GET_SYMBOL_DB("struct A::someType A::bar() { return 0; }\n");
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 2);
     }
@@ -4000,7 +4144,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    info = new (nothrow) struct Fred::Info();\n"
                       "    info = new struct Fred::Info();\n"
                       "    memset(info, 0, sizeof(struct Fred::Info));\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 4);
@@ -4017,7 +4161,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<struct A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const struct A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4036,7 +4180,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<class A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const class A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4055,7 +4199,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<union A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const union A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4074,7 +4218,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (std::vector<enum A::X>::const_iterator it = includes.begin(); it != includes.end(); ++it) {\n"
                           "        const enum A::X currentIncList = *it;\n"
                           "    }\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 5);
             const Scope *scope = db->findScopeByName("A");
@@ -4087,12 +4231,12 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase63() {
         {
-            GET_SYMBOL_DB("template class T<int> ; void foo() { }");
+            GET_SYMBOL_DB("template class T<int> ; void foo() { }\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
         {
-            GET_SYMBOL_DB("template struct T<int> ; void foo() { }");
+            GET_SYMBOL_DB("template struct T<int> ; void foo() { }\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
@@ -4106,7 +4250,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4149,7 +4293,7 @@ class TestSymbolDatabase : public TestFixture {
                           "Fred::impl::impl() { }\n"
                           "Fred::impl::~impl() { }\n"
                           "Fred::impl::impl(const Fred::impl &) { }\n"
-                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }");
+                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4190,7 +4334,7 @@ class TestSymbolDatabase : public TestFixture {
                           "        impl(const impl &) { }\n"
                           "        void foo(const impl &, const impl &) const { }\n"
                           "    };\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4235,7 +4379,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    Fred::impl::~impl() { }\n"
                           "    Fred::impl::impl(const Fred::impl &) { }\n"
                           "    void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4280,7 +4424,7 @@ class TestSymbolDatabase : public TestFixture {
                           "NS::Fred::impl::impl() { }\n"
                           "NS::Fred::impl::~impl() { }\n"
                           "NS::Fred::impl::impl(const NS::Fred::impl &) { }\n"
-                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }");
+                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4321,7 +4465,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4366,7 +4510,7 @@ class TestSymbolDatabase : public TestFixture {
                           "NS::Fred::impl::impl() { }\n"
                           "NS::Fred::impl::~impl() { }\n"
                           "NS::Fred::impl::impl(const NS::Fred::impl &) { }\n"
-                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }");
+                          "void NS::Fred::impl::foo(const NS::Fred::impl &, const NS::Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4413,7 +4557,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    Fred::impl::~impl() { }\n"
                           "    Fred::impl::impl(const Fred::impl &) { }\n"
                           "    void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4459,7 +4603,7 @@ class TestSymbolDatabase : public TestFixture {
                           "Fred::impl::impl() { }\n"
                           "Fred::impl::~impl() { }\n"
                           "Fred::impl::impl(const Fred::impl &) { }\n"
-                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }");
+                          "void Fred::impl::foo(const Fred::impl &, const Fred::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4498,7 +4642,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4541,7 +4685,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> Fred<A>::impl::impl() { }\n"
                           "template <typename A> Fred<A>::impl::~impl() { }\n"
                           "template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
-                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }");
+                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 7);
@@ -4582,7 +4726,7 @@ class TestSymbolDatabase : public TestFixture {
                           "        impl(const impl &) { }\n"
                           "        void foo(const impl &, const impl &) const { }\n"
                           "    };\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4627,7 +4771,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    template <typename A> Fred<A>::impl::~impl() { }\n"
                           "    template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
                           "    template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4672,7 +4816,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> NS::Fred<A>::impl::impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::~impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::impl(const NS::Fred<A>::impl &) { }\n"
-                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }");
+                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4713,7 +4857,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    ~impl() { }\n"
                           "    impl(const impl &) { }\n"
                           "    void foo(const impl &, const impl &) const { }\n"
-                          "};");
+                          "};\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4758,7 +4902,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> NS::Fred<A>::impl::impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::~impl() { }\n"
                           "template <typename A> NS::Fred<A>::impl::impl(const NS::Fred<A>::impl &) { }\n"
-                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }");
+                          "template <typename A> void NS::Fred<A>::impl::foo(const NS::Fred<A>::impl &, const NS::Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4805,7 +4949,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    template <typename A> Fred<A>::impl::~impl() { }\n"
                           "    template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
                           "    template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n"
-                          "}");
+                          "}\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4851,7 +4995,7 @@ class TestSymbolDatabase : public TestFixture {
                           "template <typename A> Fred<A>::impl::impl() { }\n"
                           "template <typename A> Fred<A>::impl::~impl() { }\n"
                           "template <typename A> Fred<A>::impl::impl(const Fred<A>::impl &) { }\n"
-                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }");
+                          "template <typename A> void Fred<A>::impl::foo(const Fred<A>::impl &, const Fred<A>::impl &) const { }\n");
 
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 8);
@@ -4887,7 +5031,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase65() {
         // don't crash on missing links from instantiation of template with typedef
-        check("int ( * X0 ) ( long ) < int ( ) ( long ) > :: f0 ( int * ) { return 0 ; }");
+        check("int ( * X0 ) ( long ) < int ( ) ( long ) > :: f0 ( int * ) { return 0 ; }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int g();\n" // #11385
@@ -4900,14 +5044,14 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase66() { // #8540
         GET_SYMBOL_DB("enum class ENUM1;\n"
                       "enum class ENUM2 { MEMBER2 };\n"
-                      "enum class ENUM3 : int { MEMBER1, };");
+                      "enum class ENUM3 : int { MEMBER1, };\n");
         ASSERT(db != nullptr);
         ASSERT(db && db->scopeList.size() == 3);
         ASSERT(db && db->typeList.size() == 3);
     }
 
     void symboldatabase67() { // #8538
-        GET_SYMBOL_DB("std::string get_endpoint_url() const noexcept override;");
+        GET_SYMBOL_DB("std::string get_endpoint_url() const noexcept override;\n");
         const Function *f = db ? &db->scopeList.front().functionList.front() : nullptr;
         ASSERT(f != nullptr);
         ASSERT(f && f->hasOverrideSpecifier());
@@ -4921,7 +5065,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "struct Foo : Bar {\n"
                       "    virtual std::string get_endpoint_url() const noexcept override final;\n"
-                      "};");
+                      "};\n");
         const Token *f = db ? Token::findsimplematch(tokenizer.tokens(), "get_endpoint_url ( ) const noexcept ( true ) ;") : nullptr;
         ASSERT(f != nullptr);
         ASSERT(f && f->function() && f->function()->token->linenr() == 2);
@@ -4947,7 +5091,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void foo() volatile { }\n"
                       "    void foo() const { }\n"
                       "    void foo() { }\n"
-                      "};");
+                      "};\n");
         const Token *f = db ? Token::findsimplematch(tokenizer.tokens(), "foo ( ) const volatile {") : nullptr;
         ASSERT(f != nullptr);
         ASSERT(f && f->function() && f->function()->token->linenr() == 3);
@@ -4972,20 +5116,20 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase70() {
         {
-            GET_SYMBOL_DB("class Map<String,Entry>::Entry* e;");
+            GET_SYMBOL_DB("class Map<String,Entry>::Entry* e;\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 1);
             ASSERT(db && db->variableList().size() == 2);
         }
         {
-            GET_SYMBOL_DB("template class boost::token_iterator_generator<boost::offset_separator>::type; void foo() { }");
+            GET_SYMBOL_DB("template class boost::token_iterator_generator<boost::offset_separator>::type; void foo() { }\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
         {
             GET_SYMBOL_DB("void foo() {\n"
                           "    return class Arm_relocate_functions<big_endian>::thumb32_branch_offset(upper_insn, lower_insn);\n"
-                          "}");
+                          "}\n");
             ASSERT(db != nullptr);
             ASSERT(db && db->scopeList.size() == 2);
         }
@@ -4993,7 +5137,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase71() {
         GET_SYMBOL_DB("class A { };\n"
-                      "class B final : public A { };");
+                      "class B final : public A { };\n");
         ASSERT(db && db->scopeList.size() == 3);
         ASSERT(db && db->typeList.size() == 2);
     }
@@ -5003,7 +5147,7 @@ class TestSymbolDatabase : public TestFixture {
                       "struct A::B {\n"
                       "    B() = default;\n"
                       "    B(const B&) {}\n"
-                      "};");
+                      "};\n");
 
         ASSERT(db && db->scopeList.size() == 4);
         ASSERT(db && db->typeList.size() == 2);
@@ -5015,7 +5159,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase74() { // #8838 - final
         GET_SYMBOL_DB("class Base { virtual int f() const = 0; };\n"
-                      "class Derived : Base { virtual int f() const final { return 6; } };");
+                      "class Derived : Base { virtual int f() const final { return 6; } };\n");
 
         ASSERT_EQUALS(4, db->scopeList.size());
         ASSERT_EQUALS(1, db->functionScopes.size());
@@ -5038,7 +5182,7 @@ class TestSymbolDatabase : public TestFixture {
                           "auto optional<T>::value() && -> T && {}\n"
                           "template <typename T>\n"
                           "auto optional<T>::value() const & -> T const & {}\n"
-                          "optional<int> i;");
+                          "optional<int> i;\n");
 
             ASSERT_EQUALS(5, db->scopeList.size());
             ASSERT_EQUALS(3, db->functionScopes.size());
@@ -5083,7 +5227,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("namespace foo {\n"
                       "  using namespace bar::baz;\n"
                       "  auto func(int arg) -> bar::quux {}\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(2, db->mVariableList.size());
     }
 
@@ -5092,7 +5236,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void f() {\n"
                       "  using T3 = typename T1::template T3<T2>;\n"
                       "  T3 t;\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS(2, db->mVariableList.size());
     }
 
@@ -5103,7 +5247,7 @@ class TestSymbolDatabase : public TestFixture {
                       "template <template <class> class c, class... f, template <class...> class d>\n"
                       "struct b<c<f...>, d<>>;\n"
                       "}\n"
-                      "void e() { using c = a<>; }");
+                      "void e() { using c = a<>; }\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS("", errout_str());
     }
@@ -5111,7 +5255,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase79() { // #9392
         {
             GET_SYMBOL_DB("class C { C(); };\n"
-                          "C::C() = default;");
+                          "C::C() = default;\n");
             ASSERT(db->scopeList.size() == 2);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5121,14 +5265,14 @@ class TestSymbolDatabase : public TestFixture {
                           "class C { C(); };\n"
                           "}\n"
                           "using namespace ns;\n"
-                          "C::C() = default;");
+                          "C::C() = default;\n");
             ASSERT(db->scopeList.size() == 3);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
         }
         {
             GET_SYMBOL_DB("class C { ~C(); };\n"
-                          "C::~C() = default;");
+                          "C::~C() = default;\n");
             ASSERT(db->scopeList.size() == 2);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5139,7 +5283,7 @@ class TestSymbolDatabase : public TestFixture {
                           "class C { ~C(); };\n"
                           "}\n"
                           "using namespace ns;\n"
-                          "C::~C() = default;");
+                          "C::~C() = default;\n");
             ASSERT(db->scopeList.size() == 3);
             ASSERT(db->scopeList.back().functionList.size() == 1);
             ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5157,7 +5301,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(const ns::A&);\n"
                           "};\n"
                           "using namespace ns;\n"
-                          "void AA::f(const A&) { }");
+                          "void AA::f(const A&) { }\n");
             ASSERT(db->scopeList.size() == 5);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("AA");
@@ -5177,7 +5321,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(const ns::ns1::A&);\n"
                           "};\n"
                           "using namespace ns::ns1;\n"
-                          "void AA::f(const A&) { }");
+                          "void AA::f(const A&) { }\n");
             ASSERT(db->scopeList.size() == 6);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("AA");
@@ -5197,7 +5341,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(const ns::ns1::A&);\n"
                           "};\n"
                           "using namespace ns;\n"
-                          "void AA::f(const ns1::A&) { }");
+                          "void AA::f(const ns1::A&) { }\n");
             ASSERT(db->scopeList.size() == 6);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("AA");
@@ -5219,7 +5363,7 @@ class TestSymbolDatabase : public TestFixture {
                           "using namespace std;\n"
                           "using namespace Parser;\n"
                           "using namespace Terminal;\n"
-                          "string Complete::act(const Action *act) { }");
+                          "string Complete::act(const Action *act) { }\n");
             ASSERT(db->scopeList.size() == 4);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("Complete");
@@ -5238,7 +5382,7 @@ class TestSymbolDatabase : public TestFixture {
                           "using namespace std;\n"
                           "using namespace Foo::Parser;\n"
                           "using namespace Terminal;\n"
-                          "string Complete::act(const Action *act) { }");
+                          "string Complete::act(const Action *act) { }\n");
             ASSERT(db->scopeList.size() == 4);
             ASSERT(db->functionScopes.size() == 1);
             const Scope *scope = db->findScopeByName("Complete");
@@ -5250,14 +5394,14 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase82() {
-        GET_SYMBOL_DB("namespace foo { void foo() {} }");
+        GET_SYMBOL_DB("namespace foo { void foo() {} }\n");
         ASSERT(db->functionScopes.size() == 1);
         ASSERT_EQUALS(false, db->functionScopes[0]->function->isConstructor());
     }
 
     void symboldatabase83() { // #9431
         GET_SYMBOL_DB_DBG("struct a { a() noexcept; };\n"
-                          "a::a() noexcept = default;");
+                          "a::a() noexcept = default;\n");
         const Scope *scope = db->findScopeByName("a");
         ASSERT(scope);
         ASSERT(scope->functionList.size() == 1);
@@ -5272,7 +5416,7 @@ class TestSymbolDatabase : public TestFixture {
     void symboldatabase84() {
         {
             GET_SYMBOL_DB_DBG("struct a { a() noexcept(false); };\n"
-                              "a::a() noexcept(false) = default;");
+                              "a::a() noexcept(false) = default;\n");
             const Scope *scope = db->findScopeByName("a");
             ASSERT(scope);
             ASSERT(scope->functionList.size() == 1);
@@ -5285,7 +5429,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             GET_SYMBOL_DB_DBG("struct a { a() noexcept(true); };\n"
-                              "a::a() noexcept(true) = default;");
+                              "a::a() noexcept(true) = default;\n");
             const Scope *scope = db->findScopeByName("a");
             ASSERT(scope);
             ASSERT(scope->functionList.size() == 1);
@@ -5304,7 +5448,7 @@ class TestSymbolDatabase : public TestFixture {
                       "  void f() { _mode = x; }\n"
                       "  Mode _mode;\n"
                       "  DECLARE_PROPERTY_FIELD(_mode);\n"
-                      "};");
+                      "};\n");
         const Token *vartok1 = Token::findsimplematch(tokenizer.tokens(), "_mode =");
         ASSERT(vartok1);
         ASSERT(vartok1->variable());
@@ -5316,7 +5460,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase86() {
         GET_SYMBOL_DB("class C { auto operator=(const C&) -> C&; };\n"
-                      "auto C::operator=(const C&) -> C& = default;");
+                      "auto C::operator=(const C&) -> C& = default;\n");
         ASSERT(db->scopeList.size() == 2);
         ASSERT(db->scopeList.back().functionList.size() == 1);
         ASSERT(db->scopeList.back().functionList.front().isDefault() == true);
@@ -5324,7 +5468,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase87() { // #9922 'extern const char ( * x [ 256 ] ) ;'
-        GET_SYMBOL_DB("extern const char ( * x [ 256 ] ) ;");
+        GET_SYMBOL_DB("extern const char ( * x [ 256 ] ) ;\n");
         const Token *xtok = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT(xtok->variable());
     }
@@ -5362,7 +5506,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n"
                       "}\n"
                       "using namespace external::ns1;\n"
-                      "A a{AS};");
+                      "A a{AS};\n");
         const Token *vartok1 = Token::findsimplematch(tokenizer.tokens(), "A a");
         ASSERT(vartok1);
         ASSERT(vartok1->next());
@@ -5375,7 +5519,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct Fred {\n"
                       "    void foo(const int * const x);\n"
                       "};\n"
-                      "void Fred::foo(const int * x) { }");
+                      "void Fred::foo(const int * x) { }\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "foo ( const int * x )");
         ASSERT(functok);
@@ -5388,7 +5532,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    struct Value {};\n"
                       "    void foo(const std::vector<std::function<void(const Fred::Value &)>> &callbacks);\n"
                       "}\n"
-                      "void Fred::foo(const std::vector<std::function<void(const Fred::Value &)>> &callbacks) { }");
+                      "void Fred::foo(const std::vector<std::function<void(const Fred::Value &)>> &callbacks) { }\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(),
                                                       "foo ( const std :: vector < std :: function < void ( const Fred :: Value & ) > > & callbacks ) { }");
@@ -5402,11 +5546,11 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("template <size_t, typename...> struct a;\n"
                           "template <size_t b, typename c, typename... d>\n"
                           "struct a<b, c, d...> : a<1, d...> {};\n"
-                          "template <typename... e> struct f : a<0, e...> {};");
+                          "template <typename... e> struct f : a<0, e...> {};\n");
             ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("b.f();");
+            GET_SYMBOL_DB("b.f();\n");
             ASSERT_EQUALS("", errout_str());
         }
     }
@@ -5421,7 +5565,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase94() { // structured bindings
-        GET_SYMBOL_DB("int foo() { auto [x,y] = xy(); return x+y; }");
+        GET_SYMBOL_DB("int foo() { auto [x,y] = xy(); return x+y; }\n");
         ASSERT(db != nullptr);
         ASSERT(db->getVariableFromVarId(1) != nullptr);
         ASSERT(db->getVariableFromVarId(2) != nullptr);
@@ -5487,7 +5631,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase99() { // #10864
-        check("void f() { std::map<std::string, int> m; }");
+        check("void f() { std::map<std::string, int> m; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5570,7 +5714,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase102() {
         GET_SYMBOL_DB("std::string f() = delete;\n"
-                      "void g() {}");
+                      "void g() {}\n");
         ASSERT(db);
         ASSERT(db->scopeList.size() == 2);
         ASSERT(db->scopeList.front().type == ScopeType::eGlobal);
@@ -5801,15 +5945,53 @@ class TestSymbolDatabase : public TestFixture {
                       "            i();\n"
                       "            break;\n"
                       "    }\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS("", errout_str());
         const Token *case3 = Token::findsimplematch(tokenizer.tokens(), "case 3");
         ASSERT(case3 && case3->isAttributeFallthrough());
     }
 
+    void symboldatabase112() { // explicit operator
+        GET_SYMBOL_DB("class S {\n"
+                      "    explicit constexpr operator bool() const noexcept { return ptr_ != nullptr; }\n"
+                      "private:\n"
+                      "    void *ptr_{nullptr};\n"
+                      "};\n");
+        const Token *f = db ? Token::findsimplematch(tokenizer.tokens(), "operatorbool") : nullptr;
+        ASSERT(f != nullptr);
+        ASSERT(f && f->function() && f->function()->isExplicit());
+    }
+
+    void symboldatabase113() { // #11841
+        GET_SYMBOL_DB("template <typename T>\n"
+                      "struct S {\n"
+                      "  S();\n"
+                      "  int& g() { return a; }\n"
+                      "  struct I;\n"
+                      "private:\n"
+                      "  int a;\n"
+                      "};\n"
+                      "template <>\n"
+                      "struct S<int>::I{};\n");
+        ASSERT(db->scopeList.size() == 4);
+        auto it = db->scopeList.begin();
+        ++it;
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, it->type);
+        ASSERT_EQUALS("I", it->className);
+        ASSERT_EQUALS(0, it->varlist.size());
+        ++it;
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, it->type);
+        ASSERT_EQUALS("S < int >", it->className);
+        ASSERT_EQUALS(1, it->varlist.size());
+        ++it;
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, it->type);
+        ASSERT_EQUALS("g", it->className);
+        ASSERT_EQUALS(0, it->varlist.size());
+    }
+
     void createSymbolDatabaseFindAllScopes1() {
-        GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }");
+        GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }\n");
         ASSERT(db->scopeList.size() == 3);
         ASSERT_EQUALS_ENUM(ScopeType::eUnion, db->scopeList.back().type);
     }
@@ -6010,7 +6192,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    T* x;\n"
                       "    myst(T* y) : x(y){};\n"  // <- myst constructor
                       "  };\n"
-                      "};");
+                      "};\n");
         ASSERT(db);
 
         const Token* myst1 = Token::findsimplematch(tokenizer.tokens(), "myst ( T * y )");
@@ -6058,6 +6240,24 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void createSymbolDatabaseFindAllScopes11() // #13685
+    {
+        GET_SYMBOL_DB("int f() {\n"
+                      "    int x;\n"
+                      "    if (!({ int *p = &x; *p = 1; 1; }))\n"
+                      "        return 0;\n"
+                      "    return x;\n"
+                      "}\n");
+        ASSERT(db && db->scopeList.size() == 4);
+
+        auto it = db->scopeList.begin();
+        std::advance(it, 3);
+        const Scope& compoundScope = *it;
+        ASSERT_EQUALS_ENUM(ScopeType::eUnconditional, compoundScope.type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, compoundScope.nestedIn->type);
+        ASSERT_EQUALS("f", compoundScope.nestedIn->className);
+    }
+
     void createSymbolDatabaseIncompleteVars()
     {
         {
@@ -6172,7 +6372,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void enum1() {
-        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;");
+        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;\n");
 
         /* there is a enum scope with the name BOOL */
         ASSERT(db && db->scopeList.back().type == ScopeType::eEnum && db->scopeList.back().className == "BOOL");
@@ -6182,7 +6382,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void enum2() {
-        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE } b;");
+        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE } b;\n");
 
         /* there is a enum scope with the name BOOL */
         ASSERT(db && db->scopeList.back().type == ScopeType::eEnum && db->scopeList.back().className == "BOOL");
@@ -6192,7 +6392,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void enum3() {
-        GET_SYMBOL_DB("enum ABC { A=11,B,C=A+B };");
+        GET_SYMBOL_DB("enum ABC { A=11,B,C=A+B };\n");
         ASSERT(db && db->scopeList.back().type == ScopeType::eEnum);
 
         /* There is an enum A with value 11 */
@@ -6210,7 +6410,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void enum4() { // #7493
         GET_SYMBOL_DB("enum Offsets { O1, O2, O3=5, O4 };\n"
-                      "enum MyEnums { E1=O1+1, E2, E3=O3+1 };");
+                      "enum MyEnums { E1=O1+1, E2, E3=O3+1 };\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(3U, db->scopeList.size());
@@ -6298,7 +6498,7 @@ class TestSymbolDatabase : public TestFixture {
                       "int b[A];\n"
                       "int c[A + 2];\n"
                       "int d[10 + B];\n"
-                      "int e[A + B];");
+                      "int e[A + B];\n");
         ASSERT(db != nullptr);
 
         ASSERT_EQUALS(2U, db->scopeList.size());
@@ -6353,7 +6553,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "struct Barney : public Fred {\n"
                       "    Enum func(Enum e) { return e; }\n"
-                      "};");
+                      "};\n");
         ASSERT(db != nullptr);
 
         const Token * const functionToken = Token::findsimplematch(tokenizer.tokens(), "func");
@@ -6392,7 +6592,7 @@ class TestSymbolDatabase : public TestFixture {
                       "char array9[sizeof(EL)];\n"
                       "char array10[sizeof(L)];\n"
                       "char array11[sizeof(ELL)];\n"
-                      "char array12[sizeof(LL)];");
+                      "char array12[sizeof(LL)];\n");
         ASSERT(db != nullptr);
 
         ASSERT(db->variableList().size() == 13); // the first one is not used
@@ -6809,13 +7009,66 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void enum20() { // #14419
+        {
+            GET_SYMBOL_DB("enum class myclass : uint8_t { A = 0U };\n");
+            const Token *A = Token::findsimplematch(tokenizer.tokens(), "A");
+            ASSERT(A && A->valueType() && A->valueType()->isEnum());
+            ASSERT_EQUALS_ENUM(ValueType::CHAR, A->valueType()->type);
+            ASSERT_EQUALS_ENUM(ValueType::UNSIGNED, A->valueType()->sign);
+        }
+        {
+            GET_SYMBOL_DB("enum myclass : uint8_t { A = 0U };\n");
+            const Token *A = Token::findsimplematch(tokenizer.tokens(), "A");
+            ASSERT(A && A->valueType() && A->valueType()->isEnum());
+            ASSERT_EQUALS_ENUM(ValueType::CHAR, A->valueType()->type);
+            ASSERT_EQUALS_ENUM(ValueType::UNSIGNED, A->valueType()->sign);
+        }
+    }
+
+    void struct1() {
+        GET_SYMBOL_DB_C("struct deer {\n"
+                        "   uint16_t a;\n"
+                        "   uint16_t b;\n"
+                        "};\n"
+                        "void herd ( void ) {\n"
+                        "   struct deer {\n"
+                        "     uint16_t a;\n"
+                        "   };\n"
+                        "}\n");
+
+        ASSERT_EQUALS("", errout_str());
+        ASSERT(db);
+
+        const Token* deer = Token::findsimplematch(tokenizer.tokens(), "deer {");
+        ASSERT(deer);
+        ASSERT(deer->type());
+        ASSERT(deer->type()->classScope);
+        const Token* tok = deer->next();
+        ASSERT(tok->scope());
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, tok->scope()->type);
+        ASSERT_EQUALS(tok, tok->scope()->bodyStart);
+        ASSERT_EQUALS(tok->scope(), deer->type()->classScope);
+
+        const Token* secondDeer = Token::findsimplematch(tok, "deer {");
+        ASSERT(secondDeer);
+        ASSERT(secondDeer != deer);
+        ASSERT(secondDeer->type());
+        ASSERT(secondDeer->type()->classScope);
+        tok = secondDeer->next();
+        ASSERT(tok->scope());
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, tok->scope()->type);
+        ASSERT_EQUALS(tok, tok->scope()->bodyStart);
+        ASSERT_EQUALS(tok->scope(), secondDeer->type()->classScope);
+    }
+
     void sizeOfType() {
         // #7615 - crash in Symboldatabase::sizeOfType()
         GET_SYMBOL_DB("enum e;\n"
                       "void foo() {\n"
                       "    e abc[] = {A,B,C};\n"
                       "    int i = abc[ARRAY_SIZE(cats)];\n"
-                      "}");
+                      "}\n");
         const Token *e = Token::findsimplematch(tokenizer.tokens(), "e abc");
         (void)db->sizeOfType(e);  // <- don't crash
     }
@@ -6827,7 +7080,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual());
         }
         {
@@ -6839,7 +7092,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri2 : Deri1 {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri2") && db->findScopeByName("Deri2")->functionList.front().isImplicitlyVirtual());
         }
         {
@@ -6848,7 +7101,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && !db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(true));
         }
         {
@@ -6857,7 +7110,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo(std::string& s) {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && !db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(true));
         }
         {
@@ -6869,7 +7122,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri2 : Deri1 {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri2") && db->findScopeByName("Deri2")->functionList.front().isImplicitlyVirtual());
         }
         {
@@ -6878,7 +7131,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(true)); // Default true -> true
         }
         {
@@ -6887,7 +7140,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && !db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(false)); // Default false -> false
         }
         {
@@ -6896,7 +7149,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "class Deri : Base {\n"
                           "    void foo() {}\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Deri") && db->findScopeByName("Deri")->functionList.front().isImplicitlyVirtual(false)); // Default false, but we saw "virtual" -> true
         }
         // #5289
@@ -6908,7 +7161,7 @@ class TestSymbolDatabase : public TestFixture {
                           "class Bar : private Bar<void, void> {\n"
                           "   void foo() {\n"
                           "   }\n"
-                          "};");
+                          "};\n");
             ASSERT(db && db->findScopeByName("Bar") && !db->findScopeByName("Bar")->functionList.empty() && !db->findScopeByName("Bar")->functionList.front().isImplicitlyVirtual(false));
             ASSERT_EQUALS(1, db->findScopeByName("Bar")->functionList.size());
         }
@@ -6928,7 +7181,7 @@ class TestSymbolDatabase : public TestFixture {
                           "};\n"
                           "void InfiniteA::foo() {\n"
                           "    C a;\n"
-                          "}");
+                          "}\n");
             //ASSERT(db && db->findScopeByName("InfiniteA") && !db->findScopeByName("InfiniteA")->functionList.front().isImplicitlyVirtual());
             TODO_ASSERT_EQUALS(1, 0, db->findScopeByName("InfiniteA")->functionList.size());
         }
@@ -6940,7 +7193,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    C(B b) = 0;\n"
                       "    C(C& c) = default;"
                       "    void g();\n"
-                      "};");
+                      "};\n");
         ASSERT(db && db->scopeList.back().functionList.size() == 4);
         auto it = db->scopeList.back().functionList.cbegin();
         ASSERT((it++)->isPure());
@@ -6953,7 +7206,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("TEST(a,b) {\n"
                       "  std::vector<int> messages;\n"
                       "  foo(messages[2].size());\n"
-                      "}");
+                      "}\n");
         const Variable * const var = db ? db->getVariableFromVarId(1U) : nullptr;
         ASSERT(db &&
                db->findScopeByName("TEST") &&
@@ -6972,7 +7225,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    t = PTRRELOC(t);\n"
                       "    *PTRRELOC(&x) = &y;\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *funcStart, *argStart, *declEnd;
         ASSERT(db && !db->isFunction(Token::findsimplematch(tokenizer.tokens(), "PTRRELOC ( &"), &db->scopeList.back(), funcStart, argStart, declEnd));
@@ -6985,7 +7238,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("std::vector<int>&& f(std::vector<int>& v) {\n"
                       "    v.push_back(1);\n"
                       "    return std::move(v);\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         ASSERT_EQUALS(2, db->scopeList.size());
         const Token* ret = Token::findsimplematch(tokenizer.tokens(), "return");
@@ -7013,7 +7266,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void bar() {\n"    /* 3 */
                       "    foo();\n"      /* 4 */
                       "    foo(1);\n"     /* 5 */
-                      "}");               /* 6 */
+                      "}\n");               /* 6 */
         ASSERT_EQUALS("", errout_str());
         ASSERT(db);
         const Scope * bar = db->findScopeByName("bar");
@@ -7042,7 +7295,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void otherfunc() {\n"
                       "    float t;\n"
                       "    func(x, &t);\n"
-                      "}");
+                      "}\n");
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "func ( x , & t ) ;");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
@@ -7056,7 +7309,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void foo() {\n"
                       "    derived d;\n"
                       "    d.foo();\n"
-                      "}");
+                      "}\n");
 
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "d . foo ( ) ;");
         ASSERT_EQUALS("", errout_str());
@@ -7124,7 +7377,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(crf);\n"
                       "    foo(crd);\n"
                       "    foo(crld);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7224,7 +7477,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    int syncpos, len;\n"
                       "    Sync(syncpos, type, len);\n"
                       "    Sync(type, len);\n"
-                      "}");
+                      "}\n");
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "Sync ( syncpos");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 3);
 
@@ -7236,7 +7489,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void addtoken(Token** rettail, const Token *tok);\n"
                       "void CheckMemoryLeakInFunction::getcode(const Token *tok ) {\n"
                       "   addtoken(&rettail, tok);\n"
-                      "}");
+                      "}\n");
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "void addtoken ( Token * *");
         ASSERT_EQUALS(true, db && f && !f->function()); // regression value only
     }
@@ -7252,7 +7505,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        power.nodeResults().size();\n"
                       "        assert(power.nodeResults().size()==ground.nodeResults().size());\n"
                       "    }\n"
-                      "};");
+                      "};\n");
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "power . nodeResults ( ) . size ( ) ;");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
@@ -7280,7 +7533,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void S::g() &&{ }\n"
                       "void S::g() const   { }\n"
                       "void S::g() const & { }\n"
-                      "void S::g() const &&{ }");
+                      "void S::g() const &&{ }\n");
         ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( ) {");
@@ -7342,7 +7595,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct Fred {\n"
                       "    void foo(const int * p);\n"
                       "};\n"
-                      "void Fred::foo(const int * const p) { }");
+                      "void Fred::foo(const int * const p) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( const int * const p ) {");
@@ -7353,7 +7606,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct Fred {\n"
                       "    void foo(const int * p);\n"
                       "};\n"
-                      "void Fred::foo(const int p []) { }");
+                      "void Fred::foo(const int p []) { }\n");
         ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( const int p [ ] ) {");
@@ -7370,7 +7623,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(bar());\n"
                       "    foo(cp);\n"
                       "    foo(\"\");\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7408,7 +7661,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(fp);\n"
                       "    foo(cp);\n"
                       "    foo(\"\");\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7456,7 +7709,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo2(0);\n"
                       "    foo2(nullptr);\n"
                       "    foo2(NULL);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7505,7 +7758,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo2(5, L'c');\n"
                       "    foo3(6, 'c');\n"
                       "    foo3(7, L'c');\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7545,7 +7798,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(C::si);\n"
                       "    foo(c.ip);\n"
                       "    foo(c.fp);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7582,7 +7835,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(!b);\n"
                       "    foo(i > 0);\n"
                       "    foo(f + i);\n"
-                      "}");
+                      "}\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7608,7 +7861,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(float f) const { }\n"
                       "    void a() { f(1); }\n"
                       "    void b() { f(1.f); }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7653,7 +7906,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        E1                 v13 = e1;     v13 = get(get(v13));\n"
                       "        E2                 v14 = E2::e2; v14 = get(get(v14));\n"
                       "    }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
         ASSERT(db);
@@ -7691,20 +7944,12 @@ class TestSymbolDatabase : public TestFixture {
         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v7 ) ) ;");
         ASSERT(f);
         ASSERT(f->function());
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS(10, f->function()->tokenDef->linenr());
-        } else {
-            ASSERT_EQUALS(5, f->function()->tokenDef->linenr());
-        }
+        ASSERT_EQUALS(10, f->function()->tokenDef->linenr());
 
         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v8 ) ) ;");
         ASSERT(f);
         ASSERT(f->function());
-        if (std::numeric_limits<char>::is_signed) {
-            ASSERT_EQUALS(5, f->function()->tokenDef->linenr());
-        } else {
-            ASSERT_EQUALS(11, f->function()->tokenDef->linenr());
-        }
+        ASSERT_EQUALS(11, f->function()->tokenDef->linenr());
 
         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v9 ) ) ;");
         ASSERT(f);
@@ -7754,7 +7999,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    }\n"
                       "    int _x;\n"
                       "    int _y;\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -7773,7 +8018,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(foo *myFoo) {\n"
                       "    int* myThing = myFoo->GetThing();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -7792,7 +8037,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(const foo *myFoo) {\n"
                       "    int* myThing = myFoo->GetThing();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -7811,7 +8056,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(foo *myFoo) {\n"
                       "    int* myThing = ((const foo *)myFoo)->GetThing();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db != nullptr);
 
@@ -7829,7 +8074,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f(std::shared_ptr<foo> p) {\n"
                       "  p->dostuff();\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), ". dostuff ( ) ;")->next();
         ASSERT(tok1->function());
@@ -7846,7 +8091,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    {\n"
                       "        p->dostuff();\n"
                       "    }\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), ". dostuff ( ) ;")->next();
         ASSERT(tok1->function());
@@ -7857,7 +8102,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void dostuff(float) {}\n"
                       "void f(int *p) {\n"
                       "  dostuff(p);\n"
-                      "}");
+                      "}\n");
         ASSERT(db != nullptr);
         const Token *dostuff1 = Token::findsimplematch(tokenizer.tokens(), "dostuff ( p ) ;");
         ASSERT(dostuff1->function());
@@ -7867,7 +8112,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void findFunction27() {
         GET_SYMBOL_DB("namespace { void a(int); }\n"
-                      "void f() { a(9); }");
+                      "void f() { a(9); }\n");
         const Token *a = Token::findsimplematch(tokenizer.tokens(), "a ( 9 )");
         ASSERT(a);
         ASSERT(a->function());
@@ -7878,7 +8123,7 @@ class TestSymbolDatabase : public TestFixture {
                       "struct S {\n"
                       "  void foo() { a(7); }\n"
                       "  void a(int);\n"
-                      "};");
+                      "};\n");
         const Token *a = Token::findsimplematch(tokenizer.tokens(), "a ( 7 )");
         ASSERT(a);
         ASSERT(a->function());
@@ -7899,7 +8144,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void bar(BPtr b) {\n"
                       "    int x = b->a.foo();\n"
-                      "}");
+                      "}\n");
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( ) ;");
         ASSERT(foo);
         ASSERT(foo->function());
@@ -7911,7 +8156,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("struct A;\n"
                       "void foo(std::shared_ptr<A> ptr) {\n"
                       "    int x = ptr->bar();\n"
-                      "}");
+                      "}\n");
         const Token *bar = Token::findsimplematch(tokenizer.tokens(), "bar ( ) ;");
         ASSERT(bar);
         ASSERT(!bar->function());
@@ -7920,7 +8165,7 @@ class TestSymbolDatabase : public TestFixture {
     void findFunction31() {
         GET_SYMBOL_DB("void foo(bool);\n"
                       "void foo(std::string s);\n"
-                      "void bar() { foo(\"123\"); }");
+                      "void bar() { foo(\"123\"); }\n");
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( \"123\" ) ;");
         ASSERT(foo);
         ASSERT(foo->function());
@@ -7930,7 +8175,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void findFunction32() {
         GET_SYMBOL_DB_C("void foo(char *p);\n"
-                        "void bar() { foo(\"123\"); }");
+                        "void bar() { foo(\"123\"); }\n");
         (void)db;
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( \"123\" ) ;");
         ASSERT(foo);
@@ -7952,7 +8197,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo();\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( ) ;");
             ASSERT(foo);
@@ -7972,7 +8217,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 ) ;");
             ASSERT(foo);
@@ -7992,7 +8237,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1,2);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 , 2 ) ;");
             ASSERT(foo);
@@ -8012,7 +8257,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 ) ;");
             ASSERT(foo);
@@ -8032,7 +8277,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1,2);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 , 2 ) ;");
             ASSERT(foo);
@@ -8052,7 +8297,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void doIt() const {\n"
                           "        foo(1, 2, 3);\n"
                           "    }\n"
-                          "};");
+                          "};\n");
             (void)db;
             const Token *foo = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 , 2 , 3 ) ;");
             ASSERT(foo);
@@ -8073,7 +8318,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void selectOneVsConfig(cppcheck::Platform::PlatformType);\n"
                       "};\n"
                       "class Settings : public cppcheck::Platform { };\n"
-                      "void ImportProject::selectOneVsConfig(Settings::PlatformType) { }");
+                      "void ImportProject::selectOneVsConfig(Settings::PlatformType) { }\n");
         (void)db;
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "selectOneVsConfig ( Settings :: PlatformType ) { }");
         ASSERT(foo);
@@ -8091,7 +8336,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    };\n"
                       "}\n"
                       "::clangimport::AstNode::AstNode() { }\n"
-                      "void ::clangimport::AstNode::createTokens() { }");
+                      "void ::clangimport::AstNode::createTokens() { }\n");
         (void)db;
         const Token *foo = Token::findsimplematch(tokenizer.tokens(), "AstNode ( ) { }");
         ASSERT(foo);
@@ -8117,7 +8362,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n"
                       "namespace ns {\n"
                       "    void A::f(external::T link_type) { }\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( external :: T link_type )");
         ASSERT(functok);
@@ -8135,7 +8380,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(const ns::V&);\n"
                       "};\n"
                       "using ::ns::V;\n"
-                      "void A::f(const V&) { }");
+                      "void A::f(const V&) { }\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( const :: ns :: V & )");
         ASSERT(functok);
@@ -8153,7 +8398,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(const ns::Var&);\n"
                       "};\n"
                       "using ::ns::Var;\n"
-                      "void A::f(const Var&) {}");
+                      "void A::f(const Var&) {}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( const :: ns :: V & )");
         ASSERT(functok);
@@ -8173,7 +8418,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void f(external::V::I);\n"
                       "};\n"
                       "using ::external::V;\n"
-                      "void A::f(V::I) {}");
+                      "void A::f(V::I) {}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( int )");
         ASSERT(functok);
@@ -8189,7 +8434,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "const char* E::what() const noexcept {\n"
                       "    return nullptr;\n"
-                      "}");
+                      "}\n");
         ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "what ( ) const noexcept ( true ) {");
         ASSERT(functok);
@@ -8439,7 +8684,7 @@ class TestSymbolDatabase : public TestFixture {
                           "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
                           "  void test(const std::string& str_obj);\n"
                           "  B* b_obj;\n"
-                          "};");
+                          "};\n");
             const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
             ASSERT(call);
             ASSERT(call->function());
@@ -8458,7 +8703,7 @@ class TestSymbolDatabase : public TestFixture {
                           "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
                           "  void test(const STR& str_obj);\n"
                           "  B* b_obj;\n"
-                          "};");
+                          "};\n");
             const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
             ASSERT(call);
             ASSERT(call->function());
@@ -8477,7 +8722,7 @@ class TestSymbolDatabase : public TestFixture {
                           "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
                           "  void test(const STR& str_obj);\n"
                           "  B* b_obj;\n"
-                          "};");
+                          "};\n");
             const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
             ASSERT(call);
             ASSERT(call->function());
@@ -8632,6 +8877,119 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(fun && !fun->function());
     }
 
+    void findFunction61() {
+        GET_SYMBOL_DB("namespace N {\n" // #13975
+                      "    struct B {\n"
+                      "        virtual ~B() = default;\n"
+                      "    };\n"
+                      "    struct D : B {\n"
+                      "        D() : B() {}\n"
+                      "    };\n"
+                      "}\n");
+        const Token* fun = Token::findsimplematch(tokenizer.tokens(), "B ( ) {");
+        ASSERT(fun && !fun->function());
+    }
+
+    void findFunction62() { // #14272
+        GET_SYMBOL_DB("class Token {\n"
+                      "    std::string stringifyList(const Token* end, bool attributes = true) const;\n"
+                      "    std::string stringifyList(bool varid = false) const;\n"
+                      "};\n"
+                      "\n"
+                      "void foo(const Token * const tokIf) {\n"
+                      "    tokIf->stringifyList(tokIf);\n"
+                      "}\n");
+        const Token* functionCall = Token::findsimplematch(tokenizer.tokens(), "stringifyList ( tokIf )");
+        ASSERT(functionCall);
+        ASSERT(functionCall->function());
+        ASSERT(functionCall->function()->token);
+        ASSERT_EQUALS(2, functionCall->function()->token->linenr());
+    }
+
+    void findFunction63()
+    { // #14937
+        GET_SYMBOL_DB("struct A {\n"
+                      "    void g(int);\n"
+                      "};\n"
+                      "template<class T>\n"
+                      "struct Thunk {\n"
+                      "    T& operator()() const;\n"
+                      "};\n"
+                      "void f(Thunk<A> thunk) {\n"
+                      "    thunk().g(0);\n"
+                      "}\n");
+        const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 0 )");
+        ASSERT(g);
+        ASSERT(g->function());
+        ASSERT(g->function()->tokenDef);
+        ASSERT_EQUALS(2, g->function()->tokenDef->linenr());
+        const Token* call = Token::findsimplematch(tokenizer.tokens(), "( ) . g");
+        ASSERT(call && call->valueType());
+        ASSERT(call->valueType()->typeScope && call->valueType()->typeScope->className == "A");
+        ASSERT_EQUALS(static_cast<int>(Reference::LValue), static_cast<int>(call->valueType()->reference));
+    }
+
+    void findFunction64()
+    {                                                    // overloaded operator()
+        {
+            GET_SYMBOL_DB("struct A { void g(int); };\n" // overloads distinguished by argument count
+                          "struct B { void h(int); };\n"
+                          "template<class T>\n"
+                          "struct C {\n"
+                          "    A& operator()();\n"
+                          "    B& operator()(int);\n"
+                          "};\n"
+                          "void f(C<int> c) {\n"
+                          "    c().g(1);\n"
+                          "    c(1).h(1);\n"
+                          "}\n");
+            const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 1 )");
+            ASSERT(g && g->function());
+            ASSERT_EQUALS(1, g->function()->tokenDef->linenr());
+            const Token* h = Token::findsimplematch(tokenizer.tokens(), "h ( 1 )");
+            ASSERT(h && h->function());
+            ASSERT_EQUALS(2, h->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct A { void g(int); };\n" // overloads distinguished by constness of the object
+                          "struct B { void h(int); };\n"
+                          "template<class T>\n"
+                          "struct C {\n"
+                          "    A& operator()();\n"
+                          "    B& operator()() const;\n"
+                          "};\n"
+                          "void f(C<int> c, const C<int>& k) {\n"
+                          "    c().g(1);\n"
+                          "    k().h(1);\n"
+                          "}\n");
+            const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 1 )");
+            ASSERT(g && g->function());
+            ASSERT_EQUALS(1, g->function()->tokenDef->linenr());
+            const Token* h = Token::findsimplematch(tokenizer.tokens(), "h ( 1 )");
+            ASSERT(h && h->function());
+            ASSERT_EQUALS(2, h->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct A { void g(int); };\n" // overloads distinguished by argument type
+                          "struct B { void h(int); };\n"
+                          "template<class T>\n"
+                          "struct C {\n"
+                          "    A& operator()(int);\n"
+                          "    B& operator()(double);\n"
+                          "};\n"
+                          "void f(C<int> c, int i, double d) {\n"
+                          "    c(i).g(1);\n"
+                          "    c(d).h(1);\n"
+                          "}\n");
+            const Token* g = Token::findsimplematch(tokenizer.tokens(), "g ( 1 )");
+            ASSERT(g && g->function());
+            ASSERT_EQUALS(1, g->function()->tokenDef->linenr());
+            const Token* h = Token::findsimplematch(tokenizer.tokens(), "h ( 1 )");
+            ASSERT(h && h->function());
+            ASSERT_EQUALS(2, h->function()->tokenDef->linenr());
+        }
+    }
+
     void findFunctionRef1() {
         GET_SYMBOL_DB("struct X {\n"
                       "    const std::vector<int> getInts() const & { return mInts; }\n"
@@ -8675,7 +9033,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("void dostuff(std::vector<int> v);\n"
                           "void f(std::vector<int> v) {\n"
                           "  dostuff(v);\n"
-                          "}");
+                          "}\n");
             (void)db;
             const Token *dostuff = Token::findsimplematch(tokenizer.tokens(), "dostuff ( v ) ;");
             ASSERT(dostuff->function());
@@ -8687,7 +9045,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void dostuff(int *i);\n"
                           "void f(std::vector<char> v) {\n"
                           "  dostuff(v);\n"
-                          "}");
+                          "}\n");
             (void)db;
             const Token *dostuff = Token::findsimplematch(tokenizer.tokens(), "dostuff ( v ) ;");
             ASSERT(!dostuff->function());
@@ -8698,7 +9056,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("extern \"C\" { void foo(int); }\n"
                       "void bar() {\n"
                       "    foo(42);\n"
-                      "}");
+                      "}\n");
         const Token *a = Token::findsimplematch(tokenizer.tokens(), "foo ( 42 )");
         ASSERT(a);
         ASSERT(a->function());
@@ -8714,7 +9072,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void S::foo() {\n"
                       "    x = ::bar(x);\n"
-                      "}");
+                      "}\n");
         const Token *bar = Token::findsimplematch(tokenizer.tokens(), "bar ( x )");
         ASSERT(bar);
         ASSERT(bar->function());
@@ -8727,7 +9085,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void foo(S x) {\n"
                       "    x(123);\n"
-                      "}");
+                      "}\n");
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "x . operator() ( 123 )");
         ASSERT(tok);
         ASSERT(tok->tokAt(2)->function());
@@ -8764,7 +9122,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void func1() noexcept;\n"
                       "void func2() noexcept { }\n"
                       "void func3() noexcept(true);\n"
-                      "void func4() noexcept(true) { }");
+                      "void func4() noexcept(true) { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -8775,7 +9133,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void noexceptFunction2() {
-        GET_SYMBOL_DB("template <class T> void self_assign(T& t) noexcept(noexcept(t = t)) {t = t; }");
+        GET_SYMBOL_DB("template <class T> void self_assign(T& t) noexcept(noexcept(t = t)) {t = t; }\n");
 
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
@@ -8804,7 +9162,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void func11() const noexcept(true) = 0;\n"
                       "    void func12() const noexcept(true) = 0;\n"
                       "    void func13() const noexcept(false) = 0;\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -8836,7 +9194,7 @@ class TestSymbolDatabase : public TestFixture {
                       "   A a;\n"
                       "   B(B&& b) noexcept\n"
                       "   :a(std::move(b.a)) { }\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT(db != nullptr); // not null
         const Scope *b = db->findScopeByName("B");
@@ -8854,7 +9212,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void func1() throw();\n"
                       "void func2() throw() { }\n"
                       "void func3() throw(int);\n"
-                      "void func4() throw(int) { }");
+                      "void func4() throw(int) { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT(db != nullptr); // not null
 
@@ -8883,7 +9241,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void func10() throw(int) = 0;\n"
                       "    void func11() const throw() = 0;\n"
                       "    void func12() const throw(int) = 0;\n"
-                      "};");
+                      "};\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -8904,7 +9262,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void constAttributeFunction() {
-        GET_SYMBOL_DB("void func(void) __attribute__((const));");
+        GET_SYMBOL_DB("void func(void) __attribute__((const));\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
 
@@ -8914,7 +9272,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void pureAttributeFunction() {
-        GET_SYMBOL_DB("void func(void) __attribute__((pure));");
+        GET_SYMBOL_DB("void func(void) __attribute__((pure));\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
 
@@ -8925,7 +9283,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void nothrowAttributeFunction() {
         GET_SYMBOL_DB("void func() __attribute__((nothrow));\n"
-                      "void func() { }");
+                      "void func() { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -8935,7 +9293,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void nothrowDeclspecFunction() {
-        GET_SYMBOL_DB("void __declspec(nothrow) func() { }");
+        GET_SYMBOL_DB("void __declspec(nothrow) func() { }\n");
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
@@ -8987,7 +9345,7 @@ class TestSymbolDatabase : public TestFixture {
                       "int func1() { }\n"
                       "[[nodiscard]] int func2();\n"
                       "[[nodiscard]] int func3() { }\n"
-                      "template <class T> [[nodiscard]] int func4() { }"
+                      "template <class T> [[nodiscard]] int func4() { }\n"
                       "std::pair<bool, char> [[nodiscard]] func5();\n"
                       "[[nodiscard]] std::pair<bool, char> func6();\n"
                       );
@@ -9020,7 +9378,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void varTypesIntegral() {
-        GET_SYMBOL_DB("void f() { bool b; char c; unsigned char uc; short s; unsigned short us; int i; unsigned u; unsigned int ui; long l; unsigned long ul; long long ll; }");
+        GET_SYMBOL_DB("void f() { bool b; char c; unsigned char uc; short s; unsigned short us; int i; unsigned u; unsigned int ui; long l; unsigned long ul; long long ll; }\n");
         const Variable *b = db->getVariableFromVarId(1);
         ASSERT(b != nullptr);
         ASSERT_EQUALS("b", b->nameToken()->str());
@@ -9079,7 +9437,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void varTypesFloating() {
         {
-            GET_SYMBOL_DB("void f() { float f; double d; long double ld; }");
+            GET_SYMBOL_DB("void f() { float f; double d; long double ld; }\n");
             const Variable *f = db->getVariableFromVarId(1);
             ASSERT(f != nullptr);
             ASSERT_EQUALS("f", f->nameToken()->str());
@@ -9096,7 +9454,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS(true, ld->isFloatingType());
         }
         {
-            GET_SYMBOL_DB("void f() { float * f; static const float * scf; }");
+            GET_SYMBOL_DB("void f() { float * f; static const float * scf; }\n");
             const Variable *f = db->getVariableFromVarId(1);
             ASSERT(f != nullptr);
             ASSERT_EQUALS("f", f->nameToken()->str());
@@ -9110,7 +9468,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS(true, scf->isArrayOrPointer());
         }
         {
-            GET_SYMBOL_DB("void f() { float fa[42]; }");
+            GET_SYMBOL_DB("void f() { float fa[42]; }\n");
             const Variable *fa = db->getVariableFromVarId(1);
             ASSERT(fa != nullptr);
             ASSERT_EQUALS("fa", fa->nameToken()->str());
@@ -9120,7 +9478,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void varTypesOther() {
-        GET_SYMBOL_DB("void f() { class A {} a; void *b;  }");
+        GET_SYMBOL_DB("void f() { class A {} a; void *b;  }\n");
         const Variable *a = db->getVariableFromVarId(1);
         ASSERT(a != nullptr);
         ASSERT_EQUALS("a", a->nameToken()->str());
@@ -9152,7 +9510,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        y += 10.0f - x;\n"
                       "    }\n"
                       "    lambda();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && db->scopeList.size() == 3);
         auto scope = db->scopeList.cbegin();
@@ -9171,7 +9529,7 @@ class TestSymbolDatabase : public TestFixture {
                       "        float x = 1.0f;\n"
                       "    };\n"
                       "    lambda();\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && db->scopeList.size() == 3);
         auto scope = db->scopeList.cbegin();
@@ -9185,7 +9543,7 @@ class TestSymbolDatabase : public TestFixture {
     void lambda3() {
         GET_SYMBOL_DB("void func() {\n"
                       "    auto f = []() mutable {};\n"
-                      "}");
+                      "}\n");
 
         ASSERT(db && db->scopeList.size() == 3);
         auto scope = db->scopeList.cbegin();
@@ -9251,7 +9609,7 @@ class TestSymbolDatabase : public TestFixture {
               "int main() {\n"
               "	E c;\n"
               "	c.f();\n"
-              "}");
+              "}\n");
     }
 
     void executableScopeWithUnknownFunction() {
@@ -9259,7 +9617,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("class Fred {\n"
                           "    void foo(const std::string & a = \"\");\n"
                           "};\n"
-                          "Fred::foo(const std::string & b) { }");
+                          "Fred::foo(const std::string & b) { }\n");
 
             ASSERT(db && db->scopeList.size() == 3);
             auto scope = db->scopeList.cbegin();
@@ -9311,232 +9669,232 @@ class TestSymbolDatabase : public TestFixture {
                                          $.platform.long_long_bit = 64);
 
         // numbers
-        ASSERT_EQUALS("signed int", typeOf("1;", "1", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("(-1);", "-1", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("32767;", "32767", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("(-32767);", "-32767", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("32768;", "32768", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("(-32768);", "-32768", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("32768l;", "32768l", false, &s));
-        ASSERT_EQUALS("unsigned int", typeOf("32768U;", "32768U", false, &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648;", "2147483648", false, &s));
-        ASSERT_EQUALS("unsigned long", typeOf("2147483648u;", "2147483648u", false, &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648L;", "2147483648L", false, &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("18446744069414584320;", "18446744069414584320", false, &s));
-        ASSERT_EQUALS("signed int", typeOf("0xFF;", "0xFF", false, &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFU;", "0xFFU", false, &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFFF;", "0xFFFF", false, &s));
-        ASSERT_EQUALS("signed long", typeOf("0xFFFFFF;", "0xFFFFFF", false, &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFU;", "0xFFFFFFU", false, &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFFF;", "0xFFFFFFFF", false, &s));
-        ASSERT_EQUALS("signed long long", typeOf("0xFFFFFFFFFFFF;", "0xFFFFFFFFFFFF", false, &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFFFFFFU;", "0xFFFFFFFFFFFFU", false, &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFF00000000;", "0xFFFFFFFF00000000", false, &s));
-
-        ASSERT_EQUALS("signed long", typeOf("2147483648;", "2147483648", false, &sSameSize));
-        ASSERT_EQUALS("unsigned long", typeOf("0xc000000000000000;", "0xc000000000000000", false, &sSameSize));
-
-        ASSERT_EQUALS("unsigned int", typeOf("1U;", "1U"));
-        ASSERT_EQUALS("signed long", typeOf("1L;", "1L"));
-        ASSERT_EQUALS("unsigned long", typeOf("1UL;", "1UL"));
-        ASSERT_EQUALS("signed long long", typeOf("1LL;", "1LL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1ULL;", "1ULL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1LLU;", "1LLU"));
-        ASSERT_EQUALS("signed long long", typeOf("1i64;", "1i64"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1ui64;", "1ui64"));
-        ASSERT_EQUALS("unsigned int", typeOf("1u;", "1u"));
-        ASSERT_EQUALS("signed long", typeOf("1l;", "1l"));
-        ASSERT_EQUALS("unsigned long", typeOf("1ul;", "1ul"));
-        ASSERT_EQUALS("signed long long", typeOf("1ll;", "1ll"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1ull;", "1ull"));
-        ASSERT_EQUALS("unsigned long long", typeOf("1llu;", "1llu"));
-        ASSERT_EQUALS("signed int", typeOf("01;", "01"));
-        ASSERT_EQUALS("unsigned int", typeOf("01U;", "01U"));
-        ASSERT_EQUALS("signed long", typeOf("01L;", "01L"));
-        ASSERT_EQUALS("unsigned long", typeOf("01UL;", "01UL"));
-        ASSERT_EQUALS("signed long long", typeOf("01LL;", "01LL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("01ULL;", "01ULL"));
-        ASSERT_EQUALS("signed int", typeOf("0B1;", "0B1"));
-        ASSERT_EQUALS("signed int", typeOf("0b1;", "0b1"));
-        ASSERT_EQUALS("unsigned int", typeOf("0b1U;", "0b1U"));
-        ASSERT_EQUALS("signed long", typeOf("0b1L;", "0b1L"));
-        ASSERT_EQUALS("unsigned long", typeOf("0b1UL;", "0b1UL"));
-        ASSERT_EQUALS("signed long long", typeOf("0b1LL;", "0b1LL"));
-        ASSERT_EQUALS("unsigned long long", typeOf("0b1ULL;", "0b1ULL"));
-        ASSERT_EQUALS("float", typeOf("1.0F;", "1.0F"));
-        ASSERT_EQUALS("float", typeOf("1.0f;", "1.0f"));
-        ASSERT_EQUALS("double", typeOf("1.0;", "1.0"));
-        ASSERT_EQUALS("double", typeOf("1E3;", "1E3"));
-        ASSERT_EQUALS("double", typeOf("0x1.2p3;", "0x1.2p3"));
-        ASSERT_EQUALS("long double", typeOf("1.23L;", "1.23L"));
-        ASSERT_EQUALS("long double", typeOf("1.23l;", "1.23l"));
+        ASSERT_EQUALS("signed int", typeOf("1;\n", "1", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("(-1);\n", "-1", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("32767;\n", "32767", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("(-32767);\n", "-32767", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("32768;\n", "32768", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("(-32768);\n", "-32768", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("32768l;\n", "32768l", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("32768U;\n", "32768U", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("2147483648;\n", "2147483648", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("2147483648u;\n", "2147483648u", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("2147483648L;\n", "2147483648L", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("18446744069414584320;\n", "18446744069414584320", false, &s));
+        ASSERT_EQUALS("signed int", typeOf("0xFF;\n", "0xFF", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("0xFFU;\n", "0xFFU", false, &s));
+        ASSERT_EQUALS("unsigned int", typeOf("0xFFFF;\n", "0xFFFF", false, &s));
+        ASSERT_EQUALS("signed long", typeOf("0xFFFFFF;\n", "0xFFFFFF", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFU;\n", "0xFFFFFFU", false, &s));
+        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFFF;\n", "0xFFFFFFFF", false, &s));
+        ASSERT_EQUALS("signed long long", typeOf("0xFFFFFFFFFFFF;\n", "0xFFFFFFFFFFFF", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFFFFFFU;\n", "0xFFFFFFFFFFFFU", false, &s));
+        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFF00000000;\n", "0xFFFFFFFF00000000", false, &s));
+
+        ASSERT_EQUALS("signed long", typeOf("2147483648;\n", "2147483648", false, &sSameSize));
+        ASSERT_EQUALS("unsigned long", typeOf("0xc000000000000000;\n", "0xc000000000000000", false, &sSameSize));
+
+        ASSERT_EQUALS("unsigned int", typeOf("1U;\n", "1U"));
+        ASSERT_EQUALS("signed long", typeOf("1L;\n", "1L"));
+        ASSERT_EQUALS("unsigned long", typeOf("1UL;\n", "1UL"));
+        ASSERT_EQUALS("signed long long", typeOf("1LL;\n", "1LL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1ULL;\n", "1ULL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1LLU;\n", "1LLU"));
+        ASSERT_EQUALS("signed long long", typeOf("1i64;\n", "1i64"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1ui64;\n", "1ui64"));
+        ASSERT_EQUALS("unsigned int", typeOf("1u;\n", "1u"));
+        ASSERT_EQUALS("signed long", typeOf("1l;\n", "1l"));
+        ASSERT_EQUALS("unsigned long", typeOf("1ul;\n", "1ul"));
+        ASSERT_EQUALS("signed long long", typeOf("1ll;\n", "1ll"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1ull;\n", "1ull"));
+        ASSERT_EQUALS("unsigned long long", typeOf("1llu;\n", "1llu"));
+        ASSERT_EQUALS("signed int", typeOf("01;\n", "01"));
+        ASSERT_EQUALS("unsigned int", typeOf("01U;\n", "01U"));
+        ASSERT_EQUALS("signed long", typeOf("01L;\n", "01L"));
+        ASSERT_EQUALS("unsigned long", typeOf("01UL;\n", "01UL"));
+        ASSERT_EQUALS("signed long long", typeOf("01LL;\n", "01LL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("01ULL;\n", "01ULL"));
+        ASSERT_EQUALS("signed int", typeOf("0B1;\n", "0B1"));
+        ASSERT_EQUALS("signed int", typeOf("0b1;\n", "0b1"));
+        ASSERT_EQUALS("unsigned int", typeOf("0b1U;\n", "0b1U"));
+        ASSERT_EQUALS("signed long", typeOf("0b1L;\n", "0b1L"));
+        ASSERT_EQUALS("unsigned long", typeOf("0b1UL;\n", "0b1UL"));
+        ASSERT_EQUALS("signed long long", typeOf("0b1LL;\n", "0b1LL"));
+        ASSERT_EQUALS("unsigned long long", typeOf("0b1ULL;\n", "0b1ULL"));
+        ASSERT_EQUALS("float", typeOf("1.0F;\n", "1.0F"));
+        ASSERT_EQUALS("float", typeOf("1.0f;\n", "1.0f"));
+        ASSERT_EQUALS("double", typeOf("1.0;\n", "1.0"));
+        ASSERT_EQUALS("double", typeOf("1E3;\n", "1E3"));
+        ASSERT_EQUALS("double", typeOf("0x1.2p3;\n", "0x1.2p3"));
+        ASSERT_EQUALS("long double", typeOf("1.23L;\n", "1.23L"));
+        ASSERT_EQUALS("long double", typeOf("1.23l;\n", "1.23l"));
 
         // Constant calculations
-        ASSERT_EQUALS("signed int", typeOf("1 + 2;", "+"));
-        ASSERT_EQUALS("signed long", typeOf("1L + 2;", "+"));
-        ASSERT_EQUALS("signed long long", typeOf("1LL + 2;", "+"));
-        ASSERT_EQUALS("float", typeOf("1.2f + 3;", "+"));
-        ASSERT_EQUALS("float", typeOf("1 + 2.3f;", "+"));
+        ASSERT_EQUALS("signed int", typeOf("1 + 2;\n", "+"));
+        ASSERT_EQUALS("signed long", typeOf("1L + 2;\n", "+"));
+        ASSERT_EQUALS("signed long long", typeOf("1LL + 2;\n", "+"));
+        ASSERT_EQUALS("float", typeOf("1.2f + 3;\n", "+"));
+        ASSERT_EQUALS("float", typeOf("1 + 2.3f;\n", "+"));
 
         // promotions
-        ASSERT_EQUALS("signed int", typeOf("(char)1 +  (char)2;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("(short)1 + (short)2;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (signed char)2;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (unsigned char)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed char)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned char)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed int)2;", "+"));
-        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned int)2;", "+"));
-        ASSERT_EQUALS("signed long", typeOf("(signed long)1 + (unsigned int)2;", "+"));
-        ASSERT_EQUALS("unsigned long", typeOf("(unsigned long)1 + (signed int)2;", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(char)1 +  (char)2;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(short)1 + (short)2;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (signed char)2;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("(signed int)1 + (unsigned char)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed char)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned char)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (signed int)2;\n", "+"));
+        ASSERT_EQUALS("unsigned int", typeOf("(unsigned int)1 + (unsigned int)2;\n", "+"));
+        ASSERT_EQUALS("signed long", typeOf("(signed long)1 + (unsigned int)2;\n", "+"));
+        ASSERT_EQUALS("unsigned long", typeOf("(unsigned long)1 + (signed int)2;\n", "+"));
 
         // char
-        ASSERT_EQUALS("char", typeOf("'a';", "'a'", true));
-        ASSERT_EQUALS("char", typeOf("'\\\'';", "'\\\''", true));
-        ASSERT_EQUALS("signed int", typeOf("'a';", "'a'", false));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", true));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", false));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", true));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", false));
+        ASSERT_EQUALS("char", typeOf("'a';\n", "'a'", true));
+        ASSERT_EQUALS("char", typeOf("'\\\'';\n", "'\\\''", true));
+        ASSERT_EQUALS("signed int", typeOf("'a';\n", "'a'", false));
+        ASSERT_EQUALS("wchar_t", typeOf("L'a';\n", "L'a'", true));
+        ASSERT_EQUALS("wchar_t", typeOf("L'a';\n", "L'a'", false));
+        ASSERT_EQUALS("signed int", typeOf("'aaa';\n", "'aaa'", true));
+        ASSERT_EQUALS("signed int", typeOf("'aaa';\n", "'aaa'", false));
 
         // char *
-        ASSERT_EQUALS("const char *", typeOf("\"hello\" + 1;", "+"));
-        ASSERT_EQUALS("const char",  typeOf("\"hello\"[1];", "["));
-        ASSERT_EQUALS("const char",  typeOf(";*\"hello\";", "*"));
-        ASSERT_EQUALS("const wchar_t *", typeOf("L\"hello\" + 1;", "+"));
+        ASSERT_EQUALS("const char *", typeOf("\"hello\" + 1;\n", "+"));
+        ASSERT_EQUALS("const char",  typeOf("\"hello\"[1];\n", "["));
+        ASSERT_EQUALS("const char",  typeOf(";*\"hello\";\n", "*"));
+        ASSERT_EQUALS("const wchar_t *", typeOf("L\"hello\" + 1;\n", "+"));
 
         // Variable calculations
-        ASSERT_EQUALS("void *", typeOf("void *p; a = p + 1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x + 1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x | 1;", "|"));
-        ASSERT_EQUALS("float", typeOf("float x; a = x + 1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("signed x; a = x + 1;", "x +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned x; a = x + 1;", "x +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1;",  "u1 +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1U;", "u1 +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + u2;", "u1 +"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * 2;",  "u1 *"));
-        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * u2;", "u1 *"));
-        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;", "&"));
-        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;", "&"));
-        ASSERT_EQUALS("long double", typeOf("long double x; dostuff(x,1);", "x ,"));
-        ASSERT_EQUALS("long double *", typeOf("long double x; dostuff(&x,1);", "& x ,"));
-        ASSERT_EQUALS("signed int", typeOf("struct X {int i;}; void f(struct X x) { x.i }", "."));
-        ASSERT_EQUALS("signed int *", typeOf("int *p; a = p++;", "++"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x++;", "++"));
-        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; AB *ab; x=ab+2;", "+"));
-        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; enum AB *ab; x=ab+2;", "+"));
-        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; AB ab; x=&ab;", "&"));
-        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; struct AB ab; x=&ab;", "&"));
-        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC abc; x=&abc;", "&"));
-        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC *abc; x=abc+1;", "+"));
-        ASSERT_EQUALS("signed int", typeOf("auto a(int& x, int& y) { return x + y; }", "+"));
-        ASSERT_EQUALS("signed int", typeOf("auto a(int& x) { return x << 1; }", "<<"));
-        ASSERT_EQUALS("signed int", typeOf("void a(int& x, int& y) { x = y; }", "=")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
-        ASSERT_EQUALS("signed int", typeOf("auto a(int* y) { return *y; }", "*")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
+        ASSERT_EQUALS("void *", typeOf("void *p; a = p + 1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x + 1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x | 1;\n", "|"));
+        ASSERT_EQUALS("float", typeOf("float x; a = x + 1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("signed x; a = x + 1;\n", "x +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned x; a = x + 1;\n", "x +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1;\n",  "u1 +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + 1U;\n", "u1 +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 + u2;\n", "u1 +"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * 2;\n",  "u1 *"));
+        ASSERT_EQUALS("unsigned int", typeOf("unsigned int u1, u2; a = u1 * u2;\n", "u1 *"));
+        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;\n", "&"));
+        ASSERT_EQUALS("signed int *", typeOf("int x; a = &x;\n", "&"));
+        ASSERT_EQUALS("long double", typeOf("long double x; dostuff(x,1);\n", "x ,"));
+        ASSERT_EQUALS("long double *", typeOf("long double x; dostuff(&x,1);\n", "& x ,"));
+        ASSERT_EQUALS("signed int", typeOf("struct X {int i;}; void f(struct X x) { x.i }\n", "."));
+        ASSERT_EQUALS("signed int *", typeOf("int *p; a = p++;\n", "++"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x++;\n", "++"));
+        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; AB *ab; x=ab+2;\n", "+"));
+        ASSERT_EQUALS("signed int *", typeOf("enum AB {A,B}; enum AB *ab; x=ab+2;\n", "+"));
+        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; AB ab; x=&ab;\n", "&"));
+        ASSERT_EQUALS("AB *", typeOf("struct AB {int a; int b;}; struct AB ab; x=&ab;\n", "&"));
+        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC abc; x=&abc;\n", "&"));
+        ASSERT_EQUALS("A::BC *", typeOf("namespace A { struct BC { int b; int c; }; }; struct A::BC *abc; x=abc+1;\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("auto a(int& x, int& y) { return x + y; }\n", "+"));
+        ASSERT_EQUALS("signed int", typeOf("auto a(int& x) { return x << 1; }\n", "<<"));
+        ASSERT_EQUALS("signed int", typeOf("void a(int& x, int& y) { x = y; }\n", "=")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
+        ASSERT_EQUALS("signed int", typeOf("auto a(int* y) { return *y; }\n", "*")); //Debatably this should be a signed int & but we'll stick with the current behavior for now
 
         // Unary arithmetic/bit operators
-        ASSERT_EQUALS("signed int", typeOf("int x; a = -x;", "-"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = ~x;", "~"));
-        ASSERT_EQUALS("double", typeOf("double x; a = -x;", "-"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = -x;\n", "-"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = ~x;\n", "~"));
+        ASSERT_EQUALS("double", typeOf("double x; a = -x;\n", "-"));
 
         // Ternary operator
-        ASSERT_EQUALS("signed int", typeOf("int x; a = (b ? x : x);", "?"));
-        ASSERT_EQUALS("", typeOf("int x; a = (b ? x : y);", "?"));
-        ASSERT_EQUALS("double", typeOf("int x; double y; a = (b ? x : y);", "?"));
-        ASSERT_EQUALS("const char *", typeOf("int x; double y; a = (b ? \"a\" : \"b\");", "?"));
-        ASSERT_EQUALS("", typeOf("int x; double y; a = (b ? \"a\" : std::string(\"b\"));", "?"));
-        ASSERT_EQUALS("bool", typeOf("int x; a = (b ? false : true);", "?"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = (b ? x : x);\n", "?"));
+        ASSERT_EQUALS("", typeOf("int x; a = (b ? x : y);\n", "?"));
+        ASSERT_EQUALS("double", typeOf("int x; double y; a = (b ? x : y);\n", "?"));
+        ASSERT_EQUALS("const char *", typeOf("int x; double y; a = (b ? \"a\" : \"b\");\n", "?"));
+        ASSERT_EQUALS("", typeOf("int x; double y; a = (b ? \"a\" : std::string(\"b\"));\n", "?"));
+        ASSERT_EQUALS("bool", typeOf("int x; a = (b ? false : true);\n", "?"));
 
         // Boolean operators/literals
-        ASSERT_EQUALS("bool", typeOf("a > b;", ">"));
-        ASSERT_EQUALS("bool", typeOf(";!b;", "!"));
-        ASSERT_EQUALS("bool", typeOf("c = a && b;", "&&"));
-        ASSERT_EQUALS("bool", typeOf("a = false;", "false"));
-        ASSERT_EQUALS("bool", typeOf("a = true;", "true"));
+        ASSERT_EQUALS("bool", typeOf("a > b;\n", ">"));
+        ASSERT_EQUALS("bool", typeOf(";!b;\n", "!"));
+        ASSERT_EQUALS("bool", typeOf("c = a && b;\n", "&&"));
+        ASSERT_EQUALS("bool", typeOf("a = false;\n", "false"));
+        ASSERT_EQUALS("bool", typeOf("a = true;\n", "true"));
 
         // shift => result has same type as lhs
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x << 1U;", "<<"));
-        ASSERT_EQUALS("signed int", typeOf("int x; a = x >> 1U;", ">>"));
-        ASSERT_EQUALS("",           typeOf("a = 12 >> x;", ">>", true)); // >> might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 >> x;", ">>", false));
-        ASSERT_EQUALS("",           typeOf("a = 12 << x;", "<<", true)); // << might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 << x;", "<<", false));
-        ASSERT_EQUALS("signed int", typeOf("a = true << 1U;", "<<"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x << 1U;\n", "<<"));
+        ASSERT_EQUALS("signed int", typeOf("int x; a = x >> 1U;\n", ">>"));
+        ASSERT_EQUALS("",           typeOf("a = 12 >> x;\n", ">>", true)); // >> might be overloaded
+        ASSERT_EQUALS("signed int", typeOf("a = 12 >> x;\n", ">>", false));
+        ASSERT_EQUALS("",           typeOf("a = 12 << x;\n", "<<", true)); // << might be overloaded
+        ASSERT_EQUALS("signed int", typeOf("a = 12 << x;\n", "<<", false));
+        ASSERT_EQUALS("signed int", typeOf("a = true << 1U;\n", "<<"));
 
         // assignment => result has same type as lhs
-        ASSERT_EQUALS("unsigned short", typeOf("unsigned short x; x = 3;", "="));
+        ASSERT_EQUALS("unsigned short", typeOf("unsigned short x; x = 3;\n", "="));
 
         // array..
-        ASSERT_EQUALS("void * *", typeOf("void * x[10]; a = x + 0;", "+"));
-        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = x + 1;", "+"));
-        ASSERT_EQUALS("signed int",  typeOf("int x[10]; a = x[0] + 1;", "+"));
-        ASSERT_EQUALS("",            typeOf("a = x[\"hello\"];", "[", true));
-        ASSERT_EQUALS("const char",  typeOf("a = x[\"hello\"];", "[", false));
-        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x;", "&"));
-        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x[1];", "&"));
+        ASSERT_EQUALS("void * *", typeOf("void * x[10]; a = x + 0;\n", "+"));
+        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = x + 1;\n", "+"));
+        ASSERT_EQUALS("signed int",  typeOf("int x[10]; a = x[0] + 1;\n", "+"));
+        ASSERT_EQUALS("",            typeOf("a = x[\"hello\"];\n", "[", true));
+        ASSERT_EQUALS("const char",  typeOf("a = x[\"hello\"];\n", "[", false));
+        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x;\n", "&"));
+        ASSERT_EQUALS("signed int *", typeOf("int x[10]; a = &x[1];\n", "&"));
 
         // cast..
-        ASSERT_EQUALS("void *", typeOf("a = (void *)0;", "("));
-        ASSERT_EQUALS("char", typeOf("a = (char)32;", "("));
-        ASSERT_EQUALS("signed long", typeOf("a = (long)32;", "("));
-        ASSERT_EQUALS("signed long", typeOf("a = (long int)32;", "("));
-        ASSERT_EQUALS("signed long long", typeOf("a = (long long)32;", "("));
-        ASSERT_EQUALS("long double", typeOf("a = (long double)32;", "("));
-        ASSERT_EQUALS("char", typeOf("a = static_cast<char>(32);", "("));
-        ASSERT_EQUALS("", typeOf("a = (unsigned x)0;", "("));
-        ASSERT_EQUALS("unsigned int", typeOf("a = unsigned(123);", "("));
+        ASSERT_EQUALS("void *", typeOf("a = (void *)0;\n", "("));
+        ASSERT_EQUALS("char", typeOf("a = (char)32;\n", "("));
+        ASSERT_EQUALS("signed long", typeOf("a = (long)32;\n", "("));
+        ASSERT_EQUALS("signed long", typeOf("a = (long int)32;\n", "("));
+        ASSERT_EQUALS("signed long long", typeOf("a = (long long)32;\n", "("));
+        ASSERT_EQUALS("long double", typeOf("a = (long double)32;\n", "("));
+        ASSERT_EQUALS("char", typeOf("a = static_cast<char>(32);\n", "("));
+        ASSERT_EQUALS("", typeOf("a = (unsigned x)0;\n", "("));
+        ASSERT_EQUALS("unsigned int", typeOf("a = unsigned(123);\n", "("));
 
         // sizeof..
-        ASSERT_EQUALS("char", typeOf("sizeof(char);", "char"));
+        ASSERT_EQUALS("char", typeOf("sizeof(char);\n", "char"));
 
         // const..
-        ASSERT_EQUALS("const char *", typeOf("a = \"123\";", "\"123\""));
-        ASSERT_EQUALS("const signed int *", typeOf("const int *a; x = a + 1;", "a +"));
-        ASSERT_EQUALS("signed int * const", typeOf("int * const a; x = a + 1;", "+"));
-        ASSERT_EQUALS("const signed int *", typeOf("const int a[20]; x = a + 1;", "+"));
-        ASSERT_EQUALS("const signed int *", typeOf("const int x; a = &x;", "&"));
-        ASSERT_EQUALS("signed int", typeOf("int * const a; x = *a;", "*"));
-        ASSERT_EQUALS("const signed int", typeOf("const int * const a; x = *a;", "*"));
+        ASSERT_EQUALS("const char *", typeOf("a = \"123\";\n", "\"123\""));
+        ASSERT_EQUALS("const signed int *", typeOf("const int *a; x = a + 1;\n", "a +"));
+        ASSERT_EQUALS("signed int * const", typeOf("int * const a; x = a + 1;\n", "+"));
+        ASSERT_EQUALS("const signed int *", typeOf("const int a[20]; x = a + 1;\n", "+"));
+        ASSERT_EQUALS("const signed int *", typeOf("const int x; a = &x;\n", "&"));
+        ASSERT_EQUALS("signed int", typeOf("int * const a; x = *a;\n", "*"));
+        ASSERT_EQUALS("const signed int", typeOf("const int * const a; x = *a;\n", "*"));
 
         // function call..
-        ASSERT_EQUALS("signed int", typeOf("int a(int); a(5);", "( 5"));
-        ASSERT_EQUALS("signed int", typeOf("auto a(int) -> int; a(5);", "( 5"));
-        ASSERT_EQUALS("unsigned long", typeOf("sizeof(x);", "("));
-        ASSERT_EQUALS("signed int", typeOf("int (*a)(int); a(5);", "( 5"));
-        ASSERT_EQUALS("s", typeOf("struct s { s foo(); s(int, int); }; s s::foo() { return s(1, 2); } ", "( 1 , 2 )"));
+        ASSERT_EQUALS("signed int", typeOf("int a(int); a(5);\n", "( 5"));
+        ASSERT_EQUALS("signed int", typeOf("auto a(int) -> int; a(5);\n", "( 5"));
+        ASSERT_EQUALS("unsigned long", typeOf("sizeof(x);\n", "("));
+        ASSERT_EQUALS("signed int", typeOf("int (*a)(int); a(5);\n", "( 5"));
+        ASSERT_EQUALS("s", typeOf("struct s { s foo(); s(int, int); }; s s::foo() { return s(1, 2); } \n", "( 1 , 2 )"));
         // Some standard template functions.. TODO library configuration
-        ASSERT_EQUALS("signed int &&", typeOf("std::move(5);", "( 5 )"));
-        ASSERT_EQUALS("signed int", typeOf("using F = int(int*); F* f; f(ptr);", "( ptr")); // #9792
+        ASSERT_EQUALS("signed int &&", typeOf("std::move(5);\n", "( 5 )"));
+        ASSERT_EQUALS("signed int", typeOf("using F = int(int*); F* f; f(ptr);\n", "( ptr")); // #9792
 
         // calling constructor..
-        ASSERT_EQUALS("s", typeOf("struct s { s(int); }; s::s(int){} void foo() { throw s(1); } ", "( 1 )")); // #13100
+        ASSERT_EQUALS("s", typeOf("struct s { s(int); }; s::s(int){} void foo() { throw s(1); } \n", "( 1 )")); // #13100
 
         // struct member..
-        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } ab; x = ab.a;", "."));
-        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } *ab; x = ab[1].a;", "."));
+        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } ab; x = ab.a;\n", "."));
+        ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } *ab; x = ab[1].a;\n", "."));
 
         // Overloaded operators
-        ASSERT_EQUALS("Fred &", typeOf("class Fred { Fred& operator<(int); }; void f() { Fred fred; x=fred<123; }", "<"));
+        ASSERT_EQUALS("Fred &", typeOf("class Fred { Fred& operator<(int); }; void f() { Fred fred; x=fred<123; }\n", "<"));
 
         // Static members
-        ASSERT_EQUALS("signed int", typeOf("struct AB { static int a; }; x = AB::a;", "::"));
+        ASSERT_EQUALS("signed int", typeOf("struct AB { static int a; }; x = AB::a;\n", "::"));
 
         // Pointer to unknown type
-        ASSERT_EQUALS("*", typeOf("Bar* b;", "b"));
+        ASSERT_EQUALS("*", typeOf("Bar* b;\n", "b"));
 
         // Enum
-        ASSERT_EQUALS("char", typeOf("enum E : char { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed char", typeOf("enum E : signed char { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned char", typeOf("enum E : unsigned char { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed short", typeOf("enum E : short { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned short", typeOf("enum E : unsigned short { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed int", typeOf("enum E : int { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned int", typeOf("enum E : unsigned int { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed long", typeOf("enum E : long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned long", typeOf("enum E : unsigned long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("signed long long", typeOf("enum E : long long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
-        ASSERT_EQUALS("unsigned long long", typeOf("enum E : unsigned long long { }; void foo() { E e[3]; bar(e[0]); }", "[ 0"));
+        ASSERT_EQUALS("char", typeOf("enum E : char { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed char", typeOf("enum E : signed char { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned char", typeOf("enum E : unsigned char { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed short", typeOf("enum E : short { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned short", typeOf("enum E : unsigned short { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed int", typeOf("enum E : int { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned int", typeOf("enum E : unsigned int { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed long", typeOf("enum E : long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned long", typeOf("enum E : unsigned long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("signed long long", typeOf("enum E : long long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
+        ASSERT_EQUALS("unsigned long long", typeOf("enum E : unsigned long long { }; void foo() { E e[3]; bar(e[0]); }\n", "[ 0"));
 
 #define CHECK_LIBRARY_FUNCTION_RETURN_TYPE(type) do { \
         const char xmldata[] = "<?xml version=\"1.0\"?>\n" \
@@ -9546,7 +9904,7 @@ class TestSymbolDatabase : public TestFixture {
                                "</function>\n" \
                                "</def>";              \
         const Settings sF = settingsBuilder().libraryxml(xmldata).build(); \
-        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }", "x", true, &sF)); \
+        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }\n", "x", true, &sF)); \
 } while (false)
         // *INDENT-OFF*
         CHECK_LIBRARY_FUNCTION_RETURN_TYPE(bool);
@@ -9579,12 +9937,12 @@ class TestSymbolDatabase : public TestFixture {
             settings.platform.sizeof_short = 2;
             settings.platform.sizeof_int = 4;
 
-            ASSERT_EQUALS("unsigned char", typeOf("u8'a';", "u8'a'", true, &settings));
-            ASSERT_EQUALS("unsigned short", typeOf("u'a';", "u'a'", true, &settings));
-            ASSERT_EQUALS("unsigned int", typeOf("U'a';", "U'a'", true, &settings));
-            ASSERT_EQUALS("const unsigned char *", typeOf("u8\"a\";", "u8\"a\"", true, &settings));
-            ASSERT_EQUALS("const unsigned short *", typeOf("u\"a\";", "u\"a\"", true, &settings));
-            ASSERT_EQUALS("const unsigned int *", typeOf("U\"a\";", "U\"a\"", true, &settings));
+            ASSERT_EQUALS("unsigned char", typeOf("u8'a';\n", "u8'a'", true, &settings));
+            ASSERT_EQUALS("unsigned short", typeOf("u'a';\n", "u'a'", true, &settings));
+            ASSERT_EQUALS("unsigned int", typeOf("U'a';\n", "U'a'", true, &settings));
+            ASSERT_EQUALS("const unsigned char *", typeOf("u8\"a\";\n", "u8\"a\"", true, &settings));
+            ASSERT_EQUALS("const unsigned short *", typeOf("u\"a\";\n", "u\"a\"", true, &settings));
+            ASSERT_EQUALS("const unsigned int *", typeOf("U\"a\";\n", "U\"a\"", true, &settings));
         }
         {
             // PodType
@@ -9602,11 +9960,11 @@ class TestSymbolDatabase : public TestFixture {
             ValueType vt2;
             ASSERT_EQUALS(true, vt2.fromLibraryType("podtype2", settingsWin64));
             ASSERT_EQUALS(ValueType::Type::INT, vt2.type);
-            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new u32[10];", "new", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new xyz::x[10];", "new", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("; x = (xyz::x)12;", "(", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf(";u32(12);", "(", true, &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("x = u32(y[i]);", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new u32[10];\n", "new", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new xyz::x[10];\n", "new", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf("; x = (xyz::x)12;\n", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf(";u32(12);\n", "(", true, &settingsWin64));
+            ASSERT_EQUALS("unsigned int", typeOf("x = u32(y[i]);\n", "(", true, &settingsWin64));
         }
         {
             // PlatformType
@@ -9641,9 +9999,9 @@ class TestSymbolDatabase : public TestFixture {
                                        "  <container id=\"C\" startPattern=\"C\"/>\n"
                                        "</def>";
             const Settings sC = settingsBuilder().libraryxml(xmldata).build();
-            ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;","new",true,&sC));
-            ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;","(",true,&sC));
-            ASSERT_EQUALS("container(C)", typeOf("C c = C();","(",true,&sC));
+            ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;\n","new",true,&sC));
+            ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;\n","(",true,&sC));
+            ASSERT_EQUALS("container(C)", typeOf("C c = C();\n","(",true,&sC));
         }
         {
             // Container (vector)
@@ -9663,64 +10021,64 @@ class TestSymbolDatabase : public TestFixture {
                                        "  </container>\n"
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata).build();
-            ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;", "[", true, &set));
-            ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", true, &set));
+            ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;\n", "[", true, &set));
+            ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}\n", "(", true, &set));
             ASSERT_EQUALS(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", true, &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }\n", "s", true, &set));
             ASSERT_EQUALS(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", true, &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string) &",
-                          typeOf("Vector<test::string> v; x = v.front();", "(", true, &set));
+                          typeOf("Vector<test::string> v; x = v.front();\n", "(", true, &set));
             ASSERT_EQUALS("container(test :: string) *",
-                          typeOf("Vector<test::string> v; x = v.data();", "(", true, &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = v.front();", "(", true, &set));
-            ASSERT_EQUALS("signed int *", typeOf("Vector<int> v; x = v.data();", "(", true, &set));
-            ASSERT_EQUALS("signed int * *", typeOf("Vector<int*> v; x = v.data();", "(", true, &set));
-            ASSERT_EQUALS("iterator(Vector <)", typeOf("Vector<int> v; x = v.begin();", "(", true, &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = *v.begin();", "*", true, &set));
+                          typeOf("Vector<test::string> v; x = v.data();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = v.front();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int *", typeOf("Vector<int> v; x = v.data();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int * *", typeOf("Vector<int*> v; x = v.data();\n", "(", true, &set));
+            ASSERT_EQUALS("iterator(Vector <)", typeOf("Vector<int> v; x = v.begin();\n", "(", true, &set));
+            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = *v.begin();\n", "*", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return \"x\"+s;}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return \"x\"+s;}\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+\"x\";}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return s+\"x\";}\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return 'x'+s;}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return 'x'+s;}\n", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+'x';}", "+", true, &set));
+                          typeOf("void foo(){test::string s; return s+'x';}\n", "+", true, &set));
         }
 
         // new
-        ASSERT_EQUALS("C *", typeOf("class C {}; x = new C();", "new"));
+        ASSERT_EQUALS("C *", typeOf("class C {}; x = new C();\n", "new"));
 
         // auto variables
-        ASSERT_EQUALS("signed int", typeOf("; auto x = 3;", "x"));
-        ASSERT_EQUALS("signed int *", typeOf("; auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (const int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (constexpr int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (const int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (constexpr int *)0;", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("; const constexpr auto *p = (int *)0;", "p"));
-        ASSERT_EQUALS("signed int *", typeOf("; auto data = new int[100];", "data"));
-        ASSERT_EQUALS("signed int", typeOf("; auto data = new X::Y; int x=1000; x=x/5;", "/")); // #7970
-        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (nothrow) int[100];", "data"));
-        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (std::nothrow) int[100];", "data"));
-        ASSERT_EQUALS("const signed short", typeOf("short values[10]; void f() { for (const auto x : values); }", "x"));
-        ASSERT_EQUALS("const signed short &", typeOf("short values[10]; void f() { for (const auto& x : values); }", "x"));
-        ASSERT_EQUALS("signed short &", typeOf("short values[10]; void f() { for (auto& x : values); }", "x"));
-        ASSERT_EQUALS("signed int * &", typeOf("int* values[10]; void f() { for (auto& p : values); }", "p"));
-        ASSERT_EQUALS("signed int * const &", typeOf("int* values[10]; void f() { for (const auto& p : values); }", "p"));
-        ASSERT_EQUALS("const signed int *", typeOf("int* values[10]; void f() { for (const auto* p : values); }", "p"));
-        ASSERT_EQUALS("const signed int", typeOf("; const auto x = 3;", "x"));
-        ASSERT_EQUALS("const signed int", typeOf("; constexpr auto x = 3;", "x"));
-        ASSERT_EQUALS("const signed int", typeOf("; const constexpr auto x = 3;", "x"));
-        ASSERT_EQUALS("void * const", typeOf("typedef void* HWND; const HWND x = 0;", "x"));
+        ASSERT_EQUALS("signed int", typeOf("; auto x = 3;\n", "x"));
+        ASSERT_EQUALS("signed int *", typeOf("; auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (const int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; auto *p = (constexpr int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; const auto *p = (const int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; constexpr auto *p = (constexpr int *)0;\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("; const constexpr auto *p = (int *)0;\n", "p"));
+        ASSERT_EQUALS("signed int *", typeOf("; auto data = new int[100];\n", "data"));
+        ASSERT_EQUALS("signed int", typeOf("; auto data = new X::Y; int x=1000; x=x/5;\n", "/")); // #7970
+        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (nothrow) int[100];\n", "data"));
+        ASSERT_EQUALS("signed int *", typeOf("; auto data = new (std::nothrow) int[100];\n", "data"));
+        ASSERT_EQUALS("const signed short", typeOf("short values[10]; void f() { for (const auto x : values); }\n", "x"));
+        ASSERT_EQUALS("const signed short &", typeOf("short values[10]; void f() { for (const auto& x : values); }\n", "x"));
+        ASSERT_EQUALS("signed short &", typeOf("short values[10]; void f() { for (auto& x : values); }\n", "x"));
+        ASSERT_EQUALS("signed int * &", typeOf("int* values[10]; void f() { for (auto& p : values); }\n", "p"));
+        ASSERT_EQUALS("signed int * const &", typeOf("int* values[10]; void f() { for (const auto& p : values); }\n", "p"));
+        ASSERT_EQUALS("const signed int *", typeOf("int* values[10]; void f() { for (const auto* p : values); }\n", "p"));
+        ASSERT_EQUALS("const signed int", typeOf("; const auto x = 3;\n", "x"));
+        ASSERT_EQUALS("const signed int", typeOf("; constexpr auto x = 3;\n", "x"));
+        ASSERT_EQUALS("const signed int", typeOf("; const constexpr auto x = 3;\n", "x"));
+        ASSERT_EQUALS("void * const", typeOf("typedef void* HWND; const HWND x = 0;\n", "x"));
 
         // Variable declaration
-        ASSERT_EQUALS("char *", typeOf("; char abc[] = \"abc\";", "["));
-        ASSERT_EQUALS("", typeOf("; int x[10] = { [3]=1 };", "[ 3 ]"));
+        ASSERT_EQUALS("char *", typeOf("; char abc[] = \"abc\";\n", "["));
+        ASSERT_EQUALS("", typeOf("; int x[10] = { [3]=1 };\n", "[ 3 ]"));
 
         // std::make_shared
         {
@@ -9730,7 +10088,7 @@ class TestSymbolDatabase : public TestFixture {
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata).build();
             ASSERT_EQUALS("smart-pointer(std::shared_ptr)",
-                          typeOf("class C {}; x = std::make_shared<C>();", "(", true, &set));
+                          typeOf("class C {}; x = std::make_shared<C>();\n", "(", true, &set));
         }
 
         // return
@@ -9741,7 +10099,7 @@ class TestSymbolDatabase : public TestFixture {
                                        "  <container id=\"C\" startPattern=\"C\"/>\n"
                                        "</def>";
             const Settings sC = settingsBuilder().libraryxml(xmldata).build();
-            ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }", "return", true, &sC));
+            ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }\n", "return", true, &sC));
         }
         // Smart pointer
         {
@@ -9751,9 +10109,9 @@ class TestSymbolDatabase : public TestFixture {
                                        "</def>";
             const Settings set = settingsBuilder().libraryxml(xmldata).build();
             ASSERT_EQUALS("smart-pointer(MyPtr)",
-                          typeOf("void f() { MyPtr<int> p; return p; }", "p ;", true, &set));
-            ASSERT_EQUALS("signed int", typeOf("void f() { MyPtr<int> p; return *p; }", "* p ;", true, &set));
-            ASSERT_EQUALS("smart-pointer(MyPtr)", typeOf("void f() {return MyPtr<int>();}", "(", true, &set));
+                          typeOf("void f() { MyPtr<int> p; return p; }\n", "p ;", true, &set));
+            ASSERT_EQUALS("signed int", typeOf("void f() { MyPtr<int> p; return *p; }\n", "* p ;", true, &set));
+            ASSERT_EQUALS("smart-pointer(MyPtr)", typeOf("void f() {return MyPtr<int>();}\n", "(", true, &set));
         }
     }
 
@@ -9768,7 +10126,7 @@ class TestSymbolDatabase : public TestFixture {
                       "\n"
                       "void f() {\n"
                       "    func(i, b, u, s, v, it, p);\n"
-                      "}");
+                      "}\n");
 
         const Token* tok = tokenizer.tokens();
 
@@ -9824,6 +10182,18 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(tok && tok->valueType());
             ASSERT_EQUALS("iterator(std :: vector <)", tok->valueType()->str());
         }
+        {
+            GET_SYMBOL_DB("struct S { std::vector<int> v[1][1]; };\n"
+                          "void f(S& s) {\n"
+                          "    auto it = std::begin(s.v[0][0]);\n"
+                          "}\n");
+            ASSERT_EQUALS("", errout_str());
+
+            const Token* tok = tokenizer.tokens();
+            tok = Token::findsimplematch(tok, "auto");
+            ASSERT(tok && tok->valueType());
+            ASSERT_EQUALS("iterator(std :: vector <)", tok->valueType()->str());
+        }
         {
             GET_SYMBOL_DB("void f(std::vector<int>::iterator beg, std::vector<int>::iterator end) {\n"
                           "    auto it = std::find(beg, end, 0);\n"
@@ -10004,11 +10374,31 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(tok);
             TODO_ASSERT(tok->valueType() && "container(std :: string|wstring|u16string|u32string)" == tok->valueType()->str());
         }
+        {
+            GET_SYMBOL_DB("void f() {\n"
+                          "    int &&x = 0;\n"
+                          "}\n");
+
+            const Token* tok = Token::findsimplematch(tokenizer.tokens(), "&&");
+            ASSERT(tok);
+            ASSERT_EQUALS(static_cast<const ValueType*>(nullptr), tok->valueType());
+        }
     }
 
     void valueTypeThis() {
-        ASSERT_EQUALS("C *", typeOf("class C { C() { *this = 0; } };", "this"));
-        ASSERT_EQUALS("const C *", typeOf("class C { void foo() const; }; void C::foo() const { *this = 0; }", "this"));
+        ASSERT_EQUALS("C *", typeOf("class C { C() { *this = 0; } };\n", "this"));
+        ASSERT_EQUALS("const C *", typeOf("class C { void foo() const; }; void C::foo() const { *this = 0; }\n", "this"));
+    }
+
+    void valueTypeChar() {
+        Settings s = settings2;
+        s.platform.defaultSign = 's';
+        ASSERT_EQUALS("char", typeOf("char c; c = 'x';\n", "c =", true, &s));
+        ASSERT_EQUALS("char", typeOf("char buf[10]; buf[0] = 'x';\n", "[ 0 ]", true, &s));
+    }
+
+    void valueTypeRValueReference() {
+        TODO_ASSERT_EQUALS("", "bool", typeOf("void f(std::string&& s = {})\n", "&&"));
     }
 
     void variadic1() { // #7453
@@ -10019,7 +10409,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(ot, \"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "create ( \"AAAA\"");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 1);
@@ -10033,7 +10423,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(ot, \"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "create ( \"AAAA\"");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -10050,7 +10440,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(L\"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "cp1 = create (");
             ASSERT_EQUALS(true, db && f && f->tokAt(2) && f->tokAt(2)->function() && f->tokAt(2)->function()->tokenDef->linenr() == 1);
@@ -10064,7 +10454,7 @@ class TestSymbolDatabase : public TestFixture {
                           "{\n"
                           "   CBase* cp1 = create(\"AAAA\", 44, (char*)0);\n"
                           "   CBase* cp2 = create(L\"AAAA\", 44, (char*)0);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "cp1 = create (");
             ASSERT_EQUALS(true, db && f && f->tokAt(2) && f->tokAt(2)->function() && f->tokAt(2)->function()->tokenDef->linenr() == 2);
@@ -10081,7 +10471,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    long length;\n"
                           "    XYZ per;\n"
                           "    zdcalc(length, &per);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "zdcalc ( length");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -10093,7 +10483,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    long length;\n"
                           "    XYZ per;\n"
                           "    zdcalc(length, &per);\n"
-                          "}");
+                          "}\n");
 
             const Token *f = Token::findsimplematch(tokenizer.tokens(), "zdcalc ( length");
             ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 1);
@@ -10101,7 +10491,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void noReturnType() {
-        GET_SYMBOL_DB_C("func() { }");
+        GET_SYMBOL_DB_C("func() { }\n");
 
         ASSERT(db && db->functionScopes.size() == 1);
         ASSERT(db->functionScopes[0]->function != nullptr);
@@ -10110,7 +10500,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void auto1() {
-        GET_SYMBOL_DB("; auto x = \"abc\";");
+        GET_SYMBOL_DB("; auto x = \"abc\";\n");
         const Token *autotok = tokenizer.tokens()->next();
         ASSERT(autotok && autotok->isStandardType());
         const Variable *var = db ? db->getVariableFromVarId(1) : nullptr;
@@ -10125,7 +10515,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    auto c = new S[10];\n"
                       "    auto * d = new S[10];\n"
                       "    return a->i + b->i + c[0]->i + d[0]->i;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto");
         ASSERT(db && autotok && autotok->valueType() && autotok->valueType()->pointer == 1 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S" && autotok->type() == nullptr);
 
@@ -10187,7 +10577,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    auto c = new E[10];\n"
                       "    auto * d = new E[10];\n"
                       "    return *a + *b + c[0] + d[0];\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto");
         ASSERT(db && autotok && autotok->valueType() && autotok->valueType()->pointer == 1 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "E" && autotok->type() == nullptr);
 
@@ -10242,7 +10632,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    for (const auto * e : array)\n"
                       "        auto ei = e->i;\n"
                       "    return array[0].i;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto a");
         ASSERT(db && autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 0 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S");
         ASSERT(db && autotok && autotok->type() && autotok->type()->name() == "S");
@@ -10333,7 +10723,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    for (const auto * e : vec)\n"
                       "        auto ei = e->i;\n"
                       "    return vec[0].i;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto a");
         ASSERT(autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 0 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S");
         ASSERT(autotok && autotok->type() && autotok->type()->name() == "S");
@@ -10429,7 +10819,7 @@ class TestSymbolDatabase : public TestFixture {
                       "mBuffersForTF . clear ( ) ;\n"
                       "for ( const auto & cur : mIndexedBindings ) {}\n"
                       "return mBuffersForTF ;\n"
-                      "}");
+                      "}\n");
     }
 
     void auto7() {
@@ -10455,7 +10845,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    const auto * v10 = bar.getFoo2()[0].b;\n"
                       "    auto v11 = v1 + v2 + v3[0] + v4[0] + v5[0] + v6 + v7 + v8[0] + v9[0] + v10[0];\n"
                       "    return v11;\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto v1");
 
         // auto = int, v1 = int
@@ -10639,7 +11029,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("std::vector<int> vec;\n"
                       "void foo() {\n"
                       "    for (auto it = vec.begin(); it != vec.end(); ++it) { }\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto it");
 
         ASSERT(autotok);
@@ -10679,14 +11069,14 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "  for (auto& elem : secret_) {\n"
                       "  }\n"
-                      "}");
+                      "}\n");
     }
 
     void auto10() { // #8020
         GET_SYMBOL_DB("void f() {\n"
                       "    std::vector<int> ints(4);\n"
                       "    auto iter = ints.begin() + (ints.size() - 1);\n"
-                      "}");
+                      "}\n");
         const Token *autotok = Token::findsimplematch(tokenizer.tokens(), "auto iter");
 
         ASSERT(autotok);
@@ -10701,7 +11091,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void f() {\n"
                       "  const auto v1 = 3;\n"
                       "  const auto *v2 = 0;\n"
-                      "}");
+                      "}\n");
 
         const Token *v1tok = Token::findsimplematch(tokenizer.tokens(), "v1");
         ASSERT(v1tok && v1tok->variable() && v1tok->variable()->isConst());
@@ -10714,7 +11104,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void f(const std::string &x) {\n"
                       "  auto y = x;\n"
                       "  if (y.empty()) {}\n"
-                      "}");
+                      "}\n");
 
         const Token *tok;
 
@@ -10732,7 +11122,7 @@ class TestSymbolDatabase : public TestFixture {
                       "{\n"
                       "    auto *next = get();\n"
                       "    return next;\n"
-                      "}");
+                      "}\n");
 
         const Token *tok;
 
@@ -10748,7 +11138,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("static void foo() {\n"
                       "    auto combo = widget->combo = new Combo{};\n"
                       "    combo->addItem();\n"
-                      "}");
+                      "}\n");
 
         const Token *tok;
 
@@ -10758,7 +11148,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void auto15() {
         GET_SYMBOL_DB("auto var1{3};\n"
-                      "auto var2{4.0};");
+                      "auto var2{4.0};\n");
         ASSERT_EQUALS(3, db->variableList().size());
         const Variable *var1 = db->variableList()[1];
         ASSERT(var1->valueType());
@@ -10926,7 +11316,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    Fred(float x) : f(x) { }\n"
                       "    int i;\n"
                       "    float f;\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
 
@@ -10950,7 +11340,7 @@ class TestSymbolDatabase : public TestFixture {
                       "  {   // return iterator for end of reversed nonmutable sequence\n"
                       "    return (rend());\n"
                       "  }\n"
-                      "};");
+                      "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -11229,7 +11619,7 @@ class TestSymbolDatabase : public TestFixture {
 
         {
             GET_SYMBOL_DB("typedef void ( *fp16 )( int16_t n );\n"
-                          "fp16 fp3 = ( fp16 ) 0x8000;");
+                          "fp16 fp3 = ( fp16 ) 0x8000;\n");
             const Token* tok = Token::findsimplematch(tokenizer.tokens(), "( void * ) 0x8000");
             ASSERT_EQUALS(tok->isCast(), true);
             ASSERT(tok->valueType());
@@ -11246,7 +11636,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    friend bool operator==(const Foo&lhs, const Foo&rhs) {\n"
                       "        return lhs.x == rhs.x;\n"
                       "    }\n"
-                      "};");
+                      "};\n");
         std::ostringstream ostr;
         db->printXml(ostr);
         ASSERT(ostr.str().find(" isFriend=\"true\"") != std::string::npos);
@@ -11255,10 +11645,38 @@ class TestSymbolDatabase : public TestFixture {
     void smartPointerLookupCtor() { // #13719
         // do not crash in smartpointer lookup
         GET_SYMBOL_DB("struct S { int v; S(int i); };\n"
-                      "void f() { S(0).v; }");
+                      "void f() { S(0).v; }\n");
 
         ASSERT(db);
     }
+
+    void stdintFunction() {
+        GET_SYMBOL_DB("a = UINT32_C(60);\n");
+        const Token* tok = Token::findsimplematch(tokenizer.tokens(), "UINT32_C (");
+        ASSERT(tok != nullptr);
+        ASSERT_EQUALS(tok->next()->valueType()->sign, ValueType::Sign::UNSIGNED);
+        ASSERT_EQUALS(tok->next()->valueType()->type, ValueType::Type::INT);
+    }
+
+    void userDefinedLiteral() {
+        GET_SYMBOL_DB("_ 1p;\n");
+        const Token *x = Token::findsimplematch(tokenizer.tokens(), "1p");
+        ASSERT(x);
+        ASSERT(!x->varId());
+        ASSERT(!x->variable());
+    }
+
+    void dumpValueNegative() { // #14735
+        GET_SYMBOL_DB("void f(unsigned int x) { a = x; }\n");
+        const Token* x = Token::findsimplematch(tokenizer.tokens(), "x ;");
+        ASSERT(x != nullptr);
+        std::ostringstream out;
+        x->printValueFlow({"test.cpp"}, true, out);
+        const std::string dump = out.str();
+        const std::string expected = "<value intvalue=\"-1\" bound=\"Upper\" impossible=\"true\" path=\"0\"/>";
+        // dump should contain expected string, otherwise print the dump string
+        ASSERT_EQUALS(expected, dump.find(expected) == std::string::npos ? dump : expected);
+    }
 };
 
 REGISTER_TEST(TestSymbolDatabase)
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index 31c30ed9ebf..c32fb360bec 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -16,8 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "filesettings.h"
+#include "config.h"
 #include "fixture.h"
+
+#ifdef HAS_THREADING_MODEL_THREAD
+#include "filesettings.h"
 #include "helpers.h"
 #include "redirect.h"
 #include "settings.h"
@@ -33,13 +36,22 @@
 #include <string>
 #include <utility>
 #include <vector>
+#endif // HAS_THREADING_MODEL_THREAD
 
 class TestThreadExecutorBase : public TestFixture {
 public:
-    TestThreadExecutorBase(const char * const name, bool useFS) : TestFixture(name), useFS(useFS) {}
+    TestThreadExecutorBase(const char * const name, bool useFS)
+        : TestFixture(name)
+#ifdef HAS_THREADING_MODEL_THREAD
+        , useFS(useFS)
+#endif // HAS_THREADING_MODEL_THREAD
+    {
+        (void)useFS;
+    }
 
 private:
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+#ifdef HAS_THREADING_MODEL_THREAD
+    /*const*/ Settings settings;
     bool useFS;
 
     std::string fprefix() const
@@ -51,15 +63,10 @@ class TestThreadExecutorBase : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         bool quiet = true;
-        SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        Settings::ShowTime showtime = Settings::ShowTime::NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;
-        bool clangTidy = false;
-        bool executeCommandCalled = false;
-        std::string exe;
-        std::vector<std::string> args;
     };
 
     /**
@@ -72,19 +79,19 @@ class TestThreadExecutorBase : public TestFixture {
         std::list<FileWithDetails> filelist;
         if (opt.filesList.empty()) {
             for (int i = 1; i <= files; ++i) {
-                std::string f_s = fprefix() + "_" + std::to_string(i) + ".cpp";
-                filelist.emplace_back(f_s, Standards::Language::CPP, data.size());
+                std::string f_s = fprefix() + "_" + std::to_string(i) + ".c";
+                filelist.emplace_back(f_s, Standards::Language::C, data.size());
                 if (useFS) {
-                    fileSettings.emplace_back(std::move(f_s), Standards::Language::CPP, data.size());
+                    fileSettings.emplace_back(std::move(f_s), Standards::Language::C, data.size());
                 }
             }
         }
         else {
             for (const auto& f : opt.filesList)
             {
-                filelist.emplace_back(f, Standards::Language::CPP, data.size());
+                filelist.emplace_back(f, Standards::Language::C, data.size());
                 if (useFS) {
-                    fileSettings.emplace_back(f, Standards::Language::CPP, data.size());
+                    fileSettings.emplace_back(f, Standards::Language::C, data.size());
                 }
             }
         }
@@ -95,19 +102,15 @@ class TestThreadExecutorBase : public TestFixture {
         s.quiet = opt.quiet;
         if (opt.plistOutput)
             s.plistOutput = opt.plistOutput;
-        s.clangTidy = opt.clangTidy;
         s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: remove when we only longer rely on toString() in unique message handling?
 
         Suppressions supprs;
+        std::unique_ptr<TimerResults> timerResults;
+        if (s.showtime != Settings::ShowTime::NONE)
+            timerResults.reset(new TimerResults);
 
-        bool executeCommandCalled = false;
-        std::string exe;
-        std::vector<std::string> args;
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
-        auto executeFn = [&executeCommandCalled, &exe, &args](std::string e,std::vector<std::string> a,std::string,std::string&){
-            executeCommandCalled = true;
-            exe = std::move(e);
-            args = std::move(a);
+        auto executeFn = [](std::string,std::vector<std::string>,std::string,std::string&){
             return EXIT_SUCCESS;
         };
 
@@ -120,19 +123,14 @@ class TestThreadExecutorBase : public TestFixture {
         if (useFS)
             filelist.clear();
 
-        ThreadExecutor executor(filelist, fileSettings, s, supprs, *this, executeFn);
+        ThreadExecutor executor(filelist, fileSettings, s, supprs, *this, timerResults.get(), executeFn);
         ASSERT_EQUALS(result, executor.check());
-        ASSERT_EQUALS(opt.executeCommandCalled, executeCommandCalled);
-        ASSERT_EQUALS(opt.exe, exe);
-        ASSERT_EQUALS(opt.args.size(), args.size());
-        for (std::size_t i = 0; i < args.size(); ++i)
-        {
-            ASSERT_EQUALS(opt.args[i], args[i]);
-        }
     }
+#endif // HAS_THREADING_MODEL_THREAD
 
     void run() override {
         mNewTemplate = true;
+#ifdef HAS_THREADING_MODEL_THREAD
         TEST_CASE(deadlock_with_many_errors);
         TEST_CASE(many_threads);
         TEST_CASE(many_threads_showtime);
@@ -142,26 +140,24 @@ class TestThreadExecutorBase : public TestFixture {
         TEST_CASE(no_errors_equal_amount_files);
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
-        TEST_CASE(clangTidy);
         TEST_CASE(showtime_top5_file);
-        TEST_CASE(showtime_top5_summary);
         TEST_CASE(showtime_file);
-        TEST_CASE(showtime_summary);
         TEST_CASE(showtime_file_total);
         TEST_CASE(suppress_error_library);
         TEST_CASE(unique_errors);
+#endif // HAS_THREADING_MODEL_THREAD
     }
 
+#ifdef HAS_THREADING_MODEL_THREAD
     void deadlock_with_many_errors() {
         std::ostringstream oss;
-        oss << "int main()\n"
+        oss << "void f()\n"
             << "{\n";
         const int num_err = 1;
         for (int i = 0; i < num_err; i++) {
-            oss << "  {int i = *((int*)0);}\n";
+            oss << "  (void)(*((int*)0));\n";
         }
-        oss << "  return 0;\n"
-            << "}\n";
+        oss << "}\n";
         const int num_files = 3;
         check(2, num_files, num_files, oss.str());
         ASSERT_EQUALS(1LL * num_err * num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
@@ -170,11 +166,10 @@ class TestThreadExecutorBase : public TestFixture {
     void many_threads() {
         const int num_files = 100;
         check(16, num_files, num_files,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}");
+              "  (void)(*((int*)0));\n"
+              "}\n");
         ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
@@ -182,11 +177,10 @@ class TestThreadExecutorBase : public TestFixture {
     void many_threads_showtime() {
         SUPPRESS;
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}", dinit(CheckOptions, $.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
+              "  (void)(*((int*)0));\n"
+              "}\n", dinit(CheckOptions, $.showtime = Settings::ShowTime::SUMMARY));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -196,11 +190,10 @@ class TestThreadExecutorBase : public TestFixture {
         ScopedFile plistFile("dummy", "", plistOutput);
 
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
+              "  (void)(*((int*)0));\n"
+              "}\n", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
         // we are not interested in the results - so just consume them
         ignore_errout();
     }
@@ -210,7 +203,7 @@ class TestThreadExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_less_files() {
@@ -218,7 +211,7 @@ class TestThreadExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void no_errors_equal_amount_files() {
@@ -226,129 +219,73 @@ class TestThreadExecutorBase : public TestFixture {
               "int main()\n"
               "{\n"
               "  return 0;\n"
-              "}");
+              "}\n");
     }
 
     void one_error_less_files() {
         check(2, 1, 1,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {int i = *((int*)0);}\n"
-              "  return 0;\n"
-              "}");
-        ASSERT_EQUALS("[" + fprefix() + "_1.cpp:3:14]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
+              "  (void)(*((int*)0));\n"
+              "}\n");
+        ASSERT_EQUALS("[" + fprefix() + "_1.c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     void one_error_several_files() {
         const int num_files = 20;
         check(2, num_files, num_files,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {int i = *((int*)0);}\n"
-              "  return 0;\n"
-              "}");
+              "  (void)(*((int*)0));\n"
+              "}\n");
         ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
-    void clangTidy() {
-        // TODO: we currently only invoke it with ImportProject::FileSettings
-        if (!useFS)
-            return;
-
-#ifdef _WIN32
-        constexpr char exe[] = "clang-tidy.exe";
-#else
-        constexpr char exe[] = "clang-tidy";
-#endif
-
-        const std::string file = fprefix() + "_1.cpp";
-        check(2, 1, 0,
-              "int main()\n"
-              "{\n"
-              "  return 0;\n"
-              "}",
-              dinit(CheckOptions,
-                    $.quiet = false,
-                        $.clangTidy = true,
-                        $.executeCommandCalled = true,
-                        $.exe = exe,
-                        $.args = {"-quiet", "-checks=*,-clang-analyzer-*,-llvm*", file, "--"}));
-        ASSERT_EQUALS("Checking " + file + " ...\n", output_str());
-    }
-
     // TODO: provide data which actually shows values above 0
 
     // TODO: should this be logged only once like summary?
     void showtime_top5_file() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE));
-        // for each file: top5 results + overall + empty line
+                    $.showtime = Settings::ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall + empty line
-        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
-    }
-
-    void showtime_top5_summary() {
-        REDIRECT;
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall + empty line
-        ASSERT_EQUALS(5 + 1 + 1, cppcheck::count_all_of(output_s, '\n'));
-        // should only report the top5 once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        // for each file: top5 results + check time
+        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_file() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_FILE));
+                    $.showtime = Settings::ShowTime::FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        ASSERT_EQUALS(2, cppcheck::count_all_of(output_s, "Overall time:"));
-    }
-
-    void showtime_summary() {
-        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
-        check(2, 2, 0,
-              "int main() {}",
-              dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY));
-        const std::string output_s = GET_REDIRECT_OUTPUT;
-        // should only report the actual summary once
-        ASSERT(output_s.find("1 result(s)") == std::string::npos);
-        ASSERT(output_s.find("2 result(s)") != std::string::npos);
+        ASSERT_EQUALS(0, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
     void showtime_file_total() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
-              "int main() {}",
+              "int main() {}\n",
               dinit(CheckOptions,
-                    $.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL));
+                    $.showtime = Settings::ShowTime::FILE_TOTAL));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        ASSERT(output_s.find("Check time: " + fprefix() + "_1.cpp: ") != std::string::npos);
-        ASSERT(output_s.find("Check time: " + fprefix() + "_2.cpp: ") != std::string::npos);
+        ASSERT(output_s.find("Check time: " + fprefix() + "_1.c: ") != std::string::npos);
+        ASSERT(output_s.find("Check time: " + fprefix() + "_2.c: ") != std::string::npos);
     }
 
     void suppress_error_library() {
         SUPPRESS;
         const Settings settingsOld = settings; // TODO: get rid of this
-        const char xmldata[] = R"(<def format="2"><markup ext=".cpp" reporterrors="false"/></def>)";
+        const char xmldata[] = R"(<def format="2"><markup ext=".c" reporterrors="false"/></def>)";
         settings = settingsBuilder().libraryxml(xmldata).build();
         check(2, 1, 0,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  int i = *((int*)0);\n"
-              "  return 0;\n"
-              "}");
+              "  (void)(*((int*)0));\n"
+              "}\n");
         ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
     }
@@ -358,15 +295,16 @@ class TestThreadExecutorBase : public TestFixture {
         ScopedFile inc_h(fprefix() + ".h",
                          "inline void f()\n"
                          "{\n"
-                         "  (void)*((int*)0);\n"
-                         "}");
+                         "  (void)(*((int*)0));\n"
+                         "}\n");
         check(2, 2, 2,
-              "#include \"" + inc_h.name() +"\"");
+              "#include \"" + inc_h.name() +"\"\n");
         // this is made unique by the executor
-        ASSERT_EQUALS("[" + inc_h.name() + ":3:11]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
+        ASSERT_EQUALS("[" + inc_h.name() + ":3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     // TODO: test whole program analysis
+#endif // HAS_THREADING_MODEL_THREAD
 };
 
 class TestThreadExecutorFiles : public TestThreadExecutorBase {
diff --git a/test/testtimer.cpp b/test/testtimer.cpp
index 404fdf76829..4d5c1c2700c 100644
--- a/test/testtimer.cpp
+++ b/test/testtimer.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -17,28 +17,53 @@
  */
 
 #include "fixture.h"
+#include "redirect.h"
 #include "timer.h"
 
-#include <cmath>
-#include <ctime>
+#include <chrono>
 
 class TestTimer : public TestFixture {
 public:
     TestTimer() : TestFixture("TestTimer") {}
 
 private:
-
     void run() override {
         TEST_CASE(result);
     }
 
-    void result() const {
-        TimerResultsData t1;
-        t1.mClocks = ~static_cast<std::clock_t>(0);
-        ASSERT(t1.seconds() > 100.0);
+    void result() {
+        REDIRECT;
+
+        TimerResults t1;
+        t1.addResults("call1", std::chrono::milliseconds{1230});
+        t1.addResults("call2", std::chrono::milliseconds{1234});
+        t1.addResults("call1", std::chrono::milliseconds{1235});
+        t1.addResults("call1", std::chrono::milliseconds{1239});
+
+        const auto results = t1.getResults();
+        ASSERT_EQUALS(2, results.size());
+
+        auto it = results.find("call1");
+        ASSERT(it != results.cend());
+        ASSERT_EQUALS(3, it->second.size());
+        ASSERT_EQUALS(1230, it->second[0].count());
+        ASSERT_EQUALS(1235, it->second[1].count());
+        ASSERT_EQUALS(1239, it->second[2].count());
+
+        it = results.find("call2");
+        ASSERT(it != results.cend());
+        ASSERT_EQUALS(1, it->second.size());
+        ASSERT_EQUALS(1234, it->second[0].count());
+
+        t1.showResults();
+        ASSERT_EQUALS("call1: 3.704s (avg. 1.23467s / min 1.23s / max 1.239s - 3 result(s))\n"
+                      "call2: 1.234s (avg. 1.234s / min 1.234s / max 1.234s - 1 result(s))\n", GET_REDIRECT_OUTPUT);
+
+        t1.showResults(1);
+        ASSERT_EQUALS("call1: 3.704s (avg. 1.23467s / min 1.23s / max 1.239s - 3 result(s))\n", GET_REDIRECT_OUTPUT);
 
-        t1.mClocks = CLOCKS_PER_SEC * 5 / 2;
-        ASSERT(std::fabs(t1.seconds()-2.5) < 0.01);
+        t1.showResults(1, false);
+        ASSERT_EQUALS("call1: 3.704s\n", GET_REDIRECT_OUTPUT);
     }
 };
 
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index 04a32a81dac..b72c7f60148 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -36,6 +36,11 @@ class TestToken : public TestFixture {
     TestToken() : TestFixture("TestToken") {}
 
 private:
+    class TokenTest final : public Token
+    {
+        friend class TestToken;
+    };
+
     const TokenList list{settingsDefault, Standards::Language::C};
 
     std::vector<std::string> arithmeticalOps;
@@ -59,6 +64,7 @@ class TestToken : public TestFixture {
         TEST_CASE(multiCompare3);                   // false positive for %or% on code using "|="
         TEST_CASE(multiCompare4);
         TEST_CASE(multiCompare5);
+        TEST_CASE(multiCompare6);
         TEST_CASE(charTypes);
         TEST_CASE(stringTypes);
         TEST_CASE(getStrLength);
@@ -138,13 +144,11 @@ class TestToken : public TestFixture {
         Token *last = token->tokAt(2);
         ASSERT_EQUALS(token->str(), "1");
         ASSERT_EQUALS(token->strAt(1), "2");
-        // cppcheck-suppress redundantNextPrevious - this is intentional
         ASSERT_EQUALS(token->tokAt(2)->str(), "3");
         ASSERT_EQUALS_MSG(true, last->next() == nullptr, "Null was expected");
 
         ASSERT_EQUALS(last->str(), "3");
         ASSERT_EQUALS(last->strAt(-1), "2");
-        // cppcheck-suppress redundantNextPrevious - this is intentional
         ASSERT_EQUALS(last->tokAt(-2)->str(), "1");
         ASSERT_EQUALS_MSG(true, token->previous() == nullptr, "Null was expected");
 
@@ -154,7 +158,7 @@ class TestToken : public TestFixture {
 #define MatchCheck(...) MatchCheck_(__FILE__, __LINE__, __VA_ARGS__)
     bool MatchCheck_(const char* file, int line, const std::string& code, const std::string& pattern) {
         SimpleTokenizer tokenizer(settingsDefault, *this);
-        const std::string code2 = ";" + code + ";";
+        const std::string code2 = ";" + code + ";\n";
         try {
             ASSERT_LOC(tokenizer.tokenize(code2), file, line);
         } catch (...) {}
@@ -167,15 +171,15 @@ class TestToken : public TestFixture {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token one(list, std::move(tokensFrontBack));
             one.str("one");
-            ASSERT_EQUALS(1, Token::multiCompare(&one, "one|two", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&one, "one|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token two(list, std::move(tokensFrontBack));
             two.str("two");
-            ASSERT_EQUALS(1, Token::multiCompare(&two, "one|two", 0));
-            ASSERT_EQUALS(1, Token::multiCompare(&two, "verybig|two|", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&two, "one|two", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&two, "verybig|two|", 0));
         }
 
         // Test for empty string found
@@ -183,45 +187,45 @@ class TestToken : public TestFixture {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token notfound(list, std::move(tokensFrontBack));
             notfound.str("notfound");
-            ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one|two|", 0));
+            ASSERT_EQUALS(0, TokenTest::multiCompare(&notfound, "one|two|", 0));
 
             // Test for not found
-            ASSERT_EQUALS(-1, Token::multiCompare(&notfound, "one|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&notfound, "one|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token s(list, std::move(tokensFrontBack));
             s.str("s");
-            ASSERT_EQUALS(-1, Token::multiCompare(&s, "verybig|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&s, "verybig|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token ne(list, std::move(tokensFrontBack));
             ne.str("ne");
-            ASSERT_EQUALS(-1, Token::multiCompare(&ne, "one|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&ne, "one|two", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token a(list, std::move(tokensFrontBack));
             a.str("a");
-            ASSERT_EQUALS(-1, Token::multiCompare(&a, "abc|def", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&a, "abc|def", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token abcd(list, std::move(tokensFrontBack));
             abcd.str("abcd");
-            ASSERT_EQUALS(-1, Token::multiCompare(&abcd, "abc|def", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&abcd, "abc|def", 0));
         }
 
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token def(list, std::move(tokensFrontBack));
             def.str("default");
-            ASSERT_EQUALS(-1, Token::multiCompare(&def, "abc|def", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&def, "abc|def", 0));
         }
 
         // %op%
@@ -229,22 +233,22 @@ class TestToken : public TestFixture {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token plus(list, std::move(tokensFrontBack));
             plus.str("+");
-            ASSERT_EQUALS(1, Token::multiCompare(&plus, "one|%op%", 0));
-            ASSERT_EQUALS(1, Token::multiCompare(&plus, "%op%|two", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&plus, "one|%op%", 0));
+            ASSERT_EQUALS(1, TokenTest::multiCompare(&plus, "%op%|two", 0));
         }
         {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
             Token x(list, std::move(tokensFrontBack));
             x.str("x");
-            ASSERT_EQUALS(-1, Token::multiCompare(&x, "one|%op%", 0));
-            ASSERT_EQUALS(-1, Token::multiCompare(&x, "%op%|two", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&x, "one|%op%", 0));
+            ASSERT_EQUALS(-1, TokenTest::multiCompare(&x, "%op%|two", 0));
         }
 
     }
 
     void multiCompare2() const { // #3294
         // Original pattern that failed: [[,(=<>+-*|&^] %num% [+-*/] %num% ]|,|)|;|=|%op%
-        const SimpleTokenList toks("a == 1");
+        const SimpleTokenList toks("a == 1\n");
         ASSERT_EQUALS(true, Token::Match(toks.front(), "a =|%op%"));
     }
 
@@ -253,28 +257,28 @@ class TestToken : public TestFixture {
         // Code snippet that failed: "return lv@86 |= rv@87 ;"
 
         // Note: Also test "reverse" alternative pattern, two different code paths to handle it
-        const SimpleTokenList toks("return a |= b ;");
+        const SimpleTokenList toks("return a |= b ;\n");
         ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% xyz|%or% %name% ;"));
         ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% %or%|xyz %name% ;"));
 
-        const SimpleTokenList toks2("return a | b ;");
+        const SimpleTokenList toks2("return a | b ;\n");
         ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% xyz|%or% %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% %or%|xyz %name% ;"));
 
-        const SimpleTokenList toks3("return a || b ;");
+        const SimpleTokenList toks3("return a || b ;\n");
         ASSERT_EQUALS(false, Token::Match(toks3.front(), "return %name% xyz|%or% %name% ;"));
         ASSERT_EQUALS(false, Token::Match(toks3.front(), "return %name% %or%|xyz %name% ;"));
 
         ASSERT_EQUALS(true, Token::Match(toks3.front(), "return %name% xyz|%oror% %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks3.front(), "return %name% %oror%|xyz %name% ;"));
 
-        const SimpleTokenList toks4("a % b ;");
+        const SimpleTokenList toks4("a % b ;\n");
         ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% >>|<<|&|%or%|^|% %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% %|>>|<<|&|%or%|^ %name% ;"));
         ASSERT_EQUALS(true, Token::Match(toks4.front(), "%name% >>|<<|&|%or%|%|^ %name% ;"));
 
         //%name%|%num% support
-        const SimpleTokenList num("100");
+        const SimpleTokenList num("100\n");
         ASSERT_EQUALS(true, Token::Match(num.front(), "%num%|%name%"));
         ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%num%"));
         ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%num%|%bool%"));
@@ -284,7 +288,7 @@ class TestToken : public TestFixture {
         ASSERT_EQUALS(false, Token::Match(num.front(), "%type%|%bool%|%char%"));
         ASSERT_EQUALS(true, Token::Match(num.front(), "%type%|%bool%|100"));
 
-        const SimpleTokenList numparen("( 100 )");
+        const SimpleTokenList numparen("( 100 )\n");
         ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %num%|%name% )|"));
         ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%num% )|"));
         ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%num%|%bool% )|"));
@@ -302,7 +306,7 @@ class TestToken : public TestFixture {
 
     void multiCompare4() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std :: queue < int > foo ;"));
+        ASSERT(var.tokenize("std :: queue < int > foo ;\n"));
 
         ASSERT_EQUALS(Token::eBracket, var.tokens()->tokAt(3)->tokType());
         ASSERT_EQUALS(Token::eBracket, var.tokens()->tokAt(5)->tokType());
@@ -316,7 +320,18 @@ class TestToken : public TestFixture {
         auto tokensFrontBack = std::make_shared<TokensFrontBack>();
         Token tok(list, std::move(tokensFrontBack));
         tok.str("||");
-        ASSERT_EQUALS(true, Token::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
+        ASSERT_EQUALS(true, TokenTest::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
+    }
+
+    void multiCompare6() const {
+        {
+            const SimpleTokenList stl("x %= y;\n");
+            ASSERT_EQUALS(true, Token::Match(stl.front(), "%name% %= %name%"));
+        }
+        {
+            const SimpleTokenList stl("x += y;\n");
+            ASSERT_EQUALS(false, Token::Match(stl.front(), "%name% %= %name%"));
+        }
     }
 
     void charTypes() const {
@@ -583,40 +598,40 @@ class TestToken : public TestFixture {
 
     void nextArgument() {
         SimpleTokenizer example1(*this);
-        ASSERT(example1.tokenize("foo(1, 2, 3, 4);"));
+        ASSERT(example1.tokenize("foo(1, 2, 3, 4);\n"));
         ASSERT_EQUALS(true, Token::simpleMatch(example1.tokens()->tokAt(2)->nextArgument(), "2 , 3"));
         ASSERT_EQUALS(true, Token::simpleMatch(example1.tokens()->tokAt(4)->nextArgument(), "3 , 4"));
 
         SimpleTokenizer example2(*this);
-        ASSERT(example2.tokenize("foo();"));
+        ASSERT(example2.tokenize("foo();\n"));
         ASSERT_EQUALS(true, example2.tokens()->tokAt(2)->nextArgument() == nullptr);
 
         SimpleTokenizer example3(*this);
-        ASSERT(example3.tokenize("foo(bar(a, b), 2, 3);"));
+        ASSERT(example3.tokenize("foo(bar(a, b), 2, 3);\n"));
         ASSERT_EQUALS(true, Token::simpleMatch(example3.tokens()->tokAt(2)->nextArgument(), "2 , 3"));
 
         SimpleTokenizer example4(*this);
-        ASSERT(example4.tokenize("foo(x.i[1], \"\", 3);"));
+        ASSERT(example4.tokenize("foo(x.i[1], \"\", 3);\n"));
         ASSERT_EQUALS(true, Token::simpleMatch(example4.tokens()->tokAt(2)->nextArgument(), "\"\" , 3"));
     }
 
     void eraseTokens() const {
-        SimpleTokenList code("begin ; { this code will be removed } end", Standards::Language::C);
+        SimpleTokenList code("begin ; { this code will be removed } end\n", Standards::Language::C);
         Token::eraseTokens(code.front()->next(), code.front()->tokAt(9));
         ASSERT_EQUALS("begin ; end", code.front()->stringifyList(nullptr, false));
     }
 
 
     void matchAny() const {
-        const SimpleTokenList varBitOrVar("abc|def");
+        const SimpleTokenList varBitOrVar("abc|def\n");
         ASSERT_EQUALS(true, Token::Match(varBitOrVar.front(), "%name% %or% %name%"));
 
-        const SimpleTokenList varLogOrVar("abc||def");
+        const SimpleTokenList varLogOrVar("abc||def\n");
         ASSERT_EQUALS(true, Token::Match(varLogOrVar.front(), "%name% %oror% %name%"));
     }
 
     void matchSingleChar() const {
-        const SimpleTokenList singleChar("a");
+        const SimpleTokenList singleChar("a\n");
         ASSERT_EQUALS(true, Token::Match(singleChar.front(), "[a|bc]"));
         ASSERT_EQUALS(false, Token::Match(singleChar.front(), "[d|ef]"));
 
@@ -631,83 +646,83 @@ class TestToken : public TestFixture {
         ASSERT_EQUALS(true, Token::Match(empty_String.front(), "!!else"));
         ASSERT_EQUALS(false, Token::Match(empty_String.front(), "!!else something"));
 
-        const SimpleTokenList ifSemicolon("if ;");
+        const SimpleTokenList ifSemicolon("if ;\n");
         ASSERT_EQUALS(true, Token::Match(ifSemicolon.front(), "if ; !!else"));
 
-        const SimpleTokenList ifSemicolonSomething("if ; something");
+        const SimpleTokenList ifSemicolonSomething("if ; something\n");
         ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.front(), "if ; !!else"));
 
-        const SimpleTokenList justElse("else");
+        const SimpleTokenList justElse("else\n");
         ASSERT_EQUALS(false, Token::Match(justElse.front(), "!!else"));
 
-        const SimpleTokenList ifSemicolonElse("if ; else");
+        const SimpleTokenList ifSemicolonElse("if ; else\n");
         ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.front(), "if ; !!else"));
     }
 
     void matchType() {
-        const SimpleTokenList type("abc");
+        const SimpleTokenList type("abc\n");
         ASSERT_EQUALS(true, Token::Match(type.front(), "%type%"));
 
         SimpleTokenizer isVar(*this);
-        ASSERT(isVar.tokenize("int a = 3 ;"));
+        ASSERT(isVar.tokenize("int a = 3 ;\n"));
         ASSERT_EQUALS(true, Token::Match(isVar.tokens(), "%type%"));
         ASSERT_EQUALS(true, Token::Match(isVar.tokens(), "%type% %name%"));
         ASSERT_EQUALS(false, Token::Match(isVar.tokens(), "%type% %type%"));
 
         // TODO: %type% should not match keywords other than fundamental types
-        const SimpleTokenList noType1_cpp("delete");
+        const SimpleTokenList noType1_cpp("delete\n");
         ASSERT_EQUALS(true, Token::Match(noType1_cpp.front(), "%type%"));
 
-        const SimpleTokenList noType1_c("delete", Standards::Language::C);
+        const SimpleTokenList noType1_c("delete\n", Standards::Language::C);
         ASSERT_EQUALS(true, Token::Match(noType1_c.front(), "%type%"));
 
-        const SimpleTokenList noType2("void delete");
+        const SimpleTokenList noType2("void delete\n");
         ASSERT_EQUALS(true, Token::Match(noType2.front(), "!!foo %type%"));
     }
 
     void matchChar() const {
-        const SimpleTokenList chr1("'a'");
+        const SimpleTokenList chr1("'a'\n");
         ASSERT_EQUALS(true, Token::Match(chr1.front(), "%char%"));
 
-        const SimpleTokenList chr2("'1'");
+        const SimpleTokenList chr2("'1'\n");
         ASSERT_EQUALS(true, Token::Match(chr2.front(), "%char%"));
 
-        const SimpleTokenList noChr("\"10\"");
+        const SimpleTokenList noChr("\"10\"\n");
         ASSERT_EQUALS(false, Token::Match(noChr.front(), "%char%"));
     }
 
     void matchCompOp() const {
-        const SimpleTokenList comp1("<=");
+        const SimpleTokenList comp1("<=\n");
         ASSERT_EQUALS(true, Token::Match(comp1.front(), "%comp%"));
 
-        const SimpleTokenList comp2(">");
+        const SimpleTokenList comp2(">\n");
         ASSERT_EQUALS(true, Token::Match(comp2.front(), "%comp%"));
 
-        const SimpleTokenList noComp("=");
+        const SimpleTokenList noComp("=\n");
         ASSERT_EQUALS(false, Token::Match(noComp.front(), "%comp%"));
     }
 
     void matchStr() const {
-        const SimpleTokenList noStr1("abc");
+        const SimpleTokenList noStr1("abc\n");
         ASSERT_EQUALS(false, Token::Match(noStr1.front(), "%str%"));
 
-        const SimpleTokenList noStr2("'a'");
+        const SimpleTokenList noStr2("'a'\n");
         ASSERT_EQUALS(false, Token::Match(noStr2.front(), "%str%"));
 
-        const SimpleTokenList str("\"abc\"");
+        const SimpleTokenList str("\"abc\"\n");
         ASSERT_EQUALS(true, Token::Match(str.front(), "%str%"));
 
         // Empty string
-        const SimpleTokenList emptyStr("\"\"");
+        const SimpleTokenList emptyStr("\"\"\n");
         ASSERT_EQUALS(true, Token::Match(emptyStr.front(), "%str%"));
     }
 
     void matchVarid() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("int a ; int b ;"));
+        ASSERT(var.tokenize("int a ; int b ;\n"));
 
         // Varid == 0 should throw exception
-        ASSERT_THROW_INTERNAL_EQUALS((void)Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 0),INTERNAL,"Internal error. Token::Match called with varid 0. Please report this to Cppcheck developers");
+        ASSERT_THROW_INTERNAL_EQUALS((void)Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 0),INTERNAL,"Internal error. Token::Match called with varid 0.");
 
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 1));
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %name% ; %type% %varid%", 2));
@@ -721,95 +736,89 @@ class TestToken : public TestFixture {
     }
 
     void matchNumeric() const {
-        const SimpleTokenList nonNumeric("abc");
+        const SimpleTokenList nonNumeric("abc\n");
         ASSERT_EQUALS(false, Token::Match(nonNumeric.front(), "%num%"));
 
-        const SimpleTokenList msLiteral("5ms"); // #11438
+        const SimpleTokenList msLiteral("5ms\n"); // #11438
         ASSERT_EQUALS(false, Token::Match(msLiteral.front(), "%num%"));
 
-        const SimpleTokenList sLiteral("3s");
+        const SimpleTokenList sLiteral("3s\n");
         ASSERT_EQUALS(false, Token::Match(sLiteral.front(), "%num%"));
 
-        const SimpleTokenList octal("0123");
+        const SimpleTokenList octal("0123\n");
         ASSERT_EQUALS(true, Token::Match(octal.front(), "%num%"));
 
-        const SimpleTokenList decimal("4567");
+        const SimpleTokenList decimal("4567\n");
         ASSERT_EQUALS(true, Token::Match(decimal.front(), "%num%"));
 
-        const SimpleTokenList hexadecimal("0xDEADBEEF");
+        const SimpleTokenList hexadecimal("0xDEADBEEF\n");
         ASSERT_EQUALS(true, Token::Match(hexadecimal.front(), "%num%"));
 
-        const SimpleTokenList floatingPoint("0.0f");
+        const SimpleTokenList floatingPoint("0.0f\n");
         ASSERT_EQUALS(true, Token::Match(floatingPoint.front(), "%num%"));
 
-        const SimpleTokenList signedLong("0L");
+        const SimpleTokenList signedLong("0L\n");
         ASSERT_EQUALS(true, Token::Match(signedLong.front(), "%num%"));
 
-        const SimpleTokenList negativeSignedLong("-0L");
+        const SimpleTokenList negativeSignedLong("-0L\n");
         ASSERT_EQUALS(true, Token::Match(negativeSignedLong.front(), "- %num%"));
 
-        const SimpleTokenList positiveSignedLong("+0L");
+        const SimpleTokenList positiveSignedLong("+0L\n");
         ASSERT_EQUALS(true, Token::Match(positiveSignedLong.front(), "+ %num%"));
 
-        const SimpleTokenList unsignedInt("0U");
+        const SimpleTokenList unsignedInt("0U\n");
         ASSERT_EQUALS(true, Token::Match(unsignedInt.front(), "%num%"));
 
-        const SimpleTokenList unsignedLong("0UL");
+        const SimpleTokenList unsignedLong("0UL\n");
         ASSERT_EQUALS(true, Token::Match(unsignedLong.front(), "%num%"));
 
-        const SimpleTokenList unsignedLongLong("0ULL");
+        const SimpleTokenList unsignedLongLong("0ULL\n");
         ASSERT_EQUALS(true, Token::Match(unsignedLongLong.front(), "%num%"));
 
-        const SimpleTokenList positive("+666");
+        const SimpleTokenList positive("+666\n");
         ASSERT_EQUALS(true, Token::Match(positive.front(), "+ %num%"));
 
-        const SimpleTokenList negative("-42");
+        const SimpleTokenList negative("-42\n");
         ASSERT_EQUALS(true, Token::Match(negative.front(), "- %num%"));
 
-        const SimpleTokenList negativeNull("-.0");
+        const SimpleTokenList negativeNull("-.0\n");
         ASSERT_EQUALS(true, Token::Match(negativeNull.front(), "- %num%"));
 
-        const SimpleTokenList positiveNull("+.0");
+        const SimpleTokenList positiveNull("+.0\n");
         ASSERT_EQUALS(true, Token::Match(positiveNull.front(), "+ %num%"));
     }
 
 
     void matchBoolean() const {
-        const SimpleTokenList yes("YES");
+        const SimpleTokenList yes("YES\n");
         ASSERT_EQUALS(false, Token::Match(yes.front(), "%bool%"));
 
-        const SimpleTokenList positive("true");
+        const SimpleTokenList positive("true\n");
         ASSERT_EQUALS(true, Token::Match(positive.front(), "%bool%"));
 
-        const SimpleTokenList negative("false");
+        const SimpleTokenList negative("false\n");
         ASSERT_EQUALS(true, Token::Match(negative.front(), "%bool%"));
     }
 
     void matchOr() const {
-        const SimpleTokenList bitwiseOr(";|;");
-        // cppcheck-suppress simplePatternError - this is intentional
+        const SimpleTokenList bitwiseOr(";|;\n");
         ASSERT_EQUALS(true,  Token::Match(bitwiseOr.front(), "; %or%"));
         ASSERT_EQUALS(true,  Token::Match(bitwiseOr.front(), "; %op%"));
-        // cppcheck-suppress simplePatternError - this is intentional
         ASSERT_EQUALS(false, Token::Match(bitwiseOr.front(), "; %oror%"));
 
-        const SimpleTokenList bitwiseOrAssignment(";|=;");
-        // cppcheck-suppress simplePatternError - this is intentional
+        const SimpleTokenList bitwiseOrAssignment(";|=;\n");
         ASSERT_EQUALS(false,  Token::Match(bitwiseOrAssignment.front(), "; %or%"));
         ASSERT_EQUALS(true,  Token::Match(bitwiseOrAssignment.front(), "; %op%"));
-        // cppcheck-suppress simplePatternError - this is intentional
         ASSERT_EQUALS(false, Token::Match(bitwiseOrAssignment.front(), "; %oror%"));
 
-        const SimpleTokenList logicalOr(";||;");
-        // cppcheck-suppress simplePatternError - this is intentional
+        const SimpleTokenList logicalOr(";||;\n");
         ASSERT_EQUALS(false, Token::Match(logicalOr.front(), "; %or%"));
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; %op%"));
-        // cppcheck-suppress simplePatternError - this is intentional
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; %oror%"));
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; &&|%oror%"));
         ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; %oror%|&&"));
 
-        const SimpleTokenList logicalAnd(";&&;");
+        const SimpleTokenList logicalAnd(";&&;\n");
         ASSERT_EQUALS(true, Token::simpleMatch(logicalAnd.front(), "; &&"));
         ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; &&|%oror%"));
         ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; %oror%|&&"));
@@ -1050,7 +1059,6 @@ class TestToken : public TestFixture {
         standard_types.emplace_back("long");
         standard_types.emplace_back("float");
         standard_types.emplace_back("double");
-        standard_types.emplace_back("size_t");
 
         for (auto test_op = standard_types.cbegin(); test_op != standard_types.cend(); ++test_op) {
             auto tokensFrontBack = std::make_shared<TokensFrontBack>();
@@ -1136,7 +1144,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsNeedsOpen() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;\n"));
 
         const Token* const t = var.tokens()->findClosingBracket();
         ASSERT(t == nullptr);
@@ -1144,7 +1152,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsInnerPair() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;\n"));
 
         const Token * const t = var.tokens()->tokAt(7)->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
@@ -1153,7 +1161,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsOuterPair() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;\n"));
 
         const Token* const t = var.tokens()->tokAt(3)->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
@@ -1162,7 +1170,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsWithTooManyClosing() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("X< 1>2 > x1;"));
+        ASSERT(var.tokenize("X< 1>2 > x1;\n"));
 
         const Token* const t = var.tokens()->next()->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
@@ -1171,7 +1179,7 @@ class TestToken : public TestFixture {
 
     void canFindMatchingBracketsWithTooManyOpening() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("X < (2 < 1) > x1;"));
+        ASSERT(var.tokenize("X < (2 < 1) > x1;\n"));
 
         const Token* t = var.tokens()->next()->findClosingBracket();
         ASSERT(t != nullptr && t->str() == ">");
@@ -1182,7 +1190,7 @@ class TestToken : public TestFixture {
 
     void findClosingBracket() {
         SimpleTokenizer var(*this);
-        ASSERT(var.tokenize("template<typename X, typename...Y> struct S : public Fred<Wilma<Y...>> {}"));
+        ASSERT(var.tokenize("template<typename X, typename...Y> struct S : public Fred<Wilma<Y...>> {}\n"));
 
         const Token* const t = var.tokens()->next()->findClosingBracket();
         ASSERT(Token::simpleMatch(t, "> struct"));
@@ -1216,29 +1224,29 @@ class TestToken : public TestFixture {
 
     void expressionString() {
         SimpleTokenizer var1(*this);
-        ASSERT(var1.tokenize("void f() { *((unsigned long long *)x) = 0; }"));
+        ASSERT(var1.tokenize("void f() { *((unsigned long long *)x) = 0; }\n"));
         const Token *const tok1 = Token::findsimplematch(var1.tokens(), "*");
         ASSERT_EQUALS("*((unsigned long long*)x)", tok1->expressionString());
 
         SimpleTokenizer var2(*this);
-        ASSERT(var2.tokenize("typedef unsigned long long u64; void f() { *((u64 *)x) = 0; }"));
+        ASSERT(var2.tokenize("typedef unsigned long long u64; void f() { *((u64 *)x) = 0; }\n"));
         const Token *const tok2 = Token::findsimplematch(var2.tokens(), "*");
         ASSERT_EQUALS("*((unsigned long long*)x)", tok2->expressionString());
 
         SimpleTokenizer data3(*this);
-        ASSERT(data3.tokenize("void f() { return (t){1,2}; }"));
+        ASSERT(data3.tokenize("void f() { return (t){1,2}; }\n"));
         ASSERT_EQUALS("return(t){1,2}", data3.tokens()->tokAt(5)->expressionString());
 
         SimpleTokenizer data4(*this);
-        ASSERT(data4.tokenize("void f() { return L\"a\"; }"));
+        ASSERT(data4.tokenize("void f() { return L\"a\"; }\n"));
         ASSERT_EQUALS("returnL\"a\"", data4.tokens()->tokAt(5)->expressionString());
 
         SimpleTokenizer data5(*this);
-        ASSERT(data5.tokenize("void f() { return U\"a\"; }"));
+        ASSERT(data5.tokenize("void f() { return U\"a\"; }\n"));
         ASSERT_EQUALS("returnU\"a\"", data5.tokens()->tokAt(5)->expressionString());
 
         SimpleTokenizer data6(*this);
-        ASSERT(data6.tokenize("x = \"\\0\\x1\\x2\\x3\\x4\\x5\\x6\\x7\";"));
+        ASSERT(data6.tokenize("x = \"\\0\\x1\\x2\\x3\\x4\\x5\\x6\\x7\";\n"));
         ASSERT_EQUALS("x=\"\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\"", data6.tokens()->next()->expressionString());
     }
 
@@ -1303,7 +1311,7 @@ class TestToken : public TestFixture {
         assert_tok("0.0", Token::Type::eNumber);
         assert_tok("0x0.3p10", Token::Type::eNumber);
         assert_tok("0z", Token::Type::eNumber); // TODO: not a valid number
-        assert_tok("0_km", Token::Type::eName); // user literal
+        assert_tok("0_km", Token::Type::eLiteral); // user literal
         assert_tok("=", Token::Type::eAssignmentOp);
         assert_tok("<<=", Token::Type::eAssignmentOp);
         assert_tok(">>=", Token::Type::eAssignmentOp);
@@ -1475,13 +1483,6 @@ class TestToken : public TestFixture {
             tok.str("char"); // not treated as keyword in TokenList::isKeyword()
             assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
         }
-        {
-            TokenList list_c{settingsDefault, Standards::Language::C};
-            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
-            Token tok(list_c, std::move(tokensFrontBack));
-            tok.str("size_t"); // not treated as keyword in TokenList::isKeyword()
-            assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
-        }
     }
 
     void update_property_info_etype_cpp() const
@@ -1493,21 +1494,12 @@ class TestToken : public TestFixture {
             tok.str("bool"); // not treated as keyword in TokenList::isKeyword()
             assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
         }
-        {
-            TokenList list_cpp{settingsDefault, Standards::Language::CPP};
-            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
-            Token tok(list_cpp, std::move(tokensFrontBack));
-            tok.str("size_t");
-            assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
-        }
     }
 
     void update_property_info_replace() const // #13743
     {
         auto tokensFrontBack = std::make_shared<TokensFrontBack>();
         Token tok(list, std::move(tokensFrontBack));
-        tok.str("size_t");
-        assert_tok(&tok, Token::Type::eType, false, true);
         tok.str("long");
         assert_tok(&tok, Token::Type::eType, false, true);
     }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 0dd2f654f1b..cc793f58873 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -39,14 +39,24 @@
 
 #include <simplecpp.h>
 
+class ErrorLogger;
+
 class TestTokenizer : public TestFixture {
 public:
     TestTokenizer() : TestFixture("TestTokenizer") {}
 
 private:
-    const Settings settings0 = settingsBuilder().library("qt.cfg").build();
-    const Settings settings1 = settingsBuilder().library("qt.cfg").library("std.cfg").build();
-    const Settings settings_windows = settingsBuilder().library("windows.cfg").build();
+    const Settings settings1 = settingsBuilder().library("std.cfg").debugwarnings().build();
+    const Settings settings2 = settingsBuilder(settings1).cpp(Standards::CPP11).c(Standards::C11).build();
+    const Settings settings2_win32a = settingsBuilder(settings2).platform(Platform::Type::Win32A).build();
+    const Settings settings2_win32w = settingsBuilder(settings2).platform(Platform::Type::Win32W).build();
+    const Settings settings2_win64 = settingsBuilder(settings2).platform(Platform::Type::Win64).build();
+    const Settings settings2_unix32 = settingsBuilder(settings2).platform(Platform::Type::Unix32).build();
+    const Settings settings2_unix64 = settingsBuilder(settings2).platform(Platform::Type::Unix64).build();
+    const Settings settings3 = settingsBuilder().c(Standards::C89).cpp(Standards::CPP03).build();
+    const Settings settings_windows = settingsBuilder().library("windows.cfg").debugwarnings().cpp(Standards::CPP11).build();
+    const Settings settings_win32a = settingsBuilder(settings_windows).platform(Platform::Type::Win32A).build();
+    const Settings settings_win32w = settingsBuilder(settings_windows).platform(Platform::Type::Win32W).build();
 
     void run() override {
         mNewTemplate = true;
@@ -81,6 +91,9 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(tokenize39);  // #9771
         TEST_CASE(tokenize40);  // #13181
         TEST_CASE(tokenize41);  // #13847
+        TEST_CASE(tokenize42);  // #13861
+        TEST_CASE(tokenize43);  // #13861
+        TEST_CASE(tokenize44);  // #14955
 
         TEST_CASE(validate);
 
@@ -105,7 +118,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyAt);
 
         TEST_CASE(inlineasm);
-        TEST_CASE(simplifyAsm2);  // #4725 (writing asm() around "^{}")
+        TEST_CASE(simplifyAsm2);  // #4725 (writing asm() around "^{}\n")
 
         TEST_CASE(ifAddBraces1);
         TEST_CASE(ifAddBraces2);
@@ -129,6 +142,7 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(whileAddBraces);
         TEST_CASE(whileAddBracesLabels);
+        TEST_CASE(whileAddBracesDump);
 
         TEST_CASE(doWhileAddBraces);
         TEST_CASE(doWhileAddBracesLabels);
@@ -179,6 +193,8 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(removeParentheses26);      // Ticket #8875 a[0](0)
         TEST_CASE(removeParentheses27);
         TEST_CASE(removeParentheses28);      // #12164 - don't remove parentheses in '(expr1) ? (expr2) : (expr3);'
+        TEST_CASE(removeParantheses29);      // #13735
+        TEST_CASE(removeParentheses30);
 
         TEST_CASE(tokenize_double);
         TEST_CASE(tokenize_strings);
@@ -217,11 +233,16 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(vardecl29); // #9282
         TEST_CASE(vardecl30);
         TEST_CASE(vardecl31); // function pointer init
+        TEST_CASE(vardecl32);
+        TEST_CASE(vardecl33);
+        TEST_CASE(vardecl34);
+        TEST_CASE(vardecl35);
         TEST_CASE(vardecl_stl_1);
         TEST_CASE(vardecl_stl_2);
         TEST_CASE(vardecl_stl_3);
         TEST_CASE(vardecl_template_1);
         TEST_CASE(vardecl_template_2);
+        TEST_CASE(vardecl_template_3);
         TEST_CASE(vardecl_union);
         TEST_CASE(vardecl_par);     // #2743 - set links if variable type contains parentheses
         TEST_CASE(vardecl_par2);    // #3912 - set correct links
@@ -268,6 +289,16 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(functionAttributeAfter2);
         TEST_CASE(functionAttributeListBefore);
         TEST_CASE(functionAttributeListAfter);
+        TEST_CASE(functionAttributeListAfter2);
+        TEST_CASE(cppMaybeUnusedBefore);
+        TEST_CASE(cppMaybeUnusedAfter1);
+        TEST_CASE(cppMaybeUnusedAfter2);
+        TEST_CASE(cppMaybeUnusedAfter3);
+        TEST_CASE(cppMaybeUnusedStructuredBinding);
+
+        TEST_CASE(attributeAlignasBefore);
+        TEST_CASE(attributeAlignasAfter);
+        TEST_CASE(simplifyAlignedStorage);
 
         TEST_CASE(splitTemplateRightAngleBrackets);
 
@@ -287,6 +318,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyInitVar2);
         TEST_CASE(simplifyInitVar3);
         TEST_CASE(simplifyInitVar4);
+        TEST_CASE(simplifyInitVar5);
 
         TEST_CASE(bitfields1);
         TEST_CASE(bitfields2);
@@ -303,6 +335,10 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(bitfields15); // ticket #7747 (enum Foo {A,B}:4;)
         TEST_CASE(bitfields16); // Save bitfield bit count
         TEST_CASE(bitfields17);
+        TEST_CASE(bitfields18);
+        TEST_CASE(bitfields19); // ticket #13733
+        TEST_CASE(bitfields20);
+        TEST_CASE(bitfields21);
 
         TEST_CASE(simplifyNamespaceStd);
 
@@ -346,6 +382,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyOperatorName27);
         TEST_CASE(simplifyOperatorName28);
         TEST_CASE(simplifyOperatorName29); // spaceship operator
+        TEST_CASE(simplifyOperatorName30);
         TEST_CASE(simplifyOperatorName31); // #6342
         TEST_CASE(simplifyOperatorName32); // #10256
         TEST_CASE(simplifyOperatorName33); // #10138
@@ -400,6 +437,16 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(astnoexcept);
         TEST_CASE(astvardecl);
         TEST_CASE(astnewscoped);
+        TEST_CASE(astdecltypescope);
+        TEST_CASE(astdesignatedinit);
+        TEST_CASE(astrvaluedecl);
+        TEST_CASE(astorkeyword);
+        TEST_CASE(astenumdecl);
+        TEST_CASE(astcompound);
+        TEST_CASE(astfuncdecl);
+        TEST_CASE(astarrayinit);
+        TEST_CASE(astbracedinit);
+        TEST_CASE(astif);
 
         TEST_CASE(startOfExecutableScope);
 
@@ -436,7 +483,10 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(unknownMacroBeforeReturn);
 
+        TEST_CASE(cppKeywordInCSource);
+
         TEST_CASE(cppcast);
+        TEST_CASE(ccast);
 
         TEST_CASE(checkHeader1);
 
@@ -482,29 +532,44 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyPlatformTypes);
 
         TEST_CASE(dumpFallthrough);
+
+        TEST_CASE(simplifyRedundantParentheses);
+
+        TEST_CASE(simplifyEnum1);
+
+        TEST_CASE(simplifyEnum2);
     }
 
+    class TokenizerTest final : public Tokenizer
+    {
+        friend class TestTokenizer;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
+    struct TokenizeOptions
+    {
+        bool expand = true;
+        bool cpp = true;
+    };
+
 #define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    std::string tokenizeAndStringify_(const char* file, int linenr, const char (&code)[size], bool expand = true, Platform::Type platform = Platform::Type::Native,
-                                      bool cpp = true, Standards::cppstd_t cppstd = Standards::CPP11, Standards::cstd_t cstd = Standards::C11) {
-        const Settings settings = settingsBuilder(settings1).debugwarnings().cpp(cppstd).c(cstd).platform(platform).build();
-
+    std::string tokenizeAndStringify_(const char* file, int linenr, const char (&code)[size], const TokenizeOptions& opt = make_default_obj{}) {
         // tokenize..
-        SimpleTokenizer tokenizer(settings, *this, cpp);
+        SimpleTokenizer tokenizer(settings2, *this, opt.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
 
         if (tokenizer.tokens())
-            return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
+            return tokenizer.tokens()->stringifyList(false, opt.expand, false, true, false, nullptr, nullptr);
         return "";
     }
 
     // TODO: get rid of this
     std::string tokenizeAndStringify_(const char* file, int linenr, const std::string& code) {
-        const Settings settings = settingsBuilder(settings1).debugwarnings().cpp(Standards::CPP11).c(Standards::C11).build();
-
-        // tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
+        SimpleTokenizer tokenizer(settings2, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
 
         if (tokenizer.tokens())
@@ -512,53 +577,46 @@ class TestTokenizer : public TestFixture {
         return "";
     }
 
-#define tokenizeAndStringifyWindows(...) tokenizeAndStringifyWindows_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    std::string tokenizeAndStringifyWindows_(const char* file, int linenr, const char (&code)[size], bool expand = true, Platform::Type platform = Platform::Type::Native, bool cpp = true, bool cpp11 = true) {
-        const Settings settings = settingsBuilder(settings_windows).debugwarnings().cpp(cpp11 ? Standards::CPP11 : Standards::CPP03).platform(platform).build();
-
-        // tokenize..
-        SimpleTokenizer tokenizer(settings, *this, cpp);
-        ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
-
-        if (tokenizer.tokens())
-            return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
-        return "";
-    }
-
-    template<size_t size>
-    std::string tokenizeAndStringify_(const char* file, int line, const char (&code)[size], const Settings &settings, bool cpp = true) {
+    std::string tokenizeAndStringify_(const char* file, int line, const char (&code)[size], const Settings &settings, bool cpp = true, bool expand = true) {
         // tokenize..
         SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
         if (!tokenizer.tokens())
             return "";
-        return tokenizer.tokens()->stringifyList(false, true, false, true, false, nullptr, nullptr);
+        return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
     }
 
 #define tokenizeDebugListing(...) tokenizeDebugListing_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string tokenizeDebugListing_(const char* file, int line, const char (&code)[size], bool cpp = true) {
-        const Settings settings = settingsBuilder(settings0).c(Standards::C89).cpp(Standards::CPP03).build();
-
-        SimpleTokenizer tokenizer(settings, *this, cpp);
+        SimpleTokenizer tokenizer(settings3, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // result..
         return tokenizer.tokens()->stringifyList(true,true,true,true,false);
     }
 
-    void directiveDump(const char filedata[], std::ostream& ostr) {
-        directiveDump(filedata, "test.c", settingsDefault, ostr);
+    template<size_t size>
+    void directiveDump(const char (&code)[size], std::ostream& ostr) {
+        directiveDump(code, "test.c", settingsDefault, ostr);
     }
 
-    void directiveDump(const char filedata[], const char filename[], const Settings& settings, std::ostream& ostr) {
-        std::istringstream istr(filedata);
+    template<size_t size>
+    void directiveDump(const char (&code)[size], const char filename[], const Settings& settings, std::ostream& ostr) {
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
-        const simplecpp::TokenList tokens1(istr, files, filename, &outputList);
-        Preprocessor preprocessor(settings, *this, Path::identify(tokens1.getFiles()[0], false));
-        std::list<Directive> directives = preprocessor.createDirectives(tokens1);
+        simplecpp::TokenList tokens1(code, files, filename, {}, &outputList);
+        Preprocessor preprocessor(tokens1, settings, *this, Path::identify(tokens1.getFiles()[0], false));
+        std::list<Directive> directives;
+        preprocessor.setLoadCallback([&](const simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::createDirectives(data.tokens, directives);
+            }
+        });
+        preprocessor.createDirectives(directives);
+        ASSERT(preprocessor.loadAllIncludes(files));
+        (void)preprocessor.reportOutput(outputList, true);
 
         TokenList tokenlist{settings, Path::identify(filename, false)};
         Tokenizer tokenizer(std::move(tokenlist), *this);
@@ -568,16 +626,18 @@ class TestTokenizer : public TestFixture {
     }
 
     void tokenize1() {
-        const char code[] = "void f ( )\n"
-                            "{ if ( p . y ( ) > yof ) { } }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "void f()\n"
+                            "{ if (p.y() > yof) {} }\n";
+        const char expected[] = "void f ( )\n"
+                                "{ if ( p . y ( ) > yof ) { } }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:2:20]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable yof [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:2:15]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable yof [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void tokenize2() {
-        const char code[] = "{ sizeof a, sizeof b }";
+        const char code[] = "{ sizeof a, sizeof b }\n";
         ASSERT_EQUALS("{ sizeof ( a ) , sizeof ( b ) }", tokenizeAndStringify(code));
     }
 
@@ -586,7 +646,7 @@ class TestTokenizer : public TestFixture {
                             "{\n"
                             "public:\n"
                             "    const int i;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("class foo\n"
                       "{\n"
                       "public:\n"
@@ -597,8 +657,8 @@ class TestTokenizer : public TestFixture {
 
     void tokenize5() {
         // Tokenize values
-        ASSERT_EQUALS("; + 1E3 ;", tokenizeAndStringify("; +1E3 ;"));
-        ASSERT_EQUALS("; 1E-2 ;", tokenizeAndStringify("; 1E-2 ;"));
+        ASSERT_EQUALS("; + 1E3 ;", tokenizeAndStringify("; +1E3 ;\n"));
+        ASSERT_EQUALS("; 1E-2 ;", tokenizeAndStringify("; 1E-2 ;\n"));
     }
 
     void tokenize7() {
@@ -627,13 +687,13 @@ class TestTokenizer : public TestFixture {
                             "typedef fp (*fpp)();\n"
                             "void f() {\n"
                             "    fpp x = (fpp)f();\n"
-                            "}";
+                            "}\n";
         (void)tokenizeAndStringify(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void tokenize11() {
-        ASSERT_EQUALS("X * sizeof ( Y ( ) ) ;", tokenizeAndStringify("X * sizeof(Y());"));
+        ASSERT_EQUALS("X * sizeof ( Y ( ) ) ;", tokenizeAndStringify("X * sizeof(Y());\n"));
     }
 
     // bailout if there is "@" - it is not handled well
@@ -647,44 +707,44 @@ class TestTokenizer : public TestFixture {
 
     // Ticket #2361: 0X10 => 16
     void tokenize14() {
-        ASSERT_EQUALS("; 0x10 ;", tokenizeAndStringify(";0x10;"));
-        ASSERT_EQUALS("; 0X10 ;", tokenizeAndStringify(";0X10;"));
-        ASSERT_EQUALS("; 0444 ;", tokenizeAndStringify(";0444;"));
+        ASSERT_EQUALS("; 0x10 ;", tokenizeAndStringify(";0x10;\n"));
+        ASSERT_EQUALS("; 0X10 ;", tokenizeAndStringify(";0X10;\n"));
+        ASSERT_EQUALS("; 0444 ;", tokenizeAndStringify(";0444;\n"));
     }
 
     // Ticket #8050
     void tokenizeHexWithSuffix() {
-        ASSERT_EQUALS("; 0xFFFFFF ;", tokenizeAndStringify(";0xFFFFFF;"));
-        ASSERT_EQUALS("; 0xFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFu;"));
-        ASSERT_EQUALS("; 0xFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFul;"));
+        ASSERT_EQUALS("; 0xFFFFFF ;", tokenizeAndStringify(";0xFFFFFF;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFu;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFul;\n"));
 
         // Number of digits decides about internal representation...
-        ASSERT_EQUALS("; 0xFFFFFFFF ;", tokenizeAndStringify(";0xFFFFFFFF;"));
-        ASSERT_EQUALS("; 0xFFFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFFFu;"));
-        ASSERT_EQUALS("; 0xFFFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFFFul;"));
+        ASSERT_EQUALS("; 0xFFFFFFFF ;", tokenizeAndStringify(";0xFFFFFFFF;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFFFu ;", tokenizeAndStringify(";0xFFFFFFFFu;\n"));
+        ASSERT_EQUALS("; 0xFFFFFFFFul ;", tokenizeAndStringify(";0xFFFFFFFFul;\n"));
     }
 
     // Ticket #2429: 0.125
     void tokenize15() {
-        ASSERT_EQUALS("0.125 ;", tokenizeAndStringify(".125;"));
-        ASSERT_EQUALS("005.125 ;", tokenizeAndStringify("005.125;")); // Don't confuse with octal values
+        ASSERT_EQUALS("0.125 ;", tokenizeAndStringify(".125;\n"));
+        ASSERT_EQUALS("005.125 ;", tokenizeAndStringify("005.125;\n")); // Don't confuse with octal values
     }
 
     void tokenize17() { // #2759
-        ASSERT_EQUALS("class B : private :: A { } ;", tokenizeAndStringify("class B : private ::A { };"));
+        ASSERT_EQUALS("class B : private :: A { } ;", tokenizeAndStringify("class B : private ::A { };\n"));
     }
 
     void tokenize18() { // tokenize "(X&&Y)" into "( X && Y )" instead of "( X & & Y )"
-        ASSERT_EQUALS("( X && Y ) ;", tokenizeAndStringify("(X&&Y);"));
+        ASSERT_EQUALS("( X && Y ) ;", tokenizeAndStringify("(X&&Y);\n"));
     }
 
     void tokenize19() {
         // #3006 - added hasComplicatedSyntaxErrorsInTemplates to avoid segmentation fault
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("x < () <"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("x < () <\n"), SYNTAX);
 
         // #3496 - make sure hasComplicatedSyntaxErrorsInTemplates works
         ASSERT_EQUALS("void a ( Fred * f ) { for ( ; n < f . x ( ) ; ) { } }",
-                      tokenizeAndStringify("void a(Fred* f) MACRO { for (;n < f->x();) {} }"));
+                      tokenizeAndStringify("void a(Fred* f) MACRO { for (;n < f->x();) {} }\n"));
 
         // #6216 - make sure hasComplicatedSyntaxErrorsInTemplates works
         ASSERT_EQUALS("C :: C ( )\n"
@@ -700,30 +760,30 @@ class TestTokenizer : public TestFixture {
                                            "    for (int dim = 0; dim < v.size(); ++dim) {\n"
                                            "        v[dim]->f();\n"
                                            "    }\n"
-                                           "};"));
+                                           "};\n"));
         ignore_errout(); // we do not care about the output
     }
 
     void tokenize21() { // tokenize 0x0E-7
-        ASSERT_EQUALS("0x0E - 7 ;", tokenizeAndStringify("0x0E-7;"));
+        ASSERT_EQUALS("0x0E - 7 ;", tokenizeAndStringify("0x0E-7;\n"));
     }
 
     void tokenize22() { // tokenize special marker $ from preprocessor
-        ASSERT_EQUALS("a$b", tokenizeAndStringify("a$b"));
-        ASSERT_EQUALS("a $b\nc", tokenizeAndStringify("a $b\nc"));
-        ASSERT_EQUALS("a = $0 ;", tokenizeAndStringify("a = $0;"));
-        ASSERT_EQUALS("a$ ++ ;", tokenizeAndStringify("a$++;"));
-        ASSERT_EQUALS("$if ( ! p )", tokenizeAndStringify("$if(!p)"));
+        ASSERT_EQUALS("a$b", tokenizeAndStringify("a$b\n"));
+        ASSERT_EQUALS("a $b\nc", tokenizeAndStringify("a $b\nc\n"));
+        ASSERT_EQUALS("a = $0 ;", tokenizeAndStringify("a = $0;\n"));
+        ASSERT_EQUALS("a$ ++ ;", tokenizeAndStringify("a$++;\n"));
+        ASSERT_EQUALS("$if ( ! p )", tokenizeAndStringify("$if(!p)\n"));
     }
 
-    // #4239 - segfault for "f ( struct { int typedef T x ; } ) { }"
+    // #4239 - segfault for "f ( struct { int typedef T x ; } ) { }\n"
     void tokenize25() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f ( struct { int typedef T x ; } ) { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f ( struct { int typedef T x ; } ) { }\n"), SYNTAX);
     }
 
     // #4245 - segfault
     void tokenize26() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class x { protected : template < int y = } ;"), SYNTAX); // Garbage code
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class x { protected : template < int y = } ;\n"), SYNTAX); // Garbage code
     }
 
     void tokenize27() {
@@ -732,11 +792,11 @@ class TestTokenizer : public TestFixture {
                                    "~except_spec_d_good();\n"
                                    "};\n"
                                    "struct S { S(); };\n"
-                                   "S::S() __attribute((pure)) = default;"
+                                   "S::S() __attribute((pure)) = default;\n"
                                    );
 
         // original code: glibc-2.18/posix/bug-regex20.c
-        (void)tokenizeAndStringify("static unsigned int re_string_context_at (const re_string_t *input, int idx, int eflags) internal_function __attribute__ ((pure));");
+        (void)tokenizeAndStringify("static unsigned int re_string_context_at (const re_string_t *input, int idx, int eflags) internal_function __attribute__ ((pure));\n");
     }
 
     // #3503 - don't "simplify" SetFunction member function to a variable
@@ -746,21 +806,22 @@ class TestTokenizer : public TestFixture {
                       "} ;",
                       tokenizeAndStringify("struct TTestClass { TTestClass() { }\n"
                                            "    void SetFunction(Other(*m_f)()) { }\n"
-                                           "};"));
+                                           "};\n"));
 
         ASSERT_EQUALS("struct TTestClass { TTestClass ( ) { }\n"
                       "void SetFunction ( Other ( * m_f ) ( ) ) ;\n"
                       "} ;",
                       tokenizeAndStringify("struct TTestClass { TTestClass() { }\n"
                                            "    void SetFunction(Other(*m_f)());\n"
-                                           "};"));
+                                           "};\n"));
     }
 
     // #5884 - Avoid left shift of negative integer value.
     void tokenize32() {
         // Do not simplify negative integer left shifts.
-        const char code[] = "void f ( ) { int max_x ; max_x = -10000 << 16 ; }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "void f () { int max_x; max_x = -10000 << 16; }\n";
+        const char expected[] = "void f ( ) { int max_x ; max_x = -10000 << 16 ; }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     // #5780 Various crashes on valid template code in Tokenizer::setVarId()
@@ -779,7 +840,7 @@ class TestTokenizer : public TestFixture {
                                 "  int* mElements;\n"
                                 "};\n"
                                 "Container::Container() : mElements(nullptr) {}\n"
-                                "Container intContainer;";
+                                "Container intContainer;\n";
             const char exp[] = "1: struct Container {\n"
                                "2: Container ( ) ;\n"
                                "3: int * mElements@1 ;\n"
@@ -794,7 +855,7 @@ class TestTokenizer : public TestFixture {
                                 "  int* mElements;\n"
                                 "};\n"
                                 "template <class T> Container<T>::Container() : mElements(nullptr) {}\n"
-                                "Container<int> intContainer;";
+                                "Container<int> intContainer;\n";
             const char exp[] = "1: struct Container<int> ;\n"
                                "2:\n"
                                "|\n"
@@ -810,42 +871,45 @@ class TestTokenizer : public TestFixture {
     }
 
     void tokenize35() { // #8361
-        ASSERT_NO_THROW(tokenizeAndStringify("typedef int CRCWord; "
-                                             "template<typename T> ::CRCWord const Compute(T const t) { return 0; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("typedef int CRCWord;\n"
+                                             "template<typename T> ::CRCWord const Compute(T const t) { return 0; }\n"));
     }
 
     void tokenize36() { // #8436
-        const char code[] = "int foo ( int i ) { return i ? * new int { 5 } : int { i ? 0 : 1 } ; }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "int foo (int i) { return i ? *new int {5} : int {i ? 0 : 1}; }\n";
+        const char expected[] = "int foo ( int i ) { return i ? * new int { 5 } : int { i ? 0 : 1 } ; }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void tokenize37() { // #8550
-        const char codeC[] = "class name { public: static void init ( ) {} } ; "
-                             "typedef class name N; "
-                             "void foo ( ) { return N :: init ( ) ; }";
-        const char expC[] = "class name { public: static void init ( ) { } } ; "
+        const char codeC[] = "class name { public: static void init ( ) {} } ;\n"
+                             "typedef class name N;\n"
+                             "void foo ( ) { return N :: init ( ) ; }\n";
+        const char expC[] = "class name { public: static void init ( ) { } } ;\n"
+                            "\n"
                             "void foo ( ) { return name :: init ( ) ; }";
         ASSERT_EQUALS(expC, tokenizeAndStringify(codeC));
-        const char codeS[] = "class name { public: static void init ( ) {} } ; "
-                             "typedef struct name N; "
-                             "void foo ( ) { return N :: init ( ) ; }";
-        const char expS[] = "class name { public: static void init ( ) { } } ; "
+        const char codeS[] = "class name { public: static void init ( ) {} } ;\n"
+                             "typedef struct name N;\n"
+                             "void foo ( ) { return N :: init ( ) ; }\n";
+        const char expS[] = "class name { public: static void init ( ) { } } ;\n"
+                            "\n"
                             "void foo ( ) { return name :: init ( ) ; }";
         ASSERT_EQUALS(expS, tokenizeAndStringify(codeS));
     }
 
     void tokenize38() { // #9569
-        const char code[] = "using Binary = std::vector<char>; enum Type { Binary };";
+        const char code[] = "using Binary = std::vector<char>; enum Type { Binary };\n";
         const char exp[]  = "enum Type { Binary } ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
     void tokenize39() { // #9771
-        const char code[] = "template <typename T> class Foo;"
-                            "template <typename T> bool operator!=(const Foo<T> &, const Foo<T> &);"
-                            "template <typename T> class Foo { friend bool operator!= <> (const Foo<T> &, const Foo<T> &); };";
-        const char exp[]  = "template < typename T > class Foo ; "
-                            "template < typename T > bool operator!= ( const Foo < T > & , const Foo < T > & ) ; "
+        const char code[] = "template <typename T> class Foo;\n"
+                            "template <typename T> bool operator!=(const Foo<T> &, const Foo<T> &);\n"
+                            "template <typename T> class Foo { friend bool operator!= <> (const Foo<T> &, const Foo<T> &); };\n";
+        const char exp[]  = "template < typename T > class Foo ;\n"
+                            "template < typename T > bool operator!= ( const Foo < T > & , const Foo < T > & ) ;\n"
                             "template < typename T > class Foo { friend bool operator!= < > ( const Foo < T > & , const Foo < T > & ) ; } ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
@@ -873,74 +937,110 @@ class TestTokenizer : public TestFixture {
         (void)errout_str();
     }
 
+    void tokenize42() { // #13861
+        const char code[] = "struct AB { int a; int b; };\n"
+                            "namespace ns { typedef AB S[10]; }\n"
+                            "void foo(void) {\n"
+                            "    ns::S x = {0};\n"
+                            "    x[1].a = 2;\n"
+                            "}\n";
+        ASSERT_EQUALS("struct AB { int a ; int b ; } ;\n"
+                      "\n"
+                      "void foo ( ) {\n"
+                      "AB x [ 10 ] = { 0 } ;\n"
+                      "x [ 1 ] . a = 2 ;\n"
+                      "}", tokenizeAndStringify(code));
+        (void)errout_str();
+    }
+
+    void tokenize43() {
+        const char code[] = "void f(int i) { do if (i &= 1) {} while (0); }\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code));
+        (void)errout_str();
+    }
+
+    void tokenize44() { // #14955
+        const char code[] = "namespace O {}\n"
+                            "namespace N {\n"
+                            "    using namespace O;\n"
+                            "    enum class E { E0 };\n"
+                            "    E E0 = E::E0;\n"
+                            "}\n";
+        const char expected[] = "2: namespace N {\n"
+                                "3: using namespace O ;\n"
+                                "4: enum class E { E0 } ;\n"
+                                "5: E E0@1 ; E0@1 = E :: E0 ;\n"
+                                "6: }\n";
+        ASSERT_EQUALS(expected, tokenizeDebugListing(code));
+    }
+
     void validate() {
         // C++ code in C file
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";using namespace std;",false,Platform::Type::Native,false), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";std::map<int,int> m;",false,Platform::Type::Native,false), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";template<class T> class X { };",false,Platform::Type::Native,false), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int X<Y>() {};",false,Platform::Type::Native,false), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";using namespace std;\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";std::map<int,int> m;\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";template<class T> class X { };\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int X<Y>() {};\n",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
         {
             TokenList tokenlist{settings1, Standards::Language::C}; // headers are treated as C files
-            const char code[] = "void foo(int i) { reinterpret_cast<char>(i) };";
-            std::istringstream istr(code);
+            const char code[] = "void foo(int i) { reinterpret_cast<char>(i) };\n";
             tokenlist.appendFileIfNew("test.h");
-            ASSERT(tokenlist.createTokens(istr));
+            ASSERT(tokenlist.createTokensFromString(code));
             Tokenizer tokenizer(std::move(tokenlist), *this);
             ASSERT_THROW_INTERNAL(tokenizer.simplifyTokens1(""), SYNTAX);
         }
     }
 
     void objectiveC() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { [foo bar]; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { [foo bar]; }\n"), SYNTAX);
     }
 
     void syntax_case_default() { // correct syntax
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0: z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
-        (void)tokenizeAndStringify("void f(int n) {switch (n) { case 0:; break;}}");
+        (void)tokenizeAndStringify("void f(int n) {switch (n) { case 0:; break;}}\n");
         ASSERT_EQUALS("", errout_str());
 
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?1:2 : z(); break;}}"), InternalError);
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?1:2 : z(); break;}}\n"), InternalError);
         //ASSERT_EQUALS("", errout_str());
 
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?(1?3:4):2 : z(); break;}}"), InternalError);
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?(1?3:4):2 : z(); break;}}\n"), InternalError);
         ASSERT_EQUALS("", errout_str());
 
         //allow GCC '({ %name%|%num%|%bool% ; })' statement expression extension
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?({0;}):1: z(); break;}}"), InternalError);
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?({0;}):1: z(); break;}}\n"), InternalError);
         ASSERT_EQUALS("", errout_str());
 
         //'b' can be or a macro or an undefined enum
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case b: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case b: z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
         //valid, when there's this declaration: 'constexpr int g() { return 2; }'
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g(): z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g(): z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
         //valid, when there's also this declaration: 'constexpr int g[1] = {0};'
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g[0]: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g[0]: z(); break;}}\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:34]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable g [valueFlowBailoutIncompleteVar]\n",
             errout_str());
 
         //valid, similar to above case
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case *g: z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case *g: z(); break;}}\n"));
         ASSERT_EQUALS("", errout_str());
 
         //valid, when 'x' and 'y' are constexpr.
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case sqrt(x+y): z(); break;}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case sqrt(x+y): z(); break;}}\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:39]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void removePragma() {
-        const char code[] = "_Pragma(\"abc\") int x;";
+        const char code[] = "_Pragma(\"abc\") int x;\n";
         const Settings s_c89 = settingsBuilder().c(Standards::C89).build();
         ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_c89, false));
         const Settings s_clatest;
@@ -954,7 +1054,7 @@ class TestTokenizer : public TestFixture {
 
     void foreach () {
         // #3690,#5154
-        const char code[] ="void f() { for each ( char c in MyString ) { Console::Write(c); } }";
+        const char code[] ="void f() { for each ( char c in MyString ) { Console::Write(c); } }\n";
         ASSERT_EQUALS("void f ( ) { for ( char c : MyString ) { Console :: Write ( c ) ; } }", tokenizeAndStringify(code));
         ASSERT_EQUALS(
             "[test.cpp:1:33]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable MyString [valueFlowBailoutIncompleteVar]\n",
@@ -962,37 +1062,40 @@ class TestTokenizer : public TestFixture {
     }
 
     void ifconstexpr() {
-        ASSERT_EQUALS("void f ( ) { if ( FOO ) { bar ( c ) ; } }", tokenizeAndStringify("void f() { if constexpr ( FOO ) { bar(c); } }"));
+        ASSERT_EQUALS("void f ( ) { if ( FOO ) { bar ( c ) ; } }", tokenizeAndStringify("void f() { if constexpr ( FOO ) { bar(c); } }\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable FOO [valueFlowBailoutIncompleteVar]\n",
             filter_valueflow(errout_str()));
     }
 
     void combineOperators() {
-        ASSERT_EQUALS("; private: ;", tokenizeAndStringify(";private:;"));
-        ASSERT_EQUALS("; protected: ;", tokenizeAndStringify(";protected:;"));
-        ASSERT_EQUALS("; public: ;", tokenizeAndStringify(";public:;"));
-        ASSERT_EQUALS("; __published: ;", tokenizeAndStringify(";__published:;"));
-        ASSERT_EQUALS("a . public : ;", tokenizeAndStringify("a.public:;"));
-        ASSERT_EQUALS("void f ( x & = 2 ) ;", tokenizeAndStringify("void f(x &= 2);"));
-        ASSERT_EQUALS("const_cast < a * > ( & e )", tokenizeAndStringify("const_cast<a*>(&e)"));
+        ASSERT_EQUALS("; private: ;", tokenizeAndStringify(";private:;\n"));
+        ASSERT_EQUALS("; protected: ;", tokenizeAndStringify(";protected:;\n"));
+        ASSERT_EQUALS("; public: ;", tokenizeAndStringify(";public:;\n"));
+        ASSERT_EQUALS("; __published: ;", tokenizeAndStringify(";__published:;\n"));
+        ASSERT_EQUALS("a . public : ;", tokenizeAndStringify("a.public:;\n"));
+        ASSERT_EQUALS("void f ( x & = 2 ) ;", tokenizeAndStringify("void f(x &= 2);\n"));
+        ASSERT_EQUALS("const_cast < a * > ( & e )", tokenizeAndStringify("const_cast<a*>(&e)\n"));
     }
 
     void concatenateNegativeNumber() {
-        ASSERT_EQUALS("i = -12 ;", tokenizeAndStringify("i = -12;"));
-        ASSERT_EQUALS("1 - 2 ;", tokenizeAndStringify("1-2;"));
-        ASSERT_EQUALS("foo ( -1 ) - 2 ;", tokenizeAndStringify("foo(-1)-2;"));
-        ASSERT_EQUALS("int f ( ) { return -2 ; }", tokenizeAndStringify("int f(){return -2;}"));
-        ASSERT_EQUALS("int x [ 2 ] = { -2 , 1 }", tokenizeAndStringify("int x[2] = {-2,1}"));
+        ASSERT_EQUALS("i = -12 ;", tokenizeAndStringify("i = -12;\n"));
+        ASSERT_EQUALS("1 - 2 ;", tokenizeAndStringify("1-2;\n"));
+        ASSERT_EQUALS("foo ( -1 ) - 2 ;", tokenizeAndStringify("foo(-1)-2;\n"));
+        ASSERT_EQUALS("int f ( ) { return -2 ; }", tokenizeAndStringify("int f(){return -2;}\n"));
+        ASSERT_EQUALS("int x [ 2 ] = { -2 , 1 }", tokenizeAndStringify("int x[2] = {-2,1}\n"));
 
-        ASSERT_EQUALS("f ( 123 )", tokenizeAndStringify("f(+123)"));
+        ASSERT_EQUALS("f ( 123 )", tokenizeAndStringify("f(+123)\n"));
+
+        ASSERT_EQUALS("std :: extent_v < A > - 1 ;", tokenizeAndStringify("std::extent_v<A> - 1;\n")); // #11341
     }
 
 
 
     void longtok() {
-        const std::string filedata(10000, 'a');
-        ASSERT_EQUALS(filedata, tokenizeAndStringify(filedata));
+        const std::string code = std::string(10000, 'a') + '\n';
+        const std::string expected = std::string(10000, 'a');
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
 
@@ -1002,13 +1105,13 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("; template <typename... a> uint8_t b(std::tuple<uint8_t> d) {\n"
                                            "  std::tuple<a...> c{std::move(d)};\n"
                                            "  return std::get<0>(c);\n"
-                                           "}", s));
+                                           "}\n", s));
         ASSERT_EQUALS("int g ( int ) ;",
                       tokenizeAndStringify("int g(int);\n"
                                            "template <class F, class... Ts> auto h(F f, Ts... xs) {\n"
                                            "    auto e = f(g(xs)...);\n"
                                            "    return e;\n"
-                                           "}", s));
+                                           "}\n", s));
     }
 
     void simplifyHeadersAndUnusedTemplates2() {
@@ -1018,7 +1121,7 @@ class TestTokenizer : public TestFixture {
                             "    void FooBar() {\n"
                             "        new ( (uBAR ? uBAR : sizeof(T))) T;\n"
                             "    }\n"
-                            "};";
+                            "};\n";
 
         {
             const Settings s = settingsBuilder().checkUnusedTemplates(false).build();
@@ -1037,88 +1140,104 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyAt() {
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x@123;"));
-        ASSERT_EQUALS("bool x ;", tokenizeAndStringify("bool x@123:1;"));
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x@123;\n"));
+        ASSERT_EQUALS("bool x ;", tokenizeAndStringify("bool x@123:1;\n"));
         ASSERT_EQUALS("char PORTB ; bool PB3 ;", tokenizeAndStringify("char PORTB @ 0x10; bool PB3 @ PORTB:3;\n"));
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x @ (0x1000 + 18);"));
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify("int x @ (0x1000 + 18);\n"));
 
-        ASSERT_EQUALS("int x [ 10 ] ;", tokenizeAndStringify("int x[10]@0x100;"));
+        ASSERT_EQUALS("int x [ 10 ] ;", tokenizeAndStringify("int x[10]@0x100;\n"));
 
-        ASSERT_EQUALS("void ( * f [ ] ) ( void ) ;", tokenizeAndStringify("void (*f[])(void)@0x100;")); // #13458
+        ASSERT_EQUALS("void ( * f [ ] ) ( void ) ;", tokenizeAndStringify("void (*f[])(void)@0x100;\n")); // #13458
 
-        ASSERT_EQUALS("interrupt@ f ( ) { }", tokenizeAndStringify("@interrupt f() {}"));
+        ASSERT_EQUALS("interrupt@ f ( ) { }", tokenizeAndStringify("@interrupt f() {}\n"));
 
-        ASSERT_EQUALS("const short MyVariable = 0xF0F0 ;", tokenizeAndStringify("const short MyVariable @ \"MYOWNSECTION\" = 0xF0F0; ")); // #12602
+        ASSERT_EQUALS("const short MyVariable = 0xF0F0 ;", tokenizeAndStringify("const short MyVariable @ \"MYOWNSECTION\" = 0xF0F0; \n")); // #12602
     }
 
     void inlineasm() {
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("asm { mov ax,bx };"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm { mov ax,bx };"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm mov ax,bx"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm { mov ax,bx };"));
-        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ __volatile__ ( \"mov ax,bx\" );"));
-        ASSERT_EQUALS("asm ( \"_emit 12h\" ) ;", tokenizeAndStringify("__asm _emit 12h ;"));
-        ASSERT_EQUALS("asm ( \"mov a , b\" ) ;", tokenizeAndStringify("__asm mov a, b ;"));
-        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify("asm volatile (\"fnstcw %0\" : \"= m\" (old_cw));"));
-        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify(" __asm__ (\"fnstcw %0\" : \"= m\" (old_cw));"));
-        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile__ (\"ddd\") ;"));
-        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile (\"ddd\") ;"));
-        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ volatile ( \"mov ax,bx\" );"));
-        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ; int a ;", tokenizeAndStringify("asm { mov ax,bx } int a;"));
-        ASSERT_EQUALS("asm\n\n( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm\nmov ax,bx\n__endasm;"));
-        ASSERT_EQUALS("asm\n\n( \"push b ; for if\" ) ;", tokenizeAndStringify("__asm\npush b ; for if\n__endasm;"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("asm { mov ax,bx };\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm { mov ax,bx };\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("_asm mov ax,bx\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm { mov ax,bx };\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ __volatile__ ( \"mov ax,bx\" );\n"));
+        ASSERT_EQUALS("asm ( \"_emit 12h\" ) ;", tokenizeAndStringify("__asm _emit 12h ;\n"));
+        ASSERT_EQUALS("asm ( \"mov a , b\" ) ;", tokenizeAndStringify("__asm mov a, b ;\n"));
+        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify("asm volatile (\"fnstcw %0\" : \"= m\" (old_cw));\n"));
+        ASSERT_EQUALS("asm ( \"\"fnstcw %0\" : \"= m\" ( old_cw )\" ) ;", tokenizeAndStringify(" __asm__ (\"fnstcw %0\" : \"= m\" (old_cw));\n"));
+        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile__ (\"ddd\") ;\n"));
+        ASSERT_EQUALS("asm ( \"\"ddd\"\" ) ;", tokenizeAndStringify(" __asm __volatile (\"ddd\") ;\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify("__asm__ volatile ( \"mov ax,bx\" );\n"));
+        ASSERT_EQUALS("asm ( \"mov ax , bx\" ) ; int a ;", tokenizeAndStringify("asm { mov ax,bx } int a;\n"));
+        ASSERT_EQUALS("asm\n\n( \"mov ax , bx\" ) ;", tokenizeAndStringify("__asm\nmov ax,bx\n__endasm;\n"));
+        ASSERT_EQUALS("asm\n\n( \"push b ; for if\" ) ;", tokenizeAndStringify("__asm\npush b ; for if\n__endasm;\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm volatile (\"mov ax , bx\");\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm goto (\"mov ax , bx\");\n"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm inline (\"mov ax , bx\");\n"));
 
         // 'asm ( ) ;' should be in the same line
-        ASSERT_EQUALS(";\n\nasm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify(";\n\n__asm__ volatile ( \"mov ax,bx\" );"));
+        ASSERT_EQUALS(";\n\nasm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify(";\n\n__asm__ volatile ( \"mov ax,bx\" );\n"));
+
+        ASSERT_EQUALS("void func1 ( ) ;", tokenizeAndStringify("void func1() __asm__(\"...\") __attribute__();\n"));
 
-        ASSERT_EQUALS("void func1 ( ) ;", tokenizeAndStringify("void func1() __asm__(\"...\") __attribute__();"));
+        // #14250 - assembler function
+        const char code[] = "__asm void dostuff(uint32_t x) {\n"
+                            "%reg x\n"
+                            "  e_lis r7, (lf)@h\n"
+                            "%error\n"
+                            "}\n";
+        const char expected[] = "void dostuff ( uint32_t x ) {\n"
+                                "asm ( \"% reg x e_lis r7 , ( lf ) @ h % error\" ) ;\n"
+                                "\n"
+                                "\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     // #4725 - ^{}
     void simplifyAsm2() {
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { ^{} }"), SYNTAX, "syntax error");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { x(^{}); }"), SYNTAX, "syntax error");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { foo(A(), ^{ bar(); }); }"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { ^{} }\n"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { x(^{}); }\n"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { foo(A(), ^{ bar(); }); }\n"), SYNTAX, "syntax error");
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int f0(Args args) {\n"
                                                           "    return ^{\n"
                                                           "        return sizeof...(Args);\n"
                                                           "    }() + ^ {\n"
                                                           "        return sizeof...(args);\n"
                                                           "    }();\n"
-                                                          "};"), SYNTAX, "syntax error");
+                                                          "};\n"), SYNTAX, "syntax error");
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int(^block)(void) = ^{\n"
                                                           "    static int test = 0;\n"
                                                           "    return test;\n"
-                                                          "};"), SYNTAX, "syntax error");
+                                                          "};\n"), SYNTAX, "syntax error");
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("; return f(a[b=c],^{});"), SYNTAX, "syntax error: keyword 'return' is not allowed in global scope"); // #7185
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("; return f(a[b=c],^{});\n"), SYNTAX, "syntax error: keyword 'return' is not allowed in global scope"); // #7185
         ASSERT_EQUALS("{ return f ( asm ( \"^(void){somecode}\" ) ) ; }",
-                      tokenizeAndStringify("{ return f(^(void){somecode}); }"));
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify(";a?(b?(c,^{}):0):^{};"), SYNTAX, "syntax error");
-        ASSERT_EQUALS("template < typename T > "
-                      "CImg < T > operator| ( const char * const expression , const CImg < T > & img ) { "
-                      "return img | expression ; "
-                      "} "
-                      "template < typename T > "
-                      "CImg < T > operator^ ( const char * const expression , const CImg < T > & img ) { "
-                      "return img ^ expression ; "
-                      "} "
-                      "template < typename T > "
-                      "CImg < T > operator== ( const char * const expression , const CImg < T > & img ) { "
-                      "return img == expression ; "
+                      tokenizeAndStringify("{ return f(^(void){somecode}); }\n"));
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify(";a?(b?(c,^{}):0):^{};\n"), SYNTAX, "syntax error");
+        ASSERT_EQUALS("template < typename T >\n"
+                      "CImg < T > operator| ( const char * const expression , const CImg < T > & img ) {\n"
+                      "return img | expression ;\n"
+                      "}\n"
+                      "template < typename T >\n"
+                      "CImg < T > operator^ ( const char * const expression , const CImg < T > & img ) {\n"
+                      "return img ^ expression ;\n"
+                      "}\n"
+                      "template < typename T >\n"
+                      "CImg < T > operator== ( const char * const expression , const CImg < T > & img ) {\n"
+                      "return img == expression ;\n"
                       "}",
-                      tokenizeAndStringify("template < typename T >"
-                                           "inline CImg<T> operator|(const char *const expression, const CImg<T>& img) {"
-                                           "  return img | expression ;"
-                                           "}"
-                                           "template<typename T>"
-                                           "inline CImg<T> operator^(const char *const expression, const CImg<T>& img) {"
-                                           "  return img ^ expression;"
-                                           "}"
-                                           "template<typename T>"
-                                           "inline CImg<T> operator==(const char *const expression, const CImg<T>& img) {"
-                                           "  return img == expression;"
-                                           "}"));
+                      tokenizeAndStringify("template < typename T >\n"
+                                           "inline CImg<T> operator|(const char *const expression, const CImg<T>& img) {\n"
+                                           "  return img | expression ;\n"
+                                           "}\n"
+                                           "template<typename T>\n"
+                                           "inline CImg<T> operator^(const char *const expression, const CImg<T>& img) {\n"
+                                           "  return img ^ expression;\n"
+                                           "}\n"
+                                           "template<typename T>\n"
+                                           "inline CImg<T> operator==(const char *const expression, const CImg<T>& img) {\n"
+                                           "  return img == expression;\n"
+                                           "}\n"));
     }
 
     void ifAddBraces1() {
@@ -1225,34 +1344,34 @@ class TestTokenizer : public TestFixture {
     void ifAddBraces9() {
         // ticket #990
         const char code[] =
-            "void f() {"
-            "    for (int k=0; k<VectorSize; k++)"
-            "        LOG_OUT(ID_Vector[k])"
-            "}";
+            "void f() {\n"
+            "    for (int k=0; k<VectorSize; k++)\n"
+            "        LOG_OUT(ID_Vector[k])\n"
+            "}\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), UNKNOWN_MACRO);
     }
 
     void ifAddBraces11() {
-        const char code[] = "{ if (x) if (y) ; else ; }";
+        const char code[] = "{ if (x) if (y) ; else ; }\n";
         const char expected[] = "{ if ( x ) { if ( y ) { ; } else { ; } } }";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void ifAddBraces12() {
         // ticket #1424
-        const char code[] = "{ if (x) do { } while(x); }";
+        const char code[] = "{ if (x) do { } while(x); }\n";
         const char expected[] = "{ if ( x ) { do { } while ( x ) ; } }";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void ifAddBraces13() {
         // ticket #1809
-        const char code[] = "{ if (x) if (y) { } else { } else { } }";
+        const char code[] = "{ if (x) if (y) { } else { } else { } }\n";
         const char expected[] = "{ if ( x ) { if ( y ) { } else { } } else { } }";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
 
         // ticket #1809
-        const char code2[] = "{ if (x) while (y) { } else { } }";
+        const char code2[] = "{ if (x) while (y) { } else { } }\n";
         const char expected2[] = "{ if ( x ) { while ( y ) { } } else { } }";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
@@ -1260,19 +1379,21 @@ class TestTokenizer : public TestFixture {
     void ifAddBraces15() {
         // ticket #2616 - unknown macro before if
         // TODO: Remove "A" or change it to ";A;". Then cleanup Tokenizer::ifAddBraces().
-        ASSERT_EQUALS("{ A if ( x ) { y ( ) ; } }", tokenizeAndStringify("{A if(x)y();}"));
+        ASSERT_EQUALS("{ A if ( x ) { y ( ) ; } }", tokenizeAndStringify("{A if(x)y();}\n"));
     }
 
     void ifAddBraces16() {
         // ticket #2873 - the fix is not needed anymore.
         {
-            const char code[] = "void f() { "
-                                "(void) ( { if(*p) (*p) = x(); } ) "
-                                "}";
-            ASSERT_EQUALS("void f ( ) { ( void ) ( { if ( * p ) { ( * p ) = x ( ) ; } } ) }",
-                          tokenizeAndStringify(code));
+            const char code[] = "void f() {\n"
+                                "(void) ( { if(*p) (*p) = x(); } )\n"
+                                "}\n";
+            const char expected[] = "void f ( ) {\n"
+                                    "( void ) ( { if ( * p ) { ( * p ) = x ( ) ; } } )\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:2:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
                 filter_valueflow(errout_str()));
         }
     }
@@ -1302,10 +1423,10 @@ class TestTokenizer : public TestFixture {
     void ifAddBraces18() {
         // ticket #3424 - if if { } else else
         ASSERT_EQUALS("{ if ( x ) { if ( y ) { } else { ; } } else { ; } }",
-                      tokenizeAndStringify("{ if(x) if(y){}else;else;}"));
+                      tokenizeAndStringify("{ if(x) if(y){}else;else;}\n"));
 
         ASSERT_EQUALS("{ if ( x ) { if ( y ) { if ( z ) { } else { ; } } else { ; } } else { ; } }",
-                      tokenizeAndStringify("{ if(x) if(y) if(z){}else;else;else;}"));
+                      tokenizeAndStringify("{ if(x) if(y) if(z){}else;else;else;}\n"));
     }
 
     void ifAddBraces19() {
@@ -1334,7 +1455,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void ifAddBraces20() { // #5012 - syntax error 'else }'
-        const char code[] = "void f() { if(x) {} else }";
+        const char code[] = "void f() { if(x) {} else }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
     }
 
@@ -1347,7 +1468,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  if (x)\n"
                                            "  l1: l2: return x;\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before {
@@ -1358,7 +1479,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  if (x)\n"
                                            "  l1: l2: { return x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before try/catch
@@ -1373,7 +1494,7 @@ class TestTokenizer : public TestFixture {
                                            "  l1: l2:\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { return x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
@@ -1386,7 +1507,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  switch (x)\n"
                                            "  l1: case 0: l2: case (1): return x;\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before {
         ASSERT_EQUALS("int f ( int x ) {\n"
@@ -1396,7 +1517,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("int f(int x) {\n"
                                            "  switch (x)\n"
                                            "  l1: case 0: l2: case (1): { return x; }\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before try/catch
         ASSERT_EQUALS("int f ( int x ) {\n"
@@ -1410,11 +1531,11 @@ class TestTokenizer : public TestFixture {
                                            "  l1: case 0: l2: case (1):\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { return x; }\n"
-                                           "}"));
+                                           "}\n"));
     }
 
     void whileAddBraces() {
-        const char code[] = "{while(a);}";
+        const char code[] = "{while(a);}\n";
         ASSERT_EQUALS("{ while ( a ) { ; } }", tokenizeAndStringify(code));
     }
 
@@ -1427,7 +1548,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  while (x)\n"
                                            "  l1: l2: --x;\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before {
@@ -1438,7 +1559,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  while (x)\n"
                                            "  l1: l2: { -- x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before try/catch
@@ -1453,13 +1574,24 @@ class TestTokenizer : public TestFixture {
                                            "  l1: l2:\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { --x; }\n"
-                                           "}"));
+                                           "}\n"));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
+    void whileAddBracesDump() {
+        const char code[] = "void f(){while(a);}\n";
+        SimpleTokenizer tokenizer(settingsDefault, *this, false);
+        ASSERT(tokenizer.tokenize(code));
+        ASSERT(Token::simpleMatch(tokenizer.tokens(), "void f ( ) { while ( a ) { ; } }"));
+        std::ostringstream ostr;
+        tokenizer.dump(ostr);
+        const std::string dump = ostr.str();
+        ASSERT(dump.find("isInsertedBrace=\"true\"") != std::string::npos);
+    }
+
     void doWhileAddBraces() {
         {
-            const char code[] = "{do ; while (0);}";
+            const char code[] = "{do ; while (0);}\n";
             const char result[] = "{ do { ; } while ( 0 ) ; }";
 
             ASSERT_EQUALS(result, tokenizeAndStringify(code));
@@ -1467,13 +1599,13 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "{ UNKNOWN_MACRO ( do ) ; while ( a -- ) ; }";
+            const char code[] = "{ UNKNOWN_MACRO ( do ) ; while ( a -- ) ; }\n";
             ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "{ UNKNOWN_MACRO ( do , foo ) ; while ( a -- ) ; }";
+            const char code[] = "{ UNKNOWN_MACRO ( do , foo ) ; while ( a -- ) ; }\n";
             ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
             ASSERT_EQUALS("", errout_str());
         }
@@ -1520,7 +1652,7 @@ class TestTokenizer : public TestFixture {
             // #8148 - while inside the do-while body
             const char code[] = "void foo() {\n"
                                 "    do { while (x) f(); } while (y);\n"
-                                "}";
+                                "}\n";
             const char result[] = "void foo ( ) {\n"
                                   "do { while ( x ) { f ( ) ; } } while ( y ) ;\n"
                                   "}";
@@ -1542,7 +1674,7 @@ class TestTokenizer : public TestFixture {
                                            "  do\n"
                                            "  l1: l2: --x;\n"
                                            "  while (x);\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before {
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1554,7 +1686,7 @@ class TestTokenizer : public TestFixture {
                                            "  do\n"
                                            "  l1: l2: { -- x; }\n"
                                            "  while (x);\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before try/catch
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1570,7 +1702,7 @@ class TestTokenizer : public TestFixture {
                                            "    try { throw 1; }\n"
                                            "    catch(...) { --x; }\n"
                                            "  while (x);\n"
-                                           "}"));
+                                           "}\n"));
     }
 
     void forAddBraces1() {
@@ -1579,7 +1711,7 @@ class TestTokenizer : public TestFixture {
                                 "     for(;;)\n"
                                 "         if (a) { }\n"
                                 "         else { }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "for ( ; ; ) {\n"
                                     "if ( a ) { }\n"
@@ -1597,7 +1729,7 @@ class TestTokenizer : public TestFixture {
                                 "         if (a) { }\n"
                                 "         else if (b) { }\n"
                                 "         else { }\n"
-                                "}";
+                                "}\n";
             const char expected[] = "void f ( ) {\n"
                                     "for ( ; ; ) {\n"
                                     "if ( a ) { }\n"
@@ -1614,7 +1746,7 @@ class TestTokenizer : public TestFixture {
     void forAddBraces2() { // #5088
         const char code[] = "void f() {\n"
                             "    for(;;) try { } catch (...) { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "void f ( ) {\n"
                                 "for ( ; ; ) { try { } catch ( ... ) { } }\n"
                                 "}";
@@ -1630,7 +1762,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  for ( ; x; )\n"
                                            "  l1: l2: --x;\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before {
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1640,7 +1772,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void f(int x) {\n"
                                            "  for ( ; x; )\n"
                                            "  l1: l2: { -- x; }\n"
-                                           "}"));
+                                           "}\n"));
 
         // Labels before try/catch
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1654,43 +1786,43 @@ class TestTokenizer : public TestFixture {
                                            "  l1: l2:\n"
                                            "    try { throw 1; }\n"
                                            "    catch(...) { --x; }\n"
-                                           "}"));
+                                           "}\n"));
     }
 
 
     void simplifyExternC() {
         const char expected[] = "int foo ( ) ;";
         {
-            const char code[] = "extern \"C\" int foo();";
+            const char code[] = "extern \"C\" int foo();\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(tokenizer.tokens()->next()->isExternC());
         }
         {
-            const char code[] = "extern \"C\" { int foo(); }";
+            const char code[] = "extern \"C\" { int foo(); }\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(tokenizer.tokens()->next()->isExternC());
         }
         {
-            const char code[] = "extern \"C++\" int foo();";
+            const char code[] = "extern \"C++\" int foo();\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
             ASSERT(!tokenizer.tokens()->next()->isExternC());
         }
         {
-            const char code[] = "extern \"C++\" { int foo(); }";
+            const char code[] = "extern \"C++\" { int foo(); }\n";
             // tokenize..
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             // Expected result..
             ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -1700,41 +1832,49 @@ class TestTokenizer : public TestFixture {
 
     void simplifyFunctionParameters() {
         {
-            const char code[] = "char a [ ABC ( DEF ) ] ;";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            const char code[] = "char a [ ABC ( DEF ) ] ;\n";
+            const char expected[] = "char a [ ABC ( DEF ) ] ;";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "module ( a , a , sizeof ( a ) , 0444 ) ;";
+            const char code[] = "module ( a , a , sizeof ( a ) , 0444 ) ;\n";
             ASSERT_EQUALS("module ( a , a , sizeof ( a ) , 0444 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
-        ASSERT_EQUALS("void f ( int x ) { }", tokenizeAndStringify("void f(x) int x; { }"));
+        ASSERT_EQUALS("void f ( int x ) { }", tokenizeAndStringify("void f(x) int x; { }\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("void f ( int x , char y ) { }", tokenizeAndStringify("void f(x,y) int x; char y; { }"));
+        ASSERT_EQUALS("void f ( int x , char y ) { }", tokenizeAndStringify("void f(x,y) int x; char y; { }\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("int main ( int argc , char * argv [ ] ) { }", tokenizeAndStringify("int main(argc,argv) int argc; char *argv[]; { }"));
+        ASSERT_EQUALS("int main ( int argc , char * argv [ ] ) { }", tokenizeAndStringify("int main(argc,argv) int argc; char *argv[]; { }\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("int f ( int p , int w , float d ) { }", tokenizeAndStringify("int f(p,w,d) float d; { }"));
+        ASSERT_EQUALS("int f ( int p , int w , float d ) { }", tokenizeAndStringify("int f(p,w,d) float d; { }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // #1067 - Not simplified. Feel free to fix so it is simplified correctly but this syntax is obsolescent.
-        ASSERT_EQUALS("int ( * d ( a , b , c ) ) ( ) int a ; int b ; int c ; { }", tokenizeAndStringify("int (*d(a,b,c))()int a,b,c; { }"));
+        ASSERT_EQUALS("int ( * d ( a , b , c ) ) ( ) int a ; int b ; int c ; { }", tokenizeAndStringify("int (*d(a,b,c))()int a,b,c; { }\n"));
         ASSERT_EQUALS("", errout_str());
 
         {
             // This is not a function but the pattern is similar..
-            const char code[] = "void foo()"
-                                "{"
-                                "    if (x)"
-                                "        int x;"
-                                "    { }"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( x ) { int x ; } { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if (x)\n"
+                                "        int x;\n"
+                                "    { }\n"
+                                "}\n";
+
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( x ) {\n"
+                                    "int x ; }\n"
+                                    "{ }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:20]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
                 filter_valueflow(errout_str()));
         }
     }
@@ -1752,36 +1892,52 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyFunctionParameters2() { // #4430
-        const char code[] = "class Item { "
-                            "int i ; "
-                            "public: "
-                            "Item ( int i ) ; "
-                            "} ; "
-                            "Item :: Item ( int i ) : i ( i ) { }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "class Item {\n"
+                            "    int i;\n"
+                            "public:\n"
+                            "    Item (int i);\n"
+                            "};\n"
+                            "Item::Item(int i) : i(i) { }\n";
+        const char expected[] = "class Item {\n"
+                                "int i ;\n"
+                                "public:\n"
+                                "Item ( int i ) ;\n"
+                                "} ;\n"
+                                "Item :: Item ( int i ) : i ( i ) { }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyFunctionParameters3() { // #4436
-        const char code[] = "class Item { "
-                            "int i ; "
-                            "int j ; "
-                            "public: "
-                            "Item ( int i , int j ) ; "
-                            "} ; "
-                            "Item :: Item ( int i , int j ) : i ( i ) , j ( j ) { }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "class Item {\n"
+                            "    int i;\n"
+                            "    int j;\n"
+                            "public:\n"
+                            "    Item(int i, int j);\n"
+                            "};\n"
+                            "Item :: Item (int i, int j) : i(i), j(j) {}\n";
+        const char expected[] = "class Item {\n"
+                                "int i ;\n"
+                                "int j ;\n"
+                                "public:\n"
+                                "Item ( int i , int j ) ;\n"
+                                "} ;\n"
+                                "Item :: Item ( int i , int j ) : i ( i ) , j ( j ) { }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyFunctionParameters4() { // #9421
-        const char code[] = "int foo :: bar ( int , int ) const ;";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "int foo::bar(int, int) const;\n";
+        const char expected[] = "int foo :: bar ( int , int ) const ;";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyFunctionParametersMultiTemplate() {
-        const char code[] = "template < typename T1 > template < typename T2 > "
-                            "void A < T1 > :: foo ( T2 ) { }";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
-        ASSERT_EQUALS("[test.cpp:1:68]: (debug) Executable scope 'foo' with unknown function. [symbolDatabaseWarning]\n", errout_str());
+        const char code[] = "template<typename T1> template<typename T2>\n"
+                            "void A<T1>::foo(T2) {}\n";
+        const char expected[] = "template < typename T1 > template < typename T2 >\n"
+                                "void A < T1 > :: foo ( T2 ) { }";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS("[test.cpp:2:13]: (debug) Executable scope 'foo' with unknown function. [symbolDatabaseWarning]\n", errout_str());
     }
 
     void simplifyFunctionParametersErrors() {
@@ -1797,7 +1953,7 @@ class TestTokenizer : public TestFixture {
                                                    "{}\n"), SYNTAX);
 
         ASSERT_NO_THROW(tokenizeAndStringify("void foo(int, int)\n"
-                                             "{}"));
+                                             "{}\n"));
         ASSERT_EQUALS("", errout_str());
 
         // #3848 - Don't hang
@@ -1807,7 +1963,7 @@ class TestTokenizer : public TestFixture {
                                    "void CreateSdrOLEFromStorage() {\n"
                                    "    comphelper::EmbeddedObjectContainer aCnt( xDestStorage );\n"
                                    "    { }\n"
-                                   "}");
+                                   "}\n");
         ignore_errout();
     }
 
@@ -1819,7 +1975,7 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("void foo() try {\n"
                                            "} catch (int) {\n"
                                            "} catch (char) {\n"
-                                           "}"));
+                                           "}\n"));
 
         ASSERT_EQUALS("void foo ( ) { try {\n"
                       "struct S {\n"
@@ -1838,7 +1994,7 @@ class TestTokenizer : public TestFixture {
                                            "    }\n"
                                            "  };\n"
                                            "} catch (long) {\n"
-                                           "}"));
+                                           "}\n"));
 
         ASSERT_EQUALS("struct S { void func ( ) const ; } ;\n"
                       "void S :: func ( ) const {\n"
@@ -1852,77 +2008,104 @@ class TestTokenizer : public TestFixture {
 
     // Simplify "((..))" into "(..)"
     void removeParentheses1() {
-        const char code[] = "void foo()"
-                            "{"
-                            "    free(((void*)p));"
-                            "}";
-
-        ASSERT_EQUALS("void foo ( ) { free ( ( void * ) p ) ; }", tokenizeAndStringify(code));
+        const char code[] = "void foo()\n"
+                            "{\n"
+                            "    free(((void*)p));\n"
+                            "}\n";
+        const char expected[] = "void foo ( )\n"
+                                "{\n"
+                                "free ( ( void * ) p ) ;\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:1:29]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:3:18]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void removeParentheses3() {
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    if (( true )==(true)){}"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( true == true ) { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if (( true )==(true)){}\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( true == true ) { }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    if (( 2 )==(2)){}"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( 2 == 2 ) { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if (( 2 )==(2)){}\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( 2 == 2 ) { }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    if( g(10)){}"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { if ( g ( 10 ) ) { } }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if( g(10)){}\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "if ( g ( 10 ) ) { }\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
     }
 
     // Simplify "( function (..))" into "function (..)"
     void removeParentheses4() {
-        const char code[] = "void foo()"
-                            "{"
-                            "    (free(p));"
-                            "}";
-        ASSERT_EQUALS("void foo ( ) { free ( p ) ; }", tokenizeAndStringify(code));
+        const char code[] = "void foo()\n"
+                            "{\n"
+                            "    (free(p));\n"
+                            "}\n";
+        const char expected[] = "void foo ( )\n"
+                                "{\n"
+                                "free ( p ) ;\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:1:22]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:3:11]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
             errout_str());
     }
 
     void removeParentheses5() {
         // Simplify "( delete x )" into "delete x"
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    (delete p);"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { delete p ; }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    (delete p);\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "delete p ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:24]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
         }
 
         // Simplify "( delete [] x )" into "delete [] x"
         {
-            const char code[] = "void foo()"
-                                "{"
-                                "    (delete [] p);"
-                                "}";
-            ASSERT_EQUALS("void foo ( ) { delete [ ] p ; }", tokenizeAndStringify(code));
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    (delete [] p);\n"
+                                "}\n";
+            const char expected[] = "void foo ( )\n"
+                                    "{\n"
+                                    "delete [ ] p ;\n"
+                                    "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
             ASSERT_EQUALS(
-                "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                "[test.cpp:3:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
                 errout_str());
         }
     }
@@ -1930,18 +2113,18 @@ class TestTokenizer : public TestFixture {
     // "!(abc.a)" => "!abc.a"
     void removeParentheses6() {
         {
-            const char code[] = "(!(abc.a));";
+            const char code[] = "(!(abc.a));\n";
             ASSERT_EQUALS("( ! abc . a ) ;", tokenizeAndStringify(code));
         }
         //handle more complex member selections
         {
-            const char code[] = "(!(a.b.c.d));";
+            const char code[] = "(!(a.b.c.d));\n";
             ASSERT_EQUALS("( ! a . b . c . d ) ;", tokenizeAndStringify(code));
         }
     }
 
     void removeParentheses7() {
-        const char code[] = ";char *p; (delete(p), (p)=0);";
+        const char code[] = ";char *p; (delete(p), (p)=0);\n";
         ASSERT_EQUALS("; char * p ; delete ( p ) , p = 0 ;", tokenizeAndStringify(code));
     }
 
@@ -1949,7 +2132,7 @@ class TestTokenizer : public TestFixture {
         const char code[] = "struct foo {\n"
                             "    void operator delete(void *obj, size_t sz);\n"
                             "}\n";
-        const std::string actual(tokenizeAndStringify(code, true, Platform::Type::Win32A));
+        const std::string actual(tokenizeAndStringify(code, settings2_win32a));
 
         const char expected[] = "struct foo {\n"
                                 "void operatordelete ( void * obj , unsigned long sz ) ;\n"
@@ -1959,77 +2142,77 @@ class TestTokenizer : public TestFixture {
     }
 
     void removeParentheses9() {
-        ASSERT_EQUALS("void delete ( double num ) ;", tokenizeAndStringify("void delete(double num);"));
+        ASSERT_EQUALS("void delete ( double num ) ;", tokenizeAndStringify("void delete(double num);\n"));
     }
 
     void removeParentheses10() {
-        ASSERT_EQUALS("p = buf + 8 ;", tokenizeAndStringify("p = (buf + 8);"));
+        ASSERT_EQUALS("p = buf + 8 ;", tokenizeAndStringify("p = (buf + 8);\n"));
     }
 
     void removeParentheses11() {
         // #2502
-        ASSERT_EQUALS("{ } x ( ) ;", tokenizeAndStringify("{}(x());"));
+        ASSERT_EQUALS("{ } x ( ) ;", tokenizeAndStringify("{}(x());\n"));
     }
 
     void removeParentheses12() {
         // #2760
-        ASSERT_EQUALS(", x = 0 ;", tokenizeAndStringify(",(x)=0;"));
+        ASSERT_EQUALS(", x = 0 ;", tokenizeAndStringify(",(x)=0;\n"));
     }
 
     void removeParentheses13() {
-        ASSERT_EQUALS("; f ( a + b , c ) ;", tokenizeAndStringify(";f((a+b),c);"));
-        ASSERT_EQUALS("; x = y [ a + b ] ;", tokenizeAndStringify(";x=y[(a+b)];"));
+        ASSERT_EQUALS("; f ( a + b , c ) ;", tokenizeAndStringify(";f((a+b),c);\n"));
+        ASSERT_EQUALS("; x = y [ a + b ] ;", tokenizeAndStringify(";x=y[(a+b)];\n"));
     }
 
     void removeParentheses14() {
-        ASSERT_EQUALS("{ if ( ( i & 1 ) == 0 ) { ; } }", tokenizeAndStringify("{ if ( (i & 1) == 0 ); }"));
+        ASSERT_EQUALS("{ if ( ( i & 1 ) == 0 ) { ; } }", tokenizeAndStringify("{ if ( (i & 1) == 0 ); }\n"));
     }
 
     void removeParentheses15() {
-        ASSERT_EQUALS("a = b ? c : 123 ;", tokenizeAndStringify("a = b ? c : (123);"));
-        ASSERT_EQUALS("a = b ? c : ( 123 + 456 ) ;", tokenizeAndStringify("a = b ? c : ((123)+(456));"));
-        ASSERT_EQUALS("a = b ? ( 123 ) : c ;", tokenizeAndStringify("a = b ? (123) : c;"));
+        ASSERT_EQUALS("a = b ? c : 123 ;", tokenizeAndStringify("a = b ? c : (123);\n"));
+        ASSERT_EQUALS("a = b ? c : ( 123 + 456 ) ;", tokenizeAndStringify("a = b ? c : ((123)+(456));\n"));
+        ASSERT_EQUALS("a = b ? ( 123 ) : c ;", tokenizeAndStringify("a = b ? (123) : c;\n"));
 
         // #4316
-        ASSERT_EQUALS("a = b ? c : ( d = 1 , 0 ) ;", tokenizeAndStringify("a = b ? c : (d=1,0);"));
+        ASSERT_EQUALS("a = b ? c : ( d = 1 , 0 ) ;", tokenizeAndStringify("a = b ? c : (d=1,0);\n"));
     }
 
     void removeParentheses16() { // *(x.y)=
         // #4423
-        ASSERT_EQUALS("; * x = 0 ;", tokenizeAndStringify(";*(x)=0;"));
-        ASSERT_EQUALS("; * x . y = 0 ;", tokenizeAndStringify(";*(x.y)=0;"));
+        ASSERT_EQUALS("; * x = 0 ;", tokenizeAndStringify(";*(x)=0;\n"));
+        ASSERT_EQUALS("; * x . y = 0 ;", tokenizeAndStringify(";*(x.y)=0;\n"));
     }
 
     void removeParentheses17() { // a ? b : (c > 0 ? d : e)
-        ASSERT_EQUALS("a ? b : ( c > 0 ? d : e ) ;", tokenizeAndStringify("a?b:(c>0?d:e);"));
+        ASSERT_EQUALS("a ? b : ( c > 0 ? d : e ) ;", tokenizeAndStringify("a?b:(c>0?d:e);\n"));
     }
 
     void removeParentheses18() {
-        ASSERT_EQUALS("float ( * a ) [ 2 ] ;", tokenizeAndStringify("float(*a)[2];"));
+        ASSERT_EQUALS("float ( * a ) [ 2 ] ;", tokenizeAndStringify("float(*a)[2];\n"));
     }
 
     void removeParentheses19() {
-        ASSERT_EQUALS("( ( ( typeof ( X ) ) * ) 0 ) ;", tokenizeAndStringify("(((typeof(X))*)0);"));
+        ASSERT_EQUALS("( ( ( typeof ( X ) ) * ) 0 ) ;", tokenizeAndStringify("(((typeof(X))*)0);\n"));
     }
 
     void removeParentheses20() {
-        ASSERT_EQUALS("a < b < int > > ( 2 ) ;", tokenizeAndStringify("a<b<int>>(2);"));
+        ASSERT_EQUALS("a < b < int > > ( 2 ) ;", tokenizeAndStringify("a<b<int>>(2);\n"));
     }
 
     void removeParentheses21() {
-        ASSERT_EQUALS("a = ( int ) - b ;", tokenizeAndStringify("a = ((int)-b);"));
+        ASSERT_EQUALS("a = ( int ) - b ;", tokenizeAndStringify("a = ((int)-b);\n"));
     }
 
     void removeParentheses22() {
-        static char code[] = "struct S { "
-                             "char *(a); "
-                             "char &(b); "
-                             "const static char *(c); "
-                             "} ;";
-        static const char exp[] = "struct S { "
-                                  "char * a ; "
-                                  "char & b ; "
-                                  "static const char * c ; "
+        static char code[] = "struct S {\n"
+                             "    char *(a);\n"
+                             "    char &(b);\n"
+                             "    const static char *(c);\n"
+                             "};\n";
+        static const char exp[] = "struct S {\n"
+                                  "char * a ;\n"
+                                  "char & b ;\n"
+                                  "static const char * c ;\n"
                                   "} ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
@@ -2037,48 +2220,48 @@ class TestTokenizer : public TestFixture {
     void removeParentheses23() { // Ticket #6103
         // Reported case
         {
-            static char code[] = "; * * p f ( ) int = { new int ( * [ 2 ] ) ; void }";
+            static char code[] = "; * * p f ( ) int = { new int ( * [ 2 ] ) ; void }\n";
             static const char exp[] = "; * * p f ( ) int = { new int ( * [ 2 ] ) ; void }";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         // Various valid cases
         {
-            static char code[] = "int * f [ 1 ] = { new ( int ) } ;";
+            static char code[] = "int * f [ 1 ] = { new ( int ) } ;\n";
             static const char exp[] = "int * f [ 1 ] = { new int } ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         {
-            static char code[] = "int * * f [ 1 ] = { new ( int ) [ 1 ] } ;";
+            static char code[] = "int * * f [ 1 ] = { new ( int ) [ 1 ] } ;\n";
             static const char exp[] = "int * * f [ 1 ] = { new int [ 1 ] } ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         {
-            static char code[] = "list < int > * f [ 1 ] = { new ( list < int > ) } ;";
+            static char code[] = "list < int > * f [ 1 ] = { new ( list < int > ) } ;\n";
             static const char exp[] = "list < int > * f [ 1 ] = { new list < int > } ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
         // don't remove parentheses in operator new overload
         {
-            static char code[] = "void *operator new(__SIZE_TYPE__, int);";
+            static char code[] = "void *operator new(__SIZE_TYPE__, int);\n";
             static const char exp[] = "void * operatornew ( __SIZE_TYPE__ , int ) ;";
             ASSERT_EQUALS(exp, tokenizeAndStringify(code));
         }
     }
 
     void removeParentheses24() { // Ticket #7040
-        static char code[] = "std::hash<decltype(t._data)>()(t._data);";
+        static char code[] = "std::hash<decltype(t._data)>()(t._data);\n";
         static const char exp[] = "std :: hash < decltype ( t . _data ) > ( ) ( t . _data ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
     void removeParentheses25() { // daca@home - a=(b,c)
-        static char code[] = "a=(b,c);";
+        static char code[] = "a=(b,c);\n";
         static const char exp[] = "a = ( b , c ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
     void removeParentheses26() { // Ticket #8875 a[0](0)
-        static char code[] = "a[0](0);";
+        static char code[] = "a[0](0);\n";
         static const char exp[] = "a [ 0 ] ( 0 ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
@@ -2098,11 +2281,36 @@ class TestTokenizer : public TestFixture {
     }
 
     void removeParentheses28() { // Ticket #12164
-        static char code[] = "temp1 = (value > 100U) ? (value+100U) : (value-50U);";
+        static char code[] = "temp1 = (value > 100U) ? (value+100U) : (value-50U);\n";
         static const char exp[] = "temp1 = ( value > 100U ) ? ( value + 100U ) : ( value - 50U ) ;";
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
+    void removeParantheses29() { // Ticket #13735
+        static char code[] = "double foo(void)\n"
+                             "{\n"
+                             "return (modf)(12.3, NULL);\n"
+                             "}\n";
+        static const char exp[] = "double foo ( )\n"
+                                  "{\n"
+                                  "return modf ( 12.3 , NULL ) ;\n"
+                                  "}";
+        ASSERT_EQUALS(exp, tokenizeAndStringify(code));
+    }
+
+    void removeParentheses30() {
+        static char code[] = "void f (Node *node) {\n"
+                             "    if (node->data && (node->provider)->free)\n"
+                             "        (node->provider)->free (node);\n"
+                             "}\n";
+        static const char exp[] = "void f ( Node * node ) {\n"
+                                  "if ( node . data && ( node . provider ) . free ) {\n"
+                                  "node . provider . free ( node ) ; }\n"
+                                  "}";
+        ASSERT_EQUALS(exp, tokenizeAndStringify(code));
+        (void) errout_str();
+    }
+
     void tokenize_double() {
         const char code[] = "void f() {\n"
                             "    double a = 4.2;\n"
@@ -2110,7 +2318,7 @@ class TestTokenizer : public TestFixture {
                             "    double c = 4.2e+10;\n"
                             "    double d = 4.2e-10;\n"
                             "    int e = 4+2;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "double a ; a = 4.2 ;\n"
                       "float b ; b = 4.2f ;\n"
@@ -2121,14 +2329,14 @@ class TestTokenizer : public TestFixture {
     }
 
     void tokenize_strings() {
-        const char code[] =   "void f() {\n"
+        const char code[] = "void f() {\n"
                             "const char *a =\n"
                             "{\n"
                             "\"hello \"\n"
                             "\"more \"\n"
                             "\"world\"\n"
                             "};\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "const char * a ; a =\n"
                       "{\n"
@@ -2140,27 +2348,32 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyStructDecl() {
-        const char code[] = "const struct A { int a; int b; } a;";
+        const char code[] = "const struct A { int a; int b; } a;\n";
         ASSERT_EQUALS("struct A { int a ; int b ; } ; const struct A a ;", tokenizeAndStringify(code));
 
         // #9519
-        const char code2[] = "enum A {} (a);";
+        const char code2[] = "enum A {} (a);\n";
         const char expected2[] = "enum A { } ; enum A a ;";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
 
         // #11052
-        const char code3[] = "struct a { int b; } static e[1];";
+        const char code3[] = "struct a { int b; } static e[1];\n";
         const char expected3[] = "struct a { int b ; } ; struct a static e [ 1 ] ;";
         ASSERT_EQUALS(expected3, tokenizeAndStringify(code3));
 
         // #11013 - Do not remove unnamed struct in union
-        const char code4[] = "union U { struct { int a; int b; }; int ab[2]; };";
+        const char code4[] = "union U { struct { int a; int b; }; int ab[2]; };\n";
         const char expected4[] = "union U { struct { int a ; int b ; } ; int ab [ 2 ] ; } ;";
         ASSERT_EQUALS(expected4, tokenizeAndStringify(code4));
+
+        // #14836: FP syntaxError for anonymous struct in for loop
+        const char code5[] = "void f(void) { for (struct { int a; } it = {0}; it.a < 10; it.a++) {} }\n";
+        const char expected5[] = "void f ( ) { struct Anonymous0 { int a ; } ; for ( struct Anonymous0 it = { 0 } ; it . a < 10 ; it . a ++ ) { } }";
+        ASSERT_EQUALS(expected5, tokenizeAndStringify(code5));
     }
 
     void vardecl1() {
-        const char code[] = "unsigned int a, b;";
+        const char code[] = "unsigned int a, b;\n";
 
         const std::string actual(tokenizeAndStringify(code));
 
@@ -2168,7 +2381,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl2() {
-        const char code[] = "void foo(a,b) unsigned int a, b; { }";
+        const char code[] = "void foo(a,b) unsigned int a, b; { }\n";
 
         const std::string actual(tokenizeAndStringify(code));
 
@@ -2176,7 +2389,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl3() {
-        const char code[] = "void f() { char * p = foo<10,char>(); }";
+        const char code[] = "void f() { char * p = foo<10,char>(); }\n";
         const std::string actual(tokenizeAndStringify(code));
         ASSERT_EQUALS("void f ( ) { char * p ; p = foo < 10 , char > ( ) ; }", actual);
     }
@@ -2184,23 +2397,23 @@ class TestTokenizer : public TestFixture {
     void vardecl4() {
         // ticket #346
 
-        const char code1[] = "void *p = NULL;";
+        const char code1[] = "void *p = NULL;\n";
         const char res1[]  = "void * p ; p = NULL ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
 
-        const char code2[] = "const void *p = NULL;";
+        const char code2[] = "const void *p = NULL;\n";
         const char res2[]  = "const void * p ; p = NULL ;";
         ASSERT_EQUALS(res2, tokenizeAndStringify(code2));
 
-        const char code3[] = "void * const p = NULL;";
+        const char code3[] = "void * const p = NULL;\n";
         const char res3[]  = "void * const p ; p = NULL ;";
         ASSERT_EQUALS(res3, tokenizeAndStringify(code3));
 
-        const char code4[] = "const void * const p = NULL;";
+        const char code4[] = "const void * const p = NULL;\n";
         const char res4[]  = "const void * const p ; p = NULL ;";
         ASSERT_EQUALS(res4, tokenizeAndStringify(code4));
 
-        const char code5[] = "const void * volatile p = NULL;";
+        const char code5[] = "const void * volatile p = NULL;\n";
         const char res5[]  = "const void * volatile p ; p = NULL ;";
         ASSERT_EQUALS(res5, tokenizeAndStringify(code5));
     }
@@ -2210,7 +2423,7 @@ class TestTokenizer : public TestFixture {
                       "int addI ; addI = frontPoint == 2 || frontPoint == 1 ? ( i = 0 , 1 ) : ( i = nX - 2 , -1 ) ;\n"
                       "}", tokenizeAndStringify("void foo(int nX) {\n"
                                                 "    int addI = frontPoint == 2 || frontPoint == 1 ? i = 0, 1 : (i = nX - 2, -1);\n"
-                                                "}"));
+                                                "}\n"));
         ASSERT_EQUALS(
             "[test.cpp:2:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable frontPoint [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2219,56 +2432,69 @@ class TestTokenizer : public TestFixture {
     void vardecl_stl_1() {
         // ticket #520
 
-        const char code1[] = "std::vector<std::string>a, b;";
+        const char code1[] = "std::vector<std::string>a, b;\n";
         const char res1[]  = "std :: vector < std :: string > a ; std :: vector < std :: string > b ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
 
-        const char code2[] = "std::vector<std::string>::const_iterator it, cit;";
+        const char code2[] = "std::vector<std::string>::const_iterator it, cit;\n";
         const char res2[]  = "std :: vector < std :: string > :: const_iterator it ; std :: vector < std :: string > :: const_iterator cit ;";
         ASSERT_EQUALS(res2, tokenizeAndStringify(code2));
 
-        const char code3[] = "std::vector<std::pair<std::string, std::string > > *c, d;";
+        const char code3[] = "std::vector<std::pair<std::string, std::string > > *c, d;\n";
         const char res3[]  = "std :: vector < std :: pair < std :: string , std :: string > > * c ; std :: vector < std :: pair < std :: string , std :: string > > d ;";
         ASSERT_EQUALS(res3, tokenizeAndStringify(code3));
     }
 
     void vardecl_stl_2() {
-        const char code1[] = "{ std::string x = \"abc\"; }";
+        const char code1[] = "{ std::string x = \"abc\"; }\n";
         ASSERT_EQUALS("{ std :: string x ; x = \"abc\" ; }", tokenizeAndStringify(code1));
 
-        const char code2[] = "{ std::vector<int> x = y; }";
+        const char code2[] = "{ std::vector<int> x = y; }\n";
         ASSERT_EQUALS("{ std :: vector < int > x ; x = y ; }", tokenizeAndStringify(code2));
     }
 
     void vardecl_stl_3()
     {
-        const char code1[] = "{ std::string const x = \"abc\"; }";
+        const char code1[] = "{ std::string const x = \"abc\"; }\n";
         ASSERT_EQUALS("{ const std :: string x = \"abc\" ; }", tokenizeAndStringify(code1));
 
-        const char code2[] = "{ std::vector<int> const x = y; }";
+        const char code2[] = "{ std::vector<int> const x = y; }\n";
         ASSERT_EQUALS("{ const std :: vector < int > x = y ; }", tokenizeAndStringify(code2));
     }
 
     void vardecl_template_1() {
         // ticket #1046
-        const char code1[] = "b<(1<<24),10,24> u, v;";
+        const char code1[] = "b<(1<<24),10,24> u, v;\n";
         const char res1[]  = "b < 16777216 , 10 , 24 > u ; b < 16777216 , 10 , 24 > v ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
         // ticket #3571 (segmentation fault)
-        (void)tokenizeAndStringify("template <int i = (3>4) > class X4 {};");
+        (void)tokenizeAndStringify("template <int i = (3>4) > class X4 {};\n");
     }
 
     void vardecl_template_2() {
         // ticket #3650
-        const char code[] = "const string str = x<8,int>();";
+        const char code[] = "const string str = x<8,int>();\n";
         const char expected[]  = "const string str = x < 8 , int > ( ) ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
+    void vardecl_template_3() {
+        const char code[] = "template <class T>\n" // #14909
+                            "void f(T x) {\n"
+                            "    const auto y = h<T, x.size()>;\n"
+                            "}\n";
+        const char expected[]  = "template < class T >\n"
+                                 "void f ( T x ) {\n"
+                                 "const auto y = h < T , x . size ( ) > ;\n"
+                                 "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS("[test.cpp:3:11]: (debug) auto token with no type. [autoNoType]\n", errout_str());
+    }
+
     void vardecl_union() {
         // ticket #1976
-        const char code1[] = "class Fred { public: union { int a ; int b ; } ; } ;";
-        ASSERT_EQUALS(code1, tokenizeAndStringify(code1));
+        const char code1[] = "class Fred { public: union { int a ; int b ; } ; } ;\n";
+        ASSERT_EQUALS("class Fred { public: union { int a ; int b ; } ; } ;", tokenizeAndStringify(code1));
 
         // ticket #2039
         const char code2[] = "void f() {\n"
@@ -2276,34 +2502,34 @@ class TestTokenizer : public TestFixture {
                              "         int x;\n"
                              "         long y;\n"
                              "     };\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("void f ( ) {\nunion {\nint x ;\nlong y ;\n} ;\n}", tokenizeAndStringify(code2));
 
         // ticket #3927
-        const char code3[] = "union xy *p = NULL;";
+        const char code3[] = "union xy *p = NULL;\n";
         ASSERT_EQUALS("union xy * p ; p = NULL ;", tokenizeAndStringify(code3));
     }
 
     void vardecl_par() {
         // ticket #2743 - set links if variable type contains parentheses
-        const char code[] = "Fred<int(*)()> fred1=a, fred2=b;";
+        const char code[] = "Fred<int(*)()> fred1=a, fred2=b;\n";
         ASSERT_EQUALS("Fred < int ( * ) ( ) > fred1 ; fred1 = a ; Fred < int ( * ) ( ) > fred2 ; fred2 = b ;", tokenizeAndStringify(code));
     }
 
     void vardecl_par2() {
         // ticket #3912 - set correct links
-        const char code[] = "function<void (shared_ptr<MyClass>)> v;";
+        const char code[] = "function<void (shared_ptr<MyClass>)> v;\n";
         ASSERT_EQUALS("function < void ( shared_ptr < MyClass > ) > v ;", tokenizeAndStringify(code));
     }
 
     void vardecl_par3() {
         // ticket #6556- Fred x1(a), x2(b);
-        const char code[] = "Fred x1(a), x2(b);";
+        const char code[] = "Fred x1(a), x2(b);\n";
         ASSERT_EQUALS("Fred x1 ( a ) ; Fred x2 ( b ) ;", tokenizeAndStringify(code));
     }
 
     void vardecl_class_ref() {
-        const char code[] = "class A { B &b1,&b2; };";
+        const char code[] = "class A { B &b1,&b2; };\n";
         ASSERT_EQUALS("class A { B & b1 ; B & b2 ; } ;", tokenizeAndStringify(code));
     }
 
@@ -2311,59 +2537,60 @@ class TestTokenizer : public TestFixture {
         {
             // don't simplify declarations of static variables
             // "static int i = 0;" is not the same as "static int i; i = 0;"
-            const char code[] = "static int i = 0 ;";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            const char code[] = "static int i = 0 ;\n";
+            ASSERT_EQUALS("static int i = 0 ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static int a, b;";
+            const char code[] = "static int a, b;\n";
             ASSERT_EQUALS("static int a ; static int b ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static unsigned int a, b;";
+            const char code[] = "static unsigned int a, b;\n";
             ASSERT_EQUALS("static unsigned int a ; static unsigned int b ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static int a=1, b=1;";
+            const char code[] = "static int a=1, b=1;\n";
             ASSERT_EQUALS("static int a = 1 ; static int b = 1 ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static int *a, *b;";
+            const char code[] = "static int *a, *b;\n";
             ASSERT_EQUALS("static int * a ; static int * b ;", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "static unsigned int *a=0, *b=0;";
+            const char code[] = "static unsigned int *a=0, *b=0;\n";
             ASSERT_EQUALS("static unsigned int * a = 0 ; static unsigned int * b = 0 ;", tokenizeAndStringify(code));
         }
 
         {
             // Ticket #4450
-            const char code[] = "static int large_eeprom_type = (13 | (5)), "
-                                "default_flash_type = 42;";
-            ASSERT_EQUALS("static int large_eeprom_type = 13 | 5 ; static int default_flash_type = 42 ;",
+            const char code[] = "static int large_eeprom_type = (13 | (5)),\n"
+                                "default_flash_type = 42;\n";
+            ASSERT_EQUALS("static int large_eeprom_type = 13 | 5 ; static int\n"
+                          "default_flash_type = 42 ;",
                           tokenizeAndStringify(code));
         }
 
         {
             // Ticket #5121
-            const char code[] = "unsigned int x;"
-                                "static const unsigned int A = 1, B = A, C = 0, D = (A), E = 0;"
-                                "void f() {"
-                                "  unsigned int *foo = &x;"
-                                "}";
-            ASSERT_EQUALS("unsigned int x ; "
+            const char code[] = "unsigned int x;\n"
+                                "static const unsigned int A = 1, B = A, C = 0, D = (A), E = 0;\n"
+                                "void f() {\n"
+                                "  unsigned int *foo = &x;\n"
+                                "}\n";
+            ASSERT_EQUALS("unsigned int x ;\n"
                           "static const unsigned int A = 1 ; "
                           "static const unsigned int B = A ; "
                           "static const unsigned int C = 0 ; "
                           "static const unsigned int D = A ; "
-                          "static const unsigned int E = 0 ; "
-                          "void f ( ) { "
+                          "static const unsigned int E = 0 ;\n"
+                          "void f ( ) {\n"
                           "unsigned int * foo ; "
-                          "foo = & x ; "
+                          "foo = & x ;\n"
                           "}",
                           tokenizeAndStringify(code));
         }
@@ -2373,7 +2600,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "class Machine {\n"
                                 "  static int const STACK_ORDER = 10, STACK_MAX = 1 << STACK_ORDER,"
                                 "                   STACK_GUARD = 2;\n"
-                                "};";
+                                "};\n";
             ASSERT_EQUALS("class Machine {\n"
                           "static const int STACK_ORDER = 10 ; static const int STACK_MAX = 1 << STACK_ORDER ; "
                           "static const int STACK_GUARD = 2 ;\n"
@@ -2398,7 +2625,7 @@ class TestTokenizer : public TestFixture {
     void vardecl6() {
         // ticket #565
 
-        const char code1[] = "int z = x >> 16;";
+        const char code1[] = "int z = x >> 16;\n";
         const char res1[]  = "int z ; z = x >> 16 ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
     }
@@ -2409,7 +2636,7 @@ class TestTokenizer : public TestFixture {
                             "    for (int c = 0; c < 0; ++c) {}\n"
                             "    int t;\n"
                             "    D(3 > t, \"T\");\n"
-                            "}";
+                            "}\n";
         const char res[] = "void f ( ) {\n"
                            "for ( int c = 0 ; c < 0 ; ++ c ) { }\n"
                            "int t ;\n"
@@ -2421,38 +2648,38 @@ class TestTokenizer : public TestFixture {
 
     void vardecl8() {
         // ticket #696
-        const char code[] = "char a[10]={'\\0'}, b[10]={'\\0'};";
+        const char code[] = "char a[10]={'\\0'}, b[10]={'\\0'};\n";
         const char res[]  = "char a [ 10 ] = { '\\0' } ; char b [ 10 ] = { '\\0' } ;";
         ASSERT_EQUALS(res, tokenizeAndStringify(code));
     }
 
     void vardecl9() {
-        const char code[] = "char a[2] = {'A', '\\0'}, b[2] = {'B', '\\0'};";
+        const char code[] = "char a[2] = {'A', '\\0'}, b[2] = {'B', '\\0'};\n";
         const char res[]  = "char a [ 2 ] = { 'A' , '\\0' } ; char b [ 2 ] = { 'B' , '\\0' } ;";
         ASSERT_EQUALS(res, tokenizeAndStringify(code));
     }
 
     void vardecl10() {
         // ticket #732
-        const char code[] = "char a [ 2 ] = { '-' } ; memset ( a , '-' , sizeof ( a ) ) ;";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        const char code[] = "char a[2] = {'-'}; memset(a, '-', sizeof(a));\n";
+        ASSERT_EQUALS("char a [ 2 ] = { '-' } ; memset ( a , '-' , sizeof ( a ) ) ;", tokenizeAndStringify(code));
     }
 
     void vardecl11() {
         // ticket #1684
-        const char code[] = "char a[5][8], b[5][8];";
+        const char code[] = "char a[5][8], b[5][8];\n";
         ASSERT_EQUALS("char a [ 5 ] [ 8 ] ; char b [ 5 ] [ 8 ] ;", tokenizeAndStringify(code));
     }
 
     void vardecl12() {
-        const char code[] = "struct A { public: B a, b, c, d; };";
+        const char code[] = "struct A { public: B a, b, c, d; };\n";
         ASSERT_EQUALS("struct A { public: B a ; B b ; B c ; B d ; } ;", tokenizeAndStringify(code));
     }
 
     void vardecl13() {
         const char code[] = "void f() {\n"
                             "    int a = (x < y) ? 1 : 0;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\nint a ; a = ( x < y ) ? 1 : 0 ;\n}", tokenizeAndStringify(code));
         ASSERT_EQUALS(
             "[test.cpp:2:14]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
@@ -2460,8 +2687,9 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl14() {
+        const Settings s = settingsBuilder(settings1).cpp(Standards::CPP03).build();
         const char code[] = "::std::tr1::shared_ptr<int> pNum1, pNum2;\n";
-        ASSERT_EQUALS(":: std :: tr1 :: shared_ptr < int > pNum1 ; :: std :: tr1 :: shared_ptr < int > pNum2 ;", tokenizeAndStringify(code, false, Platform::Type::Native, true, Standards::CPP03));
+        ASSERT_EQUALS(":: std :: tr1 :: shared_ptr < int > pNum1 ; :: std :: tr1 :: shared_ptr < int > pNum2 ;", tokenizeAndStringify(code, s, true, false));
     }
 
     void vardecl15() {
@@ -2625,11 +2853,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl22() {  // #4211 - segmentation fault
-        (void)tokenizeAndStringify("A<B<C<int>> >* p = 0;");
+        (void)tokenizeAndStringify("A<B<C<int>> >* p = 0;\n");
     }
 
     void vardecl23() {  // #4276 - segmentation fault
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }\n"), SYNTAX);
     }
 
     void vardecl24() {  // #4187 - variable declaration within lambda function
@@ -2638,7 +2866,7 @@ class TestTokenizer : public TestFixture {
                              "    {\n"
                              "        int temp = 0;\n"
                              "    });\n"
-                             "}";
+                             "}\n";
 
         const char expected1[] = "void f ( ) {\n"
                                  "std :: for_each ( ints . begin ( ) , ints . end ( ) , [ ] ( int val )\n"
@@ -2651,7 +2879,7 @@ class TestTokenizer : public TestFixture {
 
         const char code2[] = "void f(int j) {\n"
                              "    g( [](){int temp = 0;} , j );\n"
-                             "}";
+                             "}\n";
 
         const char expected2[] = "void f ( int j ) {\n"
                                  "g ( [ ] ( ) { int temp ; temp = 0 ; } , j ) ;\n"
@@ -2664,14 +2892,14 @@ class TestTokenizer : public TestFixture {
         (void)tokenizeAndStringify("void A::func(P g) const {}\n"
                                    "void A::a() {\n"
                                    "   b = new d(  [this]( const P & p) -> double { return this->func(p);}  );\n"
-                                   "}");
+                                   "}\n");
         ignore_errout();
     }
 
     void vardecl26() { // #5907
-        const char code[] = "extern int *new, obj, player;";
+        const char code[] = "extern int *new, obj, player;\n";
         const char expected[] = "extern int * new ; extern int obj ; extern int player ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, false));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("[test.cpp:1:13]: (debug) Scope::checkVariable found variable 'new' with varid 0. [varid0]\n", errout_str());
     }
@@ -2682,25 +2910,25 @@ class TestTokenizer : public TestFixture {
                             "  if (foo(c))\n"
                             "    return 0;\n"
                             "  return 0;\n"
-                            "}";
-        (void)tokenizeAndStringify(code, /*expand=*/ true, Platform::Type::Native, false);
+                            "}\n";
+        (void)tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false));
     }
 
     void vardecl28() {
         const char code[] = "unsigned short f(void) {\n"
                             "    unsigned short const int x = 1;\n"
                             "    return x;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("unsigned short f ( ) {\n"
                       "const unsigned short x ; x = 1 ;\n"
                       "return x ;\n"
                       "}",
-                      tokenizeAndStringify(code, /*expand=*/ true, Platform::Type::Native, false));
+                      tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void vardecl29() { // #9282
         {
-            const char code[] = "double f1() noexcept, f2(double) noexcept;";
+            const char code[] = "double f1() noexcept, f2(double) noexcept;\n";
             ASSERT_EQUALS("double f1 ( ) noexcept ( true ) ; double f2 ( double ) noexcept ( true ) ;",
                           tokenizeAndStringify(code));
         }
@@ -2717,25 +2945,72 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl30() {
-        const char code[] = "struct D {} const d;";
+        const char code[] = "struct D {} const d;\n";
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
-                      tokenizeAndStringify(code, true, Platform::Type::Native, true));
+                      tokenizeAndStringify(code));
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
-                      tokenizeAndStringify(code, true, Platform::Type::Native, false));
+                      tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void vardecl31() {
         {
-            const char code[] = "void foo() { int (*fptr)() = 0; }";
+            const char code[] = "void foo() { int (*fptr)() = 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( ) ; fptr = 0 ; }", tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "void foo() { int (*fptr)(int) = 0; }";
+            const char code[] = "void foo() { int (*fptr)(int) = 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( int ) ; fptr = 0 ; }", tokenizeAndStringify(code));
         }
     }
 
+    void vardecl32() {
+        {
+            const char code[] = "static enum { E } f() { return E; }\n";
+            ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 f ( ) { return E ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+    }
+
+    void vardecl33() {
+        {
+            const char code[] = "static enum { E } *f() { return NULL; }\n";
+            ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 * f ( ) { return NULL ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+    }
+
+    void vardecl34() {
+        {
+            const char code[] = "static enum { E } const *f() { return NULL; }\n";
+            ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 const * f ( ) { return NULL ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+    }
+
+    void vardecl35() { // #14842
+        {
+            const char code[] = "auto f() -> void {\n"
+                                "    auto p = new int;\n"
+                                "    *p = 0;\n"
+                                "}\n";
+            ASSERT_EQUALS("auto f ( ) . void {\n"
+                          "auto p ; p = new int ;\n"
+                          "* p = 0 ;\n"
+                          "}", tokenizeAndStringify(code));
+            ignore_errout();
+        }
+        {
+            const char code[] = "auto f() -> ::std::vector<int> {\n"
+                                "    int i = 0;\n"
+                                "    return { i };\n"
+                                "}\n";
+            ASSERT_EQUALS("auto f ( ) . :: std :: vector < int > {\n"
+                          "int i ; i = 0 ;\n"
+                          "return { i } ;\n"
+                          "}",
+                          tokenizeAndStringify(code));
+            ignore_errout();
+        }
+    }
+
     void volatile_variables() {
         {
             const char code[] = "volatile int a=0;\n"
@@ -2758,11 +3033,11 @@ class TestTokenizer : public TestFixture {
 
     void simplifyKeyword() {
         {
-            const char code[] = "void f (int a [ static 5] );";
+            const char code[] = "void f (int a [ static 5] );\n";
             ASSERT_EQUALS("void f ( int a [ 5 ] ) ;", tokenizeAndStringify(code));
         }
         {
-            const char in4[] = "struct B final : A { void foo(); };";
+            const char in4[] = "struct B final : A { void foo(); };\n";
             const char out4[] = "struct B : A { void foo ( ) ; } ;";
             ASSERT_EQUALS(out4, tokenizeAndStringify(in4));
 
@@ -2789,25 +3064,25 @@ class TestTokenizer : public TestFixture {
         }
         {
             // Ticket #8679
-            const char code[] = "thread_local void *thread_local_var; "
-                                "__thread void *thread_local_var_2;";
-            ASSERT_EQUALS("static void * thread_local_var ; "
+            const char code[] = "thread_local void *thread_local_var;\n"
+                                "__thread void *thread_local_var_2;\n";
+            ASSERT_EQUALS("static void * thread_local_var ;\n"
                           "void * thread_local_var_2 ;", tokenizeAndStringify(code));
         }
 
-        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred final { };"));
+        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred final { };\n"));
     }
 
     void implicitIntConst() {
-        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();\n", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void implicitIntExtern() {
-        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();\n", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     /**
@@ -2815,29 +3090,31 @@ class TestTokenizer : public TestFixture {
      */
     void implicitIntSigned1() {
         {
-            const char code1[] = "void foo ( signed int , float ) ;";
-            ASSERT_EQUALS(code1, tokenizeAndStringify(code1));
+            const char code1[] = "void foo(signed int, float);\n";
+            const char code2[] = "void foo ( signed int , float ) ;";
+            ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "signed i ;";
+            const char code1[] = "signed i ;\n";
             const char code2[] = "signed int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "signed int i ;";
-            ASSERT_EQUALS(code1, tokenizeAndStringify(code1));
+            const char code1[] = "signed int i ;\n";
+            const char code2[] = "signed int i ;";
+            ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "int signed i ;";
+            const char code1[] = "int signed i ;\n";
             const char code2[] = "signed int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "void f() { for (signed i=0; i<10; i++) {} }";
+            const char code1[] = "void f() { for (signed i=0; i<10; i++) {} }\n";
             const char code2[] = "void f ( ) { for ( signed int i = 0 ; i < 10 ; i ++ ) { } }";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
@@ -2850,40 +3127,41 @@ class TestTokenizer : public TestFixture {
     void implicitIntUnsigned1() {
         // No changes..
         {
-            const char code[] = "void foo ( unsigned int , float ) ;";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            const char code1[] = "void foo(unsigned int, float);\n";
+            const char code2[] = "void foo ( unsigned int , float ) ;";
+            ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         // insert "int" after "unsigned"..
         {
-            const char code1[] = "unsigned i ;";
+            const char code1[] = "unsigned i ;\n";
             const char code2[] = "unsigned int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         {
-            const char code1[] = "int unsigned i ;";
+            const char code1[] = "int unsigned i ;\n";
             const char code2[] = "unsigned int i ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         // insert "int" after "unsigned"..
         {
-            const char code1[] = "void f() { for (unsigned i=0; i<10; i++) {} }";
+            const char code1[] = "void f() { for (unsigned i=0; i<10; i++) {} }\n";
             const char code2[] = "void f ( ) { for ( unsigned int i = 0 ; i < 10 ; i ++ ) { } }";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
 
         // "extern unsigned x;" => "extern int x;"
         {
-            const char code1[] = "; extern unsigned x;";
+            const char code1[] = "; extern unsigned x;\n";
             const char code2[] = "; extern unsigned int x ;";
             ASSERT_EQUALS(code2, tokenizeAndStringify(code1));
         }
     }
 
     void implicitIntUnsigned2() {
-        const char code[] = "i = (unsigned)j;";
+        const char code[] = "i = (unsigned)j;\n";
         const char expected[] = "i = ( unsigned int ) j ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
@@ -2891,13 +3169,13 @@ class TestTokenizer : public TestFixture {
     // simplify "unsigned" when using templates..
     void implicitIntUnsigned3() {
         {
-            const char code[] = "; foo<unsigned>();";
+            const char code[] = "; foo<unsigned>();\n";
             const char expected[] = "; foo < unsigned int > ( ) ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
-            const char code[] = "; foo<unsigned int>();";
+            const char code[] = "; foo<unsigned int>();\n";
             const char expected[] = "; foo < unsigned int > ( ) ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
@@ -2906,162 +3184,162 @@ class TestTokenizer : public TestFixture {
     void simplifyStdType() { // #4947, #4950, #4951
         // unsigned long long
         {
-            const char code[] = "long long unsigned int x;";
+            const char code[] = "long long unsigned int x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "long long int unsigned x;";
+            const char code[] = "long long int unsigned x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned long long int x;";
+            const char code[] = "unsigned long long int x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned int long long x;";
+            const char code[] = "unsigned int long long x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int unsigned long long x;";
+            const char code[] = "int unsigned long long x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int long long unsigned x;";
+            const char code[] = "int long long unsigned x;\n";
             const char expected[] = "unsigned long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         // signed long long
         {
-            const char code[] = "long long signed int x;";
+            const char code[] = "long long signed int x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "long long int signed x;";
+            const char code[] = "long long int signed x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed long long int x;";
+            const char code[] = "signed long long int x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed int long long x;";
+            const char code[] = "signed int long long x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int signed long long x;";
+            const char code[] = "int signed long long x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int long long signed x;";
+            const char code[] = "int long long signed x;\n";
             const char expected[] = "signed long long x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         // unsigned short
         {
-            const char code[] = "short unsigned int x;";
+            const char code[] = "short unsigned int x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "short int unsigned x;";
+            const char code[] = "short int unsigned x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned short int x;";
+            const char code[] = "unsigned short int x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned int short x;";
+            const char code[] = "unsigned int short x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int unsigned short x;";
+            const char code[] = "int unsigned short x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int short unsigned x;";
+            const char code[] = "int short unsigned x;\n";
             const char expected[] = "unsigned short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         // signed short
         {
-            const char code[] = "short signed int x;";
+            const char code[] = "short signed int x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "short int signed x;";
+            const char code[] = "short int signed x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed short int x;";
+            const char code[] = "signed short int x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "signed int short x;";
+            const char code[] = "signed int short x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int signed short x;";
+            const char code[] = "int signed short x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "int short signed x;";
+            const char code[] = "int short signed x;\n";
             const char expected[] = "signed short x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "unsigned static short const int i;";
+            const char code[] = "unsigned static short const int i;\n";
             const char expected[] = "static const unsigned short i ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "float complex x;";
+            const char code[] = "float complex x;\n";
             const char expected[] = "float complex x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
         {
-            const char code[] = "float complex x;";
+            const char code[] = "float complex x;\n";
             const char expected[] = "_Complex float x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "complex float x;";
+            const char code[] = "complex float x;\n";
             const char expected[] = "_Complex float x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "complex long double x;";
+            const char code[] = "complex long double x;\n";
             const char expected[] = "_Complex long double x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "long double complex x;";
+            const char code[] = "long double complex x;\n";
             const char expected[] = "_Complex long double x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
-            const char code[] = "double complex;";
+            const char code[] = "double complex;\n";
             const char expected[] = "double complex ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Native, false));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
 
@@ -3069,8 +3347,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "class A{\n"
                                 " void f() {}\n"
-                                "};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // A body {}
@@ -3092,8 +3370,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f(){\n"
                                 " char a[10];\n"
                                 " char *b ; b = new char[a[0]];\n"
-                                "};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // a[10]
@@ -3114,8 +3392,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "void f(){\n"
                                 " foo(g());\n"
-                                "};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // foo(
@@ -3132,8 +3410,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "bool foo(C<z> a, bar<int, x<float>>& f, int b) {\n"
                                 "    return(a<b && b>f);\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // template<
@@ -3158,8 +3436,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "void foo() {\n"
                                 "    return static_cast<bar>(a);\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3173,8 +3451,8 @@ class TestTokenizer : public TestFixture {
         {
             const char code[] = "void foo() {\n"
                                 "    nvwa<(x > y)> ERROR_nnn;\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3187,8 +3465,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #4860
-            const char code[] = "class A : public B<int> {};";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "class A : public B<int> {};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3201,8 +3479,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #4860
-            const char code[] = "Bar<Typelist< int, Typelist< int, Typelist< int, FooNullType>>>>::set(1, 2, 3);";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "Bar<Typelist< int, Typelist< int, Typelist< int, FooNullType>>>>::set(1, 2, 3);\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3216,8 +3494,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #5627
-            const char code[] = "new Foo<Bar>[10];";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "new Foo<Bar>[10];\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3230,8 +3508,8 @@ class TestTokenizer : public TestFixture {
         }
         {
             // #6242
-            const char code[] = "func = integral_<uchar, int, double>;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "func = integral_<uchar, int, double>;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3243,8 +3521,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // if (a < b || c > d) { }
-            const char code[] = "{ if (a < b || c > d); }";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "{ if (a < b || c > d); }\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3253,8 +3531,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // bool f = a < b || c > d
-            const char code[] = "bool f = a < b || c > d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "bool f = a < b || c > d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3263,8 +3541,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // template
-            const char code[] = "a < b || c > d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a < b || c > d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3273,8 +3551,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // if (a < ... > d) { }
-            const char code[] = "{ if (a < b || c == 3 || d > e); }";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "{ if (a < b || c == 3 || d > e); }\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3283,8 +3561,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // template
-            const char code[] = "a<b==3 || c> d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a<b==3 || c> d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
@@ -3292,16 +3570,16 @@ class TestTokenizer : public TestFixture {
 
         {
             // template
-            const char code[] = "a<b || c==4> d;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a<b || c==4> d;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
         }
 
         {
-            const char code[] = "template < f = b || c > struct S;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "template < f = b || c > struct S;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
@@ -3309,8 +3587,8 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "struct A : B<c&&d> {};";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "struct A : B<c&&d> {};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(4) == tok->tokAt(8));
@@ -3318,8 +3596,8 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "Data<T&&>;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "Data<T&&>;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(4));
@@ -3328,8 +3606,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #6601
-            const char code[] = "template<class R> struct FuncType<R(&)()> : FuncType<R()> { };";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "template<class R> struct FuncType<R(&)()> : FuncType<R()> { };\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
@@ -3346,8 +3624,8 @@ class TestTokenizer : public TestFixture {
     void createLinks2() {
         {
             // #7158
-            const char code[] = "enum { value = boost::mpl::at_c<B, C> };";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "enum { value = boost::mpl::at_c<B, C> };\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok = Token::findsimplematch(tokenizer.tokens(), "<");
             ASSERT_EQUALS(true, tok->link() == tok->tokAt(4));
@@ -3359,7 +3637,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "template <typename T, typename U>\n"
                                 "struct CheckedDivOp< T, U, typename std::enable_if<std::is_floating_point<T>::value || std::is_floating_point<U>::value>::type> {\n"
                                 "};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "struct")->tokAt(2);
             const Token *tok2 = Token::findsimplematch(tokenizer.tokens(), "{")->previous();
@@ -3370,7 +3648,7 @@ class TestTokenizer : public TestFixture {
         {
             // #7975
             const char code[] = "template <class C> X<Y&&Z, C*> copy() {};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "< Y");
             const Token *tok2 = Token::findsimplematch(tok1, "> copy");
@@ -3380,8 +3658,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #8006
-            const char code[] = "C<int> && a = b;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "C<int> && a = b;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = tokenizer.tokens()->next();
             const Token *tok2 = tok1->tokAt(2);
@@ -3391,8 +3669,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #8115
-            const char code[] = "void Test(C<int> && c);";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "void Test(C<int> && c);\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "<");
             const Token *tok2 = tok1->tokAt(2);
@@ -3402,25 +3680,25 @@ class TestTokenizer : public TestFixture {
         {
             // #8654
             const char code[] = "template<int N> struct A {}; "
-                                "template<int... Ns> struct foo : A<Ns>... {};";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "template<int... Ns> struct foo : A<Ns>... {};\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *A = Token::findsimplematch(tokenizer.tokens(), "A <");
             ASSERT_EQUALS(true, A->linkAt(1) == A->tokAt(3));
         }
         {
             // #8851
-            const char code[] = "template<typename std::enable_if<!(std::value1) && std::value2>::type>"
-                                "void basic_json() {}";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "template<typename std::enable_if<!(std::value1) && std::value2>::type>\n"
+                                "void basic_json() {}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT_EQUALS(true, Token::simpleMatch(tokenizer.tokens()->linkAt(1), "> void"));
         }
 
         {
             // #9094 - template usage or comparison?
-            const char code[] = "a = f(x%x<--a==x>x);";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "a = f(x%x<--a==x>x);\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr == Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
@@ -3429,8 +3707,8 @@ class TestTokenizer : public TestFixture {
             // #11319
             const char code[] = "using std::same_as;\n"
                                 "template<same_as<int> T>\n"
-                                "void f();";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "void f();\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "template <");
             const Token *tok2 = Token ::findsimplematch(tokenizer.tokens(), "same_as <");
@@ -3440,8 +3718,8 @@ class TestTokenizer : public TestFixture {
 
         {
             // #9131 - template usage or comparison?
-            const char code[] = "using std::list; list<t *> l;";
-            SimpleTokenizer tokenizer(settings0, *this);
+            const char code[] = "using std::list; list<t *> l;\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
@@ -3451,8 +3729,8 @@ class TestTokenizer : public TestFixture {
                                 "void foo()\n"
                                 "{\n"
                                 "    for (set<ParticleSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {}\n"
-                                "}";
-            SimpleTokenizer tokenizer(settings0, *this);
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
@@ -3463,7 +3741,7 @@ class TestTokenizer : public TestFixture {
                                 "  a<> b;\n"
                                 "  b.a<>::c();\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ::")->link());
         }
@@ -3474,7 +3752,7 @@ class TestTokenizer : public TestFixture {
                                 "template <char... b> struct c {\n"
                                 "  void d() { a<b...>[0]; }\n"
                                 "};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> [")->link());
         }
@@ -3486,7 +3764,7 @@ class TestTokenizer : public TestFixture {
                                 "template <typename e> using f = c<e() && sizeof(int), int>;\n"
                                 "template <typename e, typename = f<e>> struct g {};\n"
                                 "template <typename e> using baz = g<e>;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ;")->link());
         }
@@ -3500,7 +3778,7 @@ class TestTokenizer : public TestFixture {
                                 "template <int> using c = a;\n"
                                 "template <int d> c<d> e;\n"
                                 "auto f = -e<1> == 0;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ==")->link());
         }
@@ -3518,7 +3796,7 @@ class TestTokenizer : public TestFixture {
                                 "constexpr void b<a, d>::operator()(c &&) const {\n"
                                 "  i<3>.f([] {});\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> . f (")->link());
         }
@@ -3526,7 +3804,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< class");
             const Token* tok2 = Token::findsimplematch(tok1, "> class");
@@ -3537,7 +3815,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< template");
             const Token* tok2 = Token::findsimplematch(tok1, "> struct");
@@ -3548,7 +3826,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< QPair");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3559,7 +3837,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> > (");
@@ -3570,7 +3848,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10615
             const char code[] = "struct A : public B<__is_constructible()>{};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< >");
             const Token* tok2 = Token::findsimplematch(tok1, "> { } >");
@@ -3581,7 +3859,7 @@ class TestTokenizer : public TestFixture {
         {
             // #10664
             const char code[] = "class C1 : public T1<D2<C2>const> {};\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< C2");
             const Token* tok2 = Token::findsimplematch(tok1, "> const");
@@ -3596,7 +3874,7 @@ class TestTokenizer : public TestFixture {
                                 "void f() {\n"
                                 "    if (a<int>[0]) {}\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> [");
@@ -3610,7 +3888,7 @@ class TestTokenizer : public TestFixture {
                                 "    int b[2] = {};\n"
                                 "    if (b[idx<1>]) {}\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< 1");
             const Token* tok2 = Token::findsimplematch(tok1, "> ]");
@@ -3622,7 +3900,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    []<typename T>() {};\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3634,7 +3912,7 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    auto g = [] <typename A, typename B> (A a, B&& b) { return a < b; };\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< A");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3648,7 +3926,7 @@ class TestTokenizer : public TestFixture {
                                 "        return [] <typename T> () {};\n"
                                 "    };\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3665,7 +3943,7 @@ class TestTokenizer : public TestFixture {
                                 "    S s;\n"
                                 "    s.operator()<int, int>(1);\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3681,7 +3959,7 @@ class TestTokenizer : public TestFixture {
                                 "        std::is_same<typename T::size_type, std::size_t>::value && std::is_same<typename T::size_type, std::size_t>::value\n"
                                 "        >();\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< bool");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
@@ -3693,18 +3971,59 @@ class TestTokenizer : public TestFixture {
             const char code[] = "double f() {\n"
                                 "    return std::is_same_v<int, double> ? 1e-7 : 1e-3;\n"
                                 "}\n";
-            SimpleTokenizer tokenizer(settings0, *this);
+            SimpleTokenizer tokenizer(settingsDefault, *this);
             ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< int");
             const Token* tok2 = Token::findsimplematch(tok1, "> ?");
             ASSERT_EQUALS(true, tok1->link() == tok2);
             ASSERT_EQUALS(true, tok2->link() == tok1);
         }
+
+        {
+            const char code[] = "template <typename Fn, typename... Args>\n" // #14612
+                                "void f(Fn&& fn, Args&&... args) {\n"
+                                "    static_assert(std::is_invocable_v<Fn&&, Args&&...>);\n"
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT(tokenizer.tokenize(code));
+            const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< Fn");
+            const Token* tok2 = Token::findsimplematch(tok1, "> )");
+            ASSERT_EQUALS(true, tok1->link() == tok2);
+            ASSERT_EQUALS(true, tok2->link() == tok1);
+        }
+
+        {
+            const char code[] = "template <typename Fn, typename... Args>\n" // #14615
+                                "void f(Fn&& fn, Args&&... args) {\n"
+                                "    constexpr bool b{ std::is_invocable_v<Fn&&, Args&&...> };\n"
+                                "}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT(tokenizer.tokenize(code));
+            const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< Fn");
+            const Token* tok2 = Token::findsimplematch(tok1, "> }");
+            ASSERT_EQUALS(true, tok1->link() == tok2);
+            ASSERT_EQUALS(true, tok2->link() == tok1);
+        }
+
+        {
+            const char code[] = "std::enable_if_t<0 || 1, void> f() {}\n" // #14982
+                                "std::enable_if_t<0 || 1, void> S::g() {}\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT(tokenizer.tokenize(code));
+            const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< 0");
+            const Token* tok2 = Token::findsimplematch(tok1, "> f");
+            ASSERT_EQUALS(true, tok1->link() == tok2);
+            ASSERT_EQUALS(true, tok2->link() == tok1);
+            const Token* tok3 = Token::findsimplematch(tok2, "< 0");
+            const Token* tok4 = Token::findsimplematch(tok3, "> S");
+            ASSERT_EQUALS(true, tok3->link() == tok4);
+            ASSERT_EQUALS(true, tok4->link() == tok3);
+        }
     }
 
     void simplifyString() {
-        TokenList tokenlist{settings0, Standards::Language::CPP};
-        Tokenizer tokenizer(std::move(tokenlist), *this);
+        TokenList tokenlist{settingsDefault, Standards::Language::CPP};
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         ASSERT_EQUALS("\"abc\"", tokenizer.simplifyString("\"abc\""));
         ASSERT_EQUALS("\"\n\"", tokenizer.simplifyString("\"\\xa\""));
         ASSERT_EQUALS("\"3\"", tokenizer.simplifyString("\"\\x33\""));
@@ -3731,102 +4050,102 @@ class TestTokenizer : public TestFixture {
 
     void simplifyConst() {
         ASSERT_EQUALS("void foo ( ) { const int x ; }",
-                      tokenizeAndStringify("void foo(){ int const x;}"));
+                      tokenizeAndStringify("void foo(){ int const x;}\n"));
 
         ASSERT_EQUALS("void foo ( ) { { } const long x ; }",
-                      tokenizeAndStringify("void foo(){ {} long const x;}"));
+                      tokenizeAndStringify("void foo(){ {} long const x;}\n"));
 
         ASSERT_EQUALS("void foo ( int b , const unsigned int x ) { }",
-                      tokenizeAndStringify("void foo(int b,unsigned const x){}"));
+                      tokenizeAndStringify("void foo(int b,unsigned const x){}\n"));
 
         ASSERT_EQUALS("void foo ( ) { bar ( ) ; const char x ; }",
-                      tokenizeAndStringify("void foo(){ bar(); char const x;}"));
+                      tokenizeAndStringify("void foo(){ bar(); char const x;}\n"));
 
         ASSERT_EQUALS("void foo ( const char x ) { }",
-                      tokenizeAndStringify("void foo(char const x){}"));
+                      tokenizeAndStringify("void foo(char const x){}\n"));
 
         ASSERT_EQUALS("void foo ( int b , const char x ) { }",
-                      tokenizeAndStringify("void foo(int b,char const x){}"));
+                      tokenizeAndStringify("void foo(int b,char const x){}\n"));
 
         ASSERT_EQUALS("void foo ( ) { int * const x ; }",
-                      tokenizeAndStringify("void foo(){ int * const x;}"));
+                      tokenizeAndStringify("void foo(){ int * const x;}\n"));
 
-        ASSERT_EQUALS("const int foo ( ) ;", tokenizeAndStringify("int const foo ();"));
+        ASSERT_EQUALS("const int foo ( ) ;", tokenizeAndStringify("int const foo ();\n"));
 
-        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("int const x;"));
-        ASSERT_EQUALS("const unsigned int x ;", tokenizeAndStringify("unsigned const x;"));
-        ASSERT_EQUALS("const struct X x ;", tokenizeAndStringify("struct X const x;"));
+        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("int const x;\n"));
+        ASSERT_EQUALS("const unsigned int x ;", tokenizeAndStringify("unsigned const x;\n"));
+        ASSERT_EQUALS("const struct X x ;", tokenizeAndStringify("struct X const x;\n"));
     }
 
     void switchCase() {
         ASSERT_EQUALS("void foo ( int i ) { switch ( i ) { case -1 : ; break ; } }",
-                      tokenizeAndStringify("void foo (int i) { switch(i) { case -1: break; } }"));
+                      tokenizeAndStringify("void foo (int i) { switch(i) { case -1: break; } }\n"));
         //ticket #3227
         ASSERT_EQUALS("void foo ( int n ) { switch ( n ) { label : ; case 1 : ; label1 : ; label2 : ; break ; } }",
-                      tokenizeAndStringify("void foo(int n){ switch (n){ label: case 1: label1: label2: break; }}"));
+                      tokenizeAndStringify("void foo(int n){ switch (n){ label: case 1: label1: label2: break; }}\n"));
         //ticket #8345
         ASSERT_EQUALS("void foo ( ) { switch ( 0 ) { case 0 : ; default : ; } }",
-                      tokenizeAndStringify("void foo () { switch(0) case 0 : default : ; }"));
+                      tokenizeAndStringify("void foo () { switch(0) case 0 : default : ; }\n"));
         //ticket #8477
         ASSERT_EQUALS("void foo ( ) { enum Anonymous0 : int { Six = 6 } ; return Six ; }",
-                      tokenizeAndStringify("void foo () { enum : int { Six = 6 } ; return Six ; }"));
+                      tokenizeAndStringify("void foo () { enum : int { Six = 6 } ; return Six ; }\n"));
         // ticket #8281
-        ASSERT_NO_THROW(tokenizeAndStringify("void lzma_decode(int i) { "
-                                             "  bool state; "
-                                             "  switch (i) "
-                                             "  while (true) { "
-                                             "     state=false; "
-                                             "   case 1: "
-                                             "      ; "
-                                             "  }"
-                                             "}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void lzma_decode(int i) {\n"
+                                             "  bool state;\n"
+                                             "  switch (i)\n"
+                                             "  while (true) {\n"
+                                             "     state=false;\n"
+                                             "   case 1:\n"
+                                             "      ;\n"
+                                             "  }\n"
+                                             "}\n"));
         // ticket #8417
-        ASSERT_NO_THROW(tokenizeAndStringify("void printOwnedAttributes(int mode) { "
-                                             "  switch(mode) case 0: { break; } "
-                                             "}"));
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void printOwnedAttributes(int mode) { "
-                                                   "  switch(mode) case 0: { break; } case 1: ; "
-                                                   "}"),
+        ASSERT_NO_THROW(tokenizeAndStringify("void printOwnedAttributes(int mode) {\n"
+                                             "  switch(mode) case 0: { break; }\n"
+                                             "}\n"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void printOwnedAttributes(int mode) {\n"
+                                                   "  switch(mode) case 0: { break; } case 1: ;\n"
+                                                   "}\n"),
                               SYNTAX);
     }
 
     void simplifyPointerToStandardType() {
         // Pointer to standard type
         ASSERT_EQUALS("char buf [ 100 ] ; readlink ( path , buf , 99 ) ;",
-                      tokenizeAndStringify("char buf[100] ; readlink(path, &buf[0], 99);",
-                                           true, Platform::Type::Native, false));
+                      tokenizeAndStringify("char buf[100] ; readlink(path, &buf[0], 99);\n",
+                                           dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("void foo ( char * c ) { if ( 1 == ( 1 & c [ 0 ] ) ) { } }",
-                      tokenizeAndStringify("void foo(char *c) { if (1==(1 & c[0])) {} }",
-                                           true, Platform::Type::Native, false));
+                      tokenizeAndStringify("void foo(char *c) { if (1==(1 & c[0])) {} }\n",
+                                           dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Simplification of unknown type - C only
         ASSERT_EQUALS("foo data [ 100 ] ; something ( foo ) ;",
-                      tokenizeAndStringify("foo data[100]; something(&foo[0]);", true, Platform::Type::Native, false));
+                      tokenizeAndStringify("foo data[100]; something(&foo[0]);\n", dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("", errout_str());
 
         // C++: No pointer simplification
         ASSERT_EQUALS("foo data [ 100 ] ; something ( & foo [ 0 ] ) ;",
-                      tokenizeAndStringify("foo data[100]; something(&foo[0]);"));
+                      tokenizeAndStringify("foo data[100]; something(&foo[0]);\n"));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyFunctionPointers1() {
-        ASSERT_EQUALS("void ( * f ) ( ) ;", tokenizeAndStringify("void (*f)();"));
-        ASSERT_EQUALS("void * ( * f ) ( ) ;", tokenizeAndStringify("void *(*f)();"));
-        ASSERT_EQUALS("unsigned int ( * f ) ( ) ;", tokenizeAndStringify("unsigned int (*f)();"));
-        ASSERT_EQUALS("unsigned int * ( * f ) ( ) ;", tokenizeAndStringify("unsigned int * (*f)();"));
-        ASSERT_EQUALS("void ( * f [ 2 ] ) ( ) ;", tokenizeAndStringify("void (*f[2])();"));
-        ASSERT_EQUALS("void ( * f [ 2 ] ) ( void ) ;", tokenizeAndStringify("typedef void func_t(void); func_t *f[2];")); // #10581
+        ASSERT_EQUALS("void ( * f ) ( ) ;", tokenizeAndStringify("void (*f)();\n"));
+        ASSERT_EQUALS("void * ( * f ) ( ) ;", tokenizeAndStringify("void *(*f)();\n"));
+        ASSERT_EQUALS("unsigned int ( * f ) ( ) ;", tokenizeAndStringify("unsigned int (*f)();\n"));
+        ASSERT_EQUALS("unsigned int * ( * f ) ( ) ;", tokenizeAndStringify("unsigned int * (*f)();\n"));
+        ASSERT_EQUALS("void ( * f [ 2 ] ) ( ) ;", tokenizeAndStringify("void (*f[2])();\n"));
+        ASSERT_EQUALS("void ( * f [ 2 ] ) ( void ) ;", tokenizeAndStringify("typedef void func_t(void); func_t *f[2];\n")); // #10581
     }
 
     void simplifyFunctionPointers2() {
         const char code[] = "typedef void (* PF)();"
                             "void f1 ( ) { }"
                             "PF pf = &f1;"
-                            "PF pfs[] = { &f1, &f1 };";
+                            "PF pfs[] = { &f1, &f1 };\n";
         const char expected[] = "void f1 ( ) { } "
                                 "void ( * pf ) ( ) ; pf = & f1 ; "
                                 "void ( * pfs [ ] ) ( ) = { & f1 , & f1 } ;";
@@ -3837,7 +4156,7 @@ class TestTokenizer : public TestFixture {
         // Related with ticket #2873
         const char code[] = "void f() {\n"
                             "(void)(xy(*p)(0));"
-                            "\n}";
+                            "\n}\n";
         const char expected[] = "void f ( ) {\n"
                                 "( void ) ( xy ( * p ) ( 0 ) ) ;\n"
                                 "}";
@@ -3852,7 +4171,7 @@ class TestTokenizer : public TestFixture {
                             "{\n"
                             "    typedef void (*FP)();\n"
                             "    virtual FP getFP();\n"
-                            "};";
+                            "};\n";
         const char expected[] = "1: struct S\n"
                                 "2: {\n"
                                 "3:\n"
@@ -3862,67 +4181,67 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyFunctionPointers5() {
-        const char code[] = ";void (*fp[])(int a) = {0,0,0};";
+        const char code[] = ";void (*fp[])(int a) = {0,0,0};\n";
         const char expected[] = "1: ; void ( * fp@1 [ ] ) ( int ) = { 0 , 0 , 0 } ;\n"; // TODO: Array dimension
         ASSERT_EQUALS(expected, tokenizeDebugListing(code));
     }
 
     void simplifyFunctionPointers6() {
-        const char code1[] = "void (*fp(void))(int) {}";
+        const char code1[] = "void (*fp(void))(int) {}\n";
         const char expected1[] = "1: void * fp ( ) { }\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
 
-        const char code2[] = "std::string (*fp(void))(int);";
+        const char code2[] = "std::string (*fp(void))(int);\n";
         const char expected2[] = "1: std :: string * fp ( ) ;\n";
         ASSERT_EQUALS(expected2, tokenizeDebugListing(code2));
     }
 
     void simplifyFunctionPointers7() {
-        const char code1[] = "void (X::*y)();";
+        const char code1[] = "void (X::*y)();\n";
         const char expected1[] = "1: void ( * y@1 ) ( ) ;\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
     }
 
     void simplifyFunctionPointers8() {
-        const char code1[] = "int (*f)() throw(int);";
+        const char code1[] = "int (*f)() throw(int);\n";
         const char expected1[] = "1: int ( * f@1 ) ( ) ;\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
     }
 
     void simplifyFunctionPointers9() { // function call with function pointer
-        const char code1[] = "int f() { (*f)(); }";
+        const char code1[] = "int f() { (*f)(); }\n";
         const char expected1[] = "1: int f ( ) { ( * f ) ( ) ; }\n";
         ASSERT_EQUALS(expected1, tokenizeDebugListing(code1));
 
-        const char code2[] = "int f() { return (*f)(); }";
+        const char code2[] = "int f() { return (*f)(); }\n";
         const char expected2[] = "1: int f ( ) { return ( * f ) ( ) ; }\n";
         ASSERT_EQUALS(expected2, tokenizeDebugListing(code2));
 
-        const char code3[] = "int f() { throw (*f)(); }";
+        const char code3[] = "int f() { throw (*f)(); }\n";
         const char expected3[] = "1: int f ( ) { throw ( * f ) ( ) ; }\n";
         ASSERT_EQUALS(expected3, tokenizeDebugListing(code3));
     }
 
     void removedeclspec() {
-        ASSERT_EQUALS("a b", tokenizeAndStringify("a __declspec ( dllexport ) b"));
-        ASSERT_EQUALS("a b", tokenizeAndStringify("a _declspec ( dllexport ) b"));
-        ASSERT_EQUALS("int a ;", tokenizeAndStringify("__declspec(thread) __declspec(align(32)) int a;"));
-        ASSERT_EQUALS("int i ;", tokenizeAndStringify("__declspec(allocate(\"mycode\")) int i;"));
-        ASSERT_EQUALS("struct IUnknown ;", tokenizeAndStringify("struct __declspec(uuid(\"00000000-0000-0000-c000-000000000046\")) IUnknown;"));
-        ASSERT_EQUALS("__property int x [ ] ;", tokenizeAndStringify("__declspec(property(get=GetX, put=PutX)) int x[];"));
+        ASSERT_EQUALS("a b", tokenizeAndStringify("a __declspec ( dllexport ) b\n"));
+        ASSERT_EQUALS("a b", tokenizeAndStringify("a _declspec ( dllexport ) b\n"));
+        ASSERT_EQUALS("int a ;", tokenizeAndStringify("__declspec(thread) __declspec(align(32)) int a;\n"));
+        ASSERT_EQUALS("int i ;", tokenizeAndStringify("__declspec(allocate(\"mycode\")) int i;\n"));
+        ASSERT_EQUALS("struct IUnknown ;", tokenizeAndStringify("struct __declspec(uuid(\"00000000-0000-0000-c000-000000000046\")) IUnknown;\n"));
+        ASSERT_EQUALS("__property int x [ ] ;", tokenizeAndStringify("__declspec(property(get=GetX, put=PutX)) int x[];\n"));
     }
 
     void removeattribute() {
-        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute__ ((aligned));"));
-        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute__ ((packed));"));
-        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute__((mode(SI))) __attribute__((vector_size (16))) vecint;"));
+        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute__ ((aligned));\n"));
+        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute__ ((packed));\n"));
+        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute__((mode(SI))) __attribute__((vector_size (16))) vecint;\n"));
 
         // alternate spelling #5328
-        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute ((aligned));"));
-        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute ((packed));"));
-        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute((mode(SI))) __attribute((vector_size (16))) vecint;"));
+        ASSERT_EQUALS("short array [ 3 ] ;", tokenizeAndStringify("short array[3] __attribute ((aligned));\n"));
+        ASSERT_EQUALS("int x [ 2 ] ;", tokenizeAndStringify("int x[2] __attribute ((packed));\n"));
+        ASSERT_EQUALS("int vecint ;", tokenizeAndStringify("int __attribute((mode(SI))) __attribute((vector_size (16))) vecint;\n"));
 
-        ASSERT_EQUALS("struct Payload_IR_config { uint8_t tap [ 16 ] ; } ;", tokenizeAndStringify("struct __attribute__((packed, gcc_struct)) Payload_IR_config { uint8_t tap[16]; };"));
+        ASSERT_EQUALS("struct Payload_IR_config { uint8_t tap [ 16 ] ; } ;", tokenizeAndStringify("struct __attribute__((packed, gcc_struct)) Payload_IR_config { uint8_t tap[16]; };\n"));
     }
 
     void functionAttributeBefore1() {
@@ -3931,11 +4250,11 @@ class TestTokenizer : public TestFixture {
                             "void __attribute__((nothrow)) __attribute__((pure)) __attribute__((const)) func3();\n"
                             "void __attribute__((__nothrow__)) __attribute__((__pure__)) __attribute__((__const__)) func4();\n"
                             "void __attribute__((noreturn)) func5();\n"
-                            "void __attribute__((__visibility__(\"default\"))) func6();";
+                            "void __attribute__((__visibility__(\"default\"))) func6();\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; void func6 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -3957,11 +4276,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void functionAttributeBefore2() {
-        const char code[] = "extern vas_f *VAS_Fail __attribute__((__noreturn__));";
+        const char code[] = "extern vas_f *VAS_Fail __attribute__((__noreturn__));\n";
         const char expected[] = "extern vas_f * VAS_Fail ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
@@ -3970,11 +4289,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void functionAttributeBefore3() { // #10978
-        const char code[] = "void __attribute__((__noreturn__)) (*func_notret)(void);";
+        const char code[] = "void __attribute__((__noreturn__)) (*func_notret)(void);\n";
         const char expected[] = "void ( * func_notret ) ( void ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
@@ -3983,11 +4302,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void functionAttributeBefore4() {
-        const char code[] = "__attribute__((const)) int& foo();";
+        const char code[] = "__attribute__((const)) int& foo();\n";
         const char expected[] = "int & foo ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
@@ -4000,7 +4319,7 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4015,12 +4334,12 @@ class TestTokenizer : public TestFixture {
         const char code[] = "void func1() __attribute__((pure)) __attribute__((nothrow)) __attribute__((const));\n"
                             "void func2() __attribute__((__pure__)) __attribute__((__nothrow__)) __attribute__((__const__));\n"
                             "void func3() __attribute__((nothrow)) __attribute__((pure)) __attribute__((const));\n"
-                            "void func4() __attribute__((__nothrow__)) __attribute__((__pure__)) __attribute__((__const__));"
-                            "void func5() __attribute__((noreturn));";
+                            "void func4() __attribute__((__nothrow__)) __attribute__((__pure__)) __attribute__((__const__));\n"
+                            "void func5() __attribute__((noreturn));\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4043,11 +4362,11 @@ class TestTokenizer : public TestFixture {
         const char code[] = "class foo {\n"
                             "public:\n"
                             "    bool operator==(const foo &) __attribute__((__pure__));\n"
-                            "};";
+                            "};\n";
         const char expected[] = "class foo { public: bool operator== ( const foo & ) ; } ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4065,12 +4384,12 @@ class TestTokenizer : public TestFixture {
                             "void __attribute__((noreturn,format(printf,1,2))) func5();\n"
                             "void __attribute__((__nothrow__)) __attribute__((__pure__,__const__)) func6();\n"
                             "void __attribute__((__nothrow__,__pure__)) __attribute__((__const__)) func7();\n"
-                            "void __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const)) func8();";
+                            "void __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const)) func8();\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; "
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4103,12 +4422,12 @@ class TestTokenizer : public TestFixture {
                             "void func5() __attribute__((noreturn,format(printf,1,2)));\n"
                             "void func6() __attribute__((__nothrow__)) __attribute__((__pure__,__const__));\n"
                             "void func7() __attribute__((__nothrow__,__pure__)) __attribute__((__const__));\n"
-                            "void func8() __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const));";
+                            "void func8() __attribute__((noreturn)) __attribute__(()) __attribute__((nothrow,pure,const));\n";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; "
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
         // tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
@@ -4133,10 +4452,140 @@ class TestTokenizer : public TestFixture {
         ASSERT(func8 && func8->isAttributeNoreturn() && func8->isAttributePure() && func8->isAttributeNothrow() && func8->isAttributeConst());
     }
 
+    void functionAttributeListAfter2() {
+        const char code[] = "[[noreturn]] void func1(const char *format, ...) __attribute__((format(printf, 1, 2)));\n" // #14181
+                            "void func2() __attribute__((unused));\n"; // #14183
+        const char expected[] = "void func1 ( const char * format , ... ) ; void func2 ( ) ;";
+
+        // tokenize..
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        // Expected result..
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token * func1 = Token::findsimplematch(tokenizer.tokens(), "func1");
+        const Token * func2 = Token::findsimplematch(tokenizer.tokens(), "func2");
+
+        ASSERT(func1 && func1->isAttributeNoreturn());
+        ASSERT(func2 && func2->isAttributeUnused());
+    }
+
+    void cppMaybeUnusedBefore() {
+        const char code[] = "[[maybe_unused]] int var {};\n";
+        const char expected[] = "int var { } ;";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var = Token::findsimplematch(tokenizer.tokens(), "var");
+        ASSERT(var && var->isAttributeMaybeUnused());
+    }
+
+    void cppMaybeUnusedAfter1() {
+        const char code[] = "int var [[maybe_unused]] {};\n";
+        const char expected[] = "int var { } ;";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var = Token::findsimplematch(tokenizer.tokens(), "var");
+        ASSERT(var && var->isAttributeMaybeUnused());
+    }
+
+    void cppMaybeUnusedAfter2() {
+        const char code[] = "std::string var [[maybe_unused]];\n";
+        const char expected[] = "std :: string var ;";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var = Token::findsimplematch(tokenizer.tokens(), "var");
+        ASSERT(var && var->isAttributeMaybeUnused());
+    }
+
+    void cppMaybeUnusedAfter3() {
+        const char code[] = "void foo(int x [[maybe_unused]]) {}\n";
+        const char expected[] = "void foo ( int x ) { }";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
+        ASSERT(x && x->isAttributeMaybeUnused());
+    }
+
+    void cppMaybeUnusedStructuredBinding() {
+        const char code[] = "[[maybe_unused]] auto [var1, var2] = f();\n";
+        const char expected[] = "auto [ var1 , var2 ] = f ( ) ;";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var1 = Token::findsimplematch(tokenizer.tokens(), "var1");
+        ASSERT(var1 && var1->isAttributeMaybeUnused());
+        const Token *var2 = Token::findsimplematch(tokenizer.tokens(), "var2");
+        ASSERT(var2 && var2->isAttributeMaybeUnused());
+    }
+
+    void attributeAlignasBefore() {
+        const char code[] = "alignas(long) unsigned char buffer[sizeof(long)];\n";
+        const char expected[] = "char buffer [ sizeof ( long ) ] ;";
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var = Token::findsimplematch(tokenizer.tokens(), "buffer");
+        ASSERT(var);
+        ASSERT(var->hasAttributeAlignas());
+        ASSERT(var->getAttributeAlignas().size() == 1);
+        ASSERT_EQUALS(var->getAttributeAlignas()[0], "long");
+    }
+
+    void attributeAlignasAfter() {
+        const char code[] = "unsigned char buffer[sizeof(long)] alignas(long);\n";
+        const char expected[] = "char buffer [ sizeof ( long ) ] ;";
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *var = Token::findsimplematch(tokenizer.tokens(), "buffer");
+        ASSERT(var);
+        ASSERT(var->hasAttributeAlignas());
+        ASSERT(var->getAttributeAlignas().size() == 1);
+        ASSERT_EQUALS(var->getAttributeAlignas()[0], "long");
+    }
+
+    void simplifyAlignedStorage() {
+        const char code[] = "std::aligned_storage<sizeof(long), alignof(long)>::type buffer;\n";
+        const char expected[] = "std :: aligned_storage < sizeof ( long ) , alignof ( long ) > :: type buffer ;";
+
+        SimpleTokenizer tokenizer(settings2, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+
+        const Token *buffer = Token::findsimplematch(tokenizer.tokens(), "buffer");
+        ASSERT(buffer);
+        ASSERT(buffer->hasAttributeAlignas());
+        ASSERT_EQUALS("alignof ( long )", buffer->getAttributeAlignas()[0]);
+    }
 
     void splitTemplateRightAngleBrackets() {
         {
-            const char code[] = "; z = x < 0 ? x >> y : x >> y;";
+            const char code[] = "; z = x < 0 ? x >> y : x >> y;\n";
             ASSERT_EQUALS("; z = x < 0 ? x >> y : x >> y ;", tokenizeAndStringify(code));
         }
         {
@@ -4150,7 +4599,7 @@ class TestTokenizer : public TestFixture {
                                 "         FFABS ( sprite_offset [ 1 ] [ i ] ) >= INT_MAX >> shift_c ||\n"
                                 "         FFABS ( sprite_delta [ 0 ] [ i ] ) >= INT_MAX >> shift_y ||\n"
                                 "         FFABS ( sprite_delta [ 1 ] [ i ] ) >= INT_MAX >> shift_y ) ;\n"
-                                "}";
+                                "}\n";
             ASSERT_EQUALS(std::string::npos, tokenizeAndStringify(code).find("> >"));
             ASSERT_EQUALS(
                 "[test.cpp:2:24]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable sprite_shift [valueFlowBailoutIncompleteVar]\n",
@@ -4168,15 +4617,15 @@ class TestTokenizer : public TestFixture {
 
     void cpp03template1() {
         {
-            const char code[] = "template<typename> struct extent {};";
+            const char code[] = "template<typename> struct extent {};\n";
             ASSERT_EQUALS("template < typename > struct extent { } ;", tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template<typename> struct extent;";
+            const char code[] = "template<typename> struct extent;\n";
             ASSERT_EQUALS("template < typename > struct extent ;", tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template<typename, unsigned = 0> struct extent;";
+            const char code[] = "template<typename, unsigned = 0> struct extent;\n";
             ASSERT_EQUALS("template < typename , unsigned int = 0 > struct extent ;", tokenizeAndStringify(code));
         }
     }
@@ -4211,11 +4660,11 @@ class TestTokenizer : public TestFixture {
                             "struct S\n"
                             "{};\n"
                             "S<int> s;\n";
-        ASSERT_EQUALS("struct S<int,(int)0> ;\n"
+        ASSERT_EQUALS("struct S<int,0> ;\n"
                       "\n"
                       "\n"
-                      "S<int,(int)0> s ;\n"
-                      "struct S<int,(int)0>\n"
+                      "S<int,0> s ;\n"
+                      "struct S<int,0>\n"
                       "{ } ;",
                       tokenizeAndStringify(code));
     }
@@ -4225,262 +4674,262 @@ class TestTokenizer : public TestFixture {
         ASSERT_NO_THROW(tokenizeAndStringify("class A; "
                                              "template <class T> class Disposer; "
                                              "template <typename T, class D = Disposer<T>> class Shim {}; "
-                                             "class B : public Shim<A> {};"));
+                                             "class B : public Shim<A> {};\n"));
         // #6354 (segmentation fault)
-        (void)tokenizeAndStringify("template <class ELFT> class ELFObjectImage {}; "
-                                   "ObjectImage *createObjectImage() { "
-                                   "  return new ELFObjectImage<ELFType<little>>(Obj); "
-                                   "} "
-                                   "void resolveX86_64Relocation() { "
-                                   "  reinterpret_cast<int>(0); "
-                                   "}");
+        (void)tokenizeAndStringify("template <class ELFT> class ELFObjectImage {};\n"
+                                   "ObjectImage *createObjectImage() {\n"
+                                   "  return new ELFObjectImage<ELFType<little>>(Obj);\n"
+                                   "}\n"
+                                   "void resolveX86_64Relocation() {\n"
+                                   "  reinterpret_cast<int>(0);\n"
+                                   "}\n");
         // #6414
-        ASSERT_NO_THROW(tokenizeAndStringify("template<typename value_type, typename function_type> "
-                                             "value_type Base(const value_type x, const value_type dx, function_type func, int type_deriv) { "
-                                             "   return 0.0; "
-                                             "}; "
-                                             "namespace { "
-                                             "  template<class DC> class C { "
-                                             "    void Fun(int G, const double x); "
-                                             "  }; "
-                                             "  template<class DC> void C<DC>::Fun(int G, const double x) {"
-                                             "    Base<double, CDFFunctor<DC>>(2, 2, f, 0); "
-                                             "  }; "
-                                             "  template<class DC> class C2 {}; "
-                                             "}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("template<typename value_type, typename function_type>\n"
+                                             "value_type Base(const value_type x, const value_type dx, function_type func, int type_deriv) {\n"
+                                             "   return 0.0;\n"
+                                             "};\n"
+                                             "namespace {\n"
+                                             "  template<class DC> class C {\n"
+                                             "    void Fun(int G, const double x);\n"
+                                             "  };\n"
+                                             "  template<class DC> void C<DC>::Fun(int G, const double x) {\n"
+                                             "    Base<double, CDFFunctor<DC>>(2, 2, f, 0);\n"
+                                             "  };\n"
+                                             "  template<class DC> class C2 {};\n"
+                                             "}\n"));
 
         ignore_errout();
     }
 
     void cpp0xtemplate5() { // #9154
         {
-            const char code[] = "struct s<x<u...>>;";
+            const char code[] = "struct s<x<u...>>;\n";
             ASSERT_EQUALS("struct s < x < u ... > > ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class f> using c = e<i<q<f,r>,b...>>;";
+            const char code[] = "template <class f> using c = e<i<q<f,r>,b...>>;\n";
             ASSERT_EQUALS("template < class f > using c = e < i < q < f , r > , b ... > > ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct s<x<u...>> { };";
+            const char code[] = "struct s<x<u...>> { };\n";
             ASSERT_EQUALS("struct s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct q : s<x<u...>> { };";
+            const char code[] = "struct q : s<x<u...>> { };\n";
             ASSERT_EQUALS("struct q : s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct q : private s<x<u...>> { };";
+            const char code[] = "struct q : private s<x<u...>> { };\n";
             ASSERT_EQUALS("struct q : private s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
     }
 
     void cpp14template() { // Ticket #6708
-        (void)tokenizeAndStringify("template <typename T> "
-                                   "decltype(auto) forward(T& t) { return 0; }");
-        ASSERT_EQUALS("[test.cpp:1:32]: (debug) auto token with no type. [autoNoType]\n", errout_str());
+        (void)tokenizeAndStringify("template <typename T>\n"
+                                   "decltype(auto) forward(T& t) { return 0; }\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (debug) auto token with no type. [autoNoType]\n", errout_str());
     }
 
     void arraySize() {
-        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3};"));
-        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3,};"));
-        ASSERT_EQUALS("; foo a [ 3 ] = { { 1 , 2 } , { 3 , 4 } , { 5 , 6 } } ;", tokenizeAndStringify(";foo a[]={{1,2},{3,4},{5,6}};"));
-        ASSERT_EQUALS("; int a [ 1 ] = { foo < bar1 , bar2 > ( 123 , 4 ) } ;", tokenizeAndStringify(";int a[]={foo<bar1,bar2>(123,4)};"));
-        ASSERT_EQUALS("; int a [ 2 ] = { b > c ? 1 : 2 , 3 } ;", tokenizeAndStringify(";int a[]={ b>c?1:2,3};"));
-        ASSERT_EQUALS("int main ( ) { int a [ 2 ] = { b < c ? 1 : 2 , 3 } }", tokenizeAndStringify("int main(){int a[]={b<c?1:2,3}}"));
+        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3};\n"));
+        ASSERT_EQUALS("; int a [ 3 ] = { 1 , 2 , 3 } ;", tokenizeAndStringify(";int a[]={1,2,3,};\n"));
+        ASSERT_EQUALS("; foo a [ 3 ] = { { 1 , 2 } , { 3 , 4 } , { 5 , 6 } } ;", tokenizeAndStringify(";foo a[]={{1,2},{3,4},{5,6}};\n"));
+        ASSERT_EQUALS("; int a [ 1 ] = { foo < bar1 , bar2 > ( 123 , 4 ) } ;", tokenizeAndStringify(";int a[]={foo<bar1,bar2>(123,4)};\n"));
+        ASSERT_EQUALS("; int a [ 2 ] = { b > c ? 1 : 2 , 3 } ;", tokenizeAndStringify(";int a[]={ b>c?1:2,3};\n"));
+        ASSERT_EQUALS("int main ( ) { int a [ 2 ] = { b < c ? 1 : 2 , 3 } }", tokenizeAndStringify("int main(){int a[]={b<c?1:2,3}}\n"));
         ASSERT_EQUALS(
             "[test.cpp:1:21]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable b [valueFlowBailoutIncompleteVar]\n",
             errout_str());
-        ASSERT_EQUALS("; int a [ 3 ] = { ABC , 2 , 3 } ;", tokenizeAndStringify(";int a[]={ABC,2,3};"));
-        ASSERT_EQUALS("; int a [ 3 ] = { [ 2 ] = 5 } ;", tokenizeAndStringify(";int a[]={ [2] = 5 };"));
-        ASSERT_EQUALS("; int a [ 5 ] = { 1 , 2 , [ 2 ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [2] = 5, 3, 4 };"));
-        ASSERT_EQUALS("; int a [ ] = { 1 , 2 , [ x ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [x] = 5, 3, 4 };"));
-        ASSERT_EQUALS("; const char c [ 4 ] = \"abc\" ;", tokenizeAndStringify(";const char c[] = { \"abc\" };"));
+        ASSERT_EQUALS("; int a [ 3 ] = { ABC , 2 , 3 } ;", tokenizeAndStringify(";int a[]={ABC,2,3};\n"));
+        ASSERT_EQUALS("; int a [ 3 ] = { [ 2 ] = 5 } ;", tokenizeAndStringify(";int a[]={ [2] = 5 };\n"));
+        ASSERT_EQUALS("; int a [ 5 ] = { 1 , 2 , [ 2 ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [2] = 5, 3, 4 };\n"));
+        ASSERT_EQUALS("; int a [ ] = { 1 , 2 , [ x ] = 5 , 3 , 4 } ;", tokenizeAndStringify(";int a[]={ 1, 2, [x] = 5, 3, 4 };\n"));
+        ASSERT_EQUALS("; const char c [ 4 ] = \"abc\" ;", tokenizeAndStringify(";const char c[] = { \"abc\" };\n"));
     }
 
     void arraySizeAfterValueFlow() {
-        const char code[] = "enum {X=10}; int a[] = {[X]=1};";
+        const char code[] = "enum {X=10}; int a[] = {[X]=1};\n";
         ASSERT_EQUALS("enum Anonymous0 { X = 10 } ; int a [ 11 ] = { [ X ] = 1 } ;", tokenizeAndStringify(code));
     }
 
     void labels() {
-        ASSERT_EQUALS("void f ( ) { ab : ; a = 0 ; }", tokenizeAndStringify("void f() { ab: a=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; a = 0 ; }", tokenizeAndStringify("void f() { ab: a=0; }\n"));
         //ticket #3176
-        ASSERT_EQUALS("void f ( ) { ab : ; ( * func ) ( ) ; }", tokenizeAndStringify("void f() { ab: (*func)(); }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; ( * func ) ( ) ; }", tokenizeAndStringify("void f() { ab: (*func)(); }\n"));
         //with '*' operator
-        ASSERT_EQUALS("void f ( ) { ab : ; * b = 0 ; }", tokenizeAndStringify("void f() { ab: *b=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; * * b = 0 ; }", tokenizeAndStringify("void f() { ab: **b=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; * b = 0 ; }", tokenizeAndStringify("void f() { ab: *b=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; * * b = 0 ; }", tokenizeAndStringify("void f() { ab: **b=0; }\n"));
         //with '&' operator
-        ASSERT_EQUALS("void f ( ) { ab : ; & b = 0 ; }", tokenizeAndStringify("void f() { ab: &b=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; & ( b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(b->x)=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; & b = 0 ; }", tokenizeAndStringify("void f() { ab: &b=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; & ( b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(b->x)=0; }\n"));
         //with '(' parentheses
-        ASSERT_EQUALS("void f ( ) { ab : ; * ( * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: *(* b)->x=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; ( * * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: (** b).x=0; }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; & ( * b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(*b.x)=0; }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; * ( * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: *(* b)->x=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; ( * * b ) . x = 0 ; }", tokenizeAndStringify("void f() { ab: (** b).x=0; }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; & ( * b . x ) = 0 ; }", tokenizeAndStringify("void f() { ab: &(*b.x)=0; }\n"));
         //with '{' parentheses
-        ASSERT_EQUALS("void f ( ) { ab : ; { b = 0 ; } }", tokenizeAndStringify("void f() { ab: {b=0;} }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; { * b = 0 ; } }", tokenizeAndStringify("void f() { ab: { *b=0;} }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; { & b = 0 ; } }", tokenizeAndStringify("void f() { ab: { &b=0;} }"));
-        ASSERT_EQUALS("void f ( ) { ab : ; { & ( * b . x ) = 0 ; } }", tokenizeAndStringify("void f() { ab: {&(*b.x)=0;} }"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { b = 0 ; } }", tokenizeAndStringify("void f() { ab: {b=0;} }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { * b = 0 ; } }", tokenizeAndStringify("void f() { ab: { *b=0;} }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { & b = 0 ; } }", tokenizeAndStringify("void f() { ab: { &b=0;} }\n"));
+        ASSERT_EQUALS("void f ( ) { ab : ; { & ( * b . x ) = 0 ; } }", tokenizeAndStringify("void f() { ab: {&(*b.x)=0;} }\n"));
         //with unhandled MACRO() code
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(ab: b=0;, foo)}"), UNKNOWN_MACRO);
-        ASSERT_EQUALS("void f ( ) { MACRO ( bar , ab : { & ( * b . x ) = 0 ; } ) }", tokenizeAndStringify("void f() { MACRO(bar, ab: {&(*b.x)=0;})}"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(ab: b=0;, foo)}\n"), UNKNOWN_MACRO);
+        ASSERT_EQUALS("void f ( ) { MACRO ( bar , ab : { & ( * b . x ) = 0 ; } ) }", tokenizeAndStringify("void f() { MACRO(bar, ab: {&(*b.x)=0;})}\n"));
 
         ignore_errout();
     }
 
     void simplifyInitVar() {
         {
-            const char code[] = "int i ; int p(0);";
+            const char code[] = "int i ; int p(0);\n";
             ASSERT_EQUALS("int i ; int p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i; int *p(0);";
+            const char code[] = "int i; int *p(0);\n";
             ASSERT_EQUALS("int i ; int * p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int p(0);";
+            const char code[] = "int p(0);\n";
             ASSERT_EQUALS("int p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int *p(0);";
+            const char code[] = "int *p(0);\n";
             ASSERT_EQUALS("int * p ( 0 ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i ; int p(i);";
+            const char code[] = "int i ; int p(i);\n";
             ASSERT_EQUALS("int i ; int p ( i ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i; int *p(&i);";
+            const char code[] = "int i; int *p(&i);\n";
             ASSERT_EQUALS("int i ; int * p ( & i ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int i; void *p(&i);";
+            const char code[] = "int i; void *p(&i);\n";
             ASSERT_EQUALS("int i ; void * p ( & i ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; struct S s; struct S *p(&s);";
+            const char code[] = "struct S { }; struct S s; struct S *p(&s);\n";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; S s; S *p(&s);";
+            const char code[] = "struct S { }; S s; S *p(&s);\n";
             ASSERT_EQUALS("struct S { } ; S s ; S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "union S { int i; float f; }; union S s; union S *p(&s);";
+            const char code[] = "union S { int i; float f; }; union S s; union S *p(&s);\n";
             ASSERT_EQUALS("union S { int i ; float f ; } ; union S s ; union S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "union S { int i; float f; }; S s; S *p(&s);";
+            const char code[] = "union S { int i; float f; }; S s; S *p(&s);\n";
             ASSERT_EQUALS("union S { int i ; float f ; } ; S s ; S * p ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class C { }; class C c; class C *p(&c);";
+            const char code[] = "class C { }; class C c; class C *p(&c);\n";
             ASSERT_EQUALS("class C { } ; class C c ; class C * p ( & c ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class C { }; C c; C *p(&c);";
+            const char code[] = "class C { }; C c; C *p(&c);\n";
             ASSERT_EQUALS("class C { } ; C c ; C * p ( & c ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; struct S s; struct S s1(s);";
+            const char code[] = "struct S { }; struct S s; struct S s1(s);\n";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S s1 ( s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; S s; S s1(s);";
+            const char code[] = "struct S { }; S s; S s1(s);\n";
             ASSERT_EQUALS("struct S { } ; S s ; S s1 ( s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; struct S s; struct S s1(&s);";
+            const char code[] = "struct S { }; struct S s; struct S s1(&s);\n";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S s1 ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "struct S { }; S s; S s1(&s);";
+            const char code[] = "struct S { }; S s; S s1(&s);\n";
             ASSERT_EQUALS("struct S { } ; S s ; S s1 ( & s ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class S { int function(); };";
+            const char code[] = "class S { int function(); };\n";
             ASSERT_EQUALS("class S { int function ( ) ; } ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class S { int function(void); };";
+            const char code[] = "class S { int function(void); };\n";
             ASSERT_EQUALS("class S { int function ( ) ; } ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class S { int function(int); };";
+            const char code[] = "class S { int function(int); };\n";
             ASSERT_EQUALS("class S { int function ( int ) ; } ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function(void);";
+            const char code[] = "int function(void);\n";
             ASSERT_EQUALS("int function ( ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function(int);";
+            const char code[] = "int function(int);\n";
             ASSERT_EQUALS("int function ( int ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "extern int function(void);";
+            const char code[] = "extern int function(void);\n";
             ASSERT_EQUALS("extern int function ( ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function1(void); int function2(void);";
+            const char code[] = "int function1(void); int function2(void);\n";
             ASSERT_EQUALS("int function1 ( ) ; int function2 ( ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int function(A);";
+            const char code[] = "int function(A);\n";
             // We can't tell if this a function prototype or a variable without knowing
             // what A is. Since A is undefined, just leave it alone.
             ASSERT_EQUALS("int function ( A ) ;", tokenizeAndStringify(code));
@@ -4488,41 +4937,49 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const char code[] = "int i; int function(A);";
+            const char code[] = "int i; int function(A);\n";
             ASSERT_EQUALS("int i ; int function ( A ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class A { } ; int foo(A);";
+            const char code[] = "class A { } ; int foo(A);\n";
             ASSERT_EQUALS("class A { } ; int foo ( A ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "class A { } ; A a; int foo(a);";
+            const char code[] = "class A { } ; A a; int foo(a);\n";
             ASSERT_EQUALS("class A { } ; A a ; int foo ( a ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "int x(f());";
+            const char code[] = "int x(f());\n";
             ASSERT_EQUALS("int x ( f ( ) ) ;", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
 
         {
-            const char code[] = "{ return doSomething(X), 0; }";
+            const char code[] = "{ return doSomething(X), 0; }\n";
             ASSERT_EQUALS("{ return doSomething ( X ) , 0 ; }", tokenizeAndStringify(code));
             ASSERT_EQUALS("", errout_str());
         }
+
+        {
+            // 13893
+            const char code[] = "namespace test { bool foo; }\n";
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            ASSERT(tokenizer.tokenize(code));
+            ASSERT(!tokenizer.tokens()->tokAt(2)->isInitBracket());
+        }
     }
 
     void simplifyInitVar2() {
         // ticket #5131 - unsigned
         const char code[] = "void f() {\n"
                             "    unsigned int a(0),b(0);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "unsigned int a ( 0 ) ; unsigned int b ( 0 ) ;\n"
                       "}", tokenizeAndStringify(code));
@@ -4531,7 +4988,7 @@ class TestTokenizer : public TestFixture {
     void simplifyInitVar3() {
         const char code[] = "void f() {\n"
                             "    int *a(0),b(0);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "int * a ( 0 ) ; int b ( 0 ) ;\n"
                       "}", tokenizeAndStringify(code));
@@ -4540,198 +4997,203 @@ class TestTokenizer : public TestFixture {
     void simplifyInitVar4() {
         const char code[] = "void f() {\n"
                             "    uint32_t x{0};\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
                       "uint32_t x { 0 } ;\n"
                       "}", tokenizeAndStringify(code));
     }
 
+    void simplifyInitVar5() { // #14218
+        const char code[] = "int c[1]{}, b;\n";
+        ASSERT_EQUALS("int c [ 1 ] { } ; int b ;", tokenizeAndStringify(code));
+    }
+
     void bitfields1() {
-        const char code1[] = "struct A { bool x : 1; };";
+        const char code1[] = "struct A { bool x : 1; };\n";
         ASSERT_EQUALS("struct A { bool x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { char x : 3; };";
+        const char code2[] = "struct A { char x : 3; };\n";
         ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { short x : 3; };";
+        const char code3[] = "struct A { short x : 3; };\n";
         ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { int x : 3; };";
+        const char code4[] = "struct A { int x : 3; };\n";
         ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringify(code4));
 
-        const char code5[] = "struct A { long x : 3; };";
+        const char code5[] = "struct A { long x : 3; };\n";
         ASSERT_EQUALS("struct A { long x ; } ;", tokenizeAndStringify(code5));
 
-        const char code6[] = "struct A { __int8 x : 3; };";
-        ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringifyWindows(code6, true, Platform::Type::Win32A));
+        const char code6[] = "struct A { __int8 x : 3; };\n";
+        ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringify(code6, settings_win32a));
 
-        const char code7[] = "struct A { __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringifyWindows(code7, true, Platform::Type::Win32A));
+        const char code7[] = "struct A { __int16 x : 3; };\n";
+        ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringify(code7,settings_win32a));
 
-        const char code8[] = "struct A { __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringifyWindows(code8, true, Platform::Type::Win32A));
+        const char code8[] = "struct A { __int32 x : 3; };\n";
+        ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringify(code8, settings_win32a));
 
-        const char code9[] = "struct A { __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringifyWindows(code9, true, Platform::Type::Win32A));
+        const char code9[] = "struct A { __int64 x : 3; };\n";
+        ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringify(code9, settings_win32a));
 
-        const char code10[] = "struct A { unsigned char x : 3; };";
+        const char code10[] = "struct A { unsigned char x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code10));
 
-        const char code11[] = "struct A { unsigned short x : 3; };";
+        const char code11[] = "struct A { unsigned short x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringify(code11));
 
-        const char code12[] = "struct A { unsigned int x : 3; };";
+        const char code12[] = "struct A { unsigned int x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringify(code12));
 
-        const char code13[] = "struct A { unsigned long x : 3; };";
+        const char code13[] = "struct A { unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { unsigned long x ; } ;", tokenizeAndStringify(code13));
 
-        const char code14[] = "struct A { unsigned __int8 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringifyWindows(code14, true, Platform::Type::Win32A));
+        const char code14[] = "struct A { unsigned __int8 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code14, settings_win32a));
 
-        const char code15[] = "struct A { unsigned __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringifyWindows(code15, true, Platform::Type::Win32A));
+        const char code15[] = "struct A { unsigned __int16 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringify(code15, settings_win32a));
 
-        const char code16[] = "struct A { unsigned __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringifyWindows(code16, true, Platform::Type::Win32A));
+        const char code16[] = "struct A { unsigned __int32 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringify(code16, settings_win32a));
 
-        const char code17[] = "struct A { unsigned __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringifyWindows(code17, true, Platform::Type::Win32A));
+        const char code17[] = "struct A { unsigned __int64 x : 3; };\n";
+        ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringify(code17, settings_win32a));
 
-        const char code18[] = "struct A { signed char x : 3; };";
+        const char code18[] = "struct A { signed char x : 3; };\n";
         ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code18));
 
-        const char code19[] = "struct A { signed short x : 3; };";
+        const char code19[] = "struct A { signed short x : 3; };\n";
         ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringify(code19));
 
-        const char code20[] = "struct A { signed int x : 3; };";
+        const char code20[] = "struct A { signed int x : 3; };\n";
         ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code20));
 
-        const char code21[] = "struct A { signed long x : 3; };";
-        ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringifyWindows(code21));
+        const char code21[] = "struct A { signed long x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringify(code21, settings_windows));
 
-        const char code22[] = "struct A { signed __int8 x : 3; };";
-        ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringifyWindows(code22, true, Platform::Type::Win32A));
+        const char code22[] = "struct A { signed __int8 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code22, settings_win32a));
 
-        const char code23[] = "struct A { signed __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringifyWindows(code23, true, Platform::Type::Win32A));
+        const char code23[] = "struct A { signed __int16 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringify(code23, settings_win32a));
 
-        const char code24[] = "struct A { signed __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringifyWindows(code24, true, Platform::Type::Win32A));
+        const char code24[] = "struct A { signed __int32 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code24, settings_win32a));
 
-        const char code25[] = "struct A { signed __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringifyWindows(code25, true, Platform::Type::Win32A));
+        const char code25[] = "struct A { signed __int64 x : 3; };\n";
+        ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringify(code25, settings_win32a));
     }
 
     void bitfields2() {
-        const char code1[] = "struct A { public: int x : 3; };";
+        const char code1[] = "struct A { public: int x : 3; };\n";
         ASSERT_EQUALS("struct A { public: int x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { public: unsigned long x : 3; };";
+        const char code2[] = "struct A { public: unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { public: unsigned long x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { protected: int x : 3; };";
+        const char code3[] = "struct A { protected: int x : 3; };\n";
         ASSERT_EQUALS("struct A { protected: int x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { protected: unsigned long x : 3; };";
+        const char code4[] = "struct A { protected: unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { protected: unsigned long x ; } ;", tokenizeAndStringify(code4));
 
-        const char code5[] = "struct A { private: int x : 3; };";
+        const char code5[] = "struct A { private: int x : 3; };\n";
         ASSERT_EQUALS("struct A { private: int x ; } ;", tokenizeAndStringify(code5));
 
-        const char code6[] = "struct A { private: unsigned long x : 3; };";
+        const char code6[] = "struct A { private: unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { private: unsigned long x ; } ;", tokenizeAndStringify(code6));
     }
 
     void bitfields3() {
-        const char code1[] = "struct A { const int x : 3; };";
+        const char code1[] = "struct A { const int x : 3; };\n";
         ASSERT_EQUALS("struct A { const int x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { const unsigned long x : 3; };";
+        const char code2[] = "struct A { const unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { const unsigned long x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { public: const int x : 3; };";
+        const char code3[] = "struct A { public: const int x : 3; };\n";
         ASSERT_EQUALS("struct A { public: const int x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { public: const unsigned long x : 3; };";
+        const char code4[] = "struct A { public: const unsigned long x : 3; };\n";
         ASSERT_EQUALS("struct A { public: const unsigned long x ; } ;", tokenizeAndStringify(code4));
     }
 
     void bitfields4() { // ticket #1956
-        const char code1[] = "struct A { CHAR x : 3; };";
+        const char code1[] = "struct A { CHAR x : 3; };\n";
         ASSERT_EQUALS("struct A { CHAR x ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { UCHAR x : 3; };";
+        const char code2[] = "struct A { UCHAR x : 3; };\n";
         ASSERT_EQUALS("struct A { UCHAR x ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { BYTE x : 3; };";
+        const char code3[] = "struct A { BYTE x : 3; };\n";
         ASSERT_EQUALS("struct A { BYTE x ; } ;", tokenizeAndStringify(code3));
 
-        const char code4[] = "struct A { WORD x : 3; };";
+        const char code4[] = "struct A { WORD x : 3; };\n";
         ASSERT_EQUALS("struct A { WORD x ; } ;", tokenizeAndStringify(code4));
 
-        const char code5[] = "struct A { DWORD x : 3; };";
+        const char code5[] = "struct A { DWORD x : 3; };\n";
         ASSERT_EQUALS("struct A { DWORD x ; } ;", tokenizeAndStringify(code5));
 
-        const char code6[] = "struct A { LONG x : 3; };";
+        const char code6[] = "struct A { LONG x : 3; };\n";
         ASSERT_EQUALS("struct A { LONG x ; } ;", tokenizeAndStringify(code6));
 
-        const char code7[] = "struct A { UINT8 x : 3; };";
+        const char code7[] = "struct A { UINT8 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT8 x ; } ;", tokenizeAndStringify(code7));
 
-        const char code8[] = "struct A { UINT16 x : 3; };";
+        const char code8[] = "struct A { UINT16 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT16 x ; } ;", tokenizeAndStringify(code8));
 
-        const char code9[] = "struct A { UINT32 x : 3; };";
+        const char code9[] = "struct A { UINT32 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT32 x ; } ;", tokenizeAndStringify(code9));
 
-        const char code10[] = "struct A { UINT64 x : 3; };";
+        const char code10[] = "struct A { UINT64 x : 3; };\n";
         ASSERT_EQUALS("struct A { UINT64 x ; } ;", tokenizeAndStringify(code10));
     }
 
     void bitfields5() { // ticket #1956
-        const char code1[] = "struct RGB { unsigned int r : 3, g : 3, b : 2; };";
+        const char code1[] = "struct RGB { unsigned int r : 3, g : 3, b : 2; };\n";
         ASSERT_EQUALS("struct RGB { unsigned int r ; unsigned int g ; unsigned int b ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { int a : 3; int : 3; int c : 3; };";
-        ASSERT_EQUALS("struct A { int a ; int c ; } ;", tokenizeAndStringify(code2));
+        const char code2[] = "struct A { int a : 3; int : 3; int c : 3; };\n";
+        ASSERT_EQUALS("struct A { int a ; int anonymous@0 ; int c ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { virtual void f() {} int f1 : 1; };";
+        const char code3[] = "struct A { virtual void f() {} int f1 : 1; };\n";
         ASSERT_EQUALS("struct A { virtual void f ( ) { } int f1 ; } ;", tokenizeAndStringify(code3));
     }
 
     void bitfields6() { // ticket #2595
-        const char code1[] = "struct A { bool b : true; };";
+        const char code1[] = "struct A { bool b : true; };\n";
         ASSERT_EQUALS("struct A { bool b ; } ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "struct A { bool b : true, c : true; };";
+        const char code2[] = "struct A { bool b : true, c : true; };\n";
         ASSERT_EQUALS("struct A { bool b ; bool c ; } ;", tokenizeAndStringify(code2));
 
-        const char code3[] = "struct A { bool : true; };";
-        ASSERT_EQUALS("struct A { } ;", tokenizeAndStringify(code3));
+        const char code3[] = "struct A { bool : true; };\n";
+        ASSERT_EQUALS("struct A { bool anonymous@0 ; } ;", tokenizeAndStringify(code3));
     }
 
     void bitfields7() { // ticket #1987
-        const char code[] = "typedef struct Descriptor {"
-                            "    unsigned element_size: 8* sizeof( unsigned );"
-                            "} Descriptor;";
-        const char expected[] = "struct Descriptor { "
-                                "unsigned int element_size ; "
+        const char code[] = "typedef struct Descriptor {\n"
+                            "    unsigned element_size: 8* sizeof( unsigned );\n"
+                            "} Descriptor;\n";
+        const char expected[] = "struct Descriptor {\n"
+                                "unsigned int element_size ;\n"
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("", errout_str());
     }
 
     void bitfields8() {
-        const char code[] = "struct A;"
-                            "class B : virtual public C"
-                            "{"
-                            "    int f();"
-                            "};";
-        const char expected[] = "struct A ; "
-                                "class B : virtual public C "
-                                "{ "
-                                "int f ( ) ; "
+        const char code[] = "struct A;\n"
+                            "class B : virtual public C\n"
+                            "{\n"
+                            "    int f();\n"
+                            "};\n";
+        const char expected[] = "struct A ;\n"
+                                "class B : virtual public C\n"
+                                "{\n"
+                                "int f ( ) ;\n"
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         ASSERT_EQUALS("", errout_str());
@@ -4744,22 +5206,26 @@ class TestTokenizer : public TestFixture {
                             "    {\n"
                             "        ;\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         (void)tokenizeAndStringify(code);
         ASSERT_EQUALS("", errout_str());
     }
 
     void bitfields10() { // ticket #2737
-        const char code[] = "{}"
-                            "MACRO "
-                            "default: { }"
-                            ";";
-        ASSERT_EQUALS("{ } MACRO default : { } ;", tokenizeAndStringify(code));
+        const char code[] = "{}\n"
+                            "MACRO\n"
+                            "default: { }\n"
+                            ";\n";
+        const char expected[] = "{ }\n"
+                                "MACRO\n"
+                                "default : { }\n"
+                                ";";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void bitfields12() { // ticket #3485 (segmentation fault)
         const char code[] = "{a:1;};\n";
-        ASSERT_EQUALS("{ } ;", tokenizeAndStringify(code));
+        ASSERT_EQUALS("{ a anonymous@0 ; } ;", tokenizeAndStringify(code));
     }
 
     void bitfields13() { // ticket #3502 (segmentation fault)
@@ -4772,19 +5238,33 @@ class TestTokenizer : public TestFixture {
                       "} ;",
                       tokenizeAndStringify("struct AB {\n"
                                            "  enum Foo {A,B} : 4;\n"
-                                           "};"));
+                                           "};\n"));
         ASSERT_EQUALS("struct AB {\n"
                       "enum Foo { A , B } ; enum Foo foo ;\n"
                       "} ;",
                       tokenizeAndStringify("struct AB {\n"
                                            "  enum Foo {A,B} foo : 4;\n"
-                                           "};"));
+                                           "};\n"));
+
+        ASSERT_EQUALS("struct S {\n" // #14324
+                      "enum E : int { E0 , E1 } ; enum E e ;\n"
+                      "} ;",
+                      tokenizeAndStringify("struct S {\n"
+                                           "    enum E : int { E0, E1 } e : 2;\n"
+                                           "};\n"));
+
+        ASSERT_EQUALS("struct S {\n"
+                      "enum class E : std :: uint8_t { E0 , E1 } ; enum E e ;\n"
+                      "} ;",
+                      tokenizeAndStringify("struct S {\n"
+                                           "    enum class E : std::uint8_t { E0, E1 } e : 2;\n"
+                                           "};\n"));
     }
 
     void bitfields16() {
-        const char code[] = "struct A { unsigned int x : 1; };";
+        const char code[] = "struct A { unsigned int x : 1; };\n";
 
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT(tokenizer.tokenize(code));
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT_EQUALS(1, x->bits());
@@ -4799,9 +5279,9 @@ class TestTokenizer : public TestFixture {
                             "};\n";
         const char expected[] = "struct S {\n"
                                 "volatile uint32_t a ;\n"
-                                "\n"
+                                "volatile uint32_t anonymous@0 ;\n"
                                 "volatile uint32_t b ;\n"
-                                "\n"
+                                "volatile uint32_t anonymous@1 ;\n"
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
 
@@ -4811,77 +5291,103 @@ class TestTokenizer : public TestFixture {
                              "};\n";
         const char expected2[] = "struct S {\n"
                                  "const volatile uint32_t a ;\n"
-                                 "\n"
+                                 "const volatile uint32_t anonymous@0 ;\n"
                                  "} ;";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
 
+    void bitfields18() {
+        const char code[] = "struct S { unsigned int a : 100000; };\n";
+        (void) tokenizeAndStringify(code);
+        ASSERT_EQUALS("[test.cpp:1:29]: (warning) Bit-field size exceeds max number of bits 32767 [tooLargeBitField]\n", errout_str());
+    }
+
+    void bitfields19() {
+        const char code[] = "struct S { volatile std::uint32_t a : 10; };\n";
+        ASSERT_EQUALS("struct S { volatile std :: uint32_t a ; } ;", tokenizeAndStringify(code));
+    }
+
+    void bitfields20() {
+        const char code[] = "struct S { volatile ::uint32_t a : 10; };\n";
+        ASSERT_EQUALS("struct S { volatile :: uint32_t a ; } ;", tokenizeAndStringify(code));
+    }
+
+    void bitfields21() {
+        const char code[] = "struct S { uint32_t a : 1, b : 1; };\n";
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+        const Token *a = Token::findsimplematch(tokenizer.tokens(), "a");
+        ASSERT_EQUALS(1, a->bits());
+        const Token *b = Token::findsimplematch(tokenizer.tokens(), "b");
+        ASSERT_EQUALS(1, b->bits());
+    }
+
     void simplifyNamespaceStd() {
         const char *expected;
 
         {
-            const char code[] = "map<foo, bar> m;"; // namespace std is not used
+            const char code[] = "map<foo, bar> m;\n"; // namespace std is not used
             ASSERT_EQUALS("map < foo , bar > m ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "map<foo, bar> m;";
+                                "map<foo, bar> m;\n";
             ASSERT_EQUALS("std :: map < foo , bar > m ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "string s;";
+                                "string s;\n";
             ASSERT_EQUALS("std :: string s ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "void foo() {swap(a, b); }";
+                                "void foo() {swap(a, b); }\n";
             ASSERT_EQUALS("void foo ( ) { std :: swap ( a , b ) ; }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "void search() {}";
+                                "void search() {}\n";
             ASSERT_EQUALS("void search ( ) { }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
                                 "void search();\n"
-                                "void dostuff() { search(); }";
+                                "void dostuff() { search(); }\n";
             ASSERT_EQUALS("void search ( ) ;\nvoid dostuff ( ) { search ( ) ; }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "void foo() {map(a, b); }"; // That's obviously not std::map<>
+                                "void foo() {map(a, b); }\n"; // That's obviously not std::map<>
             ASSERT_EQUALS("void foo ( ) { map ( a , b ) ; }", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "string<wchar_t> s;"; // That's obviously not std::string
+                                "string<wchar_t> s;\n"; // That's obviously not std::string
             TODO_ASSERT_EQUALS("string < wchar_t > s ;", "std :: string < wchar_t > s ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "swap s;"; // That's obviously not std::swap
+                                "swap s;\n"; // That's obviously not std::swap
             ASSERT_EQUALS("swap s ;", tokenizeAndStringify(code));
         }
 
         {
             const char code[] = "using namespace std;\n"
-                                "std::string s;";
+                                "std::string s;\n";
             ASSERT_EQUALS("std :: string s ;", tokenizeAndStringify(code));
         }
 
         { // #4042 (Do not add 'std ::' to variables)
             const char code[] = "using namespace std;\n"
-                                "const char * string = \"Hi\";";
+                                "const char * string = \"Hi\";\n";
             ASSERT_EQUALS("const char * string ; string = \"Hi\" ;", tokenizeAndStringify(code));
         }
 
@@ -4890,11 +5396,11 @@ class TestTokenizer : public TestFixture {
                                 "string f(const char * string) {\n"
                                 "    cout << string << endl;\n"
                                 "    return string;\n"
-                                "}";
+                                "}\n";
             expected = "std :: string f ( const char * string ) {\n"
                        "std :: cout << string << std :: endl ;\n"
                        "return string ;\n"
-                       "}";
+                       "}\n";
             TODO_ASSERT_EQUALS(expected,
                                "std :: string f ( const char * string ) {\n"
                                "cout << string << endl ;\n"
@@ -4911,7 +5417,7 @@ class TestTokenizer : public TestFixture {
                                 "void f() {\n"
                                 "  try { }\n"
                                 "  catch(std::exception &exception) { }\n"
-                                "}";
+                                "}\n";
             expected = "void f ( ) {\n"
                        "try { }\n"
                        "catch ( std :: exception & exception ) { }\n"
@@ -4925,7 +5431,7 @@ class TestTokenizer : public TestFixture {
                                 "    void search() {}\n"
                                 "    void search() const {}\n"
                                 "    void search() THROW_MACRO {}\n"
-                                "};";
+                                "};\n";
             expected = "class C {\n"
                        "void search ( ) { }\n"
                        "void search ( ) const { }\n"
@@ -4937,48 +5443,43 @@ class TestTokenizer : public TestFixture {
         // Ticket #8091
         ASSERT_EQUALS("enum Anonymous0 { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum { string };"));
+                                           "enum { string };\n"));
         ASSERT_EQUALS("enum Type { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum Type { string } ;"));
+                                           "enum Type { string } ;\n"));
         ASSERT_EQUALS("enum class Type { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum class Type { string } ;"));
+                                           "enum class Type { string } ;\n"));
         ASSERT_EQUALS("enum struct Type { string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum struct Type { string } ;"));
+                                           "enum struct Type { string } ;\n"));
         ASSERT_EQUALS("enum struct Type : int { f = 0 , string } ;",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum struct Type : int { f = 0 , string } ;"));
+                                           "enum struct Type : int { f = 0 , string } ;\n"));
         ASSERT_EQUALS("enum Type { a , b } ; void foo ( enum Type , std :: string ) { }",
                       tokenizeAndStringify("using namespace std; "
-                                           "enum Type { a , b } ; void foo ( enum Type , string) {}"));
+                                           "enum Type { a , b } ; void foo ( enum Type , string) {}\n"));
         ASSERT_EQUALS("struct T { } ; enum struct Type : int { f = 0 , string } ;",
                       tokenizeAndStringify("using namespace std; "
                                            "struct T { typedef int type; } ; "
-                                           "enum struct Type : T :: type { f = 0 , string } ;"));
+                                           "enum struct Type : T :: type { f = 0 , string } ;\n"));
         // Handle garbage enum code "well"
         ASSERT_EQUALS("enum E : int ; void foo ( ) { std :: string s ; }",
-                      tokenizeAndStringify("using namespace std; enum E : int ; void foo ( ) { string s ; }"));
+                      tokenizeAndStringify("using namespace std; enum E : int ; void foo ( ) { string s ; }\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("NS_BEGIN(IMAGEIO_2D_DICOM) using namespace std; NS_END")); // #11045
+        ASSERT_NO_THROW(tokenizeAndStringify("NS_BEGIN(IMAGEIO_2D_DICOM) using namespace std; NS_END\n")); // #11045
 
         {
             const char code[] = "using namespace std;\n"
                                 "void f(const unique_ptr<int>& p) {\n"
                                 "    if (!p)\n"
                                 "        throw runtime_error(\"abc\");\n"
-                                "}";
+                                "}\n";
             expected = "void f ( const std :: unique_ptr < int > & p ) {\n"
                        "if ( ! p ) {\n"
                        "throw std :: runtime_error ( \"abc\" ) ; }\n"
                        "}";
-            TODO_ASSERT_EQUALS(expected,
-                               "void f ( const std :: unique_ptr < int > & p ) {\n"
-                               "if ( ! p ) {\n"
-                               "throw runtime_error ( \"abc\" ) ; }\n"
-                               "}",
-                               tokenizeAndStringify(code));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
@@ -5000,134 +5501,145 @@ class TestTokenizer : public TestFixture {
                        "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "string_view f() { return string(); }\n"
+                                "void move() {}\n"
+                                "void string() {}\n";
+            expected = "std :: string_view f ( ) { return std :: string ( ) ; }\n"
+                       "void move ( ) { }\n"
+                       "void string ( ) { }";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        }
     }
 
     void microsoftMemory() {
-        const char code1a[] = "void foo() { int a[10], b[10]; CopyMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1a,true,Platform::Type::Win32A));
+        const char code1a[] = "void foo() { int a[10], b[10]; CopyMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1a,settings2_win32a));
 
-        const char code1b[] = "void foo() { int a[10], b[10]; RtlCopyMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1b,true,Platform::Type::Win32A));
+        const char code1b[] = "void foo() { int a[10], b[10]; RtlCopyMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1b,settings2_win32a));
 
-        const char code1c[] = "void foo() { int a[10], b[10]; RtlCopyBytes(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1c,true,Platform::Type::Win32A));
+        const char code1c[] = "void foo() { int a[10], b[10]; RtlCopyBytes(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1c,settings2_win32a));
 
-        const char code2a[] = "void foo() { int a[10]; FillMemory(a, sizeof(a), 255); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2a,true,Platform::Type::Win32A));
-        const char code2b[] = "void foo() { int a[10]; RtlFillMemory(a, sizeof(a), 255); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2b,true,Platform::Type::Win32A));
-        const char code2c[] = "void foo() { int a[10]; RtlFillBytes(a, sizeof(a), 255); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2c,true,Platform::Type::Win32A));
+        const char code2a[] = "void foo() { int a[10]; FillMemory(a, sizeof(a), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2a,settings2_win32a));
+        const char code2b[] = "void foo() { int a[10]; RtlFillMemory(a, sizeof(a), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2b,settings2_win32a));
+        const char code2c[] = "void foo() { int a[10]; RtlFillBytes(a, sizeof(a), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2c,settings2_win32a));
 
-        const char code3a[] = "void foo() { int a[10], b[10]; MoveMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3a,true,Platform::Type::Win32A));
-        const char code3b[] = "void foo() { int a[10], b[10]; RtlMoveMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3b,true,Platform::Type::Win32A));
+        const char code3a[] = "void foo() { int a[10], b[10]; MoveMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3a,settings2_win32a));
+        const char code3b[] = "void foo() { int a[10], b[10]; RtlMoveMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3b,settings2_win32a));
 
-        const char code4a[] = "void foo() { int a[10]; ZeroMemory(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4a,true,Platform::Type::Win32A));
-        const char code4b[] = "void foo() { int a[10]; RtlZeroMemory(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4b,true,Platform::Type::Win32A));
-        const char code4c[] = "void foo() { int a[10]; RtlZeroBytes(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4c,true,Platform::Type::Win32A));
-        const char code4d[] = "void foo() { int a[10]; RtlSecureZeroMemory(a, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4d,true,Platform::Type::Win32A));
+        const char code4a[] = "void foo() { int a[10]; ZeroMemory(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4a,settings2_win32a));
+        const char code4b[] = "void foo() { int a[10]; RtlZeroMemory(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4b,settings2_win32a));
+        const char code4c[] = "void foo() { int a[10]; RtlZeroBytes(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4c,settings2_win32a));
+        const char code4d[] = "void foo() { int a[10]; RtlSecureZeroMemory(a, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4d,settings2_win32a));
 
-        const char code5[] = "void foo() { int a[10], b[10]; RtlCompareMemory(a, b, sizeof(a)); }";
-        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcmp ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code5,true,Platform::Type::Win32A));
+        const char code5[] = "void foo() { int a[10], b[10]; RtlCompareMemory(a, b, sizeof(a)); }\n";
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcmp ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code5,settings2_win32a));
 
-        const char code6[] = "void foo() { ZeroMemory(f(1, g(a, b)), h(i, j(0, 1))); }";
-        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 0 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code6,true,Platform::Type::Win32A));
+        const char code6[] = "void foo() { ZeroMemory(f(1, g(a, b)), h(i, j(0, 1))); }\n";
+        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 0 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code6,settings2_win32a));
 
-        const char code7[] = "void foo() { FillMemory(f(1, g(a, b)), h(i, j(0, 1)), 255); }";
-        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 255 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code7,true,Platform::Type::Win32A));
+        const char code7[] = "void foo() { FillMemory(f(1, g(a, b)), h(i, j(0, 1)), 255); }\n";
+        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 255 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code7,settings2_win32a));
     }
 
     void microsoftString() {
-        const char code1a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test1\" ) ; }", tokenizeAndStringify(code1a, true, Platform::Type::Win32A));
-        const char code1b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test2\" ) ; }", tokenizeAndStringify(code1b, true, Platform::Type::Win32A));
-        const char code1c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test3\" ) ; }", tokenizeAndStringify(code1c, true, Platform::Type::Win32A));
-
-        const char code2a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, true, Platform::Type::Win32W));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, true, Platform::Type::Win64));
-        const char code2b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, true, Platform::Type::Win32W));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, true, Platform::Type::Win64));
-        const char code2c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, true, Platform::Type::Win32W));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, true, Platform::Type::Win64));
+        const char code1a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test1\" ) ; }", tokenizeAndStringify(code1a, settings2_win32a));
+        const char code1b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test2\" ) ; }", tokenizeAndStringify(code1b, settings2_win32a));
+        const char code1c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test3\" ) ; }", tokenizeAndStringify(code1c, settings2_win32a));
+
+        const char code2a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, settings2_win32w));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, settings2_win64));
+        const char code2b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, settings2_win32w));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, settings2_win64));
+        const char code2c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }\n";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, settings2_win32w));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, settings2_win64));
     }
 
     void borland() {
         // __closure
         ASSERT_EQUALS("int ( * a ) ( ) ;",  // TODO VarId
-                      tokenizeAndStringify("int (__closure *a)();", true, Platform::Type::Win32A));
+                      tokenizeAndStringify("int (__closure *a)();\n", settings2_win32a));
 
         // __property
         ASSERT_EQUALS("class Fred { ; __property ; } ;",
-                      tokenizeAndStringify("class Fred { __property int x = { } };", true, Platform::Type::Win32A));
+                      tokenizeAndStringify("class Fred { __property int x = { } };\n", settings2_win32a));
     }
 
     void simplifySQL() {
         // Oracle PRO*C extensions for inline SQL. Just replace the SQL with "asm()" to fix wrong error messages
         // ticket: #1959
-        ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B\"\" ) ;", tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B;"));
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL"), SYNTAX);
+        ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B\"\" ) ;", tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL SELECT A FROM B;\n"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL\n"), SYNTAX);
 
         ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1 ( A ) ; END ; END - __CPPCHECK_EMBEDDED_SQL_EXEC__\"\" ) ; asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT\"\" ) ;",
-                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;"));
+                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;\n"));
         ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = C\"\" ) ; asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT\"\" ) ;",
-                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = C; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;"));
+                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = C; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT;\n"));
         ASSERT_EQUALS("asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT\"\" ) ; asm ( \"\"__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1 ( A ) ; END ; END - __CPPCHECK_EMBEDDED_SQL_EXEC__\"\" ) ;",
-                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__;"));
+                      tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL COMMIT; __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL EXECUTE BEGIN Proc1(A); END; END-__CPPCHECK_EMBEDDED_SQL_EXEC__;\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f(){ __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL } int a;"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL int f(){"), SYNTAX);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL END-__CPPCHECK_EMBEDDED_SQL_EXEC__ int a;"), SYNTAX);
-        ASSERT_NO_THROW(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = :&b->b1, C = :c::c1;"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f(){ __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL } int a;\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL int f(){\n"), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL END-__CPPCHECK_EMBEDDED_SQL_EXEC__ int a;\n"), SYNTAX);
+        ASSERT_NO_THROW(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL UPDATE A SET B = :&b->b1, C = :c::c1;\n"));
     }
 
     void simplifyCAlternativeTokens() {
-        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }", true, Platform::Type::Native, true));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }\n"));
+        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }\n"));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }\n"));
         // #6201
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }\n"));
         // #6029
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }\n"));
         // #6207
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, Platform::Type::Native, false));
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }\n", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }\n"));
         // #8029
-        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }\n", dinit(TokenizeOptions, $.cpp = false)));
         // #8745
-        ASSERT_EQUALS("void f ( ) { if ( x ) { or = 0 ; } }", tokenizeAndStringify("void f() { if (x) or = 0; }"));
+        ASSERT_EQUALS("void f ( ) { if ( x ) { or = 0 ; } }", tokenizeAndStringify("void f() { if (x) or = 0; }\n"));
         // #9324
         ASSERT_EQUALS("void f ( const char * str ) { while ( * str == '!' || * str == '[' ) { } }",
-                      tokenizeAndStringify("void f(const char *str) { while (*str=='!' or *str=='['){} }"));
+                      tokenizeAndStringify("void f(const char *str) { while (*str=='!' or *str=='['){} }\n"));
         // #9920
-        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';\n", dinit(TokenizeOptions, $.cpp = false)));
 
         // #8975
         ASSERT_EQUALS("void foo ( ) {\n"
@@ -5138,17 +5650,31 @@ class TestTokenizer : public TestFixture {
                           "void foo() {\n"
                           "  char *or;\n"
                           "  while ((*or != 0) && (*or != '|')) or++;\n"
-                          "}", true, Platform::Type::Native, false));
+                          "}\n", dinit(TokenizeOptions, $.cpp = false)));
         // #10013
-        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }", true, Platform::Type::Native, true));
+        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }\n"));
 
         { // #12476
             const char code[] = "struct S { int a, b; };"
                                 "void f(struct S* compl) {"
                                 "    compl->a = compl->b;"
-                                "}";
+                                "}\n";
             const char exp[] = "struct S { int a ; int b ; } ; void f ( struct S * compl ) { compl . a = compl . b ; }";
-            ASSERT_EQUALS(exp, tokenizeAndStringify(code, true, Platform::Type::Native, false));
+            ASSERT_EQUALS(exp, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+
+        { // not used as parameter name in C
+            const char code[] = "static void foo(int not, int test) {"
+                                "    test = not;"
+                                "}\n";
+            const char exp[] = "static void foo ( int not , int test ) { test = not ; }";
+            ASSERT_EQUALS(exp, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+
+        { // binary alt token as last parameter in C
+            const char code[] = "void f(int or) { if (or) {} }\n";
+            const char exp[] = "void f ( int or ) { if ( or ) { } }";
+            ASSERT_EQUALS(exp, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
 
         //ASSERT_EQUALS("", filter_valueflow(errout_str()));
@@ -5156,41 +5682,41 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyCompoundStatements() {
-        ASSERT_EQUALS("; x = 123 ;", tokenizeAndStringify(";x=({123;});"));
-        ASSERT_EQUALS("; x = y ;", tokenizeAndStringify(";x=({y;});"));
+        ASSERT_EQUALS("; x = 123 ;", tokenizeAndStringify(";x=({123;});\n"));
+        ASSERT_EQUALS("; x = y ;", tokenizeAndStringify(";x=({y;});\n"));
         // #13419: Do not simplify compound statements in for loop
-        ASSERT_EQUALS("void foo ( int x ) { for ( ; ( { { } ; x < 1 ; } ) ; ) }",
-                      tokenizeAndStringify("void foo(int x) { for (;({ {}; x<1; });) }"));
+        ASSERT_EQUALS("void foo ( int x ) { for ( ; ( { { } ; x < 1 ; } ) ; ) { ; } }",
+                      tokenizeAndStringify("void foo(int x) { for (;({ {}; x<1; });); }\n"));
     }
 
     void simplifyOperatorName1() {
         // make sure C code doesn't get changed
-        const char code[] = "void operator () {}"
-                            "int main()"
-                            "{"
-                            "    operator();"
-                            "}";
-
-        const char result[] = "void operator ( ) { } "
-                              "int main ( ) "
-                              "{ "
-                              "operator ( ) ; "
+        const char code[] = "void operator () {}\n"
+                            "int main()\n"
+                            "{\n"
+                            "    operator();\n"
+                            "}\n";
+
+        const char result[] = "void operator ( ) { }\n"
+                              "int main ( )\n"
+                              "{\n"
+                              "operator ( ) ;\n"
                               "}";
 
-        ASSERT_EQUALS(result, tokenizeAndStringify(code, /*expand=*/ true, /*platform=*/ Platform::Type::Native, false));
+        ASSERT_EQUALS(result, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void simplifyOperatorName2() {
-        const char code[] = "class Fred"
-                            "{"
-                            "    Fred(const Fred & f) { operator = (f); }"
-                            "    operator = ();"
-                            "}";
-
-        const char result[] = "class Fred "
-                              "{ "
-                              "Fred ( const Fred & f ) { operator= ( f ) ; } "
-                              "operator= ( ) ; "
+        const char code[] = "class Fred\n"
+                            "{\n"
+                            "    Fred(const Fred & f) { operator = (f); }\n"
+                            "    operator = ();\n"
+                            "}\n";
+
+        const char result[] = "class Fred\n"
+                              "{\n"
+                              "Fred ( const Fred & f ) { operator= ( f ) ; }\n"
+                              "operator= ( ) ;\n"
                               "}";
 
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
@@ -5198,188 +5724,174 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName3() {
         // #2615
-        const char code[] = "void f() {"
-                            "static_cast<ScToken*>(xResult.operator->())->GetMatrix();"
-                            "}";
-        const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator-> ( ) ) . GetMatrix ( ) ; }";
+        const char code[] = "void f() {\n"
+                            "static_cast<ScToken*>(xResult.operator->())->GetMatrix();\n"
+                            "}\n";
+        const char result[] = "void f ( ) {\n"
+                              "static_cast < ScToken * > ( xResult . operator-> ( ) ) . GetMatrix ( ) ;\n"
+                              "}";
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName4() {
-        const char code[] = "void operator==() { }";
+        const char code[] = "void operator==() { }\n";
         const char result[] = "void operator== ( ) { }";
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName5() {
-        const char code1[] = "std::istream & operator >> (std::istream & s, Fred &f);";
+        const char code1[] = "std::istream & operator >> (std::istream & s, Fred &f);\n";
         const char result1[] = "std :: istream & operator>> ( std :: istream & s , Fred & f ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
 
-        const char code2[] = "std::ostream & operator << (std::ostream & s, const Fred &f);";
+        const char code2[] = "std::ostream & operator << (std::ostream & s, const Fred &f);\n";
         const char result2[] = "std :: ostream & operator<< ( std :: ostream & s , const Fred & f ) ;";
         ASSERT_EQUALS(result2, tokenizeAndStringify(code2));
     }
 
     void simplifyOperatorName6() { // ticket #3195
-        const char code1[] = "value_type * operator ++ (int);";
+        const char code1[] = "value_type * operator ++ (int);\n";
         const char result1[] = "value_type * operator++ ( int ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
 
-        const char code2[] = "value_type * operator -- (int);";
+        const char code2[] = "value_type * operator -- (int);\n";
         const char result2[] = "value_type * operator-- ( int ) ;";
         ASSERT_EQUALS(result2, tokenizeAndStringify(code2));
     }
 
     void simplifyOperatorName7() { // ticket #4619
-        const char code1[] = "value_type * operator += (int);";
+        const char code1[] = "value_type * operator += (int);\n";
         const char result1[] = "value_type * operator+= ( int ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
     }
 
     void simplifyOperatorName8() { // ticket #5706
-        const char code1[] = "value_type * operator += (int) noexcept ;";
+        const char code1[] = "value_type * operator += (int) noexcept ;\n";
         const char result1[] = "value_type * operator+= ( int ) noexcept ( true ) ;";
         ASSERT_EQUALS(result1, tokenizeAndStringify(code1));
 
-        const char code2[] = "value_type * operator += (int) noexcept ( true ) ;";
+        const char code2[] = "value_type * operator += (int) noexcept ( true ) ;\n";
         const char result2[] = "value_type * operator+= ( int ) noexcept ( true ) ;";
         ASSERT_EQUALS(result2, tokenizeAndStringify(code2));
 
-        const char code3[] = "value_type * operator += (int) throw ( ) ;";
+        const char code3[] = "value_type * operator += (int) throw ( ) ;\n";
         const char result3[] = "value_type * operator+= ( int ) throw ( ) ;";
         ASSERT_EQUALS(result3, tokenizeAndStringify(code3));
 
-        const char code4[] = "value_type * operator += (int) const noexcept ;";
+        const char code4[] = "value_type * operator += (int) const noexcept ;\n";
         const char result4[] = "value_type * operator+= ( int ) const noexcept ( true ) ;";
         ASSERT_EQUALS(result4, tokenizeAndStringify(code4));
 
-        const char code5[] = "value_type * operator += (int) const noexcept ( true ) ;";
+        const char code5[] = "value_type * operator += (int) const noexcept ( true ) ;\n";
         const char result5[] = "value_type * operator+= ( int ) const noexcept ( true ) ;";
         ASSERT_EQUALS(result5, tokenizeAndStringify(code5));
 
-        const char code6[] = "value_type * operator += (int) const throw ( ) ;";
+        const char code6[] = "value_type * operator += (int) const throw ( ) ;\n";
         const char result6[] = "value_type * operator+= ( int ) const throw ( ) ;";
         ASSERT_EQUALS(result6, tokenizeAndStringify(code6));
 
-        const char code7[] = "value_type * operator += (int) const noexcept ( false ) ;";
+        const char code7[] = "value_type * operator += (int) const noexcept ( false ) ;\n";
         const char result7[] = "value_type * operator+= ( int ) const noexcept ( false ) ;";
         ASSERT_EQUALS(result7, tokenizeAndStringify(code7));
 
     }
 
     void simplifyOperatorName9() { // Ticket #5709
-        const char code[] = "struct R { R operator, ( R b ) ; } ;";
-        ASSERT_EQUALS(code, tokenizeAndStringify(code));
-    }
-
-    void simplifyOperatorName31() { // #6342
-        const char code[] = "template <typename T>\n"
-                            "struct B {\n"
-                            "    typedef T A[3];\n"
-                            "    operator A& () { return x_; }\n"
-                            "    A x_;\n"
-                            "};";
-        ASSERT_EQUALS("template < typename T >\nstruct B {\n\nT ( & operatorT ( ) ) [ 3 ] { return x_ ; }\nT x_ [ 3 ] ;\n} ;", tokenizeAndStringify(code));
-        ASSERT_EQUALS("", errout_str());
-    }
-
-    void simplifyOperatorName32() { // #10256
-        const char code[] = "void f(int* = nullptr) {}\n";
-        ASSERT_EQUALS("void f ( int * = nullptr ) { }", tokenizeAndStringify(code));
-        ASSERT_EQUALS("", errout_str());
-    }
-
-    void simplifyOperatorName33() { // #10138
-        const char code[] = "int (operator\"\" _ii)(unsigned long long v) { return v; }\n";
-        ASSERT_EQUALS("int operator\"\"_ii ( unsigned long long v ) { return v ; }", tokenizeAndStringify(code));
-        ASSERT_EQUALS("", errout_str());
+        const char code[] = "struct R { R operator,(R b); };\n";
+        const char expected[] = "struct R { R operator, ( R b ) ; } ;";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName10() { // #8746
-        const char code1[] = "using a::operator=;";
+        const char code1[] = "using a::operator=;\n";
         ASSERT_EQUALS("using a :: operator= ;", tokenizeAndStringify(code1));
 
-        const char code2[] = "{ return &Fred::operator!=; }";
+        const char code2[] = "{ return &Fred::operator!=; }\n";
         ASSERT_EQUALS("{ return & Fred :: operator!= ; }", tokenizeAndStringify(code2));
     }
 
     void simplifyOperatorName11() { // #8889
-        const char code[] = "auto operator = (const Fred & other) -> Fred & ;";
+        const char code[] = "auto operator = (const Fred & other) -> Fred & ;\n";
         ASSERT_EQUALS("auto operator= ( const Fred & other ) . Fred & ;", tokenizeAndStringify(code));
         ASSERT_EQUALS("[test.cpp:1:1]: (debug) auto token with no type. [autoNoType]\n", errout_str());
 
-        const char code1[] = "auto operator = (const Fred & other) -> Fred & { }";
+        const char code1[] = "auto operator = (const Fred & other) -> Fred & { }\n";
         ASSERT_EQUALS("auto operator= ( const Fred & other ) . Fred & { }", tokenizeAndStringify(code1));
         ASSERT_EQUALS("[test.cpp:1:1]: (debug) auto token with no type. [autoNoType]\n", errout_str());
 
-        const char code2[] = "template <typename T> void g(S<&T::operator+ >) {}";
+        const char code2[] = "template <typename T> void g(S<&T::operator+ >) {}\n";
         ASSERT_EQUALS("template < typename T > void g ( S < & T :: operator+ > ) { }", tokenizeAndStringify(code2));
         ASSERT_EQUALS("", errout_str());
 
-        const char code3[] = "template <typename T> void g(S<&T::operator int>) {}";
+        const char code3[] = "template <typename T> void g(S<&T::operator int>) {}\n";
         ASSERT_EQUALS("template < typename T > void g ( S < & T :: operatorint > ) { }", tokenizeAndStringify(code3));
         ASSERT_EQUALS("", errout_str());
 
-        const char code4[] = "template <typename T> void g(S<&T::template operator- <double> >) {}";
+        const char code4[] = "template <typename T> void g(S<&T::template operator- <double> >) {}\n";
         ASSERT_EQUALS("template < typename T > void g ( S < & T :: operator- < double > > ) { }", tokenizeAndStringify(code4));
         ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyOperatorName12() { // #9110
-        const char code[] = "namespace a {"
-                            "template <typename b> void operator+(b);"
-                            "}"
-                            "using a::operator+;";
-        ASSERT_EQUALS("namespace a { "
-                      "template < typename b > void operator+ ( b ) ; "
-                      "} "
+        const char code[] = "namespace a {\n"
+                            "template <typename b> void operator+(b);\n"
+                            "}\n"
+                            "using a::operator+;\n";
+        ASSERT_EQUALS("namespace a {\n"
+                      "template < typename b > void operator+ ( b ) ;\n"
+                      "}\n"
                       "using a :: operator+ ;",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName13() { // user defined literal
-        const char code[] = "unsigned long operator\"\"_numch(const char *ch, unsigned long size);";
+        const char code[] = "unsigned long operator\"\"_numch(const char *ch, unsigned long size);\n";
         ASSERT_EQUALS("unsigned long operator\"\"_numch ( const char * ch , unsigned long size ) ;",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName14() { // std::complex operator "" if
         {
-            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num);";
+            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num);\n";
             ASSERT_EQUALS("constexpr std :: complex < float > operator\"\"if ( long double __num ) ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num) { }";
+            const char code[] = "constexpr std::complex<float> operator\"\"if(long double __num) { }\n";
             ASSERT_EQUALS("constexpr std :: complex < float > operator\"\"if ( long double __num ) { }",
                           tokenizeAndStringify(code));
         }
     }
 
     void simplifyOperatorName15() { // ticket #9468 syntaxError
-        const char code[] = "template <typename> struct a;"
-                            "template <typename> struct b {"
-                            "  typedef char c;"
-                            "  operator c();"
-                            "};"
-                            "template <> struct a<char> : b<char> { using b::operator char; };";
-        ASSERT_EQUALS("struct a<char> ; template < typename > struct a ; "
-                      "struct b<char> ; "
-                      "struct a<char> : b<char> { using b :: operatorchar ; } ; struct b<char> { "
-                      "operatorchar ( ) ; "
+        const char code[] = "template <typename> struct a;\n"
+                            "template <typename> struct b {\n"
+                            "  typedef char c;\n"
+                            "  operator c();\n"
+                            "};\n"
+                            "template <> struct a<char> : b<char> { using b::operator char; };\n";
+        ASSERT_EQUALS("struct a<char> ;\n"
+                      "template < typename > struct a ;\n"
+                      "struct b<char> ;\n"
+                      "\n"
+                      "\n"
+                      "\n"
+                      "struct a<char> : b<char> { using b :: operatorchar ; } ;\n"
+                      "struct b<char> {\n"
+                      "\n"
+                      "operatorchar ( ) ;\n"
                       "} ;",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName16() { // ticket #9472
         {
-            const char code[] = "class I : public A { iterator& operator++() override; };";
+            const char code[] = "class I : public A { iterator& operator++() override; };\n";
             ASSERT_EQUALS("class I : public A { iterator & operator++ ( ) override ; } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "class I : public A { iterator& operator++() override { } };";
+            const char code[] = "class I : public A { iterator& operator++() override { } };\n";
             ASSERT_EQUALS("class I : public A { iterator & operator++ ( ) override { } } ;",
                           tokenizeAndStringify(code));
         }
@@ -5387,32 +5899,32 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName17() {
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == d; }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == d; }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator> ( ) == d ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator> ( ) == ( d + 1 ) ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator<() == d; }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator<() == d; }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator< ( ) == d ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator>() == (d + 1); }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator> ( ) == ( d + 1 ) ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == d; }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == d; }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator++ ( ) == d ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == (d + 1); }";
+            const char code[] = "template <class a> void b(a c, a d) { c.operator++() == (d + 1); }\n";
             ASSERT_EQUALS("template < class a > void b ( a c , a d ) { c . operator++ ( ) == ( d + 1 ) ; }",
                           tokenizeAndStringify(code));
         }
@@ -5420,102 +5932,102 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName18() { // global namespace
         {
-            const char code[] = "struct Fred { operator std::string() const { return std::string(\"Fred\"); } };";
+            const char code[] = "struct Fred { operator std::string() const { return std::string(\"Fred\"); } };\n";
             ASSERT_EQUALS("struct Fred { operatorstd::string ( ) const { return std :: string ( \"Fred\" ) ; } } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "struct Fred { operator ::std::string() const { return ::std::string(\"Fred\"); } };";
+            const char code[] = "struct Fred { operator ::std::string() const { return ::std::string(\"Fred\"); } };\n";
             ASSERT_EQUALS("struct Fred { operator::std::string ( ) const { return :: std :: string ( \"Fred\" ) ; } } ;",
                           tokenizeAndStringify(code));
         }
     }
 
     void simplifyOperatorName19() {
-        const char code[] = "struct v {};"
-                            "enum E { e };"
-                            "struct s {"
-                            "  operator struct v() { return v(); };"
-                            "  operator enum E() { return e; }"
-                            "};"
-                            "void f() {"
-                            "  (void)&s::operator struct v;"
-                            "  (void)&s::operator enum E;"
-                            "}";
-        ASSERT_EQUALS("struct v { } ; "
-                      "enum E { e } ; "
-                      "struct s { "
-                      "operatorstructv ( ) { return v ( ) ; } ; "
-                      "operatorenumE ( ) { return e ; } "
-                      "} ; "
-                      "void f ( ) { "
-                      "( void ) & s :: operatorstructv ; "
-                      "( void ) & s :: operatorenumE ; "
+        const char code[] = "struct v {};\n"
+                            "enum E { e };\n"
+                            "struct s {\n"
+                            "  operator struct v() { return v(); };\n"
+                            "  operator enum E() { return e; }\n"
+                            "};\n"
+                            "void f() {\n"
+                            "  (void)&s::operator struct v;\n"
+                            "  (void)&s::operator enum E;\n"
+                            "}\n";
+        ASSERT_EQUALS("struct v { } ;\n"
+                      "enum E { e } ;\n"
+                      "struct s {\n"
+                      "operatorstructv ( ) { return v ( ) ; } ;\n"
+                      "operatorenumE ( ) { return e ; }\n"
+                      "} ;\n"
+                      "void f ( ) {\n"
+                      "( void ) & s :: operatorstructv ;\n"
+                      "( void ) & s :: operatorenumE ;\n"
                       "}",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName20() {
-        const char code[] = "void operator \"\" _a(const char *);"
-                            "namespace N {"
-                            "  using ::operator \"\" _a;"
-                            "  void operator \"\" _b(const char *);"
-                            "}";
-        ASSERT_EQUALS("void operator\"\"_a ( const char * ) ; "
-                      "namespace N { "
-                      "using :: operator\"\"_a ; "
-                      "void operator\"\"_b ( const char * ) ; "
+        const char code[] = "void operator \"\" _a(const char *);\n"
+                            "namespace N {\n"
+                            "  using ::operator \"\" _a;\n"
+                            "  void operator \"\" _b(const char *);\n"
+                            "}\n";
+        ASSERT_EQUALS("void operator\"\"_a ( const char * ) ;\n"
+                      "namespace N {\n"
+                      "using :: operator\"\"_a ;\n"
+                      "void operator\"\"_b ( const char * ) ;\n"
                       "}",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName21() {
-        const char code[] = "template<char...> void operator \"\" _h() {}"
-                            "template<> void operator \"\" _h<'a', 'b', 'c'>() {}"
-                            "template void operator \"\" _h<'a', 'b', 'c', 'd'>();";
-        ASSERT_EQUALS("void operator\"\"_h<'a','b','c'> ( ) ; "
-                      "void operator\"\"_h<'a','b','c','d'> ( ) ; "
-                      "void operator\"\"_h<'a','b','c'> ( ) { } "
+        const char code[] = "template<char...> void operator \"\" _h() {}\n"
+                            "template<> void operator \"\" _h<'a', 'b', 'c'>() {}\n"
+                            "template void operator \"\" _h<'a', 'b', 'c', 'd'>();\n";
+        ASSERT_EQUALS("void operator\"\"_h<'a','b','c'> ( ) ;\n"
+                      "void operator\"\"_h<'a','b','c','d'> ( ) ;\n"
+                      "void operator\"\"_h<'a','b','c'> ( ) { }\n"
                       "void operator\"\"_h<'a','b','c','d'> ( ) { }",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName22() {
-        const char code[] = "static RSLRelOp convertOperator(const Software::ComparisonOperator& op) {"
-                            "  if (op == &Software::operator==) return RSLEqual;"
-                            "return RSLNotEqual;"
-                            "}";
-        ASSERT_EQUALS("static RSLRelOp convertOperator ( const Software :: ComparisonOperator & op ) { "
-                      "if ( op == & Software :: operator== ) { return RSLEqual ; } "
-                      "return RSLNotEqual ; "
+        const char code[] = "static RSLRelOp convertOperator(const Software::ComparisonOperator& op) {\n"
+                            "  if (op == &Software::operator==) return RSLEqual;\n"
+                            "return RSLNotEqual;\n"
+                            "}\n";
+        ASSERT_EQUALS("static RSLRelOp convertOperator ( const Software :: ComparisonOperator & op ) {\n"
+                      "if ( op == & Software :: operator== ) { return RSLEqual ; }\n"
+                      "return RSLNotEqual ;\n"
                       "}",
                       tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:1:116]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable RSLEqual [valueFlowBailoutIncompleteVar]\n",
+            "[test.cpp:2:43]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable RSLEqual [valueFlowBailoutIncompleteVar]\n",
             filter_valueflow(errout_str()));
     }
 
     void simplifyOperatorName23() {
         {
-            const char code[] = "double *vtkMatrix3x3::operator[](const unsigned int i) {"
-                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator[], \"VTK 7.0\");"
-                                "  return &(this->Element[i][0]);"
-                                "}";
-            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator[] ( const unsigned int i ) { "
-                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator[] , \"VTK 7.0\" ) ; "
-                          "return & ( this . Element [ i ] [ 0 ] ) ; "
+            const char code[] = "double *vtkMatrix3x3::operator[](const unsigned int i) {\n"
+                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator[], \"VTK 7.0\");\n"
+                                "  return &(this->Element[i][0]);\n"
+                                "}\n";
+            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator[] ( const unsigned int i ) {\n"
+                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator[] , \"VTK 7.0\" ) ;\n"
+                          "return & ( this . Element [ i ] [ 0 ] ) ;\n"
                           "}",
                           tokenizeAndStringify(code));
             ignore_errout();
         }
         {
-            const char code[] = "double *vtkMatrix3x3::operator,(const unsigned int i) {"
-                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator,, \"VTK 7.0\");"
-                                "  return &(this->Element[i][0]);"
-                                "}";
-            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator, ( const unsigned int i ) { "
-                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator, , \"VTK 7.0\" ) ; "
-                          "return & ( this . Element [ i ] [ 0 ] ) ; "
+            const char code[] = "double *vtkMatrix3x3::operator,(const unsigned int i) {\n"
+                                "  VTK_LEGACY_BODY(vtkMatrix3x3::operator,, \"VTK 7.0\");\n"
+                                "  return &(this->Element[i][0]);\n"
+                                "}\n";
+            ASSERT_EQUALS("double * vtkMatrix3x3 :: operator, ( const unsigned int i ) {\n"
+                          "VTK_LEGACY_BODY ( vtkMatrix3x3 :: operator, , \"VTK 7.0\" ) ;\n"
+                          "return & ( this . Element [ i ] [ 0 ] ) ;\n"
                           "}",
                           tokenizeAndStringify(code));
             ignore_errout();
@@ -5524,35 +6036,37 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName24() {
         {
-            const char code[] = "void foo() { int i = a.operator++() ? a.operator--() : 0; }";
+            const char code[] = "void foo() { int i = a.operator++() ? a.operator--() : 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int i ; i = a . operator++ ( ) ? a . operator-- ( ) : 0 ; }",
                           tokenizeAndStringify(code));
         }
         {
-            const char code[] = "void foo() { int i = a.operator++(0) ? a.operator--(0) : 0; }";
+            const char code[] = "void foo() { int i = a.operator++(0) ? a.operator--(0) : 0; }\n";
             ASSERT_EQUALS("void foo ( ) { int i ; i = a . operator++ ( 0 ) ? a . operator-- ( 0 ) : 0 ; }",
                           tokenizeAndStringify(code));
         }
     }
 
     void simplifyOperatorName25() {
-        const char code[] = "bool negative(const Number &num) { return num.operator std::string()[0] == '-'; }";
+        const char code[] = "bool negative(const Number &num) { return num.operator std::string()[0] == '-'; }\n";
         ASSERT_EQUALS("bool negative ( const Number & num ) { return num . operatorstd::string ( ) [ 0 ] == '-' ; }",
                       tokenizeAndStringify(code));
     }
 
     void simplifyOperatorName26() {
-        const char code[] = "void foo() {"
-                            "    x = y.operator *().z[123];"
-                            "}";
-        ASSERT_EQUALS("void foo ( ) { x = y . operator* ( ) . z [ 123 ] ; }",
+        const char code[] = "void foo() {\n"
+                            "    x = y.operator *().z[123];\n"
+                            "}\n";
+        ASSERT_EQUALS("void foo ( ) {\n"
+                      "x = y . operator* ( ) . z [ 123 ] ;\n"
+                      "}",
                       tokenizeAndStringify(code));
         ignore_errout();
     }
 
     void simplifyOperatorName27() {
         const char code[] = "int operator \"\" i (const char *, int);\n"
-                            "x = \"abc\"i;";
+                            "x = \"abc\"i;\n";
         ASSERT_EQUALS("int operator\"\"i ( const char * , int ) ;\n"
                       "x = operator\"\"i ( \"abc\" , 3 ) ;",
                       tokenizeAndStringify(code));
@@ -5560,7 +6074,7 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName28() {
         const char code[] = "template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };\n"
-                            "int main() { }";
+                            "int main() { }\n";
         ASSERT_EQUALS("template < class ... Ts > struct overloaded : Ts ... { using Ts :: operator ( ) ... ; } ;\n"
                       "int main ( ) { }",
                       tokenizeAndStringify(code));
@@ -5569,7 +6083,44 @@ class TestTokenizer : public TestFixture {
 
     void simplifyOperatorName29() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        ASSERT_EQUALS("auto operator<=> ( ) ;", tokenizeAndStringify("auto operator<=>();", settings));
+        ASSERT_EQUALS("auto operator<=> ( ) ;", tokenizeAndStringify("auto operator<=>();\n", settings));
+    }
+
+    void simplifyOperatorName30() { // #14151
+        const char code[] = "struct S { int operator()() const { return 42; } };\n"
+                            "int f() {\n"
+                            "    S s;\n"
+                            "    return int{ s.operator()() };\n"
+                            "}\n";
+        ASSERT_EQUALS("struct S { int operator() ( ) const { return 42 ; } } ;\n"
+                      "int f ( ) {\n"
+                      "S s ;\n"
+                      "return int { s . operator() ( ) } ;\n"
+                      "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyOperatorName31() { // #6342
+        const char code[] = "template <typename T>\n"
+                            "struct B {\n"
+                            "    typedef T A[3];\n"
+                            "    operator A& () { return x_; }\n"
+                            "    A x_;\n"
+                            "};\n";
+        ASSERT_EQUALS("template < typename T >\nstruct B {\n\nT ( & operatorT ( ) ) [ 3 ] { return x_ ; }\nT x_ [ 3 ] ;\n} ;", tokenizeAndStringify(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyOperatorName32() { // #10256
+        const char code[] = "void f(int* = nullptr) {}\n";
+        ASSERT_EQUALS("void f ( int * = nullptr ) { }", tokenizeAndStringify(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyOperatorName33() { // #10138
+        const char code[] = "int (operator\"\" _ii)(unsigned long long v) { return v; }\n";
+        ASSERT_EQUALS("int operator\"\"_ii ( unsigned long long v ) { return v ; }", tokenizeAndStringify(code));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyOverloadedOperators1() {
@@ -5577,7 +6128,7 @@ class TestTokenizer : public TestFixture {
                             "\n"
                             "void foo(S x) {\n"
                             "    x(123);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("struct S { void operator() ( int ) ; } ;\n"
                       "\n"
                       "void foo ( S x ) {\n"
@@ -5605,7 +6156,7 @@ class TestTokenizer : public TestFixture {
                             "    Func max;\n"
                             "    double y = 0;\n"
                             "    foo(0, max(y));\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("struct Func { double operator() ( double x ) const ; } ;\n"
                       "void foo ( double , double ) ;\n"
                       "void test ( ) {\n"
@@ -5617,40 +6168,40 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyNullArray() {
-        ASSERT_EQUALS("* ( foo . bar [ 5 ] ) = x ;", tokenizeAndStringify("0[foo.bar[5]] = x;"));
+        ASSERT_EQUALS("* ( foo . bar [ 5 ] ) = x ;", tokenizeAndStringify("0[foo.bar[5]] = x;\n"));
     }
 
     void removeMacrosInGlobalScope() {
         // remove some unhandled macros in the global scope.
-        ASSERT_EQUALS("void f ( ) { }", tokenizeAndStringify("void f() NOTHROW { }"));
-        ASSERT_EQUALS("struct Foo { } ;", tokenizeAndStringify("struct __declspec(dllexport) Foo {};"));
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("ABA() namespace { int a ; }"), UNKNOWN_MACRO);
+        ASSERT_EQUALS("void f ( ) { }", tokenizeAndStringify("void f() NOTHROW { }\n"));
+        ASSERT_EQUALS("struct Foo { } ;", tokenizeAndStringify("struct __declspec(dllexport) Foo {};\n"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("ABA() namespace { int a ; }\n"), UNKNOWN_MACRO);
 
         // #3750
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("; AB(foo*) foo::foo() { }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("; AB(foo*) foo::foo() { }\n"), UNKNOWN_MACRO);
 
         // #4834 - syntax error
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("A(B) foo() {}"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("A(B) foo() {}\n"), UNKNOWN_MACRO);
 
         // #3855
         ASSERT_EQUALS("; class foo { }",
-                      tokenizeAndStringify("; AB class foo { }"));
+                      tokenizeAndStringify("; AB class foo { }\n"));
         ASSERT_EQUALS("; CONST struct ABC abc ;",
-                      tokenizeAndStringify("; CONST struct ABC abc ;"));
+                      tokenizeAndStringify("; CONST struct ABC abc ;\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("class A {\n"
                                              "  UNKNOWN_MACRO(A)\n" // <- this macro is ignored
                                              "private:\n"
                                              "  int x;\n"
-                                             "};"));
+                                             "};\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("MACRO(test) void test() { }"), UNKNOWN_MACRO); // #7931
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("MACRO(test) void test() { }\n"), UNKNOWN_MACRO); // #7931
 
         ASSERT_THROW_INTERNAL(tokenizeAndStringify("BEGIN_MESSAGE_MAP(CSetProgsAdvDlg, CResizableStandAloneDialog)\n"
                                                    "    ON_BN_CLICKED(IDC_ADDTOOL, OnBnClickedAddtool)\n"
                                                    "END_MESSAGE_MAP()\n"
                                                    "\n"
-                                                   "BOOL CSetProgsAdvDlg::OnInitDialog() {}"),
+                                                   "BOOL CSetProgsAdvDlg::OnInitDialog() {}\n"),
                               UNKNOWN_MACRO);
 
         ASSERT_EQUALS("struct S {\n"
@@ -5665,303 +6216,303 @@ class TestTokenizer : public TestFixture {
 
     void addSemicolonAfterUnknownMacro() {
         // #6975
-        ASSERT_EQUALS("void f ( ) { MACRO ( ) ; try { } }", tokenizeAndStringify("void f() { MACRO() try {} }"));
+        ASSERT_EQUALS("void f ( ) { MACRO ( ) ; try { } }", tokenizeAndStringify("void f() { MACRO() try {} }\n"));
         // #9376
-        ASSERT_EQUALS("MACRO ( ) ; using namespace foo ;", tokenizeAndStringify("MACRO() using namespace foo;"));
+        ASSERT_EQUALS("MACRO ( ) ; using namespace foo ;", tokenizeAndStringify("MACRO() using namespace foo;\n"));
     }
 
     void multipleAssignment() {
-        ASSERT_EQUALS("a = b = 0 ;", tokenizeAndStringify("a=b=0;"));
+        ASSERT_EQUALS("a = b = 0 ;", tokenizeAndStringify("a=b=0;\n"));
     }
 
     void platformWin() {
-        const char code[] = "BOOL f;"
-                            "BOOLEAN g;"
-                            "BYTE h;"
-                            "CHAR i;"
-                            "DWORD j;"
-                            "FLOAT k;"
-                            "INT l;"
-                            "INT32 m;"
-                            "INT64 n;"
-                            "LONG o;"
-                            "SHORT p;"
-                            "UCHAR q;"
-                            "UINT r;"
-                            "ULONG s;"
-                            "USHORT t;"
-                            "WORD u;"
-                            "VOID *v;"
-                            "LPBOOL w;"
-                            "PBOOL x;"
-                            "LPBYTE y;"
-                            "PBOOLEAN z;"
-                            "PBYTE A;"
-                            "LPCSTR B;"
-                            "PCSTR C;"
-                            "LPCVOID D;"
-                            "LPDWORD E;"
-                            "LPINT F;"
-                            "PINT G;"
-                            "LPLONG H;"
-                            "PLONG I;"
-                            "LPSTR J;"
-                            "PSTR K;"
-                            "PCHAR L;"
-                            "LPVOID M;"
-                            "PVOID N;"
-                            "BOOL _bool;"
-                            "HFILE hfile;"
-                            "LONG32 long32;"
-                            "LCID lcid;"
-                            "LCTYPE lctype;"
-                            "LGRPID lgrpid;"
-                            "LONG64 long64;"
-                            "PUCHAR puchar;"
-                            "LPCOLORREF lpcolorref;"
-                            "PDWORD pdword;"
-                            "PULONG pulong;"
-                            "SERVICE_STATUS_HANDLE service_status_hanlde;"
-                            "SC_LOCK sc_lock;"
-                            "SC_HANDLE sc_handle;"
-                            "HACCEL haccel;"
-                            "HCONV hconv;"
-                            "HCONVLIST hconvlist;"
-                            "HDDEDATA hddedata;"
-                            "HDESK hdesk;"
-                            "HDROP hdrop;"
-                            "HDWP hdwp;"
-                            "HENHMETAFILE henhmetafile;"
-                            "HHOOK hhook;"
-                            "HKL hkl;"
-                            "HMONITOR hmonitor;"
-                            "HSZ hsz;"
-                            "HWINSTA hwinsta;"
-                            "PWCHAR pwchar;"
-                            "PUSHORT pushort;"
-                            "LANGID langid;"
-                            "DWORD64 dword64;"
-                            "ULONG64 ulong64;"
-                            "LPWSTR lpcwstr;"
-                            "LPCWSTR lpcwstr;"
-                            "LPHANDLE lpHandle;"
-                            "PCWSTR pcwStr;"
-                            "PDWORDLONG pdWordLong;"
-                            "PDWORD_PTR pdWordPtr;"
-                            "PDWORD32 pdWord32;"
-                            "PDWORD64 pdWord64;"
-                            "LONGLONG ll;"
-                            "USN usn;"
-                            "PULONG64 puLong64;"
-                            "PULONG32 puLong32;"
-                            "PFLOAT ptrToFloat;";
-
-        const char expected[] = "int f ; "
-                                "unsigned char g ; "
-                                "unsigned char h ; "
-                                "char i ; "
-                                "unsigned long j ; "
-                                "float k ; "
-                                "int l ; "
-                                "int m ; "
-                                "long long n ; "
-                                "long o ; "
-                                "short p ; "
-                                "unsigned char q ; "
-                                "unsigned int r ; "
-                                "unsigned long s ; "
-                                "unsigned short t ; "
-                                "unsigned short u ; "
-                                "void * v ; "
-                                "int * w ; "
-                                "int * x ; "
-                                "unsigned char * y ; "
-                                "unsigned char * z ; "
-                                "unsigned char * A ; "
-                                "const char * B ; "
-                                "const char * C ; "
-                                "const void * D ; "
-                                "unsigned long * E ; "
-                                "int * F ; "
-                                "int * G ; "
-                                "long * H ; "
-                                "long * I ; "
-                                "char * J ; "
-                                "char * K ; "
-                                "char * L ; "
-                                "void * M ; "
-                                "void * N ; "
-                                "int _bool ; "
-                                "int hfile ; "
-                                "int long32 ; "
-                                "unsigned long lcid ; "
-                                "unsigned long lctype ; "
-                                "unsigned long lgrpid ; "
-                                "long long long64 ; "
-                                "unsigned char * puchar ; "
-                                "unsigned long * lpcolorref ; "
-                                "unsigned long * pdword ; "
-                                "unsigned long * pulong ; "
-                                "void * service_status_hanlde ; "
-                                "void * sc_lock ; "
-                                "void * sc_handle ; "
-                                "void * haccel ; "
-                                "void * hconv ; "
-                                "void * hconvlist ; "
-                                "void * hddedata ; "
-                                "void * hdesk ; "
-                                "void * hdrop ; "
-                                "void * hdwp ; "
-                                "void * henhmetafile ; "
-                                "void * hhook ; "
-                                "void * hkl ; "
-                                "void * hmonitor ; "
-                                "void * hsz ; "
-                                "void * hwinsta ; "
-                                "wchar_t * pwchar ; "
-                                "unsigned short * pushort ; "
-                                "unsigned short langid ; "
-                                "unsigned long long dword64 ; "
-                                "unsigned long long ulong64 ; "
-                                "wchar_t * lpcwstr ; "
-                                "const wchar_t * lpcwstr ; "
-                                "void * lpHandle ; "
-                                "const wchar_t * pcwStr ; "
-                                "long * pdWordLong ; "
-                                "long * pdWordPtr ; "
-                                "unsigned int * pdWord32 ; "
-                                "unsigned long * pdWord64 ; "
-                                "long long ll ; "
-                                "long long usn ; "
-                                "unsigned long long * puLong64 ; "
-                                "unsigned int * puLong32 ; "
+        const char code[] = "BOOL f;\n"
+                            "BOOLEAN g;\n"
+                            "BYTE h;\n"
+                            "CHAR i;\n"
+                            "DWORD j;\n"
+                            "FLOAT k;\n"
+                            "INT l;\n"
+                            "INT32 m;\n"
+                            "INT64 n;\n"
+                            "LONG o;\n"
+                            "SHORT p;\n"
+                            "UCHAR q;\n"
+                            "UINT r;\n"
+                            "ULONG s;\n"
+                            "USHORT t;\n"
+                            "WORD u;\n"
+                            "VOID *v;\n"
+                            "LPBOOL w;\n"
+                            "PBOOL x;\n"
+                            "LPBYTE y;\n"
+                            "PBOOLEAN z;\n"
+                            "PBYTE A;\n"
+                            "LPCSTR B;\n"
+                            "PCSTR C;\n"
+                            "LPCVOID D;\n"
+                            "LPDWORD E;\n"
+                            "LPINT F;\n"
+                            "PINT G;\n"
+                            "LPLONG H;\n"
+                            "PLONG I;\n"
+                            "LPSTR J;\n"
+                            "PSTR K;\n"
+                            "PCHAR L;\n"
+                            "LPVOID M;\n"
+                            "PVOID N;\n"
+                            "BOOL _bool;\n"
+                            "HFILE hfile;\n"
+                            "LONG32 long32;\n"
+                            "LCID lcid;\n"
+                            "LCTYPE lctype;\n"
+                            "LGRPID lgrpid;\n"
+                            "LONG64 long64;\n"
+                            "PUCHAR puchar;\n"
+                            "LPCOLORREF lpcolorref;\n"
+                            "PDWORD pdword;\n"
+                            "PULONG pulong;\n"
+                            "SERVICE_STATUS_HANDLE service_status_hanlde;\n"
+                            "SC_LOCK sc_lock;\n"
+                            "SC_HANDLE sc_handle;\n"
+                            "HACCEL haccel;\n"
+                            "HCONV hconv;\n"
+                            "HCONVLIST hconvlist;\n"
+                            "HDDEDATA hddedata;\n"
+                            "HDESK hdesk;\n"
+                            "HDROP hdrop;\n"
+                            "HDWP hdwp;\n"
+                            "HENHMETAFILE henhmetafile;\n"
+                            "HHOOK hhook;\n"
+                            "HKL hkl;\n"
+                            "HMONITOR hmonitor;\n"
+                            "HSZ hsz;\n"
+                            "HWINSTA hwinsta;\n"
+                            "PWCHAR pwchar;\n"
+                            "PUSHORT pushort;\n"
+                            "LANGID langid;\n"
+                            "DWORD64 dword64;\n"
+                            "ULONG64 ulong64;\n"
+                            "LPWSTR lpcwstr;\n"
+                            "LPCWSTR lpcwstr;\n"
+                            "LPHANDLE lpHandle;\n"
+                            "PCWSTR pcwStr;\n"
+                            "PDWORDLONG pdWordLong;\n"
+                            "PDWORD_PTR pdWordPtr;\n"
+                            "PDWORD32 pdWord32;\n"
+                            "PDWORD64 pdWord64;\n"
+                            "LONGLONG ll;\n"
+                            "USN usn;\n"
+                            "PULONG64 puLong64;\n"
+                            "PULONG32 puLong32;\n"
+                            "PFLOAT ptrToFloat;\n";
+
+        const char expected[] = "int f ;\n"
+                                "unsigned char g ;\n"
+                                "unsigned char h ;\n"
+                                "char i ;\n"
+                                "unsigned long j ;\n"
+                                "float k ;\n"
+                                "int l ;\n"
+                                "int m ;\n"
+                                "long long n ;\n"
+                                "long o ;\n"
+                                "short p ;\n"
+                                "unsigned char q ;\n"
+                                "unsigned int r ;\n"
+                                "unsigned long s ;\n"
+                                "unsigned short t ;\n"
+                                "unsigned short u ;\n"
+                                "void * v ;\n"
+                                "int * w ;\n"
+                                "int * x ;\n"
+                                "unsigned char * y ;\n"
+                                "unsigned char * z ;\n"
+                                "unsigned char * A ;\n"
+                                "const char * B ;\n"
+                                "const char * C ;\n"
+                                "const void * D ;\n"
+                                "unsigned long * E ;\n"
+                                "int * F ;\n"
+                                "int * G ;\n"
+                                "long * H ;\n"
+                                "long * I ;\n"
+                                "char * J ;\n"
+                                "char * K ;\n"
+                                "char * L ;\n"
+                                "void * M ;\n"
+                                "void * N ;\n"
+                                "int _bool ;\n"
+                                "int hfile ;\n"
+                                "int long32 ;\n"
+                                "unsigned long lcid ;\n"
+                                "unsigned long lctype ;\n"
+                                "unsigned long lgrpid ;\n"
+                                "long long long64 ;\n"
+                                "unsigned char * puchar ;\n"
+                                "unsigned long * lpcolorref ;\n"
+                                "unsigned long * pdword ;\n"
+                                "unsigned long * pulong ;\n"
+                                "void * service_status_hanlde ;\n"
+                                "void * sc_lock ;\n"
+                                "void * sc_handle ;\n"
+                                "void * haccel ;\n"
+                                "void * hconv ;\n"
+                                "void * hconvlist ;\n"
+                                "void * hddedata ;\n"
+                                "void * hdesk ;\n"
+                                "void * hdrop ;\n"
+                                "void * hdwp ;\n"
+                                "void * henhmetafile ;\n"
+                                "void * hhook ;\n"
+                                "void * hkl ;\n"
+                                "void * hmonitor ;\n"
+                                "void * hsz ;\n"
+                                "void * hwinsta ;\n"
+                                "wchar_t * pwchar ;\n"
+                                "unsigned short * pushort ;\n"
+                                "unsigned short langid ;\n"
+                                "unsigned long long dword64 ;\n"
+                                "unsigned long long ulong64 ;\n"
+                                "wchar_t * lpcwstr ;\n"
+                                "const wchar_t * lpcwstr ;\n"
+                                "void * lpHandle ;\n"
+                                "const wchar_t * pcwStr ;\n"
+                                "long * pdWordLong ;\n"
+                                "long * pdWordPtr ;\n"
+                                "unsigned int * pdWord32 ;\n"
+                                "unsigned long * pdWord64 ;\n"
+                                "long long ll ;\n"
+                                "long long usn ;\n"
+                                "unsigned long long * puLong64 ;\n"
+                                "unsigned int * puLong32 ;\n"
                                 "float * ptrToFloat ;";
 
         // These types should be defined the same on all Windows platforms
-        const std::string win32A = tokenizeAndStringifyWindows(code, true, Platform::Type::Win32A);
+        const std::string win32A = tokenizeAndStringify(code, settings_win32a);
         ASSERT_EQUALS(expected, win32A);
-        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, Platform::Type::Win32W));
-        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, Platform::Type::Win64));
+        ASSERT_EQUALS(win32A, tokenizeAndStringify(code, settings_win32w));
+        ASSERT_EQUALS(win32A, tokenizeAndStringify(code, settings_win32a));
     }
 
     void platformWin32A() {
-        const char code[] = "wchar_t wc;"
-                            "TCHAR c;"
-                            "PTSTR ptstr;"
-                            "LPTSTR lptstr;"
-                            "PCTSTR pctstr;"
-                            "LPCTSTR lpctstr;"
-                            "void foo() {"
-                            "    TCHAR tc = _T(\'c\'); "
-                            "    TCHAR src[10] = _T(\"123456789\");"
-                            "    TCHAR dst[10];"
-                            "    _tcscpy(dst, src);"
-                            "    dst[0] = 0;"
-                            "    _tcscat(dst, src);"
-                            "    LPTSTR d = _tcsdup(src);"
-                            "    _tprintf(_T(\"Hello world!\"));"
-                            "    _stprintf(dst, _T(\"Hello!\"));"
-                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));"
-                            "    _tscanf(_T(\"%s\"), dst);"
-                            "    _stscanf(dst, _T(\"%s\"), dst);"
-                            "}"
-                            "TBYTE tbyte;";
-        const char expected[] = "wchar_t wc ; "
-                                "char c ; "
-                                "char * ptstr ; "
-                                "char * lptstr ; "
-                                "const char * pctstr ; "
-                                "const char * lpctstr ; "
-                                "void foo ( ) { "
-                                "char tc ; tc = \'c\' ; "
-                                "char src [ 10 ] = \"123456789\" ; "
-                                "char dst [ 10 ] ; "
-                                "strcpy ( dst , src ) ; "
-                                "dst [ 0 ] = 0 ; "
-                                "strcat ( dst , src ) ; "
-                                "char * d ; d = strdup ( src ) ; "
-                                "printf ( \"Hello world!\" ) ; "
-                                "sprintf ( dst , \"Hello!\" ) ; "
-                                "_snprintf ( dst , sizeof ( dst ) / sizeof ( char ) , \"Hello world!\" ) ; "
-                                "scanf ( \"%s\" , dst ) ; "
-                                "sscanf ( dst , \"%s\" , dst ) ; "
-                                "} "
+        const char code[] = "wchar_t wc;\n"
+                            "TCHAR c;\n"
+                            "PTSTR ptstr;\n"
+                            "LPTSTR lptstr;\n"
+                            "PCTSTR pctstr;\n"
+                            "LPCTSTR lpctstr;\n"
+                            "void foo() {\n"
+                            "    TCHAR tc = _T(\'c\');\n"
+                            "    TCHAR src[10] = _T(\"123456789\");\n"
+                            "    TCHAR dst[10];\n"
+                            "    _tcscpy(dst, src);\n"
+                            "    dst[0] = 0;\n"
+                            "    _tcscat(dst, src);\n"
+                            "    LPTSTR d = _tcsdup(src);\n"
+                            "    _tprintf(_T(\"Hello world!\"));\n"
+                            "    _stprintf(dst, _T(\"Hello!\"));\n"
+                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));\n"
+                            "    _tscanf(_T(\"%s\"), dst);\n"
+                            "    _stscanf(dst, _T(\"%s\"), dst);\n"
+                            "}\n"
+                            "TBYTE tbyte;\n";
+        const char expected[] = "wchar_t wc ;\n"
+                                "char c ;\n"
+                                "char * ptstr ;\n"
+                                "char * lptstr ;\n"
+                                "const char * pctstr ;\n"
+                                "const char * lpctstr ;\n"
+                                "void foo ( ) {\n"
+                                "char tc ; tc = \'c\' ;\n"
+                                "char src [ 10 ] = \"123456789\" ;\n"
+                                "char dst [ 10 ] ;\n"
+                                "strcpy ( dst , src ) ;\n"
+                                "dst [ 0 ] = 0 ;\n"
+                                "strcat ( dst , src ) ;\n"
+                                "char * d ; d = strdup ( src ) ;\n"
+                                "printf ( \"Hello world!\" ) ;\n"
+                                "sprintf ( dst , \"Hello!\" ) ;\n"
+                                "_snprintf ( dst , sizeof ( dst ) / sizeof ( char ) , \"Hello world!\" ) ;\n"
+                                "scanf ( \"%s\" , dst ) ;\n"
+                                "sscanf ( dst , \"%s\" , dst ) ;\n"
+                                "}\n"
                                 "unsigned char tbyte ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32a));
 
         const char code2[] = "LPCTSTR f(void* p) { return LPCTSTR(p); }\n" // #11430
-                             "LPCTSTR g() { return LPCTSTR{}; }";
+                             "LPCTSTR g() { return LPCTSTR{}; }\n";
         const char expected2[] = "const char * f ( void * p ) { return ( const char * ) ( p ) ; }\n"
                                  "const char * g ( ) { return ( const char * ) ( 0 ) ; }";
-        ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, true, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings_win32a));
     }
 
     void platformWin32W() {
-        const char code[] = "wchar_t wc;"
-                            "TCHAR c;"
-                            "PTSTR ptstr;"
-                            "LPTSTR lptstr;"
-                            "PCTSTR pctstr;"
-                            "LPCTSTR lpctstr;"
-                            "TBYTE tbyte;"
-                            "void foo() {"
-                            "    TCHAR tc = _T(\'c\');"
-                            "    TCHAR src[10] = _T(\"123456789\");"
-                            "    TCHAR dst[10];"
-                            "    _tcscpy(dst, src);"
-                            "    dst[0] = 0;"
-                            "    _tcscat(dst, src);"
-                            "    LPTSTR d = _tcsdup(src);"
-                            "    _tprintf(_T(\"Hello world!\"));"
-                            "    _stprintf(dst, _T(\"Hello!\"));"
-                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));"
-                            "    _tscanf(_T(\"%s\"), dst);"
-                            "    _stscanf(dst, _T(\"%s\"), dst);"
-                            "}";
-        const char expected[] = "wchar_t wc ; "
-                                "wchar_t c ; "
-                                "wchar_t * ptstr ; "
-                                "wchar_t * lptstr ; "
-                                "const wchar_t * pctstr ; "
-                                "const wchar_t * lpctstr ; "
-                                "unsigned wchar_t tbyte ; "
-                                "void foo ( ) { "
-                                "wchar_t tc ; tc = L\'c\' ; "
-                                "wchar_t src [ 10 ] = L\"123456789\" ; "
-                                "wchar_t dst [ 10 ] ; "
-                                "wcscpy ( dst , src ) ; "
-                                "dst [ 0 ] = 0 ; "
-                                "wcscat ( dst , src ) ; "
-                                "wchar_t * d ; d = wcsdup ( src ) ; "
-                                "wprintf ( L\"Hello world!\" ) ; "
-                                "swprintf ( dst , L\"Hello!\" ) ; "
-                                "_snwprintf ( dst , sizeof ( dst ) / sizeof ( wchar_t ) , L\"Hello world!\" ) ; "
-                                "wscanf ( L\"%s\" , dst ) ; "
-                                "swscanf ( dst , L\"%s\" , dst ) ; "
+        const char code[] = "wchar_t wc;\n"
+                            "TCHAR c;\n"
+                            "PTSTR ptstr;\n"
+                            "LPTSTR lptstr;\n"
+                            "PCTSTR pctstr;\n"
+                            "LPCTSTR lpctstr;\n"
+                            "TBYTE tbyte;\n"
+                            "void foo() {\n"
+                            "    TCHAR tc = _T(\'c\');\n"
+                            "    TCHAR src[10] = _T(\"123456789\");\n"
+                            "    TCHAR dst[10];\n"
+                            "    _tcscpy(dst, src);\n"
+                            "    dst[0] = 0;\n"
+                            "    _tcscat(dst, src);\n"
+                            "    LPTSTR d = _tcsdup(src);\n"
+                            "    _tprintf(_T(\"Hello world!\"));\n"
+                            "    _stprintf(dst, _T(\"Hello!\"));\n"
+                            "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));\n"
+                            "    _tscanf(_T(\"%s\"), dst);\n"
+                            "    _stscanf(dst, _T(\"%s\"), dst);\n"
+                            "}\n";
+        const char expected[] = "wchar_t wc ;\n"
+                                "wchar_t c ;\n"
+                                "wchar_t * ptstr ;\n"
+                                "wchar_t * lptstr ;\n"
+                                "const wchar_t * pctstr ;\n"
+                                "const wchar_t * lpctstr ;\n"
+                                "unsigned wchar_t tbyte ;\n"
+                                "void foo ( ) {\n"
+                                "wchar_t tc ; tc = L\'c\' ;\n"
+                                "wchar_t src [ 10 ] = L\"123456789\" ;\n"
+                                "wchar_t dst [ 10 ] ;\n"
+                                "wcscpy ( dst , src ) ;\n"
+                                "dst [ 0 ] = 0 ;\n"
+                                "wcscat ( dst , src ) ;\n"
+                                "wchar_t * d ; d = wcsdup ( src ) ;\n"
+                                "wprintf ( L\"Hello world!\" ) ;\n"
+                                "swprintf ( dst , L\"Hello!\" ) ;\n"
+                                "_snwprintf ( dst , sizeof ( dst ) / sizeof ( wchar_t ) , L\"Hello world!\" ) ;\n"
+                                "wscanf ( L\"%s\" , dst ) ;\n"
+                                "swscanf ( dst , L\"%s\" , dst ) ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, Platform::Type::Win32W));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32w));
     }
 
     void platformWin32AStringCat() { //#5150
-        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
+        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");\n";
         const char expected[] = "char text [ 10 ] = \"123456789\" ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32a));
     }
 
     void platformWin32WStringCat() { //#5150
-        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
+        const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");\n";
         const char expected[] = "wchar_t text [ 10 ] = L\"123456789\" ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, Platform::Type::Win32W));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32w));
     }
 
     void platformWinWithNamespace() {
-        const char code1[] = "UINT32 a; ::UINT32 b; foo::UINT32 c;";
+        const char code1[] = "UINT32 a; ::UINT32 b; foo::UINT32 c;\n";
         const char expected1[] = "unsigned int a ; unsigned int b ; foo :: UINT32 c ;";
-        ASSERT_EQUALS(expected1, tokenizeAndStringifyWindows(code1, true, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected1, tokenizeAndStringify(code1, settings_win32a));
 
-        const char code2[] = "LPCVOID a; ::LPCVOID b; foo::LPCVOID c;";
+        const char code2[] = "LPCVOID a; ::LPCVOID b; foo::LPCVOID c;\n";
         const char expected2[] = "const void * a ; const void * b ; foo :: LPCVOID c ;";
-        ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, true, Platform::Type::Win32A));
+        ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings_win32w));
     }
 
     void isOneNumber() const {
@@ -5981,7 +6532,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void simplifyStaticConst() {
-        const char code1[]     = "class foo { public: bool const static c ; }";
+        const char code1[]     = "class foo { public: bool const static c ; }\n";
         const char expected1[] = "class foo { public: static const bool c ; }";
         ASSERT_EQUALS(expected1, tokenizeAndStringify(code1));
 
@@ -6008,7 +6559,7 @@ class TestTokenizer : public TestFixture {
             "int long long signed static const i18;\n"
             "return i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12\n"
             "+ i13 + i14 + i15 + i16 + i17 + i18;\n"
-            "}";
+            "}\n";
         const char expected2[] =
             "long long f ( )\n"
             "{\n"
@@ -6035,114 +6586,115 @@ class TestTokenizer : public TestFixture {
             "}";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
 
-        const char code3[] = "const unsigned long extern int i;";
+        const char code3[] = "const unsigned long extern int i;\n";
         const char expected3[] = "extern const unsigned long i ;";
         ASSERT_EQUALS(expected3, tokenizeAndStringify(code3));
     }
 
     void simplifyCPPAttribute() {
         ASSERT_EQUALS("int f ( ) ;",
-                      tokenizeAndStringify("[[deprecated]] int f();"));
+                      tokenizeAndStringify("[[deprecated]] int f();\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("[[deprecated]] int f();", true, Platform::Type::Native, false), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("[[deprecated]] int f();\n", dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
 
         ASSERT_EQUALS("template < class T > int f ( ) { }",
-                      tokenizeAndStringify("template <class T> [[noreturn]] int f(){}"));
+                      tokenizeAndStringify("template <class T> [[noreturn]] int f(){}\n"));
 
         ASSERT_EQUALS("int f ( int i ) ;",
-                      tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);"));
+                      tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[]] a;"));
+                      tokenizeAndStringify("struct [[]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[,]] a;"));
+                      tokenizeAndStringify("struct [[,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[,,]] a;"));
+                      tokenizeAndStringify("struct [[,,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,,]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,maybe_unused,]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,maybe_unused,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[,,,]] a;"));
+                      tokenizeAndStringify("struct [[,,,]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct alignas(int) a;"));
+                      tokenizeAndStringify("struct alignas(int) a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct alignas ( alignof ( float ) ) a;"));
+                      tokenizeAndStringify("struct alignas ( alignof ( float ) ) a;\n"));
 
         ASSERT_EQUALS("char a [ 256 ] ;",
-                      tokenizeAndStringify("alignas(256) char a[256];"));
+                      tokenizeAndStringify("alignas(256) char a[256];\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct alignas(float) [[deprecated(reason)]] a;"));
+                      tokenizeAndStringify("struct alignas(float) [[deprecated(reason)]] a;\n"));
 
         ASSERT_EQUALS("struct a ;",
-                      tokenizeAndStringify("struct [[deprecated,maybe_unused]] alignas(double) [[trivial_abi]] a;"));
+                      tokenizeAndStringify("struct [[deprecated,maybe_unused]] alignas(double) [[trivial_abi]] a;\n"));
 
         ASSERT_EQUALS("void func5 ( const char * , ... ) ;",
-                      tokenizeAndStringify("[[noreturn]] void func5(const char*, ...);"));
+                      tokenizeAndStringify("[[noreturn]] void func5(const char*, ...);\n"));
 
         ASSERT_EQUALS("void func5 ( const char * , ... ) ;",
-                      tokenizeAndStringify("[[noreturn]] [[gnu::format(printf, 1, 2)]] void func5(const char*, ...);"));
+                      tokenizeAndStringify("[[noreturn]] [[gnu::format(printf, 1, 2)]] void func5(const char*, ...);\n"));
 
         ASSERT_EQUALS("void func5 ( const char * , ... ) ;",
-                      tokenizeAndStringify("[[gnu::format(printf, 1, 2)]] [[noreturn]] void func5(const char*, ...);"));
+                      tokenizeAndStringify("[[gnu::format(printf, 1, 2)]] [[noreturn]] void func5(const char*, ...);\n"));
 
         ASSERT_EQUALS("int func1 ( ) ;",
-                      tokenizeAndStringify("[[nodiscard]] int func1();"));
+                      tokenizeAndStringify("[[nodiscard]] int func1();\n"));
 
         ASSERT_EQUALS("int func1 ( ) ;",
-                      tokenizeAndStringify("[[nodiscard]] [[clang::optnone]] int func1();"));
+                      tokenizeAndStringify("[[nodiscard]] [[clang::optnone]] int func1();\n"));
 
         ASSERT_EQUALS("int func1 ( ) ;",
-                      tokenizeAndStringify("[[clang::optnone]] [[nodiscard]] int func1();"));
+                      tokenizeAndStringify("[[clang::optnone]] [[nodiscard]] int func1();\n"));
 
+        const Settings s = settingsBuilder(settings1).c(Standards::C23).build();
         ASSERT_EQUALS("void f ( int i ) { exit ( i ) ; }",
-                      tokenizeAndStringify("[[noreturn]] void f(int i) { exit(i); }", /*expand*/ true, Platform::Type::Native, /*cpp*/ false, Standards::CPP11, Standards::C23));
+                      tokenizeAndStringify("[[noreturn]] void f(int i) { exit(i); }\n", s, false));
     }
 
     void simplifyCaseRange() {
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 1 : case 2 : case 3 : case 4 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 4: } }"));
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 4 ... 1 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 4 ... 1: } }"));
-        (void)tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 1000000: } }"); // Do not run out of memory
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 1 : case 2 : case 3 : case 4 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 4: } }\n"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 4 ... 1 : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 4 ... 1: } }\n"));
+        (void)tokenizeAndStringify("void f(int x) { switch(x) { case 1 ... 1000000: } }\n"); // Do not run out of memory
 
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'a' : case 98 : case 'c' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'a' ... 'c': } }"));
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'c' ... 'a' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'c' ... 'a': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'a' : case 98 : case 'c' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'a' ... 'c': } }\n"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case 'c' ... 'a' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case 'c' ... 'a': } }\n"));
 
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '[' : case 92 : case ']' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '[' ... ']': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '[' : case 92 : case ']' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '[' ... ']': } }\n"));
 
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '&' : case 39 : case '(' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '&' ... '(': } }"));
-        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '\\x61' : case 98 : case '\\x63' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '\\x61' ... '\\x63': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '&' : case 39 : case '(' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '&' ... '(': } }\n"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '\\x61' : case 98 : case '\\x63' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '\\x61' ... '\\x63': } }\n"));
     }
 
     void simplifyEmptyNamespaces() {
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { }"));
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { }"));
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace { } }"));
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { namespace { } }")); // Ticket #9512
-        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace bar { } }"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { }\n"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { }\n"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace { } }\n"));
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace { namespace { } }\n")); // Ticket #9512
+        ASSERT_EQUALS(";", tokenizeAndStringify("namespace foo { namespace bar { } }\n"));
     }
 
     void prepareTernaryOpForAST() {
-        ASSERT_EQUALS("a ? b : c ;", tokenizeAndStringify("a ? b : c;"));
+        ASSERT_EQUALS("a ? b : c ;", tokenizeAndStringify("a ? b : c;\n"));
 
-        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? b , c : d;"));
-        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? (b , c) : d;"));
+        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? b , c : d;\n"));
+        ASSERT_EQUALS("a ? ( b , c ) : d ;", tokenizeAndStringify("a ? (b , c) : d;\n"));
 
-        ASSERT_EQUALS("a ? ( 1 ? ( a , b ) : 3 ) : d ;", tokenizeAndStringify("a ? 1 ? a, b : 3 : d;"));
+        ASSERT_EQUALS("a ? ( 1 ? ( a , b ) : 3 ) : d ;", tokenizeAndStringify("a ? 1 ? a, b : 3 : d;\n"));
 
-        ASSERT_EQUALS("a ? ( std :: map < int , int > ( ) ) : 0 ;", tokenizeAndStringify("typedef std::map<int,int> mymap; a ? mymap() : 0;"));
+        ASSERT_EQUALS("a ? ( std :: map < int , int > ( ) ) : 0 ;", tokenizeAndStringify("typedef std::map<int,int> mymap; a ? mymap() : 0;\n"));
 
-        ASSERT_EQUALS("a ? ( b < c ) : d > e", tokenizeAndStringify("a ? b < c : d > e"));
+        ASSERT_EQUALS("a ? ( b < c ) : d > e", tokenizeAndStringify("a ? b < c : d > e\n"));
     }
 
     enum class AstStyle : std :: uint8_t {
@@ -6150,33 +6702,43 @@ class TestTokenizer : public TestFixture {
         Z3
     };
 
-    std::string testAst(const char code[], AstStyle style = AstStyle::Simple) {
+    enum class ListSimplification : std::uint8_t {
+        Partial,
+        Full
+    };
+
+    template<size_t size>
+    std::string testAst(const char (&data)[size], AstStyle style = AstStyle::Simple, ListSimplification ls = ListSimplification::Partial) {
         // tokenize given code..
-        TokenList tokenlist{settings0, Standards::Language::CPP};
-        std::istringstream istr(code);
+        TokenList tokenlist{settingsDefault, Standards::Language::CPP};
         tokenlist.appendFileIfNew("test.cpp");
-        if (!tokenlist.createTokens(istr))
+        if (!tokenlist.createTokensFromString(data))
             return "ERROR";
 
-        Tokenizer tokenizer(std::move(tokenlist), *this);
-        tokenizer.combineStringAndCharLiterals();
-        tokenizer.combineOperators();
-        tokenizer.simplifySpaceshipOperator();
-        tokenizer.createLinks();
-        tokenizer.createLinks2();
-        tokenizer.list.front()->assignIndexes();
-
-        // set varid..
-        for (Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
-            if (tok->str() == "var")
-                tok->varId(1);
-        }
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        if (ls == ListSimplification::Partial) {
+            tokenizer.combineStringAndCharLiterals();
+            tokenizer.combineOperators();
+            tokenizer.simplifySpaceshipOperator();
+            tokenizer.createLinks();
+            tokenizer.createLinks2();
+            tokenizer.simplifyCAlternativeTokens();
+            tokenizer.list.front()->assignIndexes();
+
+            // set varid..
+            for (Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
+                if (tok->str() == "var")
+                    tok->varId(1);
+            }
 
-        // Create AST..
-        tokenizer.prepareTernaryOpForAST();
-        tokenizer.list.createAst();
+            // Create AST..
+            tokenizer.prepareTernaryOpForAST();
+            tokenizer.list.createAst();
 
-        tokenizer.list.validateAst(false);
+            tokenizer.list.validateAst(false);
+        } else { // Full
+            tokenizer.simplifyTokens1("");
+        }
 
         // Basic AST validation
         for (const Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
@@ -6202,134 +6764,135 @@ class TestTokenizer : public TestFixture {
     }
 
     void astexpr() { // simple expressions with arithmetical ops
-        ASSERT_EQUALS("12+3+", testAst("1+2+3"));
-        ASSERT_EQUALS("12*3+", testAst("1*2+3"));
-        ASSERT_EQUALS("123*+", testAst("1+2*3"));
-        ASSERT_EQUALS("12*34*+", testAst("1*2+3*4"));
-        ASSERT_EQUALS("12*34*5*+", testAst("1*2+3*4*5"));
-        ASSERT_EQUALS("0(r.&", testAst("(&((typeof(x))0).r);"));
-        ASSERT_EQUALS("0(r.&", testAst("&((typeof(x))0).r;"));
-        ASSERT_EQUALS("0f1(||", testAst("; 0 || f(1);"));
+        ASSERT_EQUALS("12+3+", testAst("1+2+3\n"));
+        ASSERT_EQUALS("12*3+", testAst("1*2+3\n"));
+        ASSERT_EQUALS("123*+", testAst("1+2*3\n"));
+        ASSERT_EQUALS("12*34*+", testAst("1*2+3*4\n"));
+        ASSERT_EQUALS("12*34*5*+", testAst("1*2+3*4*5\n"));
+        ASSERT_EQUALS("0(r.&", testAst("(&((typeof(x))0).r);\n"));
+        ASSERT_EQUALS("0(r.&", testAst("&((typeof(x))0).r;\n"));
+        ASSERT_EQUALS("0f1(||", testAst("; 0 || f(1);\n"));
 
         // Various tests of precedence
-        ASSERT_EQUALS("ab::c+", testAst("a::b+c"));
-        ASSERT_EQUALS("abc+=", testAst("a=b+c"));
-        ASSERT_EQUALS("abc=,", testAst("a,b=c"));
-        ASSERT_EQUALS("a-1+", testAst("-a+1"));
-        ASSERT_EQUALS("ab++-c-", testAst("a-b++-c"));
-        ASSERT_EQUALS("ab<=>", testAst("a<=>b"));
+        ASSERT_EQUALS("ab::c+", testAst("a::b+c\n"));
+        ASSERT_EQUALS("abc+=", testAst("a=b+c\n"));
+        ASSERT_EQUALS("abc=,", testAst("a,b=c\n"));
+        ASSERT_EQUALS("a-1+", testAst("-a+1\n"));
+        ASSERT_EQUALS("ab++-c-", testAst("a-b++-c\n"));
+        ASSERT_EQUALS("ab<=>", testAst("a<=>b\n"));
 
         // sizeof
-        ASSERT_EQUALS("ab.sizeof", testAst("sizeof a.b"));
+        ASSERT_EQUALS("ab.sizeof", testAst("sizeof a.b\n"));
 
         // assignment operators
-        ASSERT_EQUALS("ab>>=", testAst("a>>=b;"));
-        ASSERT_EQUALS("ab<<=", testAst("a<<=b;"));
-        ASSERT_EQUALS("ab+=",  testAst("a+=b;"));
-        ASSERT_EQUALS("ab-=",  testAst("a-=b;"));
-        ASSERT_EQUALS("ab*=",  testAst("a*=b;"));
-        ASSERT_EQUALS("ab/=",  testAst("a/=b;"));
-        ASSERT_EQUALS("ab%=",  testAst("a%=b;"));
-        ASSERT_EQUALS("ab&=",  testAst("a&=b;"));
-        ASSERT_EQUALS("ab|=",  testAst("a|=b;"));
-        ASSERT_EQUALS("ab^=",  testAst("a^=b;"));
-
-        ASSERT_EQUALS("ab*c*.(+return", testAst("return a + ((*b).*c)();"));
+        ASSERT_EQUALS("ab>>=", testAst("a>>=b;\n"));
+        ASSERT_EQUALS("ab<<=", testAst("a<<=b;\n"));
+        ASSERT_EQUALS("ab+=",  testAst("a+=b;\n"));
+        ASSERT_EQUALS("ab-=",  testAst("a-=b;\n"));
+        ASSERT_EQUALS("ab*=",  testAst("a*=b;\n"));
+        ASSERT_EQUALS("ab/=",  testAst("a/=b;\n"));
+        ASSERT_EQUALS("ab%=",  testAst("a%=b;\n"));
+        ASSERT_EQUALS("ab&=",  testAst("a&=b;\n"));
+        ASSERT_EQUALS("ab|=",  testAst("a|=b;\n"));
+        ASSERT_EQUALS("ab^=",  testAst("a^=b;\n"));
+
+        ASSERT_EQUALS("ab*c*.(+return", testAst("return a + ((*b).*c)();\n"));
 
         // assignments are executed from right to left
-        ASSERT_EQUALS("abc==", testAst("a=b=c;"));
+        ASSERT_EQUALS("abc==", testAst("a=b=c;\n"));
 
         // ternary operator
-        ASSERT_EQUALS("ab0=c1=:?", testAst("a?b=0:c=1;"));
-        ASSERT_EQUALS("fabc,d:?=e,", testAst("f = a ? b, c : d, e;"));
-        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? (b, c) : (d, e));"));
-        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? b, c : (d, e));"));
-        ASSERT_EQUALS("ab35,4:?foo(:?return", testAst("return (a ? b ? (3,5) : 4 : foo());"));
-        ASSERT_EQUALS("check(result_type00,{invalid:?return", testAst("return check() ? result_type {0, 0} : invalid;"));
-        ASSERT_EQUALS("x01:?return", testAst("return x ? 0 : 1;"));
-        ASSERT_EQUALS("x00throw:?return", testAst("return x ? 0 : throw 0;")); // #9768
-        ASSERT_EQUALS("val0<1throwval:?return", testAst("return val < 0 ? throw 1 : val;")); // #8526
-        ASSERT_EQUALS("ix0<00throw:?=", testAst("int i = x < 0 ? 0 : throw 0;"));
-        ASSERT_EQUALS("pa[pb[<1-pa[pb[>:?return", testAst("return p[a] < p[b] ? -1 : p[a] > p[b];"));
-
-        ASSERT_EQUALS("a\"\"=", testAst("a=\"\""));
-        ASSERT_EQUALS("a\'\'=", testAst("a=\'\'"));
-        ASSERT_EQUALS("'X''a'>", testAst("('X' > 'a')"));
-        ASSERT_EQUALS("L'X'L'a'>", testAst("(L'X' > L'a')"));
-        ASSERT_EQUALS("u'X'u'a'>", testAst("(u'X' > u'a')"));
-        ASSERT_EQUALS("U'X'U'a'>", testAst("(U'X' > U'a')"));
-        ASSERT_EQUALS("u8'X'u8'a'>", testAst("(u8'X' > u8'a')"));
-
-        ASSERT_EQUALS("a0>bc/d:?", testAst("(a>0) ? (b/(c)) : d;"));
-        ASSERT_EQUALS("abc/+d+", testAst("a + (b/(c)) + d;"));
-        ASSERT_EQUALS("x1024x/0:?", testAst("void f() { x ? 1024 / x : 0; }"));
-
-        ASSERT_EQUALS("absizeofd(ef.+(=", testAst("a = b(sizeof(c d) + e.f)"));
-
-        ASSERT_EQUALS("a*b***", testAst("*a * **b;")); // Correctly distinguish between unary and binary operator*
+        ASSERT_EQUALS("ab0=c1=:?", testAst("a?b=0:c=1;\n"));
+        ASSERT_EQUALS("fabc,d:?=e,", testAst("f = a ? b, c : d, e;\n"));
+        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? (b, c) : (d, e));\n"));
+        ASSERT_EQUALS("fabc,de,:?=", testAst("f = (a ? b, c : (d, e));\n"));
+        ASSERT_EQUALS("ab35,4:?foo(:?return", testAst("return (a ? b ? (3,5) : 4 : foo());\n"));
+        ASSERT_EQUALS("check(result_type00,{invalid:?return", testAst("return check() ? result_type {0, 0} : invalid;\n"));
+        ASSERT_EQUALS("x01:?return", testAst("return x ? 0 : 1;\n"));
+        ASSERT_EQUALS("x00throw:?return", testAst("return x ? 0 : throw 0;\n")); // #9768
+        ASSERT_EQUALS("val0<1throwval:?return", testAst("return val < 0 ? throw 1 : val;\n")); // #8526
+        ASSERT_EQUALS("ix0<00throw:?=", testAst("int i = x < 0 ? 0 : throw 0;\n"));
+        ASSERT_EQUALS("pa[pb[<1-pa[pb[>:?return", testAst("return p[a] < p[b] ? -1 : p[a] > p[b];\n"));
+
+        ASSERT_EQUALS("a\"\"=", testAst("a=\"\"\n"));
+        ASSERT_EQUALS("a\'\'=", testAst("a=\'\'\n"));
+        ASSERT_EQUALS("'X''a'>", testAst("('X' > 'a')\n"));
+        ASSERT_EQUALS("L'X'L'a'>", testAst("(L'X' > L'a')\n"));
+        ASSERT_EQUALS("u'X'u'a'>", testAst("(u'X' > u'a')\n"));
+        ASSERT_EQUALS("U'X'U'a'>", testAst("(U'X' > U'a')\n"));
+        ASSERT_EQUALS("u8'X'u8'a'>", testAst("(u8'X' > u8'a')\n"));
+
+        ASSERT_EQUALS("a0>bc/d:?", testAst("(a>0) ? (b/(c)) : d;\n"));
+        ASSERT_EQUALS("abc/+d+", testAst("a + (b/(c)) + d;\n"));
+        ASSERT_EQUALS("x1024x/0:?", testAst("void f() { x ? 1024 / x : 0; }\n"));
+
+        ASSERT_EQUALS("absizeofd(ef.+(=", testAst("a = b(sizeof(c d) + e.f)\n"));
+
+        ASSERT_EQUALS("a*b***", testAst("*a * **b;\n")); // Correctly distinguish between unary and binary operator*
 
         // strings
-        ASSERT_EQUALS("f\"A\"1,(",testAst("f(\"A\" B, 1);"));
-        ASSERT_EQUALS("fA1,(",testAst("f(A \"B\", 1);"));
+        ASSERT_EQUALS("f\"A\"1,(",testAst("f(\"A\" B, 1);\n"));
+        ASSERT_EQUALS("fA1,(",testAst("f(A \"B\", 1);\n"));
 
         // C++ : type()
-        ASSERT_EQUALS("fint(0,(", testAst("f(int(),0);"));
-        ASSERT_EQUALS("f(0,(", testAst("f(int *(),0);"));  // typedef int* X; f(X(),0);
-        ASSERT_EQUALS("f((0,(", testAst("f((intp)int *(),0);"));
-        ASSERT_EQUALS("zx1(&y2(&|=", testAst("z = (x & (unsigned)1) | (y & (unsigned)2);")); // not type()
+        ASSERT_EQUALS("fint(0,(", testAst("f(int(),0);\n"));
+        ASSERT_EQUALS("f(0,(", testAst("f(int *(),0);\n"));  // typedef int* X; f(X(),0);
+        ASSERT_EQUALS("f((0,(", testAst("f((intp)int *(),0);\n"));
+        ASSERT_EQUALS("zx1(&y2(&|=", testAst("z = (x & (unsigned)1) | (y & (unsigned)2);\n")); // not type()
 
         // for
-        ASSERT_EQUALS("for;;(", testAst("for(;;)"));
-        ASSERT_EQUALS("fora0=a8<a++;;(", testAst("for(a=0;a<8;a++)"));
-        ASSERT_EQUALS("fori1=current0=,iNUM<=i++;;(", testAst("for(i = (1), current = 0; i <= (NUM); ++i)"));
-        ASSERT_EQUALS("foreachxy,((", testAst("for(each(x,y)){}"));  // it's not well-defined what this ast should be
-        ASSERT_EQUALS("forvar1(;;(", testAst("for(int var(1);;)"));
-        ASSERT_EQUALS("forab:(", testAst("for (int a : b);"));
-        ASSERT_EQUALS("forvarb:(", testAst("for (int *var : b);"));
-        ASSERT_EQUALS("forvard:(", testAst("for (a<b> var : d);"));
-        ASSERT_EQUALS("forvare:(", testAst("for (a::b<c> var : e);"));
-        ASSERT_EQUALS("forx*0=yz;;(", testAst("for(*x=0;y;z)"));
-        ASSERT_EQUALS("forx0=y(8<z;;(", testAst("for (x=0;(int)y<8;z);"));
-        ASSERT_EQUALS("forab,c:(", testAst("for (auto [a,b]: c);"));
-        ASSERT_EQUALS("fora*++;;(", testAst("for (++(*a);;);"));
-        ASSERT_EQUALS("foryz:(", testAst("for (decltype(x) *y : z);"));
-        ASSERT_EQUALS("for(tmpNULL!=tmptmpnext.=;;( tmpa=", testAst("for ( ({ tmp = a; }) ; tmp != NULL; tmp = tmp->next ) {}"));
-        ASSERT_EQUALS("forx0=x;;(", testAst("for (int x=0; x;);"));
-        ASSERT_EQUALS("forae*bc.({:(", testAst("for (a *e : {b->c()});"));
-        ASSERT_EQUALS("fori0=iasize.(<i++;;( asize.(", testAst("for (decltype(a.size()) i = 0; i < a.size(); ++i);"));
-        ASSERT_EQUALS("foria:( asize.(", testAst("for(decltype(a.size()) i:a);"));
-        ASSERT_EQUALS("forec0{([,(:( fb.return", testAst("for (auto e : c(0, [](auto f) { return f->b; }));")); // #10802
-        ASSERT_EQUALS("forvar1{;;(", testAst("for(int var{1};;)")); // #12867
+        ASSERT_EQUALS("for;;(", testAst("for(;;)\n"));
+        ASSERT_EQUALS("fora0=a8<a++;;(", testAst("for(a=0;a<8;a++)\n"));
+        ASSERT_EQUALS("fori1=current0=,iNUM<=i++;;(", testAst("for(i = (1), current = 0; i <= (NUM); ++i)\n"));
+        ASSERT_EQUALS("foreachxy,((", testAst("for(each(x,y)){}\n"));  // it's not well-defined what this ast should be
+        ASSERT_EQUALS("forvar1(;;(", testAst("for(int var(1);;)\n"));
+        ASSERT_EQUALS("forab:(", testAst("for (int a : b);\n"));
+        ASSERT_EQUALS("forvarb:(", testAst("for (int *var : b);\n"));
+        ASSERT_EQUALS("forvard:(", testAst("for (a<b> var : d);\n"));
+        ASSERT_EQUALS("forvare:(", testAst("for (a::b<c> var : e);\n"));
+        ASSERT_EQUALS("forx*0=yz;;(", testAst("for(*x=0;y;z)\n"));
+        ASSERT_EQUALS("forx0=y(8<z;;(", testAst("for (x=0;(int)y<8;z);\n"));
+        ASSERT_EQUALS("forab,c:(", testAst("for (auto [a,b]: c);\n"));
+        ASSERT_EQUALS("fora*++;;(", testAst("for (++(*a);;);\n"));
+        ASSERT_EQUALS("foryz:(", testAst("for (decltype(x) *y : z);\n"));
+        ASSERT_EQUALS("for(tmpNULL!=tmptmpnext.=;;( tmpa=", testAst("for ( ({ tmp = a; }) ; tmp != NULL; tmp = tmp->next ) {}\n"));
+        ASSERT_EQUALS("forx0=x;;(", testAst("for (int x=0; x;);\n"));
+        ASSERT_EQUALS("forae*bc.({:(", testAst("for (a *e : {b->c()});\n"));
+        ASSERT_EQUALS("fori0=iasize.(<i++;;( asize.(", testAst("for (decltype(a.size()) i = 0; i < a.size(); ++i);\n"));
+        ASSERT_EQUALS("foria:( asize.(", testAst("for(decltype(a.size()) i:a);\n"));
+        ASSERT_EQUALS("forec0{([,(:( fb.return", testAst("for (auto e : c(0, [](auto f) { return f->b; }));\n")); // #10802
+        ASSERT_EQUALS("forvar1{;;(", testAst("for(int var{1};;)\n")); // #12867
+        ASSERT_EQUALS("forxg{([(:( si.return", testAst("for (auto [x] : g([](S s) { return s.i; })) {}\n")); // #11861
 
         // for with initializer (c++20)
-        ASSERT_EQUALS("forab=ca:;(", testAst("for(a=b;int c:a)"));
+        ASSERT_EQUALS("forab=ca:;(", testAst("for(a=b;int c:a)\n"));
 
         // problems with multiple expressions
-        ASSERT_EQUALS("ax( whilex(", testAst("a(x) while (x)"));
-        ASSERT_EQUALS("ifx( i0= whilei(", testAst("if (x) { ({ int i = 0; while(i); }) };"));
-        ASSERT_EQUALS("ifx( BUG_ON{!( i0= whilei(", testAst("if (x) { BUG_ON(!({int i=0; while(i);})); }"));
-        ASSERT_EQUALS("v0= while{0!=( v0= while{0!=( v0=", testAst("({ v = 0; }); while (({ v = 0; }) != 0); while (({ v = 0; }) != 0);"));
+        ASSERT_EQUALS("ax( whilex(", testAst("a(x) while (x)\n"));
+        ASSERT_EQUALS("ifx( i0= whilei(", testAst("if (x) { ({ int i = 0; while(i); }) };\n"));
+        ASSERT_EQUALS("ifx( BUG_ON{!( i0= whilei(", testAst("if (x) { BUG_ON(!({int i=0; while(i);})); }\n"));
+        ASSERT_EQUALS("v0= while{0!=( v0= while{0!=( v0=", testAst("({ v = 0; }); while (({ v = 0; }) != 0); while (({ v = 0; }) != 0);\n"));
 
 
-        ASSERT_EQUALS("abc.1:?1+bd.1:?+=", testAst("a =(b.c ? : 1) + 1 + (b.d ? : 1);"));
+        ASSERT_EQUALS("abc.1:?1+bd.1:?+=", testAst("a =(b.c ? : 1) + 1 + (b.d ? : 1);\n"));
 
-        ASSERT_EQUALS("catch...(", testAst("try {} catch (...) {}"));
+        ASSERT_EQUALS("catch...(", testAst("try {} catch (...) {}\n"));
 
-        ASSERT_EQUALS("", testAst("void Foo(Bar&);"));
-        ASSERT_EQUALS("", testAst("void Foo(Bar&&);"));
+        ASSERT_EQUALS("", testAst("void Foo(Bar&);\n"));
+        ASSERT_EQUALS("", testAst("void Foo(Bar&&);\n"));
 
-        ASSERT_EQUALS("Barb&", testAst("void Foo(Bar& b);"));
-        ASSERT_EQUALS("Barb&&", testAst("void Foo(Bar&& b);"));
+        ASSERT_EQUALS("Barb&", testAst("void Foo(Bar& b);\n"));
+        ASSERT_EQUALS("Barb&&", testAst("void Foo(Bar&& b);\n"));
 
-        ASSERT_EQUALS("DerivedDerived::(", testAst("Derived::~Derived() {}"));
+        ASSERT_EQUALS("DerivedDerived::(", testAst("Derived::~Derived() {}\n"));
 
-        ASSERT_EQUALS("ifCA_FarReadfilenew(,sizeofobjtype(,(!(", testAst("if (!CA_FarRead(file, (void far *)new, sizeof(objtype)))")); // #5910 - don't hang if C code is parsed as C++
+        ASSERT_EQUALS("ifCA_FarReadfilenew(,sizeofobjtype(,(!(", testAst("if (!CA_FarRead(file, (void far *)new, sizeof(objtype)))\n")); // #5910 - don't hang if C code is parsed as C++
 
         // C++17: if (expr1; expr2)
-        ASSERT_EQUALS("ifx3=y;(", testAst("if (int x=3; y)"));
+        ASSERT_EQUALS("ifx3=y;(", testAst("if (int x=3; y)\n"));
 
-        ASSERT_EQUALS("xstdstring::decltypes(a::{=", testAst("auto x = std::string{ decltype(s)::a };"));
-        ASSERT_EQUALS("if0decltypest.(X::>(", testAst("if (0 > decltype(s.t)::X) {}"));
+        ASSERT_EQUALS("xstdstring::decltypes(a::{=", testAst("auto x = std::string{ decltype(s)::a };\n"));
+        ASSERT_EQUALS("if0decltypest.(X::>(", testAst("if (0 > decltype(s.t)::X) {}\n"));
     }
 
     void astexpr2() { // limit for large expressions
@@ -6472,190 +7035,190 @@ class TestTokenizer : public TestFixture {
     }
 
     void astnewdelete() {
-        ASSERT_EQUALS("aintnew=", testAst("a = new int;"));
-        ASSERT_EQUALS("aint4[new=", testAst("a = new int[4];"));
-        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);"));
-        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);"));
-        ASSERT_EQUALS("aFoo(new=", testAst("a = new Foo<bar>();"));
-        ASSERT_EQUALS("aXnew(", testAst("a (new (X));"));
-        ASSERT_EQUALS("aXnew5,(", testAst("a (new (X), 5);"));
-        ASSERT_EQUALS("adelete", testAst("delete a;"));
-        ASSERT_EQUALS("adelete", testAst("delete (a);"));
-        ASSERT_EQUALS("adelete", testAst("delete[] a;"));
-        ASSERT_EQUALS("ab.3c-(delete", testAst("delete[] a.b(3 - c);"));
-        ASSERT_EQUALS("aA1(new(bB2(new(,", testAst("a(new A(1)), b(new B(2))"));
-        ASSERT_EQUALS("Fred10[new", testAst(";new Fred[10];"));
-        ASSERT_EQUALS("adelete", testAst("void f() { delete a; }"));
-        ASSERT_EQUALS("Aa*A{new=", testAst("A* a = new A{};"));
-        ASSERT_EQUALS("Aa*A12,{new=", testAst("A* a = new A{ 1, 2 };"));
-        ASSERT_EQUALS("Sv0[(new", testAst("new S(v[0]);")); // #10929
-        ASSERT_EQUALS("SS::x(px0>intx[{newint1[{new:?(:", testAst("S::S(int x) : p(x > 0 ? new int[x]{} : new int[1]{}) {}")); // #10793
-        ASSERT_EQUALS("a0[T{new=", testAst("a[0] = new T{};"));
-        ASSERT_EQUALS("a0[T::{new=", testAst("a[0] = new ::T{};"));
-        ASSERT_EQUALS("a0[ST::{new=", testAst("a[0] = new S::T{};"));
-        ASSERT_EQUALS("intnewdelete", testAst("delete new int;")); // #11039
-        ASSERT_EQUALS("intnewdelete", testAst("void f() { delete new int; }"));
-        ASSERT_EQUALS("pint3[new1+=", testAst("p = (new int[3]) + 1;")); // #11327
-        ASSERT_EQUALS("aType2[T1T2,{new=", testAst("a = new Type *[2] {T1, T2};")); // #11745
-        ASSERT_EQUALS("pSthis(new=", testAst("p = new S*(this);")); // #10809
-        ASSERT_EQUALS("pint0{new=", testAst("p = new int*{ 0 };"));
-        ASSERT_EQUALS("pint5[{new=", testAst("p = new int* [5]{};"));
-        ASSERT_EQUALS("pint5[0{new=", testAst("p = new int* [5]{ 0 };"));
-        ASSERT_EQUALS("sSint(new::(new=", testAst("s = new S(::new int());")); // #12502
-        ASSERT_EQUALS("sS(new::=", testAst("s = ::new (ptr) S();")); // #12552
-        ASSERT_EQUALS("pdelete::return", testAst("return ::delete p;"));
-        ASSERT_EQUALS("gn--(delete", testAst("delete g(--n);"));
-        ASSERT_EQUALS("bdeletep1*p0*,deletep0*p1*,:?*return", testAst("return *(b ? (delete *p1, *p0) : (delete *p0, *p1));")); // #10662
+        ASSERT_EQUALS("aintnew=", testAst("a = new int;\n"));
+        ASSERT_EQUALS("aint4[new=", testAst("a = new int[4];\n"));
+        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);\n"));
+        ASSERT_EQUALS("aFoobar(new=", testAst("a = new Foo(bar);\n"));
+        ASSERT_EQUALS("aFoo(new=", testAst("a = new Foo<bar>();\n"));
+        ASSERT_EQUALS("aXnew(", testAst("a (new (X));\n"));
+        ASSERT_EQUALS("aXnew5,(", testAst("a (new (X), 5);\n"));
+        ASSERT_EQUALS("adelete", testAst("delete a;\n"));
+        ASSERT_EQUALS("adelete", testAst("delete (a);\n"));
+        ASSERT_EQUALS("adelete", testAst("delete[] a;\n"));
+        ASSERT_EQUALS("ab.3c-(delete", testAst("delete[] a.b(3 - c);\n"));
+        ASSERT_EQUALS("aA1(new(bB2(new(,", testAst("a(new A(1)), b(new B(2))\n"));
+        ASSERT_EQUALS("Fred10[new", testAst(";new Fred[10];\n"));
+        ASSERT_EQUALS("adelete", testAst("void f() { delete a; }\n"));
+        ASSERT_EQUALS("Aa*A{new=", testAst("A* a = new A{};\n"));
+        ASSERT_EQUALS("Aa*A12,{new=", testAst("A* a = new A{ 1, 2 };\n"));
+        ASSERT_EQUALS("Sv0[(new", testAst("new S(v[0]);\n")); // #10929
+        ASSERT_EQUALS("SS::x(px0>intx[{newint1[{new:?(:", testAst("S::S(int x) : p(x > 0 ? new int[x]{} : new int[1]{}) {}\n")); // #10793
+        ASSERT_EQUALS("a0[T{new=", testAst("a[0] = new T{};\n"));
+        ASSERT_EQUALS("a0[T::{new=", testAst("a[0] = new ::T{};\n"));
+        ASSERT_EQUALS("a0[ST::{new=", testAst("a[0] = new S::T{};\n"));
+        ASSERT_EQUALS("intnewdelete", testAst("delete new int;\n")); // #11039
+        ASSERT_EQUALS("intnewdelete", testAst("void f() { delete new int; }\n"));
+        ASSERT_EQUALS("pint3[new1+=", testAst("p = (new int[3]) + 1;\n")); // #11327
+        ASSERT_EQUALS("aType2[T1T2,{new=", testAst("a = new Type *[2] {T1, T2};\n")); // #11745
+        ASSERT_EQUALS("pSthis(new=", testAst("p = new S*(this);\n")); // #10809
+        ASSERT_EQUALS("pint0{new=", testAst("p = new int*{ 0 };\n"));
+        ASSERT_EQUALS("pint5[{new=", testAst("p = new int* [5]{};\n"));
+        ASSERT_EQUALS("pint5[0{new=", testAst("p = new int* [5]{ 0 };\n"));
+        ASSERT_EQUALS("sSint(new::(new=", testAst("s = new S(::new int());\n")); // #12502
+        ASSERT_EQUALS("sS(new::=", testAst("s = ::new (ptr) S();\n")); // #12552
+        ASSERT_EQUALS("pdelete::return", testAst("return ::delete p;\n"));
+        ASSERT_EQUALS("gn--(delete", testAst("delete g(--n);\n"));
+        ASSERT_EQUALS("bdeletep1*p0*,deletep0*p1*,:?*return", testAst("return *(b ? (delete *p1, *p0) : (delete *p0, *p1));\n")); // #10662
 
         // placement new
-        ASSERT_EQUALS("X12,3,(new ab,c,", testAst("new (a,b,c) X(1,2,3);"));
-        ASSERT_EQUALS("aX::new=", testAst("a = new (b) ::X;"));
-        ASSERT_EQUALS("cCnew= abc:?", testAst("c = new(a ? b : c) C;"));
+        ASSERT_EQUALS("X12,3,(new ab,c,", testAst("new (a,b,c) X(1,2,3);\n"));
+        ASSERT_EQUALS("aX::new=", testAst("a = new (b) ::X;\n"));
+        ASSERT_EQUALS("cCnew= abc:?", testAst("c = new(a ? b : c) C;\n"));
 
         // invalid code (libreoffice), don't hang
         // #define SlideSorterViewShell
         // SfxViewFrame* pFrame;
         // new SlideSorterViewShell(pFrame,rViewShellBase,pParentWindow,pFrameViewArgument);
-        ASSERT_EQUALS("fxnewy,z,(", testAst("f(new (x,y,z));"));
+        ASSERT_EQUALS("fxnewy,z,(", testAst("f(new (x,y,z));\n"));
 
         // clang testsuite..
-        ASSERT_EQUALS("const0(new", testAst("new const auto (0);"));
-        ASSERT_EQUALS("autonew", testAst("new (auto) (0.0);"));
-        ASSERT_EQUALS("int3[4[5[new", testAst("new (int S::*[3][4][5]) ();"));
-        ASSERT_EQUALS("pSnew=", testAst("p=new (x)(S)(1,2);"));
-        ASSERT_EQUALS("inti[new(", testAst("(void)new (int[i]);"));
-        ASSERT_EQUALS("intp* pnew malloc4(", testAst("int*p; new (p) (malloc(4));"));
-        ASSERT_EQUALS("intnew", testAst("new (&w.x)(int*)(0);"));
-        ASSERT_EQUALS("&new", testAst("new (&w.x)(0);")); // <- the "(int*)" has been simplified
+        ASSERT_EQUALS("const0(new", testAst("new const auto (0);\n"));
+        ASSERT_EQUALS("autonew", testAst("new (auto) (0.0);\n"));
+        ASSERT_EQUALS("int3[4[5[new", testAst("new (int S::*[3][4][5]) ();\n"));
+        ASSERT_EQUALS("pSnew=", testAst("p=new (x)(S)(1,2);\n"));
+        ASSERT_EQUALS("inti[new(", testAst("(void)new (int[i]);\n"));
+        ASSERT_EQUALS("intp* pnew malloc4(", testAst("int*p; new (p) (malloc(4));\n"));
+        ASSERT_EQUALS("intnew", testAst("new (&w.x)(int*)(0);\n"));
+        ASSERT_EQUALS("&new", testAst("new (&w.x)(0);\n")); // <- the "(int*)" has been simplified
 
         // gcc testsuite..
-        ASSERT_EQUALS("char10[new(", testAst("(void)new(char*)[10];"));
+        ASSERT_EQUALS("char10[new(", testAst("(void)new(char*)[10];\n"));
     }
 
     void astpar() { // parentheses
-        ASSERT_EQUALS("12+3*", testAst("(1+2)*3"));
-        ASSERT_EQUALS("123+*", testAst("1*(2+3)"));
-        ASSERT_EQUALS("123+*4*", testAst("1*(2+3)*4"));
-        ASSERT_EQUALS("ifab.c&d==(", testAst("if((a.b&c)==d){}"));
+        ASSERT_EQUALS("12+3*", testAst("(1+2)*3\n"));
+        ASSERT_EQUALS("123+*", testAst("1*(2+3)\n"));
+        ASSERT_EQUALS("123+*4*", testAst("1*(2+3)*4\n"));
+        ASSERT_EQUALS("ifab.c&d==(", testAst("if((a.b&c)==d){}\n"));
 
-        ASSERT_EQUALS("pf.pf.12,(&&", testAst("((p.f) && (p.f)(1,2))"));
+        ASSERT_EQUALS("pf.pf.12,(&&", testAst("((p.f) && (p.f)(1,2))\n"));
 
-        ASSERT_EQUALS("forresdirGetFirst.file&_T(,(=;;(", testAst("for ((res = dir.GetFirst(&file, _T(" ")));;) {}"));
+        ASSERT_EQUALS("forresdirGetFirst.file&_T(,(=;;(", testAst("for ((res = dir.GetFirst(&file, _T(" ")));;) {}\n"));
 
         // problems with: if (x[y]==z)
-        ASSERT_EQUALS("ifa(0[1==(", testAst("if(a()[0]==1){}"));
-        ASSERT_EQUALS("ifbuff0[&(*1==(", testAst("if (*((DWORD*)&buff[0])==1){}"));
-        ASSERT_EQUALS("ifp*0[1==(", testAst("if((*p)[0]==1)"));
-        ASSERT_EQUALS("ifab.cd.[e==(", testAst("if(a.b[c.d]==e){}"));
+        ASSERT_EQUALS("ifa(0[1==(", testAst("if(a()[0]==1){}\n"));
+        ASSERT_EQUALS("ifbuff0[&(*1==(", testAst("if (*((DWORD*)&buff[0])==1){}\n"));
+        ASSERT_EQUALS("ifp*0[1==(", testAst("if((*p)[0]==1)\n"));
+        ASSERT_EQUALS("ifab.cd.[e==(", testAst("if(a.b[c.d]==e){}\n"));
 
-        ASSERT_EQUALS("iftpnote.i1-[note.0==tpnote.i1-[type.4>||(", testAst("if ((tp.note[i - 1].note == 0) || (tp.note[i - 1].type > 4)) {}"));
-        ASSERT_EQUALS("ab.i[j1+[", testAst("a.b[i][j+1]"));
+        ASSERT_EQUALS("iftpnote.i1-[note.0==tpnote.i1-[type.4>||(", testAst("if ((tp.note[i - 1].note == 0) || (tp.note[i - 1].type > 4)) {}\n"));
+        ASSERT_EQUALS("ab.i[j1+[", testAst("a.b[i][j+1]\n"));
 
         // problems with: x=expr
         ASSERT_EQUALS("(= x (( (. ([ a i) f)))",
-                      testAst("x = ((a[i]).f)();", AstStyle::Z3));
-        ASSERT_EQUALS("abc.de.++[=", testAst("a = b.c[++(d.e)];"));
-        ASSERT_EQUALS("abc(1+=", testAst("a = b(c**)+1;"));
-        ASSERT_EQUALS("abc.=", testAst("a = (b).c;"));
+                      testAst("x = ((a[i]).f)();\n", AstStyle::Z3));
+        ASSERT_EQUALS("abc.de.++[=", testAst("a = b.c[++(d.e)];\n"));
+        ASSERT_EQUALS("abc(1+=", testAst("a = b(c**)+1;\n"));
+        ASSERT_EQUALS("abc.=", testAst("a = (b).c;\n"));
 
         // casts
-        ASSERT_EQUALS("a1(2(+=",testAst("a=(t)1+(t)2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t)1+2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t*)1+2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t&)1+2;"));
-        ASSERT_EQUALS("a1(2+=",testAst("a=(t&&)1+2;"));
-        ASSERT_EQUALS("ab::r&c(=", testAst("a::b& r = (a::b&)c;")); // #5261
-        ASSERT_EQUALS("ab10:?=", testAst("a=(b)?1:0;"));
-        ASSERT_EQUALS("ac5[new(=", testAst("a = (b*)(new c[5]);")); // #8786
-        ASSERT_EQUALS("a(4+", testAst("(int)(a) + 4;"));
+        ASSERT_EQUALS("a1(2(+=",testAst("a=(t)1+(t)2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t)1+2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t*)1+2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t&)1+2;\n"));
+        ASSERT_EQUALS("a1(2+=",testAst("a=(t&&)1+2;\n"));
+        ASSERT_EQUALS("ab::r&c(=", testAst("a::b& r = (a::b&)c;\n")); // #5261
+        ASSERT_EQUALS("ab10:?=", testAst("a=(b)?1:0;\n"));
+        ASSERT_EQUALS("ac5[new(=", testAst("a = (b*)(new c[5]);\n")); // #8786
+        ASSERT_EQUALS("a(4+", testAst("(int)(a) + 4;\n"));
 
         // (cast){data}[index]
-        ASSERT_EQUALS("a&{(0[1[5[0=", testAst("(int (**)[i]){&a}[0][1][5] = 0;"));
-        ASSERT_EQUALS("ab12,{(0[,(", testAst("a(b, (int []){1,2}[0]);"));
-        ASSERT_EQUALS("TrivialDefCtora2[2[{1[1[n.0=", testAst("TrivialDefCtor{a[2][2]}[1][1].n = 0;"));
-        ASSERT_EQUALS("aT12,3,{1[=", testAst("a = T{1, 2, 3}[1];"));
+        ASSERT_EQUALS("a&{(0[1[5[0=", testAst("(int (**)[i]){&a}[0][1][5] = 0;\n"));
+        ASSERT_EQUALS("ab12,{(0[,(", testAst("a(b, (int []){1,2}[0]);\n"));
+        ASSERT_EQUALS("TrivialDefCtora2[2[{1[1[n.0=", testAst("TrivialDefCtor{a[2][2]}[1][1].n = 0;\n"));
+        ASSERT_EQUALS("aT12,3,{1[=", testAst("a = T{1, 2, 3}[1];\n"));
 
         // Type{data}()
-        ASSERT_EQUALS("ab{(=", testAst("a=b{}();"));
-        ASSERT_EQUALS("abc{((=", testAst("a=b(c{}());"));
-        ASSERT_EQUALS("xNULL!=0(x(:?", testAst("void f() { {} ((x != NULL) ? (void)0 : x()); }"));
+        ASSERT_EQUALS("ab{(=", testAst("a=b{}();\n"));
+        ASSERT_EQUALS("abc{((=", testAst("a=b(c{}());\n"));
+        ASSERT_EQUALS("xNULL!=0(x(:?", testAst("void f() { {} ((x != NULL) ? (void)0 : x()); }\n"));
 
         // ({..})
-        ASSERT_EQUALS("a{+d+ bc+", testAst("a+({b+c;})+d"));
-        ASSERT_EQUALS("a{d*+ bc+", testAst("a+({b+c;})*d"));
+        ASSERT_EQUALS("a{+d+ bc+", testAst("a+({b+c;})+d\n"));
+        ASSERT_EQUALS("a{d*+ bc+", testAst("a+({b+c;})*d\n"));
         ASSERT_EQUALS("xa{((= bc( yd{((= ef(",
-                      testAst("x=(int)(a({b(c);}));" // don't hang
-                              "y=(int)(d({e(f);}));"));
+                      testAst("x=(int)(a({b(c);}));\n" // don't hang
+                              "y=(int)(d({e(f);}));\n"));
         ASSERT_EQUALS("A{{,( x0= Bx1={x2={,(",  // TODO: This is not perfect!!
-                      testAst("A({},{x=0;});" // don't hang
-                              "B({x=1},{x=2});"));
+                      testAst("A({},{x=0;});\n" // don't hang
+                              "B({x=1},{x=2});\n"));
         ASSERT_EQUALS("xMACROtype.T=value.1=,{({=",
-                      testAst("x = { MACRO( { .type=T, .value=1 } ) }")); // don't hang: MACRO({..})
-        ASSERT_EQUALS("fori10=i{;;( i--", testAst("for (i=10;i;({i--;}) ) {}"));
+                      testAst("x = { MACRO( { .type=T, .value=1 } ) }\n")); // don't hang: MACRO({..})
+        ASSERT_EQUALS("fori10=i{;;( i--", testAst("for (i=10;i;({i--;}) ) {}\n"));
         ASSERT_EQUALS("c{1{,{2.3f{,(",
-                      testAst("c({{}, {1}}, {2.3f});"));
-        ASSERT_EQUALS("x{{= e0= assert0(", testAst("x = {({ int e = 0; assert(0); e; })};"));
+                      testAst("c({{}, {1}}, {2.3f});\n"));
+        ASSERT_EQUALS("x{{= e0= assert0(", testAst("x = {({ int e = 0; assert(0); e; })};\n"));
 
         // function pointer
-        TODO_ASSERT_EQUALS("todo", "va_argapvoid((,(*0=", testAst("*va_arg(ap, void(**) ()) = 0;"));
+        TODO_ASSERT_EQUALS("todo", "va_argapvoid((,(*0=", testAst("*va_arg(ap, void(**) ()) = 0;\n"));
 
         // struct/array initialization
-        ASSERT_EQUALS("name_bytes[bits~unusedBits>>unusedBits<<{=", testAst("const uint8_t name_bytes[] = { (~bits >> unusedBits) << unusedBits };"));
-        ASSERT_EQUALS("abuf.0{={=", testAst("a = { .buf = { 0 } };"));
-        ASSERT_EQUALS("ab2[a.0=b.0=,{a.0=b.0=,{,{=", testAst("struct AB ab[2] = { { .a=0, .b=0 }, { .a=0, .b=0 } };"));
-        ASSERT_EQUALS("tset{=", testAst("struct cgroup_taskset tset = {};"));
-        ASSERT_EQUALS("s1a&,{2b&,{,{=", testAst("s = { {1, &a}, {2, &b} };"));
-        ASSERT_EQUALS("s0[L.2[x={=", testAst("s = { [0].L[2] = x};"));
-        ASSERT_EQUALS("ac.0={(=", testAst("a = (b){.c=0,};")); // <- useless comma
-        ASSERT_EQUALS("xB[1y.z.1={(&=,{={=", testAst("x = { [B] = {1, .y = &(struct s) { .z=1 } } };"));
-        ASSERT_EQUALS("xab,c,{=", testAst("x={a,b,(c)};"));
-        ASSERT_EQUALS("x0fSa.1=b.2=,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = 1, .b = 2, .c = \"\" });"));
-        ASSERT_EQUALS("x0fSa.1{=b.2{,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = { 1 }, .b { 2 }, .c = \"\" });"));
-        ASSERT_EQUALS("a0\"\"abc12:?,{{,(", testAst("a(0, {{\"\", (abc) ? 1 : 2}});"));
-        ASSERT_EQUALS("a0\'\'abc12:?,{{,(", testAst("a(0, {{\'\', (abc) ? 1 : 2}});"));
-        ASSERT_EQUALS("x12,{34,{,{56,{78,{,{,{=", testAst("x = { { {1,2}, {3,4} }, { {5,6}, {7,8} } };"));
-        ASSERT_EQUALS("Sa.stdmove::s(=b.1=,{(", testAst("S({.a = std::move(s), .b = 1})"));
+        ASSERT_EQUALS("name_bytes[bits~unusedBits>>unusedBits<<{=", testAst("const uint8_t name_bytes[] = { (~bits >> unusedBits) << unusedBits };\n"));
+        ASSERT_EQUALS("abuf.0{={=", testAst("a = { .buf = { 0 } };\n"));
+        ASSERT_EQUALS("ab2[a.0=b.0=,{a.0=b.0=,{,{=", testAst("struct AB ab[2] = { { .a=0, .b=0 }, { .a=0, .b=0 } };\n"));
+        ASSERT_EQUALS("tset{=", testAst("struct cgroup_taskset tset = {};\n"));
+        ASSERT_EQUALS("s1a&,{2b&,{,{=", testAst("s = { {1, &a}, {2, &b} };\n"));
+        ASSERT_EQUALS("s0[L.2[x={=", testAst("s = { [0].L[2] = x};\n"));
+        ASSERT_EQUALS("ac.0={(=", testAst("a = (b){.c=0,};\n")); // <- useless comma
+        ASSERT_EQUALS("xB[1y.z.1={(&=,{={=", testAst("x = { [B] = {1, .y = &(struct s) { .z=1 } } };\n"));
+        ASSERT_EQUALS("xab,c,{=", testAst("x={a,b,(c)};\n"));
+        ASSERT_EQUALS("x0fSa.1=b.2=,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = 1, .b = 2, .c = \"\" });\n"));
+        ASSERT_EQUALS("x0fSa.1{=b.2{,c.\"\"=,{(||=", testAst("x = 0 || f(S{.a = { 1 }, .b { 2 }, .c = \"\" });\n"));
+        ASSERT_EQUALS("a0\"\"abc12:?,{{,(", testAst("a(0, {{\"\", (abc) ? 1 : 2}});\n"));
+        ASSERT_EQUALS("a0\'\'abc12:?,{{,(", testAst("a(0, {{\'\', (abc) ? 1 : 2}});\n"));
+        ASSERT_EQUALS("x12,{34,{,{56,{78,{,{,{=", testAst("x = { { {1,2}, {3,4} }, { {5,6}, {7,8} } };\n"));
+        ASSERT_EQUALS("Sa.stdmove::s(=b.1=,{(", testAst("S({.a = std::move(s), .b = 1})\n"));
 
         // struct initialization hang
         ASSERT_EQUALS("sbar.1{,{(={= forfieldfield++;;(",
                       testAst("struct S s = {.bar = (struct foo) { 1, { } } };\n"
-                              "void f(struct cmd *) { for (; field; field++) {} }"));
+                              "void f(struct cmd *) { for (; field; field++) {} }\n"));
 
         // template parentheses: <>
-        ASSERT_EQUALS("ab::c(de::(<=return", testAst("return a::b(c) <= d<double>::e();")); // #6195
+        ASSERT_EQUALS("ab::c(de::(<=return", testAst("return a::b(c) <= d<double>::e();\n")); // #6195
 
         // C++ initializer
-        ASSERT_EQUALS("Class{", testAst("Class{};"));
-        ASSERT_EQUALS("Class12,{", testAst("Class{1,2};"));
-        ASSERT_EQUALS("Class12,{", testAst("Class<X>{1,2};"));
-        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c{}:d;"));
-        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c{1,2}:d;"));
-        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c<X>{}:d;"));
-        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c<X>{1,2}:d;"));
-        ASSERT_EQUALS("a::12,{", testAst("::a{1,2};")); // operator precedence
-        ASSERT_EQUALS("Abc({newreturn", testAst("return new A {b(c)};"));
-        ASSERT_EQUALS("a{{return", testAst("return{{a}};"));
-        ASSERT_EQUALS("a{b{,{return", testAst("return{{a},{b}};"));
-        ASSERT_EQUALS("stdvector::{{,{return", testAst("return std::vector<std::vector<int> >{{},{}};"));
-        ASSERT_EQUALS("stdvector::{2{,{return", testAst("return std::vector<std::vector<int> >{{}, {2}};"));
-        ASSERT_EQUALS("forbstdvector::{{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{},{}});"));
-        ASSERT_EQUALS("forbstdvector::{2{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{}, {2}});"));
-        ASSERT_EQUALS("abR{{,P(,((", testAst("a(b(R{},{},P()));"));
-        ASSERT_EQUALS("f1{2{,3{,{x,(", testAst("f({{1},{2},{3}},x);"));
-        ASSERT_EQUALS("a1{ b2{", testAst("auto a{1}; auto b{2};"));
-        ASSERT_EQUALS("var1ab::23,{,{4ab::56,{,{,{", testAst("auto var{{1,a::b{2,3}}, {4,a::b{5,6}}};"));
-        ASSERT_EQUALS("var{{,{{,{", testAst("auto var{ {{},{}}, {} };"));
-        ASSERT_EQUALS("fXYabcfalse==CD:?,{,{(", testAst("f({X, {Y, abc == false ? C : D}});"));
-        ASSERT_EQUALS("stdvector::p0[{(return", testAst("return std::vector<int>({ p[0] });"));
-        ASSERT_EQUALS("vstdvector::{=", testAst("auto v = std::vector<int>{ };"));
+        ASSERT_EQUALS("Class{", testAst("Class{};\n"));
+        ASSERT_EQUALS("Class12,{", testAst("Class{1,2};\n"));
+        ASSERT_EQUALS("Class12,{", testAst("Class<X>{1,2};\n"));
+        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c{}:d;\n"));
+        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c{1,2}:d;\n"));
+        ASSERT_EQUALS("abc{d:?=", testAst("a=b?c<X>{}:d;\n"));
+        ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c<X>{1,2}:d;\n"));
+        ASSERT_EQUALS("a::12,{", testAst("::a{1,2};\n")); // operator precedence
+        ASSERT_EQUALS("Abc({newreturn", testAst("return new A {b(c)};\n"));
+        ASSERT_EQUALS("a{{return", testAst("return{{a}};\n"));
+        ASSERT_EQUALS("a{b{,{return", testAst("return{{a},{b}};\n"));
+        ASSERT_EQUALS("stdvector::{{,{return", testAst("return std::vector<std::vector<int> >{{},{}};\n"));
+        ASSERT_EQUALS("stdvector::{2{,{return", testAst("return std::vector<std::vector<int> >{{}, {2}};\n"));
+        ASSERT_EQUALS("forbstdvector::{{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{},{}});\n"));
+        ASSERT_EQUALS("forbstdvector::{2{,{:(", testAst("for (auto b : std::vector<std::vector<int> >{{}, {2}});\n"));
+        ASSERT_EQUALS("abR{{,P(,((", testAst("a(b(R{},{},P()));\n"));
+        ASSERT_EQUALS("f1{2{,3{,{x,(", testAst("f({{1},{2},{3}},x);\n"));
+        ASSERT_EQUALS("a1{ b2{", testAst("auto a{1}; auto b{2};\n"));
+        ASSERT_EQUALS("var1ab::23,{,{4ab::56,{,{,{", testAst("auto var{{1,a::b{2,3}}, {4,a::b{5,6}}};\n"));
+        ASSERT_EQUALS("var{{,{{,{", testAst("auto var{ {{},{}}, {} };\n"));
+        ASSERT_EQUALS("fXYabcfalse==CD:?,{,{(", testAst("f({X, {Y, abc == false ? C : D}});\n"));
+        ASSERT_EQUALS("stdvector::p0[{(return", testAst("return std::vector<int>({ p[0] });\n"));
+        ASSERT_EQUALS("vstdvector::{=", testAst("auto v = std::vector<int>{ };\n"));
 
         // Initialization with decltype(expr) instead of a type
-        ASSERT_EQUALS("decltypex((", testAst("decltype(x)();"));
-        ASSERT_EQUALS("decltypex({", testAst("decltype(x){};"));
-        ASSERT_EQUALS("decltypexy+(yx+(", testAst("decltype(x+y)(y+x);"));
-        ASSERT_EQUALS("decltypexy+(yx+{", testAst("decltype(x+y){y+x};"));
+        ASSERT_EQUALS("decltypex((", testAst("decltype(x)();\n"));
+        ASSERT_EQUALS("decltypex({", testAst("decltype(x){};\n"));
+        ASSERT_EQUALS("decltypexy+(yx+(", testAst("decltype(x+y)(y+x);\n"));
+        ASSERT_EQUALS("decltypexy+(yx+{", testAst("decltype(x+y){y+x};\n"));
         ASSERT_EQUALS("adecltypeac::(,decltypead::(,",
-                      testAst("template <typename a> void b(a &, decltype(a::c), decltype(a::d));"));
+                      testAst("template <typename a> void b(a &, decltype(a::c), decltype(a::d));\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("struct A;\n" // #10839
                                              "struct B { A* hash; };\n"
@@ -6693,12 +7256,12 @@ class TestTokenizer : public TestFixture {
         (void)tokenizeAndStringify("void foo(const std::vector<std::string>& locations = {\"\"}) {\n"
                                    "    for (int i = 0; i <= 123; ++i)\n"
                                    "        x->emplace_back(y);\n"
-                                   "}");
+                                   "}\n");
         ignore_errout();
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #10831
                                              "    auto g = [](std::function<void()> h = []() {}) { };\n"
-                                             "}"));
+                                             "}\n"));
         ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #11379
@@ -6708,131 +7271,132 @@ class TestTokenizer : public TestFixture {
             "[test.cpp:2:15]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
             errout_str());
 
-        ASSERT_EQUALS("forinti(0=i5<=i++;;(", testAst("for (int (i) = 0; (i) <= 5; (i)++) {}")); // #13225
+        ASSERT_EQUALS("forinti(0=i5<=i++;;(", testAst("for (int (i) = 0; (i) <= 5; (i)++) {}\n")); // #13225
     }
 
     void astbrackets() { // []
-        ASSERT_EQUALS("a23+[4+", testAst("a[2+3]+4"));
-        ASSERT_EQUALS("a1[0[", testAst("a[1][0]"));
-        ASSERT_EQUALS("ab0[=", testAst("a=(b)[0];"));
-        ASSERT_EQUALS("abc.0[=", testAst("a=b.c[0];"));
-        ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];"));
+        ASSERT_EQUALS("a23+[4+", testAst("a[2+3]+4\n"));
+        ASSERT_EQUALS("a1[0[", testAst("a[1][0]\n"));
+        ASSERT_EQUALS("ab0[=", testAst("a=(b)[0];\n"));
+        ASSERT_EQUALS("abc.0[=", testAst("a=b.c[0];\n"));
+        ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];\n"));
     }
 
     void astvardecl() {
         // Variable declaration
-        ASSERT_EQUALS("a1[\"\"=", testAst("char a[1]=\"\";"));
-        ASSERT_EQUALS("charp*(3[char5[3[new=", testAst("char (*p)[3] = new char[5][3];"));
-        ASSERT_EQUALS("varp=", testAst("const int *var = p;"));
-        ASSERT_EQUALS("intrp0[*(&", testAst("int& r(*p[0]);"));
+        ASSERT_EQUALS("a1[\"\"=", testAst("char a[1]=\"\";\n"));
+        ASSERT_EQUALS("charp*(3[char5[3[new=", testAst("char (*p)[3] = new char[5][3];\n"));
+        ASSERT_EQUALS("varp=", testAst("const int *var = p;\n"));
+        ASSERT_EQUALS("intrp0[*(&", testAst("int& r(*p[0]);\n"));
 
         // #9127
         const char code1[] = "using uno::Ref;\n"
                              "Ref<X> r;\n"
-                             "int var(0);";
+                             "int var(0);\n";
         ASSERT_EQUALS("unoRef:: var0(", testAst(code1));
 
-        ASSERT_EQUALS("vary=", testAst("std::string var = y;"));
+        ASSERT_EQUALS("vary=", testAst("std::string var = y;\n"));
+        ASSERT_EQUALS("vary=", testAst("std::unique_ptr<int> var = y;\n")); // #14019
 
-        ASSERT_EQUALS("", testAst("void *(*var)(int);"));
-        ASSERT_EQUALS("", testAst("void *(*var[2])(int);"));
+        ASSERT_EQUALS("", testAst("void *(*var)(int);\n"));
+        ASSERT_EQUALS("", testAst("void *(*var[2])(int);\n"));
 
 
         // create ast for decltype
-        ASSERT_EQUALS("decltypex( var1=", testAst("decltype(x) var = 1;"));
-        ASSERT_EQUALS("a1bdecltypet((>2,(", testAst("a(1 > b(decltype(t)), 2);")); // #10271
-        ASSERT_EQUALS("decltypex({01:?", testAst("decltype(x){} ? 0 : 1;"));
+        ASSERT_EQUALS("decltypex( var1=", testAst("decltype(x) var = 1;\n"));
+        ASSERT_EQUALS("a1bdecltypet((>2,(", testAst("a(1 > b(decltype(t)), 2);\n")); // #10271
+        ASSERT_EQUALS("decltypex({01:?", testAst("decltype(x){} ? 0 : 1;\n"));
 
         ASSERT_EQUALS("Tp* Tt* forctp.=;;( tp.", testAst("struct T { T* p; };\n" // #10874
                                                          "void f(T * t) {\n"
                                                          "    for (decltype(t->p) (c) = t->p; ;) {}\n"
                                                          "}\n"));
         ASSERT_EQUALS("x0=a, stdtie::a(x=", testAst("int x = 0, a; std::tie(a) = x;\n"));
-        ASSERT_EQUALS("tmpa*=a*b*=,b*tmp=,", testAst("{ ((tmp) = (*a)), ((*a) = (*b)), ((*b) = (tmp)); }"));
-        ASSERT_EQUALS("a(*v=", testAst("(*(volatile unsigned int *)(a) = (v));"));
-        ASSERT_EQUALS("i(j=", testAst("(int&)(i) = j;"));
+        ASSERT_EQUALS("tmpa*=a*b*=,b*tmp=,", testAst("{ ((tmp) = (*a)), ((*a) = (*b)), ((*b) = (tmp)); }\n"));
+        ASSERT_EQUALS("a(*v=", testAst("(*(volatile unsigned int *)(a) = (v));\n"));
+        ASSERT_EQUALS("i(j=", testAst("(int&)(i) = j;\n"));
 
-        ASSERT_EQUALS("", testAst("void f(enum E* var){}"));
-        ASSERT_EQUALS("", testAst("void f(enum E*& var){}"));
-        ASSERT_EQUALS("", testAst("void f(bool& var){}"));
+        ASSERT_EQUALS("", testAst("void f(enum E* var){}\n"));
+        ASSERT_EQUALS("", testAst("void f(enum E*& var){}\n"));
+        ASSERT_EQUALS("", testAst("void f(bool& var){}\n"));
     }
 
     void astunaryop() { // unary operators
-        ASSERT_EQUALS("1a--+", testAst("1 + --a"));
-        ASSERT_EQUALS("1a--+", testAst("1 + a--"));
-        ASSERT_EQUALS("ab+!", testAst("!(a+b)"));
-        ASSERT_EQUALS("ab.++", testAst("++a.b;"));
-        ASSERT_EQUALS("ab.++", testAst("a.b++;"));
-        ASSERT_EQUALS("ab::++", testAst("a::b++;"));
-        ASSERT_EQUALS("c5[--*", testAst("*c[5]--;"));
-        ASSERT_EQUALS("xreturn", testAst("return x;"));
-        ASSERT_EQUALS("x(throw", testAst(";throw x();"));
-        ASSERT_EQUALS("a*bc:?return", testAst("return *a ? b : c;"));
-        ASSERT_EQUALS("xy*--=", testAst("x = -- * y;"));
-        ASSERT_EQUALS("x(throw", testAst(";throw (foo) x;")); // #9955
+        ASSERT_EQUALS("1a--+", testAst("1 + --a\n"));
+        ASSERT_EQUALS("1a--+", testAst("1 + a--\n"));
+        ASSERT_EQUALS("ab+!", testAst("!(a+b)\n"));
+        ASSERT_EQUALS("ab.++", testAst("++a.b;\n"));
+        ASSERT_EQUALS("ab.++", testAst("a.b++;\n"));
+        ASSERT_EQUALS("ab::++", testAst("a::b++;\n"));
+        ASSERT_EQUALS("c5[--*", testAst("*c[5]--;\n"));
+        ASSERT_EQUALS("xreturn", testAst("return x;\n"));
+        ASSERT_EQUALS("x(throw", testAst(";throw x();\n"));
+        ASSERT_EQUALS("a*bc:?return", testAst("return *a ? b : c;\n"));
+        ASSERT_EQUALS("xy*--=", testAst("x = -- * y;\n"));
+        ASSERT_EQUALS("x(throw", testAst(";throw (foo) x;\n")); // #9955
 
         // Unary :: operator
-        ASSERT_EQUALS("abcd::12,(e/:?=", testAst("a = b ? c : ::d(1,2) / e;"));
+        ASSERT_EQUALS("abcd::12,(e/:?=", testAst("a = b ? c : ::d(1,2) / e;\n"));
 
         // how is "--" handled here:
-        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + --c : 1"));
-        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + c-- : 1"));
-        ASSERT_EQUALS("ai[i= i--", testAst("a[i]=i; --i;"));
+        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + --c : 1\n"));
+        ASSERT_EQUALS("ab4<<c--+1:?", testAst("a ? (b << 4) + c-- : 1\n"));
+        ASSERT_EQUALS("ai[i= i--", testAst("a[i]=i; --i;\n"));
 
-        ASSERT_EQUALS("fint0{1&(", testAst("f(int{ 0 } & 1);")); // #11572
-        ASSERT_EQUALS("int0{1&return", testAst("int g() { return int{ 0 } & 1; }"));
+        ASSERT_EQUALS("fint0{1&(", testAst("f(int{ 0 } & 1);\n")); // #11572
+        ASSERT_EQUALS("int0{1&return", testAst("int g() { return int{ 0 } & 1; }\n"));
     }
 
     void astfunction() { // function calls
-        ASSERT_EQUALS("1f(+2+", testAst("1+f()+2"));
-        ASSERT_EQUALS("1f2(+3+", testAst("1+f(2)+3"));
-        ASSERT_EQUALS("1f23,(+4+", testAst("1+f(2,3)+4"));
-        ASSERT_EQUALS("1f2a&,(+", testAst("1+f(2,&a)"));
-        ASSERT_EQUALS("argv[", testAst("int f(char argv[]);"));
-        ASSERT_EQUALS("", testAst("void f();"));
-        ASSERT_EQUALS("", testAst("void f() {}"));
-        ASSERT_EQUALS("", testAst("int f() = delete;"));
-        ASSERT_EQUALS("", testAst("a::b f();"));
-        ASSERT_EQUALS("", testAst("a::b f() {}"));
-        ASSERT_EQUALS("", testAst("a::b f() = delete;"));
-        ASSERT_EQUALS("", testAst("int f() const = delete;"));
-        ASSERT_EQUALS("", testAst("extern unsigned f(const char *);"));
-        ASSERT_EQUALS("charformat*...,", testAst("extern void f(const char *format, ...);"));
-        ASSERT_EQUALS("int(int(void,", testAst("extern int for_each_commit_graft(int (*)(int*), void *);"));
-        ASSERT_EQUALS("for;;(", testAst("for (;;) {}"));
-        ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)"));
-        ASSERT_EQUALS("abc{d{,{(=", testAst("a = b({ c{}, d{} });"));
-        ASSERT_EQUALS("abc;(", testAst("a(b;c)"));
-        ASSERT_EQUALS("x{( forbc;;(", testAst("x({ for(a;b;c){} });"));
-        ASSERT_EQUALS("PT.(", testAst("P->~T();"));  // <- The "T" token::function() will be a destructor
-        ASSERT_EQUALS("double&(4[", testAst("void f(double(&)[4]) {}"));
-        ASSERT_EQUALS("voidu*", testAst("int* g ( void* (f) (void*), void* u);")); // #12475
-        ASSERT_EQUALS("f::(", testAst("::f();")); // #12544
-        ASSERT_EQUALS("(( f (, c ({ (= (. x) 0))))", testAst("f(c, { .x = 0 });", AstStyle::Z3)); // #12806
+        ASSERT_EQUALS("1f(+2+", testAst("1+f()+2\n"));
+        ASSERT_EQUALS("1f2(+3+", testAst("1+f(2)+3\n"));
+        ASSERT_EQUALS("1f23,(+4+", testAst("1+f(2,3)+4\n"));
+        ASSERT_EQUALS("1f2a&,(+", testAst("1+f(2,&a)\n"));
+        ASSERT_EQUALS("argv[", testAst("int f(char argv[]);\n"));
+        ASSERT_EQUALS("", testAst("void f();\n"));
+        ASSERT_EQUALS("", testAst("void f() {}\n"));
+        ASSERT_EQUALS("", testAst("int f() = delete;\n"));
+        ASSERT_EQUALS("", testAst("a::b f();\n"));
+        ASSERT_EQUALS("", testAst("a::b f() {}\n"));
+        ASSERT_EQUALS("", testAst("a::b f() = delete;\n"));
+        ASSERT_EQUALS("", testAst("int f() const = delete;\n"));
+        ASSERT_EQUALS("", testAst("extern unsigned f(const char *);\n"));
+        ASSERT_EQUALS("charformat*...,", testAst("extern void f(const char *format, ...);\n"));
+        ASSERT_EQUALS("int(int(void,", testAst("extern int for_each_commit_graft(int (*)(int*), void *);\n"));
+        ASSERT_EQUALS("for;;(", testAst("for (;;) {}\n"));
+        ASSERT_EQUALS("xsizeofvoid(=", testAst("x=sizeof(void*)\n"));
+        ASSERT_EQUALS("abc{d{,{(=", testAst("a = b({ c{}, d{} });\n"));
+        ASSERT_EQUALS("abc;(", testAst("a(b;c)\n"));
+        ASSERT_EQUALS("x{( forbc;;(", testAst("x({ for(a;b;c){} });\n"));
+        ASSERT_EQUALS("PT.(", testAst("P->~T();\n"));  // <- The "T" token::function() will be a destructor
+        ASSERT_EQUALS("double&(4[", testAst("void f(double(&)[4]) {}\n"));
+        ASSERT_EQUALS("voidu*", testAst("int* g ( void* (f) (void*), void* u);\n")); // #12475
+        ASSERT_EQUALS("f::(", testAst("::f();\n")); // #12544
+        ASSERT_EQUALS("(( f (, c ({ (= (. x) 0))))", testAst("f(c, { .x = 0 });\n", AstStyle::Z3)); // #12806
         ASSERT_EQUALS("(= it (( (. s insert) (, it ({ (, (, (= (. a) i) (= (. b) 2)) (= (. c) 3))))))",
-                      testAst("it = s.insert(it, { .a = i, .b = 2, .c = 3 });", AstStyle::Z3)); // #12815
+                      testAst("it = s.insert(it, { .a = i, .b = 2, .c = 3 });\n", AstStyle::Z3)); // #12815
     }
 
     void asttemplate() { // uninstantiated templates will have <,>,etc..
-        ASSERT_EQUALS("a(3==", testAst("a<int>()==3"));
+        ASSERT_EQUALS("a(3==", testAst("a<int>()==3\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("ab(== f(", testAst("a == b<c>(); f();"));
+        ASSERT_EQUALS("ab(== f(", testAst("a == b<c>(); f();\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("static_casta(i[", testAst("; static_cast<char*>(a)[i];")); // #6203
+        ASSERT_EQUALS("static_casta(i[", testAst("; static_cast<char*>(a)[i];\n")); // #6203
         ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("reinterpret_castreinterpret_castptr(123&(",
-                      testAst(";reinterpret_cast<void*>(reinterpret_cast<unsigned>(ptr) & 123);")); // #7253
+                      testAst(";reinterpret_cast<void*>(reinterpret_cast<unsigned>(ptr) & 123);\n")); // #7253
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("bcd.(=", testAst(";a<int> && b = c->d();"));
+        ASSERT_EQUALS("bcd.(=", testAst(";a<int> && b = c->d();\n"));
         ASSERT_EQUALS("", errout_str());
 
         // This two unit tests were added to avoid a crash. The actual correct AST result for non-executable code has not been determined so far.
-        ASSERT_NO_THROW(testAst("class C : public ::a::b<bool> { };"));
+        ASSERT_NO_THROW(testAst("class C : public ::a::b<bool> { };\n"));
         ASSERT_EQUALS("", errout_str());
-        ASSERT_EQUALS("AB: abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };"));
+        ASSERT_EQUALS("AB: abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };\n"));
         ASSERT_EQUALS("", errout_str());
 
-        ASSERT_EQUALS("xfts(=", testAst("; auto x = f(ts...);"));
+        ASSERT_EQUALS("xfts(=", testAst("; auto x = f(ts...);\n"));
         ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("dae(new= ifd(", testAst("template <typename a, typename... b>\n" // #10199
@@ -6866,43 +7430,44 @@ class TestTokenizer : public TestFixture {
 
     void astrequires()
     {
-        ASSERT_EQUALS("brequires{ac::||= ac::", testAst("template <class a> concept b = requires { a::c; } || a::c;"));
+        ASSERT_EQUALS("brequires{ac::||= ac::", testAst("template <class a> concept b = requires { a::c; } || a::c;\n"));
         ASSERT_EQUALS("crequires{ac::||= a{b{||",
-                      testAst("template <class a, class b> concept c = requires { a{} || b{}; } || a::c;"));
-        ASSERT_EQUALS("ifrequires{(", testAst("if (requires { true; }) {}")); // #13308
+                      testAst("template <class a, class b> concept c = requires { a{} || b{}; } || a::c;\n"));
+        ASSERT_EQUALS("ifrequires{(", testAst("if (requires { true; }) {}\n")); // #13308
+        ASSERT_EQUALS("Crequires({requires({||= sizeofT(4== sizeofT(8==", testAst("concept C = requires() { sizeof(T) == 4; } || requires() { sizeof(T) == 8; };\n"));
     }
 
     void astcast() {
-        ASSERT_EQUALS("ac&(=", testAst("a = (long)&c;"));
-        ASSERT_EQUALS("ac*(=", testAst("a = (Foo*)*c;"));
-        ASSERT_EQUALS("ac-(=", testAst("a = (long)-c;"));
-        ASSERT_EQUALS("ac~(=", testAst("a = (b)~c;"));
-        ASSERT_EQUALS("ac(=", testAst("a = (some<strange, type>)c;"));
-        ASSERT_EQUALS("afoveon_avgimage((foveon_avgimage((+=", testAst("a = foveon_avg(((short(*)[4]) image)) + foveon_avg(((short(*)[4]) image));"));
-        ASSERT_EQUALS("c(40<<return", testAst("return (long long)c << 40;"));
-        ASSERT_EQUALS("ab-(=", testAst("a = ((int)-b)")); // Multiple subsequent unary operators (cast and -)
-        ASSERT_EQUALS("xdouble123(i*(=", testAst("x = (int)(double(123)*i);"));
-        ASSERT_EQUALS("ac(=", testAst("a = (::b)c;"));
-        ASSERT_EQUALS("abcd,({(=", testAst("a = (s){b(c, d)};"));
-        ASSERT_EQUALS("xatoistr({(=", testAst("x = (struct X){atoi(str)};"));
-        ASSERT_EQUALS("xa.0=b.0=,c.0=,{(=", testAst("x = (struct abc) { .a=0, .b=0, .c=0 };"));
+        ASSERT_EQUALS("ac&(=", testAst("a = (long)&c;\n"));
+        ASSERT_EQUALS("ac*(=", testAst("a = (Foo*)*c;\n"));
+        ASSERT_EQUALS("ac-(=", testAst("a = (long)-c;\n"));
+        ASSERT_EQUALS("ac~(=", testAst("a = (b)~c;\n"));
+        ASSERT_EQUALS("ac(=", testAst("a = (some<strange, type>)c;\n"));
+        ASSERT_EQUALS("afoveon_avgimage((foveon_avgimage((+=", testAst("a = foveon_avg(((short(*)[4]) image)) + foveon_avg(((short(*)[4]) image));\n"));
+        ASSERT_EQUALS("c(40<<return", testAst("return (long long)c << 40;\n"));
+        ASSERT_EQUALS("ab-(=", testAst("a = ((int)-b)\n")); // Multiple subsequent unary operators (cast and -)
+        ASSERT_EQUALS("xdouble123(i*(=", testAst("x = (int)(double(123)*i);\n"));
+        ASSERT_EQUALS("ac(=", testAst("a = (::b)c;\n"));
+        ASSERT_EQUALS("abcd,({(=", testAst("a = (s){b(c, d)};\n"));
+        ASSERT_EQUALS("xatoistr({(=", testAst("x = (struct X){atoi(str)};\n"));
+        ASSERT_EQUALS("xa.0=b.0=,c.0=,{(=", testAst("x = (struct abc) { .a=0, .b=0, .c=0 };\n"));
 
-        ASSERT_EQUALS("yz.(return", testAst("return (x)(y).z;"));
+        ASSERT_EQUALS("yz.(return", testAst("return (x)(y).z;\n"));
 
-        ASSERT_EQUALS("fon!(restoring01:?,(", testAst("f((long) !on, restoring ? 0 : 1);"));
+        ASSERT_EQUALS("fon!(restoring01:?,(", testAst("f((long) !on, restoring ? 0 : 1);\n"));
 
-        ASSERT_EQUALS("esi.!(=", testAst("E e = (E)!s->i;")); // #10882
+        ASSERT_EQUALS("esi.!(=", testAst("E e = (E)!s->i;\n")); // #10882
 
-        ASSERT_EQUALS("xp(= 12>34:?", testAst("x = ( const char ( * ) [ 1 > 2 ? 3 : 4 ] ) p ;"));
+        ASSERT_EQUALS("xp(= 12>34:?", testAst("x = ( const char ( * ) [ 1 > 2 ? 3 : 4 ] ) p ;\n"));
 
-        ASSERT_EQUALS("f{(si.,(", testAst("f((struct S){ }, s->i);")); // #11606
+        ASSERT_EQUALS("f{(si.,(", testAst("f((struct S){ }, s->i);\n")); // #11606
 
         // not cast
-        ASSERT_EQUALS("AB||", testAst("(A)||(B)"));
-        ASSERT_EQUALS("abc[1&=", testAst("a = (b[c]) & 1;"));
-        ASSERT_EQUALS("abc::(=", testAst("a = (b::c)();"));
+        ASSERT_EQUALS("AB||", testAst("(A)||(B)\n"));
+        ASSERT_EQUALS("abc[1&=", testAst("a = (b[c]) & 1;\n"));
+        ASSERT_EQUALS("abc::(=", testAst("a = (b::c)();\n"));
 
-        ASSERT_EQUALS("pcharnew(=", testAst("p = (void *)(new char);"));
+        ASSERT_EQUALS("pcharnew(=", testAst("p = (void *)(new char);\n"));
     }
 
     void astlambda() {
@@ -6911,37 +7476,37 @@ class TestTokenizer : public TestFixture {
         // `-(
         //   `-{
 
-        ASSERT_EQUALS("x{(a&[( ai=", testAst("x([&a](int i){a=i;});"));
-        ASSERT_EQUALS("{([(return 0return", testAst("return [](){ return 0; }();"));
+        ASSERT_EQUALS("x{(a&[( ai=", testAst("x([&a](int i){a=i;});\n"));
+        ASSERT_EQUALS("{([(return 0return", testAst("return [](){ return 0; }();\n"));
 
         // noexcept (which if simplified to always have a condition by the time AST is created)
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) noexcept(true) { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable noexcept(true) { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const noexcept(true) { a=i; });"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) noexcept(true) { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable noexcept(true) { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const noexcept(true) { a=i; });\n"));
 
         // both mutable and constexpr (which is simplified to 'const' by the time AST is created)
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable noexcept(true) { a=i; });"));
-        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const noexcept(true) { a=i; });"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) const mutable noexcept(true) { a=i; });\n"));
+        ASSERT_EQUALS("x{([( ai=", testAst("x([](int i) mutable const noexcept(true) { a=i; });\n"));
 
         // ->
-        ASSERT_EQUALS("{([(return 0return", testAst("return []() -> int { return 0; }();"));
-        ASSERT_EQUALS("{(something[(return 0return", testAst("return [something]() -> int { return 0; }();"));
-        ASSERT_EQUALS("{([cd,(return 0return", testAst("return [](int a, int b) -> int { return 0; }(c, d);"));
-        ASSERT_EQUALS("{([return", testAst("return []() -> decltype(0) {};"));
-        ASSERT_EQUALS("x{(&[=", testAst("x = [&]()->std::string const & {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo* {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo&& {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = [](void) mutable -> foo* {};"));
-        ASSERT_EQUALS("f{([=", testAst("f = []() mutable {};"));
+        ASSERT_EQUALS("{([(return 0return", testAst("return []() -> int { return 0; }();\n"));
+        ASSERT_EQUALS("{(something[(return 0return", testAst("return [something]() -> int { return 0; }();\n"));
+        ASSERT_EQUALS("{([cd,(return 0return", testAst("return [](int a, int b) -> int { return 0; }(c, d);\n"));
+        ASSERT_EQUALS("{([return", testAst("return []() -> decltype(0) {};\n"));
+        ASSERT_EQUALS("x{(&[=", testAst("x = [&]()->std::string const & {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo* {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = []() -> foo&& {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = [](void) mutable -> foo* {};\n"));
+        ASSERT_EQUALS("f{([=", testAst("f = []() mutable {};\n"));
 
-        ASSERT_EQUALS("x{([= 0return", testAst("x = [](){return 0; };"));
+        ASSERT_EQUALS("x{([= 0return", testAst("x = [](){return 0; };\n"));
 
-        ASSERT_EQUALS("ab{&[(= cd=", testAst("a = b([&]{c=d;});"));
+        ASSERT_EQUALS("ab{&[(= cd=", testAst("a = b([&]{c=d;});\n"));
 
         // 8628
-        ASSERT_EQUALS("f{([( switchx( 1case y++", testAst("f([](){switch(x){case 1:{++y;}}});"));
+        ASSERT_EQUALS("f{([( switchx( 1case y++", testAst("f([](){switch(x){case 1:{++y;}}});\n"));
 
         ASSERT_EQUALS("{(=[{return ab=",
                       testAst("return {\n"
@@ -6960,31 +7525,32 @@ class TestTokenizer : public TestFixture {
                               "  [=]() -> int {\n"
                               "    a=b;\n"
                               "  }\n"
-                              "}"));
+                              "}\n"));
         ASSERT_EQUALS("{(=[{return ab=",
                       testAst("return {\n"
                               "  [=]() mutable consteval -> int {\n"
                               "    a=b;\n"
                               "  }\n"
-                              "}"));
+                              "}\n"));
 
         // daca@home hang
         ASSERT_EQUALS("a{(&[= 0return b{(=[= fori0=i10!=i++;;(",
                       testAst("a = [&]() -> std::pair<int, int> { return 0; };\n"
-                              "b = [=]() { for (i = 0; i != 10; ++i); };"));
+                              "b = [=]() { for (i = 0; i != 10; ++i); };\n"));
 
         // #9662
-        ASSERT_EQUALS("b{[{ stdunique_ptr::0nullptrnullptr:?{", testAst("auto b{[] { std::unique_ptr<void *>{0 ? nullptr : nullptr}; }};"));
-        ASSERT_EQUALS("{b{[=[", testAst("void a() { [b = [] { ; }] {}; }"));
+        ASSERT_EQUALS("b{[{ stdunique_ptr::0nullptrnullptr:?{", testAst("auto b{[] { std::unique_ptr<void *>{0 ? nullptr : nullptr}; }};\n"));
+        ASSERT_EQUALS("{b{[=[", testAst("void a() { [b = [] { ; }] {}; }\n"));
 
         // Lambda capture expression (C++14)
-        ASSERT_EQUALS("a{b1=[= c2=", testAst("a = [b=1]{c=2;};"));
+        ASSERT_EQUALS("a{b1=[= c2=", testAst("a = [b=1]{c=2;};\n"));
 
         // #9729
-        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { bar([]() noexcept { if (0) {} }); }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { bar([]() noexcept { if (0) {} }); }\n"));
         ASSERT_EQUALS("", errout_str());
 
         // #11128
+        const Settings s = settingsBuilder(settings1).cpp(Standards::CPP17).build();
         ASSERT_NO_THROW(tokenizeAndStringify("template <typename T>\n"
                                              "struct S;\n"
                                              "struct R;\n"
@@ -6994,7 +7560,7 @@ class TestTokenizer : public TestFixture {
                                              "        return y;\n"
                                              "    else\n"
                                              "        return z;\n"
-                                             "}\n", true, Platform::Type::Native, true, Standards::CPP17));
+                                             "}\n", s));
         ignore_errout();
 
         // #10079 - createInnerAST bug..
@@ -7002,7 +7568,7 @@ class TestTokenizer : public TestFixture {
                       testAst("x = []() -> std::vector<uint8_t> {\n"
                               "    const auto y = z;\n"
                               "    switch (y) {}\n"
-                              "};"));
+                              "};\n"));
 
         // #11357
         ASSERT_NO_THROW(tokenizeAndStringify("void f(std::vector<int>& v, bool c) {\n"
@@ -7058,172 +7624,240 @@ class TestTokenizer : public TestFixture {
                                              "}\n"));
         ASSERT_EQUALS("", errout_str());
 
+        ASSERT_NO_THROW(tokenizeAndStringify("int foo() {\n"
+                                             "    connect([]( const int& f ) {\n"
+                                             "                switch( f )\n"
+                                             "                {\n"
+                                             "                    case (int)1:\n"
+                                             "                    {\n"
+                                             "                        A r(f);\n"
+                                             "                        if (1) {}\n"
+                                             "                    }\n"
+                                             "                    break;\n"
+                                             "                }\n"
+                                             "                return 0;\n"
+                                             "             });\n"
+                                             "    return 0;\n"
+                                             "}\n"));
+        ASSERT_EQUALS("", errout_str());
+
         // #11378
-        ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };"));
+        ASSERT_EQUALS("gT{(&[{= 0return", testAst("auto g = T{ [&]() noexcept -> int { return 0; } };\n"));
 
-        ASSERT_EQUALS("sf.{(i[{={", testAst("void g(int i) { S s{ .f = { [i]() {} } }; }"));
+        ASSERT_EQUALS("sf.{(i[{={", testAst("void g(int i) { S s{ .f = { [i]() {} } }; }\n"));
 
-        ASSERT_EQUALS("{([", testAst("void f() { []() {}; }")); // #13471
+        ASSERT_EQUALS("{([", testAst("void f() { []() {}; }\n")); // #13471
     }
 
     void astcase() {
-        ASSERT_EQUALS("0case", testAst("case 0:"));
-        ASSERT_EQUALS("12+case", testAst("case 1+2:"));
-        ASSERT_EQUALS("xyz:?case", testAst("case (x?y:z):"));
-        ASSERT_EQUALS("switchx( 1case y++ 2case", testAst("switch(x){case 1:{++y;break;case 2:break;}}"));
-        ASSERT_EQUALS("switchi( 12<<~case 0return", testAst("switch (i) { case ~(1 << 2) : return 0; }")); // #13197
+        ASSERT_EQUALS("0case", testAst("case 0:\n"));
+        ASSERT_EQUALS("12+case", testAst("case 1+2:\n"));
+        ASSERT_EQUALS("xyz:?case", testAst("case (x?y:z):\n"));
+        ASSERT_EQUALS("switchx( 1case y++ 2case", testAst("switch(x){case 1:{++y;break;case 2:break;}}\n"));
+        ASSERT_EQUALS("switchi( 12<<~case 0return", testAst("switch (i) { case ~(1 << 2) : return 0; }\n")); // #13197
     }
 
     void astrefqualifier() {
-        ASSERT_EQUALS("", testAst("class a { auto b() -> int&; };"));
-        ASSERT_EQUALS("", testAst("class a { auto b() -> int&&; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() &&; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() &; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() && = delete; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() & = delete; };"));
-        ASSERT_EQUALS("", testAst("class a { void b() && {} };"));
-        ASSERT_EQUALS("", testAst("class a { void b() & {} };"));
+        ASSERT_EQUALS("", testAst("class a { auto b() -> int&; };\n"));
+        ASSERT_EQUALS("", testAst("class a { auto b() -> int&&; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() &&; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() &; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() && = delete; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() & = delete; };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() && {} };\n"));
+        ASSERT_EQUALS("", testAst("class a { void b() & {} };\n"));
     }
 
     void astthrowdelete() {
-        ASSERT_EQUALS("a(", testAst("class a { virtual ~a() throw() = delete; };"));
+        ASSERT_EQUALS("a(", testAst("class a { virtual ~a() throw() = delete; };\n"));
     }
 
     void asttrailingdecltype() {
-        ASSERT_EQUALS("Cc& csize.(", testAst("template<class C> constexpr auto s(const C &c) noexcept -> decltype(c.size()) {}"));
+        ASSERT_EQUALS("Cc& csize.(", testAst("template<class C> constexpr auto s(const C &c) noexcept -> decltype(c.size()) {}\n"));
         ASSERT_EQUALS("Cc& MakeSpancdata.(csize.(,(",
-                      testAst("template <typename C> constexpr auto MakeSpan(C &c) -> decltype(MakeSpan(c.data(), c.size())) {}"));
-        ASSERT_EQUALS("Eqeq&key_typek&, eqkk,(", testAst("auto KeyTypeCanBeEq(const Eq& eq, const key_type& k) -> decltype(eq(k, k));"));
-        ASSERT_EQUALS("h{([= si. {return", testAst("auto h = []() -> decltype(s.i) { return {}; };"));
+                      testAst("template <typename C> constexpr auto MakeSpan(C &c) -> decltype(MakeSpan(c.data(), c.size())) {}\n"));
+        ASSERT_EQUALS("Eqeq&key_typek&, eqkk,(", testAst("auto KeyTypeCanBeEq(const Eq& eq, const key_type& k) -> decltype(eq(k, k));\n"));
+        ASSERT_EQUALS("h{([= si. {return", testAst("auto h = []() -> decltype(s.i) { return {}; };\n"));
     }
     void astnoexcept() {
-        ASSERT_EQUALS("noexceptaswap.b((", testAst("void f() noexcept(noexcept(a.swap(b))) {}"));
-        ASSERT_EQUALS("{([ noexceptaswap.b((", testAst("[]() noexcept(noexcept(a.swap(b))) {}"));
+        ASSERT_EQUALS("noexceptaswap.b((", testAst("void f() noexcept(noexcept(a.swap(b))) {}\n"));
+        ASSERT_EQUALS("{([ noexceptaswap.b((", testAst("[]() noexcept(noexcept(a.swap(b))) {}\n"));
     }
 
     //Verify that returning a newly constructed object generates the correct AST even when the class name is scoped
     //Addresses https://trac.cppcheck.net/ticket/9700
     void astnewscoped() {
-        ASSERT_EQUALS("(return (new A))", testAst("return new A;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( A)))", testAst("return new A();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( A true)))", testAst("return new A(true);", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (:: A B)))", testAst("return new A::B;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: A B))))", testAst("return new A::B();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: A B) true)))", testAst("return new A::B(true);", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (:: (:: A B) C)))", testAst("return new A::B::C;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: A B) C))))", testAst("return new A::B::C();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: A B) C) true)))", testAst("return new A::B::C(true);", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (:: (:: (:: A B) C) D)))", testAst("return new A::B::C::D;", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D))))", testAst("return new A::B::C::D();", AstStyle::Z3));
-        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D) true)))", testAst("return new A::B::C::D(true);", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new A))", testAst("return new A;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( A)))", testAst("return new A();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( A true)))", testAst("return new A(true);\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (:: A B)))", testAst("return new A::B;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: A B))))", testAst("return new A::B();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: A B) true)))", testAst("return new A::B(true);\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (:: (:: A B) C)))", testAst("return new A::B::C;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: A B) C))))", testAst("return new A::B::C();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: A B) C) true)))", testAst("return new A::B::C(true);\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (:: (:: (:: A B) C) D)))", testAst("return new A::B::C::D;\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D))))", testAst("return new A::B::C::D();\n", AstStyle::Z3));
+        ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D) true)))", testAst("return new A::B::C::D(true);\n", AstStyle::Z3));
+    }
+
+    void astdecltypescope() {
+        ASSERT_EQUALS("sizedecltypethism_P.(XSize::::{", testAst("size { decltype(this->m_P)::X::Size };\n"));
+    }
+
+    void astdesignatedinit() {
+        ASSERT_EQUALS("(( f ({ (= (. x) 1)))", testAst("f({ .x = 1 });\n", AstStyle::Z3));
+    }
+
+    void astrvaluedecl() {
+        ASSERT_EQUALS("varstdmove::var(=", testAst("std::string&& var = std::move(var);\n"));
+    }
+
+    void astorkeyword() {
+        ASSERT_EQUALS("ifsp.\"\"==sp.0==||(", testAst("void f() { if (s.p == \"\" or s.p == 0) {} }\n"));
+    }
+
+    void astenumdecl() {
+        ASSERT_EQUALS("A0U=", testAst("enum class myclass : unsigned char { A = 0U, };\n"));
+        ASSERT_EQUALS("A0U=", testAst("enum myclass : unsigned char { A = 0U, };\n"));
+    }
+
+    void astcompound() {
+        ASSERT_EQUALS("sn0=={(tmp:?=", testAst("Str s = n == 0 ? (Str) { 0 } : tmp;\n")); // #14548
+        ASSERT_EQUALS("s(sstrlens(0:?,{(return", testAst("return (struct Str) { (unsigned char*)s, s ? strlen(s) : 0 };\n"));
+    }
+
+    void astfuncdecl() {
+        ASSERT_EQUALS("", testAst("bool operator==(const S& a, const S& b);\n", AstStyle::Simple, ListSimplification::Full));
+        ASSERT_EQUALS("", testAst("::int32_t f();\n"));
+        ASSERT_EQUALS("", testAst("void f(int&& var);\n"));
+    }
+
+    void astarrayinit() { // #11738
+        ASSERT_EQUALS("a2[12,{", testAst("int a[2]{ 1, 2 };\n"));
+        ASSERT_EQUALS("a2[2[ 12, 34,{", testAst("int a[2][2]{ { 1, 2 }, { 3, 4 } };\n"));
+    }
+
+    void astbracedinit() {
+        ASSERT_EQUALS("ab{", testAst("int &a { b };\n", AstStyle::Simple, ListSimplification::Full));
+        ASSERT_EQUALS("a0{", testAst("int &&a { 0 };\n", AstStyle::Simple, ListSimplification::Full));
+        ASSERT_EQUALS("anullptr{", testAst("int *a { nullptr };\n", AstStyle::Simple, ListSimplification::Full));
+    }
+
+    void astif() {
+        ASSERT_EQUALS( // #14967
+            "ifxx(&&(",
+            testAst("void f(int (*x)()) {\n"
+                    "    if (x && x()) {}\n"
+                    "}\n", AstStyle::Simple, ListSimplification::Full));
     }
 
 #define isStartOfExecutableScope(offset, code) isStartOfExecutableScope_(offset, code, __FILE__, __LINE__)
     template<size_t size>
     bool isStartOfExecutableScope_(int offset, const char (&code)[size], const char* file, int line) {
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return Tokenizer::startOfExecutableScope(tokenizer.tokens()->tokAt(offset)) != nullptr;
     }
 
     void startOfExecutableScope() {
-        ASSERT(isStartOfExecutableScope(3, "void foo() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() volatile { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() override { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() NOEXCEPT { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() CONST NOEXCEPT { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept(true) { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept(true) { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() throw() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() THROW() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() CONST THROW() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const throw() { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() throw(int) { }"));
-        ASSERT(isStartOfExecutableScope(3, "void foo() const throw(int) { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a(1) { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a(1), b(2) { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a{1} { }"));
-        ASSERT(isStartOfExecutableScope(2, "foo() : a{1}, b{2} { }"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() volatile { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() override { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() NOEXCEPT { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() CONST NOEXCEPT { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() noexcept(true) { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const noexcept(true) { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() throw() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() THROW() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() CONST THROW() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const throw() { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() throw(int) { }\n"));
+        ASSERT(isStartOfExecutableScope(3, "void foo() const throw(int) { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a(1) { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a(1), b(2) { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a{1} { }\n"));
+        ASSERT(isStartOfExecutableScope(2, "foo() : a{1}, b{2} { }\n"));
     }
 
     void removeMacroInClassDef() { // #6058
-        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred { } ;"));
-        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class Fred FINAL : Base { } ;"));
-        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class DLLEXPORT Fred final : Base { } ;")); // #11422
+        ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred { } ;\n"));
+        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class Fred FINAL : Base { } ;\n"));
+        ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class DLLEXPORT Fred final : Base { } ;\n")); // #11422
         // Regression for C code:
-        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;", true, Platform::Type::Native, false));
+        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;\n", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void sizeofAddParentheses() {
-        ASSERT_EQUALS("sizeof ( sizeof ( 1 ) ) ;", tokenizeAndStringify("sizeof sizeof 1;"));
-        ASSERT_EQUALS("sizeof ( a . b ) + 3 ;", tokenizeAndStringify("sizeof a.b+3;"));
-        ASSERT_EQUALS("sizeof ( a [ 2 ] . b ) + 3 ;", tokenizeAndStringify("sizeof a[2].b+3;"));
-        ASSERT_EQUALS("f ( 0 , sizeof ( ptr . bar ) ) ;", tokenizeAndStringify("f(0, sizeof ptr->bar );"));
-        ASSERT_EQUALS("sizeof ( a ) > sizeof ( & main ) ;", tokenizeAndStringify("sizeof a > sizeof &main;"));
+        ASSERT_EQUALS("sizeof ( sizeof ( 1 ) ) ;", tokenizeAndStringify("sizeof sizeof 1;\n"));
+        ASSERT_EQUALS("sizeof ( a . b ) + 3 ;", tokenizeAndStringify("sizeof a.b+3;\n"));
+        ASSERT_EQUALS("sizeof ( a [ 2 ] . b ) + 3 ;", tokenizeAndStringify("sizeof a[2].b+3;\n"));
+        ASSERT_EQUALS("f ( 0 , sizeof ( ptr . bar ) ) ;", tokenizeAndStringify("f(0, sizeof ptr->bar );\n"));
+        ASSERT_EQUALS("sizeof ( a ) > sizeof ( & main ) ;", tokenizeAndStringify("sizeof a > sizeof &main;\n"));
     }
 
     void reportUnknownMacros() {
         const char code1[] = "MY_UNKNOWN_IMP1(IInStream)\n"
-                             "STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) { if (ptr); }";
+                             "STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) { if (ptr); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code1), UNKNOWN_MACRO);
 
-        const char code2[] = "void foo() { dostuff(x 0); }";
+        const char code2[] = "void foo() { dostuff(x 0); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code2), UNKNOWN_MACRO);
 
-        const char code3[] = "f(\"1\" __stringify(48) \"1\");";
+        const char code3[] = "f(\"1\" __stringify(48) \"1\");\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code3), UNKNOWN_MACRO);
 
         const char code4[] = "struct Foo {\n"
                              "  virtual MACRO(int) f1() {}\n"
                              "  virtual MACRO(int) f2() {}\n"
-                             "};";
+                             "};\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code4), UNKNOWN_MACRO);
 
         const char code5[] = "void foo() {\n"
                              "  EVALUATE(123, int x=a; int y=b+c;);\n"
-                             "}";
+                             "}\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code5), UNKNOWN_MACRO);
 
-        const char code6[] = "void foo() { dostuff(a, .x=0); }";
+        const char code6[] = "void foo() { dostuff(a, .x=0); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code6), UNKNOWN_MACRO);
 
-        const char code7[] = "void foo() { dostuff(ZEND_NUM_ARGS() TSRMLS_CC, x, y); }"; // #9476
+        const char code7[] = "void foo() { dostuff(ZEND_NUM_ARGS() TSRMLS_CC, x, y); }\n"; // #9476
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code7), UNKNOWN_MACRO);
 
-        const char code8[] = "void foo() { a = [](int x, decltype(vec) y){}; }";
+        const char code8[] = "void foo() { a = [](int x, decltype(vec) y){}; }\n";
         ASSERT_NO_THROW(tokenizeAndStringify(code8));
 
-        const char code9[] = "void f(std::exception c) { b(M() c.what()); }";
+        const char code9[] = "void f(std::exception c) { b(M() c.what()); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code9), UNKNOWN_MACRO);
 
-        const char code10[] = "void f(std::exception c) { b(M() M() + N(c.what())); }";
+        const char code10[] = "void f(std::exception c) { b(M() M() + N(c.what())); }\n";
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code10), UNKNOWN_MACRO);
 
-        const char code11[] = "struct B { B(B&&) noexcept {} ~B() noexcept {} };";
+        const char code11[] = "struct B { B(B&&) noexcept {} ~B() noexcept {} };\n";
         ASSERT_NO_THROW(tokenizeAndStringify(code11));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("alignas(8) alignas(16) int x;")); // alignas is not unknown macro
+        ASSERT_NO_THROW(tokenizeAndStringify("alignas(8) alignas(16) int x;\n")); // alignas is not unknown macro
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { if(x) SYSTEM_ERROR }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { dostuff(); SYSTEM_ERROR }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { if(x) SYSTEM_ERROR }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { dostuff(); SYSTEM_ERROR }\n"), UNKNOWN_MACRO);
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f(void* q) {\n"
                                              "    g(&(S) { .p = (int*)q });\n"
-                                             "}\n", /*expand*/ true, Platform::Type::Native, false));
+                                             "}\n", dinit(TokenizeOptions, $.cpp = false)));
 
         ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { int i; } S;\n"
                                              "void f(float a) {\n"
                                              "S s = (S){ .i = (int)a };\n"
-                                             "}\n", /*expand*/ true, Platform::Type::Native, false));
+                                             "}\n", dinit(TokenizeOptions, $.cpp = false)));
 
         ASSERT_THROW_INTERNAL(tokenizeAndStringify("std::string g();\n"
                                                    "std::string f() {\n"
                                                    "    return std::string{ g() + \"abc\" MACRO \"def\" };\n"
-                                                   "}\n", /*expand*/ true, Platform::Type::Native, true), UNKNOWN_MACRO);
+                                                   "}\n"), UNKNOWN_MACRO);
 
         ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("static void handle_toggle(void (*proc) PROTO_XT_CALLBACK_ARGS, int var) {}\n"), // #13198
                                      UNKNOWN_MACRO,
@@ -7234,8 +7868,8 @@ class TestTokenizer : public TestFixture {
 
     void findGarbageCode() { // Test Tokenizer::findGarbageCode()
         // C++ try/catch in global scope
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("try { }"), SYNTAX, "syntax error: keyword 'try' is not allowed in global scope");
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() try { } catch (int) { }"));
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("try { }\n"), SYNTAX, "syntax error: keyword 'try' is not allowed in global scope");
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() try { } catch (int) { }\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct S {\n" // #9716
                                              "    S();\n"
                                              "    int x, y;\n"
@@ -7250,61 +7884,61 @@ class TestTokenizer : public TestFixture {
                                              "    catch (...) { h(); }\n"));
 
         // before if|for|while|switch
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { do switch (a) {} while (1); }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { label: switch (a) {} }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { UNKNOWN_MACRO if (a) {} }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { []() -> int * {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { const char* var = \"1\" \"2\"; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { do switch (a) {} while (1); }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { label: switch (a) {} }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { UNKNOWN_MACRO if (a) {} }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { []() -> int * {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { const char* var = \"1\" \"2\"; }\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(switch); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(x,switch); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( if (!done) done = 1); }"), UNKNOWN_MACRO);
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( a, b, if (!done) done = 1); }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(switch); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { MACRO(x,switch); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( if (!done) done = 1); }\n"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { for_chain( a, b, if (!done) done = 1); }\n"), UNKNOWN_MACRO);
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { if (retval==){} }"), SYNTAX, "syntax error: ==)");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { if (retval==){} }\n"), SYNTAX, "syntax error: ==)");
 
         // after (expr)
-        ASSERT_NO_THROW(tokenizeAndStringify("void f() { switch (a) int b; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() { switch (a) int b; }\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x=2, .y[0]=3 };"));
-        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .ab.a=2, .ab.b=3 };"));
+        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x=2, .y[0]=3 };\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .ab.a=2, .ab.b=3 };\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("extern \"C\" typedef void FUNC();"));
+        ASSERT_NO_THROW(tokenizeAndStringify("extern \"C\" typedef void FUNC();\n"));
 
         // Ticket #9572
         ASSERT_NO_THROW(tokenizeAndStringify("struct poc { "
                                              "  struct { int d; } port[1]; "
                                              "}; "
-                                             "struct poc p = { .port[0] = {.d = 3} };"));
+                                             "struct poc p = { .port[0] = {.d = 3} };\n"));
 
         // Ticket #9664
-        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x { 2 }, .y[0] { 3 } };"));
+        ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x { 2 }, .y[0] { 3 } };\n"));
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f(0, .x());"), SYNTAX); // #12823
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f(0, .x());\n"), SYNTAX); // #12823
 
         // Ticket #11134
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; }; "
                                              "std::string s; "
-                                             "func(my_struct{ .x=42 }, s.size());"));
+                                             "func(my_struct{ .x=42 }, s.size());\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; int y; }; "
                                              "std::string s; "
-                                             "func(my_struct{ .x{42}, .y=3 }, s.size());"));
+                                             "func(my_struct{ .x{42}, .y=3 }, s.size());\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; int y; }; "
                                              "std::string s; "
-                                             "func(my_struct{ .x=42, .y{3} }, s.size());"));
+                                             "func(my_struct{ .x=42, .y{3} }, s.size());\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; }; "
                                              "void h() { "
                                              "  for (my_struct ms : { my_struct{ .x=5 } }) {} "
-                                             "}"));
+                                             "}\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; int y; }; "
                                              "void h() { "
                                              "  for (my_struct ms : { my_struct{ .x=5, .y{42} } }) {} "
-                                             "}"));
+                                             "}\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("template <typename T> void foo() {} "
                                              "void h() { "
                                              "  [func=foo<int>]{func();}(); "
-                                             "}"));
+                                             "}\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("template <class T> constexpr int n = 1;\n"
                                              "template <class T> T a[n<T>];\n"));
 
@@ -7313,23 +7947,23 @@ class TestTokenizer : public TestFixture {
 
 
         // op op
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { dostuff (x==>y); }"), SYNTAX, "syntax error: == >");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { dostuff (x==>y); }\n"), SYNTAX, "syntax error: == >");
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a==()); }"), SYNTAX, "syntax error: ==()");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a+()); }"), SYNTAX, "syntax error: +()");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a==()); }\n"), SYNTAX, "syntax error: ==()");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { assert(a+()); }\n"), SYNTAX, "syntax error: +()");
 
         // #9445 - typeof is not a keyword in C
-        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }", false, Platform::Type::Native, false));
+        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }\n", dinit(TokenizeOptions, $.expand = false, $.cpp = false)));
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : { };"), SYNTAX, "syntax error: Unexpected token '{'");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : 3 { };"), SYNTAX, "syntax error: Unexpected token '3'");
-        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = int{} };"));
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : { };\n"), SYNTAX, "syntax error: Unexpected token '{'");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("enum : 3 { };\n"), SYNTAX, "syntax error: Unexpected token '3'");
+        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = int{} };\n"));
 
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int a() { b((c)return 0) }"), SYNTAX, "syntax error");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int f() { MACRO(x) return 0; }"),
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int a() { b((c)return 0) }\n"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int f() { MACRO(x) return 0; }\n"),
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("bool f() { unknown return 0; }"),
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("bool f() { unknown return 0; }\n"),
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If unknown is a macro then please configure it.");
 
@@ -7390,22 +8024,46 @@ class TestTokenizer : public TestFixture {
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
 
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("{ for (()()) }"), SYNTAX); // #11643
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("{ for (()()) }\n"), SYNTAX); // #11643
 
-        ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();")); // #12552
-        ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f(const std::vector<std::string>& v) {\n" // #14326
+                                                   "    for (const std::string&s : v)\n"
+                                                   "}\n"),
+                              SYNTAX);
+
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f(T* p) {\n"
+                                                   "    g(p->x TSRMLS_CC);"
+                                                   "}\n"),
+                              UNKNOWN_MACRO);
+
+        ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();\n")); // #12552
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }\n"));
 
         ASSERT_NO_THROW(tokenizeAndStringify("template <typename T, int N>\n" // #12659
-                                             "constexpr void f(T(&&a)[N]) {}"));
+                                             "constexpr void f(T(&&a)[N]) {}\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { typedef int T; } S;")); // #12700
+        ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { typedef int T; } S;\n")); // #12700
 
         ASSERT_NO_THROW(tokenizeAndStringify("class A { bool restrict() const; };\n"
-                                             "bool A::restrict() const { return true; }")); // #12718
+                                             "bool A::restrict() const { return true; }\n")); // #12718
+
+        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = sizeof(struct { int i; }) };\n")); // #13249
 
-        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = sizeof(struct { int i; }) };")); // #13249
+        ASSERT_NO_THROW(tokenizeAndStringify("struct S { unsigned u:2, :30; };\n")); // #14393
+
+        ASSERT_NO_THROW(tokenizeAndStringify("struct S {};\n" // #14400
+                                             "auto f(bool b) -> struct S {\n"
+                                             "    if (b) {}\n"
+                                             "    return {};\n"
+                                             "};\n"));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #14395
+                                             "    for (int i : [](int a, int b) { ++a; ++b; return std::vector<int>{a, b}; }(1, 2)) {}\n"
+                                             "}\n"));
 
         ignore_errout();
+
+        ASSERT_EQUALS(";", tokenizeAndStringify("typedef std::size_t size_t;\n")); // #14809
     }
 
 
@@ -7623,7 +8281,7 @@ class TestTokenizer : public TestFixture {
                             "  });\n"
                             "}\n"));
 
-        ASSERT_NO_THROW(tokenizeAndStringify("a<b?0:1>()==3;"));
+        ASSERT_NO_THROW(tokenizeAndStringify("a<b?0:1>()==3;\n"));
 
         // #10336
         ASSERT_NO_THROW(tokenizeAndStringify("struct a {\n"
@@ -7677,14 +8335,14 @@ class TestTokenizer : public TestFixture {
     }
 
     void checkNamespaces() {
-        ASSERT_NO_THROW(tokenizeAndStringify("namespace x { namespace y { namespace z {}}}"));
+        ASSERT_NO_THROW(tokenizeAndStringify("namespace x { namespace y { namespace z {}}}\n"));
     }
 
     void checkLambdas() {
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, &i] {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i] {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i = std::move(i)] {}; }"));
-        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, i = std::move(i)] {}; }"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, &i] {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i] {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [&, i = std::move(i)] {}; }\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("auto f(int& i) { return [=, i = std::move(i)] {}; }\n"));
         ASSERT_NO_THROW(tokenizeAndStringify("struct c {\n"
                                              "  void d() {\n"
                                              "    int a;\n"
@@ -7768,6 +8426,12 @@ class TestTokenizer : public TestFixture {
                                              "int main() { \n"
                                              "    takesFunc([func = [](S s) { return s.c; }] {});\n"
                                              "}\n"));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #14256
+                                             "    int i = 0;\n"
+                                             "    auto x = [i] mutable {};\n"
+                                             "}\n"));
+
         ignore_errout();
     }
     void checkIfCppCast() {
@@ -7891,7 +8555,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void noCrash3() {
-        ASSERT_NO_THROW(tokenizeAndStringify("void a(X<int> x, typename Y1::Y2<int, A::B::C, 2> y, Z z = []{});"));
+        ASSERT_NO_THROW(tokenizeAndStringify("void a(X<int> x, typename Y1::Y2<int, A::B::C, 2> y, Z z = []{});\n"));
     }
 
     void noCrash4() {
@@ -7931,13 +8595,25 @@ class TestTokenizer : public TestFixture {
     }
 
     void checkConfiguration() {
-        ASSERT_THROW_INTERNAL_EQUALS(checkConfig("void f() { DEBUG(x();y()); }"),
+        ASSERT_THROW_INTERNAL_EQUALS(checkConfig("void f() { DEBUG(x();y()); }\n"),
                                      UNKNOWN_MACRO,
                                      "There is an unknown macro here somewhere. Configuration is required. If DEBUG is a macro then please configure it.");
     }
 
     void unknownMacroBeforeReturn() {
-        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f() { X return 0; }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f() { X return 0; }\n"), UNKNOWN_MACRO);
+    }
+
+    void cppKeywordInCSource() {
+        ASSERT_NO_THROW(tokenizeAndStringify("int throw() {}\n", dinit(TokenizeOptions, $.cpp = false)));
+
+        const char code[] = "void requires(const char*);\n" // #14613
+                            "void f() { requires(\"abc\"); }\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        const Settings s_cpp17 = settingsBuilder().cpp(Standards::CPP17).build();
+        ASSERT_NO_THROW(tokenizeAndStringify(code, s_cpp17, true));
+        const Settings s_cpp20 = settingsBuilder().cpp(Standards::CPP20).build();
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code, s_cpp20, true), AST);
     }
 
     void cppcast() {
@@ -7954,8 +8630,25 @@ class TestTokenizer : public TestFixture {
         }
     }
 
+    void ccast() {
+        const char code[] = "a = (int)x;\n" // #13579
+                            "int (*p)[10];\n"
+                            "b = (void (S::*)(int) const)&y;\n";
+
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
+
+        const Token* par = Token::findsimplematch(tokenizer.tokens(), "(");
+        ASSERT(par->isCast());
+        par = Token::findsimplematch(par->next(), "(");
+        ASSERT(!par->isCast());
+        par = Token::findsimplematch(par->next(), "(");
+        ASSERT(par->isCast());
+    }
+
 #define checkHdrs(...) checkHdrs_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string checkHdrs_(const char* file, int line, const char code[], bool checkHeadersFlag) {
+    template<size_t size>
+    std::string checkHdrs_(const char* file, int line, const char (&code)[size], bool checkHeadersFlag) {
         const Settings settings = settingsBuilder().checkHeaders(checkHeadersFlag).build();
 
         SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
@@ -7963,7 +8656,7 @@ class TestTokenizer : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        return tokenizer.tokens()->stringifyList();
+        return tokenizer.tokens()->stringifyList(false, false, true, true, true);
     }
 
     void checkHeader1() {
@@ -7973,7 +8666,7 @@ class TestTokenizer : public TestFixture {
                             "    int a = 1;\n"
                             "    void f() { g(1); }\n"
                             "    template <typename T> void g(T x) { a = 2; }\n" // <- template is used and should be kept
-                            "};";
+                            "};\n";
 
         ASSERT_EQUALS("\n\n##file 1\n"
                       "1: struct A {\n"
@@ -7993,40 +8686,40 @@ class TestTokenizer : public TestFixture {
     }
 
     void removeExtraTemplateKeywords() {
-        const char code1[] = "typename GridView::template Codim<0>::Iterator iterator;";
+        const char code1[] = "typename GridView::template Codim<0>::Iterator iterator;\n";
         const char expected1[] = "GridView :: Codim < 0 > :: Iterator iterator ;";
         ASSERT_EQUALS(expected1, tokenizeAndStringify(code1));
 
-        const char code2[] = "typename GridView::template Codim<0>::Iterator it = gv.template begin<0>();";
+        const char code2[] = "typename GridView::template Codim<0>::Iterator it = gv.template begin<0>();\n";
         const char expected2[] = "GridView :: Codim < 0 > :: Iterator it ; it = gv . begin < 0 > ( ) ;";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
 
     void removeAlignas1() {
-        const char code[] = "alignas(float) unsigned char c[sizeof(float)];";
+        const char code[] = "alignas(float) unsigned char c[sizeof(float)];\n";
         const char expected[] = "unsigned char c [ sizeof ( float ) ] ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void removeAlignas2() { // Do not remove alignas and alignof in the same way
-        const char code[] = "static_assert( alignof( VertexC ) == 4 );";
+        const char code[] = "static_assert( alignof( VertexC ) == 4 );\n";
         const char expected[] = "static_assert ( alignof ( VertexC ) == 4 ) ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void removeAlignas3() {
-        const char code[] = "alignas(16) int x;";
+        const char code[] = "alignas(16) int x;\n";
         const char expected[] = "int x ;";
         // According to cppreference alignas() is a C23 macro; but it is often available when compiling C11.
         // Misra C has C11 examples with alignas.
         // Microsoft provides alignas in C11.
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, false, Standards::CPP11, Standards::C11));
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, Platform::Type::Native, true, Standards::CPP11, Standards::C11));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void dumpAlignas() {
         SimpleTokenizer tokenizer(settingsDefault, *this, false);
-        ASSERT(tokenizer.tokenize("int alignas(8) alignas(16) x;"));
+        ASSERT(tokenizer.tokenize("int alignas(8) alignas(16) x;\n"));
         ASSERT(Token::simpleMatch(tokenizer.tokens(), "int x ;"));
         std::ostringstream ostr;
         tokenizer.dump(ostr);
@@ -8037,15 +8730,15 @@ class TestTokenizer : public TestFixture {
     void simplifyCoroutines() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
 
-        const char code1[] = "generator<int> f() { co_yield start++; }";
+        const char code1[] = "generator<int> f() { co_yield start++; }\n";
         const char expected1[] = "generator < int > f ( ) { co_yield ( start ++ ) ; }";
         ASSERT_EQUALS(expected1, tokenizeAndStringify(code1, settings));
 
-        const char code2[] = "task<> f() { co_await foo(); }";
+        const char code2[] = "task<> f() { co_await foo(); }\n";
         const char expected2[] = "task < > f ( ) { co_await ( foo ( ) ) ; }";
         ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings));
 
-        const char code3[] = "generator<int> f() { co_return 7; }";
+        const char code3[] = "generator<int> f() { co_return 7; }\n";
         const char expected3[] = "generator < int > f ( ) { co_return ( 7 ) ; }";
         ASSERT_EQUALS(expected3, tokenizeAndStringify(code3, settings));
     }
@@ -8053,41 +8746,41 @@ class TestTokenizer : public TestFixture {
     void simplifySpaceshipOperator() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
 
-        ASSERT_EQUALS("; x <=> y ;", tokenizeAndStringify(";x<=>y;", settings));
+        ASSERT_EQUALS("; x <=> y ;", tokenizeAndStringify(";x<=>y;\n", settings));
     }
 
     void simplifyIfSwitchForInit1() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP17).build();
-        const char code[] = "void f() { if (a;b) {} }";
+        const char code[] = "void f() { if (a;b) {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; if ( b ) { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit2() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { if (a;b) {} else {} }";
+        const char code[] = "void f() { if (a;b) {} else {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; if ( b ) { } else { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit3() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { switch (a;b) {} }";
+        const char code[] = "void f() { switch (a;b) {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; switch ( b ) { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit4() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { for (a;b:c) {} }";
+        const char code[] = "void f() { for (a;b:c) {} }\n";
         ASSERT_EQUALS("void f ( ) { { a ; for ( b : c ) { } } }", tokenizeAndStringify(code, settings));
     }
 
     void simplifyIfSwitchForInit5() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "void f() { if ([] { ; }) {} }";
+        const char code[] = "void f() { if ([] { ; }) {} }\n";
         ASSERT_EQUALS("void f ( ) { if ( [ ] { ; } ) { } }", tokenizeAndStringify(code, settings));
     }
 
     void newPlacementArgsCppInit() { // #13775
-        const char code[] = "::new(nullptr) int {};";
+        const char code[] = "::new(nullptr) int {};\n";
         SimpleTokenizer tokenizer(settings1, *this);
         tokenizer.tokenize(code);
         const Token *inttok = Token::findsimplematch(tokenizer.tokens(), "int");
@@ -8100,7 +8793,7 @@ class TestTokenizer : public TestFixture {
 
     void cpp20_default_bitfield_initializer() {
         const Settings s1 = settingsBuilder().cpp(Standards::CPP20).build();
-        const char code[] = "struct S { int a:2 = 0; };";
+        const char code[] = "struct S { int a:2 = 0; };\n";
         ASSERT_EQUALS("struct S { int a ; a = 0 ; } ;", tokenizeAndStringify(code, s1));
         const Settings s2 = settingsBuilder().cpp(Standards::CPP17).build();
         ASSERT_THROW_INTERNAL(tokenizeAndStringify(code, s2), SYNTAX);
@@ -8108,55 +8801,55 @@ class TestTokenizer : public TestFixture {
 
     void cpp11init() {
         #define testIsCpp11init(...) testIsCpp11init_(__FILE__, __LINE__, __VA_ARGS__)
-        auto testIsCpp11init_ = [this](const char* file, int line, const char* code, const char* find, TokenImpl::Cpp11init expected) {
+        auto testIsCpp11init_ = [this](const char* file, int line, const std::string& code, const char* find, Token::Cpp11init expected) {
             SimpleTokenizer tokenizer(settingsDefault, *this);
-            ASSERT_LOC(tokenizer.tokenize(code), file, line);
+            ASSERT_LOC(tokenizer.tokenize(code.data(), code.size()), file, line);
 
             const Token* tok = Token::findsimplematch(tokenizer.tokens(), find, strlen(find));
             ASSERT_LOC(tok, file, line);
             ASSERT_LOC(tok->isCpp11init() == expected, file, line);
         };
 
-        testIsCpp11init("class X : public A<int>, C::D {};",
+        testIsCpp11init("class X : public A<int>, C::D {};\n",
                         "D {",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
-        testIsCpp11init("auto f() -> void {}",
+        testIsCpp11init("auto f() -> void {}\n",
                         "void {",
-                        TokenImpl::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() & -> void {}",
+                        Token::Cpp11init::NOINIT);
+        testIsCpp11init("auto f() & -> void {}\n",
                         "void {",
-                        TokenImpl::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() const noexcept(false) -> void {}",
+                        Token::Cpp11init::NOINIT);
+        testIsCpp11init("auto f() const noexcept(false) -> void {}\n",
                         "void {",
-                        TokenImpl::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
+                        Token::Cpp11init::NOINIT);
+        testIsCpp11init("auto f() -> std::vector<int> { return {}; }\n",
                         "{ return",
-                        TokenImpl::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
+                        Token::Cpp11init::NOINIT);
+        testIsCpp11init("auto f() -> std::vector<int> { return {}; }\n",
                         "vector",
-                        TokenImpl::Cpp11init::NOINIT);
-        testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
+                        Token::Cpp11init::NOINIT);
+        testIsCpp11init("auto f() -> std::vector<int> { return {}; }\n",
                         "std ::",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
-        testIsCpp11init("class X{};",
+        testIsCpp11init("class X{};\n",
                         "{ }",
-                        TokenImpl::Cpp11init::NOINIT);
-        testIsCpp11init("class X{}", // forgotten ; so not properly recognized as a class
+                        Token::Cpp11init::NOINIT);
+        testIsCpp11init("class X{}\n", // forgotten ; so not properly recognized as a class
                         "{ }",
-                        TokenImpl::Cpp11init::CPP11INIT);
+                        Token::Cpp11init::CPP11INIT);
 
-        testIsCpp11init("namespace abc::def { TEST(a, b) {} }",
+        testIsCpp11init("namespace abc::def { TEST(a, b) {} }\n",
                         "{ TEST",
-                        TokenImpl::Cpp11init::NOINIT);
-        testIsCpp11init("namespace { TEST(a, b) {} }", // anonymous namespace
+                        Token::Cpp11init::NOINIT);
+        testIsCpp11init("namespace { TEST(a, b) {} }\n", // anonymous namespace
                         "{ TEST",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
-        testIsCpp11init("enum { e = decltype(s)::i };",
+        testIsCpp11init("enum { e = decltype(s)::i };\n",
                         "{ e",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("template <typename T>\n" // #11378
                         "class D<M<T, 1>> : public B<M<T, 1>, T> {\n"
@@ -8164,7 +8857,7 @@ class TestTokenizer : public TestFixture {
                         "    D(int x) : B<M<T, 1>, T>(x) {}\n"
                         "};\n",
                         "{ public:",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("template <typename T>\n"
                         "class D<M<T, 1>> : B<M<T, 1>, T> {\n"
@@ -8172,7 +8865,7 @@ class TestTokenizer : public TestFixture {
                         "    D(int x) : B<M<T, 1>, T>(x) {}\n"
                         "};\n",
                         "{ public:",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("using namespace std;\n"
                         "namespace internal {\n"
@@ -8182,21 +8875,21 @@ class TestTokenizer : public TestFixture {
                         "    S::S() {}\n"
                         "}\n",
                         "{ } }",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("template <std::size_t N>\n"
                         "struct C : public C<N - 1>, public B {\n"
                         "    ~C() {}\n"
                         "};\n",
                         "{ } }",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("struct S { int i; } s;\n"
                         "struct T : decltype (s) {\n"
                         "    T() : decltype(s) ({ 0 }) { }\n"
                         "};\n",
                         "{ } }",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("struct S {};\n"
                         "template<class... Args>\n"
@@ -8206,21 +8899,33 @@ class TestTokenizer : public TestFixture {
                         "    void operator()(Args...) {}\n"
                         "};\n",
                         "{ void",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("struct S {\n"
                         "    std::uint8_t* p;\n"
                         "    S() : p{ new std::uint8_t[1]{} } {}\n"
                         "};\n",
                         "{ } } {",
-                        TokenImpl::Cpp11init::CPP11INIT);
+                        Token::Cpp11init::CPP11INIT);
 
         testIsCpp11init("struct S {\n"
                         "    S() : p{new (malloc(4)) int{}} {}\n"
                         "    int* p;\n"
                         "};\n",
                         "{ } } {",
-                        TokenImpl::Cpp11init::CPP11INIT);
+                        Token::Cpp11init::CPP11INIT);
+
+        testIsCpp11init("void f() { g([]() {}, { 1 }); }\n",
+                        "{ 1",
+                        Token::Cpp11init::CPP11INIT);
+
+        testIsCpp11init("int a[2]{ 1, 2 }; \n",
+                        "{ 1",
+                        Token::Cpp11init::CPP11INIT);
+
+        testIsCpp11init("void f() { g([] { if (int x = 1; x) {} }); }\n", // #14790
+                        "{ int",
+                        Token::Cpp11init::NOINIT); // don't hang
 
         ASSERT_NO_THROW(tokenizeAndStringify("template<typename U> struct X {};\n" // don't crash
                                              "template<typename T> auto f(T t) -> X<decltype(t + 1)> {}\n"));
@@ -8327,14 +9032,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void testDirectiveIncludeLocations() {
+        ScopedFile inc1("inc1.h", "#define macro2 val\n#include \"inc2.h\"\n#define macro4 val\n");
+        ScopedFile inc2("inc2.h", "#define macro3 val\n");
+        // TODO: preprocess?
         const char filedata[] = "#define macro1 val\n"
-                                "#file \"inc1.h\"\n"
-                                "#define macro2 val\n"
-                                "#file \"inc2.h\"\n"
-                                "#define macro3 val\n"
-                                "#endfile\n"
-                                "#define macro4 val\n"
-                                "#endfile\n"
+                                "#include \"inc1.h\"\n"
                                 "#define macro5 val\n";
         const char dumpdata[] = "  <directivelist>\n"
                                 "    <directive file=\"test.c\" linenr=\"1\" str=\"#define macro1 val\">\n"
@@ -8345,8 +9047,14 @@ class TestTokenizer : public TestFixture {
                                 "    </directive>\n"
                                 "    <directive file=\"test.c\" linenr=\"2\" str=\"#include &quot;inc1.h&quot;\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
-                                "      <token column=\"2\" str=\"file\"/>\n"
-                                "      <token column=\"7\" str=\"&quot;inc1.h&quot;\"/>\n"
+                                "      <token column=\"2\" str=\"include\"/>\n"
+                                "      <token column=\"10\" str=\"&quot;inc1.h&quot;\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#define macro5 val\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"define\"/>\n"
+                                "      <token column=\"9\" str=\"macro5\"/>\n"
+                                "      <token column=\"16\" str=\"val\"/>\n"
                                 "    </directive>\n"
                                 "    <directive file=\"inc1.h\" linenr=\"1\" str=\"#define macro2 val\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
@@ -8356,14 +9064,8 @@ class TestTokenizer : public TestFixture {
                                 "    </directive>\n"
                                 "    <directive file=\"inc1.h\" linenr=\"2\" str=\"#include &quot;inc2.h&quot;\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
-                                "      <token column=\"2\" str=\"file\"/>\n"
-                                "      <token column=\"7\" str=\"&quot;inc2.h&quot;\"/>\n"
-                                "    </directive>\n"
-                                "    <directive file=\"inc2.h\" linenr=\"1\" str=\"#define macro3 val\">\n"
-                                "      <token column=\"1\" str=\"#\"/>\n"
-                                "      <token column=\"2\" str=\"define\"/>\n"
-                                "      <token column=\"9\" str=\"macro3\"/>\n"
-                                "      <token column=\"16\" str=\"val\"/>\n"
+                                "      <token column=\"2\" str=\"include\"/>\n"
+                                "      <token column=\"10\" str=\"&quot;inc2.h&quot;\"/>\n"
                                 "    </directive>\n"
                                 "    <directive file=\"inc1.h\" linenr=\"3\" str=\"#define macro4 val\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
@@ -8371,10 +9073,10 @@ class TestTokenizer : public TestFixture {
                                 "      <token column=\"9\" str=\"macro4\"/>\n"
                                 "      <token column=\"16\" str=\"val\"/>\n"
                                 "    </directive>\n"
-                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#define macro5 val\">\n"
+                                "    <directive file=\"inc2.h\" linenr=\"1\" str=\"#define macro3 val\">\n"
                                 "      <token column=\"1\" str=\"#\"/>\n"
                                 "      <token column=\"2\" str=\"define\"/>\n"
-                                "      <token column=\"9\" str=\"macro5\"/>\n"
+                                "      <token column=\"9\" str=\"macro3\"/>\n"
                                 "      <token column=\"16\" str=\"val\"/>\n"
                                 "    </directive>\n"
                                 "  </directivelist>\n"
@@ -8474,7 +9176,7 @@ class TestTokenizer : public TestFixture {
     }
 
     void genericInIf() { // #13561
-        const char code[] = "  if (_Generic(s, char * : 1, const float * : (a ? b, c : d), volatile int * : 3, default : 0)) {}";
+        const char code[] = "  if (_Generic(s, char * : 1, const float * : (a ? b, c : d), volatile int * : 3, default : 0)) {}\n";
         const char ast[] = "(( if (( _Generic (, (, (, (, s 1) (? a (: (, b c) d))) 3) 0)))";
         ASSERT_EQUALS(ast, testAst(code, AstStyle::Z3));
     }
@@ -8512,29 +9214,29 @@ class TestTokenizer : public TestFixture {
                             "    if (fp_t const fp = s.g<fp_t>()) {}\n"
                             "}\n";
         ASSERT_NO_THROW(tokenizeAndStringify(code));
-        ASSERT_EQUALS("void ( * const f ) ( ) ;", tokenizeAndStringify("typedef void (*fp_t)(); fp_t const f;"));
+        ASSERT_EQUALS("void ( * const f ) ( ) ;", tokenizeAndStringify("typedef void (*fp_t)(); fp_t const f;\n"));
     }
 
     void simplifyPlatformTypes() {
         {
-            const char code[] = "size_t f();";
-            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, true, Platform::Type::Unix32));
-            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, true, Platform::Type::Unix64));
+            const char code[] = "size_t f();\n";
+            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, settings2_unix32));
+            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, settings2_unix64));
         }
         {
-            const char code[] = "ssize_t f();";
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, true, Platform::Type::Unix32));
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, true, Platform::Type::Unix64));
+            const char code[] = "ssize_t f();\n";
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix32));
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix64));
         }
         {
-            const char code[] = "std::ptrdiff_t f();";
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, true, Platform::Type::Unix32));
-            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, true, Platform::Type::Unix64));
+            const char code[] = "std::ptrdiff_t f();\n";
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix32));
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, settings2_unix64));
         }
     }
 
     void dumpFallthrough() {
-        const char * code = "void f(int n) {\n"
+        const char code[] = "void f(int n) {\n"
                             "    void g(), h(), i();\n"
                             "    switch (n) {\n"
                             "        case 1:\n"
@@ -8548,7 +9250,7 @@ class TestTokenizer : public TestFixture {
                             "            i();\n"
                             "            break;\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         SimpleTokenizer tokenizer(settingsDefault, *this, false);
         ASSERT(tokenizer.tokenize(code));
         std::ostringstream ostr;
@@ -8556,55 +9258,36 @@ class TestTokenizer : public TestFixture {
         const std::string dump = ostr.str();
         ASSERT(dump.find(" isAttributeFallthrough=\"true\"") != std::string::npos);
     }
-};
-
-REGISTER_TEST(TestTokenizer)
 
-class TestTokenizerCompileLimits : public TestFixture
-{
-public:
-    TestTokenizerCompileLimits() : TestFixture("TestTokenizerCompileLimits") {}
-
-private:
-    void run() override
-    {
-        TEST_CASE(test); // #5592 crash: gcc: testsuit: gcc.c-torture/compile/limits-declparen.c
+    void simplifyRedundantParentheses() {
+        const char code[] = "int f(struct S s) {\n"
+                            "    return g(1, &(int){ s.i });\n"
+                            "}\n";
+        SimpleTokenizer tokenizer(settingsDefault, *this, false);
+        ASSERT_NO_THROW(tokenizer.tokenize(code));
     }
 
-#define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeAndStringify_(const char* file, int linenr, const std::string& code) {
-        // tokenize..
+    void simplifyEnum1() {
+        const char code[] = "static enum {A,B} ab;\n";
+        ASSERT_EQUALS("enum Anonymous0 { A , B } ; static enum Anonymous0 ab ;", tokenizeAndStringify(code));
         SimpleTokenizer tokenizer(settingsDefault, *this);
-        ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
-
-        if (tokenizer.tokens())
-            return tokenizer.tokens()->stringifyList(false, true, false, true, false, nullptr, nullptr);
-        return "";
+        tokenizer.tokenize(code);
+        const Token* tok = Token::findsimplematch(tokenizer.tokens(), "static");
+        ASSERT(tok);
+        ASSERT_EQUALS(tok->column(), 1);
+        ASSERT_EQUALS(tok->next()->column(), 8);
     }
 
-    void test() {
-        const char raw_code[] = "#define PTR1 (* (* (* (*\n"
-                                "#define PTR2 PTR1 PTR1 PTR1 PTR1\n"
-                                "#define PTR3 PTR2 PTR2 PTR2 PTR2\n"
-                                "#define PTR4 PTR3 PTR3 PTR3 PTR3\n"
-                                "\n"
-                                "#define RBR1 ) ) ) )\n"
-                                "#define RBR2 RBR1 RBR1 RBR1 RBR1\n"
-                                "#define RBR3 RBR2 RBR2 RBR2 RBR2\n"
-                                "#define RBR4 RBR3 RBR3 RBR3 RBR3\n"
-                                "\n"
-                                "int PTR4 q4_var RBR4 = 0;\n";
-
-        // Preprocess file..
-        std::istringstream fin(raw_code);
-        simplecpp::OutputList outputList;
-        std::vector<std::string> files;
-        const simplecpp::TokenList tokens1(fin, files, "", &outputList);
-        const std::string filedata = tokens1.stringify();
-        const std::string code = PreprocessorHelper::getcode(settingsDefault, *this, filedata, "", "test.c");
-
-        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify(code), AST, "maximum AST depth exceeded");
+    void simplifyEnum2() {
+        const char code[] = "enum AB {A,B}; enum AB static ab; \n";
+        ASSERT_EQUALS("enum AB { A , B } ; static enum AB ab ;", tokenizeAndStringify(code));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        tokenizer.tokenize(code);
+        const Token* tok = Token::findsimplematch(tokenizer.tokens(), "static");
+        ASSERT(tok);
+        ASSERT_EQUALS(tok->column(), 24);
+        ASSERT_EQUALS(tok->next()->column(), 16);
     }
 };
 
-REGISTER_TEST(TestTokenizerCompileLimits)
+REGISTER_TEST(TestTokenizer)
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
index 9815c3f31be..0374ad6b4a2 100644
--- a/test/testtokenlist.cpp
+++ b/test/testtokenlist.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2024 Cppcheck team.
+ * Copyright (C) 2007-2025 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
@@ -26,7 +26,6 @@
 #include "token.h"
 #include "tokenlist.h"
 
-#include <sstream>
 #include <stack>
 #include <string>
 #include <utility>
@@ -66,7 +65,7 @@ class TestTokenList : public TestFixture {
     }
 
     void inc() const {
-        const char code[] = "a++1;1++b;";
+        const char code[] = "a++1;1++b;\n";
 
         const SimpleTokenList tokenlist(code);
         ASSERT(Token::simpleMatch(tokenlist.front(), "a + + 1 ; 1 + + b ;"));
@@ -74,7 +73,7 @@ class TestTokenList : public TestFixture {
 
     void isKeyword() const {
 
-        const char code[] = "for a int delete true";
+        const char code[] = "for a int delete true\n";
 
         {
             const SimpleTokenList tokenlist(code, Standards::Language::C);
@@ -110,46 +109,44 @@ class TestTokenList : public TestFixture {
         }
 
         {
-            const char code2[] = "_Generic"; // C11 keyword
+            const char code2[] = "_Generic\n"; // C11 keyword
             const SimpleTokenList tokenlist(code2); // default settings use latest standard
             ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "_Generic"; // C11 keyword
+            const char code2[] = "_Generic\n"; // C11 keyword
             const SimpleTokenList tokenlist(code2, Standards::Language::C); // default settings use latest standard
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "_Generic"; // C11 keyword
+            const char code2[] = "_Generic\n"; // C11 keyword
             const Settings s = settingsBuilder().c(Standards::C89).build();
             TokenList tokenlist(s, Standards::Language::C);
-            std::istringstream istr(code2);
             tokenlist.appendFileIfNew("a.c");
-            ASSERT(tokenlist.createTokens(istr));
+            ASSERT(tokenlist.createTokensFromString(code2));
             ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "co_return"; // C++20 keyword
+            const char code2[] = "co_return\n"; // C++20 keyword
             const SimpleTokenList tokenlist(code2); // default settings use latest standard
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "co_return"; // C++20 keyword
+            const char code2[] = "co_return\n"; // C++20 keyword
             const SimpleTokenList tokenlist(code2, Standards::Language::C); // default settings use latest standard
             ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
         }
 
         {
-            const char code2[] = "noexcept"; // C++11 keyword
+            const char code2[] = "noexcept\n"; // C++11 keyword
             const Settings s = settingsBuilder().cpp(Standards::CPP03).build();
             TokenList tokenlist(s, Standards::Language::CPP);
-            std::istringstream istr(code2);
             tokenlist.appendFileIfNew("a.cpp");
-            ASSERT(tokenlist.createTokens(istr));
+            ASSERT(tokenlist.createTokensFromString(code2));
             ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
         }
     }
@@ -157,22 +154,22 @@ class TestTokenList : public TestFixture {
     void notokens() {
         // analyzing /usr/include/poll.h caused Path::identify() to be called with an empty filename from
         // TokenList::determineCppC() because there are no tokens
-        const char code[] = "#include <sys/poll.h>";
-        std::istringstream istr(code);
+        const char code[] = "#include <sys/poll.h>\n";
         std::vector<std::string> files;
-        simplecpp::TokenList tokens1(istr, files, "poll.h", nullptr);
-        Preprocessor preprocessor(settingsDefault, *this, Path::identify(tokens1.getFiles()[0], false));
-        simplecpp::TokenList tokensP = preprocessor.preprocess(tokens1, "", files, true);
+        simplecpp::TokenList tokens1(code, files, "poll.h", {}, nullptr);
+        Preprocessor preprocessor(tokens1, settingsDefault, *this, Path::identify(tokens1.getFiles()[0], false));
+        simplecpp::OutputList outputList_pp;
+        simplecpp::TokenList tokensP = preprocessor.preprocess("", files, outputList_pp);
+        ASSERT(!preprocessor.reportOutput(outputList_pp, true));
         TokenList tokenlist(settingsDefault, Standards::Language::C); // headers are treated as C files
         tokenlist.createTokens(std::move(tokensP)); // do not assert
     }
 
     void ast1() const {
-        const std::string s = "('Release|x64' == 'Release|x64');";
+        const char code[] = "('Release|x64' == 'Release|x64');\n";
 
         TokenList tokenlist(settingsDefault, Standards::Language::C);
-        std::istringstream istr(s);
-        ASSERT(tokenlist.createTokens(istr));
+        ASSERT(tokenlist.createTokensFromString(code));
         // TODO: put this logic in TokenList
         // generate links
         {
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
index e27e6c5b038..f2ac218fec2 100644
--- a/test/testtokenrange.cpp
+++ b/test/testtokenrange.cpp
@@ -67,19 +67,19 @@ class TestTokenRange : public TestFixture {
     }
 
     void enumerationToEnd() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         ASSERT_EQUALS("", testTokenRange(ConstTokenRange{ tokenList.front(), nullptr }, tokenList.front(), nullptr));
     }
 
     void untilHelperToEnd() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         ASSERT_EQUALS("", testTokenRange(tokenList.front()->until(nullptr), tokenList.front(), nullptr));
     }
 
     void untilHelperPartWay() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         const Token* start = tokenList.front()->tokAt(4);
         const Token* end = start->tokAt(8);
@@ -87,7 +87,7 @@ class TestTokenRange : public TestFixture {
     }
 
     void partialEnumeration() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         const Token* start = tokenList.front()->tokAt(4);
         const Token* end = tokenList.front()->tokAt(10);
@@ -96,7 +96,7 @@ class TestTokenRange : public TestFixture {
 
     void scopeExample() {
         SimpleTokenizer tokenizer(settingsDefault, *this);
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         ASSERT(tokenizer.tokenize(code));
 
         const SymbolDatabase* sd = tokenizer.getSymbolDatabase();
@@ -110,7 +110,7 @@ class TestTokenRange : public TestFixture {
     }
 
     void exampleAlgorithms() const {
-        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const char code[] = "void a(){} void main(){ if(true){a();} }\n";
         const SimpleTokenList tokenList(code);
         ConstTokenRange range{ tokenList.front(), nullptr };
         ASSERT_EQUALS(true, std::all_of(range.begin(), range.end(), [](const Token*) {
diff --git a/test/testtype.cpp b/test/testtype.cpp
index 2f15f816a39..a8617beb01d 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -26,7 +26,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestType : public TestFixture {
 public:
@@ -49,8 +48,7 @@ class TestType : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() = default;
-        const Settings* settings = nullptr;
+        const Settings* settings = nullptr; // TODO: split from this
         Standards::cppstd_t standard = Standards::cppstd_t::CPP11;
     };
 
@@ -63,8 +61,8 @@ class TestType : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckType>(tokenizer, this);
+        CheckType check;
+        runChecks(check, tokenizer, *this);
     }
 
     // TODO: get rid of this
@@ -75,13 +73,12 @@ class TestType : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckType>(tokenizer, this);
+        CheckType check;
+        runChecks(check, tokenizer, *this);
     }
 
     struct CheckPOptions
     {
-        CheckPOptions() = default;
         const Settings* settings = nullptr;
         bool cpp = true;
     };
@@ -96,8 +93,8 @@ class TestType : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check..
-        runChecks<CheckType>(tokenizer, this);
+        CheckType check;
+        runChecks(check, tokenizer, *this);
     }
 
     void checkTooBigShift_Unix32() {
@@ -106,16 +103,16 @@ class TestType : public TestFixture {
         // unsigned types getting promoted to int sizeof(int) = 4 bytes
         // and unsigned types having already a size of 4 bytes
         {
-            const std::string types[] = {"unsigned char", /*[unsigned]*/ "char", "bool", "unsigned short", "unsigned int", "unsigned long"};
+            const std::string types[] = {"unsigned char", "bool", "unsigned short", "unsigned int", "unsigned long"};
             for (const std::string& type : types) {
-                check(type + " f(" + type +" x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("", errout_str());
-                check(type + " f(" + type +" x) { return x << 33; }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 33 bits is undefined behaviour\n", errout_str());
-                check(type + " f(int x) { return (x = (" + type + ")x << 32); }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str());
-                check(type + " foo(" + type + " x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings));
-                ASSERT_EQUALS("", errout_str());
+                check(type + " f(" + type +" x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("", errout_str(), type);
+                check(type + " f(" + type +" x) { return x << 33; }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("[test.cpp:1]: (error) Shifting 32-bit value by 33 bits is undefined behaviour\n", errout_str(), type);
+                check(type + " f(int x) { return (x = (" + type + ")x << 32); }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str(), type);
+                check(type + " foo(" + type + " x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings));
+                ASSERT_EQUALS_MSG("", errout_str(), type);
             }
         }
         // signed types getting promoted to int sizeof(int) = 4 bytes
@@ -124,68 +121,68 @@ class TestType : public TestFixture {
             const std::string types[] = {"signed char", "signed short", /*[signed]*/ "short", "wchar_t", /*[signed]*/ "int", "signed int", /*[signed]*/ "long", "signed long"};
             for (const std::string& type : types) {
                 // c++11
-                check(type + " f(" + type +" x) { return x << 33; }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " f(" + type +" x) { return x << 33; }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 33 bits is undefined behaviour\n", errout_str());
-                check(type + " f(int x) { return (x = (" + type + ")x << 32); }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " f(int x) { return (x = (" + type + ")x << 32); }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str());
-                check(type + " foo(" + type + " x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " foo(" + type + " x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting signed 32-bit value by 31 bits is undefined behaviour\n", errout_str());
-                check(type + " foo(" + type + " x) { return x << 30; }", dinit(CheckOptions, $.settings = &settings));
+                check(type + " foo(" + type + " x) { return x << 30; }\n", dinit(CheckOptions, $.settings = &settings));
                 ASSERT_EQUALS("", errout_str());
 
                 // c++14
-                check(type + " foo(" + type + " x) { return x << 31; }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+                check(type + " foo(" + type + " x) { return x << 31; }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
                 ASSERT_EQUALS("[test.cpp:1]: (portability) Shifting signed 32-bit value by 31 bits is implementation-defined behaviour\n", errout_str());
-                check(type + " f(int x) { return (x = (" + type + ")x << 32); }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+                check(type + " f(int x) { return (x = (" + type + ")x << 32); }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
                 ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n", errout_str());
             }
         }
         // 64 bit width types
         {
             // unsigned long long
-            check("unsigned long long foo(unsigned long long x) { return x << 64; }",dinit(CheckOptions, $.settings = &settings));
+            check("unsigned long long foo(unsigned long long x) { return x << 64; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("unsigned long long f(int x) { return (x = (unsigned long long)x << 64); }",dinit(CheckOptions, $.settings = &settings));
+            check("unsigned long long f(int x) { return (x = (unsigned long long)x << 64); }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("unsigned long long f(unsigned long long x) { return x << 63; }",dinit(CheckOptions, $.settings = &settings));
+            check("unsigned long long f(unsigned long long x) { return x << 63; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
             // [signed] long long
-            check("long long foo(long long x) { return x << 64; }",dinit(CheckOptions, $.settings = &settings));
+            check("long long foo(long long x) { return x << 64; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("long long f(int x) { return (x = (long long)x << 64); }",dinit(CheckOptions, $.settings = &settings));
+            check("long long f(int x) { return (x = (long long)x << 64); }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("long long f(long long x) { return x << 63; }",dinit(CheckOptions, $.settings = &settings));
+            check("long long f(long long x) { return x << 63; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting signed 64-bit value by 63 bits is undefined behaviour\n", errout_str());
-            check("long long f(long long x) { return x << 62; }",dinit(CheckOptions, $.settings = &settings));
+            check("long long f(long long x) { return x << 62; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
             // signed long long
-            check("signed long long foo(signed long long x) { return x << 64; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long foo(signed long long x) { return x << 64; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 63; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(signed long long x) { return x << 63; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting signed 64-bit value by 63 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 62; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(signed long long x) { return x << 62; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
 
             // c++14
-            check("signed long long foo(signed long long x) { return x << 64; }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+            check("signed long long foo(signed long long x) { return x << 64; }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+            check("signed long long f(long long x) { return (x = (signed long long)x << 64); }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
             ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 64-bit value by 64 bits is undefined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 63; }", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
+            check("signed long long f(signed long long x) { return x << 63; }\n", dinit(CheckOptions, $.settings = &settings, $.standard = Standards::CPP14));
             ASSERT_EQUALS("[test.cpp:1]: (portability) Shifting signed 64-bit value by 63 bits is implementation-defined behaviour\n", errout_str());
-            check("signed long long f(signed long long x) { return x << 62; }",dinit(CheckOptions, $.settings = &settings));
+            check("signed long long f(signed long long x) { return x << 62; }\n",dinit(CheckOptions, $.settings = &settings));
             ASSERT_EQUALS("", errout_str());
         }
 
-        check("void f() { int x; x = 1 >> 64; }", dinit(CheckOptions, $.settings = &settings));
+        check("void f() { int x; x = 1 >> 64; }\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 64 bits is undefined behaviour\n", errout_str());
 
         check("void foo() {\n"
               "  QList<int> someList;\n"
               "  someList << 300;\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #6793
@@ -193,14 +190,14 @@ class TestType : public TestFixture {
               "const unsigned int f = foo<31>(0);\n"
               "const unsigned int g = foo<100>(0);\n"
               "template<unsigned int I> int hoo(unsigned int x) { return x << 32; }\n"
-              "const unsigned int h = hoo<100>(0);", dinit(CheckOptions, $.settings = &settings));
+              "const unsigned int h = hoo<100>(0);\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:4]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n"
                       "[test.cpp:1]: (error) Shifting 32-bit value by 100 bits is undefined behaviour\n", errout_str());
 
         // #7266: C++, shift in macro
         check("void f(unsigned int x) {\n"
               "    UINFO(x << 1234);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8640
@@ -210,7 +207,7 @@ class TestType : public TestFixture {
               "    constexpr const int shift[1] = {32};\n"
               "    constexpr const int ret = a << shift[0];\n" // shift too many bits
               "    return ret;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5]: (error) Shifting 32-bit value by 32 bits is undefined behaviour\n"
                       "[test.cpp:5]: (error) Signed integer overflow for expression 'a<<shift[0]'.\n", errout_str());
 
@@ -221,7 +218,7 @@ class TestType : public TestFixture {
               "  if (k > 32)\n"
               "    return 0;\n"
               "  return rm>> k;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4] -> [test.cpp:6]: (warning) Shifting signed 32-bit value by 31 bits is undefined behaviour. See condition at line 4.\n",
             errout_str());
@@ -233,7 +230,7 @@ class TestType : public TestFixture {
               "    return 0;\n"
               "  else\n"
               "    return rm>> k;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4] -> [test.cpp:7]: (warning) Shifting signed 32-bit value by 31 bits is undefined behaviour. See condition at line 4.\n",
             errout_str());
@@ -245,20 +242,20 @@ class TestType : public TestFixture {
               "    return 0;\n"
               "  else\n"
               "    return rm>> k;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("static long long f(int x, long long y) {\n"
               "    if (x >= 64)\n"
               "        return 0;\n"
               "    return -(y << (x-1));\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    std::ofstream outfile;\n"
               "    outfile << vec_points[0](0) << static_cast<int>(d) << ' ';\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned b, int len, unsigned char rem) {\n" // #10773
@@ -276,45 +273,45 @@ class TestType : public TestFixture {
     void checkIntegerOverflow() {
         const Settings settings = settingsBuilder().severity(Severity::warning).platform(Platform::Type::Unix32).build();
 
-        check("x = (int)0x10000 * (int)0x10000;", dinit(CheckOptions, $.settings = &settings));
+        check("x = (int)0x10000 * (int)0x10000;\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:1:18]: (error) Signed integer overflow for expression '(int)0x10000*(int)0x10000'. [integerOverflow]\n", errout_str());
 
-        check("x = (long)0x10000 * (long)0x10000;", dinit(CheckOptions, $.settings = &settings));
+        check("x = (long)0x10000 * (long)0x10000;\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:1:19]: (error) Signed integer overflow for expression '(long)0x10000*(long)0x10000'. [integerOverflow]\n", errout_str());
 
         check("void foo() {\n"
               "    int intmax = 0x7fffffff;\n"
               "    return intmax + 1;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Signed integer overflow for expression 'intmax+1'. [integerOverflow]\n", errout_str());
 
         check("void foo() {\n"
               "    int intmax = 0x7fffffff;\n"
               "    return intmax - 1;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("int foo(signed int x) {\n"
               "   if (x==123456) {}\n"
               "   return x * x;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:13]: (warning) Either the condition 'x==123456' is redundant or there is signed integer overflow for expression 'x*x'. [integerOverflowCond]\n", errout_str());
 
         check("int foo(signed int x) {\n"
               "   if (x==123456) {}\n"
               "   return -123456 * x;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:19]: (warning) Either the condition 'x==123456' is redundant or there is signed integer underflow for expression '-123456*x'. [integerOverflowCond]\n", errout_str());
 
         check("int foo(signed int x) {\n"
               "   if (x==123456) {}\n"
               "   return 123456U * x;\n"
-              "}",dinit(CheckOptions, $.settings = &settings));
+              "}\n",dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int i) {\n" // #12117
               "    return (i == 31) ? 1 << i : 0;\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:2:26]: (warning) Shifting signed 32-bit value by 31 bits is undefined behaviour. See condition at line 2. [shiftTooManyBitsSigned]\n", errout_str());
 
         check("void f() {\n" // #13092
@@ -322,7 +319,7 @@ class TestType : public TestFixture {
               "    for (int i = 0; i < 10; i++) {\n"
               "        n = n * 47163 - 57412;\n"
               "    }\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Signed integer underflow for expression 'n*47163'. [integerOverflow]\n"
                       "[test.cpp:4:23]: (error) Signed integer underflow for expression 'n*47163-57412'. [integerOverflow]\n",
                       errout_str());
@@ -330,22 +327,22 @@ class TestType : public TestFixture {
 
     void signConversion() {
         const Settings settings = settingsBuilder().platform(Platform::Type::Unix64).build();
-        check("x = -4 * (unsigned)y;");
+        check("x = -4 * (unsigned)y;\n");
         ASSERT_EQUALS("[test.cpp:1:6]: (warning) Expression '-4' has a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n", errout_str());
 
-        check("x = (unsigned)y * -4;");
+        check("x = (unsigned)y * -4;\n");
         ASSERT_EQUALS("[test.cpp:1:20]: (warning) Expression '-4' has a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n", errout_str());
 
         check("unsigned int dostuff(int x) {\n" // x is signed
               "  if (x==0) {}\n"
               "  return (x-1)*sizeof(int);\n"
-              "}", dinit(CheckOptions, $.settings = &settings));
+              "}\n", dinit(CheckOptions, $.settings = &settings));
         ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:3:12]: (warning) Expression 'x-1' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversionCond]\n", errout_str());
 
         check("unsigned int f1(signed int x, unsigned int y) {" // x is signed
               "  return x * y;\n"
               "}\n"
-              "void f2() { f1(-4,4); }");
+              "void f2() { f1(-4,4); }\n");
         ASSERT_EQUALS(
             "[test.cpp:1:57]: (warning) Expression 'x' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n",
             errout_str());
@@ -353,7 +350,7 @@ class TestType : public TestFixture {
         check("unsigned int f1(int x) {"
               "  return x * 5U;\n"
               "}\n"
-              "void f2() { f1(-4); }");
+              "void f2() { f1(-4); }\n");
         ASSERT_EQUALS(
             "[test.cpp:1:34]: (warning) Expression 'x' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n",
             errout_str());
@@ -361,19 +358,19 @@ class TestType : public TestFixture {
         check("unsigned int f1(int x) {" // #6168: FP for inner calculation
               "  return 5U * (1234 - x);\n" // <- signed subtraction, x is not sign converted
               "}\n"
-              "void f2() { f1(-4); }");
+              "void f2() { f1(-4); }\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't warn for + and -
         check("void f1(int x) {"
               "  a = x + 5U;\n"
               "}\n"
-              "void f2() { f1(-4); }");
+              "void f2() { f1(-4); }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("size_t foo(size_t x) {\n"
               " return -2 * x;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (warning) Expression '-2' has a negative value. That is converted to an unsigned value and used in an unsigned calculation. [signConversion]\n", errout_str());
 
         checkP("void f() {\n" // #12110 FP signConversion with integer overflow
@@ -468,6 +465,26 @@ class TestType : public TestFixture {
         check(code2, dinit(CheckOptions, $.settings = &settingsWin));
         ASSERT_EQUALS("[test.cpp:2:3]: (style) int result is returned as long long value. If the return value is long long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
 
+        const char code3[] = "long f() {\n"
+                             "    int n = 1;\n"
+                             "    return n << 12;\n"
+                             "}\n";
+        check(code3, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code4[] = "long f(int n) {\n"
+                             "    return n << 12;\n"
+                             "}\n";
+        check(code4, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) int result is returned as long value. If the return value is long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
+
+        const char code5[] = "long f() {\n"
+                             "    unsigned int n = 1U << 20;\n"
+                             "    return n << 20;\n"
+                             "}\n";
+        check(code5, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) int result is returned as long value. If the return value is long to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n", errout_str());
+
         // typedef
         check("size_t f(int x, int y) {\n"
               "  return x * y;\n"
@@ -486,42 +503,42 @@ class TestType : public TestFixture {
     }
 
     void checkFloatToIntegerOverflow() {
-        check("x = (int)1E100;");
+        check("x = (int)1E100;\n");
         ASSERT_EQUALS("[test.cpp:1:5]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (int)1E100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (int)-1E100;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (short)1E6;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (unsigned char)256.0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  return (unsigned char)255.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  char c = 1234.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         check("char f(void) {\n"
               "  return 1234.5;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:2:3]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
 
         checkP("#define TEST(b, f) b ? 5000 : (unsigned short)f\n" // #11685
@@ -591,14 +608,14 @@ class TestType : public TestFixture {
                "int f()\n"
                "{\n"
                "    fun(INT_MIN);\n"
-               "}", dinit(CheckPOptions, $.settings = &s));
+               "}\n", dinit(CheckPOptions, $.settings = &s));
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Signed integer overflow for expression '-x'. [integerOverflow]\n", errout_str());
 
         checkP("void f() {\n" // #8399
                "    int32_t i = INT32_MAX;\n"
                "    i << 1;\n"
                "    i << 2;\n"
-               "}", dinit(CheckPOptions, $.settings = &s));
+               "}\n", dinit(CheckPOptions, $.settings = &s));
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Signed integer overflow for expression 'i<<2'. [integerOverflow]\n", errout_str());
     }
 
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index b7438c13692..1874e020fa8 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,6 +23,7 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
 #include <list>
 #include <string>
 
@@ -75,10 +76,12 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(uninitvar12); // #10218 - stream read
         TEST_CASE(uninitvar13); // #9772
         TEST_CASE(uninitvar14);
+        TEST_CASE(uninitvar15); // #13685
         TEST_CASE(uninitvar_unconditionalTry);
         TEST_CASE(uninitvar_funcptr); // #6404
         TEST_CASE(uninitvar_operator); // #6680
-        TEST_CASE(uninitvar_ternaryexpression); // #4683
+        TEST_CASE(uninitvar_ternaryexpression1); // #4683
+        TEST_CASE(uninitvar_ternaryexpression2); // #14729
         TEST_CASE(uninitvar_pointertoarray);
         TEST_CASE(uninitvar_cpp11ArrayInit); // #7010
         TEST_CASE(uninitvar_rangeBasedFor); // #7078
@@ -96,6 +99,7 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(uninitvar_memberfunction);
         TEST_CASE(uninitvar_nonmember); // crash in ycmd test
         TEST_CASE(uninitvarDesignatedInitializers);
+        TEST_CASE(uninitvarMemberPointer);
 
         TEST_CASE(isVariableUsageDeref); // *p
         TEST_CASE(isVariableUsageDerefValueflow); // *p
@@ -108,22 +112,32 @@ class TestUninitVar : public TestFixture {
 
     struct CheckUninitVarOptions
     {
-        CheckUninitVarOptions() = default;
         bool cpp = true;
-        bool debugwarnings = false;
-        const Settings *s = nullptr;
     };
 
 #define checkUninitVar(...) checkUninitVar_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkUninitVar_(const char* file, int line, const char code[], const CheckUninitVarOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(options.s ? *options.s : settings).debugwarnings(options.debugwarnings).build();
+    template<size_t size>
+    void checkUninitVar_(const char* file, int line, const char (&code)[size], const CheckUninitVarOptions& options = make_default_obj()) {
+        checkUninitVar_(file, line, code, settings, options.cpp);
+    }
 
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+    template<size_t size>
+    void checkUninitVar_(const char* file, int line, const char (&code)[size], const Settings& settings1, bool cpp = true) {
+        SimpleTokenizer tokenizer(settings1, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        // Check for redundant code..
+        CheckUninitVarImpl checkuninitvar(&tokenizer, settings1, *this);
+        checkuninitvar.check();
+    }
+
+    // TODO: get rid of this
+    void checkUninitVar_(const char* file, int line, const std::string& code) {
+        SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for redundant code..
-        CheckUninitVar checkuninitvar(&tokenizer, &settings1, this);
+        CheckUninitVarImpl checkuninitvar(&tokenizer, settings, *this);
         checkuninitvar.check();
     }
 
@@ -134,13 +148,13 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "    int a;\n"
                        "    b = c - a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    int a;\n"
                        "    b = a - c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // Ticket #6455 - some compilers allow const variables to be uninitialized
@@ -148,27 +162,27 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "    const int a;\n"
                        "    b = c - a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
         // extracttests.enable
 
         checkUninitVar("void foo() {\n"
                        "    int *p;\n"
                        "    realloc(p,10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n" // #5240
                        "    char *p = malloc(100);\n"
                        "    char *tmp = realloc(p,1000);\n"
                        "    if (!tmp) free(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    int *p = NULL;\n"
                        "    realloc(p,10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // dereferencing uninitialized pointer..
@@ -177,7 +191,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    Foo *p;\n"
                        "    p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: template<class T> struct Foo { void abcd(); };
@@ -185,7 +199,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    Foo<int> *p;\n"
                        "    p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Foo { void* a; };
@@ -193,90 +207,90 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int a;\n"
                        "    p->a = malloc(4 * a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:23]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    delete p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    delete [] p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    *p = 135;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *p;\n"
                        "    p[0] = 135;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *x;\n"
                        "    int y = *x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int *x;\n"
                        "    int &y(*x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int x;\n"
                        "    int *y = &x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int *x;\n"
                        "    int *&y = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int x = xyz::x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a;\n"
                        "    a = 5 + a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a;\n"
                        "    a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    extern int a;\n"
                        "    a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void bar(int);
@@ -284,28 +298,28 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int a;\n"
                        "    bar(4 * a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int i;\n"
                        "    if (i);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int i;\n"
                        "    for (int x = 0; i < 10; x++);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:21]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int i;\n"
                        "    for (int x = 0; x < 10; i++);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:29]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
@@ -314,7 +328,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        i = 0;\n"
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
@@ -322,7 +336,7 @@ class TestUninitVar : public TestFixture {
                        "    int ar[10];\n"
                        "    int i;\n"
                        "    ar[i] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
@@ -330,13 +344,13 @@ class TestUninitVar : public TestFixture {
                        "    int x, y;\n"
                        "    x = (y = 10);\n"
                        "    int z = y * 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo() {\n"
                        "    int x, y;\n"
                        "    x = ((y) = 10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3597
@@ -344,27 +358,27 @@ class TestUninitVar : public TestFixture {
                        "    int a;\n"
                        "    int b = 1;\n"
                        "    (b += a) = 1;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    int a,b,c;\n"
                        "    a = b = c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:0]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    Foo p;\n"
                        "    p.abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    Foo p;\n"
                        "    int x = p.abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown types
@@ -374,7 +388,7 @@ class TestUninitVar : public TestFixture {
                            "{\n"
                            "    A ret;\n"
                            "    return ret;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void a()\n"
@@ -391,7 +405,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f(float x) {\n"
                        "  union lf { long l; float f; } u_lf;\n"
                        "  float hx = (u_lf.f = (x), u_lf.l);\n"
-                       "}",
+                       "}\n",
                        dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
@@ -399,7 +413,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int x[10];\n"
                        "    int *y = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
@@ -408,7 +422,7 @@ class TestUninitVar : public TestFixture {
                        "    int *y = &x;\n"
                        "    *y = 0;\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
@@ -417,7 +431,7 @@ class TestUninitVar : public TestFixture {
                        "    char *z = x;\n"
                        "    memset(z, 0, sizeof(x));\n"
                        "    memcpy(y, x, sizeof(x));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Handling >> and <<
@@ -426,26 +440,26 @@ class TestUninitVar : public TestFixture {
                            "    int ret;\n"
                            "    std::cin >> ret;\n"
                            "    ret++;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f(int b) {\n"
                            "    int a;\n"
                            "    std::cin >> b >> a;\n"
                            "    return a;"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    int ret[2];\n"
                            "    std::cin >> ret[0];\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f(int i) {\n"
                            "    int a;\n"
                            "    i >> a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:10]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("int a() {\n"
@@ -459,14 +473,14 @@ class TestUninitVar : public TestFixture {
                            "    Node node;\n"
                            "    int x;\n"
                            "    node[\"abcd\"] >> x;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("int a(FArchive &arc) {\n"   // #3060 (initialization through operator<<)
                            "    int *p;\n"
                            "    arc << p;\n" // <- TODO initialization?
                            "    return *p;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void a() {\n"
@@ -481,32 +495,32 @@ class TestUninitVar : public TestFixture {
                            "    int a;\n"
                            "    a << 1;\n"  // <- TODO initialization?
                            "    return a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             // #4673
             checkUninitVar("void f() {\n"
                            "    int a;\n"
                            "    std::cout << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:18]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void f(std::ostringstream& os) {\n"
                            "    int a;\n"
                            "    os << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:11]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    int a;\n"
                            "    std::cout << 1 << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void f(std::ostringstream& os) {\n"
                            "    int a;\n"
                            "    os << 1 << a;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             {
@@ -514,25 +528,25 @@ class TestUninitVar : public TestFixture {
                 checkUninitVar("void f() {\n"
                                "  char *p = new char[10];\n"
                                "  std::cout << (void *)p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << (void *)p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char *p = new char[10];\n"
                                "  std::cout << p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:3:16]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
                 checkUninitVar("void f() {\n" // #9696
                                "  int *p = new int[10];\n"
                                "  std::cout << p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
@@ -542,7 +556,7 @@ class TestUninitVar : public TestFixture {
                                "  std::cout << c;\n"
                                "  wchar_t w[10];\n"
                                "  std::cout << w;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: c [legacyUninitvar]\n"
                               "[test.cpp:7:16]: (error) Uninitialized variable: w [legacyUninitvar]\n",
                               errout_str());
@@ -550,62 +564,69 @@ class TestUninitVar : public TestFixture {
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << *p << 1;\n"
-                               "}");
+                               "}\n");
                 ASSERT_EQUALS("[test.cpp:3:17]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
             }
+
+            checkUninitVar("void f() {\n" // #13908
+                           "    int* i = new int;\n"
+                           "    std::cout << i << \", \" << *i;\n"
+                           "    delete i;\n"
+                           "}\n");
+            ASSERT_EQUALS("[test.cpp:3:32]: (error) Memory is allocated but not initialized: i [uninitdata]\n", errout_str());
         }
 
         // #8494 : Overloaded & operator
         checkUninitVar("void f() {\n"
                        "  int x;\n"
                        "  a & x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a) {\n"
                        "  int x;\n"
                        "  a & x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  int a,b,c;\n"
                        "  ar & a & b & c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a() {\n"   // asm
                        "    int x;\n"
                        "    asm();\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
                        "    int x[10];\n"
                        "    struct xyz xyz1 = { .x = x };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
                        "    struct S *s;\n"
                        "    s->x = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "   char *buf = malloc(100);\n"
                        "   struct ABC *abc = buf;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("class Fred {\n"
@@ -616,7 +637,7 @@ class TestUninitVar : public TestFixture {
                        "Fred::~Fred()\n"
                        "{\n"
                        "    fclose(f);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -624,7 +645,7 @@ class TestUninitVar : public TestFixture {
                        "    int c;\n"
                        "    ab(sizeof(xyz), &c);\n"
                        "    if (c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -632,7 +653,7 @@ class TestUninitVar : public TestFixture {
                        "    int c;\n"
                        "    a = (f2(&c));\n"
                        "    c++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a)\n"
@@ -641,7 +662,7 @@ class TestUninitVar : public TestFixture {
                        "        char *p;\n"
                        "        *p = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // +=
@@ -649,14 +670,14 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int c;\n"
                        "    c += 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a[10];\n"
                        "    a[0] = 10 - a[1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Uninitialized variable: a[1] [legacyUninitvar]\n", errout_str());
 
         // goto/setjmp/longjmp..
@@ -672,7 +693,7 @@ class TestUninitVar : public TestFixture {
                        "\n"
                        "found:\n"
                        "    int a = b;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -684,7 +705,7 @@ class TestUninitVar : public TestFixture {
                        "        return a;\n"
                        "    a = 1;\n"
                        "    longjmp(env, 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // macro_for..
@@ -698,7 +719,7 @@ class TestUninitVar : public TestFixture {
                        "  else\n"
                        "    retval = 2;\n"
                        "  return retval;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -707,7 +728,7 @@ class TestUninitVar : public TestFixture {
                        "    goto exit;\n"
                        "    i++;\n"
                        "exit:\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
@@ -717,7 +738,7 @@ class TestUninitVar : public TestFixture {
                        "    x = a;\n"
                        "    y = 1;\n"
                        "    goto again;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3873 (false positive)
@@ -726,7 +747,7 @@ class TestUninitVar : public TestFixture {
                        "  if (!Range)\n"
                        "    Range = new MachineLoopRange(Loop, Allocator, *Indexes);\n"
                        "  return Range;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4040 - False positive
@@ -742,7 +763,7 @@ class TestUninitVar : public TestFixture {
                        "        iter = x;\n"
                        "    }\n"
                        "    return 1 + iter;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // C++11 style initialization
@@ -750,7 +771,7 @@ class TestUninitVar : public TestFixture {
                        "    int i = 0;\n"
                        "    int j{ i };\n"
                        "    return j;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5646
@@ -758,7 +779,7 @@ class TestUninitVar : public TestFixture {
                        "  float source[2] = {3.1, 3.1};\n"
                        "  float (*sink)[2] = &source;\n"
                        "  return (*sink)[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #9296
@@ -766,14 +787,14 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int x;\n"
                        "    int z = (x) & ~__round_mask(1, 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(void)\n"
                        "{\n"
                        "    int x;\n"
                        "    int z = (x) | ~__round_mask(1, 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int __round_mask(int, int);\n"
@@ -781,7 +802,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int x;\n"
                        "    int* z = &x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -792,7 +813,7 @@ class TestUninitVar : public TestFixture {
                        "  int x;\n"
                        "  a = x;\n"
                        "  b = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
     }
 
@@ -801,7 +822,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "void f() {\n"
                             "    dfs a;\n"
                             "    return a;\n"
-                            "}";
+                            "}\n";
 
         // Assume dfs is a non POD type if file is C++
         checkUninitVar(code);
@@ -815,7 +836,7 @@ class TestUninitVar : public TestFixture {
                              "void f() {\n"
                              "    struct AB ab;\n"
                              "    return ab;\n"
-                             "}";
+                             "}\n";
         checkUninitVar(code2);
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n"
                       "[test.cpp:4:12]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
@@ -826,14 +847,14 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    std::map<int,bool> x;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3906 - False positive for std::vector pointer
         checkUninitVar("void f() {\n"
                        "    std::vector<int> *x = NULL;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -846,7 +867,7 @@ class TestUninitVar : public TestFixture {
             checkUninitVar("void f() {\n"
                            "  Fred _tm;\n"
                            "  _tm.dostuff();\n"
-                           "}", dinit(CheckUninitVarOptions, $.s = &s));
+                           "}\n", s);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -855,7 +876,7 @@ class TestUninitVar : public TestFixture {
                        "    A a,b;\n"
                        "    b[0] = 0;"
                        "    return a;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -872,7 +893,7 @@ class TestUninitVar : public TestFixture {
                        "        _Bit_reference(_Bit_type * __x, _Bit_type __y)\n"
                        "         : _M_p(__x), _M_mask(__y) { }\n"
                        "    };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -882,13 +903,13 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "    int b;\n"
                        "    c = a | b;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: b [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    int b;\n"
                        "    c = b | a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: b [legacyUninitvar]\n", errout_str());
     }
 
@@ -901,7 +922,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        p = new Foo;\n"
                        "    p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
@@ -910,7 +931,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x==1);\n"
                        "    if (x==2);\n"
                        "    x = a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int foo() {\n"
@@ -918,7 +939,7 @@ class TestUninitVar : public TestFixture {
                        "    if (1)\n"
                        "        i = 11;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int bar(int x) {\n"
@@ -928,7 +949,7 @@ class TestUninitVar : public TestFixture {
                        "    else if ( x == 11 )\n"
                        "      n = 2;\n"
                        "    return n;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -939,7 +960,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        i = 33;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(int x)\n" // #5503
@@ -950,7 +971,7 @@ class TestUninitVar : public TestFixture {
                        "    else if (x >= 2)\n" // condition is always true
                        "        i = 33;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -964,7 +985,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -980,7 +1001,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
@@ -990,7 +1011,7 @@ class TestUninitVar : public TestFixture {
                        "        p = new Foo;\n"
                        "    if (x)\n"
                        "        p->abcd();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int a)\n"
@@ -1008,7 +1029,7 @@ class TestUninitVar : public TestFixture {
                        "    if( n == 0) {\n"
                        "        a=condition;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -1016,20 +1037,20 @@ class TestUninitVar : public TestFixture {
                        "    C *c;\n"
                        "    if (fun(&c));\n"
                        "    c->Release();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    C c;\n"
                        "    if (fun(&c.d));\n"
                        "    return c;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "   char a[10];\n"
                        "   if (a[0] = x){}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(int x)\n"
@@ -1040,7 +1061,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        return 3;\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2207 - False positive
@@ -1051,7 +1072,7 @@ class TestUninitVar : public TestFixture {
                        "    if (!x)\n"
                        "        return;\n"
                        "    b = (c - a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
@@ -1062,7 +1083,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        throw 3;\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a)\n"
@@ -1073,7 +1094,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        XYZ ret = 2;\n"  // XYZ may be an unexpanded macro so bailout the checking of "ret".
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:8:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f(int a, int b)\n"
@@ -1086,7 +1107,7 @@ class TestUninitVar : public TestFixture {
                        "      x = b;\n"
                        "   }\n"
                        "   return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(long verbose,bool bFlag)\n"
@@ -1099,7 +1120,7 @@ class TestUninitVar : public TestFixture {
                        "    if (verbose)\n"
                        "      std::cout << (12-t);\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int test(int cond1, int cond2) {\n"
@@ -1111,7 +1132,7 @@ class TestUninitVar : public TestFixture {
                        "  if (cond2) {\n"
                        "    int t = foo*foo;\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int *pix) {\n"
@@ -1122,14 +1143,14 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    if (pix)\n"
                        "        a = dest_x;\n" // <- not uninitialized
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ? :
         checkUninitVar("static void foo(int v) {\n"
                        "    int x;\n"
                        "    x = v <= 0 ? -1 : x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1141,19 +1162,19 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    ret = ret <= 0 ? -1 :\n"
                        "          strcmp(msgid1, msgid2) == 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int a, int b)\n"
                        "{\n"
                        "    int x; x = (a<b) ? 1 : 0;\n"
                        "    int y = y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n" // pidgin-2.11.0/finch/libgnt/gnttree.c
                        "  int x = (x = bar()) ? x : 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ; { .. }
@@ -1166,7 +1187,7 @@ class TestUninitVar : public TestFixture {
                        "  else\n"
                        "    retval = 2;\n"
                        "  return retval;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1177,7 +1198,7 @@ class TestUninitVar : public TestFixture {
                        "  }\n"
                        "\n"
                        "  { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ({ .. })
@@ -1186,7 +1207,7 @@ class TestUninitVar : public TestFixture {
                        "    if (abc) { x = 123; }\n"
                        "    else { a = ({b=c;}); x = 456; }\n"
                        "    ++x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #3098 - False negative uninitialized variable
@@ -1196,7 +1217,7 @@ class TestUninitVar : public TestFixture {
                        "    if(strcoll(c1,c2))\n"
                        "    {\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: c1 [legacyUninitvar]\n"
                       "[test.cpp:4:19]: (error) Uninitialized variable: c2 [legacyUninitvar]\n", errout_str());
 
@@ -1205,26 +1226,26 @@ class TestUninitVar : public TestFixture {
                        "    if(strcoll(c1,c2))\n"
                        "    {\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char *c1;\n"
                        "    c1=strcpy(c1,\"test\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Uninitialized variable: c1 [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(char *c1)\n"
                        "{\n"
                        "    c1=strcpy(c1,\"test\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  X var;\n"
                        "  memset(var, 0, sizeof(var));\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n" // #8692
@@ -1285,8 +1306,8 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 4; ++i) {\n"
                        "        int a;\n"
                        "        b(4*a);\n"
-                       "    }"
-                       "}");
+                       "    }\n"
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -1294,7 +1315,7 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 4; ++i) {\n"
                        "        k = k + 2;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: k [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -1302,7 +1323,7 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 4; ++i) {\n"
                        "        int sz = sizeof(sel);\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("enum ABCD { A, B, C, D };\n"
@@ -1312,7 +1333,7 @@ class TestUninitVar : public TestFixture {
                        "    for (i = 0; i < D; i++) {\n"
                        "        str[i] = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void x() {\n"
@@ -1322,7 +1343,7 @@ class TestUninitVar : public TestFixture {
                        "        {\n"
                        "        }\n"
                        "    } while (tok2);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(void) {\n"
@@ -1335,7 +1356,7 @@ class TestUninitVar : public TestFixture {
                        "            x = 2;\n"
                        "        }\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(void) {\n"
@@ -1347,7 +1368,7 @@ class TestUninitVar : public TestFixture {
                        "            a = 1;\n"
                        "        }\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:24]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo(int n) {\n"
@@ -1357,7 +1378,7 @@ class TestUninitVar : public TestFixture {
                        "      f = one[i];\n"
                        "    one[rank] = -1;\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2226: C++0x loop
@@ -1365,7 +1386,7 @@ class TestUninitVar : public TestFixture {
                        "    container c;\n"
                        "    for (iterator it : c) {\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #2345: False positive in sub-condition in if inside a loop
@@ -1376,7 +1397,7 @@ class TestUninitVar : public TestFixture {
                        "        { }\n"
                        "        x--;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
         // extracttests.start: struct PoolItem { bool operator!=(const PoolItem&) const; };
         checkUninitVar("void f(int x, const PoolItem& rPool) {\n"
@@ -1386,7 +1407,7 @@ class TestUninitVar : public TestFixture {
                        "        { }\n"
                        "        x--;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: pItem [legacyUninitvar]\n", errout_str());
 
         // #2231 - conditional initialization in loop..
@@ -1401,7 +1422,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:11]: (error) Uninitialized variable: x\n", "", errout_str());
 
         // Ticket #2796
@@ -1412,7 +1433,7 @@ class TestUninitVar : public TestFixture {
                        "        else break;\n"
                        "        return x;\n"   // <- x is initialized
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Assignment in for. Ticket #3287
@@ -1421,7 +1442,7 @@ class TestUninitVar : public TestFixture {
                        "    if (b) for (c = in; *c == 0; ++c) {}\n"
                        "    else c = in + strlen(in) - 1;\n"
                        "    *c = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #10273 - assignment in conditional code
@@ -1432,7 +1453,7 @@ class TestUninitVar : public TestFixture {
                        "        if (!(learn & PORT_LEARN_DISABLE))\n"
                        "            learn = 123;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:15]: (error) Uninitialized variable: learn [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Entry { Entry *next; }; Entry *buckets[10];
@@ -1483,7 +1504,7 @@ class TestUninitVar : public TestFixture {
                        "        *p = 7;\n" // <<
                        "        p = new int(9);\n"
                        "    } while (*p != 8);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:11:10]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // #6952 - while-loop
@@ -1494,7 +1515,7 @@ class TestUninitVar : public TestFixture {
                        "        *p = 7;\n"
                        "        p = new int(9);\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // switch in loop
@@ -1510,7 +1531,7 @@ class TestUninitVar : public TestFixture {
                        "    };\n"
                        "    ++p\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1524,7 +1545,7 @@ class TestUninitVar : public TestFixture {
                        "        c++;\n"
                        "        break;\n"
                        "    };\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: c [uninitvar]\n", "", errout_str());
 
         checkUninitVar("char * f()\n"
@@ -1537,7 +1558,7 @@ class TestUninitVar : public TestFixture {
                        "        case 2: return ret;\n"
                        "    }\n"
                        "    return 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(const int iVar, unsigned int slot, unsigned int pin)\n"
@@ -1560,7 +1581,7 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #1855 - switch(foo(&x))
@@ -1572,7 +1593,7 @@ class TestUninitVar : public TestFixture {
                        "        case 1:\n"
                        "            return x;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3231 - ({ switch .. })
@@ -1586,7 +1607,7 @@ class TestUninitVar : public TestFixture {
                        "        break;\n"
                        "    };\n"
                        "    })\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1596,7 +1617,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    char a[10];\n"
                        "    a[a[0]] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: a[0] [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f()\n"
@@ -1604,59 +1625,59 @@ class TestUninitVar : public TestFixture {
                        "    char a[10];\n"
                        "    *a = '\\0';\n"
                        "    int i = strlen(a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a, b[10];\n"
                        "    a = b[0] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a[10], b[10];\n"
                        "    a[0] = b[0] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a[10], *p;\n"
                        "    *(p = a) = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char a[10], *p;\n"
                        "    p = &(a[10]);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // array usage in ?: (tests that the isVariableUsed() works)
         checkUninitVar("void f() {\n"
                        "    char a[10], *p;\n"
                        "    p = c?a:0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    char a[10], c;\n"
                        "    c = *(x?a:0);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char a[10], c;\n"
                        "    strcpy(dest, x?a:\"\");\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "  int a[2];\n"
                        "  y *= (x ? 1 : 2);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // passing array to library functions
@@ -1664,25 +1685,25 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    char c[50] = \"\";\n"
                        "    strcat(c, \"test\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(char *s2) {\n"
                        "    char s[20];\n"
                        "    strcpy(s2, s);\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char s[20];\n"
                        "    strcat(s, \"abc\");\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char s[20];\n"
                        "    strchr(s, ' ');\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1691,7 +1712,7 @@ class TestUninitVar : public TestFixture {
                        "        int s;\n"
                        "        GetField( y + 0, y + 1 );\n"
                        "        s = y[0] * y[1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -1699,14 +1720,14 @@ class TestUninitVar : public TestFixture {
                        "        int a[2];\n"
                        "        init(a - 1);\n"
                        "        int b = a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "        Fred a[2];\n"
                        "        Fred b = a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
@@ -1727,40 +1748,40 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int a[10];\n"
                        "    f(a[0]);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // Ticket #2320
         checkUninitVar("void foo() {\n"
                        "        char a[2];\n"
                        "        unsigned long b = (unsigned long)(a+2) & ~7;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"   // Ticket #3050
                        "    char a[2];\n"
                        "    printf(\"%s\", a);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", "", errout_str());
 
         checkUninitVar("void f() {\n"   // Ticket #5108 (fp)
                        "    const char *a;\n"
                        "    printf(\"%s\", a=\"abc\");\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"    // Ticket #3497
                        "    char header[1];\n"
                        "    *((unsigned char*)(header)) = 0xff;\n"
                        "    return header[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"    // Ticket #3497
                        "    char header[1];\n"
                        "    *((unsigned char*)((unsigned char *)(header))) = 0xff;\n"
                        "    return header[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -1770,7 +1791,7 @@ class TestUninitVar : public TestFixture {
                        "    abc.a = a;\n"
                        "    init(&abc);\n"
                        "    return a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #3344
@@ -1779,7 +1800,7 @@ class TestUninitVar : public TestFixture {
                        "   char *buffer=(char*)malloc(128*sizeof(char));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Memory is allocated but not initialized: buffer [uninitdata]\n", errout_str());
 
         checkUninitVar("void f(){\n"
@@ -1787,45 +1808,45 @@ class TestUninitVar : public TestFixture {
                        "   char *buffer=static_cast<char*>(malloc(128*sizeof(char)));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (error) Memory is allocated but not initialized: buffer [uninitdata]\n", errout_str());
 
         // #3845
         checkUninitVar("int foo() {\n"
                        "    int a[1] = {5};\n"
                        "    return a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[2][2] = {{3,4}, {5,6}};\n"
                        "    return a[0][1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[1];\n"
                        "    return a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[2][2];\n"
                        "    return a[0][1];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[10];\n"
                        "    dostuff(a[0]);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 4740
         checkUninitVar("void f() {\n"
                        "    int *a[2][19];\n"
                        "    int **b = a[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6869 - FP when passing uninit array to function
@@ -1833,7 +1854,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "  char x[10];\n"
                        "  bar(x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // struct
@@ -1842,7 +1863,7 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "  struct Fred fred[10];\n"
                        "  fred[1].x = 0;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("char f() {\n"
@@ -1885,7 +1906,7 @@ class TestUninitVar : public TestFixture {
                        "        vertices[i][1][2] = 4.0;\n"
                        "        vertices[i][1][3] = 5.0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: vertices [legacyUninitvar]\n",
                       errout_str());
 
@@ -1901,7 +1922,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("double foo(bool flag) {\n"
                        "    double adIHPoint_local[4][4]{};\n"
                        "    function(*adIHPoint_local);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1910,96 +1931,96 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    char *s = (char *)malloc(100);\n"
                        "    strcat(s, \"abc\");\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Memory is allocated but not initialized: s [uninitdata]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char *s1 = new char[10];\n"
                        "    char *s2 = new char[strlen(s1)];\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("[test.cpp:4:32]: (error) Memory is allocated but not initialized: s1 [uninitdata]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char *p = (char*)malloc(64);\n"
                        "    int x = p[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = (char*)malloc(64);\n"
                        "    if (p[0]) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (error) Memory is allocated but not initialized: p[0] [uninitdata]\n", errout_str());
 
         checkUninitVar("char f() {\n"
                        "    char *p = (char*)malloc(64);\n"
                        "    return p[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = new Fred;\n"
                        "    fred->foo();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct Fred { int i; Fred(int, float); };\n"
                        "void f() {\n"
                        "    Fred *fred = new Fred(1, 2);\n"
                        "    fred->foo();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = malloc(sizeof(Fred));\n"
                        "    x(&fred->f);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = malloc(sizeof(Fred));\n"
                        "    x(fred->f);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(char *s)\n"
                        "{\n"
                        "    char *a = malloc(100);\n"
                        "    *a = *s;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    char *a;\n"
                        "    if (a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    char *a = malloc(100);\n"
                        "    if (a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a.word = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
@@ -2007,14 +2028,14 @@ class TestUninitVar : public TestFixture {
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a = 123;\n"
                        "    abc->a += 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    free(abc);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2023,14 +2044,14 @@ class TestUninitVar : public TestFixture {
                        "    if (!s)\n"
                        "        return;\n"
                        "    char c = *s;\n"
-                       "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Memory is allocated but not initialized: s\n", "", errout_str());
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:6:15]: (error) Memory is allocated but not initialized: s [uninitdata]\n", errout_str());
 
         // #3708 - false positive when using ptr typedef
         checkUninitVar("void f() {\n"
                        "    uintptr_t x = malloc(100);\n"
                        "    uintptr_t y = x + 10;\n"  // <- not bad usage
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2039,7 +2060,7 @@ class TestUninitVar : public TestFixture {
                        "  strm.next_out = buf;\n"
                        "  deflate(&strm, Z_FINISH);\n"
                        "  memcpy(body, buf, 10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6451 - allocation in subscope
@@ -2055,7 +2076,7 @@ class TestUninitVar : public TestFixture {
                        "    else\n"
                        "        pNewStrm = new StgStrm(rIo);\n"
                        "    pNewStrm->Write();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6450 - calling a member function is allowed if memory was allocated by new
@@ -2066,7 +2087,7 @@ class TestUninitVar : public TestFixture {
                        "void processObjectRecord() {\n"
                        "    EMFPFont *font = new EMFPFont();\n"
                        "    font->Initialize();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7623 - new can also initialize the memory, don't warn in this case
@@ -2075,14 +2096,14 @@ class TestUninitVar : public TestFixture {
                        "    int* p2 = new int();\n"
                        "    int* arr = new int[5]();\n"
                        "    std::cout << *p1 << *p2 << arr[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // new in C code does not allocate..
         checkUninitVar("int main() {\n"
                        "    char * pBuf = new(10);\n"
                        "    a = *pBuf;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("class A {};\n" // #10698
@@ -2128,6 +2149,59 @@ class TestUninitVar : public TestFixture {
                        "        *(p + i) = 0;\n"
                        "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("int* f() {\n" // #14448
+                       "    int* p = (int*)malloc(4);\n"
+                       "    if (!p)\n"
+                       "        return nullptr;\n"
+                       "    if (*p) {}\n"
+                       "    return p;\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (error) Memory is allocated but not initialized: *p [uninitdata]\n", errout_str());
+
+        checkUninitVar("int* f() {\n"
+                       "    int* p = (int*)malloc(4);\n"
+                       "    if (p == nullptr)\n"
+                       "        return nullptr;\n"
+                       "    if (*p) {}\n"
+                       "    return p;\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (error) Memory is allocated but not initialized: *p [uninitdata]\n", errout_str());
+
+        checkUninitVar("char* f(size_t nBytes, size_t nAlign) {\n" // #14485
+                       "    char* p = reinterpret_cast<char*>(malloc(nBytes));\n"
+                       "    if ((uintptr_t)p % nAlign != 0) {}\n"
+                       "    return p;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("struct S { char c[10]; };\n" // #11290
+                       "S* f() {\n"
+                       "    S* s = (S*)malloc(sizeof(S));\n"
+                       "    sprintf(s->c, \"abc\");\n"
+                       "    return s;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("int f() {\n" // #14719
+                       "    int* p = new int[]{ 1, 2 };\n"
+                       "    int i = p[0] + p[1];\n"
+                       "    delete[] p;\n"
+                       "    return i;\n"
+                       "}\n"
+                       "int g() {\n"
+                       "    int* p = new std::int32_t[]{ 1, 2 };\n"
+                       "    int i = p[0] + p[1];\n"
+                       "    delete[] p;\n"
+                       "    return i;\n"
+                       "}\n"
+                       "int h() {\n"
+                       "    int* p = new ::std::int32_t[]{ 1, 2 };\n"
+                       "    int i = p[0] + p[1];\n"
+                       "    delete[] p;\n"
+                       "    return i;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     // class / struct..
@@ -2136,7 +2210,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    int i;\n"
                        "    int a() { return i; }\n"
-                       "};");
+                       "};\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2147,16 +2221,16 @@ class TestUninitVar : public TestFixture {
                        "            surface->MoveTo();\n"
                        "        }\n"
                        "    };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    static const struct ab {\n"
                        "        int a,b;\n"
-                       "        int get_a() { return a; }"
+                       "        int get_a() { return a; }\n"
                        "    } x = { 0, 0 };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2169,13 +2243,13 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    struct AB ab;\n"
                        "    x = ab.x = 12;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2186,7 +2260,7 @@ class TestUninitVar : public TestFixture {
                        "    enum AB { a, b };\n"
                        "    AB ab;\n"
                        "    if (ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (error) Uninitialized variable: ab [legacyUninitvar]\n", errout_str());
     }
 
@@ -2198,7 +2272,7 @@ class TestUninitVar : public TestFixture {
                        "    int &b = a;\n"
                        "    b = 0;\n"
                        "    int x = a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(struct blame_entry *ent)\n"
@@ -2206,14 +2280,14 @@ class TestUninitVar : public TestFixture {
                        "    struct origin *suspect = ent->suspect;\n"
                        "    char hex[41];\n"
                        "    strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    const std::string s(x());\n"
                        "    strchr(s.c_str(), ',');\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6717
@@ -2222,7 +2296,7 @@ class TestUninitVar : public TestFixture {
                        "    thing it;\n"
                        "    int& referenced_int = it.value;\n"
                        "    referenced_int = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2231,19 +2305,19 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("static int foo() {\n"
                        "    int ret;\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static int foo() {\n"
                        "    int ret;\n"
                        "    return ret+5;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static int foo() {\n"
                        "    int ret;\n"
                        "    return ret = 5;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -2251,7 +2325,7 @@ class TestUninitVar : public TestFixture {
                            "    int ret;\n"
                            "    cin >> ret;\n"
                            "    return ret;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("static int foo() {\n"
@@ -2263,10 +2337,10 @@ class TestUninitVar : public TestFixture {
 
         // Ticket #6341- False negative
         {
-            checkUninitVar("wchar_t f() { int i; return btowc(i); }");
+            checkUninitVar("wchar_t f() { int i; return btowc(i); }\n");
             ASSERT_EQUALS("[test.cpp:1:35]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
-            checkUninitVar("wchar_t f(int i) { return btowc(i); }");
+            checkUninitVar("wchar_t f(int i) { return btowc(i); }\n");
             ASSERT_EQUALS("", errout_str());
 
             // Avoid a potential false positive (#6341)
@@ -2278,7 +2352,7 @@ class TestUninitVar : public TestFixture {
                 "int f() {\n"
                 "  int x;\n"
                 "  return setvalue(x);\n"
-                "}");
+                "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2291,7 +2365,7 @@ class TestUninitVar : public TestFixture {
                            "        f = 0.0;\n"
                            "    }\n"
                            "    printf (\"%f\",f);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:7:18]: (error) Uninitialized variable: f [legacyUninitvar]\n", errout_str());
 
             // Check for potential FP
@@ -2302,7 +2376,7 @@ class TestUninitVar : public TestFixture {
                            "        f = 0.0;\n"
                            "    }\n"
                            "    printf (\"%f\",f);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2310,7 +2384,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("int f(int x) {\n"
                        "    int y;\n"
                        "    return x ? 1 : y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         // Ticket #3106 - False positive
@@ -2318,13 +2392,13 @@ class TestUninitVar : public TestFixture {
             checkUninitVar("int f() {\n"
                            "    int i;\n"
                            "    return x(&i) ? i : 0;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("int f() {\n"
                            "    int i;\n"
                            "    return x() ? i : 0;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
         }
     }
@@ -2337,7 +2411,7 @@ class TestUninitVar : public TestFixture {
                        "    struct A msg = { .buf = {&key} };\n"
                        "    init(&msg);\n"
                        "    key++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5660 - False positive
@@ -2346,7 +2420,7 @@ class TestUninitVar : public TestFixture {
                        "    int *res[] = {&result};\n"
                        "    foo(res);\n"
                        "    return result;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6873
@@ -2355,7 +2429,7 @@ class TestUninitVar : public TestFixture {
                        "    char *b[] = {a};\n"
                        "    foo(b);\n"
                        "    return atoi(a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // = { .. }
@@ -2364,7 +2438,7 @@ class TestUninitVar : public TestFixture {
                        "    int *p[] = { &a };\n"
                        "    *p[0] = 0;\n"
                        "    return a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
     }
@@ -2379,7 +2453,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[100];\n"
                        "    strncpy(a, s, 20);\n"
                        "    strncat(a, s, 20);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Dangerous usage of 'a' (strncpy doesn't always null-terminate it).\n", "", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2387,7 +2461,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[100];\n"
                        "    strncpy(a, \"hello\", 3);\n"
                        "    strncat(a, \"world\", 20);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Dangerous usage of 'a' (strncpy doesn't always null-terminate it).\n", "", errout_str());
 
         checkUninitVar("void f()\n"
@@ -2395,7 +2469,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[100];\n"
                        "    strncpy(a, \"hello\", sizeof(a));\n"
                        "    strncat(a, \"world\", 20);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #3245 - false positive
@@ -2404,14 +2478,14 @@ class TestUninitVar : public TestFixture {
                            "    char a[100];\n"
                            "    strncpy(a,p,10);\n"
                            "    memcmp(a,q,10);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    char a[100];\n"
                            "    strncpy(a,p,10);\n"
                            "    if (memcmp(a,q,10)==0);\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -2420,7 +2494,7 @@ class TestUninitVar : public TestFixture {
                        "    char buf[10];\n"
                        "    strncpy(buf, dev, 10);\n"
                        "    strncpy(str, buf, 10);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2428,73 +2502,73 @@ class TestUninitVar : public TestFixture {
                        "  const char* source = \"You\";\n"
                        "  strncpy(dst, source, sizeof(dst));\n"
                        "  char value = dst[2];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     // valid and invalid use of 'int a(int x) { return x + x; }'
     void func_uninit_var() {
-        const std::string funca("int a(int x) { return x + x; }");
+        const std::string funca("int a(int x) { return x + x; }\n");
 
-        checkUninitVar((funca +
-                        "void b() {\n"
-                        "    int x;\n"
-                        "    a(x);\n"
-                        "}").c_str());
-        ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int x;\n"
+                       "    a(x);\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
-        checkUninitVar((funca +
-                        "void b() {\n"
-                        "    int *p;\n"
-                        "    a(*p);\n"
-                        "}").c_str());
-        ASSERT_EQUALS("[test.cpp:3:8]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int *p;\n"
+                       "    a(*p);\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
 
     // valid and invalid use of 'void a(int *p) { *p = 0; }'
     void func_uninit_pointer() {
-        const std::string funca("void a(int *p) { *p = 0; }");
+        const std::string funca("void a(int *p) { *p = 0; }\n");
 
         // ok - initialized pointer
-        checkUninitVar((funca +
-                        "void b() {\n"
-                        "    int buf[10];\n"
-                        "    a(buf);\n"
-                        "}").c_str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int buf[10];\n"
+                       "    a(buf);\n"
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // not ok - uninitialized pointer
-        checkUninitVar((funca +
-                        "void b() {\n"
-                        "    int *p;\n"
-                        "    a(p);\n"
-                        "}").c_str());
-        ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int *p;\n"
+                       "    a(p);\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
     void uninitvar_typeof() {
         checkUninitVar("void f() {\n"
                        "    struct Fred *fred;\n"
                        "    typeof(fred->x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct SData * s;\n"
                        "    ab(typeof(s->status));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct SData * s;\n"
                        "    TYPEOF(s->status);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:3:12]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *n = ({ typeof(*n) z;  (typeof(*n)*)z; })\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2502,25 +2576,25 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void foo() {\n"
                        "  int i;\n"
                        "  dostuff((int&)i, 0);\n" // <- cast is not use
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "  int i;\n"
                        "  return (int&)i + 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "  int i;\n"
                        "  dostuff(*&i, 0);\n" // <- *& is not use
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "  int i;\n"
                        "  return *&i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
     }
 
@@ -2529,121 +2603,121 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: char str[10];
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    str[x] = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n" // #7736
                        "    int buf[12];\n"
                        "    printf (\"%d\", buf[0] );\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: buf [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    int y = x & 3;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    int y = 3 & x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    x = 3 + x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    x = x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct ABC {int a;};
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    abc->a = 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: abc [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    static int x;\n"
                        "    return ++x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    extern int x;\n"
                        "    return ++x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"  // #3926 - weird cast.
                        "    int x;\n"
                        "    *(((char *)&x) + 0) = 0;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4737 - weird cast.
                        "    int x;\n"
                        "    do_something(&((char*)&x)[0], 1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    char *p = (char*)&x + 1;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    i=f(), i!=2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // using uninit var in condition
         checkUninitVar("void f(void) {\n"
                        "    int x;\n"
                        "    if (x) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    if (1 == (3 & x)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // ?:
         checkUninitVar("int f(int *ptr) {\n"
                        "    int a;\n"
                        "    int *p = ptr ? ptr : &a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n"
                        "    int x;\n"
                        "    if (a==3) { x=2; }\n"
                        "    y = (a==3) ? x : a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // = ({ .. })
         checkUninitVar("void f() {\n"
                        "    int x = ({ 1 + 2; });\n"
                        "    int y = 1 + (x ? y : y);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         // >> => initialization / usage
@@ -2651,7 +2725,7 @@ class TestUninitVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
-                                "}";
+                                "}\n";
             checkUninitVar(code);
             ASSERT_EQUALS("", errout_str());
 
@@ -2662,7 +2736,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    int i, i2;\n"
                        "    strm >> i >> i2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unconditional initialization
@@ -2671,7 +2745,7 @@ class TestUninitVar : public TestFixture {
                        "    if (a) { ret = 1; }\n"
                        "    else { {} ret = 2; }\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -2679,7 +2753,7 @@ class TestUninitVar : public TestFixture {
                        "    if (a) { ret = 1; }\n"
                        "    else { s=foo(1,{2,3},4); ret = 2; }\n"
                        "    return ret;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // conditional initialization
@@ -2688,7 +2762,7 @@ class TestUninitVar : public TestFixture {
                        "    if (y == 1) { x = 1; }\n"
                        "    else { if (y == 2) { x = 1; } }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2697,7 +2771,7 @@ class TestUninitVar : public TestFixture {
                        "    else { if (y == 2) { x = 1; } }\n"
                        "    if (y == 3) { }\n"   // <- ignore condition
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // initialization in condition
@@ -2705,7 +2779,7 @@ class TestUninitVar : public TestFixture {
                        "    int a;\n"
                        "    if (init(&a)) { }\n"
                        "    a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return, break, continue, goto
@@ -2714,14 +2788,14 @@ class TestUninitVar : public TestFixture {
                        "    if (y == 1) { return; }\n"
                        "    else { x = 1; }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    if (y == 1) { return; }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f(int x) {\n"
@@ -2734,7 +2808,7 @@ class TestUninitVar : public TestFixture {
                        "out1:\n"
                        "out2:\n"
                        "    return ret;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2745,7 +2819,7 @@ class TestUninitVar : public TestFixture {
                        "        goto out;\n"
                        "    }\n"
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -2753,7 +2827,7 @@ class TestUninitVar : public TestFixture {
                        "    for (i=0;i<9;++i)\n"
                        "        if (foo) break;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -2761,7 +2835,7 @@ class TestUninitVar : public TestFixture {
                        "    while (foo)\n"
                        "        if (bar) break;\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // try/catch : don't warn about exception variable
@@ -2771,7 +2845,7 @@ class TestUninitVar : public TestFixture {
                        "        trace();\n"
                        "        e->Delete();\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #5347
@@ -2779,7 +2853,7 @@ class TestUninitVar : public TestFixture {
                        "    } catch (const char* e) {\n"
                        "        A a = e;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // exit
@@ -2788,7 +2862,7 @@ class TestUninitVar : public TestFixture {
                        "    if (y == 1) { exit(0); }\n"
                        "    else { x = 1; }\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // strange code.. don't crash (#3415)
@@ -2796,14 +2870,14 @@ class TestUninitVar : public TestFixture {
                        "    int i;\n"
                        "    ({ if (0); });\n"
                        "    for_each(i) { }\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
 
         // if, if
         checkUninitVar("void f(int a) {\n"
                        "    int i;\n"
                        "    if (a) i = 0;\n"
                        "    if (a) i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2815,7 +2889,7 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    }\n"
                        "    if (b) a++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -2823,41 +2897,41 @@ class TestUninitVar : public TestFixture {
                        "    if (x) { }\n"
                        "    else { if (y==2) { a=1; b=2; } }\n"
                        "    if (a) { ++b; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f(int x, int y) {\n"
                        "    int a;\n"
                        "    if (x == 0) { a = y; }\n"
                        "    if (x == 0 && (a == 1)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f() {\n"
                        "    int a=0, b;\n"
                        "    if (something) { a = dostuff(&b); }\n"
                        "    if (!a || b) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f(int x, int y) {\n"
                        "    int a;\n"
                        "    if (x == 0 && (a == 1)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:20]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int a;\n"
                        "    if (x) { a = 0; }\n"
                        "    if (x) { if (y) { a++; } }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int a;\n"
                        "    if (x) { a = 0; }\n"
                        "    if (x) { if (y) { } else { a++; } }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -2866,7 +2940,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) ab = getAB();\n"
                        "    else ab.a = 0;\n"
                        "    if (ab.a == 1) b = ab.b;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(void) {\n"
@@ -2877,7 +2951,7 @@ class TestUninitVar : public TestFixture {
                        "    if (i==1) { a = 0; }\n"
                        "    else { a = 1; }\n"
                        "    return a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #4560
@@ -2887,7 +2961,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = 123;\n" // <- y is always initialized
                        "    else {}\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #6583
@@ -2896,7 +2970,7 @@ class TestUninitVar : public TestFixture {
                        "    else if (a == 2) x = 0;\n"
                        "    else exit(2);\n"
                        "    return x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #4560
@@ -2906,7 +2980,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) {}\n"
                        "    else y = 123;\n" // <- y is always initialized
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n" // #3948
@@ -2914,7 +2988,7 @@ class TestUninitVar : public TestFixture {
                        "  if (x !=-1)\n"
                        "    value = getvalue();\n"
                        "  if (x == -1 || value > 300) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("enum t_err { ERR_NONE, ERR_BAD_ARGS };\n" // #9649
@@ -2927,7 +3001,7 @@ class TestUninitVar : public TestFixture {
                        "        ret = init_box(&box2, 20);\n"
                        "    if (ret == ERR_NONE)\n"
                        "        z = x + box2.value;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -2936,7 +3010,7 @@ class TestUninitVar : public TestFixture {
                        "    value = getvalue();\n"
                        "  if (x == 1)\n"
                        "    v = value;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: value [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -2945,7 +3019,7 @@ class TestUninitVar : public TestFixture {
                        "    value = getvalue();\n"
                        "  if (x == 32) {}\n"
                        "  else v = value;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (error) Uninitialized variable: value [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static int x;" // #4773
@@ -2955,7 +3029,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = 123;\n"
                        "    else y = 456;\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static int x;" // #4773
@@ -2965,7 +3039,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = 123;\n"
                        "    else y = 456;\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a) {\n"
@@ -2975,7 +3049,7 @@ class TestUninitVar : public TestFixture {
                        "    if (!a) {}\n"
                        "    else if (x) {}\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // asm
@@ -2983,74 +3057,74 @@ class TestUninitVar : public TestFixture {
                        "    int x;\n"
                        "    asm();\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // sizeof / typeof / offsetof / etc
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    sizeof(i+1);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    if (100 == sizeof(i+1));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    int i = ARRAY_SIZE(abc.a);"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:3:24]: (error) Uninitialized variable: abc [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *abc;\n"
                        "    typeof(*abc);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    return do_something(typeof(*abc));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    A *a;\n"
                        "    a = malloc(sizeof(*a));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // &
         checkUninitVar("void f() {\n"  // #4426 - address of uninitialized variable
                        "    int a,b;\n"
                        "    if (&a == &b);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"  // #4439 - cast address of uninitialized variable
                        "    int a;\n"
                        "    x((LPARAM)(RECT*)&a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int main() {\n"
                        "    int done;\n"
                        "    dostuff(1, (AuPointer) &done);\n" // <- It is not conclusive if the "&" is a binary or unary operator. Bailout.
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4778 - cast address of uninitialized variable
                        "    long a;\n"
                        "    &a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4717 - ({})
                        "    int a = ({ long b = (long)(123); 2 + b; });\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3061,7 +3135,7 @@ class TestUninitVar : public TestFixture {
                        "    int &x = buf[0];\n"
                        "    buf[0] = 0;\n"
                        "    x++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3071,14 +3145,14 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("void f() {\n"
                        "    x<char> c;\n"
                        "    c << 2345;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ensure there is no false negative
         checkUninitVar("void f() {\n"
                        "    char c;\n"
                        "    char a = c << 2;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
     }
 
@@ -3108,7 +3182,7 @@ class TestUninitVar : public TestFixture {
                             "    dsmp_t type;\n"
                             "    int syncpos, len;\n"
                             "    Sync(syncpos, type, len);\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3117,7 +3191,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "namespace Ns { class C; }\n"
                             "void f1() { char *p; *p = 0; }\n"
                             "class Ns::C* p;\n"
-                            "void f2() { char *p; *p = 0; }";
+                            "void f2() { char *p; *p = 0; }\n";
         checkUninitVar(code);
         ASSERT_EQUALS("[test.cpp:2:23]: (error) Uninitialized variable: p [legacyUninitvar]\n"
                       "[test.cpp:4:23]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
@@ -3137,7 +3211,7 @@ class TestUninitVar : public TestFixture {
                             "int global() {\n"
                             "    int bar = 1;\n"
                             "    return bar;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3147,7 +3221,7 @@ class TestUninitVar : public TestFixture {
                             "void foo () {\n"
                             "    int x;\n"
                             "    x = get(x) && x;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3156,7 +3230,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "void fp() {\n"
                             "  std::stringstream ss;\n"
                             "  for (int i; ss >> i;) {}\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3178,7 +3252,7 @@ class TestUninitVar : public TestFixture {
                             "    free(ccb);\n"
                             " \n"
                             "  return rez;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3187,7 +3261,7 @@ class TestUninitVar : public TestFixture {
         const char code[] = "void f() {\n"
                             "    int b;\n"
                             "    *(&b) = 0;\n"
-                            "}";
+                            "}\n";
         checkUninitVar(code);
         ASSERT_EQUALS("", errout_str());
     }
@@ -3199,7 +3273,7 @@ class TestUninitVar : public TestFixture {
                        "    {\n"
                        "        return i;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -3207,7 +3281,7 @@ class TestUninitVar : public TestFixture {
                        "    try {\n"
                        "        return i;\n"
                        "    } catch(...) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(bool x) {\n"
@@ -3247,20 +3321,20 @@ class TestUninitVar : public TestFixture {
                        "    Reference< XStorageBasedLibraryContainer >(*Factory)(const Reference< XComponentContext >&, const Reference< XStorageBasedDocument >&)\n"
                        "        = &DocumentDialogLibraryContainer::create;\n"
                        "    rxContainer.set((*Factory)(m_aContext, xDocument));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    void* x;\n"
                        "    int (*f)(int, int) = x;\n"
                        "    dostuff((*f)(a,b));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void getLibraryContainer() {\n"
                        "    Reference< XStorageBasedLibraryContainer >(*Factory)(const Reference< XComponentContext >&, const Reference< XStorageBasedDocument >&);\n"
                        "    rxContainer.set((*Factory)(m_aContext, xDocument));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: Factory [legacyUninitvar]\n", errout_str());
 
         // extracttests.enable
@@ -3280,14 +3354,14 @@ class TestUninitVar : public TestFixture {
                        "  Sink s2;\n"
                        "  int n;\n"
                        "  foo >> s2.v >> n;\n" // Initialized by operator>>
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:16]: (error) Uninitialized struct member: s.v [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct Fred { int a; };\n"
                        "void foo() {\n"
                        "  Fred fred;\n"
                        "  std::cin >> fred.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3300,7 +3374,7 @@ class TestUninitVar : public TestFixture {
                        "   int *b = 0;\n"
                        "   bar(a,b);\n" // <<
                        "   return 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:8]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // non-pointer variable
@@ -3308,35 +3382,35 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    char c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(char c);\n"  // value => error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(const char c);\n"  // const value => error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(char *c);\n"  // address => no error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(pstr s);\n"  // address => no error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(const char *c);\n"  // const address => data is not changed
@@ -3344,7 +3418,7 @@ class TestUninitVar : public TestFixture {
                        "    char c;\n"
                        "    a(&c);\n"  // <- no warning
                        "    c++;\n"  // <- uninitialized variable
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: c\n", "", errout_str());
 
         // pointer variable
@@ -3352,7 +3426,7 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(*c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
 
@@ -3360,7 +3434,7 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("typedef struct { int a; int b; } AB;\n"
@@ -3368,42 +3442,42 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    AB *ab;\n"
                        "    a(ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: ab [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(const char *c);\n"  // const address => error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(const char c[]);\n"  // const address => error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void a(char **c);\n"  // address of pointer => no error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(char *c);\n"  // address of pointer (suspicious cast to pointer) => no error
                        "void b() {\n"
                        "    char *c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(const char **c);\n"  // const address of pointer => no error
                        "void b() {\n"
                        "    const char *c;\n"
                        "    a(&c);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // array
@@ -3411,14 +3485,14 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    int x[10];\n"
                        "    calc(x,10);\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n",
                            "", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x[10];\n"
                        "    int &x0(*x);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ....
@@ -3428,25 +3502,25 @@ class TestUninitVar : public TestFixture {
                        "    struct ABC abc;\n"
                        "    clear(abc);\n"
                        "    return abc.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    time_t now0;\n"
                        "    time(&now0);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    time_t* now0;\n"
                        "    time(now0);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:10]: (error) Uninitialized variable: now0 [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    char now0;\n"
                        "    strcmp(&now0, sth);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:13]: (error) Uninitialized variable: now0 [legacyUninitvar]\n", errout_str());
 
         // #2775 - uninitialized struct pointer in subfunction
@@ -3458,7 +3532,7 @@ class TestUninitVar : public TestFixture {
                        "void b() {\n"
                        "    struct Fred *p;\n"
                        "    a(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:7:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // #2946 - FP array is initialized in subfunction
@@ -3469,14 +3543,14 @@ class TestUninitVar : public TestFixture {
                        "    char buf[10];\n"
                        "    a(buf);\n"
                        "    buf[1] = buf[0];\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown macro
         checkUninitVar("void f() {\n"
                        "  struct listnode *item;\n"
                        "  list_for_each(item, &key_list) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3488,7 +3562,7 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -3498,7 +3572,7 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -3507,14 +3581,14 @@ class TestUninitVar : public TestFixture {
                        "    else y = get_value(i);\n"
                        "    if (y != 0) return;\n" // <- condition is always true if i is uninitialized
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    int i;\n"
                        "    if (x) i = 0;\n"
                        "    if (!x || i>0) {}\n" // <- no error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3522,7 +3596,7 @@ class TestUninitVar : public TestFixture {
                        "    if (!x) { }\n"
                        "    else i = 0;\n"
                        "    if (x || i>0) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3530,7 +3604,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) { }\n"
                        "    else i = 0;\n"
                        "    if (x || i>0) {}\n" // <- no error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int x) {\n"
@@ -3538,7 +3612,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x) y = do_something();\n"
                        "    if (!x) return 0;\n"
                        "    return y;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int y;
@@ -3547,7 +3621,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        a = y;\n"
                        "    return x ? 2*a : 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int x) {\n"
@@ -3555,13 +3629,13 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        a = y;\n"
                        "    return y ? 2*a : 3*a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         ASSERT_THROW_INTERNAL(checkUninitVar("void f() {\n" // Don't crash
                                              "    int a;\n"
                                              "    dostuff(\"ab\" cd \"ef\", x?a:z);\n" // <- No AST is created for ?
-                                             "}"), UNKNOWN_MACRO);
+                                             "}\n"), UNKNOWN_MACRO);
 
         // Unknown => bail out..
         checkUninitVar("void f(int x) {\n"
@@ -3569,7 +3643,7 @@ class TestUninitVar : public TestFixture {
                        "    if (a(x)) i = 0;\n"
                        "    if (b(x)) return;\n"
                        "    i++;\n" // <- no error if b(x) is always true when a(x) is false
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3578,7 +3652,7 @@ class TestUninitVar : public TestFixture {
                        "    while (condition) {\n"
                        "        if (x) i++;\n" // <- no error
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
@@ -3587,11 +3661,33 @@ class TestUninitVar : public TestFixture {
                        "    while (condition) {\n"
                        "        i++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
 #define valueFlowUninit(...) valueFlowUninit_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void valueFlowUninit_(const char* file, int line, const char (&code)[size], bool cpp = true)
+    {
+        SimpleTokenizer tokenizer(settings, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        // Check for redundant code..
+        CheckUninitVarImpl checkuninitvar(&tokenizer, settings, *this);
+        (checkuninitvar.valueFlowUninit)();
+    }
+
+    void uninitvar15() { // #13685
+        const char code[] = "int f() {\n"
+                            "    int x;\n"
+                            "    if (!({ int *p = &x; *p = 1; 1; }))\n"
+                            "        return 0;\n"
+                            "    return x;\n"
+                            "}\n";
+        valueFlowUninit(code, false);
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void valueFlowUninit2_value()
     {
         valueFlowUninit("void f() {\n"
@@ -3601,8 +3697,7 @@ class TestUninitVar : public TestFixture {
                         "        if (y != 0) return;\n"
                         "        i++;\n"
                         "    }\n"
-                        "}",
-                        true);
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3612,8 +3707,7 @@ class TestUninitVar : public TestFixture {
                         "        if (y != 0) return;\n"
                         "        i++;\n"
                         "    }\n"
-                        "}",
-                        true);
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3622,21 +3716,21 @@ class TestUninitVar : public TestFixture {
                         "    else y = get_value(i);\n"
                         "    if (y != 0) return;\n" // <- condition is always true if i is uninitialized
                         "    i++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
                         "    if (!x) i = 0;\n"
                         "    if (!x || i>0) {}\n" // <- error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:4:15]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
                         "    if (x) i = 0;\n"
                         "    if (!x || i>0) {}\n" // <- no error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3644,7 +3738,7 @@ class TestUninitVar : public TestFixture {
                         "    if (!x) { }\n"
                         "    else i = 0;\n"
                         "    if (x || i>0) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:14]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3652,7 +3746,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) { }\n"
                         "    else i = 0;\n"
                         "    if (x || i>0) {}\n" // <- no error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int x) {\n"
@@ -3660,7 +3754,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = do_something();\n"
                         "    if (!x) return 0;\n"
                         "    return y;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int y;
@@ -3669,7 +3763,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x)\n"
                         "        a = y;\n"
                         "    return x ? 2*a : 0;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int x, int y) {\n"
@@ -3677,13 +3771,13 @@ class TestUninitVar : public TestFixture {
                         "    if (x)\n"
                         "        a = y;\n"
                         "    return y ? 2*a : 3*a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:18]: (warning) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         ASSERT_THROW_INTERNAL(valueFlowUninit("void f() {\n" // Don't crash
                                               "    int a;\n"
                                               "    dostuff(\"ab\" cd \"ef\", x?a:z);\n" // <- No AST is created for ?
-                                              "}"), UNKNOWN_MACRO);
+                                              "}\n"), UNKNOWN_MACRO);
 
         // Unknown => bail out..
         valueFlowUninit("void f(int x) {\n"
@@ -3691,7 +3785,7 @@ class TestUninitVar : public TestFixture {
                         "    if (a(x)) i = 0;\n"
                         "    if (b(x)) return;\n"
                         "    i++;\n" // <- no error if b(x) is always true when a(x) is false
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3700,7 +3794,7 @@ class TestUninitVar : public TestFixture {
                         "    while (condition) {\n"
                         "        if (x) i++;\n" // <- no error
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -3709,13 +3803,13 @@ class TestUninitVar : public TestFixture {
                         "    while (condition) {\n"
                         "        i++;\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         valueFlowUninit("void f ( void ){\n" // #9313 - FN
                         " int *p;\n"
                         " int a[ 2 ] = { [ 0 ] = *p++, [ 1 ] = 1 };\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:26]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int height) {\n"
@@ -3737,7 +3831,7 @@ class TestUninitVar : public TestFixture {
                         "        break;\n"
                         "    }\n"
                         "    ++c;\n"
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         // #12030
@@ -3807,123 +3901,122 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // extracttests.start: char str[10];
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    str[x] = 0;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n" // #7736
                         "    int buf[12];\n"
                         "    printf (\"%d\", buf[0] );\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: buf [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    int y = x & 3;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    int y = 3 & x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    x = 3 + x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    x = x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // extracttests.start: struct ABC {int a;};
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    abc->a = 0;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: abc [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    static int x;\n"
                         "    return ++x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    extern int x;\n"
                         "    return ++x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #3926 - weird cast.
                         "    int x;\n"
                         "    *(((char *)&x) + 0) = 0;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4737 - weird cast.
                         "    int x;\n"
                         "    do_something(&((char*)&x)[0], 1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    char *p = (char*)&x + 1;\n"
-                        "}",
-                        true);
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    i=f(), i!=2;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // using uninit var in condition
         valueFlowUninit("void f(void) {\n"
                         "    int x;\n"
                         "    if (x) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    if (1 == (3 & x)) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // ?:
         valueFlowUninit("int f(int *ptr) {\n"
                         "    int a;\n"
                         "    int *p = ptr ? ptr : &a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n"
                         "    int x;\n"
                         "    if (a==3) { x=2; }\n"
                         "    y = (a==3) ? x : a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // = ({ .. })
         valueFlowUninit("void f() {\n"
                         "    int x = ({ 1 + 2; });\n"
                         "    int y = 1 + (x ? y : y);\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: y [legacyUninitvar]\n", "", errout_str());
 
         // >> => initialization / usage
@@ -3931,7 +4024,7 @@ class TestUninitVar : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
-                                "}";
+                                "}\n";
             valueFlowUninit(code, true);
             ASSERT_EQUALS("", errout_str());
 
@@ -3942,7 +4035,7 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n"
                         "    int i, i2;\n"
                         "    strm >> i >> i2;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unconditional initialization
@@ -3951,7 +4044,7 @@ class TestUninitVar : public TestFixture {
                         "    if (a) { ret = 1; }\n"
                         "    else { {} ret = 2; }\n"
                         "    return ret;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
@@ -3959,7 +4052,7 @@ class TestUninitVar : public TestFixture {
                         "    if (a) { ret = 1; }\n"
                         "    else { s=foo(1,{2,3},4); ret = 2; }\n"
                         "    return ret;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // conditional initialization
@@ -3968,7 +4061,7 @@ class TestUninitVar : public TestFixture {
                         "    if (y == 1) { x = 1; }\n"
                         "    else { if (y == 2) { x = 1; } }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", "", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -3977,7 +4070,7 @@ class TestUninitVar : public TestFixture {
                         "    else { if (y == 2) { x = 1; } }\n"
                         "    if (y == 3) { }\n" // <- ignore condition
                         "    return x;\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:24]: (error) Uninitialized variable: x [legacyUninitvar]\n", "", errout_str());
 
         // initialization in condition
@@ -3985,7 +4078,7 @@ class TestUninitVar : public TestFixture {
                         "    int a;\n"
                         "    if (init(&a)) { }\n"
                         "    a++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return, break, continue, goto
@@ -3994,14 +4087,14 @@ class TestUninitVar : public TestFixture {
                         "    if (y == 1) { return; }\n"
                         "    else { x = 1; }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    if (y == 1) { return; }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f(int x) {\n"
@@ -4014,7 +4107,7 @@ class TestUninitVar : public TestFixture {
                         "out1:\n"
                         "out2:\n"
                         "    return ret;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
@@ -4026,7 +4119,7 @@ class TestUninitVar : public TestFixture {
                         "        goto out;\n"
                         "    }\n"
                         "    i++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
@@ -4034,7 +4127,7 @@ class TestUninitVar : public TestFixture {
                         "    for (i=0;i<9;++i)\n"
                         "        if (foo) break;\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f() {\n"
@@ -4042,7 +4135,7 @@ class TestUninitVar : public TestFixture {
                         "    while (foo)\n"
                         "        if (bar) break;\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // try/catch : don't warn about exception variable
@@ -4052,7 +4145,7 @@ class TestUninitVar : public TestFixture {
                         "        trace();\n"
                         "        e->Delete();\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #5347
@@ -4060,7 +4153,7 @@ class TestUninitVar : public TestFixture {
                         "    } catch (const char* e) {\n"
                         "        A a = e;\n"
                         "    }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // exit
@@ -4069,7 +4162,7 @@ class TestUninitVar : public TestFixture {
                         "    if (y == 1) { exit(0); }\n"
                         "    else { x = 1; }\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // strange code.. don't crash (#3415)
@@ -4077,7 +4170,7 @@ class TestUninitVar : public TestFixture {
                         "    int i;\n"
                         "    ({ if (0); });\n"
                         "    for_each(i) { }\n"
-                        "}",
+                        "}\n",
                         false);
 
         // if, if
@@ -4085,7 +4178,7 @@ class TestUninitVar : public TestFixture {
                         "    int i;\n"
                         "    if (a) i = 0;\n"
                         "    if (a) i++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -4097,7 +4190,7 @@ class TestUninitVar : public TestFixture {
                         "        }\n"
                         "    }\n"
                         "    if (b) a++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -4105,27 +4198,27 @@ class TestUninitVar : public TestFixture {
                         "    if (x) { }\n"
                         "    else { if (y==2) { a=1; b=2; } }\n"
                         "    if (a) { ++b; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f(int x, int y) {\n"
                         "    int a;\n"
                         "    if (x == 0) { a = y; }\n"
                         "    if (x == 0 && (a == 1)) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f() {\n"
                         "    int a=0, b;\n"
                         "    if (something) { a = dostuff(&b); }\n"
                         "    if (!a || b) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f(int x, int y) {\n"
                         "    int a;\n"
                         "    if (x == 0 && (a == 1)) { }\n"
-                        "}",
+                        "}\n",
                         true);
         ASSERT_EQUALS("[test.cpp:3:20]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
@@ -4133,14 +4226,14 @@ class TestUninitVar : public TestFixture {
                         "    int a;\n"
                         "    if (x) { a = 0; }\n"
                         "    if (x) { if (y) { a++; } }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int a;\n"
                         "    if (x) { a = 0; }\n"
                         "    if (x) { if (y) { } else { a++; } }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -4149,7 +4242,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) ab = getAB();\n"
                         "    else ab.a = 0;\n"
                         "    if (ab.a == 1) b = ab.b;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
@@ -4161,7 +4254,7 @@ class TestUninitVar : public TestFixture {
                         "    if (i==1) { a = 0; }\n"
                         "    else { a = 1; }\n"
                         "    return a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n" // #4560
@@ -4171,8 +4264,8 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = 123;\n" // <- y is always initialized
                         "    else {}\n"
                         "    return y;\n"
-                        "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:5:9] -> [test.cpp:7:12]: (warning) Uninitialized variable: y [uninitvar]\n", errout_str());
+                        "}\n");
+        ASSERT_EQUALS("", errout_str()); // #4560: escaping else keeps x known, so x is true and y is initialized
 
         valueFlowUninit("int f(int a) {\n" // #6583
                         "    int x;\n"
@@ -4180,7 +4273,7 @@ class TestUninitVar : public TestFixture {
                         "    else if (a == 2) x = 0;\n"
                         "    else exit(2);\n"
                         "    return x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n" // #4560
@@ -4190,15 +4283,16 @@ class TestUninitVar : public TestFixture {
                         "    if (x) {}\n"
                         "    else y = 123;\n" // <- y is always initialized
                         "    return y;\n"
-                        "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:5:9] -> [test.cpp:7:12]: (warning) Uninitialized variable: y [uninitvar]\n", errout_str());
+                        "}\n");
+        ASSERT_EQUALS("",
+                      errout_str()); // #4560: fork-based condition analysis tracks x==0 -> else branch -> y initialized
 
         valueFlowUninit("void f(int x) {\n" // #3948
                         "  int value;\n"
                         "  if (x !=-1)\n"
                         "    value = getvalue();\n"
                         "  if (x == -1 || value > 300) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("enum t_err { ERR_NONE, ERR_BAD_ARGS };\n" // #9649
@@ -4211,7 +4305,7 @@ class TestUninitVar : public TestFixture {
                         "        ret = init_box(&box2, 20);\n"
                         "    if (ret == ERR_NONE)\n"
                         "        z = x + box2.value;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -4220,7 +4314,7 @@ class TestUninitVar : public TestFixture {
                         "    value = getvalue();\n"
                         "  if (x == 1)\n"
                         "    v = value;\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: value [legacyUninitvar]\n", "", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
@@ -4229,7 +4323,7 @@ class TestUninitVar : public TestFixture {
                         "    value = getvalue();\n"
                         "  if (x == 32) {}\n"
                         "  else v = value;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:6:12]: (warning) Uninitialized variable: value [uninitvar]\n", errout_str());
 
         valueFlowUninit("static int x;" // #4773
@@ -4239,7 +4333,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = 123;\n"
                         "    else y = 456;\n"
                         "    return y;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static int x;" // #4773
@@ -4249,7 +4343,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x) y = 123;\n"
                         "    else y = 456;\n"
                         "    return y;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int a) {\n"
@@ -4259,7 +4353,7 @@ class TestUninitVar : public TestFixture {
                         "    if (!a) {}\n"
                         "    else if (x) {}\n"
                         "  }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // asm
@@ -4267,75 +4361,75 @@ class TestUninitVar : public TestFixture {
                         "    int x;\n"
                         "    asm();\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // sizeof / typeof / offsetof / etc
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    sizeof(i+1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    if (100 == sizeof(i+1));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    int i = ARRAY_SIZE(abc.a);"
-                        "}");
+                        "}\n");
         // FP ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int *abc;\n"
                         "    typeof(*abc);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    return do_something(typeof(*abc));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    A *a;\n"
                         "    a = malloc(sizeof(*a));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // &
         valueFlowUninit("void f() {\n" // #4426 - address of uninitialized variable
                         "    int a,b;\n"
                         "    if (&a == &b);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4439 - cast address of uninitialized variable
                         "    int a;\n"
                         "    x((LPARAM)(RECT*)&a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit(
             "int main() {\n"
             "    int done;\n"
             "    dostuff(1, (AuPointer) &done);\n" // <- It is not conclusive if the "&" is a binary or unary operator. Bailout.
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("", "[test.cpp:3:29]: (error) Uninitialized variable: done [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n" // #4778 - cast address of uninitialized variable
                         "    long a;\n"
                         "    &a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4717 - ({})
                         "    int a = ({ long b = (long)(123); 2 + b; });\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
     }
@@ -4348,7 +4442,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "  struct myst item;\n"
                         "  bar(&item);\n"
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct myst { int a; };\n"
@@ -4357,7 +4451,7 @@ class TestUninitVar : public TestFixture {
                         "  struct myst item;\n"
                         "  bar(&item);\n"
                         "  a = item.a;\n" // <- item.a is not initialized
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("[test.c:6:12]: (error) Uninitialized variable: item.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct myst { int a; };\n"
@@ -4366,14 +4460,14 @@ class TestUninitVar : public TestFixture {
                         "  struct myst item;\n"
                         "  bar(&item);\n"
                         "  a = item.a;\n"
-                        "}", false);
+                        "}\n", false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int& r) {}\n" // #12536
                         "void g() {\n"
                         "    int i;\n"
                         "    f(i);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int& i, int j, int k) {\n" // #12514
@@ -4384,7 +4478,7 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "    int i;\n"
                         "    return f(i, 1, 0);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:4:12]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f(int& i, int k) {\n"
@@ -4395,7 +4489,7 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "    int i;\n"
                         "    return f(i, 0);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:4:12]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
     }
 
@@ -4404,21 +4498,21 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    int a = ab.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    AB ab;\n"
                        "    int a = ab.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    ab.a = ab.a + 1;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4444,7 +4538,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    do_something(ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4458,7 +4552,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    AB ab1;\n"
                        "    AB ab2 = { ab1.a, 0 };\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:20]: (error) Uninitialized struct member: ab1.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4497,7 +4591,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4505,7 +4599,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4513,7 +4607,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4521,7 +4615,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4529,7 +4623,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4537,7 +4631,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).f();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4545,7 +4639,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; element->v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
@@ -4553,7 +4647,7 @@ class TestUninitVar : public TestFixture {
                        "};\n"
                        "void test() {\n"
                        "    Element *element; (*element).v;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"  // pass struct member by address
@@ -4569,7 +4663,7 @@ class TestUninitVar : public TestFixture {
                        "    Cstring res;\n"
                        "    if ( ! maybe() ) return;\n"  // <- fp goes away if this is removed
                        "    ( ((res).text = (void*)0), ((res).size = (res).alloc = 0) );\n"  // <- fp goes away if parentheses are removed
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         {
@@ -4589,7 +4683,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    uninitvar_funcArgInTest(&ab);\n"
                            "    x = ab;\n"
-                           "}\n", dinit(CheckUninitVarOptions, $.cpp = false, $.s = &s));
+                           "}\n", s, false);
             ASSERT_EQUALS("[test.c:5:9]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
             checkUninitVar("struct AB { int a; };\n"
@@ -4597,7 +4691,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    uninitvar_funcArgOutTest(&ab);\n"
                            "    x = ab;\n"
-                           "}\n", dinit(CheckUninitVarOptions, $.cpp = false, $.s = &s));
+                           "}\n", s, false);
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -4657,7 +4751,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    ab.set();\n"
                            "    x = ab;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("struct AB { int a; int get() const; };\n"
@@ -4665,7 +4759,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    ab.get();\n"
                            "    x = ab;\n"
-                           "}");
+                           "}\n");
             ASSERT_EQUALS("[test.cpp:5:9]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
             checkUninitVar("struct AB { int a; void dostuff() {} };\n"
@@ -4673,7 +4767,7 @@ class TestUninitVar : public TestFixture {
                            "    struct AB ab;\n"
                            "    ab.dostuff();\n"
                            "    x = ab;\n"
-                           "}");
+                           "}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
@@ -4712,7 +4806,7 @@ class TestUninitVar : public TestFixture {
                        "    struct PIXEL p1;\n"
                        "    p1.color = 255;\n"
                        "    return p1.red;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4723,7 +4817,7 @@ class TestUninitVar : public TestFixture {
                        "      a = ab->a;\n"
                        "    }\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4733,7 +4827,7 @@ class TestUninitVar : public TestFixture {
                        "    ab = getab();\n"
                        "  }\n"
                        "  if (x == 0 && (ab != NULL || ab->a == 0)) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct A { int *x; };\n" // declarationId is 0 for "delete"
@@ -4741,7 +4835,7 @@ class TestUninitVar : public TestFixture {
                        "void bar(void) {\n"
                        "  struct A *delete = 0;\n"
                        "  foo( info, NULL );\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct ABC { int a; int b; int c; };\n"
@@ -4750,7 +4844,7 @@ class TestUninitVar : public TestFixture {
                        "  struct ABC abc;\n"
                        "  foo(123, &abc);\n"
                        "  return abc.b;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized struct member: abc.a\n"
                            "[test.cpp:5]: (error) Uninitialized struct member: abc.b\n"
                            "[test.cpp:5]: (error) Uninitialized struct member: abc.c\n",
@@ -4761,13 +4855,13 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "  struct ABC abc;\n"
                        "  dostuff((uint32_t *)&abc.a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n"
                        "    struct tm t;\n"
                        "    t.tm_year = 123;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return
@@ -4831,20 +4925,20 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct Fred fred;\n"
                        "    if (fred.a==1) {}\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:4:9]: (error) Uninitialized struct member: fred.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct S { int n; int m; };\n"
                        "void f(void) {\n"
                        " struct S s;\n"
                        " for (s.n = 0; s.n <= 10; s.n++) { }\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void test2() {\n"
                        "  struct { char type; } s_d;\n"
                        "  if (foo(&s_d.type)){}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // for
@@ -4852,21 +4946,21 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    while (x) { clear(ab); z = ab.a; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; };\n"
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    while (x) { ab.a = ab.a + 1; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:24]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; };\n"
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    while (x) { init(&ab); z = ab.a; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // address of member
@@ -4874,7 +4968,7 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct AB ab;\n"
                        "    int *p = ab.a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Reference
@@ -4884,7 +4978,7 @@ class TestUninitVar : public TestFixture {
                        "  int& x = a.x;\n"
                        "  x = 0;\n"
                        "  return a.x;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
@@ -4893,7 +4987,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    int a = ab.a;\n"
                        "    int b = ab.b;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
 
         // STL class member
@@ -4904,7 +4998,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C++)
@@ -4915,7 +5009,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
@@ -4926,7 +5020,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:7:9]: (error) Uninitialized struct member: a.m [uninitStructMember]\n", errout_str());
 
         // Type with constructor
@@ -4938,7 +5032,7 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #11002
@@ -4961,7 +5055,7 @@ class TestUninitVar : public TestFixture {
                        "  if (flag) {\n"
                        "    a = ab.a;\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct S { int x; };\n"
@@ -4976,7 +5070,7 @@ class TestUninitVar : public TestFixture {
                        "    S& r{ s };\n"
                        "    r.x = 0;\n"
                        "    return s;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct S { int i; };\n" // #12142
@@ -4987,6 +5081,14 @@ class TestUninitVar : public TestFixture {
                        "    return s.i;\n"
                        "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("struct S { int a; };\n" // #13848
+                       "int f(std::istream& is) {\n"
+                       "    S s;\n"
+                       "    is >> s;\n"
+                       "    return s.a;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar2_while() {
@@ -4998,7 +5100,7 @@ class TestUninitVar : public TestFixture {
                        "    while (a) {\n"
                        "        x = x + 1;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -5006,18 +5108,18 @@ class TestUninitVar : public TestFixture {
                        "    do {\n"
                        "        x = x + 1;\n"
                        "    } while (a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    for (int x = x; x < 10; x++) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Element{Element*Next();};
         checkUninitVar("void f() {\n"
                        "    for (Element *ptr3 = ptr3->Next(); ptr3; ptr3 = ptr3->Next()) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (error) Uninitialized variable: ptr3 [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: int a;
@@ -5027,7 +5129,7 @@ class TestUninitVar : public TestFixture {
                        "        init(&x);\n"
                        "        x++;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -5036,7 +5138,7 @@ class TestUninitVar : public TestFixture {
                        "        if (b) x++;\n"
                        "        else x = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
@@ -5044,13 +5146,13 @@ class TestUninitVar : public TestFixture {
                        "    for (int i = 0; i < 10; i += x) {\n"
                        "        x = y;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    for (int i = 0; i < 10; i += x) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:34]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
@@ -5058,14 +5160,14 @@ class TestUninitVar : public TestFixture {
                        "    for (i=0;i<9;++i)\n"
                        "        if (foo()) return i;\n"
                        "    return 9;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    do {} while (!getvalue(&i));\n"
                        "    i++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(void) {\n"
@@ -5077,7 +5179,7 @@ class TestUninitVar : public TestFixture {
                        "       }\n"
                        "   }\n"
                        "   return x;\n"
-                       "}");
+                       "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("int f(void) {\n"
@@ -5088,7 +5190,7 @@ class TestUninitVar : public TestFixture {
                        "       }\n"
                        "   }\n"
                        "   return 0;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void do_something(int);
@@ -5098,7 +5200,7 @@ class TestUninitVar : public TestFixture {
                        "       int a = x+1;\n"
                        "       do_something(a);\n"
                        "   }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct AB {int a; int b;};\n"
@@ -5118,7 +5220,7 @@ class TestUninitVar : public TestFixture {
                        "        for (int i=0;i<10;i++)\n"
                        "            buffer[i] = 0;\n" // <- fp
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(){\n" // #4519 - fp: inline assembler in loop
@@ -5127,14 +5229,14 @@ class TestUninitVar : public TestFixture {
                        "        asm(\"foo\");\n"
                        "        if (x & 0xf1) { }\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f(void) {\n"
                        "    struct ABC *abc;\n"
                        "    for (i = 0; i < 10; i++)\n"
                        "        x += sizeof(*abc);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n" // #4879
@@ -5143,7 +5245,7 @@ class TestUninitVar : public TestFixture {
                        "        for (i = 0; i < 5; i++)\n"
                        "            a[i] = b[i];\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n" // #5658
@@ -5152,7 +5254,7 @@ class TestUninitVar : public TestFixture {
                        "            foo = malloc(sizeof(*foo));\n"
                        "            foo->x = 0;\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n"
@@ -5160,28 +5262,28 @@ class TestUninitVar : public TestFixture {
                        "  while (x) {\n"
                        "    for (i=0,y=i;;){}\n"
                        "  }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  char *p = (char *)malloc(256);\n"
                        "  while(*p && *p == '_')\n"
                        "    p++;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Memory is allocated but not initialized: *p [uninitdata]\n", errout_str());
 
         // #6646 - init in for loop
         checkUninitVar("void f() {\n" // No FP
                        "  for (int i;;i++)\n"
                        "    dostuff(&i);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int a;
         checkUninitVar("void f() {\n" // No FN
                        "  for (int i;;i++)\n"
                        "    a=i;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:2:15]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("namespace N {\n" // #7377
@@ -5219,7 +5321,7 @@ class TestUninitVar : public TestFixture {
                        "    void ff(void) { char *p; ::N1::Fred::f2(p); }\n"
                        "    void fg(void) { char *p; Foo::f1(p); }\n"
                        "    void fh(void) { char *p; Foo::f2(p); }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:6:39]: (error) Uninitialized variable: p [legacyUninitvar]\n"
                       "[test.cpp:8:45]: (error) Uninitialized variable: p [legacyUninitvar]\n"
                       "[test.cpp:13:33]: (error) Uninitialized variable: p [legacyUninitvar]\n"
@@ -5234,7 +5336,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    char *p;\n"
                        "    fred.f1(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:8:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("class Fred {\n"
@@ -5257,7 +5359,7 @@ class TestUninitVar : public TestFixture {
                        "void f(void) {\n"
                        "    char *p;\n"
                        "    fred.wilma.barney.betty.f1(p);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:20:32]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
@@ -5265,20 +5367,20 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("int f() {\n"
                        "    int *p = (int*)malloc(40);\n"
                        "    return *p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *p = (int*)malloc(40);\n"
                        "    int var = *p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "int f() {\n"
                        "    struct AB *ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    return ab->a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (error) Memory is allocated but not initialized: ab [uninitdata]\n"
                       "[test.cpp:4:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n",
                       errout_str());
@@ -5289,31 +5391,31 @@ class TestUninitVar : public TestFixture {
                        "  struct t_udf_file *newf;\n"
                        "  newf = malloc(sizeof(*newf));\n"
                        "  if (!newf) {};\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *s = malloc(100);\n"
                        "    if (s != NULL) { }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = malloc(100);\n"
                        "    p || assert_failed();\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = malloc(100);\n"
                        "    x = p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int* f() {\n"
                        "    int *p = (int*)malloc(40);\n"
                        "    return p;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // function parameter (treat it as initialized until malloc is used)
@@ -5321,7 +5423,7 @@ class TestUninitVar : public TestFixture {
                        "    if (*p == 1) {}\n" // no error
                        "    p = (int*)malloc(256);\n"
                        "    return *p;\n" // error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -5329,7 +5431,7 @@ class TestUninitVar : public TestFixture {
                        "    if (ab->a == 1) {}\n" // no error
                        "    ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    return ab->a;\n" // error
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -5337,17 +5439,17 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct AB *ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    do_something(ab);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // analysis failed. varid 0.
         checkUninitVar("void *vlc_custom_create (vlc_object_t *parent, size_t length, const char *typename) {\n"
                        "  assert (length >= sizeof (vlc_object_t));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
-    void uninitvar_ternaryexpression() { // #4683
+    void uninitvar_ternaryexpression1() { // #4683
         checkUninitVar("struct B { int asd; };\n"
                        "int f() {\n"
                        "    int a=0;\n"
@@ -5357,7 +5459,15 @@ class TestUninitVar : public TestFixture {
                        "        b = p;\n"
                        "    }\n"
                        "    return a ? b->asd : 0;\n"
-                       "}");
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void uninitvar_ternaryexpression2() { // #14729
+        checkUninitVar("void f(bool b, int i) {\n"
+                       "    int *p = (int*) malloc(4);\n"
+                       "    int *q = b ? p : &i;\n"
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5367,19 +5477,19 @@ class TestUninitVar : public TestFixture {
                        "        expr->operate();\n"
                        "        expr->operate();\n"
                        "    }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *item;\n"
                        "    for (item: itemList) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int buf[10];\n"
                        "    for (int &i: buf) { i = 0; }\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5394,7 +5504,7 @@ class TestUninitVar : public TestFixture {
                        "  X::P_t P; "
                        "  P.p = 0; "
                        "  result.push_back(P); "
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5407,7 +5517,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "        return i;\n"
                        "    } while (0);\n"
-                       "}\n", dinit(CheckUninitVarOptions, $.s = &s));
+                       "}\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5415,7 +5525,7 @@ class TestUninitVar : public TestFixture {
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f() {\n"
                        "    struct AB *ab = (struct AB*)calloc(1, sizeof(*ab));\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5434,7 +5544,7 @@ class TestUninitVar : public TestFixture {
                        "  using_planner_action = true;\n"
                        "}\n"
                        "if (using_planner_action) {}\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5445,7 +5555,7 @@ class TestUninitVar : public TestFixture {
                             "  struct flex_array *group;\n"
                             "  struct cgroup_taskset tset = { };\n"
                             "  do { } while_each_thread(leader, tsk);\n"
-                            "}";
+                            "}\n";
         ASSERT_THROW_INTERNAL(checkUninitVar(code), SYNTAX);
     }
 
@@ -5455,25 +5565,33 @@ class TestUninitVar : public TestFixture {
                        "  char *dp;\n"
                        "  dp=(char *)d;\n"
                        "  init(dp);\n"
-                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
         // Unknown type
         TODO_ASSERT_EQUALS("", "[test.c:4:14]: (error) Uninitialized variable: d [legacyUninitvar]\n", errout_str());
     }
 
-    void valueFlowUninit_(const char* file, int line, const char code[], bool cpp = true)
-    {
+#define ctu(...) ctu_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void ctu_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        const Settings s = settingsBuilder(settings).debugwarnings(false).build();
-
-        SimpleTokenizer tokenizer(s, *this, cpp);
+        SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for redundant code..
-        CheckUninitVar checkuninitvar(&tokenizer, &s, this);
-        (checkuninitvar.valueFlowUninit)();
+        const CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
+
+        // Check code..
+        std::list<const Check::FileInfo*> fileInfo;
+        CheckUninitVar check;
+        Check& c = getCheck(check);
+        fileInfo.push_back(c.getFileInfo(tokenizer, settings, ""));
+        c.analyseWholeProgram(*ctu, fileInfo, settings, *this); // TODO: check result
+        while (!fileInfo.empty()) {
+            delete fileInfo.back();
+            fileInfo.pop_back();
+        }
+        delete ctu;
     }
 
-#define ctu(code) ctu_(__FILE__, __LINE__, code)
     void valueFlowUninitTest() {
         // #9735 - FN
         valueFlowUninit("typedef struct\n"
@@ -5494,20 +5612,61 @@ class TestUninitVar : public TestFixture {
                         "    status s;\n"
                         "    s.x = 42;\n"
                         "    bar(&s);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:18:9] -> [test.cpp:12:13] -> [test.cpp:8:15]: (warning) Uninitialized variable: s->flag [uninitvar]\n", errout_str());
 
+        // A value narrowed by a nested condition (dimensions < 1 here) must survive the enclosing
+        // 'if' so a later correlated condition can be resolved: dimensions == 1 is then false, the
+        // function does not return, and the uninitialized read is reached.
+        valueFlowUninit("unsigned int g();\n"
+                        "void f(bool a) {\n"
+                        "    unsigned int dimensions = 0;\n"
+                        "    bool mightBeLarger;\n"
+                        "    if (a) {\n"
+                        "        dimensions = g();\n"
+                        "        if (dimensions >= 1)\n"
+                        "            mightBeLarger = false;\n"
+                        "    } else {\n"
+                        "        mightBeLarger = false;\n"
+                        "    }\n"
+                        "    if (dimensions == 1)\n"
+                        "        return;\n"
+                        "    if (!mightBeLarger) {}\n"
+                        "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:9] -> [test.cpp:7:24] -> [test.cpp:14:10]: (warning) Uninitialized variable: mightBeLarger [uninitvar]\n",
+            errout_str());
+
+        // Same shape, but the later condition (dimensions == 0) is implied by the narrowing, so the
+        // early return fires on the uninitialized path and there must be no warning.
+        valueFlowUninit("unsigned int g();\n"
+                        "void f(bool a) {\n"
+                        "    unsigned int dimensions = 0;\n"
+                        "    bool mightBeLarger;\n"
+                        "    if (a) {\n"
+                        "        dimensions = g();\n"
+                        "        if (dimensions >= 1)\n"
+                        "            mightBeLarger = false;\n"
+                        "    } else {\n"
+                        "        mightBeLarger = false;\n"
+                        "    }\n"
+                        "    if (dimensions == 0)\n"
+                        "        return;\n"
+                        "    if (!mightBeLarger) {}\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
         // Ticket #2207 - False negative
         valueFlowUninit("void foo() {\n"
                         "    int a;\n"
                         "    b = c - a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void foo() {\n"
                         "    int a;\n"
                         "    b = a - c;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         // Ticket #6455 - some compilers allow const variables to be uninitialized
@@ -5515,59 +5674,59 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void foo() {\n"
                         "    const int a;\n"
                         "    b = c - a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
         // extracttests.enable
 
         valueFlowUninit("void foo() {\n"
                         "    int *p;\n"
                         "    realloc(p,10);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
         valueFlowUninit("void foo() {\n" // #5240
                         "    char *p = malloc(100);\n"
                         "    char *tmp = realloc(p,1000);\n"
                         "    if (!tmp) free(p);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo() {\n"
                         "    int *p = NULL;\n"
                         "    realloc(p,10);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "  int x;\n"
                         "  switch (x) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "  int x;\n"
                         "  init(x);\n"
                         "  return x;\n" // TODO: inconclusive ?
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #8172
                         "  char **x;\n"
                         "  if (2 < sizeof(*x)) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo() {\n" // #5259 - False negative
                         "    int a;\n"
                         "    int x[] = {a,2};\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "    int x;\n"
                         "    int *y = &x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
@@ -5575,20 +5734,20 @@ class TestUninitVar : public TestFixture {
                         "    int *x;\n"
                         "    int *&y = x;\n"
                         "    y = nullptr;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "    int x = xyz::x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
                         "{\n"
                         "    extern int a;\n"
                         "    a++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
@@ -5596,27 +5755,27 @@ class TestUninitVar : public TestFixture {
                         "    int x, y;\n"
                         "    x = (y = 10);\n"
                         "    int z = y * 2;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo() {\n"
                         "    int x, y;\n"
                         "    x = ((y) = 10);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
                         "{\n"
                         "    Foo p;\n"
                         "    p.abcd();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
                         "{\n"
                         "    Foo p;\n"
                         "    int x = p.abcd();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // struct
@@ -5638,7 +5797,7 @@ class TestUninitVar : public TestFixture {
                         "    if (b)\n"
                         "        p = new S(io);\n"
                         "    p->Write();\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:10]: (warning) Uninitialized variable: p\n",
                            "[test.cpp:8:9] -> [test.cpp:10:5]: (warning) Uninitialized variable: p.rIo [uninitvar]\n",
                            errout_str());
@@ -5649,14 +5808,14 @@ class TestUninitVar : public TestFixture {
                             "{\n"
                             "    A ret;\n"
                             "    return ret;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             // #3916 - avoid false positive
             valueFlowUninit("void f(float x) {\n"
                             "  union lf { long l; float f; } u_lf;\n"
                             "  float hx = (u_lf.f = (x), u_lf.l);\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -5664,7 +5823,7 @@ class TestUninitVar : public TestFixture {
                         "{\n"
                         "    int x[10];\n"
                         "    int *y = x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
@@ -5673,7 +5832,7 @@ class TestUninitVar : public TestFixture {
                         "    int *y = &x;\n"
                         "    *y = 0;\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
@@ -5682,7 +5841,7 @@ class TestUninitVar : public TestFixture {
                         "    char *z = x;\n"
                         "    memset(z, 0, sizeof(x));\n"
                         "    memcpy(y, x, sizeof(x));\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Handling >> and <<
@@ -5691,28 +5850,28 @@ class TestUninitVar : public TestFixture {
                             "    int ret;\n"
                             "    std::cin >> ret;\n"
                             "    ret++;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("void f(int b) {\n"
                             "    int a;\n"
                             "    std::cin >> b >> a;\n"
                             "    return a;"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("void foo() {\n"   // #3707
                             "    Node node;\n"
                             "    int x;\n"
                             "    node[\"abcd\"] >> x;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("int a(FArchive &arc) {\n"  // #3060 (initialization through operator<<)
                             "    int *p;\n"
                             "    arc << p;\n"  // <- TODO initialization?
                             "    return *p;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
             // #4320
@@ -5720,7 +5879,7 @@ class TestUninitVar : public TestFixture {
                             "    int a;\n"
                             "    a << 1;\n"
                             "    return a;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
             // #9750
@@ -5732,7 +5891,7 @@ class TestUninitVar : public TestFixture {
                             "void test(std::istringstream& in) {\n"
                             "    S p;\n"
                             "    in >> p.one >> p.two;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
         }
 
@@ -5740,28 +5899,28 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    S s;\n"
                         "    return s(1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a() {\n"   // asm
                         "    int x;\n"
                         "    asm();\n"
                         "    x++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
                         "{\n"
                         "    int x[10];\n"
                         "    struct xyz xyz1 = { .x = x };\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "   char *buf = malloc(100);\n"
                         "   struct ABC *abc = buf;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("class Fred {\n"
@@ -5772,7 +5931,7 @@ class TestUninitVar : public TestFixture {
                         "Fred::~Fred()\n"
                         "{\n"
                         "    fclose(f);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
@@ -5780,7 +5939,7 @@ class TestUninitVar : public TestFixture {
                         "    int c;\n"
                         "    ab(sizeof(xyz), &c);\n"
                         "    if (c);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
@@ -5788,7 +5947,7 @@ class TestUninitVar : public TestFixture {
                         "    int c;\n"
                         "    a = (f2(&c));\n"
                         "    c++;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // goto/setjmp/longjmp..
@@ -5804,7 +5963,7 @@ class TestUninitVar : public TestFixture {
                         "\n"
                         "found:\n"
                         "    int a = b;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo()\n"
@@ -5816,14 +5975,14 @@ class TestUninitVar : public TestFixture {
                         "        return a;\n"
                         "    a = 1;\n"
                         "    longjmp(env, 1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // range for..
         valueFlowUninit("void f() {\n"
                         "    X *item;\n"
                         "    for (item: itemList) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("X f() {\n"
@@ -5847,7 +6006,7 @@ class TestUninitVar : public TestFixture {
                         "  else\n"
                         "    retval = 2;\n"
                         "  return retval;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo(struct qb_list_head *list) {\n"
@@ -5859,7 +6018,7 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void json_parse_nat_type_flags(json_t *root) {\n"
                         "    int index;\n"
                         "    json_array_foreach(root, index, value) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo()\n"
@@ -5868,7 +6027,7 @@ class TestUninitVar : public TestFixture {
                         "    goto exit;\n"
                         "    i++;\n"
                         "exit:\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo() {\n"
@@ -5878,7 +6037,7 @@ class TestUninitVar : public TestFixture {
                         "    x = a;\n"
                         "    y = 1;\n"
                         "    goto again;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #4040 - False positive
@@ -5894,7 +6053,7 @@ class TestUninitVar : public TestFixture {
                         "        iter = x;\n"
                         "    }\n"
                         "    return 1 + iter;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // C++11 style initialization
@@ -5902,7 +6061,7 @@ class TestUninitVar : public TestFixture {
                         "    int i = 0;\n"
                         "    int j{ i };\n"
                         "    return j;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #5646
@@ -5910,7 +6069,7 @@ class TestUninitVar : public TestFixture {
                         "  float source[2] = {3.1, 3.1};\n"
                         "  float (*sink)[2] = &source;\n"
                         "  return (*sink)[0];\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Ticket #8755
@@ -5922,14 +6081,14 @@ class TestUninitVar : public TestFixture {
                         "        a = 1;\n"
                         "    if (b == 'x') {}\n"
                         "    if (a) {}\n"
-                        "}");
+                        "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: a\n", "", errout_str());
 
         valueFlowUninit("void h() {\n"
                         "  int i;\n"
                         "  int* v = &i;\n"
                         "  sscanf(\"0\", \"%d\", v);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void test(int p) {\n"
@@ -5938,7 +6097,7 @@ class TestUninitVar : public TestFixture {
                         "        f = 0;\n"
                         "    if (p > 1)\n"
                         "        f += 1;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("unsigned char get();\n"
@@ -6034,14 +6193,14 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "    int me;\n"
                         "     dowork(me);\n" // <- me is uninitialized
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:13]: (error) Uninitialized variable: me [uninitvar]\n", errout_str());
 
         valueFlowUninit("int foo() {\n"
                         "  int x;\n"
                         "  int a = x;\n" // <- x is uninitialized
                         "  return a;\n" // <- a has been initialized
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // #10468
@@ -6406,7 +6565,7 @@ class TestUninitVar : public TestFixture {
                         "    int a[1], b[1];\n"
                         "    while (a[0] = g()) {}\n"
                         "    if ((b[0] = g()) == 0) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(const char *x, char *y);\n" // #4527
@@ -6414,7 +6573,7 @@ class TestUninitVar : public TestFixture {
                         "    char a[1000];\n"
                         "    f(a, b);\n"
                         "    printf(\"%s\", a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void usage(const char *);\n" // #10330
@@ -6434,7 +6593,7 @@ class TestUninitVar : public TestFixture {
                         "    if (user)\n"
                         "        pwd = getpwnam(user);\n"
                         "    if (pwd == NULL) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:15:9] -> [test.cpp:17:9]: (warning) Uninitialized variable: pwd [uninitvar]\n", errout_str());
 
         valueFlowUninit("size_t Read(unsigned char* buffer, size_t len);\n" // #11540
@@ -6580,6 +6739,55 @@ class TestUninitVar : public TestFixture {
                         "    return c.front();\n"
                         "}\n");
         ASSERT_EQUALS("[test.cpp:8:12]: (error) Uninitialized variable: c [uninitvar]\n", errout_str());
+
+        // #13930
+        valueFlowUninit("extern int32_t g_items[10U];\n"
+                        "uint16_t write_item(uint8_t n);\n"
+                        "uint16_t write_item(uint8_t n) {\n"
+                        "    int32_t *p_item = NULL;\n"
+                        "    uint16_t ret;\n"
+                        "    ret = 0U;\n"
+                        "    if (n < 10U)\n"
+                        "        p_item = &g_items[n];\n"
+                        "    else\n"
+                        "        ret = 1U;\n"
+                        "    if (ret == 0U) \n"
+                        "        *p_item = 5;\n"
+                        "    return ret;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("int f() {\n" // #12944
+                        "    int i;\n"
+                        "    auto x = [&]() { return i; };\n"
+                        "    i = 5;\n"
+                        "    return x();\n"
+                        "}\n"
+                        "int g() {\n"
+                        "    int i;\n"
+                        "    {\n"
+                        "        auto x = [&]() { return i; };\n"
+                        "        i = 5;\n"
+                        "        return x();\n"
+                        "    }\n"
+                        "}\n"
+                        "int h() {\n"
+                        "    int j;\n"
+                        "    return [&]() { return j; }();\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:17:27]: (error) Uninitialized variable: j [uninitvar]\n", errout_str());
+
+        valueFlowUninit("int f() {\n" // #14582
+                        "    int a[1];\n"
+                        "    static_cast<int*>(a)[0] = 0;\n"
+                        "    return a[0];\n"
+                        "}\n"
+                        "int g() {\n"
+                        "    int a[1];\n"
+                        "    ((int*)a)[0] = 0;\n"
+                        "    return a[0];\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value
@@ -6591,7 +6799,7 @@ class TestUninitVar : public TestFixture {
                         "    wcsstruct *x;\n"
                         "    memcpy(wcsin, x, sizeof(wcsstruct));\n" // <- warning
                         "    x->wcsprm = NULL;\n" // <- no warning
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:19]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct wcsstruct {\n"
@@ -6602,7 +6810,7 @@ class TestUninitVar : public TestFixture {
                         "    wcsstruct *x;\n"
                         "    sizeof(x);\n"
                         "    x->wcsprm = NULL;\n" // <- Warn
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct wcsstruct {\n"
@@ -6615,7 +6823,7 @@ class TestUninitVar : public TestFixture {
                         "    wcsstruct *x;\n"
                         "    x->wcsprm = NULL;\n" // <- warn here
                         "    init_wcs(x);\n" // <- no warning
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:9:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
     }
 
@@ -6630,7 +6838,7 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         "    someType_t gVar;\n"
                         "    bar(&gVar);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:9:9]: (error) Uninitialized variable: &gVar [uninitvar]\n", errout_str());
 
         valueFlowUninit("typedef struct\n"
@@ -6640,7 +6848,7 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         "        someType_t gVar;\n"
                         "        if(gVar.flags[1] == 42){}\n"
-                        "}");
+                        "}\n");
         // TODO : find bugs for member arrays
         TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: gVar.flags\n", "", errout_str());
 
@@ -6650,7 +6858,7 @@ class TestUninitVar : public TestFixture {
                         "    char control[123];\n"
                         "  } u;\n"
                         "  char *x = u.control;\n" // <- no error
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct pc_data {\n"
@@ -6661,7 +6869,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct pc_data *pcdata;\n"
                         "    if ( *pcdata->wampiryzm.strefa == '\\0' ) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:8:11]: (error) Uninitialized variable: pcdata [uninitvar]\n", errout_str());
 
         // # 9293
@@ -6674,7 +6882,7 @@ class TestUninitVar : public TestFixture {
                         "    struct S s1;\n"
                         "    int * x = &s1.x;\n"
                         "    struct S s2 = {*x, 0};\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:9:20]: (error) Uninitialized variable: *x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct S {\n"
@@ -6687,7 +6895,7 @@ class TestUninitVar : public TestFixture {
                         "    struct S s2;\n"
                         "    int * x = &s1.x;\n"
                         "    s2.x = *x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:10:12]: (error) Uninitialized variable: *x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(bool * x) {\n"
@@ -6696,7 +6904,7 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "    bool b;\n"
                         "    f(&b);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(bool * x) {\n"
@@ -6706,7 +6914,7 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "    bool x;\n"
                         "    f(&x);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
@@ -6714,7 +6922,7 @@ class TestUninitVar : public TestFixture {
                         "    bool * x = &b;\n"
                         "    if (x != nullptr)\n"
                         "        x = 1;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A { bool b; };"
@@ -6724,14 +6932,14 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "    A b;\n"
                         "    f(&b);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("std::string f() {\n"
                         "    std::ostringstream ostr;\n"
                         "    ostr << \"\";\n"
                         "    return ostr.str();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
         // #9281
         valueFlowUninit("struct s {\n"
@@ -6746,7 +6954,7 @@ class TestUninitVar : public TestFixture {
                         "void a() {\n"
                         "    struct s s1;\n"
                         "    b(&s1);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9290
@@ -6757,7 +6965,7 @@ class TestUninitVar : public TestFixture {
                         "    A * c;\n"
                         "    c->x = 42;\n"
                         "    return c->x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: c [uninitvar]\n",
                       errout_str());
 
@@ -6768,7 +6976,7 @@ class TestUninitVar : public TestFixture {
                         "    A c;\n"
                         "    c.x = 42;\n"
                         "    return c.x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n"
@@ -6781,7 +6989,7 @@ class TestUninitVar : public TestFixture {
                         "double b() {\n"
                         "    A c;\n"
                         "    return d(&c);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9302
@@ -6794,7 +7002,7 @@ class TestUninitVar : public TestFixture {
                         "    vz.typ      = 42;\n"
                         "    if (pvz->typ == 0)\n"
                         "        return;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9305
@@ -6810,7 +7018,7 @@ class TestUninitVar : public TestFixture {
                         "    set( pb);\n"
                         "    if (pb->x)\n"
                         "        return;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9348
@@ -6821,7 +7029,7 @@ class TestUninitVar : public TestFixture {
                         "void g() {\n"
                         "  int i;\n"
                         "  f(&i);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // # 9631
@@ -6832,7 +7040,7 @@ class TestUninitVar : public TestFixture {
                         "  size_t bytesCopied;\n"
                         "  bool copied_all = true;\n"
                         "  g(&copied_all, 5, 6, &bytesCopied);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:24] -> [test.cpp:2:18]: (warning) Uninitialized variable: *buflen [uninitvar]\n", errout_str());
 
         // # 9953
@@ -6861,7 +7069,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    ab.a = 0;\n"
                         "    do_something(ab);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6870,7 +7078,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    ab.a = 0;\n"
                         "    do_something(ab);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:6:18] -> [test.cpp:2:49]: (warning) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6885,7 +7093,7 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         "    AB ab1;\n"
                         "    AB ab2 = { ab1.a, 0 };\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:20]: (error) Uninitialized variable: ab1.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6928,7 +7136,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6936,7 +7144,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6944,7 +7152,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6952,7 +7160,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6960,7 +7168,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6968,7 +7176,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).f();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6976,7 +7184,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; element->v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
@@ -6984,7 +7192,7 @@ class TestUninitVar : public TestFixture {
                         "};\n"
                         "void test() {\n"
                         "    Element *element; (*element).v;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n" // pass struct member by address
@@ -7002,7 +7210,7 @@ class TestUninitVar : public TestFixture {
             "    Cstring res;\n"
             "    if ( ! maybe() ) return;\n"                                     // <- fp goes away if this is removed
             "    ( ((res).text = (void*)0), ((res).size = (res).alloc = 0) );\n" // <- fp goes away if parentheses are removed
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -7067,7 +7275,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    ab.set();\n"
                             "    x = ab;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("struct AB { int a; int get() const; };\n"
@@ -7075,7 +7283,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    ab.get();\n"
                             "    x = ab;\n"
-                            "}");
+                            "}\n");
             ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: ab [uninitvar]\n", errout_str());
 
             valueFlowUninit("struct AB { int a; void dostuff() {} };\n"
@@ -7083,7 +7291,7 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    ab.dostuff();\n"
                             "    x = ab;\n"
-                            "}");
+                            "}\n");
             TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
@@ -7124,7 +7332,7 @@ class TestUninitVar : public TestFixture {
                         "    struct PIXEL p1;\n"
                         "    p1.color = 255;\n"
                         "    return p1.red;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -7135,7 +7343,7 @@ class TestUninitVar : public TestFixture {
                         "      a = ab->a;\n"
                         "    }\n"
                         "  }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -7145,7 +7353,7 @@ class TestUninitVar : public TestFixture {
                         "    ab = getab();\n"
                         "  }\n"
                         "  if (x == 0 && (ab != NULL || ab->a == 0)) { }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A { int *x; };\n" // declarationId is 0 for "delete"
@@ -7153,7 +7361,7 @@ class TestUninitVar : public TestFixture {
                         "void bar(void) {\n"
                         "  struct A *delete = 0;\n"
                         "  foo( info, NULL );\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct ABC { int a; int b; int c; };\n"
@@ -7162,20 +7370,20 @@ class TestUninitVar : public TestFixture {
                         "  struct ABC abc;\n"
                         "  foo(123, &abc);\n"
                         "  return abc.b;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: &abc [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct ABC { int a; int b; int c; };\n"
                         "void foo() {\n"
                         "  struct ABC abc;\n"
                         "  dostuff((uint32_t *)&abc.a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(void) {\n"
                         "    struct tm t;\n"
                         "    t.tm_year = 123;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return
@@ -7243,7 +7451,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct Fred fred;\n"
                         "    if (fred.a==1) {}\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("[test.c:4:14]: (error) Uninitialized variable: fred.a [uninitvar]\n", errout_str());
 
@@ -7251,14 +7459,14 @@ class TestUninitVar : public TestFixture {
                         "void f(void) {\n"
                         " struct S s;\n"
                         " for (s.n = 0; s.n <= 10; s.n++) { }\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void test2() {\n"
                         "  struct { char type; } s_d;\n"
                         "  if (foo(&s_d.type)){}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // for
@@ -7266,21 +7474,21 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    while (x) { clear(ab); z = ab.a; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; };\n"
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    while (x) { ab.a = ab.a + 1; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:4:27]: (error) Uninitialized variable: ab.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; };\n"
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    while (x) { init(&ab); z = ab.a; }\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // address of member
@@ -7288,7 +7496,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    struct AB ab;\n"
                         "    int *p = ab.a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Reference
@@ -7298,7 +7506,7 @@ class TestUninitVar : public TestFixture {
                         "  int& x = a.x;\n"
                         "  x = 0;\n"
                         "  return a.x;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
@@ -7307,7 +7515,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    int a = ab.a;\n"
                         "    int b = ab.b;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         // STL class member
@@ -7318,7 +7526,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C++)
@@ -7329,8 +7537,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}",
-                        true);
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
@@ -7341,7 +7548,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}",
+                        "}\n",
                         false);
         ASSERT_EQUALS("[test.c:7:11]: (error) Uninitialized variable: a.m [uninitvar]\n", errout_str());
 
@@ -7354,7 +7561,7 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S {\n"
@@ -7384,7 +7591,7 @@ class TestUninitVar : public TestFixture {
                         "   S s;\n"
                         "   s.t[0] = 1;\n"
                         "   f(&s);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct X {\n"
@@ -7649,6 +7856,21 @@ class TestUninitVar : public TestFixture {
                         "  return (&s)->y;\n"
                         "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: s.y [uninitvar]\n", errout_str());
+
+        valueFlowUninit("struct S { int* p; };\n" // #14640
+                        "void f() {\n"
+                        "    int x;\n"
+                        "    S s{ &x };\n"
+                        "    *s.p = 0;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f() {\n"
+                        "    int x;\n"
+                        "    std::vector<int*> v{ &x };\n"
+                        "    *v[0] = 0;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void valueFlowUninitForLoop()
@@ -7659,6 +7881,16 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
+
+        // #14137
+        valueFlowUninit("int f(int n) {\n"
+                        "    int x;\n"
+                        "    assert(n > 0);\n"
+                        "    for(int i=0;i<n;i++)\n"
+                        "        x = n;\n"
+                        "    return x;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_memberfunction() {
@@ -7669,7 +7901,7 @@ class TestUninitVar : public TestFixture {
                         "void f() {\n"
                         "    C *c;\n"
                         "    if (c->x() == 4) {}\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: c [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct A { \n"
@@ -7691,7 +7923,7 @@ class TestUninitVar : public TestFixture {
                         "int main() {\n"
                         "  Foo* foo;\n"
                         "  foo->bar = 3;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:7:3]: (error) Uninitialized variable: foo [uninitvar]\n", errout_str());
     }
 
@@ -7701,7 +7933,7 @@ class TestUninitVar : public TestFixture {
                        "  char *b;\n"
                        "  extern int f(struct a *);\n"
                        "  return f(&(struct a){.b = 0});\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct a { int b, c; };\n"
@@ -7709,41 +7941,57 @@ class TestUninitVar : public TestFixture {
                        "  char *c;\n"
                        "  extern int f(struct a *);\n"
                        "  return f(&(struct a){.b = 0, .c = 0});\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
+    void uninitvarMemberPointer() {
+        checkUninitVar("void f()\n"
+                       "{\n"
+                       "  struct S {};\n"
+                       "  int S::* mp;\n"
+                       "  if (mp) {}\n"
+                       "}\n");
+        ASSERT_EQUALS("[test.cpp:5:7]: (error) Uninitialized variable: mp [legacyUninitvar]\n", errout_str());
+    }
+
     void isVariableUsageDeref() {
         // *p
         checkUninitVar("void f() {\n"
                        "    char a[10];\n"
                        "    char c = *a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: extern const int SIZE;
         checkUninitVar("void f() {\n"
                        "    char a[SIZE+10];\n"
                        "    char c = *a;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char a[10];\n"
                        "    *a += 10;\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  int a[10][10];\n"
                        "  dostuff(*a);\n"
-                       "}");
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    void (*fp[1]) (void) = {function1};\n"
                        "    (*fp[0])();\n"
-                       "}");
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("void f() {\n" // #14708
+                       "    int a[1], b[1];\n"
+                       "    int* c[2]{ a, b };\n"
+                       "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7753,32 +8001,32 @@ class TestUninitVar : public TestFixture {
         valueFlowUninit("void f() {\n"
                         "    char a[10];\n"
                         "    char c = *a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: *a [uninitvar]\n", errout_str());
 
         // extracttests.start: extern const int SIZE;
         valueFlowUninit("void f() {\n"
                         "    char a[SIZE+10];\n"
                         "    char c = *a;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: *a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    char a[10];\n"
                         "    *a += 10;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: *a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "  int a[10][10];\n"
                         "  dostuff(*a);\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    void (*fp[1]) (void) = {function1};\n"
                         "    (*fp[0])();\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("template <typename T, int value> T Get() {return value;}\n"
@@ -7816,7 +8064,7 @@ class TestUninitVar : public TestFixture {
                         "    foo a;\n"
                         "    ((&a)->bar) =  reinterpret_cast<char*>(*p);\n"
                         "    if ((&a)->bar) ;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct foo{char *bar;};\n"
@@ -7824,7 +8072,7 @@ class TestUninitVar : public TestFixture {
                         "    foo a;\n"
                         "    ((&(a))->bar) =  reinterpret_cast<char*>(*p);\n"
                         "    if ((&a)->bar) ;\n"
-                        "}");
+                        "}\n");
         ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n" // #10200
@@ -7903,25 +8151,20 @@ class TestUninitVar : public TestFixture {
                         "    return s;\n"
                         "}\n");
         ASSERT_EQUALS("", errout_str());
-    }
-
-    void ctu_(const char* file, int line, const char code[]) {
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
-
-        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check code..
-        std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckUninitVar>();
-        fileInfo.push_back(c.getFileInfo(tokenizer, settings));
-        c.analyseWholeProgram(*ctu, fileInfo, settings, *this); // TODO: check result
-        while (!fileInfo.empty()) {
-            delete fileInfo.back();
-            fileInfo.pop_back();
-        }
-        delete ctu;
+        valueFlowUninit("struct S { int i; };\n" // #14191
+                        "bool g(S*);\n"
+                        "void f( struct S *p) {\n"
+                        "    struct S s;\n"
+                        "    if (!p) {\n"
+                        "        p = &s;\n"
+                        "        if (g(p))\n"
+                        "            return;\n"
+                        "    }\n"
+                        "    printf(\"%i\", p->i);\n"
+                        "    p = &s;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ctuTest() {
@@ -7931,7 +8174,7 @@ class TestUninitVar : public TestFixture {
             "int main() {\n"
             "  int x;\n"
             "  f(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:4] -> [test.cpp:2:10]: (error) Using argument p that points at uninitialized variable x [ctuuninitvar]\n", errout_str());
 
         ctu("void use(int *p) { a = *p + 3; }\n"
@@ -7939,7 +8182,7 @@ class TestUninitVar : public TestFixture {
             "int main() {\n"
             "  int x;\n"
             "  call(4,&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:5:7] -> [test.cpp:2:33] -> [test.cpp:1:25]: (error) Using argument p that points at uninitialized variable x [ctuuninitvar]\n", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
@@ -7951,7 +8194,7 @@ class TestUninitVar : public TestFixture {
             "void f() {\n"
             "  int x;\n"
             "  dostuff(a, &x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
@@ -7963,7 +8206,7 @@ class TestUninitVar : public TestFixture {
             "void f() {\n"
             "  int x;\n"
             "  dostuff(a, &x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void f(int *p) {\n"
@@ -7972,7 +8215,7 @@ class TestUninitVar : public TestFixture {
             "int main() {\n"
             "  int x;\n"
             "  f(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void f(int *v) {\n"
@@ -7981,7 +8224,7 @@ class TestUninitVar : public TestFixture {
             "int main() {\n"
             "  int x;\n"
             "  f(&x);\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         ctu("void increment(int& i) { ++i; }\n" // #6475
diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
index b705ed91f61..e38cfc25df0 100644
--- a/test/testunusedfunctions.cpp
+++ b/test/testunusedfunctions.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -79,7 +79,6 @@ class TestUnusedFunctions : public TestFixture {
         TEST_CASE(entrypointsWinU);
         TEST_CASE(entrypointsUnix);
 
-        TEST_CASE(includes);
         TEST_CASE(virtualFunc);
         TEST_CASE(parensInit);
         TEST_CASE(typeInCast);
@@ -87,29 +86,33 @@ class TestUnusedFunctions : public TestFixture {
         TEST_CASE(attributeUnused);
         TEST_CASE(attributeMaybeUnused);
         TEST_CASE(staticFunction);
+        TEST_CASE(unnamedArg);
     }
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         Platform::Type platform = Platform::Type::Native;
-        const Settings* s = nullptr;
         bool cpp = true;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(options.s ? *options.s : settings).platform(options.platform).build();
+        // TODO: avoid copy
+        const Settings settings1 = (options.platform == Platform::Type::Native) ? settings : settingsBuilder(settings).platform(options.platform).build();
 
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+        check_(file, line, code, settings1, options.cpp);
+    }
+
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings& settings1, bool cpp = true) {
+        SimpleTokenizer tokenizer(settings1, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused functions..
         CheckUnusedFunctions checkUnusedFunctions;
-        checkUnusedFunctions.parseTokens(tokenizer, settings1);
-        (checkUnusedFunctions.check)(settings1, *this); // TODO: check result
+        checkUnusedFunctions.parseTokens(tokenizer, settings1.library);
+        (checkUnusedFunctions.check)(settings1.library, *this); // TODO: check result
     }
 
     // TODO: get rid of this
@@ -120,8 +123,8 @@ class TestUnusedFunctions : public TestFixture {
 
         // Check for unused functions..
         CheckUnusedFunctions checkUnusedFunctions;
-        checkUnusedFunctions.parseTokens(tokenizer, settings);
-        (checkUnusedFunctions.check)(settings, *this); // TODO: check result
+        checkUnusedFunctions.parseTokens(tokenizer, settings.library);
+        (checkUnusedFunctions.check)(settings.library, *this); // TODO: check result
     }
 
     void incondition() {
@@ -129,24 +132,24 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    if (f1())\n"
               "    { }\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
     void return1() {
         check("int f1()\n"
               "{\n"
               "    return f1();\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
     void return2() {
         check("char * foo()\n"
               "{\n"
               "    return foo();\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:8]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
     void return3() {
@@ -163,7 +166,7 @@ class TestUnusedFunctions : public TestFixture {
               "}\n"
               "int main() {\n"
               "  indirectHello();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -171,8 +174,8 @@ class TestUnusedFunctions : public TestFixture {
         check("void f1()\n"
               "{\n"
               "    void (*f)() = cond ? f1 : NULL;\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
     void callback2() { // #8677
@@ -184,8 +187,8 @@ class TestUnusedFunctions : public TestFixture {
               "\n"
               "void C::callback() {}\n" // <- not unused
               "\n"
-              "void C::start() { ev.set<C, &C::callback>(this); }");
-        ASSERT_EQUALS("[test.cpp:9:0]: (style) The function 'start' is never used. [unusedFunction]\n", errout_str());
+              "void C::start() { ev.set<C, &C::callback>(this); }\n");
+        ASSERT_EQUALS("[test.cpp:9:9]: (style) The function 'start' is never used. [unusedFunction]\n", errout_str());
     }
 
     void else1() {
@@ -193,8 +196,8 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    if (cond) ;\n"
               "    else f1();\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
     void functionpointer() {
@@ -202,14 +205,14 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f(&foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void foo() { }\n"
               "int main() {\n"
               "    f(&::foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
@@ -218,7 +221,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f(&abc::foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
@@ -227,7 +230,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f = &abc::foo;\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
@@ -236,7 +239,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f = &::abc::foo;\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"  // #3875
@@ -245,7 +248,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f(abc::foo);\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("template <class T> T f()\n" // #13117
@@ -267,7 +270,7 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    foo<int>();\n"
               "    return 0\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -279,8 +282,8 @@ class TestUnusedFunctions : public TestFixture {
               "    f();\n"
               "}\n"
               "\n"
-              "void h() { g<int>(); h(); }");
-        ASSERT_EQUALS("[test.cpp:8:0]: (style) The function 'h' is never used. [unusedFunction]\n", errout_str());
+              "void h() { g<int>(); h(); }\n");
+        ASSERT_EQUALS("[test.cpp:8:6]: (style) The function 'h' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template3() { // #4701
@@ -290,8 +293,8 @@ class TestUnusedFunctions : public TestFixture {
               "private:\n"
               "    template<typename T> void foo( T t ) const;\n"
               "};\n"
-              "template<typename T> void X::foo( T t ) const { }");
-        ASSERT_EQUALS("[test.cpp:3:0]: (style) The function 'bar' is never used. [unusedFunction]\n", errout_str());
+              "template<typename T> void X::foo( T t ) const { }\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The function 'bar' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template4() { // #9805
@@ -310,8 +313,8 @@ class TestUnusedFunctions : public TestFixture {
               "        call<int>(1, 2, 3);\n"
               "        test();\n"
               "    }\n"
-              "};");
-        ASSERT_EQUALS("[test.cpp:11:0]: (style) The function 'test' is never used. [unusedFunction]\n", errout_str());
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:11:10]: (style) The function 'test' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template5() { // #9220
@@ -322,7 +325,7 @@ class TestUnusedFunctions : public TestFixture {
               "template <Filter fun>\n"
               "void g() { fun(); }\n"
               "\n"
-              "int main() { g<f>(); return 0;}");
+              "int main() { g<f>(); return 0;}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -337,7 +340,7 @@ class TestUnusedFunctions : public TestFixture {
         check("void f() {\n"
               "    std::array<std::array<double,3>,3> array;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template8() { // #11485
@@ -345,7 +348,7 @@ class TestUnusedFunctions : public TestFixture {
               "    template<typename T>\n"
               "    void tf(const T&) { }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:3:0]: (style) The function 'tf' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The function 'tf' is never used. [unusedFunction]\n", errout_str());
 
         check("struct C {\n"
               "    template<typename T>\n"
@@ -400,45 +403,45 @@ class TestUnusedFunctions : public TestFixture {
     }
 
     void throwIsNotAFunction() {
-        check("struct A {void f() const throw () {}}; int main() {A a; a.f();}");
+        check("struct A {void f() const throw () {}}; int main() {A a; a.f();}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void unusedError() {
         check("void foo() {}\n"
-              "int main()");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
+              "int main()\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
 
         check("void foo() const {}\n"
-              "int main()");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
+              "int main()\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
 
         check("void foo() const throw() {}\n"
-              "int main()");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
+              "int main()\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
 
         check("void foo() throw() {}\n"
-              "int main()");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
+              "int main()\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
     void unusedMain() {
-        check("int main() { }");
+        check("int main() { }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void initializationIsNotAFunction() {
         check("struct B: N::A {\n"
               "  B(): N::A() {};\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void operator1() {
-        check("struct Foo { void operator()(int a) {} };");
+        check("struct Foo { void operator()(int a) {} };\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct Foo { operator std::string(int a) {} };");
+        check("struct Foo { operator std::string(int a) {} };\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -456,56 +459,56 @@ class TestUnusedFunctions : public TestFixture {
     }
 
     void returnRef() {
-        check("int& foo() {return x;}");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
+        check("int& foo() {return x;}\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
     void attribute() { // #3471 - FP __attribute__((constructor))
-        check("void __attribute__((constructor)) f() {}");
+        check("void __attribute__((constructor)) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void __attribute__((constructor(1000))) f() {}");
+        check("void __attribute__((constructor(1000))) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void __attribute__((destructor)) f() {}");
+        check("void __attribute__((destructor)) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("void __attribute__((destructor(1000))) f() {}");
+        check("void __attribute__((destructor(1000))) f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // alternate syntax
-        check("__attribute__((constructor)) void f() {}");
+        check("__attribute__((constructor)) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("__attribute__((constructor(1000))) void f() {}");
+        check("__attribute__((constructor(1000))) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("__attribute__((destructor)) void f() {}");
+        check("__attribute__((destructor)) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("__attribute__((destructor(1000))) void f() {}");
+        check("__attribute__((destructor(1000))) void f() {}\n");
         ASSERT_EQUALS("", errout_str());
 
         // alternate syntax
         check("void f() __attribute__((constructor));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((constructor(1000)));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((destructor));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((destructor(1000)));\n"
-              "void f() { }");
+              "void f() { }\n");
         ASSERT_EQUALS("", errout_str());
 
         // Don't crash on wrong syntax
         check("int x __attribute__((constructor));\n"
-              "int y __attribute__((destructor));");
+              "int y __attribute__((destructor));\n");
 
         // #10661
         check("extern \"C\" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) { return 0; }\n");
@@ -522,7 +525,7 @@ class TestUnusedFunctions : public TestFixture {
               "    A() : m_i(foo())\n"
               "    {}\n"
               "int m_i;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         // #8580
@@ -533,7 +536,7 @@ class TestUnusedFunctions : public TestFixture {
               "public:\n"
               "  A() : a(bar([] { return foo(); })) {}\n"
               "  const int a;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -547,7 +550,7 @@ class TestUnusedFunctions : public TestFixture {
               "    void (Foo::*ptr)();\n"
               "    ptr = (argc > 1 && !strcmp(argv[1], \"F2\")) ? &Foo::F2 : &Foo::F1;\n"
               "    (foo.*ptr)();\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -556,7 +559,7 @@ class TestUnusedFunctions : public TestFixture {
               "void f() {\n"
               "    parse(line, blanks_p >> ident[&_xy] >> blanks_p >> eol_p).full;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:0]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:6]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
 
     void enumValues() { // #11486
@@ -566,8 +569,8 @@ class TestUnusedFunctions : public TestFixture {
               "    void Break() {}\n"
               "    void Break1() {}\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:4:0]: (style) The function 'Break' is never used. [unusedFunction]\n"
-                      "[test.cpp:5:0]: (style) The function 'Break1' is never used. [unusedFunction]\n",
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The function 'Break' is never used. [unusedFunction]\n"
+                      "[test.cpp:5:10]: (style) The function 'Break1' is never used. [unusedFunction]\n",
                       errout_str());
 
         check("struct S {\n" // #12899
@@ -577,21 +580,21 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    E e{ f };\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:0]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
 
     void recursive() {
         check("void f() {\n" // #8159
               "    f();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'f' is never used. [unusedFunction]\n",
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f' is never used. [unusedFunction]\n",
                       errout_str());
     }
 
     void multipleFiles() {
         CheckUnusedFunctions c;
 
-        const char code[] = "static void f() { }";
+        const char code[] = "static void f() { }\n";
 
         for (int i = 1; i <= 2; ++i) {
             const std::string fname = "test" + std::to_string(i) + ".cpp";
@@ -599,29 +602,29 @@ class TestUnusedFunctions : public TestFixture {
             SimpleTokenizer tokenizer{settings, *this, fname};
             ASSERT(tokenizer.tokenize(code));
 
-            c.parseTokens(tokenizer, settings);
+            c.parseTokens(tokenizer, settings.library);
         }
 
         // Check for unused functions..
-        (c.check)(settings, *this); // TODO: check result
+        (c.check)(settings.library, *this); // TODO: check result
 
-        ASSERT_EQUALS("[test1.cpp:1:0]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test1.cpp:1:13]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
 
     void lineNumber() {
         check("void foo();\n"
               "void bar() {}\n"
-              "int main() {}");
-        ASSERT_EQUALS("[test.cpp:2:0]: (style) The function 'bar' is never used. [unusedFunction]\n", errout_str());
+              "int main() {}\n");
+        ASSERT_EQUALS("[test.cpp:2:6]: (style) The function 'bar' is never used. [unusedFunction]\n", errout_str());
     }
 
     void ignore_declaration() {
         check("void f();\n"
-              "void f() {}");
-        ASSERT_EQUALS("[test.cpp:2:0]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
+              "void f() {}\n");
+        ASSERT_EQUALS("[test.cpp:2:6]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
 
         check("void f(void) {}\n"
-              "void (*list[])(void) = {f};");
+              "void (*list[])(void) = {f};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -632,7 +635,7 @@ class TestUnusedFunctions : public TestFixture {
               "};\n"
               "std::ostream & operator<<(std::ostream &os, const A&) {\n"
               "    os << \"This is class A\";\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A{};\n"
@@ -669,7 +672,7 @@ class TestUnusedFunctions : public TestFixture {
               "A operator ++ (const A &){ return A(); }\n"
               "A operator -- (const A &, const int){ return A(); }\n"
               "A operator -- (const A &){ return A(); }\n"
-              "A operator , (const A &, const A &){ return A(); }");
+              "A operator , (const A &, const A &){ return A(); }\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -683,70 +686,55 @@ class TestUnusedFunctions : public TestFixture {
               "}\n"
               "void * A::operator new[](std::size_t s) {\n"
               "    return malloc(s);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsWin() {
-        check("int WinMain() { }");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'WinMain' is never used. [unusedFunction]\n", errout_str());
+        check("int WinMain() { }\n");
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'WinMain' is never used. [unusedFunction]\n", errout_str());
 
-        check("int _tmain() { }");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function '_tmain' is never used. [unusedFunction]\n", errout_str());
+        check("int _tmain() { }\n");
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function '_tmain' is never used. [unusedFunction]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).library("windows.cfg").build();
 
-        check("int WinMain() { }", dinit(CheckOptions, $.s = &s));
+        check("int WinMain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
 
-        check("int _tmain() { }", dinit(CheckOptions, $.s = &s));
+        check("int _tmain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsWinU() {
-        check("int wWinMain() { }");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function 'wWinMain' is never used. [unusedFunction]\n", errout_str());
+        check("int wWinMain() { }\n");
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'wWinMain' is never used. [unusedFunction]\n", errout_str());
 
-        check("int _tmain() { }");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function '_tmain' is never used. [unusedFunction]\n", errout_str());
+        check("int _tmain() { }\n");
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function '_tmain' is never used. [unusedFunction]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).library("windows.cfg").build();
 
-        check("int wWinMain() { }", dinit(CheckOptions, $.s = &s));
+        check("int wWinMain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
 
-        check("int _tmain() { }", dinit(CheckOptions, $.s = &s));
+        check("int _tmain() { }\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsUnix() {
         check("int _init() { }\n"
               "int _fini() { }\n");
-        ASSERT_EQUALS("[test.cpp:1:0]: (style) The function '_init' is never used. [unusedFunction]\n"
-                      "[test.cpp:2:0]: (style) The function '_fini' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function '_init' is never used. [unusedFunction]\n"
+                      "[test.cpp:2:5]: (style) The function '_fini' is never used. [unusedFunction]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).library("gnu.cfg").build();
 
         check("int _init() { }\n"
-              "int _fini() { }\n", dinit(CheckOptions, $.s = &s));
+              "int _fini() { }\n", s);
         ASSERT_EQUALS("", errout_str());
     }
 
-    // TODO: fails because the location information is not be preserved by PreprocessorHelper::getcode()
-    void includes()
-    {
-        // #11483
-        const char inc[] = "class A {\n"
-                           "public:\n"
-                           "    void f() {}\n"
-                           "};";
-        const char code[] = R"(#include "test.h")";
-        ScopedFile header("test.h", inc);
-        const std::string processed = PreprocessorHelper::getcode(settings, *this, code, "", "test.cpp");
-        check(processed);
-        TODO_ASSERT_EQUALS("[test.h:3:0]: (style) The function 'f' is never used. [unusedFunction]\n", "[test.cpp:3:0]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
-    }
-
     void virtualFunc()
     {
         check("struct D : public B {\n" // #10660
@@ -778,7 +766,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    const int url(0);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:0]: (style) The function 'url' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'url' is never used. [unusedFunction]\n", errout_str());
     }
 
     void typeInCast()
@@ -790,7 +778,7 @@ class TestUnusedFunctions : public TestFixture {
               "    struct Type {} t;\n"
               "    Type t2{ (Type)t };\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2:0]: (style) The function 'Type' is never used. [unusedFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'Type' is never used. [unusedFunction]\n", errout_str());
     }
 
     void attributeCleanup()
@@ -838,7 +826,17 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "    f();\n"
               "}\n", dinit(CheckOptions, $.cpp = false));
-        ASSERT_EQUALS("[test.c:1:0]: (style) The function 'f' should have static linkage since it is not used outside of its translation unit. [staticFunction]\n", errout_str());
+        ASSERT_EQUALS("[test.c:1:6]: (style) The function 'f' should have static linkage since it is not used outside of its translation unit. [staticFunction]\n", errout_str());
+    }
+
+    void unnamedArg()
+    {
+        check("struct S {\n" // #12904
+              "    void Type() {}\n"
+              "};\n"
+              "[[unused]] void f(Type) {}\n"
+              "[[unused]] void g(Type, Type) {}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'Type' is never used. [unusedFunction]\n", errout_str());
     }
 };
 
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index d90e46daab0..621ee11f184 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,8 +23,8 @@
 #include "settings.h"
 #include "fixture.h"
 
+#include <cstddef>
 #include <string>
-#include <vector>
 
 class TestUnusedPrivateFunction : public TestFixture {
 public:
@@ -58,7 +58,6 @@ class TestUnusedPrivateFunction : public TestFixture {
 
         TEST_CASE(classInClass);
         TEST_CASE(sameFunctionNames);
-        TEST_CASE(incompleteImplementation);
 
         TEST_CASE(derivedClass);   // skip warning for derived classes. It might be a virtual function.
 
@@ -76,7 +75,6 @@ class TestUnusedPrivateFunction : public TestFixture {
         TEST_CASE(testDoesNotIdentifyMethodAsMiddleFunctionArgument);
         TEST_CASE(testDoesNotIdentifyMethodAsLastFunctionArgument);
 
-        TEST_CASE(multiFile);
         TEST_CASE(unknownBaseTemplate); // ticket #2580
         TEST_CASE(hierarchy_loop); // ticket 5590
 
@@ -84,17 +82,18 @@ class TestUnusedPrivateFunction : public TestFixture {
 
         TEST_CASE(templateSimplification); //ticket #6183
         TEST_CASE(maybeUnused);
+        TEST_CASE(attributeUnused); // #14129
         TEST_CASE(trailingReturn);
     }
 
     struct CheckOptions
     {
-        CheckOptions() = default;
         Platform::Type platform = Platform::Type::Native;
     };
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const CheckOptions& options = make_default_obj()) {
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
         const Settings settings1 = settingsBuilder(settings).platform(options.platform).build();
 
         SimpleTokenizer2 tokenizer(settings1, *this, code, "test.cpp");
@@ -103,7 +102,7 @@ class TestUnusedPrivateFunction : public TestFixture {
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused private functions..
-        CheckClass checkClass(&tokenizer, &settings1, this);
+        CheckClassImpl checkClass(&tokenizer, settings1, *this);
         checkClass.privateFunctions();
     }
 
@@ -120,7 +119,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "{ }\n"
               "\n"
               "unsigned int Fred::f()\n"
-              "{ }");
+              "{ }\n");
 
         ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:12:20]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
@@ -138,7 +137,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "{ }\n"
               "\n"
               "unsigned int Fred::f()\n"
-              "{ }");
+              "{ }\n");
 
         ASSERT_EQUALS("[p.h:4:18] -> [p.cpp:4:20]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
@@ -154,7 +153,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "void Fred::f()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[p.h:4:6] -> [p.cpp:2:12]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
         // Don't warn about include files which implementation we don't see
@@ -170,7 +169,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "int main()\n"
               "{\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -188,7 +187,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "A::A()\n"
-              "{ }");
+              "{ }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -203,7 +202,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "A::~A()\n"
-              "{ B(); }");
+              "{ B(); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -218,7 +217,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "A::A() : _owner(false)\n"
-              "{ b(); }");
+              "{ b(); }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -229,14 +228,14 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    A() : lock(new Lock())\n"
               "    { }\n"
               "    Lock *lock;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void test6() { // ticket #2602 segmentation fault
         check("class A {\n"
               "    A& operator=(const A&);\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -273,7 +272,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "\n"
               "Fred::Fred()\n"
-              "{}");
+              "{}\n");
 
         ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:6:12]: (style) Unused private function: 'Fred::get' [unusedPrivateFunction]\n", errout_str());
     }
@@ -292,7 +291,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void callback(const& unsigned) const {}\n"
               "\n"
               "    Observer<UnusedPrivateFunctionMemberPointer, unsigned> mObserver;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -306,7 +305,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "private:\n"
               "    void f1() const {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -320,7 +319,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void (*fptr)();\n"
               "};\n"
               "myclass::myclass() { fptr = &f; }\n"
-              "void myclass::f() {}");
+              "void myclass::f() {}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -332,7 +331,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void (*f)();\n"
               "private:\n"
               "    static void func() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -345,7 +344,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void test(void* f = a) {\n"
               "        f(\"test\");\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -386,7 +385,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    }\n"
               "\n"
               "    int numOfThreads;\n"
-              "};");
+              "};\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -399,7 +398,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "  double TotalWeighting() { return 123.0; }\n"  // called from constructor
               "public:\n"
               "  double totalWeighting_;\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -407,7 +406,7 @@ class TestUnusedPrivateFunction : public TestFixture {
         check("class C {\n"
               "    C() = default;\n"
               "    void f() const { (void)this; }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:3:10]: (style) Unused private function: 'C::f' [unusedPrivateFunction]\n", errout_str());
     }
 
@@ -424,7 +423,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    static void f()\n"
               "    { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:10:17] -> [test.cpp:10:17]: (style) Unused private function: 'A::f' [unusedPrivateFunction]\n", errout_str());
 
         check("class A\n"
@@ -443,7 +442,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "        B(A *a)\n"
               "        { a->f(); }\n"
               "    };\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"  // #6968 - outer definition
@@ -454,7 +453,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "class A::B {"
               "  B() { A a; a.f(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class C {\n" // #13790
@@ -477,25 +476,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void f() { }\n"
               "    void f(int) { }\n"
-              "};");
-        ASSERT_EQUALS("", errout_str());
-    }
-
-    void incompleteImplementation() {
-        // The implementation for "A::a" is missing - so don't check if
-        // "A::b" is used or not
-        check("#file \"test.h\"\n"
-              "class A\n"
-              "{\n"
-              "public:\n"
-              "    A();\n"
-              "    void a();\n"
-              "private:\n"
-              "    void b();\n"
-              "};\n"
-              "#endfile\n"
-              "A::A() { }\n"
-              "void A::b() { }");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -507,7 +488,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    derived() : base() { }\n"
               "private:\n"
               "    void f();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class base {\n"
@@ -519,7 +500,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void foo() {}\n" // Skip for overrides of virtual functions of base
               "    void bar() {}\n" // Don't skip if no function is overridden
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:9:10] -> [test.cpp:9:10]: (style) Unused private function: 'derived::bar' [unusedPrivateFunction]\n", errout_str());
 
         check("class Base {\n"
@@ -538,7 +519,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "class Derived2: public Derived1 {\n"
               "private:\n"
               "    void func() {}\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Base {\n"
@@ -556,7 +537,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    Derived* f() {\n"
               "      return 0;\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -566,7 +547,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    friend Bar;\n" // Unknown friend class
               "    void f() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Bar {\n"
@@ -576,7 +557,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    friend Bar;\n"
               "    void f();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("struct Bar {\n"
@@ -586,7 +567,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    friend Bar;\n"
               "    void f() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Bar {\n" // Friend class seen, f() not used in it
@@ -594,7 +575,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "class Foo {\n"
               "    friend Bar;\n"
               "    void f() { }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:5:10] -> [test.cpp:5:10]: (style) Unused private function: 'Foo::f' [unusedPrivateFunction]\n", errout_str());
 
         check("struct F;\n" // #10265
@@ -608,7 +589,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    bool operator()(const S& lhs, const S& rhs) const {\n"
               "        return lhs.f() < rhs.f();\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -622,7 +603,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "    __property int x = {read=getx}\n"
-              "};", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "};\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -635,7 +616,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    }\n"
               "public:\n"
               "    Foo() { }\n"
-              "};", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+              "};\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -653,7 +634,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "template <class T>\n"
               "T A::getVal() const {\n"
               "    return internalGetVal();\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -669,7 +650,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void startListening() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
@@ -681,120 +662,101 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void startListening() {\n"
               "    }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("[test.cpp:8:10] -> [test.cpp:8:10]: (style) Unused private function: 'Fred::startListening' [unusedPrivateFunction]\n", errout_str());
 
         // #5059
         check("class Fred {\n"
               "    void* operator new(size_t obj_size, size_t buf_size) {}\n"
-              "};");
+              "};\n");
         TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Unused private function: 'Fred::operatornew'\n", "", errout_str()); // No message for operators - we currently cannot check their usage
 
         check("class Fred {\n"
               "    void* operator new(size_t obj_size, size_t buf_size) {}\n"
               "public:\n"
               "    void* foo() { return new(size) Fred(); }\n"
-              "};");
+              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsFirstFunctionArgument() {
-        check("void callback(void (*func)(int), int arg)"
-              "{"
-              "    (*func)(arg);"
-              "}"
-              "class MountOperation"
-              "{"
-              "    static void Completed(int i);"
-              "public:"
-              "    MountOperation(int i);"
-              "};"
-              "void MountOperation::Completed(int i)"
-              "{"
-              "    std::cerr << i << std::endl;"
-              "}"
-              "MountOperation::MountOperation(int i)"
-              "{"
-              "    callback(MountOperation::Completed, i);"
-              "}"
-              "int main(void)"
-              "{"
-              "    MountOperation aExample(10);"
-              "}"
+        check("void callback(void (*func)(int), int arg)\n"
+              "{\n"
+              "    (*func)(arg);\n"
+              "}\n"
+              "class MountOperation\n"
+              "{\n"
+              "    static void Completed(int i);\n"
+              "public:\n"
+              "    MountOperation(int i);\n"
+              "};\n"
+              "void MountOperation::Completed(int i)\n"
+              "{\n"
+              "    std::cerr << i << std::endl;\n"
+              "}\n"
+              "MountOperation::MountOperation(int i)\n"
+              "{\n"
+              "    callback(MountOperation::Completed, i);\n"
+              "}\n"
+              "int main(void)\n"
+              "{\n"
+              "    MountOperation aExample(10);\n"
+              "}\n"
               );
         ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsMiddleFunctionArgument() {
-        check("void callback(char, void (*func)(int), int arg)"
-              "{"
-              "    (*func)(arg);"
-              "}"
-              "class MountOperation"
-              "{"
-              "    static void Completed(int i);"
-              "public:"
-              "    MountOperation(int i);"
-              "};"
-              "void MountOperation::Completed(int i)"
-              "{"
-              "    std::cerr << i << std::endl;"
-              "}"
-              "MountOperation::MountOperation(int i)"
-              "{"
-              "    callback('a', MountOperation::Completed, i);"
-              "}"
-              "int main(void)"
-              "{"
-              "    MountOperation aExample(10);"
-              "}"
+        check("void callback(char, void (*func)(int), int arg)\n"
+              "{\n"
+              "    (*func)(arg);\n"
+              "}\n"
+              "class MountOperation\n"
+              "{\n"
+              "    static void Completed(int i);\n"
+              "public:\n"
+              "    MountOperation(int i);\n"
+              "};\n"
+              "void MountOperation::Completed(int i)\n"
+              "{\n"
+              "    std::cerr << i << std::endl;\n"
+              "}\n"
+              "MountOperation::MountOperation(int i)\n"
+              "{\n"
+              "    callback('a', MountOperation::Completed, i);\n"
+              "}\n"
+              "int main(void)\n"
+              "{\n"
+              "    MountOperation aExample(10);\n"
+              "}\n"
               );
         ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsLastFunctionArgument() {
-        check("void callback(int arg, void (*func)(int))"
-              "{"
-              "    (*func)(arg);"
-              "}"
-              "class MountOperation"
-              "{"
-              "    static void Completed(int i);"
-              "public:"
-              "    MountOperation(int i);"
-              "};"
-              "void MountOperation::Completed(int i)"
-              "{"
-              "    std::cerr << i << std::endl;"
-              "}"
-              "MountOperation::MountOperation(int i)"
-              "{"
-              "    callback(i, MountOperation::Completed);"
-              "}"
-              "int main(void)"
-              "{"
-              "    MountOperation aExample(10);"
-              "}"
-              );
-        ASSERT_EQUALS("", errout_str());
-    }
-
-    void multiFile() { // ticket #2567
-        check("#file \"test.h\"\n"
-              "struct Fred\n"
+        check("void callback(int arg, void (*func)(int))\n"
               "{\n"
-              "    Fred()\n"
-              "    {\n"
-              "        Init();\n"
-              "    }\n"
-              "private:\n"
-              "    void Init();\n"
+              "    (*func)(arg);\n"
+              "}\n"
+              "class MountOperation\n"
+              "{\n"
+              "    static void Completed(int i);\n"
+              "public:\n"
+              "    MountOperation(int i);\n"
               "};\n"
-              "#endfile\n"
-              "void Fred::Init()\n"
+              "void MountOperation::Completed(int i)\n"
               "{\n"
-              "}");
-
+              "    std::cerr << i << std::endl;\n"
+              "}\n"
+              "MountOperation::MountOperation(int i)\n"
+              "{\n"
+              "    callback(i, MountOperation::Completed);\n"
+              "}\n"
+              "int main(void)\n"
+              "{\n"
+              "    MountOperation aExample(10);\n"
+              "}\n"
+              );
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -805,7 +767,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    virtual void F() const;\n"
               "};\n"
-              "void Bla::F() const { }");
+              "void Bla::F() const { }\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -824,7 +786,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "void InfiniteA::foo() {\n"
               "    C a;\n"
-              "}");
+              "}\n");
 
         ASSERT_EQUALS("", errout_str());
     }
@@ -834,7 +796,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    static int i;\n"
               "    static int F() const { return 1; }\n"
               "};\n"
-              "int Foo::i = Foo::F();");
+              "int Foo::i = Foo::F();\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
@@ -842,15 +804,15 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    int F() const { return 1; }\n"
               "};\n"
               "Foo f;\n"
-              "int Foo::i = f.F();");
+              "int Foo::i = f.F();\n");
         ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
               "    static int i;\n"
               "    static int F() const { return 1; }\n"
               "};\n"
-              "int Foo::i = sth();"
-              "int i = F();");
+              "int Foo::i = sth();\n"
+              "int i = F();\n");
         ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:3:16]: (style) Unused private function: 'Foo::F' [unusedPrivateFunction]\n", errout_str());
     }
 
@@ -873,14 +835,33 @@ class TestUnusedPrivateFunction : public TestFixture {
               "int main() {\n"
               "    CTest::Greeting<bool>(true);\n"
               "    return 0;\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void maybeUnused() {
         check("class C {\n"
               "    [[maybe_unused]] int f() { return 42; }\n"
-              "};");
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class C {\n"
+              "    [[maybe_unused]] static int f();\n"
+              "};\n"
+              "int C::f() { return 42; }\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void attributeUnused() {
+        check("class C {\n"
+              "    __attribute__((unused)) int f() { return 42; }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class C {\n"
+              "    __attribute__((unused)) int f();\n"
+              "};\n"
+              "int C::f() { return 42; }\n");
         ASSERT_EQUALS("", errout_str());
     }
 
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index 5350535d42f..049c1200c31 100644
--- a/test/testunusedvar.cpp
+++ b/test/testunusedvar.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -23,9 +23,12 @@
 #include "preprocessor.h"
 #include "settings.h"
 
+#include <cstddef>
 #include <list>
 #include <string>
 
+#include <simplecpp.h>
+
 class TestUnusedVar : public TestFixture {
 public:
     TestUnusedVar() : TestFixture("TestUnusedVar") {}
@@ -70,7 +73,16 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(structmember25);
         TEST_CASE(structmember26); // #13345
         TEST_CASE(structmember27); // #13367
+        TEST_CASE(structmember28);
+        TEST_CASE(structmember29); // #14075
+        TEST_CASE(structmember30); // #14131
+        TEST_CASE(structmember31); // #14130
+        TEST_CASE(structmember32); // #14483
+        TEST_CASE(structmember33);
+        TEST_CASE(structmember34);
+        TEST_CASE(structmember35);
         TEST_CASE(structmember_macro);
+        TEST_CASE(structmember_template_argument); // #13887 - do not report that member used in template argument is unused
         TEST_CASE(classmember);
         TEST_CASE(structmemberStructuredBinding); // #13107
 
@@ -144,6 +156,9 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvar69);
         TEST_CASE(localvar70);
         TEST_CASE(localvar71);
+        TEST_CASE(localvar72);
+        TEST_CASE(localvar73);
+        TEST_CASE(localvar74);
         TEST_CASE(localvarloops); // loops
         TEST_CASE(localvaralias1);
         TEST_CASE(localvaralias2); // ticket #1637
@@ -186,6 +201,8 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvarconst2);
         TEST_CASE(localvarreturn); // ticket #9167
         TEST_CASE(localvarmaybeunused);
+        TEST_CASE(localvarrvalue); // ticket #13977
+        TEST_CASE(localvarreferencearray); // ticket #14637
 
         TEST_CASE(localvarthrow); // ticket #3687
 
@@ -237,6 +254,7 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvarDelete);
         TEST_CASE(localvarLambda); // #8941, #8948
         TEST_CASE(localvarStructuredBinding); // #10368
+        TEST_CASE(localvarPtrToPtr);
 
         TEST_CASE(localvarCppInitialization);
         TEST_CASE(localvarCpp11Initialization);
@@ -250,18 +268,22 @@ class TestUnusedVar : public TestFixture {
 
         TEST_CASE(lambdaFunction); // #5078
         TEST_CASE(namespaces); // #7557
-        TEST_CASE(bracesInitCpp11);// #7895 - "int var{123}" initialization
+        TEST_CASE(bracesInitCpp11);// #7895 - "int var{123}\n" initialization
 
         TEST_CASE(argument);
         TEST_CASE(argumentClass);
         TEST_CASE(escapeAlias); // #9150
         TEST_CASE(volatileData); // #9280
         TEST_CASE(globalData);
+
+        TEST_CASE(structuredBinding); // #13269
+
+        TEST_CASE(pointerCast1); // #14535
+        TEST_CASE(pointerCast2);
     }
 
     struct FunctionVariableUsageOptions
     {
-        FunctionVariableUsageOptions() = default;
         bool cpp = true;
     };
 
@@ -272,19 +294,19 @@ class TestUnusedVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         checkUnusedVar.checkFunctionVariableUsage();
     }
 
     struct CheckStructMemberUsageOptions
     {
-        CheckStructMemberUsageOptions() = default;
         const std::list<Directive>* directives = nullptr;
         bool cpp = true;
     };
 
 #define checkStructMemberUsage(...) checkStructMemberUsage_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkStructMemberUsage_(const char* file, int line, const char code[], const CheckStructMemberUsageOptions& options = make_default_obj()) {
+    template<size_t size>
+    void checkStructMemberUsage_(const char* file, int line, const char (&code)[size], const CheckStructMemberUsageOptions& options = make_default_obj()) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this, options.cpp);
         if (options.directives)
@@ -292,31 +314,33 @@ class TestUnusedVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         (checkUnusedVar.checkStructMemberUsage)();
     }
 
 #define checkStructMemberUsageP(...) checkStructMemberUsageP_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkStructMemberUsageP_(const char* file, int line, const char code[]) {
+    template<size_t size>
+    void checkStructMemberUsageP_(const char* file, int line, const char (&code)[size]) {
         SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         (checkUnusedVar.checkStructMemberUsage)();
     }
 
 #define checkFunctionVariableUsageP(...) checkFunctionVariableUsageP_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkFunctionVariableUsageP_(const char* file, int line, const char code[]) {
+    template<size_t size>
+    void checkFunctionVariableUsageP_(const char* file, int line, const char (&code)[size]) {
         SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        CheckUnusedVarImpl checkUnusedVar(&tokenizer, settings, *this);
         (checkUnusedVar.checkFunctionVariableUsage)();
     }
 
@@ -326,7 +350,7 @@ class TestUnusedVar : public TestFixture {
             "class A {};\n"
             "void f() {\n"
             "   A a;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:3:6]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -337,7 +361,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   B b;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: b [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -347,7 +371,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -357,7 +381,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   D d;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: d [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -367,7 +391,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   E e;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: e [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -378,7 +402,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -389,7 +413,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -401,7 +425,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -413,7 +437,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -425,7 +449,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -437,7 +461,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -449,7 +473,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         // non-empty constructor
@@ -463,7 +487,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // constructor with hidden definition
@@ -477,7 +501,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "int main() {\n"
             "   A a;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // side-effect variable
@@ -495,7 +519,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   G g;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // side-effect variable in initialization list
@@ -514,7 +538,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   G g;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown variable type
@@ -525,7 +549,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   H h;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown variable type in initialization list
@@ -538,7 +562,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   H h;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown variable type used for initialization
@@ -551,7 +575,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -563,7 +587,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -574,7 +598,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -585,7 +609,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -596,7 +620,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -607,7 +631,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -646,7 +670,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   F f;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // function forward declaration
@@ -659,7 +683,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return literal
@@ -672,7 +696,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:8:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // return variable without side effects
@@ -688,7 +712,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // return variable with side effects
@@ -704,7 +728,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return unknown variable
@@ -719,7 +743,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // return variable is global, but not changed
@@ -735,7 +759,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // changing global variable in return
@@ -751,7 +775,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // changing global variable in function body
@@ -768,7 +792,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -784,7 +808,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -800,7 +824,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -816,7 +840,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global variable use in function body without change
@@ -833,7 +857,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // changing global array variable in function body
@@ -850,7 +874,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -866,7 +890,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -882,7 +906,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // pointer arithmetic on global array
@@ -899,7 +923,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -915,7 +939,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -932,7 +956,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -949,7 +973,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
@@ -965,7 +989,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
@@ -980,7 +1004,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // changing local variable
@@ -998,7 +1022,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // variable of user-defined class without side effects
@@ -1015,7 +1039,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // variable of user-defined class with side effects
@@ -1035,7 +1059,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown type variable
@@ -1051,7 +1075,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // nested clean function call
@@ -1068,7 +1092,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // nested side-effects function call
@@ -1088,7 +1112,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // unknown nested function
@@ -1104,7 +1128,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // clean function recursion
@@ -1123,7 +1147,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:14:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // indirect clean function recursion
@@ -1145,7 +1169,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:17:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // side-effect function recursion
@@ -1166,7 +1190,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // multiple returns (side-effect & clean)
@@ -1182,7 +1206,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // multiple clean returns
@@ -1198,7 +1222,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // multiple side-effect returns
@@ -1214,7 +1238,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // argument return
@@ -1229,7 +1253,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:10:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global variable modifying through function argument
@@ -1246,7 +1270,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global variable modifying through local pointer
@@ -1264,7 +1288,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global variable assigning to local pointer, but not modifying
@@ -1282,7 +1306,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global struct variable modification
@@ -1299,7 +1323,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global struct variable without modification
@@ -1316,7 +1340,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global pointer to struct variable modification
@@ -1334,7 +1358,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global pointer to struct variable without modification
@@ -1352,7 +1376,7 @@ class TestUnusedVar : public TestFixture {
             "};\n"
             "void f() {\n"
             "   C c;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
     }
 
@@ -1365,7 +1389,7 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "    Fred fred;\n"
                               "    throw fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1376,7 +1400,7 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "    Fred fred;\n"
                               "    throw fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1386,7 +1410,7 @@ class TestUnusedVar : public TestFixture {
                                "    int a;\n"
                                "    int b;\n"
                                "    int c;\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) struct member 'abc::a' is never used. [unusedStructMember]\n"
                       "[test.cpp:4:9]: (style) struct member 'abc::b' is never used. [unusedStructMember]\n"
                       "[test.cpp:5:9]: (style) struct member 'abc::c' is never used. [unusedStructMember]\n", errout_str());
@@ -1396,10 +1420,26 @@ class TestUnusedVar : public TestFixture {
                                "    int a;\n"
                                "    int b;\n"
                                "    int c;\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) union member 'abc::a' is never used. [unusedStructMember]\n"
                       "[test.cpp:4:9]: (style) union member 'abc::b' is never used. [unusedStructMember]\n"
                       "[test.cpp:5:9]: (style) union member 'abc::c' is never used. [unusedStructMember]\n", errout_str());
+
+        // #7458 - union with anonymous struct should not cause false positive
+        checkStructMemberUsage("union DoubleInt {\n"
+                               "    double asDouble;\n"
+                               "    uint64_t asInt;\n"
+                               "    struct {\n"
+                               "        uint32_t lo, hi;\n" // <- no FP about lo because hi is used
+                               "    } asIntel;\n"
+                               "};\n"
+                               "void f() {\n"
+                               "    union DoubleInt di;\n"
+                               "    di.asIntel.hi = 3;\n"
+                               "}\n");
+        ASSERT_EQUALS("[test.cpp:2:12]: (style) union member 'DoubleInt::asDouble' is never used. [unusedStructMember]\n"
+                      "[test.cpp:3:14]: (style) union member 'DoubleInt::asInt' is never used. [unusedStructMember]\n",
+                      errout_str());
     }
 
     void structmember2() {
@@ -1416,7 +1456,7 @@ class TestUnusedVar : public TestFixture {
                                "    int a = abc.a;\n"
                                "    int b = abc.b;\n"
                                "    int c = abc.c;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1435,7 +1475,7 @@ class TestUnusedVar : public TestFixture {
                                "    int a = abc[0].a;\n"
                                "    int b = abc[0].b;\n"
                                "    int c = abc[0].c;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1449,7 +1489,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ABC abc;\n"
                                "    if (abc.a == 2);\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1469,7 +1509,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    struct AB ab;\n"
                                "    ab.reset();\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1483,7 +1523,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(char *buf)\n"
                                "{\n"
                                "    struct AB *ab = (struct AB *)&buf[10];\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct AB\n"
@@ -1495,7 +1535,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(char *buf)\n"
                                "{\n"
                                "    struct AB *ab = (AB *)&buf[10];\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1509,7 +1549,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(struct AB *ab)\n"
                                "{\n"
                                "    ab->a = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) struct member 'AB::b' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct AB\n"
@@ -1521,7 +1561,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(struct AB _shuge *ab)\n"
                                "{\n"
                                "    ab->a = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) struct member 'AB::b' is never used. [unusedStructMember]\n", errout_str());
     }
 
@@ -1535,7 +1575,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo(char *ab)\n"
                                "{\n"
                                "    ((AB *)ab)->b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1545,7 +1585,7 @@ class TestUnusedVar : public TestFixture {
                                "};\n"
                                "\n"
                                "struct derived : public base {"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1553,19 +1593,19 @@ class TestUnusedVar : public TestFixture {
         // Fred may have some useful side-effects
         checkStructMemberUsage("struct abc {\n"
                                "    Fred fred;\n"
-                               "};");
+                               "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void structmember11() { // #4168
         checkStructMemberUsage("struct abc { int x; };\n"
                                "struct abc s = {0};\n"
-                               "void f() { do_something(&s); }");
+                               "void f() { do_something(&s); }\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct abc { int x; };\n"
                                "struct abc s = {0};\n"
-                               "void f() { }");
+                               "void f() { }\n");
         TODO_ASSERT_EQUALS("abc::x is not used", "", errout_str());
     }
 
@@ -1585,14 +1625,14 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    printf(\"var.struct1.a = %d\", var.struct1.a);\n"
                                "    return 1;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void structmember13() { // #3088 - struct members required by hardware
         checkStructMemberUsage("struct S {\n"
                                "  int x;\n"
-                               "} __attribute__((packed));");
+                               "} __attribute__((packed));\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1600,14 +1640,18 @@ class TestUnusedVar : public TestFixture {
         checkStructMemberUsage("struct bstr { char *bstart; size_t len; };\n"
                                "struct bstr bstr0(void) {\n"
                                "  return (struct bstr){\"hello\",6};\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void structmember15() { // #3088
         std::list<Directive> directives;
-        directives.emplace_back("test.cpp", 1, "#pragma pack(1)");
-        checkStructMemberUsage("\nstruct Foo { int x; int y; };", dinit(CheckStructMemberUsageOptions, $.directives = &directives));
+        std::vector<std::string> f = { "test.cpp" };
+        simplecpp::TokenList tokenList(f);
+        simplecpp::Location loc;
+        loc.line = 1;
+        directives.emplace_back(tokenList, loc, "#pragma pack(1)");
+        checkStructMemberUsage("\nstruct Foo { int x; int y; };\n", dinit(CheckStructMemberUsageOptions, $.directives = &directives));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1622,7 +1666,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo()\n"
                                "{\n"
                                "    ab.b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // global linkage => no false positive
@@ -1635,7 +1679,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo()\n"
                                "{\n"
                                "    ab.b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // static linkage => error message
@@ -1648,7 +1692,7 @@ class TestUnusedVar : public TestFixture {
                                "void foo()\n"
                                "{\n"
                                "    ab.b = 0;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) struct member 'AB::a' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct A\n"
@@ -1659,7 +1703,7 @@ class TestUnusedVar : public TestFixture {
                                "int foo()\n"
                                "{\n"
                                "    return A::a;\n"
-                               "}");
+                               "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -1668,14 +1712,14 @@ class TestUnusedVar : public TestFixture {
                                "  uint8_t message_type;\n"
                                "}\n"
                                "\n"
-                               "input.skip(sizeof(Header));");
+                               "input.skip(sizeof(Header));\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct Header {\n"
                                "  uint8_t message_type;\n"
                                "}\n"
                                "\n"
-                               "input.skip(sizeof(struct Header));");
+                               "input.skip(sizeof(struct Header));\n");
         ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a, b, c; };\n" // #6561
@@ -1888,7 +1932,7 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("[test.cpp:10:9]: (style) struct member 'S::f' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct A { int i; };\n"
-                               "struct B { struct A* pA; };");
+                               "struct B { struct A* pA; };\n");
         ASSERT_EQUALS("[test.cpp:1:16]: (style) struct member 'A::i' is never used. [unusedStructMember]\n"
                       "[test.cpp:2:22]: (style) struct member 'B::pA' is never used. [unusedStructMember]\n",
                       errout_str());
@@ -1997,12 +2041,98 @@ class TestUnusedVar : public TestFixture {
                       errout_str());
     }
 
+    void structmember28() {
+        checkStructMemberUsage("struct S {\n"
+                               "    unsigned int a : 16;\n"
+                               "    unsigned int : 16;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:18]: (style) struct member 'S::a' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember29() { // #14075 - alignas false positive
+        checkStructMemberUsage("struct S {\n"
+                               "    static constexpr size_t cDataAlign = 8;\n"
+                               "    static constexpr size_t cDataSize = 128;\n"
+                               "    alignas(cDataAlign) std::array<uint8_t, cDataSize> storage{};\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:4:56]: (style) struct member 'S::storage' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember30() { // #14131
+        checkStructMemberUsage("struct S\n"
+                               "{\n"
+                               "private:\n"
+                               "    __attribute__((unused)) int i1{};\n"
+                               "    int __attribute__((unused)) i2{}; // no warning\n"
+                               "    int i3 __attribute__((unused)) {};\n"
+                               "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void structmember31() { // #14130
+        checkStructMemberUsage("struct S\n"
+                               "{\n"
+                               "    [[maybe_unused]] int i1{};\n"
+                               "    int i2 [[maybe_unused]] {};\n"
+                               "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void structmember32() { // #14483
+        checkStructMemberUsage("struct S {\n"
+                               "  int S::* mp;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:12]: (style) struct member 'S::mp' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember33() {
+        checkStructMemberUsage("struct S {\n"
+                               "  int A::B<int>::C::* mp;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) struct member 'S::mp' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember34() {
+        checkStructMemberUsage("struct S {\n" // #14785
+                               "  std::int32_t i;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) struct member 'S::i' is never used. [unusedStructMember]\n", errout_str());
+
+        checkStructMemberUsage("struct S {\n" // #14786
+                               "  std::unique_ptr<int> p;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:24]: (style) struct member 'S::p' is never used. [unusedStructMember]\n", errout_str());
+    }
+
+    void structmember35() {
+        checkStructMemberUsage("struct S { int i; };\n"
+                               "int f() { return g<S>(); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkStructMemberUsage("struct S { int i; };\n"
+                               "int f() { A<S> *a = nullptr; (void) a; }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkStructMemberUsage("struct S { int i; };\n"
+                               "int f() { const std::vector<S> a {}; (void) a; }\n");
+        ASSERT_EQUALS("[test.cpp:1:16]: (style) struct member 'S::i' is never used. [unusedStructMember]\n", errout_str());
+    }
+
     void structmember_macro() {
         checkStructMemberUsageP("#define S(n) struct n { int a, b, c; };\n"
                                 "S(unused);\n");
         ASSERT_EQUALS("", errout_str());
     }
 
+    void structmember_template_argument() { // #13887 - False positive
+        checkStructMemberUsage("template <class T, int i> struct A{ T buf[i]; }\n"
+                               "struct B {\n"
+                               "    constexpr int x = 20;\n" // <- not unused
+                               "    A<uint32_t, x> a;\n" // <- unused
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:4:20]: (style) struct member 'B::a' is never used. [unusedStructMember]\n", errout_str());
+    }
+
     void classmember() {
         checkStructMemberUsage("class C {\n"
                                "    int i{};\n"
@@ -2076,16 +2206,15 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i(0);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // if a is undefined then Cppcheck can't determine if "int i(a)" is a
@@ -2094,14 +2223,14 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int j = 0;\n"
                               "    int i(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2109,7 +2238,7 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    int & i = j;\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2117,7 +2246,7 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    const int & i = j;\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:19]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2125,7 +2254,7 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    int & i(j);\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2133,53 +2262,51 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    const int & i(j);\n"
                               "    x(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * j = Data;\n"
                               "    int * i(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * j = Data;\n"
                               "    const int * i(j);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    bool i = false;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    bool i = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char *i;\n"
                               "    i = fgets();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // undefined variables are not reported because they may be classes with constructors
         functionVariableUsage("undefined foo()\n"
                               "{\n"
                               "    undefined i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (information) --check-library: Provide <type-checks><unusedvar> configuration for undefined [checkLibraryCheckType]\n", errout_str());
 
         functionVariableUsage("undefined foo()\n"
@@ -2188,129 +2315,118 @@ class TestUnusedVar : public TestFixture {
                               "}\n",
                               dinit(FunctionVariableUsageOptions, $.cpp = false));
         ASSERT_EQUALS(
-            "[test.c:3:17]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.c:3:15]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.c:3:17]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = undefined;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * i = Data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i = Data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:14]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:14]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i = Data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:20]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:20]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct S * i = DATA;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:16]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct S * i = DATA;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:24]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:22]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:24]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct S & i = j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct S & i = j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    undefined * i = X;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:19]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:17]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:19]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    int j = i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:11]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:9]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:11]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i[10] = { 0 };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:15]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo(int n)\n"
                               "{\n"
                               "    int i[n] = { 0 };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char i[10] = \"123456789\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char *i = \"123456789\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2320,7 +2436,7 @@ class TestUnusedVar : public TestFixture {
                               "        std::cout<<code<<std::endl;\n"
                               "        code += 2;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2331,7 +2447,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "        d = code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:24]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:7:11]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
@@ -2345,7 +2461,7 @@ class TestUnusedVar : public TestFixture {
                               "        g(d);\n"
                               "        d = code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2359,7 +2475,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        d = code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2371,7 +2487,7 @@ class TestUnusedVar : public TestFixture {
                               "        a=b;\n"
                               "        b=tmp;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2381,7 +2497,7 @@ class TestUnusedVar : public TestFixture {
                               "        std::cout<<code<<std::endl;\n"
                               "        code += 2;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2392,7 +2508,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "        d += code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:7:11]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -2405,7 +2521,7 @@ class TestUnusedVar : public TestFixture {
                               "        g(d);\n"
                               "        d += code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2419,7 +2535,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        d += code;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2431,7 +2547,7 @@ class TestUnusedVar : public TestFixture {
                               "        a=b;\n"
                               "        b=tmp;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2441,7 +2557,7 @@ class TestUnusedVar : public TestFixture {
                               "        std::cout<<code<<std::endl;\n"
                               "        code += 2;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2452,7 +2568,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "        d += code;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:7:11]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -2465,7 +2581,7 @@ class TestUnusedVar : public TestFixture {
                               "        g(d);\n"
                               "        d += code;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2479,7 +2595,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        d += code;\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2491,7 +2607,7 @@ class TestUnusedVar : public TestFixture {
                               "        a=b;\n"
                               "        b=tmp;\n"
                               "    } while( a!=30 );\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2503,7 +2619,7 @@ class TestUnusedVar : public TestFixture {
                               "            code += 2;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2515,7 +2631,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "        code += 2;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2527,7 +2643,7 @@ class TestUnusedVar : public TestFixture {
                               "            code += 2;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2539,15 +2655,14 @@ class TestUnusedVar : public TestFixture {
                               "            code += 2;\n"
                               "        }\n"
                               "    } while(code < 20);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int j = 0) {\n" // #5985 - default function parameters should not affect checking results
                               "    int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
         // extracttests.enable
     }
@@ -2559,14 +2674,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("bool foo()\n"
                               "{\n"
                               "    bool i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         // undefined variables are not reported because they may be classes with constructors
@@ -2574,7 +2689,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    undefined i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("undefined foo()\n"
@@ -2589,35 +2704,35 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    undefined * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("int *foo()\n"
                               "{\n"
                               "    int * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("const int *foo()\n"
                               "{\n"
                               "    const int * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("struct S *foo()\n"
                               "{\n"
                               "    struct S * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("const struct S *foo()\n"
                               "{\n"
                               "    const struct S * i;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         // assume f() can write a
@@ -2625,7 +2740,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
@@ -2633,7 +2748,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0], 0);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
@@ -2641,7 +2756,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(0, a[0]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
@@ -2649,7 +2764,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(0, a[0], 0);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // f() can not write a (not supported yet)
@@ -2658,7 +2773,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0]);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'a' is not assigned a value.\n",
                            "", errout_str());
 
@@ -2668,7 +2783,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a[0]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int * i);\n"
@@ -2676,7 +2791,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "    f(a+1);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
         // extracttests.enable
     }
@@ -2688,7 +2803,7 @@ class TestUnusedVar : public TestFixture {
                               "    if ( abc )\n"
                               "        ;\n"
                               "    else i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -2697,14 +2812,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i = 0;\n"
                               "    f(i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    f(&i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2713,7 +2828,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a = 0;\n"
                               "    b = (char)a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2722,7 +2837,7 @@ class TestUnusedVar : public TestFixture {
                               "    int b[10];\n"
                               "    for (int i=0;i<10;++i)\n"
                               "        b[i] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:14]: (style) Variable 'b[i]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -2730,14 +2845,14 @@ class TestUnusedVar : public TestFixture {
                               "    int b[10];\n"
                               "    for (int i=0;i<10;++i)\n"
                               "        b[i] = ++a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (style) Variable 'b[i]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    int b[10];\n"
                               "    for (int i=0;i<10;++i)\n"
                               "        *(b+i) = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable '*(b+i)' is assigned a value that is never used.\n", "", errout_str());
 
         functionVariableUsage("void f() {\n" // #11832, #11923
@@ -2751,25 +2866,25 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i[2];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         // extracttests.start: struct A {int x;};
@@ -2777,68 +2892,68 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    A * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct A * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct A * i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:22]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const int * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i[2];\n"
-                              "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:18]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct A * i[2];\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct A * i[2];\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo(int n)\n"
                               "{\n"
                               "    int i[n];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    int &j = i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:3:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
@@ -2847,7 +2962,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i;\n"
                               "    int &j = i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
@@ -2856,7 +2971,7 @@ class TestUnusedVar : public TestFixture {
                               "    int i;\n"
                               "    int &j = i;\n"
                               "    j = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'i' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -2866,48 +2981,48 @@ class TestUnusedVar : public TestFixture {
                               "    double i = 0.0;\n"
                               "    const double j = i;\n"
                               "    return j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    A * i;\n"
                               "    i->f();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i;\n"
                               "    if (i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i = 0;\n"
                               "    if (i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i = new char[10];\n"
                               "    if (i);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char *i;\n"
                               "    f(i);\n"
-                              "}");
+                              "}\n");
 
         functionVariableUsage("int a;\n"
                               "void foo()\n"
                               "{\n"
                               "    return &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -2916,7 +3031,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *p = a;\n"
                               "    for (int i = 0; i < 10; i++)\n"
                               "        p[i] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -2925,7 +3040,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *p = &a[0];\n"
                               "    for (int i = 0; i < 10; i++)\n"
                               "        p[i] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -2934,7 +3049,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x;\n"
                               "    a[0] = 0;\n"
                               "    x = a[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // extracttests.start: int f();
@@ -2942,7 +3057,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a, b, c;\n"
                               "    a = b = c = f();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:4:11]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:4:15]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n",
@@ -2951,7 +3066,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int * foo()\n"
                               "{\n"
                               "    return &undefined[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -2962,7 +3077,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    for (int i = 0; i < 10; )\n"
                               "        a[i++] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:16]: (style) Variable 'a[i++]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -2975,7 +3090,7 @@ class TestUnusedVar : public TestFixture {
                               "    } else {\n"
                               "        int i;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:7:13]: (style) Unused variable: i [unusedVariable]\n", errout_str());
@@ -2987,7 +3102,7 @@ class TestUnusedVar : public TestFixture {
                               "        int i;\n"
                               "    else\n"
                               "        int i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:7:13]: (style) Unused variable: i [unusedVariable]\n", errout_str());
@@ -3000,11 +3115,10 @@ class TestUnusedVar : public TestFixture {
                               "    } else {\n"
                               "        int i = 0;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:7:15]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n"
-                      "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
-                      "[test.cpp:7:13]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo(int x)\n"
@@ -3016,7 +3130,7 @@ class TestUnusedVar : public TestFixture {
                               "        int i;\n"
                               "    }\n"
                               "    i = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:9:7]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:5:13]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:7:13]: (style) Unused variable: i [unusedVariable]\n", errout_str());
@@ -3032,7 +3146,7 @@ class TestUnusedVar : public TestFixture {
                               "        return;\n"
                               "    }\n"
                               "    x = a;\n"  // redundant assignment
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:9:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -3048,7 +3162,7 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        return;\n"
                               "    x = a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:10:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3058,7 +3172,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a, b, c, d, e, f;\n"
                               "    a = b = c = d = e = f = 15;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
             "[test.cpp:4:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
             "[test.cpp:4:11]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
@@ -3073,7 +3187,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a, b, c = 0;\n"
                               "    a = b = c;\n"
                               "\n"
-                              "}");
+                              "}\n");
 
         TODO_ASSERT_EQUALS(
             "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
@@ -3091,7 +3205,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int x;\n"
                               "    x = obj->ySize / 8;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3100,7 +3214,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int a[10];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
@@ -3111,7 +3225,7 @@ class TestUnusedVar : public TestFixture {
                               "    int b[a];\n"
                               "    b[0] = 0;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
@@ -3120,7 +3234,7 @@ class TestUnusedVar : public TestFixture {
                               "    int * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return *b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int * foo()\n"
@@ -3129,7 +3243,7 @@ class TestUnusedVar : public TestFixture {
                               "    const int * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct B * foo()\n"
@@ -3138,7 +3252,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct B * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("const struct B * foo()\n"
@@ -3147,7 +3261,7 @@ class TestUnusedVar : public TestFixture {
                               "    const struct B * b[a];\n"
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3157,7 +3271,7 @@ class TestUnusedVar : public TestFixture {
                               "    char buf[5];\n"
                               "    char *ptr = buf;\n"
                               "    *(ptr++) = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'buf' is assigned a value that is never used.\n", "", errout_str());
 
         // #3910
@@ -3166,7 +3280,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *data[2];\n"
                               "    data[0] = buf;\n"
                               "    do_something(data);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -3176,7 +3290,7 @@ class TestUnusedVar : public TestFixture {
                               "    data[0] = buf1;\n"
                               "    data[1] = buf2;\n"
                               "    do_something(data);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3193,7 +3307,7 @@ class TestUnusedVar : public TestFixture {
                               "    line_start = ptr;\n"
                               "    data->info = k;\n"
                               "    line_start = ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:10:16]: (style) Variable 'line_start' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         // extracttests.enable
     }
@@ -3202,7 +3316,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("A::A(int iValue) {\n"
                               "    UserDefinedException* pe = new UserDefinedException();\n"
                               "    throw pe;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3211,7 +3325,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    int c;\n"
                               "    c = *(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:2:9]: (style) Variable 'a' is not assigned a value. [unassignedVariable]\n", errout_str());
     }
@@ -3222,7 +3336,7 @@ class TestUnusedVar : public TestFixture {
                               "    char c1 = 'c';\n"
                               "    char c2[] = { c1 };\n"
                               "    a(c2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3231,7 +3345,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char buffer[1024];\n"
                               "    bar((void *)buffer);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3242,7 +3356,7 @@ class TestUnusedVar : public TestFixture {
                               "    h = 0 ? u : v;\n"
                               "    i = 1 ? u : v;\n"
                               "    return h + i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3253,7 +3367,7 @@ class TestUnusedVar : public TestFixture {
                               "    int b[10];\n"
                               "    a = b[c] = 0;\n"
                               "    return a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:14]: (style) Variable 'b[c]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3264,7 +3378,7 @@ class TestUnusedVar : public TestFixture {
                               "    {\n"
                               "        throw *this;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3275,7 +3389,7 @@ class TestUnusedVar : public TestFixture {
                               "    const char*edge = ppos? \" +\" : pneg ? \" -\" : \"\";\n"
                               "    printf(\"This should be a '+' -> %s\\n\", edge);\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3284,7 +3398,7 @@ class TestUnusedVar : public TestFixture {
                               "    const Fred &fred = getfred();\n"
                               "    int *p = fred.x();\n"
                               "    *p = 0;"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3292,7 +3406,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(struct s *ptr) {\n"
                               "    int param = 1;\n"
                               "    ptr->param = param++;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (style) Variable 'param' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3301,7 +3415,7 @@ class TestUnusedVar : public TestFixture {
                               "    char* pos = buffer;\n"
                               "    int size = value;\n"
                               "    *(int*)pos = size;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3310,7 +3424,7 @@ class TestUnusedVar : public TestFixture {
                               "    float s_ranges[] = { 0, 256 };\n"
                               "    float* ranges[] = { s_ranges };\n"
                               "    cout << ranges[0][0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3318,7 +3432,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    Engine *engine = e;\n"
                               "    x->engine = engine->clone();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3326,7 +3440,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int x = 0;\n"
                               "    a.x = x - b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3336,33 +3450,33 @@ class TestUnusedVar : public TestFixture {
                               "    int x;\n"
                               "    fstream &f = getfile();\n"
                               "    f >> x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #4596 - if (c >>= x) {}
         functionVariableUsage("void f(int x) {\n"
                               "    C c;\n" // possibly some stream class
                               "    if (c >>= x) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (information) --check-library: Provide <type-checks><unusedvar> configuration for C [checkLibraryCheckType]\n", errout_str());
 
         functionVariableUsage("void f(int x) {\n"
                               "    C c;\n"
                               "    if (c >>= x) {}\n"
-                              "}", dinit(FunctionVariableUsageOptions, $.cpp = false));
+                              "}\n", dinit(FunctionVariableUsageOptions, $.cpp = false));
         ASSERT_EQUALS("[test.c:3:11]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    int x, y;\n"
                               "    std::cin >> x >> y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // ticket #8494
         functionVariableUsage("void f(C c) {\n"
                               "  int x;\n"
                               "  c & x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3372,7 +3486,7 @@ class TestUnusedVar : public TestFixture {
                               "    while (0 != (abc = abc->next())) {\n"
                               "        ++nOldNum;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3383,7 +3497,7 @@ class TestUnusedVar : public TestFixture {
                               "    } else {\n"
                               "        j -= i;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3391,7 +3505,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int a, b;\n"
                               "    x(1,a,b);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3400,32 +3514,32 @@ class TestUnusedVar : public TestFixture {
                               "    int a, b;\n"
                               "    a = 2 * (b = 3);\n"
                               "    return a + b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // ticket #4318
                               "    int a,b;\n"
                               "    x(a, b=2);\n"  // <- if param2 is passed-by-reference then b might be used in x
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // ticket #6147
                               "    int a = 0;\n"
                               "    bar(a=a+2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // ticket #6147
                               "    int a = 0;\n"
                               "    bar(a=2);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
 
         functionVariableUsage("void bar(int);\n"
                               "int foo() {\n"
                               "    int a = 0;\n"
                               "    bar(a=a+2);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
@@ -3433,7 +3547,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int a = 2;\n"
                               "    ints.at(a) = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3443,7 +3557,7 @@ class TestUnusedVar : public TestFixture {
                               "    const std::string s1(sizeof_(code));\n"
                               "    const std::string s2 = sizeof_(code);\n"
                               "    return(s1+s2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3451,7 +3565,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int a = 1;\n"
                               "    foo(x*a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3459,7 +3573,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int f() {\n"
                               "    int a = 1;\n"
                               "    return x & a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3469,7 +3583,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x = 1;\n"
                               "    int y = FOO::VALUE * x;\n"
                               "    return y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3481,7 +3595,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatA = 2.2f;\n"
                               "    const float floatTot = g_float * floatA;\n"
                               "    SomeTestFunc(floatTot);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("float g_float = 1;\n"
@@ -3491,7 +3605,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatB = 2.2f;\n"
                               "    const float floatTot = floatB * g_float;\n"
                               "    SomeTestFunc(floatTot);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("float g_float = 1;\n"
@@ -3501,7 +3615,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatC = 2.2f;\n"
                               "    float floatTot = g_float * floatC;\n"
                               "    SomeTestFunc(floatTot);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3527,7 +3641,7 @@ class TestUnusedVar : public TestFixture {
                               "        piArray[uiIndex] = -1234;\n"
                               "    }\n"
                               "    delete [] piArray;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // #9877
@@ -3535,7 +3649,7 @@ class TestUnusedVar : public TestFixture {
                               "    MACRO(2U, x.size())\n"
                               "    int i = 0;\n"
                               "    return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3543,7 +3657,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void func() {\n"
                               "    int *sp_mem[2] = { global1, global2 };\n"
                               "    sp_mem[0][3] = 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3552,7 +3666,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 123;\n"
                               "    int b = (short)-a;;\n"
                               "    return b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3561,7 +3675,7 @@ class TestUnusedVar : public TestFixture {
                               "    int i = 0;\n"
                               "    int j{i};\n"
                               "    return j;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(bool b, bool c, double& r) {\n"
@@ -3581,17 +3695,17 @@ class TestUnusedVar : public TestFixture {
                               "    std::mutex m;\n"
                               "    std::unique_lock<std::mutex> l{ m };\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int func() {\n"
                               "    std::shared_lock<std::shared_timed_mutex> lock( m );\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #10490
                               "    std::shared_lock lock = GetLock();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
@@ -3621,7 +3735,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int (SfxUndoManager::*retrieveCount)(bool) const\n"
                               "        = (flag) ? &SfxUndoManager::foo : &SfxUndoManager::bar;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'retrieveCount' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         // extracttests.enable
     }
@@ -3629,7 +3743,7 @@ class TestUnusedVar : public TestFixture {
     void localvar48() { // #6954
         functionVariableUsage("void foo() {\n"
                               "  long (*pKoeff)[256] = new long[9][256];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3650,10 +3764,9 @@ class TestUnusedVar : public TestFixture {
                               "}\n"
                               "void A::DoSomething(void) {\n"
                               "    const std::string x = Bar();\n"  // <- warning
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:16:25]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:16:23]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:16:25]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
     }
 
@@ -3662,13 +3775,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "  char buf1[10];\n"
                               "  dostuff(cond?buf1:buf2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "  char buf1[10];\n"
                               "  dostuff(cond?buf2:buf1);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6542 - ternary operator
@@ -3676,7 +3789,7 @@ class TestUnusedVar : public TestFixture {
                               "  char buf1[10], buf2[10];\n"
                               "  char *p = c ? buf1 : buf2;\n"
                               "  dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3685,13 +3798,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo(const Token *var) {\n"
                               "  const Token *tok = nameToken();\n"
                               "  tok = tok->next();\n"  // read+write
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Variable 'tok' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "  int x = 4;\n"
                               "  x = 15 + x;\n"  // read+write
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3700,7 +3813,7 @@ class TestUnusedVar : public TestFixture {
                               "  std::vector<int> data;\n"
                               "  data[2] = 32;\n"
                               "  return data;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3713,7 +3826,7 @@ class TestUnusedVar : public TestFixture {
                               "      continue;\n"
                               "    }\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo(int a, int loop) {\n"
@@ -3725,7 +3838,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "  }\n"
                               "  return x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3733,7 +3846,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("Padding fun() {\n"
                               "  Distance d = DISTANCE;\n"
                               "  return (Padding){ d, d, d, d };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3749,7 +3862,7 @@ class TestUnusedVar : public TestFixture {
                               "            data[x] = 0;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:6:15]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
@@ -3760,7 +3873,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int x = 31;\n"
                               "    mask[x] |= 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3769,7 +3882,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int x = 0;\n"
                               "    x++;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:6]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3777,13 +3890,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    int x = 0;\n"
                               "    if (--x > 0) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    int x = 0;\n"
                               "    if (x-- > 0) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3791,7 +3904,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("Response foo() {\n"
                               "    const std::vector<char> cmanifest = z;\n"
                               "    return {.a = cmanifest, .b =0};\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -3801,7 +3914,7 @@ class TestUnusedVar : public TestFixture {
                               "        auto& p = m_points[i];\n"
                               "        p += scale;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int c[]) {\n" // #10597
@@ -3837,8 +3950,7 @@ class TestUnusedVar : public TestFixture {
                               "    return i;\n"
                               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:18]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:16]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:18]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("int f() {\n"
@@ -3846,8 +3958,7 @@ class TestUnusedVar : public TestFixture {
                               "    return j;\n"
                               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:9]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void f() {\n" // #10846
@@ -3861,7 +3972,7 @@ class TestUnusedVar : public TestFixture {
                               "  int x=3;\n"             // <- set but not used
                               "  goto y;\n"
                               "  y:return;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -3971,12 +4082,42 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void localvar72() {
+        functionVariableUsage("void f()\n"
+                              "{\n"
+                              "  struct S {};\n"
+                              "  int S::* mp;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (style) Unused variable: mp [unusedVariable]\n", errout_str());
+    }
+
+    void localvar73() {
+        functionVariableUsage("struct S { S(); ~S(); };\n"
+                              "void f() {\n"
+                              "    auto a{ S() };\n"
+                              "    auto const &b{ S() };\n"
+                              "    const auto &&c{ S() };\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void localvar74() {
+        functionVariableUsage("struct S { void (*fp)(); };\n"
+                              "void g();\n"
+                              "void f() {\n"
+                              "    S s;\n"
+                              "    s.fp = g;\n"
+                              "    s.fp();\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void localvarloops() {
         // loops
         functionVariableUsage("void fun(int c) {\n"
                               "  int x;\n"
                               "  while (c) { x=10; }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void dostuff(int x);\n"
@@ -3986,7 +4127,7 @@ class TestUnusedVar : public TestFixture {
                               "    dostuff(x);\n"
                               "    if (y) { x=10; break; }\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void dostuff(int &x);\n"
@@ -3996,7 +4137,7 @@ class TestUnusedVar : public TestFixture {
                               "    dostuff(x);\n"
                               "    if (y) { x=10; break; }\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:6:15]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void fun() {\n"
@@ -4005,13 +4146,13 @@ class TestUnusedVar : public TestFixture {
                               "    dostuff(x);\n"
                               "    x = 10;\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void fun() {\n"
                               "  int x = 0;\n"
                               "  while (x < 10) { x = x + 1; }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void fun()\n"
@@ -4019,7 +4160,7 @@ class TestUnusedVar : public TestFixture {
                               "    int   status = 0;\n"
                               "    for (ind = 0; ((ind < nrArgs) && (status < 10)); ind++)\n"
                               "        status = x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f()\n"
@@ -4027,7 +4168,7 @@ class TestUnusedVar : public TestFixture {
                               "    int sum = 0U;\n"
                               "    for (i = 0U; i < 2U; i++)\n"
                               "        sum += 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:13]: (style) Variable 'sum' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:5:13]: (style) Variable 'sum' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
@@ -4092,20 +4233,18 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a;\n"
                               "    int *b = &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:4:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int a[10];\n"
                               "    int *b = a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:4:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4113,7 +4252,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4123,7 +4262,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    char *b = (char *)&a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4133,7 +4272,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    char *b = (char *)(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4143,7 +4282,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    const char *b = (const char *)&a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4153,7 +4292,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    const char *b = (const char *)(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4163,7 +4302,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    char *b = static_cast<char *>(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4173,7 +4312,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    const char *b = static_cast<const char *>(&a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4183,20 +4322,18 @@ class TestUnusedVar : public TestFixture {
                               "void foo()\n"
                               "{\n"
                               "    int *b = &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // a is not a local variable and b is aliased to it
         functionVariableUsage("void foo(int a)\n"
                               "{\n"
                               "    int *b = &a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:10]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:12]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // a is not a local variable and b is aliased to it
@@ -4207,10 +4344,9 @@ class TestUnusedVar : public TestFixture {
                               "    {\n"
                               "        int *b = &a;\n"
                               "    }\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS(
-            "[test.cpp:6:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:6:14]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:6:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("int a;\n"
@@ -4218,14 +4354,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int a)\n"
                               "{\n"
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A\n"
@@ -4236,7 +4372,7 @@ class TestUnusedVar : public TestFixture {
                               "        int *b = &a;\n"
                               "        *b = 0;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4244,7 +4380,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    int *b = a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4254,7 +4390,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    char *b = (char *)a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4264,7 +4400,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    char *b = (char *)(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4274,7 +4410,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    const char *b = (const char *)a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4284,7 +4420,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    const char *b = (const char *)(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4294,7 +4430,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    char *b = static_cast<char *>(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4304,7 +4440,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    const char *b = static_cast<const char *>(a);\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -4314,7 +4450,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int *b = a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -4323,7 +4459,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4331,7 +4467,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4339,7 +4475,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int a[10];
@@ -4348,7 +4484,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int c = b[0];\n"
                               "    x(c);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4356,7 +4492,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int c = b[0];\n"
                               "    x(c);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -4364,28 +4500,28 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int *b = &a[0];\n"
                               "    a[0] = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int *b = &a[0];\n"
                               "    a[0] = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int *b = a;\n"
                               "    a[0] = b[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int a[10])\n"
                               "{\n"
                               "    int *b = a;\n"
                               "    *b = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A\n"
@@ -4396,7 +4532,7 @@ class TestUnusedVar : public TestFixture {
                               "        int *b = a;\n"
                               "        *b = 0;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4405,7 +4541,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    int *c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'a' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4417,10 +4553,9 @@ class TestUnusedVar : public TestFixture {
                               "    int *c = a;\n"
                               "    int *d = b;\n"
                               "    *d = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:12]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:10]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4430,7 +4565,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *c = a;\n"
                               "    c = b;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
@@ -4443,7 +4578,7 @@ class TestUnusedVar : public TestFixture {
                               "    *c = 0;\n"
                               "    c = a;\n"
                               "    *c = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:9]: (style) Variable 'a' is assigned a value that is never used.\n"
                            "[test.cpp:7]: (style) Variable 'b' is assigned a value that is never used.\n",
                            "",
@@ -4453,7 +4588,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10], * b = a + 10;\n"
                               "    b[-10] = 1;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'b[-10]' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4463,11 +4598,10 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10], * b = a + 10;\n"
                               "    b[-10] = 0;\n"
                               "    int * c = b - 10;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS(
             "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
-            "[test.cpp:5:13]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:5:11]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:5:13]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4475,7 +4609,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10], * b = a + 10;\n"
                               "    int * c = b - 10;\n"
                               "    c[1] = 3;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'c[1]' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4485,7 +4619,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10], * b = a + 10;\n"
                               "    int * c = b - 10;\n"
                               "    c[1] = c[0];\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'c[1]' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4496,7 +4630,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &a[0];\n"
                               "    int *d = b[0];\n"
                               "    return *d;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n" // #4022 - FP (a is assigned a value that is never used)
@@ -4505,7 +4639,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &a[0];\n"
                               "    int d = b[0].value;\n"
                               "    return d;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4514,7 +4648,7 @@ class TestUnusedVar : public TestFixture {
                               "    char a[100];\n"
                               "    struct S * s = (struct S *)a;\n"
                               "    s->c[0] = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4522,10 +4656,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    struct S * s = (struct S *)a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:16]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4533,10 +4666,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    const struct S * s = (const struct S *)a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:24]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:22]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4544,10 +4676,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    struct S * s = static_cast<struct S *>(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:16]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
@@ -4555,10 +4686,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char a[100];\n"
                               "    const struct S * s = static_cast<const struct S *>(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:24]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n"
-                      "[test.cpp:5:22]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:10]: (style) Unused variable: a [unusedVariable]\n",
                       errout_str());
 
         functionVariableUsage("int a[10];\n"
@@ -4571,7 +4701,7 @@ class TestUnusedVar : public TestFixture {
                               "    d = a;\n"
                               "    d = c;\n"
                               "    *d = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Unused variable: b [unusedVariable]\n",
                       errout_str());
 
@@ -4584,7 +4714,7 @@ class TestUnusedVar : public TestFixture {
                               "    d = b; *d = 0;\n"
                               "    d = a; *d = 0;\n"
                               "    d = c; *d = 0;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'b' is assigned a value that is never used.\n"
                            "[test.cpp:9]: (style) Variable 'c' is assigned a value that is never used.\n",
                            "",
@@ -4596,7 +4726,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int * a;\n"
                               "    x(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4607,7 +4737,7 @@ class TestUnusedVar : public TestFixture {
                               "    char          szDisplayName[MAX_PATH];\n"
                               "    info.pszDisplayName = szDisplayName;\n"
                               "    SHBrowseForFolder(&info);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4616,10 +4746,9 @@ class TestUnusedVar : public TestFixture {
                               "void foo()\n"
                               "{\n"
                               "    int * a = &ab.a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("struct AB { int a; int b; } ab;\n"
@@ -4627,7 +4756,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int * a = &ab.a;\n"
                               "    *a = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct AB { int a; int b; };\n"
@@ -4635,10 +4764,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct AB ab;\n"
                               "    int * a = &ab.a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:4:15]: (style) Variable 'ab' is not assigned a value. [unassignedVariable]\n"
-                      "[test.cpp:5:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:4:15]: (style) Variable 'ab' is not assigned a value. [unassignedVariable]\n",
                       errout_str());
 
         functionVariableUsage("struct AB { int a; int b; };\n"
@@ -4647,7 +4775,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct AB ab;\n"
                               "    int * a = &ab.a;\n"
                               "    *a = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4658,7 +4786,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[0];\n"
                               "    *p++ = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
@@ -4667,7 +4795,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[1];\n"
                               "    *p-- = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
@@ -4676,7 +4804,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[0];\n"
                               "    *++p = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
@@ -4685,7 +4813,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *p = &buf[1];\n"
                               "    *--p = 0;\n"
                               "    return buf[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4702,7 +4830,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4715,7 +4843,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4730,7 +4858,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4744,7 +4872,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: buf [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4756,7 +4884,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = buf;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4771,7 +4899,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4785,7 +4913,7 @@ class TestUnusedVar : public TestFixture {
                               "        srcdata = vdata;\n"
                               "    }\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4801,7 +4929,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
                            errout_str());
@@ -4816,7 +4944,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: buf [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4829,7 +4957,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    srcdata = buf;\n"
                               "    b(srcdata);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:10]: (style) Unused variable: vdata [unusedVariable]\n", errout_str());
     }
 
@@ -4840,7 +4968,7 @@ class TestUnusedVar : public TestFixture {
                               "    char **cp;\n"
                               "    cp = c;\n"
                               "    *cp = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -4861,7 +4989,7 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        pb = b4;\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4882,7 +5010,7 @@ class TestUnusedVar : public TestFixture {
                               "        pb = b4;\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4905,7 +5033,7 @@ class TestUnusedVar : public TestFixture {
                               "        pb = b4;\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -4924,7 +5052,7 @@ class TestUnusedVar : public TestFixture {
                               "        pb = b3;\n"
                               "    pb = b4;\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: b1 [unusedVariable]\n"
                       "[test.cpp:4:10]: (style) Unused variable: b2 [unusedVariable]\n"
                       "[test.cpp:5:10]: (style) Unused variable: b3 [unusedVariable]\n", errout_str());
@@ -4949,7 +5077,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -4974,7 +5102,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -5001,7 +5129,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -5023,7 +5151,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    pb = b4;\n"
                               "    b(pb);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: b1 [unusedVariable]\n"
                       "[test.cpp:4:10]: (style) Unused variable: b2 [unusedVariable]\n"
                       "[test.cpp:5:10]: (style) Unused variable: b3 [unusedVariable]\n", errout_str());
@@ -5035,7 +5163,7 @@ class TestUnusedVar : public TestFixture {
                               "    Foo foo;\n"
                               "    Foo &ref = foo;\n"
                               "    ref[0] = 123;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5045,7 +5173,7 @@ class TestUnusedVar : public TestFixture {
                               "    Foo &ref = foo;\n"
                               "    int *x = &ref.x();\n"
                               "    *x = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5053,7 +5181,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(Foo &foo) {\n"
                               "    std::set<int>::iterator x = foo.dostuff();\n"
                               "    *(x) = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5062,14 +5190,14 @@ class TestUnusedVar : public TestFixture {
                               "    int a[4];\n"
                               "    int *b = (int*)((int*)a+1);\n"
                               "    x(b);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f(void) {\n" // #4628
                               "    int x=1,y;\n"
                               "    y = (x * a) / 100;\n"
                               "    return y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5078,14 +5206,14 @@ class TestUnusedVar : public TestFixture {
                               "    char a[4];\n"
                               "    p = a;\n"
                               "    strcpy(p, \"x\");\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(char *p) {\n"
                               "    char a[4];\n"
                               "    p = a;\n"
                               "    strcpy(p, \"x\");\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("a is assigned value that is never used", "", errout_str());
     }
 
@@ -5094,20 +5222,20 @@ class TestUnusedVar : public TestFixture {
                               "void f() {\n"
                               "    char a[4], *p=a;\n"
                               "    p = dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'p' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("char * dostuff(char *&p);\n"
                               "void f() {\n"
                               "    char a[4], *p=a;\n"
                               "    p = dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // TODO: we can warn in this special case; variable is local and there are no function calls after the assignment
 
         functionVariableUsage("void f() {\n"
                               "    char a[4], *p=a;\n"
                               "    p = dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // TODO: we can warn in this special case; variable is local and there are no function calls after the assignment
     }
 
@@ -5117,7 +5245,7 @@ class TestUnusedVar : public TestFixture {
                               "  int *p = &x;\n"
                               "  int *p2[1] = {p};\n"
                               "  dostuff(p2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5126,7 +5254,7 @@ class TestUnusedVar : public TestFixture {
                               "  auto x = dostuff();\n"
                               "  p = x;\n"
                               "  x->data[0] = 9;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5135,7 +5263,7 @@ class TestUnusedVar : public TestFixture {
                               "  int x;\n"
                               "  unknown_type p = &x;\n"
                               "  *p = 9;\n"
-                              "}", dinit(FunctionVariableUsageOptions, $.cpp = false));
+                              "}\n", dinit(FunctionVariableUsageOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5151,8 +5279,15 @@ class TestUnusedVar : public TestFixture {
                               "            break;\n"
                               "        }\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("void f(const std::vector<int>& v) {\n" // #13303
+                              "    std::vector<int>::const_iterator it = v.cbegin();\n"
+                              "    if (*it == 0)\n"
+                              "        it = v.cend();\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:12]: (style) Variable 'it' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvaralias19() { // #9828
@@ -5179,10 +5314,9 @@ class TestUnusedVar : public TestFixture {
                               "    const auto&& c = g();\n"
                               "    auto&& d = c;\n"
                               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:5:20]: (style) Variable 'b' is assigned a value that is never used.\n"
-                           "[test.cpp:7:14]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n",
-                           "[test.cpp:7:14]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n",
-                           errout_str());
+        ASSERT_EQUALS("[test.cpp:5:19]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:7:14]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n",
+                      errout_str());
     }
 
     void localvaralias21() { // #11728
@@ -5234,7 +5368,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    asm();\n"
                               "    b = a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5243,7 +5377,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    static const struct{ int x, y, w, h; } bounds = {1,2,3,4};\n"
                               "    return bounds.x + bounds.y + bounds.w + bounds.h;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5252,10 +5386,9 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct ABC { int a, b, c; };\n"
                               "    struct ABC abc = { 1, 2, 3 };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:20]: (style) Variable 'abc' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:4:16]: (style) Variable 'abc' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:4:20]: (style) Variable 'abc' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
     }
 
@@ -5267,7 +5400,7 @@ class TestUnusedVar : public TestFixture {
                               "    do {\n"
                               "        func();\n"
                               "    } while(a--);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Unused variable: x\n"
                            "[test.cpp:4]: (style) Unused variable: z\n", "", errout_str());
     }
@@ -5277,13 +5410,13 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo() {\n"
                               "    A a;\n"
                               "    return a.i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
@@ -5298,7 +5431,7 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a;\n"
                               "    return a.i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
@@ -5306,17 +5439,16 @@ class TestUnusedVar : public TestFixture {
                               "    A a;\n"
                               "    a.i = 0;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:9]: (style) Variable 'a.i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
                               "int foo() {\n"
                               "    A a = { 0 };\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // extracttests.disable
@@ -5324,10 +5456,9 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a = { 0 };\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:9]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         // extracttests.enable
@@ -5335,42 +5466,42 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class A { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class A { int i; public: A(); { } };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A { unknown i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A : public Fred { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred {char c;};\n"
@@ -5378,7 +5509,7 @@ class TestUnusedVar : public TestFixture {
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
@@ -5389,7 +5520,7 @@ class TestUnusedVar : public TestFixture {
                               "    Type & get() { return t; }\n"
                               "private:\n"
                               "    Type t;\n"
-                              "};");
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5403,7 +5534,7 @@ class TestUnusedVar : public TestFixture {
                               "  args = &aatt;\n"
                               "  aatt.text = tmp;\n"
                               "  dostuff(args);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void dostuff(int*);
@@ -5417,7 +5548,7 @@ class TestUnusedVar : public TestFixture {
                               "  int *p = &aatt.b;\n"
                               "  aatt.a = 123;\n"
                               "  dostuff(p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:9:10]: (style) Variable 'aatt.a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("struct AB {\n"
@@ -5430,7 +5561,7 @@ class TestUnusedVar : public TestFixture {
                               "  int &a = ab.a;\n"
                               "  ab.a = 123;\n"
                               "  dostuff(a);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5449,7 +5580,7 @@ class TestUnusedVar : public TestFixture {
                               "      struct s test;\n"
                               "      test.raw = 0x100;\n"
                               "      dostuff(test.fld1, test.fld2);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5459,7 +5590,7 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "      struct XY xy(get());\n"
                               "      return xy.x + xy.y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5470,7 +5601,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct S s;\n"
                               "    s.x = 3;\n"
                               "    memcpy (&s, &s2, sizeof (S));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:9]: (style) Variable 's.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -5482,7 +5613,7 @@ class TestUnusedVar : public TestFixture {
                               "    Point p;\n"
                               "    p.x = 42;\n"
                               "    return scale(&p).y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5492,7 +5623,7 @@ class TestUnusedVar : public TestFixture {
                               "void Set() {\n"
                               "    S s;\n"
                               "    s.Ref() = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5531,7 +5662,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    struct X x[10];\n"
                               "    x[0].a = 5;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:12]: (style) Variable 'x[0].a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -5543,7 +5674,7 @@ class TestUnusedVar : public TestFixture {
                               "    x.c[0] = fgetuc(fp);\n"
                               "    x.c[1] = fgetuc(fp);\n"
                               "    return x.s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5554,7 +5685,7 @@ class TestUnusedVar : public TestFixture {
                              "{\n"
                              "    int tmp = 10;\n"
                              "    return 123 " + std::string(1, *p) + " tmp;\n"
-                             "}");
+                             "}\n");
             functionVariableUsage(code.c_str());
             ASSERT_EQUALS("", errout_str());
         }
@@ -5565,7 +5696,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int tmp = 10;\n"
                               "    return ~tmp;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5576,7 +5707,7 @@ class TestUnusedVar : public TestFixture {
                               "    if ( tmp )\n"
                               "        return 1;\n"
                               "    return 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("bool argsMatch(const Token *first, const Token *second) {\n" // #6145
@@ -5604,7 +5735,7 @@ class TestUnusedVar : public TestFixture {
                               "    int tmp2 = 2;\n"
                               "    int tmp3 = 3;\n"
                               "    return tmp1 ? tmp2 : tmp3;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5615,10 +5746,9 @@ class TestUnusedVar : public TestFixture {
                               "        return 2;\n"
                               "    else\n"
                               "        return 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3:15]: (style) Variable 'y' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:3:13]: (style) Variable 'y' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:3:15]: (style) Variable 'y' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("int foo(int x)\n"
@@ -5627,7 +5757,7 @@ class TestUnusedVar : public TestFixture {
                               "        return y;\n"
                               "    else\n"
                               "        return 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo(int x)\n"
@@ -5636,7 +5766,7 @@ class TestUnusedVar : public TestFixture {
                               "        return 2;\n"
                               "    else\n"
                               "        return y;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f(int i) {\n" // #11788
@@ -5677,14 +5807,14 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 1;\n"
                               "    int b = 2;\n"
                               "    a |= b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
                       "[test.cpp:5:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    int a = 1;\n"
                               "    (b).x += a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -5692,7 +5822,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = x;\n"
                               "    a += b[0];\n"
                               "    return a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int *start, int *stop) {\n"
@@ -5700,14 +5830,14 @@ class TestUnusedVar : public TestFixture {
                               "  if (length < 10000)\n"
                               "    length = 10000;\n"
                               "  *stop -= length;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int a) {\n"
                               "  int x = 3;\n"
                               "  a &= ~x;\n"
                               "  return a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // extracttests.disable
@@ -5715,14 +5845,14 @@ class TestUnusedVar : public TestFixture {
                               "  Fred fred;\n"
                               "  int *a; a = b;\n"
                               "  fred += a;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:8]: (information) --check-library: Provide <type-checks><unusedvar> configuration for Fred [checkLibraryCheckType]\n", errout_str());
         // extracttests.enable
 
         functionVariableUsage("void f(std::pair<int,int> x) {\n"
                               "  std::pair<int,int> fred;\n"  // class with library configuration
                               "  fred = x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:8]: (style) Variable 'fred' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -5731,13 +5861,29 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a = 1;\n"
                               "    for (;a;);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    for (int i = 0; (pci = cdi_list_get(pciDevices, i)); i++)\n"
                               "    {}\n"
-                              "}");
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("void f(const int* b, int x) {\n" // #11125
+                              "    int a[6];\n"
+                              "    int i = 0;\n"
+                              "    for (int j = 0; j < 6; ++j) {\n"
+                              "        if (b[j] != 0) {\n"
+                              "            a[i] = j;\n"
+                              "            ++i;\n"
+                              "        }\n"
+                              "    }\n"
+                              "    if (i > 1) {\n"
+                              "        a[i] = a[0];\n"
+                              "        (void)a[x];\n"
+                              "    }\n"
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5749,7 +5895,7 @@ class TestUnusedVar : public TestFixture {
                               "        if (i==x) return x;\n"
                               "        i = x;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #5154 - MSVC 'for each'
@@ -5757,7 +5903,7 @@ class TestUnusedVar : public TestFixture {
                               "  std::map<int,int> ints;\n"
                               "  ints[0]= 1;\n"
                               "  for each(std::pair<int,int> i in ints) { x += i.first; }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5766,7 +5912,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int var = 1;\n"
                               "    return 1 >> var;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5775,14 +5921,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    QList<int *> ints;\n"
                               "    ints << 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // #4320
                               "    int x;\n"
                               "    x << 1;\n"
                               "    return x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5792,7 +5938,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 1;\n"
                               "    int b = static_cast<int>(a);\n"
                               "    return b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5803,7 +5949,7 @@ class TestUnusedVar : public TestFixture {
                               "        int a;\n"
                               "        int f() { return a; }\n"
                               "    } b;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5811,44 +5957,44 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((unused));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((unused)) = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((unused)) test;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((unused)) test = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((used));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((used)) test;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    char a[1] __attribute__((unused));\n"
                               "    char b[1][2] __attribute__((unused));\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5859,7 +6005,7 @@ class TestUnusedVar : public TestFixture {
                               "  function_type fn;\n"
                               "  fn = reinterpret_cast<function_type>(dlsym(h, \"try_allocation\"));\n"
                               "  fn();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5870,7 +6016,7 @@ class TestUnusedVar : public TestFixture {
                               "    static const int ci;\n"
                               "    static std::string s;\n"
                               "    static const std::string cs;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Unused variable: i [unusedVariable]\n"
                       "[test.cpp:4:22]: (style) Unused variable: ci [unusedVariable]\n"
                       "[test.cpp:5:24]: (style) Unused variable: s [unusedVariable]\n"
@@ -5880,14 +6026,14 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    static int i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:16]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    static int i(0);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -5896,7 +6042,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    static int j = 0;\n"
                               "    static int i(j);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:4:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -5908,7 +6054,7 @@ class TestUnusedVar : public TestFixture {
                               "    static int c[] = { 5, 6, 7, 8 };\n"
                               "    b[1] = 1;\n"
                               "    return x ? a : c;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:6:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
                            "",
                            errout_str());
@@ -5918,7 +6064,7 @@ class TestUnusedVar : public TestFixture {
                               "    static int i = 0;\n"
                               "    if(i < foo())\n"
                               "        i += 5;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
@@ -5928,14 +6074,14 @@ class TestUnusedVar : public TestFixture {
                               "        x = 0;\n"
                               "    else\n"
                               "        x++;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int value) {\n"
                               "    static int array[16] = {0};\n"
                               "    if(array[value]) {}\n"
                               "    array[value] = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int fun() {\n" // #11310
@@ -5960,7 +6106,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    extern int i;\n"
                               "    i = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -5969,14 +6115,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    void* ptr = malloc(16);\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:17]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char* ptr = new char[16];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.disable
@@ -5985,14 +6131,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char* ptr = new ( nothrow ) char[16];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char* ptr = new ( std::nothrow ) char[16];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.enable
@@ -6001,7 +6147,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char* ptr = new char;\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6009,7 +6155,7 @@ class TestUnusedVar : public TestFixture {
                               "    void* ptr = malloc(16);\n"
                               "    ptr[0] = 123;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6017,7 +6163,7 @@ class TestUnusedVar : public TestFixture {
                               "    char* ptr = new char[16];\n"
                               "    ptr[0] = 123;\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6025,7 +6171,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = new Fred;\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int a; };\n"
@@ -6034,7 +6180,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = new Fred;\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int a; Fred() : a(0) {} };\n"
@@ -6043,7 +6189,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = new Fred;\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
@@ -6051,7 +6197,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* fred = malloc(sizeof(Fred));\n"
                               "    std::cout << \"test\" << std::endl;\n"
                               "    free(fred);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
 
@@ -6059,7 +6205,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    char* ptr = names[i];\n"
                               "    delete[] ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6069,7 +6215,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6078,7 +6224,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6086,7 +6232,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:38]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6095,7 +6241,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6103,7 +6249,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.disable
@@ -6113,7 +6259,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new (nothrow ) Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6121,7 +6267,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new (std::nothrow) Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.enable
@@ -6132,7 +6278,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new Fred();\n"
                               "    ptr->i = 0;\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6140,7 +6286,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    struct Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:18]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
@@ -6149,7 +6295,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct Fred* ptr = new Fred();\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6157,7 +6303,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:31]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6166,7 +6312,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6174,7 +6320,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
@@ -6183,7 +6329,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new Fred();\n"
                               "    ptr->i = 0;\n"
                               "    delete ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6194,7 +6340,7 @@ class TestUnusedVar : public TestFixture {
                               "    int* p = data;\n"
                               "    for ( int i = 0; i < 10; ++i )\n"
                               "        p++;\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'p' is modified but its new value is never used.\n",
                            "",
                            errout_str());
@@ -6204,7 +6350,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    int p[5];\n"
                               "    *p = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6213,7 +6359,7 @@ class TestUnusedVar : public TestFixture {
                               "    int p[5][5];\n"
                               "    p[0][0] = 0;\n"
                               "    return p[0][0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6222,7 +6368,7 @@ class TestUnusedVar : public TestFixture {
                               "    int p[5][5];\n"
                               "    *((int*)p[0]) = 0;\n"
                               "    return p[0][0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6232,7 +6378,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *pp[0];\n"
                               "    p[0] = 1;\n"
                               "    *pp[0] = p[0];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6240,24 +6386,24 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo() {\n"
                               "    int p[5][5];\n"
                               "    dostuff(*p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    int p[5];\n"
                               "    dostuff(*p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    int p[5][5][5];\n"
                               "    dostuff(**p);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #11872
                               "    char v[1][2];\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:10]: (style) Unused variable: v [unusedVariable]\n", errout_str());
     }
 
@@ -6275,51 +6421,49 @@ class TestUnusedVar : public TestFixture {
     void localvarstring1() { // ticket #1597
         functionVariableUsage("void foo() {\n"
                               "    std::string s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Unused variable: s [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    std::string s;\n"
                               "    s = \"foo\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    std::string s = \"foo\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:19]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:17]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:19]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void foo() {\n" // #8901
                               "    const std::string s = \"foo\";\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:25]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:23]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:25]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("std::string foo() {\n"
                               "    std::string s;\n" // Class instances are initialized. Assignment is not necessary
                               "    return s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("std::string foo() {\n"
                               "    std::string s = \"foo\";\n"
                               "    return s;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::string s(\"foo\");\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::string s{ \"foo\" };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
@@ -6327,7 +6471,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    std::string s;\n"
                               "    int i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:17]: (style) Unused variable: s [unusedVariable]\n"
                       "[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
     }
@@ -6335,10 +6479,9 @@ class TestUnusedVar : public TestFixture {
     void localvarconst1() {
         functionVariableUsage("void foo() {\n"
                               "    const bool b = true;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:18]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:18]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
     }
 
@@ -6346,7 +6489,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    const int N = 10;\n"
                               "    struct X { int x[N]; };\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6361,27 +6504,27 @@ class TestUnusedVar : public TestFixture {
                               "        bar() {}\n"
                               "    };\n"
                               "    return MyInt;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void localvarmaybeunused() {
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
                               "int main() {\n"
                               "    [[maybe_unused]] int x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
                               "int main() {\n"
                               "    [[maybe_unused]] int x = getX();\n"
                               "    x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
@@ -6389,74 +6532,99 @@ class TestUnusedVar : public TestFixture {
                               "    [[maybe_unused]] int x = getX();\n"
                               "    x = getX();\n"
                               "    std::cout << x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int& x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int* x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int& x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int* x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] auto x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] auto&& x = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int x[] = getX();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] constexpr volatile static int x = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
-        functionVariableUsage("[[maybe_unused]] inline int x = 1;");
+        functionVariableUsage("[[maybe_unused]] inline int x = 1;\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] [[anotherattribute]] const int* = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] char a[1];\n"
                               "    [[maybe_unused]] char b[1][2];\n"
-                              "}");
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int main() {\n"
+                              "    std::string a [[maybe_unused]];\n"
+                              "    f();\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void localvarrvalue() { // ticket #13977
+        functionVariableUsage("void f(void) {\n"
+                              "    std::string s;\n"
+                              "    std::string&& m = std::move(s);\n"
+                              "    cb();\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:21]: (style) Variable 'm' is assigned a value that is never used. [unreadVariable]\n", errout_str());
+    }
+
+    void localvarreferencearray() { // ticket #14637
+        functionVariableUsage("int f() {\n"
+                              "        int a[1];\n"
+                              "        int(&r)[1] = a;\n"
+                              "        r[0] = 0;\n"
+                              "        return r[0];\n"
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
     void localvarthrow() { // ticket #3687
         functionVariableUsage("void foo() {\n"
-                              "    try {}"
+                              "    try {}\n"
                               "    catch(Foo& bar) {}\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6465,41 +6633,40 @@ class TestUnusedVar : public TestFixture {
 
         functionVariableUsage("void f() {\n"
                               "    std::string x = foo();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2:19]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n"
-            "[test.cpp:2:17]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+            "[test.cpp:2:19]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n",
             errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<int> x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:22]: (style) Unused variable: x [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<int> x(100);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:23]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<MyClass> x;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:26]: (style) Unused variable: x [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::lock_guard<MyClass> lock(mutex_);\n" // Has a side-effect #4385
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    pLocker = std::shared_ptr<jfxLocker>(new jfxLocker(m_lock, true));\n" // Could have side-effects (#4355)
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::mutex m;\n"
                               "    std::unique_lock<std::mutex> lock(m);\n" // #4624
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #7732
@@ -6543,13 +6710,13 @@ class TestUnusedVar : public TestFixture {
     void localVarClass() {
         functionVariableUsage("void f() {\n"
                               "    Fred f;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class C { int x; };\n"
                               "void f() {\n"
                               "    C c;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:7]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class ExampleClass\n" // #10000
@@ -6572,13 +6739,41 @@ class TestUnusedVar : public TestFixture {
                               "void foo()\n"
                               "{\n"
                               "   ExampleClass ex(1, 2, 3, 4);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:20:19]: (style) Variable 'ex' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("class C { public: C(int); ~C(); };\n"
                               "void f() {\n"
                               "    C c(12);\n"
-                              "}");
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #14643
+        functionVariableUsage("class S { S(int); };\n"
+                              "void f() { S s = 0; }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #10965
+        functionVariableUsage("class A {\n"
+                              "public:\n"
+                              "    A();\n"
+                              "};\n"
+                              "extern A cb();\n"
+                              "void f() { const A c = cb(); }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #11704
+        functionVariableUsage("class S {\n"
+                              "public:\n"
+                              "    S();\n"
+                              "};\n"
+                              "class C {\n"
+                              "    S &s();\n"
+                              "    void f() {\n"
+                              "        const S s1 = s(); // warning\n"
+                              "        const S s2; // no warning\n"
+                              "    }\n"
+                              "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6609,7 +6804,7 @@ class TestUnusedVar : public TestFixture {
                               "    auto a2 = std::unique_ptr<A>(new A());\n"
                               "}\n");
         ASSERT_EQUALS("[test.cpp:7:12]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
-                      "[test.cpp:8:13]: (style) Variable 'a2' is assigned a value that is never used. [unreadVariable]\n", // duplicate
+                      "[test.cpp:8:13]: (style) Variable 'a2' is assigned a value that is never used. [unreadVariable]\n",
                       errout_str());
 
         functionVariableUsage("void g();\n" // #11094
@@ -6635,6 +6830,13 @@ class TestUnusedVar : public TestFixture {
                               "    p = nullptr;\n"
                               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("struct S { S(); };\n" // #14160
+                              "void f() {\n"
+                              "    auto p = std::make_unique<S>();\n"
+                              "    auto q = std::make_unique<U>();\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     // ticket #3104 - false positive when variable is read with "if (NOT var)"
@@ -6642,7 +6844,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    bool x = foo();\n"
                               "    if (NOT x) { }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6652,7 +6854,7 @@ class TestUnusedVar : public TestFixture {
                               "    if (m_errorflags & flag) {\n"
                               "        return 1;\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6666,7 +6868,7 @@ class TestUnusedVar : public TestFixture {
                               "        default: ptr=def; break;\n"
                               "    }\n"
                               "    return ptr;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // Don't write an error that "a" is not used
 
         functionVariableUsage("void x() {\n"
@@ -6684,7 +6886,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (iIndice = 1; iIndice <= (pnodeCurrent->usLen / 2); iIndice++) {\n"
                               "        *pcData = gacHexChar[(*pcOctet >> 4) & 0x0F];\n"
                               "    }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str()); // Don't write an error that "fValeur" is not used
     }
 
@@ -6694,13 +6896,13 @@ class TestUnusedVar : public TestFixture {
                               "    foo(p);\n"
                               "    free(p);\n"
                               "    p = NULL;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(Foo *p) {\n"
                               "    free(p);\n"
                               "    p = (Foo *)NULL;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #11079
@@ -6741,7 +6943,7 @@ class TestUnusedVar : public TestFixture {
                               "    goto label;\n"
                               " }\n"
                               " return false;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:5:7]: (style) Variable 'X' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // #4558
@@ -6754,7 +6956,7 @@ class TestUnusedVar : public TestFixture {
                               " if (i<3)\n"
                               "     goto start;\n"
                               " return i;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6762,14 +6964,14 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("int foo() {\n"
                               "    auto f = []{return 1};\n"
                               "    return f();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    auto f = []{return 1};\n"
                               "    auto g = []{return 1};\n"
                               "    return f() + g();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(std::vector<int>& v) {\n"
@@ -6779,7 +6981,7 @@ class TestUnusedVar : public TestFixture {
                               "        n += 2;\n"
                               "        return r;\n"
                               "    });\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // #8433
@@ -6819,11 +7021,21 @@ class TestUnusedVar : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void localvarPtrToPtr() {
+        functionVariableUsage("int main() {\n"
+                              "  int *p, **pp = &p;\n"
+                              "  int i = 123;\n"
+                              "  *pp = &i;\n"
+                              "  return *p;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void localvarCppInitialization() {
         functionVariableUsage("void foo() {\n"
                               "    int buf[6];\n"
                               "    Data data(buf);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:14]: (information) --check-library: Provide <type-checks><unusedvar> configuration for Data [checkLibraryCheckType]\n", errout_str());
     }
 
@@ -6832,7 +7044,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "    int myNewValue{ 3u };\n"
                               "    myManager.theDummyTable.addRow(UnsignedIndexValue{ myNewValue }, DummyRowData{ false });\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
@@ -6851,7 +7063,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void reset() {\n"
                               "    for (auto & e : array)\n"
                               "        e = 0;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6861,13 +7073,13 @@ class TestUnusedVar : public TestFixture {
                               "  do {\n"
                               "    dostuff(a);\n"
                               "  } while((a += x) < 30);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    int var = 1;\n"
                               "    while (var = var >> 1) { }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6876,13 +7088,13 @@ class TestUnusedVar : public TestFixture {
                               "void foo() {\n"
                               "  const int x = 0;\n"
                               "  f<x>();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "  constexpr std::size_t ArraySize(5);\n"
                               "  std::array<int, ArraySize> X; X.dostuff();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #10686
@@ -6900,29 +7112,63 @@ class TestUnusedVar : public TestFixture {
                               "    return hash[0];\n"
                               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("template <int N>\n" // #14199
+                              "struct S {\n"
+                              "    int i;\n"
+                              "};\n"
+                              "void f() {\n"
+                              "    S<0> s;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:10]: (style) Unused variable: s [unusedVariable]\n", errout_str());
+
+        functionVariableUsage("template <typename T>\n" // #14783
+                              "struct A {\n"
+                              "    A() = default;\n"
+                              "};\n"
+                              "void f() {\n"
+                              "    A<int> a;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (style) Unused variable: a [unusedVariable]\n", errout_str());
+
+        functionVariableUsage("template <typename T>\n" // #14784
+                              "struct A {\n"
+                              "    A() {}\n"
+                              "};\n"
+                              "void f() {\n"
+                              "    A<int> a;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:12]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
     void localvarFuncPtr() {
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void)(x);\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'funcPtr' is assigned a value never used.\n", "", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:2:11]: (style) Unused variable: funcPtr [unusedVariable]\n", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void)(x);\n"
                               "    funcPtr();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void) = x;\n"
                               "    funcPtr();\n"
-                              "}");
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #14661
+        functionVariableUsage("int main() {\n"
+                              "    void (*const funcPtr[])(void) = {x};\n"
+                              "    funcPtr[0]();\n"
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6931,14 +7177,14 @@ class TestUnusedVar : public TestFixture {
                               "  int x = 0;\n"
                               "  dostuff(&x);\n"
                               "  x = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "  int x = 0;\n"
                               "  dostuff(std::ref(x));\n"
                               "  x = 1;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6952,7 +7198,7 @@ class TestUnusedVar : public TestFixture {
                               "    buf = tmp;"
                               ""
                               "    delete [] buf;"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6962,7 +7208,7 @@ class TestUnusedVar : public TestFixture {
                               "    double sum = 0.0;\n"
                               "    for (int i = 0; i<n; ++i)\n"
                               "        pdD[i] = (sum += pdD[i]);\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -6970,7 +7216,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("SAL_WNODEPRECATED_DECLARATIONS_PUSH\n"
                               "void convertToTokenArray() {\n"
                               "}\n"
-                              "SAL_WNODEPRECATED_DECLARATIONS_POP"); // #4033
+                              "SAL_WNODEPRECATED_DECLARATIONS_POP\n"); // #4033
     }
 
     void crash2() {
@@ -6980,7 +7226,8 @@ class TestUnusedVar : public TestFixture {
                               "struct Y<0> {};\n"
                               "void f() {\n"
                               "    Y y;\n"
-                              "}"); // #4695
+                              "}\n"); // #4695
+        ASSERT_EQUALS("[test.cpp:6:7]: (style) Unused variable: y [unusedVariable]\n", errout_str());
     }
 
     void crash3() {
@@ -7003,7 +7250,7 @@ class TestUnusedVar : public TestFixture {
                               "          }\n"
                               "   }\n"
                               "   return j;\n"
-                              "}"); // #4585
+                              "}\n"); // #4585
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7021,7 +7268,7 @@ class TestUnusedVar : public TestFixture {
                               "  };\n"
                               "  do_something();\n"
                               "  do_something();\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
 
@@ -7029,20 +7276,20 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(std::vector<int> ints) {\n"
                               "  int x = 0;\n"
                               "  std::for_each(ints.begin(), ints.end(), [&x](int i){ dostuff(x); x = i; });\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(std::vector<int> ints) {\n"
                               "  int x = 0;\n"
                               "  std::for_each(ints.begin(), ints.end(), [&x](int i){ x += i; });\n"
-                              "}");
+                              "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3:5]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", "", errout_str());
 
         functionVariableUsage("int f(const std::vector<int>& v) {\n"
                               "    auto it = std::find_if(v.begin(), v.end(), [&](int i) { return i > 0 && i < 7; });\n"
                               "    std::unordered_map<std::string, std::vector<int*>> exprs;\n"
                               "    return *it;\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("[test.cpp:3:56]: (style) Unused variable: exprs [unusedVariable]\n", errout_str());
     }
 
@@ -7060,7 +7307,7 @@ class TestUnusedVar : public TestFixture {
                               "     }\n"
                               "     return value;\n"
                               "  }\n"
-                              "}");
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7070,7 +7317,7 @@ class TestUnusedVar : public TestFixture {
             " static int fpUnread{0};\n"
             " const int var{fpUnread++};\n"
             " return var;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7078,19 +7325,19 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void fun(Value value) {\n"
             " value[10] = 123;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "void fun(std::string s) {\n"
             " s[10] = 123;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("[test.cpp:2:8]: (style) Variable 's[10]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage(
             "void fun(short data[2]) {\n"
             "  data[2] = 1;\n"
-            "}"
+            "}\n"
             );
         ASSERT_EQUALS("", errout_str());
 
@@ -7098,7 +7345,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void A::b(Date& result) {"
             "  result = 12;\n"
-            "}"
+            "}\n"
             );
         ASSERT_EQUALS("", errout_str());
 
@@ -7107,14 +7354,14 @@ class TestUnusedVar : public TestFixture {
             functionVariableUsage( // assume unknown argument type is reference
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
-                "}"
+                "}\n"
                 );
             ASSERT_EQUALS("", errout_str());
 
             functionVariableUsage( // there is no reference type in C
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
-                "}",
+                "}\n",
                 dinit(FunctionVariableUsageOptions, $.cpp = false)
                 );
             ASSERT_EQUALS("[test.c:1:35]: (style) Variable 'result.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
@@ -7123,7 +7370,7 @@ class TestUnusedVar : public TestFixture {
                 "struct Date { int x; };\n"
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
-                "}"
+                "}\n"
                 );
             ASSERT_EQUALS("[test.cpp:2:35]: (style) Variable 'result.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         }
@@ -7133,7 +7380,7 @@ class TestUnusedVar : public TestFixture {
             "void fun() {"
             "  struct FOO foo;\n"
             "  foo.x = 123;\n"
-            "}"
+            "}\n"
             );
         ASSERT_EQUALS("[test.cpp:2:9]: (style) Variable 'foo.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
@@ -7142,7 +7389,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void foo(std::insert_iterator<C> it) {\n"
             "  it = 123;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7157,7 +7404,7 @@ class TestUnusedVar : public TestFixture {
             "        else\n"
             "            (*pos).second = number;\n"
             "    }\n"
-            "};");
+            "};\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7166,7 +7413,7 @@ class TestUnusedVar : public TestFixture {
             "struct Data { unsigned int n; };\n"
             "int main() {\n"
             "  (*(volatile struct Data*)0x4200).n = 1;\n"
-            "}");
+            "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -7175,7 +7422,61 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage(
             "void f(void) {\n"
             "    ((uint8_t *) (uint16_t)0x1000)[0] = 0x42;\n"
-            "}");
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void structuredBinding() { // #13269
+        functionVariableUsage("int main()\n"
+                              "{\n"
+                              "    auto [a, b] = std::make_pair(42, 0.42);\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:3:17]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n", errout_str());
+
+        functionVariableUsage("int main()\n"
+                              "{\n"
+                              "    auto [a, b] = std::make_pair(42, 0.42);\n"
+                              "    (void) a;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int main()\n"
+                              "{\n"
+                              "    auto [a, b] = std::make_pair(42, 0.42);\n"
+                              "    (void) b;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int main()\n"
+                              "{\n"
+                              "    auto [a, b, c] = std::make_pair(42, 0.42);\n"
+                              "    (void) b;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int main()\n"
+                              "{\n"
+                              "    [[maybe_unused]] auto [a2, b3] = std::make_pair(42, 0.42);\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void pointerCast1() { // #14535
+        functionVariableUsage("void f(int* p)\n"
+                              "{\n"
+                              "    int* p2 = p;\n"
+                              "    ((int *)(p2))[0] = 0;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void pointerCast2() {
+        functionVariableUsage("void f(int* p)\n"
+                              "{\n"
+                              "    int* p2 = p;\n"
+                              "    static_cast<int*>(p2)[0] = 0;\n"
+                              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 };
diff --git a/test/testutils.cpp b/test/testutils.cpp
index d1150b7b0d2..8e91108c3f4 100644
--- a/test/testutils.cpp
+++ b/test/testutils.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -44,6 +44,7 @@ class TestUtils : public TestFixture {
         TEST_CASE(splitString);
         TEST_CASE(as_const);
         TEST_CASE(memoize);
+        TEST_CASE(endsWith);
     }
 
     void isValidGlobPattern() const {
@@ -52,18 +53,32 @@ class TestUtils : public TestFixture {
         ASSERT_EQUALS(true, ::isValidGlobPattern("x*"));
         ASSERT_EQUALS(true, ::isValidGlobPattern("*/x/*"));
         ASSERT_EQUALS(true, ::isValidGlobPattern("x/*/z"));
-        ASSERT_EQUALS(false, ::isValidGlobPattern("**"));
-        ASSERT_EQUALS(false, ::isValidGlobPattern("**x"));
-        ASSERT_EQUALS(false, ::isValidGlobPattern("x**"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("**"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("**x"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("x**"));
 
         ASSERT_EQUALS(true, ::isValidGlobPattern("?"));
         ASSERT_EQUALS(true, ::isValidGlobPattern("?x"));
         ASSERT_EQUALS(true, ::isValidGlobPattern("x?"));
         ASSERT_EQUALS(true, ::isValidGlobPattern("?/x/?"));
         ASSERT_EQUALS(true, ::isValidGlobPattern("x/?/z"));
-        ASSERT_EQUALS(false, ::isValidGlobPattern("??"));
-        ASSERT_EQUALS(false, ::isValidGlobPattern("??x"));
-        ASSERT_EQUALS(false, ::isValidGlobPattern("x??"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("??"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("????"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("??x"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("x??"));
+
+        ASSERT_EQUALS(true, ::isValidGlobPattern("?*"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("?**"));
+        ASSERT_EQUALS(false, ::isValidGlobPattern("?***"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("???*"));
+        ASSERT_EQUALS(true, ::isValidGlobPattern("???**"));
+        ASSERT_EQUALS(false, ::isValidGlobPattern("???***"));
+
+        ASSERT_EQUALS(false, ::isValidGlobPattern("*?"));
+        ASSERT_EQUALS(true,  ::isValidGlobPattern("*x?"));
+        ASSERT_EQUALS(false, ::isValidGlobPattern("**?"));
+        ASSERT_EQUALS(false, ::isValidGlobPattern("***"));
+        ASSERT_EQUALS(true,  ::isValidGlobPattern("**x*"));
     }
 
     void matchglob() const {
@@ -76,11 +91,26 @@ class TestUtils : public TestFixture {
         ASSERT_EQUALS(true, ::matchglob("*", "x/y/z"));
         ASSERT_EQUALS(true, ::matchglob("*/y/z", "x/y/z"));
 
+        ASSERT_EQUALS(true, ::matchglob("**", ""));
+        ASSERT_EQUALS(true, ::matchglob("**", "abcdefg"));
+        ASSERT_EQUALS(true, ::matchglob("**", "abcde/foo/bar"));
+        ASSERT_EQUALS(false, ::matchglob("*/**", "abcde"));
+        ASSERT_EQUALS(true, ::matchglob("*/**", "abcde/foo"));
+        ASSERT_EQUALS(true, ::matchglob("*/**", "abcde/foo/bar"));
+
         ASSERT_EQUALS(false, ::matchglob("?", "xyz"));
         ASSERT_EQUALS(false, ::matchglob("x?", "xyz"));
         ASSERT_EQUALS(false, ::matchglob("?z", "xyz"));
         ASSERT_EQUALS(true, ::matchglob("?y?", "xyz"));
         ASSERT_EQUALS(true, ::matchglob("?/?/?", "x/y/z"));
+
+        ASSERT_EQUALS(true, ::matchglob("??", "xy"));
+        ASSERT_EQUALS(false, ::matchglob("??", "x"));
+        ASSERT_EQUALS(false, ::matchglob("??", "xyz"));
+
+        ASSERT_EQUALS(true, ::matchglob("????", "wxyz"));
+        ASSERT_EQUALS(false, ::matchglob("????", "xyz"));
+        ASSERT_EQUALS(false, ::matchglob("????", "vwxyz"));
     }
 
     void isStringLiteral() const {
@@ -193,26 +223,64 @@ class TestUtils : public TestFixture {
 
     void strToInt() {
         ASSERT_EQUALS(1, ::strToInt<int>("1"));
+        ASSERT_EQUALS(1, ::strToInt<int>("+1"));
         ASSERT_EQUALS(-1, ::strToInt<int>("-1"));
         ASSERT_EQUALS(1, ::strToInt<std::size_t>("1"));
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(""), std::runtime_error, "converting '' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<std::size_t>(""), std::runtime_error, "converting '' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<std::size_t>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("-1"), std::runtime_error, "converting '-1' to integer failed - needs to be positive");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::max()) + 1)), std::runtime_error, "converting '2147483648' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::min()) - 1)), std::runtime_error, "converting '-2147483649' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::max()) + 1)), std::runtime_error, "converting '128' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::min()) - 1)), std::runtime_error, "converting '-129' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<unsigned int>(std::to_string(static_cast<uint64_t>(std::numeric_limits<unsigned int>::max()) + 1)), std::runtime_error, "converting '4294967296' to integer failed - out of range (limits)");
-        ASSERT_THROW_EQUALS_2(::strToInt<int>("9223372036854775808"), std::runtime_error, "converting '9223372036854775808' to integer failed - out of range (stoll)"); // LLONG_MAX + 1
-        ASSERT_THROW_EQUALS_2(::strToInt<std::size_t>("18446744073709551616"), std::runtime_error, "converting '18446744073709551616' to integer failed - out of range (stoull)"); // ULLONG_MAX + 1
+        ASSERT_EQUALS(1, ::strToInt<std::size_t>("+1"));
+        ASSERT_EQUALS(0, ::strToInt<int>("0"));
+        ASSERT_EQUALS(0, ::strToInt<int>("+0"));
+        ASSERT_EQUALS(0, ::strToInt<int>("-0"));
+        ASSERT_EQUALS(0, ::strToInt<std::size_t>("0"));
+        ASSERT_EQUALS(0, ::strToInt<std::size_t>("+0"));
+        ASSERT_THROW_EQUALS(::strToInt<int>(""), std::runtime_error, "converting '' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>(""), std::runtime_error, "converting '' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>(" "), std::runtime_error, "converting ' ' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("-1"), std::runtime_error, "converting '-1' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("-0"), std::runtime_error, "converting '-0' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>("-1"), std::runtime_error, "converting '-1' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>("-0"), std::runtime_error, "converting '-0' to integer failed - needs to be positive");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("+1.0"), std::runtime_error, "converting '+1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("-1.0"), std::runtime_error, "converting '-1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1U"), std::runtime_error, "converting '1U' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1L"), std::runtime_error, "converting '1L' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1Z"), std::runtime_error, "converting '1Z' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("01"), std::runtime_error, "converting '01' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<int>("0x1"), std::runtime_error, "converting '0x1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("0b1"), std::runtime_error, "converting '0b1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(" 1"), std::runtime_error, "converting ' 1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<int>("\t1"), std::runtime_error, "converting '\t1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1 "), std::runtime_error, "converting '1 ' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("1\t"), std::runtime_error, "converting '1\t' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("+ 1"), std::runtime_error, "converting '+ 1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("O1"), std::runtime_error, "converting 'O1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1ms"), std::runtime_error, "converting '1ms' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1.0"), std::runtime_error, "converting '1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("+1.0"), std::runtime_error, "converting '+1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("-1.0"), std::runtime_error, "converting '-1.0' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1U"), std::runtime_error, "converting '1U' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1L"), std::runtime_error, "converting '1L' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1Z"), std::runtime_error, "converting '1Z' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("01"), std::runtime_error, "converting '01' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("0x1"), std::runtime_error, "converting '0x1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("0b1"), std::runtime_error, "converting '0b1' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("one"), std::runtime_error, "converting 'one' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>(" 1"), std::runtime_error, "converting ' 1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("\t1"), std::runtime_error, "converting '\t1' to integer failed - not an integer");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1 "), std::runtime_error, "converting '1 ' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("1\t"), std::runtime_error, "converting '1\t' to integer failed - not an integer (pos)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("- 1"), std::runtime_error, "converting '- 1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>("O1"), std::runtime_error, "converting 'O1' to integer failed - not an integer (invalid_argument)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::max()) + 1)), std::runtime_error, "converting '2147483648' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int>(std::to_string(static_cast<int64_t>(std::numeric_limits<int>::min()) - 1)), std::runtime_error, "converting '-2147483649' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::max()) + 1)), std::runtime_error, "converting '128' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int8_t>(std::to_string(static_cast<int64_t>(std::numeric_limits<int8_t>::min()) - 1)), std::runtime_error, "converting '-129' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<unsigned int>(std::to_string(static_cast<uint64_t>(std::numeric_limits<unsigned int>::max()) + 1)), std::runtime_error, "converting '4294967296' to integer failed - out of range (limits)");
+        ASSERT_THROW_EQUALS(::strToInt<int>("9223372036854775808"), std::runtime_error, "converting '9223372036854775808' to integer failed - out of range (stoll)"); // LLONG_MAX + 1
+        ASSERT_THROW_EQUALS(::strToInt<std::size_t>("18446744073709551616"), std::runtime_error, "converting '18446744073709551616' to integer failed - out of range (stoull)"); // ULLONG_MAX + 1
 
         {
             long tmp;
@@ -281,25 +349,25 @@ class TestUtils : public TestFixture {
             long tmp;
             std::string err;
             ASSERT(!::strToInt("1ms", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (pos)", err);
         }
         {
             long tmp;
             std::string err;
             ASSERT(!::strToInt("1.0", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (pos)", err);
         }
         {
             long tmp;
             std::string err;
             ASSERT(!::strToInt("one", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (invalid_argument)", err);
         }
         {
             std::size_t tmp;
             std::string err;
             ASSERT(!::strToInt("1ms", tmp, &err));
-            ASSERT_EQUALS("not an integer", err);
+            ASSERT_EQUALS("not an integer (pos)", err);
         }
         {
             long tmp;
@@ -492,7 +560,6 @@ class TestUtils : public TestFixture {
             void f() {
                 written = true;
             }
-            // cppcheck-suppress functionStatic - needs to be const
             void f() const {}
         };
 
@@ -513,10 +580,9 @@ class TestUtils : public TestFixture {
             ASSERT(c.written);
         }
         {
-            C c;
-            C* cp = &c;
-            utils::as_const(cp)->f(); // (correctly) calls non-const version
-            ASSERT(c.written);
+            int i = 0;
+            auto cr = utils::as_const(i); // TODO: does nothing and should not be allowed
+            (void)cr;
         }
     }
 
@@ -535,6 +601,17 @@ class TestUtils : public TestFixture {
         ASSERT_EQUALS(1, callF());
         ASSERT_EQUALS(1, count);
     }
+
+    void endsWith() const
+    {
+        ASSERT(::endsWith("test", "test"));
+        ASSERT(::endsWith("test2", "2"));
+        ASSERT(::endsWith("test test", "test"));
+        ASSERT(::endsWith("test", "t"));
+        ASSERT(!::endsWith("", "test"));
+        ASSERT(!::endsWith("tes", "test"));
+        ASSERT(!::endsWith("2test", "2"));
+    }
 };
 
 REGISTER_TEST(TestUtils)
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
index 36e1d2cb038..4b08c2316d3 100644
--- a/test/testvaarg.cpp
+++ b/test/testvaarg.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -38,8 +38,8 @@ class TestVaarg : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckVaarg>(tokenizer, this);
+        CheckVaarg check;
+        runChecks(check, tokenizer, *this);
     }
 
     void run() override {
@@ -57,21 +57,21 @@ class TestVaarg : public TestFixture {
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szFormat);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) 'szFormat' given to va_start() is not last named argument of the function. Did you intend to pass 'nSize'? [va_start_wrongParameter]\n", errout_str());
 
         check("void Format(char* szFormat, char* szBuffer, size_t nSize, ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (warning) 'szBuffer' given to va_start() is not last named argument of the function. Did you intend to pass 'nSize'? [va_start_wrongParameter]\n", errout_str());
 
         check("void Format(char* szFormat, char* szBuffer, size_t nSize, ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, nSize);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char *argv[]) {\n"
@@ -80,14 +80,14 @@ class TestVaarg : public TestFixture {
               "        va_start(argp, format);\n"
               "        c = va_arg(argp, int);\n"
               "    };\n"
-              "}"); // Don't crash (#6032)
+              "}\n"); // Don't crash (#6032)
         ASSERT_EQUALS("[test.cpp:6:5]: (error) va_list 'argp' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         check("void Format(char* szFormat, char* szBuffer, size_t nSize, ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr);\n"
               "    va_end(arg_ptr);\n"
-              "}"); // Don't crash if less than expected arguments are given.
+              "}\n"); // Don't crash if less than expected arguments are given.
         ASSERT_EQUALS("", errout_str());
 
         check("void assertf_fail(const char *assertion, const char *file, int line, const char *func, const char* msg, ...) {\n"
@@ -99,7 +99,7 @@ class TestVaarg : public TestFixture {
               "                va_end(args);\n"
               "        }\n"
               "    };\n"
-              "}"); // Inner class (#6453)
+              "}\n"); // Inner class (#6453)
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -108,14 +108,14 @@ class TestVaarg : public TestFixture {
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:23]: (error) Using reference 'szBuffer' as parameter for va_start() results in undefined behaviour. [va_start_referencePassed]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -124,7 +124,7 @@ class TestVaarg : public TestFixture {
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6186
@@ -136,13 +136,13 @@ class TestVaarg : public TestFixture {
               "    } catch(...) {\n"
               "        va_end(arg_ptr);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:1]: (error) va_list 'arg_ptr' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -150,7 +150,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    if(sth) return;\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:19]: (error) va_list 'arg_ptr' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         // #8124
@@ -164,7 +164,7 @@ class TestVaarg : public TestFixture {
               "        return va_arg(ap, const char*);\n"
               "    });\n"
               "    va_end(ap);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void f(int n, ...)\n"
@@ -176,7 +176,7 @@ class TestVaarg : public TestFixture {
               "    {\n"
               "        return va_arg(ap, const char*);\n"
               "    });\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:10:1]: (error) va_list 'ap' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
     }
 
@@ -184,19 +184,19 @@ class TestVaarg : public TestFixture {
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    return va_arg(arg_ptr, float);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:19]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    foo(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:9]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_copy(f, arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -204,13 +204,13 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
               "    return va_arg(arg_ptr, float);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:5:19]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:3:5]: (error) va_list 'arg_ptr' used before va_start() was called. [va_list_usedBeforeStarted]\n", errout_str());
 
 
@@ -221,7 +221,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    foo(va_arg(arg_ptr, float));\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #6066
@@ -230,7 +230,7 @@ class TestVaarg : public TestFixture {
               "    va_copy(v2, v1);\n"
               "    foo(va_arg(v1, float));\n"
               "    va_end(v2);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7527
@@ -246,7 +246,7 @@ class TestVaarg : public TestFixture {
               "        int data = va_arg(vargs, int);\n"
               "        va_end(vargs);\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7533
@@ -262,7 +262,7 @@ class TestVaarg : public TestFixture {
               "        break;\n"
               "    }\n"
               "    va_end(args);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void action_push(int type, ...) {\n"
@@ -278,7 +278,7 @@ class TestVaarg : public TestFixture {
               "        va_end(args);\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         check("void action_push(int type, ...) {\n"
@@ -293,7 +293,7 @@ class TestVaarg : public TestFixture {
               "        va_end(args);\n"
               "        break;\n"
               "    }\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:13:1]: (error) va_list 'args' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
 
         // #8043
@@ -308,7 +308,7 @@ class TestVaarg : public TestFixture {
               "    sdscatvprintf(curarg, _format, _cpy);\n"
               "    va_end(_cpy);\n"
               "format_err:\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -318,7 +318,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) va_start() or va_copy() called subsequently on 'arg_ptr' without va_end() in between. [va_start_subsequentCalls]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -326,7 +326,7 @@ class TestVaarg : public TestFixture {
               "    va_start(vl1, szBuffer);\n"
               "    va_copy(vl1, vl1);\n"
               "    va_end(vl1);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("[test.cpp:4:5]: (error) va_start() or va_copy() called subsequently on 'vl1' without va_end() in between. [va_start_subsequentCalls]\n", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -335,7 +335,7 @@ class TestVaarg : public TestFixture {
               "    va_end(arg_ptr);\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
     }
 
@@ -344,7 +344,7 @@ class TestVaarg : public TestFixture {
               "  BG_TChar * f;\n"
               "  va_start(args,f);\n"
               "  BG_TString result(f);\n"
-              "}");
+              "}\n");
         ASSERT_EQUALS("", errout_str());
 
         // #7559
@@ -356,7 +356,7 @@ class TestVaarg : public TestFixture {
               "  }\n"
               "  va_start(va, name);\n"
               "  va_end(va);\n"
-              "}");
+              "}\n");
     }
 };
 
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 5522f465356..56bd0e26ce2 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -43,16 +43,9 @@ class TestValueFlow : public TestFixture {
     TestValueFlow() : TestFixture("TestValueFlow") {}
 
 private:
-    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    const Settings settings = settingsBuilder().library("std.cfg").build();
 
     void run() override {
-        // strcpy, abort cfg
-        constexpr char cfg[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"strcpy\"> <arg nr=\"1\"><not-null/></arg> </function>\n"
-                               "  <function name=\"abort\"> <noreturn>true</noreturn> </function>\n" // abort is a noreturn function
-                               "</def>";
-        settings = settingsBuilder(settings).libraryxml(cfg).build();
 
         mNewTemplate = true;
         TEST_CASE(valueFlowNumber);
@@ -137,6 +130,7 @@ class TestValueFlow : public TestFixture {
         TEST_CASE(valueFlowConditionExpressions);
 
         TEST_CASE(valueFlowContainerSize);
+        TEST_CASE(valueFlowContainerSizeIterator);
         TEST_CASE(valueFlowContainerElement);
 
         TEST_CASE(valueFlowDynamicBufferSize);
@@ -172,9 +166,13 @@ class TestValueFlow : public TestFixture {
 
         mNewTemplate = false;
         TEST_CASE(valueFlowBailoutIncompleteVar);
+        TEST_CASE(valueFlowBailoutNoreturn);
         mNewTemplate = true;
 
         TEST_CASE(performanceIfCount);
+        TEST_CASE(bitfields);
+
+        TEST_CASE(bitfieldsHang);
     }
 
     static bool isNotTokValue(const ValueFlow::Value &val) {
@@ -293,8 +291,8 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-#define testValueOfXInconclusive(code, linenr, value) testValueOfXInconclusive_(code, linenr, value, __FILE__, __LINE__)
-    bool testValueOfXInconclusive_(const char code[], unsigned int linenr, int value, const char* file, int line) {
+#define testValueOfXInconclusive(...) testValueOfXInconclusive_(__FILE__, __LINE__, __VA_ARGS__)
+    bool testValueOfXInconclusive_(const char* file, int line, const char code[], unsigned int linenr, int value) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
@@ -316,7 +314,7 @@ class TestValueFlow : public TestFixture {
     }
 
 #define testValueOfX(...) testValueOfX_(__FILE__, __LINE__, __VA_ARGS__)
-    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, const Settings *s = nullptr) {
+    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, MathLib::bigint value, const Settings *s = nullptr) {
         const Settings *settings1 = s ? s : &settings;
 
         // Tokenize..
@@ -370,8 +368,8 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-#define getErrorPathForX(code, linenr) getErrorPathForX_(code, linenr, __FILE__, __LINE__)
-    std::string getErrorPathForX_(const char code[], unsigned int linenr, const char* file, int line) {
+#define getErrorPathForX(...) getErrorPathForX_(__FILE__, __LINE__, __VA_ARGS__)
+    std::string getErrorPathForX_(const char* file, int line, const char code[], unsigned int linenr) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
@@ -414,7 +412,7 @@ class TestValueFlow : public TestFixture {
 
 #define testLifetimeOfX(...) testLifetimeOfX_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    bool testLifetimeOfX_(const char* file, int line, const char (&code)[size], unsigned int linenr, const char value[], ValueFlow::Value::LifetimeScope lifetimeScope = ValueFlow::Value::LifetimeScope::Local) {
+    bool testLifetimeOfX_(const char* file, int line, const char (&code)[size], unsigned int linenr, const char value[]) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
@@ -423,7 +421,7 @@ class TestValueFlow : public TestFixture {
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
                 if (std::any_of(tok->values().cbegin(), tok->values().cend(), [&](const ValueFlow::Value& v) {
-                    return v.isLifetimeValue() && v.lifetimeScope == lifetimeScope && Token::simpleMatch(v.tokvalue, value, len);
+                    return v.isLifetimeValue() && v.lifetimeScope == ValueFlow::Value::LifetimeScope::Local && Token::simpleMatch(v.tokvalue, value, len);
                 }))
                     return true;
             }
@@ -432,9 +430,10 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, ValueFlow::Value::ValueType type) {
+    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, ValueFlow::Value::ValueType type, const Settings* s = nullptr) {
+        const Settings& curSettings = s ? *s : settings;
         // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
+        SimpleTokenizer tokenizer(curSettings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -466,9 +465,9 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-#define testConditionalValueOfX(code, linenr, value) testConditionalValueOfX_(code, linenr, value, __FILE__, __LINE__)
+#define testConditionalValueOfX(...) testConditionalValueOfX_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    bool testConditionalValueOfX_(const char (&code)[size], unsigned int linenr, int value, const char* file, int line) {
+    bool testConditionalValueOfX_(const char* file, int line, const char (&code)[size], unsigned int linenr, int value) {
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
@@ -504,19 +503,35 @@ class TestValueFlow : public TestFixture {
         return tok ? tok->values() : std::list<ValueFlow::Value>();
     }
 
-    std::list<ValueFlow::Value> tokenValues_(const char* file, int line, const char code[], const char tokstr[], ValueFlow::Value::ValueType vt, const Settings *s = nullptr) {
-        std::list<ValueFlow::Value> values = tokenValues_(file, line, code, tokstr, s);
+    std::list<ValueFlow::Value> tokenValues_(const char* file, int line, const char code[], const char tokstr[], ValueFlow::Value::ValueType vt) {
+        std::list<ValueFlow::Value> values = tokenValues_(file, line, code, tokstr);
         values.remove_if([&](const ValueFlow::Value& v) {
             return v.valueType != vt;
         });
         return values;
     }
 
+    // The expression of the container recorded by the container size value of the token. The
+    // container token has to be resolved while the tokenizer is alive.
+#define containerOfSizeValue(...) containerOfSizeValue_(__FILE__, __LINE__, __VA_ARGS__)
+    std::string containerOfSizeValue_(const char* file, int line, const char code[], const char tokstr[]) {
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+        const Token* tok = Token::findmatch(tokenizer.tokens(), tokstr);
+        if (!tok)
+            return "";
+        const std::list<ValueFlow::Value>& values = tok->values();
+        const auto it = std::find_if(values.cbegin(), values.cend(), [](const ValueFlow::Value& v) {
+            return v.isContainerSizeValue() && v.container;
+        });
+        return it == values.cend() ? "" : it->container->expressionString();
+    }
+
 #define lifetimeValues(...) lifetimeValues_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    std::vector<std::string> lifetimeValues_(const char* file, int line, const char (&code)[size], const char tokstr[], const Settings *s = nullptr) {
+    std::vector<std::string> lifetimeValues_(const char* file, int line, const char (&code)[size], const char tokstr[]) {
         std::vector<std::string> result;
-        SimpleTokenizer tokenizer(s ? *s : settings, *this);
+        SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token *tok = Token::findmatch(tokenizer.tokens(), tokstr);
         if (!tok)
@@ -542,11 +557,9 @@ class TestValueFlow : public TestFixture {
                               int line,
                               const char code[],
                               const char tokstr[],
-                              int value,
-                              const Settings* s = nullptr,
-                              bool cpp = true)
+                              int value)
     {
-        std::list<ValueFlow::Value> values = removeImpossible(tokenValues_(file, line, code, tokstr, s, cpp));
+        std::list<ValueFlow::Value> values = removeImpossible(tokenValues_(file, line, code, tokstr));
         return std::any_of(values.begin(), values.end(), [&](const ValueFlow::Value& v) {
             return v.isKnown() && v.isIntValue() && v.intvalue == value;
         });
@@ -567,35 +580,35 @@ class TestValueFlow : public TestFixture {
     }
 
     void valueFlowNumber() {
-        ASSERT_EQUALS(123, valueOfTok("x=123;", "123").intvalue);
-        ASSERT_EQUALS_DOUBLE(192.0, valueOfTok("x=0x0.3p10;", "0x0.3p10").floatValue, 1e-5); // 3 * 16^-1 * 2^10 = 192
-        ASSERT(std::fabs(valueOfTok("x=0.5;", "0.5").floatValue - 0.5) < 0.1);
-        ASSERT_EQUALS(10, valueOfTok("enum {A=10,B=15}; x=A+0;", "+").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x=false;", "false").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("x=true;", "true").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x(NULL);", "NULL").intvalue);
-        ASSERT_EQUALS(static_cast<int>('a'), valueOfTok("x='a';", "'a'").intvalue);
-        ASSERT_EQUALS(static_cast<int>('\n'), valueOfTok("x='\\n';", "'\\n'").intvalue);
-        TODO_ASSERT_EQUALS(0xFFFFFFFF00000000, 0, valueOfTok("x=0xFFFFFFFF00000000;", "0xFFFFFFFF00000000").intvalue); // #7701
-        ASSERT_EQUALS_DOUBLE(16, valueOfTok("x=(double)16;", "(").floatValue, 1e-5);
-        ASSERT_EQUALS_DOUBLE(0.0625, valueOfTok("x=1/(double)16;", "/").floatValue, 1e-5);
+        ASSERT_EQUALS(123, valueOfTok("x=123;\n", "123").intvalue);
+        ASSERT_EQUALS_DOUBLE(192.0, valueOfTok("x=0x0.3p10;\n", "0x0.3p10").floatValue, 1e-5); // 3 * 16^-1 * 2^10 = 192
+        ASSERT(std::fabs(valueOfTok("x=0.5;\n", "0.5").floatValue - 0.5) < 0.1);
+        ASSERT_EQUALS(10, valueOfTok("enum {A=10,B=15}; x=A+0;\n", "+").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x=false;\n", "false").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("x=true;\n", "true").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x(NULL);\n", "NULL").intvalue);
+        ASSERT_EQUALS(static_cast<int>('a'), valueOfTok("x='a';\n", "'a'").intvalue);
+        ASSERT_EQUALS(static_cast<int>('\n'), valueOfTok("x='\\n';\n", "'\\n'").intvalue);
+        TODO_ASSERT_EQUALS(0xFFFFFFFF00000000, 0, valueOfTok("x=0xFFFFFFFF00000000;\n", "0xFFFFFFFF00000000").intvalue); // #7701
+        ASSERT_EQUALS_DOUBLE(16, valueOfTok("x=(double)16;\n", "(").floatValue, 1e-5);
+        ASSERT_EQUALS_DOUBLE(0.0625, valueOfTok("x=1/(double)16;\n", "/").floatValue, 1e-5);
 
         const Settings settingsC23 = settingsBuilder().c(Standards::C23).build();
-        ASSERT_EQUALS(1, valueOfTok("x=true;", "true", &settingsC23, false).intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x=false;", "false", &settingsC23, false).intvalue);
+        ASSERT_EQUALS(1, valueOfTok("x=true;\n", "true", &settingsC23, false).intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x=false;\n", "false", &settingsC23, false).intvalue);
 
         const Settings settingsC17 = settingsBuilder().c(Standards::C17).build();
-        ASSERT(!valueOfTok("x=true;", "true", &settingsC17, false).isKnown());
-        ASSERT(!valueOfTok("x=false;", "false", &settingsC17, false).isKnown());
+        ASSERT(!valueOfTok("x=true;\n", "true", &settingsC17, false).isKnown());
+        ASSERT(!valueOfTok("x=false;\n", "false", &settingsC17, false).isKnown());
 
         // scope
         {
             const char code[] = "namespace N { enum E {e0,e1}; }\n"
-                                "void foo() { x = N::e1; }";
+                                "void foo() { x = N::e1; }\n";
             ASSERT_EQUALS(1, valueOfTok(code, "::").intvalue);
         }
 
-        ASSERT_EQUALS(63, valueOfTok("x = 3 * uint32_t{21};", "*").intvalue);
+        ASSERT_EQUALS(63, valueOfTok("x = 3 * uint32_t{21};\n", "*").intvalue);
     }
 
     void valueFlowString() {
@@ -606,7 +619,7 @@ class TestValueFlow : public TestFixture {
                 "    static const char *x;\n"
                 "    if (a) x = \"123\";\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4, "\"123\"", ValueFlow::Value::ValueType::TOK));
 
         // valueFlowSubFunction
@@ -614,85 +627,85 @@ class TestValueFlow : public TestFixture {
                 "  f(x);\n"
                 "}\n"
                 "\n"
-                "void test() { dostuff(\"abc\"); }";
+                "void test() { dostuff(\"abc\"); }\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2, "\"abc\"", ValueFlow::Value::ValueType::TOK));
     }
 
     void valueFlowTypeTraits()
     {
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>::value;", ":: value", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void_v<void>;", "::", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void>::value;\n", ":: value", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void_v<void>;\n", "::", 1));
 
         // is_void
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void*>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<const void>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<volatile void>{};", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<void*>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<const void>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_void<volatile void>{};\n", "{", 1));
 
         // is_lvalue_reference
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&&>{};", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_lvalue_reference<int&&>{};\n", "{", 0));
 
         // is_rvalue_reference
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&&>{};", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_rvalue_reference<int&&>{};\n", "{", 1));
 
         // is_reference
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int>{};", "{", 0));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&>{};", "{", 1));
-        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&&>{};", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int>{};\n", "{", 0));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&>{};\n", "{", 1));
+        ASSERT_EQUALS(true, testKnownValueOfTok("std::is_reference<int&&>{};\n", "{", 1));
 
         {
             const char* code;
             code = "void bar();\n"
-                   "void foo() { std::is_void<decltype(bar())>::value; }";
+                   "void foo() { std::is_void<decltype(bar())>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "int bar();\n"
-                   "void foo() { std::is_void<decltype(bar())>::value; }";
+                   "void foo() { std::is_void<decltype(bar())>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "void bar();\n"
-                   "void foo() { std::is_void<decltype(bar)>::value; }";
+                   "void foo() { std::is_void<decltype(bar)>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_lvalue_reference<A>::value; }";
+                   "void foo() { std::is_lvalue_reference<A>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_lvalue_reference<A&>::value; }";
+                   "void foo() { std::is_lvalue_reference<A&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "class A;\n"
-                   "void foo() { std::is_lvalue_reference<A&&>::value; }";
+                   "void foo() { std::is_lvalue_reference<A&&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_rvalue_reference<A>::value; }";
+                   "void foo() { std::is_rvalue_reference<A>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_rvalue_reference<A&>::value; }";
+                   "void foo() { std::is_rvalue_reference<A&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_rvalue_reference<A&&>::value; }";
+                   "void foo() { std::is_rvalue_reference<A&&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "class A;\n"
-                   "void foo() { std::is_reference<A>::value; }";
+                   "void foo() { std::is_reference<A>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
 
             code = "class A;\n"
-                   "void foo() { std::is_reference<A&>::value; }";
+                   "void foo() { std::is_reference<A&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "class A;\n"
-                   "void foo() { std::is_reference<A&&>::value; }";
+                   "void foo() { std::is_reference<A&&>::value; }\n";
             ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
 
             code = "void foo() {\n"
@@ -757,7 +770,7 @@ class TestValueFlow : public TestFixture {
                 "    static char ret[10];\n"
                 "    if (a) x = &ret[0];\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5, "& ret [ 0 ]", ValueFlow::Value::ValueType::TOK));
 
         // dead pointer
@@ -765,13 +778,13 @@ class TestValueFlow : public TestFixture {
                 "  int *x;\n"
                 "  if (cond) { int i; x = &i; }\n"
                 "  *x = 0;\n"  // <- x can point at i
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4, "& i", ValueFlow::Value::ValueType::TOK));
 
         code  = "void f() {\n"
                 "  struct X *x;\n"
                 "  x = &x[1];\n"
-                "}";
+                "}\n";
         values = tokenValues(code, "&");
         values.remove_if(&isNotTokValue);
         ASSERT_EQUALS(true, values.empty());
@@ -906,6 +919,19 @@ class TestValueFlow : public TestFixture {
             ASSERT_EQUALS(true, lifetimes.size() == 1);
             ASSERT_EQUALS(true, lifetimes.front() == "a");
         }
+        {
+            const char code[] = "void f(const char *s, size_t len) {\n"
+                                "    char buf[10];\n"
+                                "    {\n"
+                                "        char *tmp = buf;\n"
+                                "        s = strcpy(tmp, s);\n"
+                                "    }\n"
+                                "    if (s[len] == '\0') {}\n"
+                                "}\n";
+            lifetimes = lifetimeValues(code, "s [");
+            ASSERT_EQUALS(true, lifetimes.size() == 1);
+            ASSERT_EQUALS(true, lifetimes.front() == "buf");
+        }
     }
 
     void valueFlowArrayElement() {
@@ -914,38 +940,38 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    const int x[] = {43,23,12};\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "{ 43 , 23 , 12 }", ValueFlow::Value::ValueType::TOK));
 
         code  = "void f() {\n"
                 "    const char x[] = \"abcd\";\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "\"abcd\"", ValueFlow::Value::ValueType::TOK));
 
         code  = "void f() {\n"
                 "    char x[32] = \"abcd\";\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, "\"abcd\"", ValueFlow::Value::ValueType::TOK));
 
         code = "void f() {\n"
                "  int a[10];\n"
                "  int *x = a;\n" // <- a value is a
                "  *x = 0;\n"     // .. => x value is a
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4, "a", ValueFlow::Value::ValueType::TOK));
 
         code  = "char f() {\n"
                 "    const char *x = \"abcd\";\n"
                 "    return x[0];\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(static_cast<int>('a'), valueOfTok(code, "[").intvalue);
 
         code  = "char f() {\n"
                 "    const char *x = \"\";\n"
                 "    return x[0];\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(0, valueOfTok(code, "[").intvalue);
 
         code = "int g() { return 3; }\n"
@@ -970,28 +996,28 @@ class TestValueFlow : public TestFixture {
                "   X x;\n"
                "   g(std::move(x));\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f() {\n"
                "   X x;\n"
                "   g(std::forward<X>(x));\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::ForwardedVariable));
 
         code = "void f() {\n"
                "   X x;\n"
                "   g(std::move(x).getA());\n"   // Only parts of x might be moved out
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f() {\n"
                "   X x;\n"
                "   g(std::forward<X>(x).getA());\n" // Only parts of x might be moved out
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::ForwardedVariable));
 
         code = "void f() {\n"
@@ -999,7 +1025,7 @@ class TestValueFlow : public TestFixture {
                "   g(std::move(x));\n"
                "   x.clear();\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f() {\n"
@@ -1007,28 +1033,28 @@ class TestValueFlow : public TestFixture {
                "   g(std::move(x));\n"
                "   y=x->y;\n"
                "   z=x->z;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int i) {\n"
                "    X x;\n"
                "    z = g(std::move(x));\n"
                "    y = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int i) {\n"
                "    X x;\n"
                "    y = g(std::move(x),\n"
                "          x.size());\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int i) {\n"
                "    X x;\n"
                "    x = g(std::move(x));\n"
                "    y = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "A f(int i) {\n"
@@ -1036,7 +1062,7 @@ class TestValueFlow : public TestFixture {
                "    if (i)"
                "        return g(std::move(x));\n"
                "    return h(std::move(x));\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "struct X {\n"
@@ -1050,13 +1076,13 @@ class TestValueFlow : public TestFixture {
                "   X x;\n"
                "   g(std::move(x)).foo([=](int value) mutable {;});\n"
                "   X y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 11U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void f(int x) {\n"
                "   g(std::move(x));\n"
                "   y=x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "void g(std::string);\n"
@@ -1075,63 +1101,71 @@ class TestValueFlow : public TestFixture {
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 13U, ValueFlow::Value::MoveKind::MovedVariable));
+
+        code = "struct S { int f(int); };\n" // #11751
+               "S g(S);\n"
+               "void h() {\n"
+               "    S x;\n"
+               "    g(std::move(x)).f(1);\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 5U, ValueFlow::Value::MoveKind::MovedVariable));
     }
 
     void valueFlowCalculations() {
         const char *code;
 
         // Different operators
-        ASSERT_EQUALS(5, valueOfTok("3 +  (a ? b : 2);", "+").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 -  (a ? b : 2);", "-").intvalue);
-        ASSERT_EQUALS(6, valueOfTok("3 *  (a ? b : 2);", "*").intvalue);
-        ASSERT_EQUALS(6, valueOfTok("13 / (a ? b : 2);", "/").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("13 % (a ? b : 2);", "%").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("3 == (a ? b : 2);", "==").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 != (a ? b : 2);", "!=").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 >  (a ? b : 2);", ">").intvalue);
-        ASSERT_EQUALS(1, valueOfTok("3 >= (a ? b : 2);", ">=").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("3 <  (a ? b : 2);", "<").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("3 <= (a ? b : 2);", "<=").intvalue);
-
-        ASSERT_EQUALS(1, valueOfTok("(UNKNOWN_TYPE)1;","(").intvalue);
-        ASSERT(tokenValues("(UNKNOWN_TYPE)1000;","(").empty()); // don't know if there is truncation, sign extension
-        ASSERT_EQUALS(255, valueOfTok("(unsigned char)~0;", "(").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("(int)0;", "(").intvalue);
-        ASSERT_EQUALS(3, valueOfTok("(int)(1+2);", "(").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("(UNKNOWN_TYPE*)0;","(").intvalue);
-        ASSERT_EQUALS(100, valueOfTok("(int)100.0;", "(").intvalue);
-        ASSERT_EQUALS(10, valueOfTok("x = static_cast<int>(10);", "( 10 )").intvalue);
-        ASSERT_EQUALS(0, valueOfTok("x = sizeof (struct {int a;}) * 0;", "*").intvalue);
+        ASSERT_EQUALS(5, valueOfTok("3 +  (a ? b : 2);\n", "+").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 -  (a ? b : 2);\n", "-").intvalue);
+        ASSERT_EQUALS(6, valueOfTok("3 *  (a ? b : 2);\n", "*").intvalue);
+        ASSERT_EQUALS(6, valueOfTok("13 / (a ? b : 2);\n", "/").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("13 % (a ? b : 2);\n", "%").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("3 == (a ? b : 2);\n", "==").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 != (a ? b : 2);\n", "!=").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 >  (a ? b : 2);\n", ">").intvalue);
+        ASSERT_EQUALS(1, valueOfTok("3 >= (a ? b : 2);\n", ">=").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("3 <  (a ? b : 2);\n", "<").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("3 <= (a ? b : 2);\n", "<=").intvalue);
+
+        ASSERT_EQUALS(1, valueOfTok("(UNKNOWN_TYPE)1;\n","(").intvalue);
+        ASSERT(tokenValues("(UNKNOWN_TYPE)1000;\n","(").empty()); // don't know if there is truncation, sign extension
+        ASSERT_EQUALS(255, valueOfTok("(unsigned char)~0;\n", "(").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("(int)0;\n", "(").intvalue);
+        ASSERT_EQUALS(3, valueOfTok("(int)(1+2);\n", "(").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("(UNKNOWN_TYPE*)0;\n","(").intvalue);
+        ASSERT_EQUALS(100, valueOfTok("(int)100.0;\n", "(").intvalue);
+        ASSERT_EQUALS(10, valueOfTok("x = static_cast<int>(10);\n", "( 10 )").intvalue);
+        ASSERT_EQUALS(0, valueOfTok("x = sizeof (struct {int a;}) * 0;\n", "*").intvalue);
 
         // Don't calculate or crash if there is UB or invalid operations
-        ASSERT(tokenValues(";-1<<10;","<<").empty());
-        ASSERT(tokenValues(";10<<-1;","<<").empty());
-        ASSERT(tokenValues(";10<<64;","<<").empty());
-        ASSERT(tokenValues(";-1>>10;",">>").empty());
-        ASSERT(tokenValues(";10>>-1;",">>").empty());
-        ASSERT(tokenValues(";10>>64;",">>").empty());
-        ASSERT_EQUALS(tokenValues(";1%-1;","%").size(), 1);
-        ASSERT_EQUALS(tokenValues(";1%-10;","%").size(), 1);
-        ASSERT_EQUALS(tokenValues(";1.5%-1;","%").size(), 1);
-        ASSERT_EQUALS(tokenValues(";1.5%-10;","%").size(), 1);
-        ASSERT(tokenValues(";1%-1.5;","%").empty());
-        ASSERT(tokenValues(";1%-10.5;","%").empty());
-        ASSERT(tokenValues(";1.5%-1.5;","%").empty());
-        ASSERT(tokenValues(";1.5%-10.5;","%").empty());
-        ASSERT(tokenValues(";1/-1;","/").empty());
-        ASSERT(tokenValues(";1/-10;","/").empty());
-        ASSERT(tokenValues(";1.5/-1;","/").empty());
-        ASSERT(tokenValues(";1.5/-10;","/").empty());
-        ASSERT(tokenValues(";1/-1.5;","/").empty());
-        ASSERT(tokenValues(";1/-10.5;","/").empty());
-        ASSERT(tokenValues(";1.5/-1.5;","/").empty());
-        ASSERT(tokenValues(";1.5/-10.5;","/").empty());
-        ASSERT(tokenValues(";1/0;","/").empty());
-        ASSERT(tokenValues(";1/0;","/").empty());
-        ASSERT(tokenValues(";1.5/0;","/").empty());
-        ASSERT(tokenValues(";1.5/0;","/").empty());
-        ASSERT(tokenValues(";((-1) * 9223372036854775807LL - 1) / (-1);", "/").empty()); // #12109
-        ASSERT_EQUALS(tokenValues(";((-1) * 9223372036854775807LL - 1) % (-1);", "%").size(), 1); // #12109
+        ASSERT(tokenValues(";-1<<10;\n","<<").empty());
+        ASSERT(tokenValues(";10<<-1;\n","<<").empty());
+        ASSERT(tokenValues(";10<<64;\n","<<").empty());
+        ASSERT(tokenValues(";-1>>10;\n",">>").empty());
+        ASSERT(tokenValues(";10>>-1;\n",">>").empty());
+        ASSERT(tokenValues(";10>>64;\n",">>").empty());
+        ASSERT_EQUALS(tokenValues(";1%-1;\n","%").size(), 1);
+        ASSERT_EQUALS(tokenValues(";1%-10;\n","%").size(), 1);
+        ASSERT_EQUALS(tokenValues(";1.5%-1;\n","%").size(), 1);
+        ASSERT_EQUALS(tokenValues(";1.5%-10;\n","%").size(), 1);
+        ASSERT(tokenValues(";1%-1.5;\n","%").empty());
+        ASSERT(tokenValues(";1%-10.5;\n","%").empty());
+        ASSERT(tokenValues(";1.5%-1.5;\n","%").empty());
+        ASSERT(tokenValues(";1.5%-10.5;\n","%").empty());
+        ASSERT(tokenValues(";1/-1;\n","/").empty());
+        ASSERT(tokenValues(";1/-10;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-1;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-10;\n","/").empty());
+        ASSERT(tokenValues(";1/-1.5;\n","/").empty());
+        ASSERT(tokenValues(";1/-10.5;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-1.5;\n","/").empty());
+        ASSERT(tokenValues(";1.5/-10.5;\n","/").empty());
+        ASSERT(tokenValues(";1/0;\n","/").empty());
+        ASSERT(tokenValues(";1/0;\n","/").empty());
+        ASSERT(tokenValues(";1.5/0;\n","/").empty());
+        ASSERT(tokenValues(";1.5/0;\n","/").empty());
+        ASSERT(tokenValues(";((-1) * 9223372036854775807LL - 1) / (-1);\n", "/").empty()); // #12109
+        ASSERT_EQUALS(tokenValues(";((-1) * 9223372036854775807LL - 1) % (-1);\n", "%").size(), 1); // #12109
 
         code = "float f(const uint16_t& value) {\n"
                "    const uint16_t uVal = value; \n"
@@ -1142,27 +1176,27 @@ class TestValueFlow : public TestFixture {
         // calculation using 1,2 variables/values
         code  = "void f(int x) {\n"
                 "    a = x+456;\n"
-                "    if (x==123) {}"
-                "}";
+                "    if (x==123) {}\n"
+                "}\n";
         ASSERT_EQUALS(579, valueOfTok(code, "+").intvalue);
 
         code  = "void f(int x, int y) {\n"
                 "    a = x+y;\n"
-                "    if (x==123 || y==456) {}"
-                "}";
+                "    if (x==123 || y==456) {}\n"
+                "}\n";
         ASSERT_EQUALS(0, valueOfTok(code, "+").intvalue);
 
         code  = "void f(int x) {\n"
                 "    a = x+x;\n"
-                "    if (x==123) {}"
-                "}";
+                "    if (x==123) {}\n"
+                "}\n";
         ASSERT_EQUALS(246, valueOfTok(code, "+").intvalue);
 
         code  = "void f(int x, int y) {\n"
                 "    a = x*x;\n"
                 "    if (x==2) {}\n"
                 "    if (x==4) {}\n"
-                "}";
+                "}\n";
         std::list<ValueFlow::Value> values = tokenValues(code,"*");
         ASSERT_EQUALS(2U, values.size());
         ASSERT_EQUALS(4, values.front().intvalue);
@@ -1171,7 +1205,7 @@ class TestValueFlow : public TestFixture {
         code  = "void f(int x) {\n"
                 "    if (x == 3) {}\n"
                 "    a = x * (1 - x - 1);\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(-9, valueOfTok(code, "*").intvalue);
 
         // addition of different variables with known values
@@ -1205,15 +1239,25 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(123, values.empty() ? 0 : values.front().intvalue);
 
+        code = "x = true ? 2 : 3;\n"; // #14369
+        values = tokenValues(code, "?");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(2, values.empty() ? 0 : values.front().intvalue);
+
+        code = "x = false ? 2 : 3;\n"; // #14369
+        values = tokenValues(code, "?");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(3, values.empty() ? 0 : values.front().intvalue);
+
         code  = "int f() {\n"
                 "    const int i = 1;\n"
                 "    int x = i < 0 ? 0 : 1;\n"
                 "    return x;\n"
-                "}";
+                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 1));
 
         // ~
-        code  = "x = ~0U;";
+        code  = "x = ~0U;\n";
         values = tokenValues(code,"~");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(~0U, values.back().intvalue);
@@ -1222,7 +1266,7 @@ class TestValueFlow : public TestFixture {
         code  = "void f(int x) {\n"
                 "    a = !x;\n"
                 "    if (x==0) {}\n"
-                "}";
+                "}\n";
         values = removeImpossible(tokenValues(code, "!"));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.back().intvalue);
@@ -1231,59 +1275,65 @@ class TestValueFlow : public TestFixture {
         code  = "void f(int x) {\n"
                 "    a = -x;\n"
                 "    if (x==10) {}\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"-");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(-10, values.back().intvalue);
 
+        code = "bool f(unsigned a) {\n" // #14848
+               "    bool x = -a < 1;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 1));
+
         // Logical and
         code = "void f(bool b) {\n"
                "   bool x = false && b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "void f(bool b) {\n"
                "   bool x = b && false;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "void f(bool b) {\n"
                "   bool x = true && b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
 
         code = "void f(bool b) {\n"
                "   bool x = b && true;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
 
         // Logical or
         code = "void f(bool b) {\n"
                "   bool x = true || b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "void f(bool b) {\n"
                "   bool x = b || true;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "void f(bool b) {\n"
                "   bool x = false || b;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(bool b) {\n"
                "   bool x = b || false;\n"
                "   bool a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int i) {\n"
@@ -1319,7 +1369,7 @@ class TestValueFlow : public TestFixture {
                 "void callf() {\n"
                 "    f(1,1);\n"
                 "    f(10,10);\n"
-                "}";
+                "}\n";
         values = tokenValues(code, "+");
         ASSERT_EQUALS(true, values.empty());
         if (!values.empty()) {
@@ -1337,22 +1387,22 @@ class TestValueFlow : public TestFixture {
         ASSERT_NO_THROW(tokenValues(code, "<=>"));
 
         // Comparison of string
-        values = removeImpossible(tokenValues("f(\"xyz\" == \"xyz\");", "==")); // implementation defined
+        values = removeImpossible(tokenValues("f(\"xyz\" == \"xyz\");\n", "==")); // implementation defined
         ASSERT_EQUALS(0U, values.size()); // <- no value
 
-        values = removeImpossible(tokenValues("f(\"xyz\" == 0);", "=="));
+        values = removeImpossible(tokenValues("f(\"xyz\" == 0);\n", "=="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
 
-        values = removeImpossible(tokenValues("f(0 == \"xyz\");", "=="));
+        values = removeImpossible(tokenValues("f(0 == \"xyz\");\n", "=="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
 
-        values = removeImpossible(tokenValues("f(\"xyz\" != 0);", "!="));
+        values = removeImpossible(tokenValues("f(\"xyz\" != 0);\n", "!="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.front().intvalue);
 
-        values = removeImpossible(tokenValues("f(0 != \"xyz\");", "!="));
+        values = removeImpossible(tokenValues("f(0 != \"xyz\");\n", "!="));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.front().intvalue);
     }
@@ -1365,7 +1415,7 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    char a[10];"
                 "    x = sizeof(*a);\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"( *");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.back().intvalue);
@@ -1373,22 +1423,46 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    char a[10];"
                 "    x = sizeof(a[0]);\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"( a");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(1, values.back().intvalue);
 
         code = "enum testEnum : uint32_t { a };\n"
-               "sizeof(testEnum);";
+               "sizeof(testEnum);\n";
         values = tokenValues(code,"( testEnum");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(4, values.back().intvalue);
 
+        code = "char& r = i;\n"
+               "sizeof(r);\n";
+        values = tokenValues(code, "( r");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(1, values.back().intvalue);
+
+        code = "char* p;\n"
+               "sizeof(p);\n";
+        values = tokenValues(code, "( p");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(settings.platform.sizeof_pointer, values.back().intvalue);
+
+        code = "char*& pr = p;\n"
+               "sizeof(pr);\n";
+        values = tokenValues(code, "( pr");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(settings.platform.sizeof_pointer, values.back().intvalue);
+
+        code = "struct { char& r; char* p; } s{ x, y };\n"
+               "sizeof(s);\n";
+        values = tokenValues(code, "( s");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, values.back().intvalue);
+
 #define CHECK3(A, B, C)                          \
     do {                                     \
         code = "void f() {\n"                    \
                "    x = sizeof(" A ");\n"        \
-               "}";                              \
+               "}\n";                              \
         values = tokenValues(code,"( " C " )");  \
         ASSERT_EQUALS(1U, values.size());        \
         ASSERT_EQUALS(B, values.back().intvalue); \
@@ -1426,7 +1500,7 @@ class TestValueFlow : public TestFixture {
         code  = "void f() {\n"
                 "    struct S *a[10];"
                 "    x = sizeof(a) / sizeof(a[0]);\n"
-                "}";
+                "}\n";
         values = tokenValues(code,"/");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(10, values.back().intvalue);
@@ -1435,7 +1509,7 @@ class TestValueFlow : public TestFixture {
                 "    struct S { int i; };\n"
                 "    const S a[] = { 1, 2 };\n"
                 "    x = sizeof(a) / ( sizeof(a[0]) );\n"
-                "}";
+                "}\n";
         values = tokenValues(code, "/");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(2, values.back().intvalue);
@@ -1445,7 +1519,7 @@ class TestValueFlow : public TestFixture {
         code = "enum " A " E " B " { E0, E1 };\n" \
                "void f() {\n"                     \
                "    x = sizeof(" C ");\n"         \
-               "}";                               \
+               "}\n";                               \
         values = tokenValues(code,"( " C " )");   \
         ASSERT_EQUALS(1U, values.size());         \
         ASSERT_EQUALS(D, values.back().intvalue); \
@@ -1471,7 +1545,7 @@ class TestValueFlow : public TestFixture {
         CHECK("", ": signed long long", "E", settings.platform.sizeof_long_long);
         CHECK("", ": unsigned long long", "E", settings.platform.sizeof_long_long);
         CHECK("", ": wchar_t", "E", settings.platform.sizeof_wchar_t);
-        CHECK("", ": size_t", "E", settings.platform.sizeof_size_t);
+        CHECK("", ": size_t\n", "E", settings.platform.sizeof_size_t);
 
         // enumerators
         CHECK("", "", "E0", settings.platform.sizeof_int);
@@ -1493,7 +1567,7 @@ class TestValueFlow : public TestFixture {
         CHECK("", ": signed long long", "E0", settings.platform.sizeof_long_long);
         CHECK("", ": unsigned long long", "E0", settings.platform.sizeof_long_long);
         CHECK("", ": wchar_t", "E0", settings.platform.sizeof_wchar_t);
-        CHECK("", ": size_t", "E0", settings.platform.sizeof_size_t);
+        CHECK("", ": size_t\n", "E0", settings.platform.sizeof_size_t);
 
         // class typed enumerators
         CHECK("class", ": char", "E :: E0", 1U);
@@ -1512,7 +1586,7 @@ class TestValueFlow : public TestFixture {
         CHECK("class", ": signed long long", "E :: E0", settings.platform.sizeof_long_long);
         CHECK("class", ": unsigned long long", "E :: E0", settings.platform.sizeof_long_long);
         CHECK("class", ": wchar_t", "E :: E0", settings.platform.sizeof_wchar_t);
-        CHECK("class", ": size_t", "E :: E0", settings.platform.sizeof_size_t);
+        CHECK("class", ": size_t\n", "E :: E0", settings.platform.sizeof_size_t);
 #undef CHECK
 
 #define CHECK(A, B)                                   \
@@ -1521,7 +1595,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"                         \
                "    E arrE[] = { E0, E1 };\n"         \
                "    x = sizeof(arrE);\n"              \
-               "}";                                   \
+               "}\n";                                   \
         values = tokenValues(code,"( arrE )");        \
         ASSERT_EQUALS(1U, values.size());             \
         ASSERT_EQUALS(B * 2ULL, values.back().intvalue); \
@@ -1547,7 +1621,7 @@ class TestValueFlow : public TestFixture {
         CHECK(": signed long long", settings.platform.sizeof_long_long);
         CHECK(": unsigned long long", settings.platform.sizeof_long_long);
         CHECK(": wchar_t", settings.platform.sizeof_wchar_t);
-        CHECK(": size_t", settings.platform.sizeof_size_t);
+        CHECK(": size_t\n", settings.platform.sizeof_size_t);
 #undef CHECK
 
 #define CHECK(A, B)                                   \
@@ -1556,7 +1630,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"                         \
                "    E arrE[] = { E::E0, E::E1 };\n"   \
                "    x = sizeof(arrE);\n"              \
-               "}";                                   \
+               "}\n";                                   \
         values = tokenValues(code,"( arrE )");        \
         ASSERT_EQUALS(1U, values.size());             \
         ASSERT_EQUALS(B * 2ULL, values.back().intvalue); \
@@ -1582,16 +1656,16 @@ class TestValueFlow : public TestFixture {
         CHECK(": signed long long", settings.platform.sizeof_long_long);
         CHECK(": unsigned long long", settings.platform.sizeof_long_long);
         CHECK(": wchar_t", settings.platform.sizeof_wchar_t);
-        CHECK(": size_t", settings.platform.sizeof_size_t);
+        CHECK(": size_t\n", settings.platform.sizeof_size_t);
 #undef CHECK
 
         code = "uint16_t arr[10];\n"
-               "x = sizeof(arr);";
+               "x = sizeof(arr);\n";
         values = tokenValues(code,"( arr )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(10 * sizeof(std::uint16_t), values.back().intvalue);
 
-        code = "int sz = sizeof(int32_t[10][20]);";
+        code = "int sz = sizeof(int32_t[10][20]);\n";
         values = tokenValues(code, "=");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(sizeof(std::int32_t) * 10 * 20, values.back().intvalue);
@@ -1599,7 +1673,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { float a; float b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1607,7 +1681,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { char a; char b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(2, values.back().intvalue);
@@ -1615,7 +1689,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { char a; float b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1623,7 +1697,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { char a; char b; float c; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1631,7 +1705,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { float a; char b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1639,7 +1713,7 @@ class TestValueFlow : public TestFixture {
         code = "struct X { float a; char b; char c; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(8, values.back().intvalue);
@@ -1648,11 +1722,32 @@ class TestValueFlow : public TestFixture {
                "struct X { A a; char b; };\n"
                "void f() {\n"
                "    x = sizeof(X);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "( X )");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(12, values.back().intvalue);
 
+        code = "struct X { A a; int b; A c; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "}\n";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(-1, values.back().intvalue);
+
+        code = "struct X {};\n"
+               "struct SubX : X {};\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "    subx = sizeof(SubX);\n"
+               "}\n";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(1, values.back().intvalue);
+        values = tokenValues(code, "( SubX )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(1, values.back().intvalue);
+
         code = "struct T;\n"
                "struct S { T& r; };\n"
                "struct T { S s{ *this }; };\n"
@@ -1698,11 +1793,50 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int a[N + 1];"
                "    x = sizeof(a) / sizeof(a[0]);\n"
-               "}";
+               "}\n";
         values = tokenValues(code,"/");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(-1, values.back().intvalue);
         ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Impossible, values.back().valueKind);
+
+        code = "struct E;\n"
+               "struct B {\n"
+               "    E* e;\n"
+               "    B* b;\n"
+               "};\n"
+               "struct D : B {};\n"
+               "struct E : B {\n"
+               "	B* be;\n"
+               "};\n"
+               "int f() {\n"
+               "    return sizeof(D);\n"
+               "}\n";
+        values = tokenValues(code, "( D )");
+        ASSERT_EQUALS(1U, values.size());
+        TODO_ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, 1, values.back().intvalue);
+
+        code = "int f() {\n" // #11335
+               "    int* a[2];"
+               "    return sizeof(a);\n"
+               "}\n";
+        values = tokenValues(code, "( a");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, values.back().intvalue);
+        ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);
+
+        code = "struct S { std::array<int, 3> a; };\n"
+               "x = sizeof(S);\n";
+        values = tokenValues(code, "( S");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(3 * settings.platform.sizeof_int, values.back().intvalue);
+        ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);
+
+        code = "std::array<int, 3> a;\n"
+               "x = sizeof(a);\n";
+        values = tokenValues(code, "( a");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(3 * settings.platform.sizeof_int, values.back().intvalue);
+        ASSERT_EQUALS_ENUM(ValueFlow::Value::ValueKind::Known, values.back().valueKind);
     }
 
     void valueFlowComma()
@@ -1744,7 +1878,7 @@ class TestValueFlow : public TestFixture {
                "  int x = y;\n"
                "  a = x;\n"
                "  y += 12;\n"
-               "  if (y == 32) {}"
+               "  if (y == 32) {}\n"
                "}\n";
         ASSERT_EQUALS("2,x is assigned 'y' here.\n"
                       "5,Assuming that condition 'y==32' is not redundant\n"
@@ -1779,45 +1913,45 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    int a = x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 123));
 
         code = "void f(unsigned int x) {\n"
                "    int a = x;\n"
                "    if (x >= 1) {}\n"
-               "}";
+               "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 2U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(unsigned int x) {\n"
                "    int a = x;\n"
                "    if (x > 0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(unsigned int x) {\n"
                "    int a = x;\n"
                "    if (x > 1) {}\n" // not zero => don't consider > condition
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 1));
 
         code = "void f(int x) {\n" // not unsigned => don't consider > condition
                "    int a = x;\n"
                "    if (x > 0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
 
         code = "void f(int *x) {\n"
                "    *x = 100;\n"
                "    if (x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "extern const int x;\n"
                "void f() {\n"
                "    int a = x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         // after loop
@@ -1839,26 +1973,26 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "   x = 2 + x;\n"
                "   if (x == 65);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 65));
 
         code = "void f(int x) {\n"
                "   x = y = 2 + x;\n"
                "   if (x == 65);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 65));
 
         code = "void f(int x) {\n"
                "   a[x++] = 0;\n"
                "   if (x == 5);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 5));
 
         code = "void f(int x) {\n"
                "   a = x;\n"
                "   x++;\n"
                "   if (x == 4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 3));
 
         // compound assignment += , -= , ...
@@ -1866,7 +2000,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x += 2;\n"
                "   if (x == 4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 2));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 2));
 
@@ -1874,7 +2008,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x -= 2;\n"
                "   if (x == 4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 6));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 6));
 
@@ -1882,7 +2016,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x *= 2;\n"
                "   if (x == 42);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 21));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 21));
 
@@ -1890,7 +2024,7 @@ class TestValueFlow : public TestFixture {
                "   a = x;\n"
                "   x /= 5;\n"
                "   if (x == 42);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 210));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 210));
 
@@ -1898,7 +2032,7 @@ class TestValueFlow : public TestFixture {
         bailout("void f(int x) {\n"
                 "    x = y;\n"
                 "    if (x == 123) {}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -1911,7 +2045,7 @@ class TestValueFlow : public TestFixture {
                "    if (!x || \n"  // <- x can be 0
                "        a/x) {}\n" // <- x can't be 0
                "    if (x==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
@@ -1919,14 +2053,14 @@ class TestValueFlow : public TestFixture {
                "  ((x=ret())&&\n"
                "   (*x==0));\n"  // <- x is not 0
                "  if (x==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int *x) {\n"
                "  int a = (x && *x == '1');\n"
                "  int b = a ? atoi(x) : 0;\n"  // <- x is not 0
                "  if (x==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
     }
 
@@ -1937,7 +2071,7 @@ class TestValueFlow : public TestFixture {
                "  a = x;\n"
                "  setx(x);\n"
                "  if (x == 1) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX((std::string("void setx(int x);")+code).c_str(), 2U, 1));
         ASSERT_EQUALS(false, testValueOfX((std::string("void setx(int &x);")+code).c_str(), 2U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 1));
@@ -1945,7 +2079,7 @@ class TestValueFlow : public TestFixture {
         code = "void f(char* x) {\n"
                "  strcpy(x,\"abc\");\n"
                "  if (x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void addNewFunction(Scope**scope, const Token**tok);\n"
@@ -1953,14 +2087,14 @@ class TestValueFlow : public TestFixture {
                "  x->functionList.back();\n"
                "  addNewFunction(&x,&tok);\n" // address-of, x can be changed by subfunction
                "  if (x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void g(int&);"
                "void f(int x) {\n"
                "   g(x);\n"
                "   if (x == 5);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 5));
     }
 
@@ -1970,25 +2104,25 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n" // loop condition, x is not assigned inside loop => use condition
                "  a = x;\n"  // x can be 37
                "  while (x == 37) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 37));
 
         code = "void f(int x) {\n" // loop condition, x is assigned inside loop => don't use condition
                "  a = x;\n"  // don't assume that x can be 37
                "  while (x != 37) { x++; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 37));
 
         code = "void f(int x) {\n"
                "  a = x;\n"
                "  for (; x!=1; x++) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 1));
 
         code = "void f(menu *x) {\n"
                "  a = x->parent;\n"
                "  for (i=0;(i<10) && (x!=0); i++) { x = x->next; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
 
         code = "void f(int x) {\n"  // condition inside loop, x is NOT assigned inside loop => use condition
@@ -1996,7 +2130,7 @@ class TestValueFlow : public TestFixture {
                "    do {\n"
                "        if (x==76) {}\n"
                "    } while (1);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 76));
 
         code = "void f(int x) {\n"  // conditions inside loop, x is assigned inside do-while => don't use condition
@@ -2004,7 +2138,7 @@ class TestValueFlow : public TestFixture {
                "    do {\n"
                "        if (x!=76) { x=do_something(); }\n"
                "    } while (1);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 76));
 
         code = "void f(X x) {\n"  // conditions inside loop, x is assigned inside do-while => don't use condition
@@ -2013,7 +2147,7 @@ class TestValueFlow : public TestFixture {
                "        BUGON(x==0)\n"
                "        x = x.next;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
 
         code = "struct S {\n" // #12848
@@ -2039,7 +2173,7 @@ class TestValueFlow : public TestFixture {
 
         bailout("void f(int x) {\n"
                 "    y = ((x<0) ? x : ((x==2)?3:4));\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2047,26 +2181,26 @@ class TestValueFlow : public TestFixture {
         bailout("int f(int x) {\n"
                 "  int r = x ? 1 / x : 0;\n"
                 "  if (x == 0) {}\n"
-                "}");
+                "}\n");
 
         code = "void f(int x) {\n"
                "    int a =v x;\n"
                "    a = b ? x/2 : 20/x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 123));
 
         code = "void f(const s *x) {\n"
                "  x->a = 0;\n"
                "  if (x ? x->a : 0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(int x, int y) {\n"
                "    a = x;\n"
                "    if (y){}\n"
                "    if (x==123){}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 123));
     }
 
@@ -2076,13 +2210,13 @@ class TestValueFlow : public TestFixture {
         code = "void f(int *x) {\n"
                "    sizeof(x[0]);\n"
                "    if (x==63){}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 63));
 
         code = "void f(int *x) {\n"
                "    char a[sizeof x.y];\n"
                "    if (x==0){}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
     }
 
@@ -2095,7 +2229,7 @@ class TestValueFlow : public TestFixture {
                "      (a(x->name, html)) &&\n"
                "      (a(x->name, body))) {}\n"
                "  if (x != NULL) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
@@ -2104,7 +2238,7 @@ class TestValueFlow : public TestFixture {
         bailout("void f(int x) {\n"
                 "    if (x != 123) { b = x; }\n"
                 "    if (x == 123) {}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:2:21]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable b [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2113,14 +2247,14 @@ class TestValueFlow : public TestFixture {
                "  a = x;\n"
                "  if (abc) { x = 1; }\n" // <- condition must be false if x is 7 in next line
                "  if (x == 7) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 7));
 
         code = "void f(int x, bool abc) {\n"
                "  a = x;\n"
                "  if (abc) { x = 7; }\n" // <- condition is probably true
                "  if (x == 7) { }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 7));
     }
 
@@ -2132,7 +2266,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"
                "    int a = x;\n"
                "    if (x == 123) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3,123));
 
         // bailout when there is function call
@@ -2141,7 +2275,7 @@ class TestValueFlow : public TestFixture {
                "    int a = x;\n"
                "    clear();\n"  // <- x might be assigned
                "    if (x == 234) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code,3,234));
     }
 
@@ -2153,7 +2287,7 @@ class TestValueFlow : public TestFixture {
                 "    case 1: a=x; break;\n"
                 "    case 2: if (x==5) {} break;\n"
                 "    };\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2163,7 +2297,7 @@ class TestValueFlow : public TestFixture {
                 "    case 1: a=x; return 1;\n"
                 "    case 2: if (x==5) {} break;\n"
                 "    };\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS(
             "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
             errout_str());
@@ -2175,7 +2309,7 @@ class TestValueFlow : public TestFixture {
                 "void f(int x) {\n"
                 "    a = x;\n"
                 "    M;\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n"
             "[test.cpp:4]: (debug) valueflow.cpp:1260:(valueFlow) bailout: variable 'x', condition is defined in macro\n"
@@ -2186,7 +2320,7 @@ class TestValueFlow : public TestFixture {
                 "void f(int *x) {\n"
                 "    a = x;\n"
                 "    FREE(x);\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n"
             "[test.cpp:4]: (debug) valueflow.cpp:1260:(valueFlow) bailout: variable 'x', condition is defined in macro\n"
@@ -2201,7 +2335,7 @@ class TestValueFlow : public TestFixture {
                 "    a=x;\n"   // <- x is not 123
                 "out:"
                 "    if (x==123){}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n"
             "[test.cpp:2]: (debug) valueflow.cpp::(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n"
@@ -2218,7 +2352,7 @@ class TestValueFlow : public TestFixture {
                 "\n"
                 "out:\n"
                 "    if (abc) {}\n"
-                "}");
+                "}\n");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
             "[test.cpp:3]: (debug) valueflow.cpp:6730:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n"
             "[test.cpp:3]: (debug) valueflow.cpp:6730:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n", // duplicate
@@ -2232,14 +2366,14 @@ class TestValueFlow : public TestFixture {
                "    int x = a;\n"
                "    if (a == 123) {}\n"
                "    int b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int a) {\n"
                "    int x = a;\n"
                "    if (a != 123) {}\n"
                "    int b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
     }
 
@@ -2273,38 +2407,38 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int x = 123;\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f() {\n"
                "    bool x = 32;\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "void f() {\n"
                "    int x = 123;\n"
                "    a = sizeof(x);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
         code = "void f() {\n"
                "    int x = 123;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f() {\n"
                "    const int x(321);\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 321));
 
         code = "void f() {\n"
                "    int x = 9;\n"
                "    --x;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 9));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 8));
         ASSERT_EQUALS("2,Assignment 'x=9', assigned value is 9\n"
@@ -2315,54 +2449,54 @@ class TestValueFlow : public TestFixture {
                "    int x = value ? 6 : 0;\n"
                "    x =\n"
                "        1 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 7));
 
         code = "void f() {\n"
                "    int x = 0;\n"
                "    y = x += z;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    static int x = 2;\n"
                "    x++;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
 
         code = "void f() {\n"
                "    static int x = 2;\n"
                "    a >> x;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
 
         code = "void f() {\n"
                "    static int x = 0;\n"
                "    if (x==0) x = getX();\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         // truncation
         code = "int f() {\n"
                "  int x = 1.5;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "int f() {\n"
                "  unsigned char x = 0x123;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0x23));
 
         code = "int f() {\n"
                "  signed char x = 0xfe;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, -2));
 
         // function
@@ -2370,14 +2504,14 @@ class TestValueFlow : public TestFixture {
                "    char *x = 0;\n"
                "    int success = getx((char**)&x);\n"
                "    if (success) x[0] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    char *x = 0;\n"
                "    getx(reinterpret_cast<void **>(&x));\n"
                "    *x = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         // lambda
@@ -2415,14 +2549,14 @@ class TestValueFlow : public TestFixture {
                "    int x = 8;\n"
                "    a = ((x > 10) ?\n"
                "        x : 0);\n" // <- x is not 8
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 8));
 
         code = "void f() {\n" // #6973
                "    char *x = \"\";\n"
                "    a = ((x[0] == 'U') ?\n"
                "        x[1] : 0);\n" // <- x is not ""
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, "\"\"", ValueFlow::Value::ValueType::TOK));
 
         code = "void f() {\n" // #6973
@@ -2445,7 +2579,7 @@ class TestValueFlow : public TestFixture {
                "  t *x = 0;\n"
                "  y = (a ? 1 : x\n" // <- x is 0
                "       && x->y ? 1 : 2);" // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -2453,7 +2587,7 @@ class TestValueFlow : public TestFixture {
                "  t *x = 0;\n"
                "  y = (a ? 1 : !x\n" // <- x is 0
                "       || x->y ? 1 : 2);" // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -2462,14 +2596,14 @@ class TestValueFlow : public TestFixture {
                "    int x = 123;\n"
                "    if (condition) return;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f() {\n"
                "    int x = 1;\n"
                "    if (condition) x = 2;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 2));
 
@@ -2478,7 +2612,7 @@ class TestValueFlow : public TestFixture {
                "    if (condition1) x = 456;\n"
                "    if (condition2) x = 789;\n"
                "    a = 2 + x;\n" // <- either assignment "x=123" is redundant or x can be 123 here.
-               "}";
+               "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 5U, 123));
 
         code = "void f(int a) {\n"
@@ -2488,7 +2622,7 @@ class TestValueFlow : public TestFixture {
                "    else\n"
                "        ++x;\n"
                "    return 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f() {\n"
@@ -2496,7 +2630,7 @@ class TestValueFlow : public TestFixture {
                "    if (condition1) x = 2;\n"
                "    else return;\n"
                "    a = 2 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 1));
 
         code = "void f(){\n"
@@ -2511,21 +2645,21 @@ class TestValueFlow : public TestFixture {
                "  X *x = getx();\n"
                "  if(0) { x = 0; }\n"
                "  else { x->y = 1; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n" // #6239
                "  int x = 4;\n"
                "  if(1) { x = 0; }\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 4));
 
         code = "void f() {\n"
                "    int x = 32;\n"
                "    if (x>=32) return;\n"
                "    a[x]=0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 32));
 
         code = "void f() {\n"
@@ -2534,7 +2668,7 @@ class TestValueFlow : public TestFixture {
                "        a[x] = 0;\n"  // <- should have possible value 32
                "        return;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 32));
 
         code = "void f() {\n"
@@ -2542,7 +2676,7 @@ class TestValueFlow : public TestFixture {
                "    if (x==33) goto fail;\n"
                "    a[x]=0;\n"
                "fail:\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 33));
 
         code = "void f() {\n"
@@ -2550,7 +2684,7 @@ class TestValueFlow : public TestFixture {
                "    if (a==1) { z=x+12; }\n"
                "    if (a==2) { z=x+32; }\n"
                "    z = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 32));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 32));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 32));
@@ -2561,14 +2695,14 @@ class TestValueFlow : public TestFixture {
                "        x = getx();\n"
                "    }\n"
                "    y = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 0));
 
         code = "void f(int y) {\n" // alias
                "  int x = y;\n"
                "  if (y == 54) {}\n"
                "  else { a = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 54));
 
         code = "void f () {\n"
@@ -2578,7 +2712,7 @@ class TestValueFlow : public TestFixture {
                "        return 1;\n"
                "    }\n"
                "    a = x->y;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 0));
 
         code = "void f () {\n"
@@ -2589,7 +2723,7 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "    a = x->y;\n"
                "label:\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 0));
 
         code = "void f() {\n" // #5752 - FP
@@ -2597,14 +2731,14 @@ class TestValueFlow : public TestFixture {
                "    if (x && *x == 123) {\n"
                "        getx(*x);\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    int x = 0;\n"
                "    if (!x) {}\n"
                "    else { y = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n" // #6118 - FP
@@ -2612,7 +2746,7 @@ class TestValueFlow : public TestFixture {
                "    x = x & 0x1;\n"
                "    if (x == 0) { x = 2; }\n"
                "    y = 42 / x;\n" // <- x is 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -2621,7 +2755,7 @@ class TestValueFlow : public TestFixture {
                "    x = x & 0x1;\n"
                "    if (x == 0) { x += 2; }\n"
                "    y = 42 / x;\n" // <- x is 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -2634,7 +2768,7 @@ class TestValueFlow : public TestFixture {
                "    if (!x) exit(1);\n"
                "\n"
                "    a = x->a;\n" // <- x can't be 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 9U, 0));
 
         code = "void f(int i) {\n"
@@ -2658,14 +2792,14 @@ class TestValueFlow : public TestFixture {
         code = "void f(int a) {\n"
                "    int x = a;\n"
                "    if (a!=132) { b = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 132));
 
         code = "void f(int a) {\n"
                "    int x = a;\n"
                "    b = x;\n" // <- line 3
                "    if (a!=132) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 132));
 
         code = "void f() {\n"
@@ -2674,7 +2808,7 @@ class TestValueFlow : public TestFixture {
                "    else { a = 0; }\n"
                "    int x = a;\n"
                "    if (a > 0) { a = b / x; }\n" // <- line 6
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 0)); // x is not 0 at line 6
 
         code = "void f(int x1) {\n" // #6086
@@ -2683,7 +2817,7 @@ class TestValueFlow : public TestFixture {
                "    return;\n"
                "  }\n"
                "  a = x;\n"  // <- x is not 3
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 3));
 
         code = "int f(int *x) {\n" // #5980
@@ -2694,13 +2828,13 @@ class TestValueFlow : public TestFixture {
                "    };\n"
                "  }\n"
                "  return *x;\n"  // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 8U, 0));
 
         code = "void f(int a) {\n" // #6826
                "    int x = a ? a : 87;\n"
                "    if (a && x) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 87));
 
         code = "void f() {\n"
@@ -2709,7 +2843,7 @@ class TestValueFlow : public TestFixture {
                "    if (first >= 0) { a = x; }\n" // <- x is not 0
                "    first++; x=3;\n"
                "  } while (1);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 3));
 
@@ -2721,7 +2855,7 @@ class TestValueFlow : public TestFixture {
                "    *px = 1;\n"
                "  }\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 2));
 
         code = "int f(void) {\n"
@@ -2731,7 +2865,7 @@ class TestValueFlow : public TestFixture {
                "    rx = 1;\n"
                "  }\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 5));
 
         // break
@@ -2754,7 +2888,7 @@ class TestValueFlow : public TestFixture {
                "    case B: x = 34; break;\n"
                "  }\n"
                "  v = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 7U, 12));
         ASSERT_EQUALS(true, testValueOfX(code, 7U, 34));
 
@@ -2767,7 +2901,7 @@ class TestValueFlow : public TestFixture {
                "  switch (ab) {\n"
                "    case A: v = x; break;\n" // <- x is not 34
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 8U, 34));
 
         // while/for
@@ -3002,7 +3136,7 @@ class TestValueFlow : public TestFixture {
                "  if (y)\n"
                "    x = 10;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 10));
 
         code = "namespace A { int x; }\n"
@@ -3010,7 +3144,7 @@ class TestValueFlow : public TestFixture {
                "  if (y)\n"
                "    A::x = 10;\n"
                "  return A::x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 10));
 
         // member variable
@@ -3021,7 +3155,7 @@ class TestValueFlow : public TestFixture {
                "      x = 10;\n"
                "    return x;\n"
                "  }\n"
-               "};";
+               "};\n";
         ASSERT_EQUALS(true, testValueOfX(code, 6U, 10));
 
         code = "void f(int i) {\n"
@@ -3045,21 +3179,21 @@ class TestValueFlow : public TestFixture {
                "    constexpr int x(123);\n"
                "    constexpr int y(x*x);\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 123));
 
         code = "void f() {\n"
                "    static const int x(123);\n"
                "    static const int y(x*x);\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 123));
 
         code = "void f() {\n"
                "    static int x(123);\n"
                "    static int y(x*x);\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "bool f() {\n" // #13208
@@ -3073,6 +3207,56 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 9U, 1));
+
+        code = "int32_t f() {\n"
+               "    const int32_t x = 0xffffffff;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, -1));
+
+        code = "A* f() {\n" // #14864
+               "    A* x{};\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, 0));
+
+        code = "A* f() {\n"
+               "    A* x{ nullptr };\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, 0));
+
+        code = "bool f();\n" // a modification after a conditional escape must still be seen
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) {\n"
+               "        if (f()) return;\n"
+               "        if (f()) x = true;\n"
+               "    }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 8U, 0));
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 8U, 0));
+
+        code = "bool f();\n"
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) {\n"
+               "        if (f()) return;\n"
+               "        x = true;\n"
+               "    }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 8U, 0));
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 8U, 0));
+
+        code = "bool f();\n" // the branch always escapes - keep the known value
+               "void g() {\n"
+               "    bool x = false;\n"
+               "    if (f()) { x = true; return; }\n"
+               "    if (x) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 0));
     }
 
     void valueFlowAfterSwap()
@@ -3085,7 +3269,7 @@ class TestValueFlow : public TestFixture {
                "    std::swap(a, b);\n"
                "    int x = a;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 6U, 2));
         ASSERT_EQUALS(false, testValueOfXKnown(code, 6U, 1));
 
@@ -3095,7 +3279,7 @@ class TestValueFlow : public TestFixture {
                "    std::swap(a, b);\n"
                "    int x = b;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 6U, 1));
         ASSERT_EQUALS(false, testValueOfXKnown(code, 6U, 2));
 
@@ -3127,21 +3311,21 @@ class TestValueFlow : public TestFixture {
                "    if (x == 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x != 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3149,7 +3333,7 @@ class TestValueFlow : public TestFixture {
                "    if (x < 123) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 122));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3159,7 +3343,7 @@ class TestValueFlow : public TestFixture {
                "    if (123 < x) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3167,7 +3351,7 @@ class TestValueFlow : public TestFixture {
                "    if (123 > x) {\n"
                "        a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 122));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
@@ -3175,13 +3359,13 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    if (x == 123) {}\n"
                "    else a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x != 123) {}\n"
                "    else a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         // after if
@@ -3190,7 +3374,7 @@ class TestValueFlow : public TestFixture {
                "        x++;\n"
                "    }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 10));
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 5U, 11));
 
@@ -3198,78 +3382,78 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    if (!x) { a = x; }\n"
                "    else a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(int x, int y) {\n"
                "    if (!(x&&y)) { return; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int x) {\n"
                "    if (!x) { { throw new string(); }; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "void f(int x) {\n"
                "    if (x != 123) { throw " "; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x != 123) { }\n"
                "    else { throw " "; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
         code = "void f(int x) {\n"
                "    if (x == 123) { }\n"
                "    else { throw " "; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
 
         code = "void f(int x) {\n"
                "    if (x < 123) { }\n"
                "    else { a = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x < 123) { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x < 123) { }\n"
                "    else { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 122));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) { }\n"
                "    else { a = x; }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 123));
 
         code = "void f(int x) {\n"
                "    if (x > 123) { }\n"
                "    else { throw \"\"; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
@@ -3277,7 +3461,7 @@ class TestValueFlow : public TestFixture {
                "    if (x < 123) { return; }\n"
                "    else { return; }\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
@@ -3286,7 +3470,7 @@ class TestValueFlow : public TestFixture {
                "    if (x) { a = x; }\n"  // <- x is not 0
                "    else { b = x; }\n"    // <- x is 0
                "    c = x;\n"             // <- x might be 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
         ASSERT_EQUALS(true,  testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true,  testValueOfX(code, 4U, 0));
@@ -3295,32 +3479,32 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    while (x != 3) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 3));
 
         code = "void f(int x) {\n"
                "    while (11 != (x = dostuff())) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 11));
 
         code = "void f(int x) {\n"
                "    while (11 != (x = dostuff()) && y) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 11));
 
         code = "void f(int x) {\n"
                "    while (x = dostuff()) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "void f(const Token *x) {\n" // #5866
                "    x = x->next();\n"
                "    while (x) { x = x->next(); }\n"
                "    if (x->str()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
 
         code = "void f(const Token *x) {\n"
@@ -3344,7 +3528,7 @@ class TestValueFlow : public TestFixture {
                "    a = x;\n"  // <- TODO, x can be 2
                "  else\n"
                "    b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 2));
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 2));
 
@@ -3354,7 +3538,7 @@ class TestValueFlow : public TestFixture {
                "  if (x == 7) { y = 1; }\n"
                "  if (!y)\n"
                "    a = x;\n" // <- x can not be 7 here
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 7));
 
         code = "void f(struct X *x) {\n"
@@ -3371,13 +3555,13 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "  a = (x != 3 ||\n"
                "       x);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 3));
 
         code = "void f(int x) {\n"
                "  a = (x == 4 &&\n"
                "       x);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 4));
 
         // protected usage with &&
@@ -3385,7 +3569,7 @@ class TestValueFlow : public TestFixture {
                "    if (x) {}\n"
                "    for (; x &&\n"
                "         x->str() != y; x = x->next()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -3393,7 +3577,7 @@ class TestValueFlow : public TestFixture {
                "    if (x) {}\n"
                "    if (x &&\n"
                "        x->str() != y) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -3403,7 +3587,7 @@ class TestValueFlow : public TestFixture {
                "    if (z) return; else return;\n"
                "  }\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 5));
 
         code = "void f(int x) {\n" // #6730
@@ -3411,14 +3595,14 @@ class TestValueFlow : public TestFixture {
                "    if (z) continue; else throw e;\n"
                "  }\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 5));
 
         // TODO: float
         code = "void f(float x) {\n"
                "  if (x == 0.5) {}\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         // aliased variable
@@ -3429,7 +3613,7 @@ class TestValueFlow : public TestFixture {
                "    calc(data);\n"
                "    a = x;\n"  // <- x might be changed by calc
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 0));
 
         code = "int* g();\n"
@@ -3446,15 +3630,15 @@ class TestValueFlow : public TestFixture {
         code = "void foo(const volatile int &x) {\n"
                "    if (x==1) {\n"
                "        return x;\n"
-               "    }"
-               "}";
+               "    }\n"
+               "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 1));
 
         code = "void foo(const std::atomic<int> &x) {\n"
                "    if (x==2) {\n"
                "        return x;\n"
-               "    }"
-               "}";
+               "    }\n"
+               "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 2));
 
         code = "int f(int i, int j) {\n"
@@ -3693,6 +3877,44 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
+
+        // if the guarded block calls an unknown, possibly noreturn function
+        // then the condition value is lowered to inconclusive after the block
+        code = "int f(int x) {\n"
+               "    if (x == 0)\n"
+               "        g();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXInconclusive(code, 4U, 0));
+
+        // .. also when the guard is in the else branch
+        code = "int f(int x) {\n"
+               "    if (x != 0)\n"
+               "        ;\n"
+               "    else\n"
+               "        g();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXInconclusive(code, 6U, 0));
+
+        // a declared function is assumed to return
+        code = "void g();\n"
+               "int f(int x) {\n"
+               "    if (x == 0)\n"
+               "        g();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 5U, 0));
+        ASSERT_EQUALS(false, testValueOfXInconclusive(code, 5U, 0));
+
+        // a noreturn function conclusively escapes
+        code = "int f(int x) {\n"
+               "    if (x == 0)\n"
+               "        abort();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
+        ASSERT_EQUALS(true, testValueOfXImpossible(code, 4U, 0));
     }
 
     void valueFlowAfterConditionTernary()
@@ -3751,7 +3973,7 @@ class TestValueFlow : public TestFixture {
                "        int x = p[0];\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int y) {\n"
@@ -3759,7 +3981,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+1;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int y) {\n"
@@ -3767,7 +3989,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+2;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 124));
 
         code = "void f(int y, int z) {\n"
@@ -3775,7 +3997,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+z;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
 
         code = "void f(int y, int z) {\n"
@@ -3784,7 +4006,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y+z;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 123));
 
         code = "void f(int y) {\n"
@@ -3792,7 +4014,7 @@ class TestValueFlow : public TestFixture {
                "        int x = y++;\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 124));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 125));
@@ -3847,28 +4069,28 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x, int y) {\n"
                "    if (x!=0) {}\n"
                "      return y/x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "int f(int x, int y) {\n"
                "    if (!!(x != 0)) {\n"
                "      return y/x;\n"
                "}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
 
         code = "int f(int x, int y) {\n"
                "    if (!!!(x != 0)) {\n"
                "      return y/x;\n"
                "}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "int f(int x, int y) {\n"
                "    if (!!!!(x != 0)) {\n"
                "      return y/x;\n"
                "}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 0));
     }
 
@@ -3879,7 +4101,7 @@ class TestValueFlow : public TestFixture {
                "    int x = 123;\n"
                "    x += 43;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 166));
         ASSERT_EQUALS("2,Assignment 'x=123', assigned value is 123\n"
                       "3,Compound assignment '+=', assigned value is 166\n",
@@ -3889,36 +4111,44 @@ class TestValueFlow : public TestFixture {
                "    int x = 123;\n"
                "    x /= 0;\n" // don't crash when evaluating x/=0
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
         code = "float f() {\n"
                "    float x = 123.45f;\n"
                "    x += 67;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, static_cast<double>(123.45f) + 67, 0.01));
 
         code = "double f() {\n"
                "    double x = 123.45;\n"
                "    x += 67;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 123.45 + 67, 0.01));
 
         code = "void f() {\n"
                "    int x = 123;\n"
                "    x >>= 1;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 61));
 
         code = "int f() {\n"
                "    int x = 123;\n"
                "    x <<= 1;\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 246));
+
+        code = "int64_t f() {\n"
+               "    const int64_t val = 1LL << 33;\n"
+               "    int64_t x = val;\n"
+               "    x += val;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 5U, 1LL << 34));
     }
 
     void valueFlowForwardCorrelatedVariables() {
@@ -3928,7 +4158,7 @@ class TestValueFlow : public TestFixture {
                "  bool zero(x==0);\n"
                "  if (zero) a = x;\n"  // <- x is 0
                "  else b = x;\n"  // <- x is not 0
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
@@ -3954,7 +4184,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 0;\n"
                "  if (b) x = 1;\n"
                "  else b = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 0));
 
         code = "void f(int i) {\n"
@@ -3979,7 +4209,7 @@ class TestValueFlow : public TestFixture {
                "  int x=1;\n"
                "  C c(x);\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 8U, 1));
 
         code = "class C {\n"
@@ -3990,7 +4220,7 @@ class TestValueFlow : public TestFixture {
                "  int x=1;\n"
                "  C c(x);\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 8U, 1));
 
         code = "int f(int *);\n"
@@ -3999,7 +4229,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 11;\n"
                "  c = (a && f(&x));\n"
                "  if (x == 42) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 11));
 
         code = "void f() {\n"
@@ -4022,21 +4252,21 @@ class TestValueFlow : public TestFixture {
                "  int x=5;\n"
                "  a = b ? init1(&x) : init2(&x);\n"
                "  return 1 + x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 5));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 5));
 
         code = "int f(int *p) {\n" // #9008 - gcc ternary ?:
                "  if (p) return;\n"
                "  x = *p ? : 1;\n" // <- no explicit expr0
-               "}";
+               "}\n";
         (void)testValueOfX(code, 1U, 0); // do not crash
 
         code = "void f(int a) {\n" // #8784
                "    int x = 13;\n"
                "    if (a == 1) x = 26;\n"
                "    return a == 1 ? x : 0;\n"  // <- x is 26
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 13));
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 26));
 
@@ -4047,6 +4277,15 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
         ASSERT_EQUALS(false, testValueOfXImpossible(code, 4U, 0));
+
+        code = "double f(double d, bool b) {\n" // #14734
+               "    double s = 0.0;\n"
+               "    if (b)\n"
+               "        s += d;\n"
+               "    return s > 0.0 ? s : 0.0;\n"
+               "}\n";
+        auto values = tokenValues(code, "s :", ValueFlow::Value::ValueType::FLOAT);
+        ASSERT_EQUALS(0, values.size());
     }
 
     void valueFlowForwardLambda() {
@@ -4057,7 +4296,7 @@ class TestValueFlow : public TestFixture {
                "  auto f = [&](){ a=x; }\n"  // x is not 1
                "  x = 2;\n"
                "  f();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, 2));
 
@@ -4065,7 +4304,7 @@ class TestValueFlow : public TestFixture {
                "  int x=3;\n"
                "  auto f = [&](){ a=x; }\n"  // todo: x is 3
                "  f();\n"
-               "}";
+               "}\n";
         TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, 3));
 
         code = "void f() {\n"
@@ -4074,7 +4313,7 @@ class TestValueFlow : public TestFixture {
                "  x = 1;\n"
                "  f();\n"
                "  int a = x;\n" // x is actually 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 1));
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 3));
     }
@@ -4119,21 +4358,21 @@ class TestValueFlow : public TestFixture {
         code = "int f(int a) {\n"
                "  int x = a & 0x80;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0));
         ASSERT_EQUALS(true, testValueOfX(code,3U,0x80));
 
         code = "int f(int a) {\n"
                "  int x = a & 0x80 ? 1 : 2;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code,3U,0));
         ASSERT_EQUALS(false, testValueOfX(code,3U,0x80));
 
         code = "int f() {\n"
                "  int x = (19 - 3) & 15;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0));
         ASSERT_EQUALS(false, testValueOfX(code,3U,16));
     }
@@ -4267,73 +4506,73 @@ class TestValueFlow : public TestFixture {
         code = "int f(int a) {\n"
                "  int x = (a & 0xff) >> 16;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0,&s));
 
         code = "int f(unsigned int a) {\n"
                "  int x = (a % 123) >> 16;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code,3U,0,&s));
 
         code = "int f(int y) {\n"
                "  int x = (y & 0xFFFFFFF) >> 31;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0));
 
         code = "int f(int y) {\n"
                "  int x = (y & 0xFFFFFFF) >> 32;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(short y) {\n"
                "  int x = (y & 0xFFFFFF) >> 31;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(short y) {\n"
                "  int x = (y & 0xFFFFFF) >> 32;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 63;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 64;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 63;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 64;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 121;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
 
         code = "int f(long long y) {\n"
                "  int x = (y & 0xFFFFFF) >> 128;\n"
                "  return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3u, 0,&s));
     }
 
@@ -4345,7 +4584,7 @@ class TestValueFlow : public TestFixture {
                "  struct Foo foo;\n"
                "  foo.x = 1;\n"
                "  x = 0 + foo.x;\n" // <- foo.x is 1
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+"));
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(true, values.front().isKnown());
@@ -4358,7 +4597,7 @@ class TestValueFlow : public TestFixture {
                "  int y = 10;\n"
                "  while (s.x < y)\n" // s.x does not have known value
                "    s.x++;\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, "<"));
         ASSERT_EQUALS(1, values.size());
         ASSERT(values.front().isPossible());
@@ -4370,7 +4609,7 @@ class TestValueFlow : public TestFixture {
                "  int y = 10;\n"
                "  while (s.x < y)\n" // s.x has a known value
                "    y--;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, ". x <");
         ASSERT(values.size() == 1 &&
                values.front().isKnown() &&
@@ -4383,7 +4622,7 @@ class TestValueFlow : public TestFixture {
                "  if (foo)\n"
                "    hints.x = 2;\n"
                "  x = 0 + foo.x;\n" // <- foo.x is possible 1, possible 2
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+"));
         TODO_ASSERT_EQUALS(2U, 0U, values.size()); // should be 2
 
@@ -4398,7 +4637,7 @@ class TestValueFlow : public TestFixture {
                "  }\n"
                "  if (*b > 0) {\n" // *b does not have known value
                "  }\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, ">"));
         ASSERT_EQUALS(1, values.size());
         ASSERT(values.front().isPossible());
@@ -4411,7 +4650,7 @@ class TestValueFlow : public TestFixture {
                "        if (pvd.descr_type == 0xff) {}\n"
                "        dostuff(&pvd);\n"
                "    } while (condition);\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, "=="));
         ASSERT_EQUALS(1, values.size());
         ASSERT(values.front().isPossible());
@@ -4421,7 +4660,7 @@ class TestValueFlow : public TestFixture {
         code = "struct S { int x; };\n" // #9036
                "void foo(struct S s) {\n"
                "    for (s.x = 0; s.x < 127; s.x++) {}\n"
-               "}";
+               "}\n";
         values = removeImpossible(tokenValues(code, "<"));
         values.remove_if([&](const ValueFlow::Value& v) {
             return !v.isKnown();
@@ -4436,7 +4675,7 @@ class TestValueFlow : public TestFixture {
                             "    case 14: a=x+2; break;\n"  // <- x is 14
                             "    };\n"
                             "    a = x;\n"  // <- x can be 14
-                            "}";
+                            "}\n";
         ASSERT_EQUALS(true, testConditionalValueOfX(code, 2U, 14));
         TODO_ASSERT_EQUALS(true, false, testConditionalValueOfX(code, 4U, 14));
         TODO_ASSERT_EQUALS(true, false, testConditionalValueOfX(code, 6U, 14));
@@ -4457,7 +4696,7 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x++)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 9));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 10));
@@ -4467,7 +4706,7 @@ class TestValueFlow : public TestFixture {
                "    for (x = 2; x < 1; x++)\n"
                "        a[x] = 0;\n" // <- not 2
                "    b = x;\n" // 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -4476,7 +4715,7 @@ class TestValueFlow : public TestFixture {
                "    for (x = 2; x < 1; ++x)\n"
                "        a[x] = 0;\n" // <- not 2
                "    b = x;\n" // 2
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 2));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 2));
 
@@ -4485,26 +4724,26 @@ class TestValueFlow : public TestFixture {
                "    int x;\n"
                "    for (x = 1; x < B; ++x)\n"
                "        a[x] = 0;\n" // <- not 1
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 1));
 
         code = "void f(int a) {\n"
                "    for (int x = a; x < 10; x++)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 9));
 
         code = "void f() {\n"
                "    for (int x = 0; x < 5; x += 2)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 4));
 
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x = x + 2)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 8));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 10));
@@ -4512,14 +4751,14 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x = x / 0)\n"
                "        a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0)); // don't crash
 
         code = "void f() {\n"
                "    for (int x = 0; x < 10; x++)\n"
                "        x<4 ?\n"
                "        a[x] : 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 9));
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 9));
@@ -4528,13 +4767,13 @@ class TestValueFlow : public TestFixture {
                "    for (int x = 0; x < 10; x++)\n"
                "        x==0 ?\n"
                "        0 : a[x];\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n" // #5223
                "    for (int x = 0; x < 300 && x < 18; x++)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 17));
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 299));
@@ -4543,7 +4782,7 @@ class TestValueFlow : public TestFixture {
                "    int x;\n"
                "    for (int i = 0; x = bar[i]; i++)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
@@ -4551,28 +4790,28 @@ class TestValueFlow : public TestFixture {
                "    int x;\n"
                "    for (x = 0; abc[x] != '\\0'; x++) {}\n"
                "    a[x] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 3));
 
         code = "void f() {\n" // #5939
                "    int x;\n"
                "    for (int x = 0; (x = do_something()) != 0;)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    int x;\n"
                "    for (int x = 0; x < 10 && y = do_something();)\n"
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
 
         code = "void f() {\n"
                "    int x,y;\n"
                "    for (x = 0, y = 0; x < 10, y < 10; x++, y++)\n" // usage of ,
                "        x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
 
         code = "void foo(double recoveredX) {\n"
@@ -4598,7 +4837,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "  for (int x = 0; x < 10; x++) {\n"
                "    if (x > 1\n"
-               "        && x) {}" // <- x is not 0
+               "        && x) {}\n" // <- x is not 0
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
@@ -4608,7 +4847,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "  for (int x = 0; x < 10; x++) {\n"
                "    if (x < value\n"
-               "        && x) {}" // <- maybe x is not 9
+               "        && x) {}\n" // <- maybe x is not 9
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 9));
@@ -4617,7 +4856,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "  for (int x = 0; x < 10; x++) {\n"
                "    if (x == 0\n"
-               "        || x) {}" // <- x is not 0
+               "        || x) {}\n" // <- x is not 0
                "  }\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
@@ -4653,7 +4892,7 @@ class TestValueFlow : public TestFixture {
                "    abort();\n"
                "  }\n"
                "  a = x;\n" // <- x can't be 5
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 7U, 5));
 
         code = "void f() {\n"
@@ -4662,7 +4901,7 @@ class TestValueFlow : public TestFixture {
                "  if (x < 5) {}\n"
                "  else return;\n"
                "  a = x;\n" // <- x can't be 5
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 5));
 
         // assert after for loop..
@@ -4682,7 +4921,7 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  for(int i = 0; i < 20; i++)\n"
                "    n = (int)(i < 10 || abs(negWander) < abs(negTravel));\n"
-               "}";
+               "}\n";
         (void)testValueOfX(code,0,0); // <- don't hang
 
         // crash (daca@home)
@@ -4695,7 +4934,7 @@ class TestValueFlow : public TestFixture {
                "            if (z[n] && strncmp(&z[n+i], \"-->\", 3) == 0) ;\n"
                "        }\n"
                "    }\n"
-               "}";
+               "}\n";
         (void)testValueOfX(code,0,0); // <- don't crash
 
         // conditional code in loop
@@ -4707,7 +4946,7 @@ class TestValueFlow : public TestFixture {
                "      else { a = x; }\n" // <- x is not 10
                "    }\n"
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 6U, 10));
 
         // #7886 - valueFlowForLoop must be called after valueFlowAfterAssign
@@ -4716,14 +4955,14 @@ class TestValueFlow : public TestFixture {
                "  int x,y;\n"
                "  for(x=0,y=0; x < sz && y < 10; x++)\n"
                "    a = x;\n" // <- max value is 3
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 3));
 
         code = "void f() {\n"
                "    int x;\n"
                "    for (x = 0; x < 10; x++)\n"
                "        x;\n"
-               "}";
+               "}\n";
         std::list<ValueFlow::Value> values = tokenValues(code, "x <");
         ASSERT(std::none_of(values.cbegin(), values.cend(), std::mem_fn(&ValueFlow::Value::isUninitValue)));
 
@@ -4883,6 +5122,27 @@ class TestValueFlow : public TestFixture {
         ++it;
         ASSERT_EQUALS(0, it->intvalue);
         ASSERT(it->isPossible());
+
+        code = "void g(int*);\n"
+               "void f(int* a) {\n"
+               "    for (int i = 0; i < 5; ++i) {\n"
+               "        g(&a[i]);\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "i ]");
+        ASSERT_EQUALS(4, values.size());
+        it = values.begin();
+        ASSERT_EQUALS(0, it->intvalue);
+        ASSERT(it->isPossible());
+        ++it;
+        ASSERT_EQUALS(-1, it->intvalue);
+        ASSERT(it->isImpossible());
+        ++it;
+        ASSERT_EQUALS(4, it->intvalue);
+        ASSERT(it->isPossible());
+        ++it;
+        ASSERT_EQUALS(5, it->intvalue);
+        ASSERT(it->isImpossible());
     }
 
     void valueFlowSubFunction() {
@@ -4898,7 +5158,7 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void g(){\n"
                "    f(42);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 17));
         ASSERT_EQUALS(true, testValueOfX(code, 5U, 42));
         ASSERT_EQUALS(true, testValueOfX(code, 7U, 0));
@@ -5016,7 +5276,7 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void f2() {\n"
                "    x = 10 - f1(2);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(7, valueOfTok(code, "-").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "-").isKnown());
 
@@ -5025,12 +5285,12 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void f2() {\n"
                "    x = 2 * add(10+1,4);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(30, valueOfTok(code, "*").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "*").isKnown());
 
         code = "int one() { return 1; }\n"
-               "void f() { x = 2 * one(); }";
+               "void f() { x = 2 * one(); }\n";
         ASSERT_EQUALS(2, valueOfTok(code, "*").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "*").isKnown());
 
@@ -5039,7 +5299,7 @@ class TestValueFlow : public TestFixture {
                "}\n"
                "void f2() {\n"
                "    x = 2 * add(1,add(2,3));\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(12, valueOfTok(code, "*").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "*").isKnown());
 
@@ -5048,7 +5308,7 @@ class TestValueFlow : public TestFixture {
                "        return g(std::move(x));\n"
                "    g(x);\n"
                "    return 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, ValueFlow::Value::MoveKind::MovedVariable));
 
         code = "class A\n"
@@ -5059,7 +5319,7 @@ class TestValueFlow : public TestFixture {
                "    void f2() {\n"
                "        x = 10 - f1(2);\n"
                "    }\n"
-               "};";
+               "};\n";
         ASSERT_EQUALS(7, valueOfTok(code, "-").intvalue);
         ASSERT_EQUALS(true, valueOfTok(code, "-").isKnown());
 
@@ -5071,7 +5331,7 @@ class TestValueFlow : public TestFixture {
                "    void f2() {\n"
                "        x = 10 - f1(2);\n"
                "    }\n"
-               "};";
+               "};\n";
         TODO_ASSERT_EQUALS(7, 0, valueOfTok(code, "-").intvalue);
         ASSERT_EQUALS(false, valueOfTok(code, "-").isKnown());
 
@@ -5203,8 +5463,14 @@ class TestValueFlow : public TestFixture {
 
         code = "class continuous_src_time {\n"
                "    continuous_src_time(std::complex<double> f, double st = 0.0, double et = infinity) {}\n"
-               "};";
+               "};\n";
         (void)testValueOfX(code, 2U, 2); // Don't crash (#6494)
+
+        code = "struct S {\n" // #14693
+               "    int i;\n"
+               "    explicit S(std::string&& s = {}) : i(0) {}\n"
+               "};\n";
+        ASSERT_EQUALS(false, testKnownValueOfTok(code, "{ } )", 0));
     }
 
     bool isNotKnownValues(const char code[], const char str[]) {
@@ -5218,13 +5484,13 @@ class TestValueFlow : public TestFixture {
         const char *code;
         ValueFlow::Value value;
 
-        ASSERT(valueOfTok("x = 1;", "1").isKnown());
+        ASSERT(valueOfTok("x = 1;\n", "1").isKnown());
 
         // after assignment
         code = "void f() {\n"
                "  int x = 1;\n"
                "  return x + 2;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(3, value.intvalue);
         ASSERT(value.isKnown());
@@ -5233,7 +5499,7 @@ class TestValueFlow : public TestFixture {
             code = "void f() {\n"
                    "  int x = 15;\n"
                    "  if (x == 15) { x += 7; }\n" // <- condition is true
-                   "}";
+                   "}\n";
             value = valueOfTok(code, "==");
             ASSERT_EQUALS(1, value.intvalue);
             ASSERT(value.isKnown());
@@ -5253,7 +5519,7 @@ class TestValueFlow : public TestFixture {
                "  int x;\n"
                "  if (ab) { x = 7; }\n"
                "  return x + 2;\n" // <- possible value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(9, value.intvalue);
         ASSERT(value.isPossible());
@@ -5262,7 +5528,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 0;\n"
                "  if (c) {} else { x++; }\n"
                "  return x + 2;\n" // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "+"));
 
         code = "void f() {\n"
@@ -5337,7 +5603,7 @@ class TestValueFlow : public TestFixture {
                "    a = x+2;\n"
                "    dostuff();\n"
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "+"));
 
         code = "void f() {\n"
@@ -5363,7 +5629,7 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "  }\n"
                "  if (!x) {}\n"  // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "!"));
 
         code = "void f() {\n" // #8356
@@ -5371,7 +5637,7 @@ class TestValueFlow : public TestFixture {
                "  for(int x = 3; !b && x < 10; x++) {\n" // <- b has known value
                "    for(int y = 4; !b && y < 20; y++) {}\n"
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "!");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isKnown());
@@ -5384,7 +5650,7 @@ class TestValueFlow : public TestFixture {
                "    break;\n"
                "  }\n"
                "  if (!x) {}\n"  // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "!"));
 
         code = "void f() {\n" // #7049
@@ -5395,7 +5661,7 @@ class TestValueFlow : public TestFixture {
                "  case 2:\n"
                "    if (!x) {}\n" // <- possible value
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "!"));
 
         code = "void f() {\n"
@@ -5403,7 +5669,7 @@ class TestValueFlow : public TestFixture {
                "  while (!x) {\n" // <- possible value
                "    scanf(\"%d\", &x);\n"
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "!");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isPossible());
@@ -5411,7 +5677,7 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  int x = 0;\n"
                "  do { } while (++x < 12);\n" // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, "<"));
 
         code = "void f() {\n"
@@ -5426,7 +5692,7 @@ class TestValueFlow : public TestFixture {
                "  int x = 0;\n"
                "a:\n"
                "  a = x + 1;\n" // <- possible value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isPossible());
@@ -5436,7 +5702,7 @@ class TestValueFlow : public TestFixture {
                "  if (!x) {\n"
                "    a = x+1;\n" // <- known value
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isKnown());
@@ -5445,7 +5711,7 @@ class TestValueFlow : public TestFixture {
                "  if (a && 4==x && y) {\n"
                "    a = x+12;\n" // <- known value
                "  }\n"
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(16, value.intvalue);
         ASSERT(value.isKnown());
@@ -5454,7 +5720,7 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x) {\n"
                "  if (x == 4) {}\n"
                "  return x + 1;\n" // <- possible value
-               "}";
+               "}\n";
         value = valueOfTok(code, "+");
         ASSERT_EQUALS(5, value.intvalue);
         ASSERT(value.isPossible());
@@ -5462,7 +5728,7 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x) {\n"
                "  if (x < 2) {}\n"
                "  else if (x >= 2) {}\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, ">=");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isKnown());
@@ -5470,7 +5736,7 @@ class TestValueFlow : public TestFixture {
         code = "int f(int x) {\n"
                "  if (x < 2) {}\n"
                "  else if (x > 2) {}\n" // <- possible value
-               "}";
+               "}\n";
         ASSERT(isNotKnownValues(code, ">"));
 
         // known and possible value
@@ -5478,22 +5744,22 @@ class TestValueFlow : public TestFixture {
                "    int x = 1;\n"
                "    int y = 2 + x;\n" // <- known value, don't care about condition
                "    if (x == 2) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true,  testValueOfX(code, 3U, 1)); // value of x can be 1
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 2)); // value of x can't be 2
 
         code = "bool f() {\n"
                "  const int s( 4 );"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
 
         code = "bool f() {\n"
-               "  const int s{ 4 };"
+               "  const int s{ 4 };\n"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5501,7 +5767,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int( 4 );"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5509,7 +5775,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int{ 4 };"
                "  return s == 4;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT(value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5517,7 +5783,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int{};"
                "  return s == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5525,7 +5791,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s = int();"
                "  return s == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5533,7 +5799,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  const int s{};"
                "  return s == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5541,7 +5807,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p{};\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5549,7 +5815,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p{ nullptr };\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5557,7 +5823,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p{ 0 };\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5565,7 +5831,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p = {};\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5573,7 +5839,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int i = {};\n"
                "  return i == 0;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5581,7 +5847,7 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int* p = { 0 };\n"
                "  return p == nullptr;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
@@ -5589,20 +5855,20 @@ class TestValueFlow : public TestFixture {
         code = "bool f() {\n"
                "  int i = { 1 };\n"
                "  return i == 1;\n" // <- known value
-               "}";
+               "}\n";
         value = valueOfTok(code, "==");
         ASSERT_EQUALS(true, value.isKnown());
         ASSERT_EQUALS(1, value.intvalue);
 
         // calculation with known result
-        code = "int f(int x) { a = x & 0; }"; // <- & is 0
+        code = "int f(int x) { a = x & 0; }\n"; // <- & is 0
         value = valueOfTok(code, "&");
         ASSERT_EQUALS(0, value.intvalue);
         ASSERT(value.isKnown());
 
         // template parameters are not known
         code = "template <int X> void f() { a = X; }\n"
-               "f<1>();";
+               "f<1>();\n";
         value = valueOfTok(code, "1");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT_EQUALS(false, value.isKnown());
@@ -5613,10 +5879,25 @@ class TestValueFlow : public TestFixture {
         value = valueOfTok(code, ", 1");
         ASSERT_EQUALS(0, value.intvalue);
         ASSERT_EQUALS(false, value.isKnown());
+
+        // #13959
+        const Settings settingsC23 = settingsBuilder(settings).c(Standards::C23).build();
+        code = "void f(int* p) {\n"
+               "    if (p == nullptr)\n"
+               "        return;\n"
+               "    if (p) {}\n"
+               "}\n";
+        value = valueOfTok(code, "p ) { }", &settingsC23, /*cpp*/ false);
+        ASSERT_EQUALS(1, value.intvalue);
+        ASSERT_EQUALS(true, value.isKnown());
+
+        const Settings settingsC17 = settingsBuilder(settings).c(Standards::C17).build();
+        value = valueOfTok(code, "p ) { }", &settingsC17, /*cpp*/ false);
+        ASSERT(value == ValueFlow::Value());
     }
 
     void valueFlowSizeofForwardDeclaredEnum() {
-        const char *code = "enum E; sz=sizeof(E);";
+        const char *code = "enum E; sz=sizeof(E);\n";
         (void)valueOfTok(code, "="); // Don't crash (#7775)
     }
 
@@ -5627,14 +5908,14 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"
                "    x = 4;\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 4));
 
         code = "int x;\n"
                "void f() {\n"
                "    if (x == 4) {}\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 4));
 
         code = "int x;\n"
@@ -5642,7 +5923,7 @@ class TestValueFlow : public TestFixture {
                "    x = 42;\n"
                "    unknownFunction();\n"
                "    a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 42));
     }
 
@@ -5652,7 +5933,7 @@ class TestValueFlow : public TestFixture {
         code = "const int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 321));
 
         code = "void f(const int x = 1) {\n"
@@ -5675,41 +5956,41 @@ class TestValueFlow : public TestFixture {
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { x=a; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { p = &x; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { x++; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 321;\n"
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { foo(x); }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 321));
 
         code = "static int x = 1;\n" // compound assignment
                "void f() {\n"
                "  a = x;\n"
-               "}"
+               "}\n"
                "void other() { x += b; }\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
     }
@@ -5719,7 +6000,7 @@ class TestValueFlow : public TestFixture {
                            "    int x = 42;\n"
                            "    asm(\"\");\n"
                            "    a = x;\n"
-                           "}";
+                           "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 42));
     }
 
@@ -5749,6 +6030,36 @@ class TestValueFlow : public TestFixture {
                "    bool b = x;\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
+
+        code = "int f(int a) {\n"
+               "    int x = a ^ a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "int f(int a) {\n"
+               "    int x = a /= a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
+
+        code = "int f(int a) {\n"
+               "    int x = a -= a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "int f(int a) {\n"
+               "    int x = a %= a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "int f(int a) {\n"
+               "    int x = a ^= a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
     }
 
     void valueFlowUninit() {
@@ -5758,21 +6069,21 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int x;\n"
                "    switch (x) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x )");
         ASSERT_EQUALS(true, values.size()==1U && values.front().isUninitValue());
 
         code = "void f() {\n"
                "    const C *c;\n"
                "    if (c->x() == 4) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "c .");
         ASSERT_EQUALS(true, values.size()==1U && values.front().isUninitValue());
 
         code = "void f() {\n"
                "    C *c;\n"
                "    if (c->x() == 4) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "c .");
         ASSERT_EQUALS(true, values.size()==1U && values.front().isUninitValue());
 
@@ -5780,7 +6091,7 @@ class TestValueFlow : public TestFixture {
                "    int **x;\n"
                "    y += 10;\n"
                "    x = dostuff(sizeof(*x)*y);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(0U, tokenValues(code, "x )").size());
 
         // initialization
@@ -5788,7 +6099,7 @@ class TestValueFlow : public TestFixture {
                "  int x;\n"
                "  *((int *)(&x)) = 12;\n"
                "  a = x + 1;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x +");
         ASSERT_EQUALS(true, values.empty());
         // ASSERT_EQUALS(1U, values.size());
@@ -5811,7 +6122,7 @@ class TestValueFlow : public TestFixture {
         code = "void foo() {\n"
                "    int x;\n"
                "    f(x=3), return x+3;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x +");
         ASSERT_EQUALS(true, values.empty());
         // ASSERT_EQUALS(1U, values.size());
@@ -5824,15 +6135,15 @@ class TestValueFlow : public TestFixture {
                "  if (is >> x) {\n"
                "    a = x;\n"
                "  }\n"
-               "}";
-        values = tokenValues(code, "x ; }");
+               "}\n";
+        values = tokenValues(code, "x ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         // return (#8173)
         code = "int repeat() {\n"
                "  const char *n;\n"
                "  return((n=42) && *n == 'A');\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "n ==");
         values.remove_if(&isNotUninitValue);
         ASSERT_EQUALS(true, values.empty());
@@ -5846,7 +6157,7 @@ class TestValueFlow : public TestFixture {
                "  else\n"
                "    x = 1;\n"
                "  if (x>1) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 8U, 1));
 
         // #8348 - noreturn else
@@ -5866,8 +6177,8 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "    int x;\n"
                "    a & x;\n"
-               "}";
-        values = tokenValues(code, "x ; }");
+               "}\n";
+        values = tokenValues(code, "x ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5878,7 +6189,7 @@ class TestValueFlow : public TestFixture {
                "    goto;\n"
                "  c++;\n"
                "}\n";
-        values = tokenValues(code, "c ++ ; }");
+        values = tokenValues(code, "c ++ ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5889,7 +6200,7 @@ class TestValueFlow : public TestFixture {
                "    return;\n"
                "  c++;\n"
                "}\n";
-        values = tokenValues(code, "c ++ ; }");
+        values = tokenValues(code, "c ++ ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5900,7 +6211,7 @@ class TestValueFlow : public TestFixture {
                "    exit();\n"
                "  c++;\n"
                "}\n";
-        values = tokenValues(code, "c ++ ; }");
+        values = tokenValues(code, "c ++ ; }\n");
         ASSERT_EQUALS(true, values.empty());
 
         code = "void b(bool d, bool e) {\n"
@@ -5912,9 +6223,9 @@ class TestValueFlow : public TestFixture {
                "  c++;\n"
                "}\n";
         values = tokenValues(code, "c ++ ; }");
-        TODO_ASSERT_EQUALS(true, false, values.size() == 2);
-        // ASSERT_EQUALS(true, values.front().isUninitValue() || values.back().isUninitValue());
-        // ASSERT_EQUALS(true, values.front().isPossible() || values.back().isPossible());
+        ASSERT_EQUALS(true, values.size() == 2);
+        ASSERT_EQUALS(true, values.front().isUninitValue() || values.back().isUninitValue());
+        ASSERT_EQUALS(true, values.front().isPossible() || values.back().isPossible());
         // ASSERT_EQUALS(true, values.front().intvalue == 0 || values.back().intvalue == 0);
 
         code = "void b(bool d, bool e) {\n"
@@ -5935,7 +6246,7 @@ class TestValueFlow : public TestFixture {
                "  int szHdr;\n"
                "  idx = (A<0x80) ? (szHdr = 0) : dostuff(A, (int *)&(szHdr));\n"
                "  d = szHdr;\n" // szHdr can be 0.
-               "}";
+               "}\n";
         values = tokenValues(code, "szHdr ; }");
         TODO_ASSERT_EQUALS(1, 0, values.size());
         if (values.size() == 1) {
@@ -5946,7 +6257,7 @@ class TestValueFlow : public TestFixture {
                "  int szHdr;\n"
                "  idx = ((aKey<0x80) ? ((szHdr)=aKey), 1 : sqlite3GetVarint32(&(szHdr)));\n"
                "  d = szHdr;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "szHdr ; }");
         ASSERT_EQUALS(0, values.size());
 
@@ -5957,7 +6268,7 @@ class TestValueFlow : public TestFixture {
                "    MyStruct x;\n"
                "    fread(((char *)&x) + 0, sizeof(x), f);\n"
                "    if (x.value < 432) {}\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x . value");
         ASSERT_EQUALS(0, values.size());
 
@@ -6031,7 +6342,7 @@ class TestValueFlow : public TestFixture {
                "    int n;\n"
                "    for (int i = 0; i < 4; i = n)\n" // <- n is initialized in the loop body
                "        n = 10;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "n )", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(0, values.size());
 
@@ -6053,7 +6364,7 @@ class TestValueFlow : public TestFixture {
                "  int x;\n"
                "  if (false || init(&x)) {}\n"
                "  int b = x+1;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x + 1", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(0, values.size());
 
@@ -6137,7 +6448,7 @@ class TestValueFlow : public TestFixture {
                "    size_t bytesCopied;\n"
                "    bool copied_all = true;\n"
                "    g(&copied_all, &bytesCopied);\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "buflen >=", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(1, values.size());
 
@@ -6156,6 +6467,14 @@ class TestValueFlow : public TestFixture {
                "}\n";
         values = tokenValues(code, "x > 5", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(0, values.size());
+
+        code = "void f() {\n" // #11152
+               "  char b[10];\n"
+               "  sprintf(b, \"abc\");\n"
+               "  printf(\"%s\", b);\n"
+               "}\n";
+        values = tokenValues(code, "b )", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(0, values.size());
     }
 
     void valueFlowConditionExpressions() {
@@ -6294,7 +6613,7 @@ class TestValueFlow : public TestFixture {
                "\n"
                "    this->FileIndex = 1 ;\n"
                "    if ( this->FileIndex < 0 ) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, valueOfTok(code, "<").intvalue == 1);
 
         code = "int f(int p) {\n"
@@ -6395,6 +6714,11 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 0));
+
+        code = "void f() {\n"
+               "    if (int* x = {}) {}\n"
+               "}\n";
+        ASSERT_EQUALS(true, testKnownValueOfTok(code, "=", 0));
     }
 
     static std::string isPossibleContainerSizeValue(std::list<ValueFlow::Value> values,
@@ -6474,33 +6798,33 @@ class TestValueFlow : public TestFixture {
         code = "void f(const std::list<int> &ints) {\n"
                "  if (!static_cast<bool>(ints.empty()))\n"
                "    ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         // valueFlowContainerReverse
         code = "void f(const std::list<int> &ints) {\n"
                "  ints.front();\n" // <- container can be empty
                "  if (ints.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  ints.front();\n" // <- container can be empty
                "  if (ints.size()==0) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(std::list<int> ints) {\n"
                "  ints.front();\n" // <- no container size
                "  ints.pop_back();\n"
                "  if (ints.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 1));
 
         code = "void f(std::vector<int> v) {\n"
                "  v[10] = 0;\n" // <- container size can be 10
                "  if (v.size() == 10) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "v ["), 10));
 
         code = "void f(std::vector<std::string> params) {\n"
@@ -6513,7 +6837,7 @@ class TestValueFlow : public TestFixture {
                "    if (params.size() < 2) { }\n" // <- condition
                "    break;\n"
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "params [ 2 ]").empty());
 
         // valueFlowAfterCondition
@@ -6549,40 +6873,40 @@ class TestValueFlow : public TestFixture {
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) {}\n"
                "  ints.front();\n" // <- container can be empty
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) { continue; }\n"
                "  ints.front();\n" // <- no container size
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) { ints.push_back(0); }\n"
                "  ints.front();\n" // <- container is not empty
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "ints . front").empty());
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.empty()) {\n"
                "    ints.front();\n" // <- container is empty
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.size() == 3) {\n"
                "    ints.front();\n" // <- container size is 3
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 3));
 
         code = "void f(const std::list<int> &ints) {\n"
                "  if (ints.size() <= 3) {\n"
                "    ints.front();\n" // <- container size is 3
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 4, false));
 
@@ -6590,7 +6914,7 @@ class TestValueFlow : public TestFixture {
                "  if (ints.size() >= 3) {\n"
                "    ints.front();\n" // <- container size is 3
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 2, false));
 
@@ -6598,7 +6922,7 @@ class TestValueFlow : public TestFixture {
                "  if (ints.size() < 3) {\n"
                "    ints.front();\n" // <- container size is 2
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 2, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
 
@@ -6606,7 +6930,7 @@ class TestValueFlow : public TestFixture {
                "  if (ints.size() > 3) {\n"
                "    ints.front();\n" // <- container size is 4
                "  }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "ints . front"), 4, false));
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints . front"), 3, false));
 
@@ -6614,103 +6938,103 @@ class TestValueFlow : public TestFixture {
                "  if (ints.empty() == false) {\n"
                "    ints.front();\n" // <- container is not empty
                "  }\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "ints . front").empty());
 
         code = "void f(const std::vector<int> &v) {\n"
                "  if (v.empty()) {}\n"
                "  if (!v.empty() && v[10]==0) {}\n" // <- no container size for 'v[10]'
-               "}";
+               "}\n";
         ASSERT(removeImpossible(tokenValues(code, "v [")).empty());
 
         code = "void f() {\n"
                "  std::list<int> ints;\n"  // No value => ints is empty
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 0));
 
         code = "void f() {\n"
                "  std::array<int,10> ints;\n" // Array size is 10
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("values.size():2", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 10)); // uninit value
 
         code = "void f() {\n"
                "  std::string s;\n"
                "  cin >> s;\n"
                "  s[0];\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "s [").empty());
 
         code = "void f() {\n"
                "  std::string s = \"abc\";\n" // size of s is 3
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s . size"), 3));
 
         code = "void f(const char* p) {\n"
                "  if (p == nullptr) return;\n"
                "  std::string s { p };\n" // size of s is unknown
                "  s.front();\n"
-               "}";
+               "}\n";
         ASSERT(removeSymbolicTok(tokenValues(code, "s . front")).empty());
 
         code = "void f() {\n"
                "  std::string s = { 'a', 'b', 'c' };\n" // size of s is 3
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s . size"), 3));
 
         code = "void f() {\n"
                "  std::string s=\"abc\";\n" // size of s is 3
                "  s += unknown;\n"
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "s . size").empty());
 
         code = "void f() {\n"
                "  std::string s=\"abc\";\n" // size of s is 3
                "  s += \"def\";\n" // size of s => 6
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s . size"), 6));
 
         code = "void f(std::string s) {\n"
                "    if (s == \"hello\")\n"
                "        s[40] = c;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "s ["), 5));
 
         code = "void f(std::string s) {\n"
                "    s[40] = c;\n"
                "    if (s == \"hello\") {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "s ["), 5));
 
         code = "void f(std::string s) {\n"
                "    if (s != \"hello\") {}\n"
                "    s[40] = c;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "s ["), 5));
 
         code = "void f(std::string s) {\n"
                "    if (s != \"hello\")\n"
                "        s[40] = c;\n"
-               "}";
+               "}\n";
         ASSERT(!isImpossibleContainerSizeValue(tokenValues(code, "s ["), 5).empty());
 
         code = "void f() {\n"
                "    static std::string s;\n"
                "    if (s.size() == 0)\n"
                "        s = x;\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "s . size").empty());
 
         code = "void f() {\n"
                "    const uint8_t data[] = { 1, 2, 3 };\n"
                "    std::vector<uint8_t> v{ data, data + sizeof(data) };\n"
                "    v.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "v . size"), 3, false));
 
         // valueFlowContainerForward, loop
@@ -6718,7 +7042,7 @@ class TestValueFlow : public TestFixture {
                "    std::stack<Token *> links;\n"
                "    while (!links.empty() || indentlevel)\n"
                "        links.push(tok);\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "links . empty"), 0));
 
         // valueFlowContainerForward, function call
@@ -6726,14 +7050,14 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  f(x);\n"
                "  x.front();\n" // <- unknown container size
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void f() {\n" // #8689
                "  std::list<int> x;\n"
                "  f<ns::a>(x);\n"
                "  x.front();\n" // <- unknown container size
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>&);\n"
@@ -6741,7 +7065,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>*);\n"
@@ -6749,7 +7073,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>* const);\n" // #9434
@@ -6757,7 +7081,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(const std::list<int>&);\n"
@@ -6765,7 +7089,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>);\n"
@@ -6773,7 +7097,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(int&);\n"
@@ -6781,7 +7105,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x[0]);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(int&);\n"
@@ -6789,7 +7113,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x.back());\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>&) {}\n"
@@ -6797,7 +7121,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>& y) { y.push_back(1); }\n"
@@ -6805,7 +7129,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void g(std::list<int>*) {}\n"
@@ -6813,7 +7137,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void g(std::list<int>* y) { y->push_back(1); }\n"
@@ -6821,7 +7145,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(&x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void h(std::list<int>&);\n"
@@ -6830,7 +7154,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void h(const std::list<int>&);\n"
@@ -6839,7 +7163,7 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "x . front"), 0));
 
         code = "void h(const std::list<int>&);\n"
@@ -6848,14 +7172,14 @@ class TestValueFlow : public TestFixture {
                "  std::list<int> x;\n"
                "  g(x);\n"
                "  x.front();\n"
-               "}";
+               "}\n";
         ASSERT(tokenValues(code, "x . front").empty());
 
         code = "void f(std::vector<int> ints) {\n" // #8697
                "  if (ints.empty())\n"
                "    abort() << 123;\n"
                "  ints[0] = 0;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "ints ["), 0));
 
         code = "struct A {\n"  // forward, nested function call, #9424
@@ -6871,7 +7195,7 @@ class TestValueFlow : public TestFixture {
                "    std::vector<unsigned char> v;\n"
                "    ptr->getMessage (&v);\n"
                "    if (v.size () > 0) {}\n" // <- v has unknown size!
-               "}";
+               "}\n";
         ASSERT_EQUALS(0U, tokenValues(code, "v . size ( )").size());
 
         // if
@@ -6890,46 +7214,46 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  std::string s = \"abcd\";\n"
                "  s.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(4, tokenValues(code, "( ) ;").front().intvalue);
 
         code = "void f() {\n"
                "  std::string s;\n"
                "  s.empty();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(1, tokenValues(code, "( ) ;").front().intvalue);
 
         // Calculations
         code = "void f() {\n"
                "  std::string s = \"abcd\";\n"
                "  x = s + s;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "+"), 8));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.clear();\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.resize(3);\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.resize(3);\n"
                "  ints.push_back(3);\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 4));
 
         code = "void f(const std::vector<int> &ints) {\n"
                "  ints.resize(3);\n"
                "  ints.pop_back();\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 2));
 
         code = "int f(bool b) {\n"
@@ -6958,21 +7282,21 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  std::vector<int> ints{};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
         code = "void f() {\n"
                "  std::vector<int> ints{};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
         code = "void f() {\n"
                "  std::vector<int> ints{1};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 1));
 
@@ -6980,14 +7304,14 @@ class TestValueFlow : public TestFixture {
                "  std::vector<int> ints{1};\n"
                "  std::vector<int> ints2{ints.begin(), ints.end()};\n"
                "  ints2.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(
             "", isKnownContainerSizeValue(tokenValues(code, "ints2 . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 1));
 
         code = "void f() {\n"
                "  std::vector<int> ints = {};\n"
                "  ints.front();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("",
                       isKnownContainerSizeValue(tokenValues(code, "ints . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
 
@@ -7131,6 +7455,15 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, tokenValues(code, "a . size", ValueFlow::Value::ValueType::CONTAINER_SIZE).empty());
 
+        code = "void f() {\n" // #14060
+               "    std::stack<std::pair<int, int>> s;\n"
+               "    s.emplace(0, 0);\n"
+               "    s.pop();\n"
+               "    bool x = s.empty();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 6U, 1));
+
         code = "std::vector<int> g();\n"
                "std::vector<int> f() {\n"
                "    std::vector<int> v = g();\n"
@@ -7143,7 +7476,7 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(
             true,
-            removeImpossible(tokenValues(code, "v [ 0 ] != 0 ) { }", ValueFlow::Value::ValueType::CONTAINER_SIZE)).empty());
+            removeImpossible(tokenValues(code, "v [ 0 ] != 0 ) { }\n", ValueFlow::Value::ValueType::CONTAINER_SIZE)).empty());
 
         code = "std::vector<int> f() {\n"
                "    std::vector<int> v;\n"
@@ -7157,13 +7490,13 @@ class TestValueFlow : public TestFixture {
         code = "void f() {\n"
                "  std::vector<int> v(3);\n"
                "  v.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "v . size"), 3));
 
         code = "void f() {\n"
                "  std::vector<int> v({ 1, 2, 3 });\n"
                "  v.size();\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "v . size"), 3));
 
         code = "int f() {\n"
@@ -7204,16 +7537,16 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 0));
 
-        code = "std::vector<int> f() { return std::vector<int>(); }";
+        code = "std::vector<int> f() { return std::vector<int>(); }\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "( ) ;"), 0));
 
-        code = "std::vector<int> f() { return std::vector<int>{}; }";
+        code = "std::vector<int> f() { return std::vector<int>{}; }\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "{ } ;"), 0));
 
-        code = "std::vector<int> f() { return {}; }";
+        code = "std::vector<int> f() { return {}; }\n";
         ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "{ } ;"), 0));
 
-        code = "int f() { auto a = std::array<int, 2>{}; return a[1]; }";
+        code = "int f() { auto a = std::array<int, 2>{}; return a[1]; }\n";
         ASSERT_EQUALS("values.size():0", isKnownContainerSizeValue(tokenValues(code, "a ["), 0));
 
         code = "void g(std::vector<int>* w) {\n"
@@ -7282,44 +7615,44 @@ class TestValueFlow : public TestFixture {
         code = "void f(const std::string& a) {\n" // #12994
                "    std::string b = a + \"123\";\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 2));
 
         code = "void f(const std::string& a) {\n"
                "    std::string b = \"123\" + a;\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 2));
 
         code = "void f(const std::string& a, const std::string& b) {\n"
                "    std::string c = a + b + \"123\";\n"
                "    if (c.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "c ."), 2));
 
         code = "void f(const std::string& a) {\n"
                "    std::string b = a + \"123\" + \"456\";\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 5));
 
         code = "void f(const std::string& a) {\n"
                "    std::string b = \"123\" + a + \"456\";\n"
                "    if (b.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "b ."), 5));
 
         code = "void f(const std::string& a, const std::string& b) {\n"
                "    std::string c = \"123\" + a + b;\n"
                "    if (c.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isImpossibleContainerSizeValue(tokenValues(code, "c ."), 2));
 
         code = "void f(const std::string& a) {\n"
                "    std::string s;\n"
                "    s.append(a);\n"
                "    if (s.empty()) {}\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "s . empty"), 0));
 
         code = "int f(const std::string& str) {\n"
@@ -7327,20 +7660,187 @@ class TestValueFlow : public TestFixture {
                "    std::vector<std::string> v{ std::istream_iterator<std::string>(iss), {} };\n"
                "    auto x = v.size();\n"
                "    return x;\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 5U, 2));
 
         code = "auto f() {\n" // #13450
                "    auto v = std::vector<std::vector<S*>>(3, std::vector<S*>());\n"
                "    return v[2];\n"
-               "}";
+               "}\n";
         ASSERT(isKnownContainerSizeValue(tokenValues(code, "v ["), 3).empty());
 
         code = "auto f() {\n" // #13654
                "    std::array<uint8_t, 6 * sizeof(uint16_t)> a{};\n"
                "    return a[0];\n"
-               "}";
+               "}\n";
         ASSERT(!isKnownContainerSizeValue(tokenValues(code, "a ["), 6).empty());
+
+        code = "void f(const char a[]) {\n" // #14518
+               "    std::string s(a);\n"
+               "    if (s.empty()) {}\n"
+               "}\n";
+        ASSERT(!isKnownContainerSizeValue(tokenValues(code, "s ."), 0).empty());
+
+        code = "void g(std::map<int, int>* p) {\n" // #14721
+               "    (*p)[1] = 2;\n"
+               "}\n"
+               "void f() {\n"
+               "    std::map<int, int> m;\n"
+               "    g(&m);\n"
+               "    if (m.empty()) {}\n"
+               "}\n";
+        ASSERT(!isKnownContainerSizeValue(tokenValues(code, "m ."), 0).empty());
+
+        // the pointer returned by data() carries the container size
+        code = "int f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    int* p = v.data();\n"
+               "    return p[1];\n"
+               "}\n";
+        ASSERT_EQUALS("",
+                      isKnownContainerSizeValue(tokenValues(code, "p [", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+
+        // ..which is invalidated when the container size changes
+        code = "int f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    int* p = v.data();\n"
+               "    v.push_back(1);\n"
+               "    return p[1];\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "p [", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+
+        // the buffer of c_str() includes the null terminator
+        code = "const char* f() {\n"
+               "    std::string s = \"abc\";\n"
+               "    const char* p = s.c_str();\n"
+               "    return p + 3;\n"
+               "}\n";
+        ASSERT_EQUALS("",
+                      isKnownContainerSizeValue(tokenValues(code, "p +", ValueFlow::Value::ValueType::CONTAINER_SIZE), 4));
+
+        code = "const char* f() {\n"
+               "    std::string s = \"abc\";\n"
+               "    return s.c_str();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) ;", ValueFlow::Value::ValueType::CONTAINER_SIZE), 4));
+
+        // the size value of a data() pointer records the container the size belongs to
+        code = "int* f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    return v.data();\n"
+               "}\n";
+        ASSERT_EQUALS("",
+                      isKnownContainerSizeValue(tokenValues(code, "( ) ;", ValueFlow::Value::ValueType::CONTAINER_SIZE),
+                                                3));
+        ASSERT_EQUALS("v", containerOfSizeValue(code, "( ) ;"));
+
+        // an empty associative container implies that its default-inserted elements are empty as well
+        code = "void f(const std::string& k) {\n"
+               "    std::map<std::string, std::vector<int>> m;\n"
+               "    m[k].front();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "[ k ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE),
+                                      0));
+        ASSERT_EQUALS("m[k]", containerOfSizeValue(code, "[ k ] . front"));
+
+        // ..also for nested associative containers..
+        code = "void f(int a, int b) {\n"
+               "    std::map<int, std::map<int, std::vector<int>>> m;\n"
+               "    m[a][b].front();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "[ b ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE), 0));
+
+        // ..but not for non-associative containers..
+        code = "void f(int i) {\n"
+               "    std::vector<std::vector<int>> v;\n"
+               "    v[i].front();\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "[ i ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+
+        // ..nor when the container is not empty..
+        code = "void f(std::map<std::string, std::vector<int>>& m, const std::string& k) {\n"
+               "    if (m.size() == 1)\n"
+               "        m[k].front();\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "[ k ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+
+        // ..nor when the container was modified
+        code = "void f(const std::string& k) {\n"
+               "    std::map<std::string, std::vector<int>> m;\n"
+               "    m[\"a\"].push_back(1);\n"
+               "    m[k].front();\n"
+               "}\n";
+        ASSERT_EQUALS(0U, tokenValues(code, "[ k ] . front", ValueFlow::Value::ValueType::CONTAINER_SIZE).size());
+    }
+
+    void valueFlowContainerSizeIterator() {
+        const char* code;
+
+        // valueFlowForwardConst: the container size is added to iterators of a const container
+        code = "void f() {\n"
+               "    const std::vector<int> v{1, 2, 3};\n"
+               "    auto it = v.begin();\n"
+               "    if (it != v.end()) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+
+        // ..also to iterators created in place
+        code = "void f() {\n"
+               "    const std::deque<int> d{1, 2, 3, 4, 5, 6};\n"
+               "    if (std::equal(d.cbegin(), d.cend(), d.cbegin())) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) ,", ValueFlow::Value::ValueType::CONTAINER_SIZE), 6));
+
+        // ..and to iterators of containers with a static size
+        code = "void f() {\n"
+               "    std::array<int, 5> a;\n"
+               "    auto it = a.begin();\n"
+               "    if (it != a.end()) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 5));
+
+        // the size of another container is not added to the iterator
+        code = "void f(std::vector<int>& w) {\n"
+               "    const std::vector<int> v{1, 2, 3};\n"
+               "    auto it = w.begin();\n"
+               "    if (it != w.end()) {}\n"
+               "}\n";
+        ASSERT(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE).empty());
+
+        // iterators created from the container carry the container size
+        code = "bool f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    return v.begin() != v.end();\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "( ) ;", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+
+        // the size value records the container it belongs to
+        code = "void f() {\n"
+               "    std::vector<int> v(3);\n"
+               "    auto it = v.begin();\n"
+               "    if (it != v.end()) {}\n"
+               "}\n";
+        ASSERT_EQUALS(
+            "",
+            isKnownContainerSizeValue(tokenValues(code, "it !=", ValueFlow::Value::ValueType::CONTAINER_SIZE), 3));
+        ASSERT_EQUALS("v", containerOfSizeValue(code, "it !="));
     }
 
     void valueFlowContainerElement()
@@ -7372,43 +7872,84 @@ class TestValueFlow : public TestFixture {
     void valueFlowDynamicBufferSize() {
         const char *code;
 
-        const Settings settingsOld = settings; // TODO: get rid of this
-        settings = settingsBuilder(settings).library("posix.cfg").library("bsd.cfg").build();
+        const Settings settingsCfg = settingsBuilder(settings).library("posix.cfg").library("bsd.cfg").build();
 
         code = "void* f() {\n"
                "  void* x = malloc(10);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 3U, 10,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 10, ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  void* x = calloc(4, 5);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 3U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  const char* y = \"abcd\";\n"
                "  const char* x = strdup(y);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 5,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 5,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  void* y = malloc(10);\n"
                "  void* x = realloc(y, 20);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 20,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
         code = "void* f() {\n"
                "  void* y = calloc(10, 4);\n"
                "  void* x = reallocarray(y, 20, 5);\n"
                "  return x;\n"
-               "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 100,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 100,  ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
+
+        code = "struct A {};\n" // #14305
+               "void* f() {\n"
+               "  A* x = new A();\n"
+               "  return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 1, ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
+
+        code = "struct A {};\n"
+               "void* f() {\n"
+               "  void* x = new A;\n"
+               "  return x;\n"
+               "}\n";
+        {
+            auto values = tokenValues(code, "x ; }", &settingsCfg);
+            ASSERT_EQUALS(1, values.size());
+            ASSERT(values.front().isSymbolicValue());
+            // TODO: add BUFFER_SIZE value = 1
+        }
+
+        code = "struct B { int32_t i; };\n"
+               "void* f() {\n"
+               "  B* x = new B();\n"
+               "  return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 4, ValueFlow::Value::ValueType::BUFFER_SIZE, &settingsCfg));
 
-        settings = settingsOld;
+        code = "void f()\n"
+               "{\n"
+               "    void *x = ::operator new(0);\n"
+               "    (void) x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 0, ValueFlow::Value::ValueType::BUFFER_SIZE));
+
+        code = "void f(int *x)\n"
+               "{\n"
+               "	*x = 1;\n"
+               "}\n"
+               "void g(void)\n"
+               "{\n"
+               "	int *ptr = malloc(1234);\n"
+               "	f(ptr);\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 1234, ValueFlow::Value::ValueType::BUFFER_SIZE));
     }
 
     void valueFlowSafeFunctionParameterValues() {
@@ -7419,7 +7960,7 @@ class TestValueFlow : public TestFixture {
 
         code = "short f(short x) {\n"
                "  return x + 0;\n"
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+", &s));
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(-0x8000, values.front().intvalue);
@@ -7427,7 +7968,7 @@ class TestValueFlow : public TestFixture {
 
         code = "short f(std::string x) {\n"
                "  return x[10];\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x [", &s);
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
@@ -7435,7 +7976,7 @@ class TestValueFlow : public TestFixture {
 
         code = "int f(float x) {\n"
                "  return x;\n"
-               "}";
+               "}\n";
         values = tokenValues(code, "x ;", &s);
         ASSERT_EQUALS(2, values.size());
         ASSERT(values.front().floatValue < -1E20);
@@ -7443,7 +7984,7 @@ class TestValueFlow : public TestFixture {
 
         code = "short f(__cppcheck_low__(0) __cppcheck_high__(100) short x) {\n"
                "  return x + 0;\n"
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+", &s));
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(0, values.front().intvalue);
@@ -7451,7 +7992,7 @@ class TestValueFlow : public TestFixture {
 
         code = "unsigned short f(unsigned short x) [[expects: x <= 100]] {\n"
                "  return x + 0;\n"
-               "}";
+               "}\n";
         values = removeSymbolicTok(tokenValues(code, "+", &s));
         values.remove_if([](const ValueFlow::Value& v) {
             return v.isImpossible();
@@ -7476,7 +8017,7 @@ class TestValueFlow : public TestFixture {
         /*const*/ Settings s = settingsBuilder().library("std.cfg").build();
         s.checkUnknownFunctionReturn.insert("rand");
 
-        code = "x = rand();";
+        code = "x = rand();\n";
         values = tokenValues(code, "(", &s);
         ASSERT_EQUALS(2, values.size());
         ASSERT_EQUALS(INT_MIN, values.front().intvalue);
@@ -7485,10 +8026,9 @@ class TestValueFlow : public TestFixture {
 
     void valueFlowUnknownFunctionReturnMalloc() { // #4626
         const char *code;
-        const Settings s = settingsBuilder().library("std.cfg").build();
 
-        code = "ptr = malloc(10);";
-        const auto& values = tokenValues(code, "(", &s);
+        code = "ptr = malloc(10);\n";
+        const auto& values = tokenValues(code, "(");
         ASSERT_EQUALS(1, values.size());
         ASSERT_EQUALS(true, values.front().isIntValue());
         ASSERT_EQUALS(true, values.front().isPossible());
@@ -7690,7 +8230,7 @@ class TestValueFlow : public TestFixture {
                "  std::tuple<float, float, float, float> t4(5.2f, 3.1f, 2.4f, 9.1f), t5(4, 6, 9, 27);\n"
                "  t4 = t5;\n"
                "  ASSERT(!(t4 < t5) && t4 <= t5);\n"
-               "}";
+               "}\n";
         (void)valueOfTok(code, "<=");
 
         code = "void f() {\n"
@@ -7930,6 +8470,40 @@ class TestValueFlow : public TestFixture {
                "    return (!std::is_reference<decltype(a)>::value);\n"
                "}\n";
         (void)valueOfTok(code, "0");
+
+        code = "struct S { int a; };\n" // #14036
+               "template <typename T>\n"
+               "struct U {\n"
+               "    U() = default;\n"
+               "    U(int i, int* p) {\n"
+               "        m = new T(i, p);\n"
+               "    }\n"
+               "    T m;\n"
+               "};\n"
+               "U<S*> u;\n";
+        (void)valueOfTok(code, "new");
+
+        code = "void f() {\n" // #14287
+               "    auto a = { \"1\" };\n"
+               "    auto b = a;\n"
+               "}\n";
+        (void)valueOfTok(code, "b");
+
+        code = "namespace O {}\n" // #14952
+               "namespace N {\n"
+               "    using namespace O;\n"
+               "    enum class E { E0 };\n"
+               "    auto E0 = E::E0;\n"
+               "    struct S {\n"
+               "        E f() const { return E0; }\n"
+               "    };\n"
+               "}\n";
+        (void)valueOfTok(code, "E0");
+
+        code = "void f() {\n" // #14980
+               "    OpNew *newp = &operator new;\n"
+               "}\n";
+        (void)valueOfTok(code, "&");
     }
 
     void valueFlowHang() {
@@ -8154,6 +8728,75 @@ class TestValueFlow : public TestFixture {
                "    static T f[64];\n"
                "};\n";
         (void)valueOfTok(code, "(");
+
+        // fork explosion on many opaque conditions; bounded by maxForwardConditionForks
+        code = "int g(int);\n"
+               "bool h(int);\n"
+               "void f() {\n"
+               "    int x = 0;\n"
+               "    if (h(0)) g(x);\n"
+               "    if (h(1)) g(x);\n"
+               "    if (h(2)) g(x);\n"
+               "    if (h(3)) g(x);\n"
+               "    if (h(4)) g(x);\n"
+               "    if (h(5)) g(x);\n"
+               "    if (h(6)) g(x);\n"
+               "    if (h(7)) g(x);\n"
+               "    if (h(8)) g(x);\n"
+               "    if (h(9)) g(x);\n"
+               "    if (h(10)) g(x);\n"
+               "    if (h(11)) g(x);\n"
+               "    if (h(12)) g(x);\n"
+               "    if (h(13)) g(x);\n"
+               "    if (h(14)) g(x);\n"
+               "    if (h(15)) g(x);\n"
+               "    if (h(16)) g(x);\n"
+               "    if (h(17)) g(x);\n"
+               "    if (h(18)) g(x);\n"
+               "    if (h(19)) g(x);\n"
+               "    if (h(20)) g(x);\n"
+               "    if (h(21)) g(x);\n"
+               "    if (h(22)) g(x);\n"
+               "    if (h(23)) g(x);\n"
+               "    if (h(24)) g(x);\n"
+               "    if (h(25)) g(x);\n"
+               "    if (h(26)) g(x);\n"
+               "    if (h(27)) g(x);\n"
+               "    if (h(28)) g(x);\n"
+               "    if (h(29)) g(x);\n"
+               "    if (h(30)) g(x);\n"
+               "    if (h(31)) g(x);\n"
+               "    if (h(32)) g(x);\n"
+               "    if (h(33)) g(x);\n"
+               "    if (h(34)) g(x);\n"
+               "    if (h(35)) g(x);\n"
+               "    if (h(36)) g(x);\n"
+               "    if (h(37)) g(x);\n"
+               "    if (h(38)) g(x);\n"
+               "    if (h(39)) g(x);\n"
+               "    if (h(40)) g(x);\n"
+               "    if (h(41)) g(x);\n"
+               "    if (h(42)) g(x);\n"
+               "    if (h(43)) g(x);\n"
+               "    if (h(44)) g(x);\n"
+               "    if (h(45)) g(x);\n"
+               "    if (h(46)) g(x);\n"
+               "    if (h(47)) g(x);\n"
+               "    if (h(48)) g(x);\n"
+               "    if (h(49)) g(x);\n"
+               "    if (h(50)) g(x);\n"
+               "    if (h(51)) g(x);\n"
+               "    if (h(52)) g(x);\n"
+               "    if (h(53)) g(x);\n"
+               "    if (h(54)) g(x);\n"
+               "    if (h(55)) g(x);\n"
+               "    if (h(56)) g(x);\n"
+               "    if (h(57)) g(x);\n"
+               "    if (h(58)) g(x);\n"
+               "    if (h(59)) g(x);\n"
+               "    (void)x;\n"
+               "}\n";
+        (void)valueOfTok(code, "x");
     }
 
     void valueFlowCrashConstructorInitialization() { // #9577
@@ -8167,7 +8810,7 @@ class TestValueFlow : public TestFixture {
                "    if (path != standard)\n"
                "    {\n"
                "    }\n"
-               "}";
+               "}\n";
         (void)valueOfTok(code, "path");
 
         code = "void Error()\n"
@@ -8179,7 +8822,7 @@ class TestValueFlow : public TestFixture {
                "    if (path != standard)\n"
                "    {\n"
                "    }\n"
-               "}";
+               "}\n";
         (void)valueOfTok(code, "path");
 
         code = "struct S {\n"
@@ -8213,7 +8856,7 @@ class TestValueFlow : public TestFixture {
                           "  }\n"
                           "\n"
                           "  return 0;\n"
-                          "}";
+                          "}\n";
 
         ASSERT_EQUALS(false, testValueOfXKnown(code, 4U, 1));
     }
@@ -8578,21 +9221,21 @@ class TestValueFlow : public TestFixture {
                "    if (x == y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 3U, "y", 0));
 
         code = "void f(int x, int y) {\n"
                "    if (x != y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 0));
 
         code = "void f(int x, int y) {\n"
                "    if (x < y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", -1));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 0));
 
@@ -8600,7 +9243,7 @@ class TestValueFlow : public TestFixture {
                "    if (x <= y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", 0));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 1));
 
@@ -8608,7 +9251,7 @@ class TestValueFlow : public TestFixture {
                "    if (x > y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", 1));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", 0));
 
@@ -8616,7 +9259,7 @@ class TestValueFlow : public TestFixture {
                "    if (x >= y) {\n"
                "        int a = x;\n"
                "    }\n"
-               "}";
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, "y", 0));
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, "y", -1));
 
@@ -8731,6 +9374,15 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, "malloc(10)", 0));
+
+        code = "struct S {\n" // #14891
+               "    void f() const {\n"
+               "        const int* p = a;\n"
+               "        if (*p) {}\n"
+               "    }\n"
+               "    int a[3];\n"
+               "};\n";
+        ASSERT(tokenValues(code, "* p )").empty());
     }
 
     void valueFlowSymbolicIdentity()
@@ -8796,6 +9448,18 @@ class TestValueFlow : public TestFixture {
                "    return x;\n"
                "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, "a", 0));
+
+        code = "void f(int n) {\n"
+               "    int x = 0 - n;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 3U, "n", ValueFlow::Value::ValueType::SYMBOLIC));
+
+        code = "void f(int n) {\n"
+               "    int x = n - 0;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, "n", ValueFlow::Value::ValueType::SYMBOLIC));
     }
 
     void valueFlowSymbolicStrlen()
@@ -8998,10 +9662,23 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 1));
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
+
+        code = "bool f() {\n"
+               "    std::string s1, s2;\n"
+               "    bool x = (s1 == s2);\n"
+               "    return x;\n"
+               "}\n"
+               "bool g() {\n"
+               "    std::string s1, s2;\n"
+               "    bool x = (s1 != s2);\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 1));
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 9U, 0));
     }
 
-    void valueFlowBailoutIncompleteVar() { // #12526
-        bailout(
+    void valueFlowBailoutIncompleteVar() {
+        bailout( // #12526
             "int f1() {\n"
             "    return VALUE_1;\n"
             "}\n"
@@ -9014,6 +9691,23 @@ class TestValueFlow : public TestFixture {
             "[test.cpp:2]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable VALUE_1\n"
             "[test.cpp:6]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable VALUE_2\n",
             errout_str());
+
+        bailout(
+            "std::string_view f() {\n"
+            "    return \"abc\"sv;\n"
+            "}\n"
+            );
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout_str());
+    }
+
+    void valueFlowBailoutNoreturn() { // #13718
+        bailout(
+            "void f(const int* p) {\n"
+            "    if (p)\n"
+            "        (void)*p;\n"
+            "}\n"
+            );
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout_str());
     }
 
     void performanceIfCount() {
@@ -9042,6 +9736,67 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(1U, tokenValues(code, "v .", &s).size());
     }
+
+#define testBitfields(...) testBitfields_(__FILE__, __LINE__, __VA_ARGS__)
+    void testBitfields_(const char *file, int line, const std::string &structBody, std::size_t expectedSize) {
+        const Settings settingsUnix64 = settingsBuilder().platform(Platform::Type::Unix64).build();
+        const std::string code = "struct S { " + structBody + " }; const std::size_t size = sizeof(S);\n";
+        const auto values = tokenValues(code.c_str(), "( S", &settingsUnix64);
+        ASSERT_LOC(!values.empty(), file, line);
+        ASSERT_EQUALS_LOC(expectedSize, values.back().intvalue, file, line);
+    }
+
+    void bitfields() {
+
+        // #13653
+        testBitfields("unsigned int data_rw: 1;\n"
+                      "unsigned int page_address: 4;\n"
+                      "unsigned int register_address: 3;\n",
+                      4);
+
+        testBitfields("unsigned char data_rw: 1;\n"
+                      "unsigned char page_address: 4;\n"
+                      "unsigned char register_address: 3;\n",
+                      1);
+
+        testBitfields("unsigned int a : 1;\n"
+                      "unsigned int b;\n"
+                      "unsigned int c : 1;\n",
+                      12);
+
+        testBitfields("unsigned int a : 1;\n"
+                      "unsigned char b;\n"
+                      "unsigned int c : 1;\n",
+                      12);
+
+        testBitfields("unsigned int a : 31;\n"
+                      "unsigned int b : 2;\n",
+                      8);
+
+        // #13850
+        testBitfields("int a : 32;\n"
+                      "int b : 16;\n"
+                      "unsigned short c;\n",
+                      8);
+
+        testBitfields("unsigned int a : 31;\n"
+                      "unsigned int   : 2;\n",
+                      8);
+
+        testBitfields("unsigned int a : 16;\n"
+                      "unsigned int   : 0;\n"
+                      "unsigned int b : 16;\n",
+                      8);
+
+        testBitfields("unsigned char a : 16;\n",
+                      2);
+    }
+
+    void bitfieldsHang() {
+        const char *code = "struct S { unknown_type x : 1; };\n"
+                           "const size_t size = sizeof(S);\n";
+        (void)valueOfTok(code, "x");
+    }
 };
 
 REGISTER_TEST(TestValueFlow)
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index b30b56c2bfb..4186917cc35 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2025 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -25,7 +25,6 @@
 
 #include <cstddef>
 #include <string>
-#include <vector>
 
 class TestVarID : public TestFixture {
 public:
@@ -102,6 +101,8 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid69);
         TEST_CASE(varid70); // #12660 - function
         TEST_CASE(varid71); // #12676 - wrong varid in uninstantiated templated constructor
+        TEST_CASE(varid72);
+        TEST_CASE(varid73);
         TEST_CASE(varid_for_1);
         TEST_CASE(varid_for_2);
         TEST_CASE(varid_for_3);
@@ -149,6 +150,8 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid_in_class26);
         TEST_CASE(varid_in_class27);
         TEST_CASE(varid_in_class28);
+        TEST_CASE(varid_in_class29);
+        TEST_CASE(varid_in_class30);
         TEST_CASE(varid_namespace_1);   // #7272
         TEST_CASE(varid_namespace_2);   // #7000
         TEST_CASE(varid_namespace_3);   // #8627
@@ -219,6 +222,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(varidclass18);
         TEST_CASE(varidclass19);  // initializer list
         TEST_CASE(varidclass20);   // #7578: int (*p)[2]
+        TEST_CASE(varidclass21);
         TEST_CASE(varid_classnameshaddowsvariablename); // #3990
         TEST_CASE(varid_classnametemplate); // #10221
 
@@ -241,6 +245,11 @@ class TestVarID : public TestFixture {
         TEST_CASE(decltype1);
         TEST_CASE(decltype2);
 
+        TEST_CASE(typeof1);
+        TEST_CASE(typeof2);
+        TEST_CASE(typeof3);
+        TEST_CASE(typeof4);
+
         TEST_CASE(exprid1);
         TEST_CASE(exprid2);
         TEST_CASE(exprid3);
@@ -255,23 +264,25 @@ class TestVarID : public TestFixture {
         TEST_CASE(exprid12);
         TEST_CASE(exprid13);
         TEST_CASE(exprid14);
+        TEST_CASE(exprid15);
 
         TEST_CASE(structuredBindings);
     }
 
     struct TokenizeOptions
     {
-        TokenizeOptions() = default;
         bool cpp = true;
-        const Settings *s = nullptr;
     };
 
 #define tokenize(...) tokenize_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     std::string tokenize_(const char* file, int line, const char (&code)[size], const TokenizeOptions& options = make_default_obj()) {
-        const Settings *settings1 = options.s ? options.s : &settings;
+        return tokenize_(file, line, code, settings, options.cpp);
+    }
 
-        SimpleTokenizer tokenizer(*settings1, *this, options.cpp);
+    template<size_t size>
+    std::string tokenize_(const char* file, int line, const char (&code)[size], const Settings& settings1, bool cpp = true) {
+        SimpleTokenizer tokenizer(settings1, *this, cpp);
         ASSERT_LOC((tokenizer.tokenize)(code), file, line);
 
         // result..
@@ -307,8 +318,8 @@ class TestVarID : public TestFixture {
 
 #define compareVaridsForVariable(...) compareVaridsForVariable_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
-    std::string compareVaridsForVariable_(const char* file, int line, const char (&code)[size], const char varname[], bool cpp = true) {
-        SimpleTokenizer tokenizer(settings, *this, cpp);
+    std::string compareVaridsForVariable_(const char* file, int line, const char (&code)[size], const char varname[]) {
+        SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC((tokenizer.tokenize)(code), file, line);
 
         unsigned int varid = ~0U;
@@ -535,7 +546,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    std::string str(\"test\");\n"
             "    str.clear();\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: void func ( )\n"
                                 "2: {\n"
@@ -561,7 +572,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int abc;\n"
             "    struct abc abc1;\n"
-            "}", dinit(TokenizeOptions, $.cpp = false));
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -573,7 +584,7 @@ class TestVarID : public TestFixture {
     }
 
     void varid11() {
-        const std::string actual = tokenize("class Foo;");
+        const std::string actual = tokenize("class Foo;\n");
 
         const char expected[] = "1: class Foo ;\n";
 
@@ -585,7 +596,7 @@ class TestVarID : public TestFixture {
             "static void a()\n"
             "{\n"
             "    class Foo *foo;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: static void a ( )\n"
                                 "2: {\n"
@@ -620,7 +631,7 @@ class TestVarID : public TestFixture {
             "A a;\n"
             "B b;\n"
             "b * a;\n"
-            "}", dinit(TokenizeOptions, $.cpp = false));
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -638,7 +649,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "} s;", dinit(TokenizeOptions, $.cpp = false));
+                "} s;\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -653,7 +664,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "};", dinit(TokenizeOptions, $.cpp = false));
+                "};\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -879,7 +890,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "void f() {\n"
                              "  int  *p;\n"
                              "  void bar(int *p);\n"
-                             "}";
+                             "}\n";
         const char expected2[] = "1: void f ( ) {\n"
                                  "2: int * p@1 ;\n"
                                  "3: void bar ( int * p ) ;\n"
@@ -905,17 +916,21 @@ class TestVarID : public TestFixture {
 
     void varid37() {
         {
-            const char code[] = "void blah() {"
-                                "    Bar bar(*x);"
-                                "}";
-            ASSERT_EQUALS("1: void blah ( ) { Bar bar@1 ( * x ) ; }\n",
+            const char code[] = "void blah() {\n"
+                                "    Bar bar(*x);\n"
+                                "}\n";
+            ASSERT_EQUALS("1: void blah ( ) {\n"
+                          "2: Bar bar@1 ( * x ) ;\n"
+                          "3: }\n",
                           tokenize(code));
         }
         {
-            const char code[] = "void blah() {"
-                                "    Bar bar(&x);"
-                                "}";
-            ASSERT_EQUALS("1: void blah ( ) { Bar bar@1 ( & x ) ; }\n",
+            const char code[] = "void blah() {\n"
+                                "    Bar bar(&x);\n"
+                                "}\n";
+            ASSERT_EQUALS("1: void blah ( ) {\n"
+                          "2: Bar bar@1 ( & x ) ;\n"
+                          "3: }\n",
                           tokenize(code));
         }
     }
@@ -941,18 +956,18 @@ class TestVarID : public TestFixture {
     }
 
     void varid40() {
-        const char code[] ="extern \"C\" int (*a())();";
+        const char code[] ="extern \"C\" int (*a())();\n";
         ASSERT_EQUALS("1: int * a ( ) ;\n",
                       tokenize(code));
     }
 
     void varid41() {
-        const char code1[] = "union evt; void f(const evt & event);";
+        const char code1[] = "union evt; void f(const evt & event);\n";
         ASSERT_EQUALS("1: union evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code1));
         ASSERT_THROW_INTERNAL(tokenize(code1, dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
 
-        const char code2[] = "struct evt; void f(const evt & event);";
+        const char code2[] = "struct evt; void f(const evt & event);\n";
         ASSERT_EQUALS("1: struct evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code2));
         ASSERT_THROW_INTERNAL(tokenize(code2, dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
@@ -963,7 +978,7 @@ class TestVarID : public TestFixture {
                             "class Fred {\n"
                             "public:\n"
                             "     struct fruit::banana Bananas[25];\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: namespace fruit { struct banana { } ; } ;\n"
                       "2: class Fred {\n"
                       "3: public:\n"
@@ -973,25 +988,25 @@ class TestVarID : public TestFixture {
     }
 
     void varid43() {
-        const char code[] ="int main(int flag) { if(a & flag) { return 1; } }";
+        const char code[] ="int main(int flag) { if(a & flag) { return 1; } }\n";
         ASSERT_EQUALS("1: int main ( int flag@1 ) { if ( a & flag@1 ) { return 1 ; } }\n",
                       tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid44() {
-        const char code[] ="class A:public B,public C,public D {};";
+        const char code[] ="class A:public B,public C,public D {};\n";
         ASSERT_EQUALS("1: class A : public B , public C , public D { } ;\n",
                       tokenize(code));
     }
 
     void varid45() { // #3466
-        const char code[] ="void foo() { B b(this); A a(this, b); }";
+        const char code[] ="void foo() { B b(this); A a(this, b); }\n";
         ASSERT_EQUALS("1: void foo ( ) { B b@1 ( this ) ; A a@2 ( this , b@1 ) ; }\n",
                       tokenize(code));
     }
 
     void varid46() { // #3756
-        const char code[] ="void foo() { int t; x = (struct t *)malloc(); f(t); }";
+        const char code[] ="void foo() { int t; x = (struct t *)malloc(); f(t); }\n";
         ASSERT_EQUALS("1: void foo ( ) { int t@1 ; x = ( struct t * ) malloc ( ) ; f ( t@1 ) ; }\n",
                       tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
@@ -999,7 +1014,7 @@ class TestVarID : public TestFixture {
     void varid47() { // function parameters
         // #3768
         {
-            const char code[] ="void f(std::string &string, std::string &len) {}";
+            const char code[] ="void f(std::string &string, std::string &len) {}\n";
             ASSERT_EQUALS("1: void f ( std :: string & string@1 , std :: string & len@2 ) { }\n",
                           tokenize(code));
         }
@@ -1017,25 +1032,25 @@ class TestVarID : public TestFixture {
     }
 
     void varid48() {  // #3785 - return (a*b)
-        const char code[] ="int X::f(int b) const { return(a*b); }";
+        const char code[] ="int X::f(int b) const { return(a*b); }\n";
         ASSERT_EQUALS("1: int X :: f ( int b@1 ) const { return ( a * b@1 ) ; }\n",
                       tokenize(code));
     }
 
     void varid49() {  // #3799 - void f(std::vector<int>)
-        const char code[] ="void f(std::vector<int>)";
+        const char code[] ="void f(std::vector<int>)\n";
         ASSERT_EQUALS("1: void f ( std :: vector < int > )\n",
                       tokenize(code));
     }
 
     void varid50() {  // #3760 - explicit
-        const char code[] ="class A { explicit A(const A&); };";
+        const char code[] ="class A { explicit A(const A&); };\n";
         ASSERT_EQUALS("1: class A { explicit A ( const A & ) ; } ;\n",
                       tokenize(code));
     }
 
     void varid51() {  // don't set varid on template function
-        const char code[] ="T t; t.x<0>();";
+        const char code[] ="T t; t.x<0>();\n";
         ASSERT_EQUALS("1: T t@1 ; t@1 . x < 0 > ( ) ;\n",
                       tokenize(code));
     }
@@ -1043,7 +1058,7 @@ class TestVarID : public TestFixture {
     void varid52() {
         const char code[] ="A<B<C>::D> e;\n"
                             "B< C<> > b[10];\n"
-                            "B<C<>> c[10];";
+                            "B<C<>> c[10];\n";
         ASSERT_EQUALS("1: A < B < C > :: D > e@1 ;\n"
                       "2: B < C < > > b@2 [ 10 ] ;\n"
                       "3: B < C < > > c@3 [ 10 ] ;\n",
@@ -1052,74 +1067,67 @@ class TestVarID : public TestFixture {
 
     void varid53() { // #4172 - Template instantiation: T<&functionName> list[4];
         ASSERT_EQUALS("1: A < & f > list@1 [ 4 ] ;\n",
-                      tokenize("A<&f> list[4];"));
+                      tokenize("A<&f> list[4];\n"));
     }
 
     void varid54() { // hang
         // Original source code: libgc
-        (void)tokenize("STATIC ptr_t GC_approx_sp(void) { word sp; sp = (word)&sp; return((ptr_t)sp); }");
+        (void)tokenize("STATIC ptr_t GC_approx_sp(void) { word sp; sp = (word)&sp; return((ptr_t)sp); }\n");
     }
 
     void varid55() { // Ticket #5868
-        const char code[] =     "typedef struct foo {} foo; "
-                            "void bar1(struct foo foo) {} "
-                            "void baz1(foo foo) {} "
-                            "void bar2(struct foo& foo) {} "
-                            "void baz2(foo& foo) {} "
-                            "void bar3(struct foo* foo) {} "
-                            "void baz3(foo* foo) {}";
-        const char expected[] = "1: "
-                                "struct foo { } ; "
-                                "void bar1 ( struct foo foo@1 ) { } "
-                                "void baz1 ( struct foo foo@2 ) { } "
-                                "void bar2 ( struct foo & foo@3 ) { } "
-                                "void baz2 ( struct foo & foo@4 ) { } "
-                                "void bar3 ( struct foo * foo@5 ) { } "
-                                "void baz3 ( struct foo * foo@6 ) { }\n";
+        const char code[] = "typedef struct foo {} foo;\n"
+                            "void bar1(struct foo foo) {}\n"
+                            "void baz1(foo foo) {}\n"
+                            "void bar2(struct foo& foo) {}\n"
+                            "void baz2(foo& foo) {}\n"
+                            "void bar3(struct foo* foo) {}\n"
+                            "void baz3(foo* foo) {}\n";
+        const char expected[] = "1: struct foo { } ;\n"
+                                "2: void bar1 ( struct foo foo@1 ) { }\n"
+                                "3: void baz1 ( struct foo foo@2 ) { }\n"
+                                "4: void bar2 ( struct foo & foo@3 ) { }\n"
+                                "5: void baz2 ( struct foo & foo@4 ) { }\n"
+                                "6: void bar3 ( struct foo * foo@5 ) { }\n"
+                                "7: void baz3 ( struct foo * foo@6 ) { }\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid56() { // Ticket #6548 - function with a throw()
-        const char code1[] = "void fred(int x) throw() {}"
-                             "void wilma() { x++; }";
-        const char expected1[] = "1: "
-                                 "void fred ( int x@1 ) throw ( ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code1[] = "void fred(int x) throw() {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected1[] = "1: void fred ( int x@1 ) throw ( ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected1, tokenize(code1));
 
-        const char code2[] = "void fred(int x) const throw(EXCEPT) {}"
-                             "void wilma() { x++; }";
-        const char expected2[] = "1: "
-                                 "void fred ( int x@1 ) const throw ( EXCEPT ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code2[] = "void fred(int x) const throw(EXCEPT) {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected2[] = "1: void fred ( int x@1 ) const throw ( EXCEPT ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected2, tokenize(code2));
 
-        const char code3[] = "void fred(int x) throw() ABCD {}"
-                             "void wilma() { x++; }";
-        const char expected3[] = "1: "
-                                 "void fred ( int x@1 ) throw ( ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code3[] = "void fred(int x) throw() ABCD {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected3[] = "1: void fred ( int x@1 ) throw ( ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected3, tokenize(code3));
 
-        const char code4[] = "void fred(int x) noexcept() {}"
-                             "void wilma() { x++; }";
-        const char expected4[] = "1: "
-                                 "void fred ( int x@1 ) noexcept ( ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code4[] = "void fred(int x) noexcept() {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected4[] = "1: void fred ( int x@1 ) noexcept ( ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected4, tokenize(code4));
 
-        const char code5[] = "void fred(int x) noexcept {}"
-                             "void wilma() { x++; }";
-        const char expected5[] = "1: "
-                                 "void fred ( int x@1 ) noexcept ( true ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code5[] = "void fred(int x) noexcept {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected5[] = "1: void fred ( int x@1 ) noexcept ( true ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected5, tokenize(code5));
 
-        const char code6[] = "void fred(int x) noexcept ( false ) {}"
-                             "void wilma() { x++; }";
-        const char expected6[] = "1: "
-                                 "void fred ( int x@1 ) noexcept ( false ) { } "
-                                 "void wilma ( ) { x ++ ; }\n";
+        const char code6[] = "void fred(int x) noexcept ( false ) {}\n"
+                             "void wilma() { x++; }\n";
+        const char expected6[] = "1: void fred ( int x@1 ) noexcept ( false ) { }\n"
+                                 "2: void wilma ( ) { x ++ ; }\n";
         ASSERT_EQUALS(expected6, tokenize(code6));
     }
 
@@ -1175,7 +1183,7 @@ class TestVarID : public TestFixture {
         const char code[] = "class DLLSYM B;\n"
                             "struct B {\n"
                             "    ~B() {}\n"
-                            "};";
+                            "};\n";
         const char expected[] = "1: class DLLSYM B@1 ;\n" // In this line, we cannot really do better...
                                 "2: struct B {\n"
                                 "3: ~ B@1 ( ) { }\n" // ...but here we could
@@ -1189,13 +1197,13 @@ class TestVarID : public TestFixture {
 
     void varid60() { // #7267 - cast
         ASSERT_EQUALS("1: a = ( x y ) 10 ;\n",
-                      tokenize("a=(x y)10;"));
+                      tokenize("a=(x y)10;\n"));
     }
 
     void varid61() {
         const char code[] = "void foo(int b) {\n"
                             "  void bar(int a, int b) {}\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void foo ( int b@1 ) {\n"
                                 "2: void bar ( int a@2 , int b@3 ) { }\n"
                                 "3: }\n";
@@ -1209,41 +1217,41 @@ class TestVarID : public TestFixture {
                             "        int x;\n"
                             "        bar(r, r * x);\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         // Ensure that there is only one variable id for "x"
         ASSERT_EQUALS("same varid", compareVaridsForVariable(code, "x"));
     }
 
     void varid63() {
-        const char code[] = "void f(boost::optional<int> const& x) {}";
+        const char code[] = "void f(boost::optional<int> const& x) {}\n";
         const char expected[] = "1: void f ( const boost :: optional < int > & x@1 ) { }\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid64() {
-        const char code[] = "extern const char (*x[256]);";
+        const char code[] = "extern const char (*x[256]);\n";
         const char expected[] = "1: extern const char ( * x@1 [ 256 ] ) ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid65() { // #10936
         {
-            const char code[] = "extern int (*p);";
+            const char code[] = "extern int (*p);\n";
             const char expected[] = "1: extern int ( * p@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
         {
-            const char code[] = "extern int (i);";
+            const char code[] = "extern int (i);\n";
             const char expected[] = "1: extern int ( i@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
         {
-            const char code[] = "int (*p);";
+            const char code[] = "int (*p);\n";
             const char expected[] = "1: int ( * p@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
         {
-            const char code[] = "int (i);";
+            const char code[] = "int (i);\n";
             const char expected[] = "1: int ( i@1 ) ;\n";
             ASSERT_EQUALS(expected, tokenize(code));
         }
@@ -1270,7 +1278,7 @@ class TestVarID : public TestFixture {
 
     void varid67() { // #11711
         const char code1[] = "int *x;\n"
-                             "_Generic(*x, int: foo, default: bar)();";
+                             "_Generic(*x, int: foo, default: bar)();\n";
         const char expected1[] = "1: int * x@1 ;\n"
                                  "2: _Generic ( * x@1 , int : foo , default : bar ) ( ) ;\n";
         ASSERT_EQUALS(expected1, tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
@@ -1281,7 +1289,7 @@ class TestVarID : public TestFixture {
                              "char* str_chars(struct S* s);\n"
                              "void f(struct S strOut) {\n"
                              "	 switch (str_chars(&strOut)[0])  {}\n"
-                             "}";
+                             "}\n";
         const char expected1[] = "1: struct S { } ;\n"
                                  "2: char * str_chars ( struct S * s@1 ) ;\n"
                                  "3: void f ( struct S strOut@2 ) {\n"
@@ -1294,7 +1302,7 @@ class TestVarID : public TestFixture {
     void varid69() {
         const char code1[] = "void f() {\n"
                              "    auto g = [](int&, int& r, int i) {};\n"
-                             "}";
+                             "}\n";
         const char expected1[] = "1: void f ( ) {\n"
                                  "2: auto g@1 ; g@1 = [ ] ( int & , int & r@2 , int i@3 ) { } ;\n"
                                  "3: }\n";
@@ -1320,7 +1328,7 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected2, tokenize(code2));
 
         const char code3[] = "extern void (*arr[10])(uint32_t some);\n";
-        const char expected3[] = "1: extern void ( * arr@1 [ 10 ] ) ( uint32_t some@2 ) ;\n";
+        const char expected3[] = "1: extern void ( * arr@1 [ 10 ] ) ( uint32_t ) ;\n";
         ASSERT_EQUALS(expected3, tokenize(code3));
 
         const char code4[] = "_Static_assert(sizeof((struct S){0}.i) == 4);\n"; // #12729
@@ -1394,10 +1402,24 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varid72() {
+        const char code1[] = "static_assert(true && true);\n"; // #14386
+        const char expected1[] = "1: static_assert ( true && true ) ;\n";
+        ASSERT_EQUALS(expected1, tokenize(code1));
+    }
+
+    void varid73() {
+        const char code[] = "namespace a { int x; };\n"
+                            "namespace b { int x = a::x; };\n";
+        const char expected[]  = "1: namespace a { int x@1 ; } ;\n"
+                                 "2: namespace b { int x@2 ; x@2 = a :: x@1 ; } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varid_for_1() {
         const char code[] = "void foo(int a, int b) {\n"
                             "  for (int a=1,b=2;;) {}\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void foo ( int a@1 , int b@2 ) {\n"
                                 "2: for ( int a@3 = 1 , b@4 = 2 ; ; ) { }\n"
                                 "3: }\n";
@@ -1407,7 +1429,7 @@ class TestVarID : public TestFixture {
     void varid_for_2() {
         const char code[] = "void foo(int a, int b) {\n"
                             "  for (int a=f(x,y,z),b=2;;) {}\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void foo ( int a@1 , int b@2 ) {\n"
                                 "2: for ( int a@3 = f ( x , y , z ) , b@4 = 2 ; ; ) { }\n"
                                 "3: }\n";
@@ -1440,7 +1462,7 @@ class TestVarID : public TestFixture {
         const char code[] = "void f() {\n"
                             "    delete d;\n"
                             "    throw t;\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: void f ( ) {\n"
                                 "2: delete d@1 ;\n"
@@ -1455,27 +1477,27 @@ class TestVarID : public TestFixture {
                             "unsigned long bits, int wake, int delete, struct extent_state **cached_state, "
                             "gfp_t mask) {\n"
                             "  struct extent_state *state;\n"
-                            "}"
+                            "}\n"
                             "int clear_extent_dirty() {\n"
                             "  return clear_extent_bit(tree, start, end, EXTENT_DIRTY | EXTENT_DELALLOC | "
                             "                          EXTENT_DO_ACCOUNTING, 0, 0, NULL, mask);\n"
-                            "}";
+                            "}\n";
         ASSERT_NO_THROW(tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid_cpp_keywords_in_c_code3() { // #12120
-        const char code[] = "const struct class *p;";
+        const char code[] = "const struct class *p;\n";
         const char expected[] = "1: const struct class * p@1 ;\n";
         ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid_cpp_keywords_in_c_code4() { // #12120
         {
-            const char code[] = "int false = 0;";
+            const char code[] = "int false = 0;\n";
             ASSERT_THROW_INTERNAL_EQUALS(tokenize(code, dinit(TokenizeOptions, $.cpp = true)), INTERNAL, "Internal error. VarId set for bool literal.");
         }
         {
-            const char code[] = "int false = 0;";
+            const char code[] = "int false = 0;\n";
             ASSERT_EQUALS("1: int false@1 ; false@1 = 0 ;\n", tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
@@ -1484,7 +1506,7 @@ class TestVarID : public TestFixture {
         const char code[] ="void f() {\n"
                             "    int x;\n"
                             "    x = a(y*x,10);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( ) {\n"
                                 "2: int x@1 ;\n"
                                 "3: x@1 = a ( y * x@1 , 10 ) ;\n"
@@ -1496,7 +1518,7 @@ class TestVarID : public TestFixture {
         // #2491
         const char code[] ="void f(int b) {\n"
                             "    x(a*b,10);\n"
-                            "}";
+                            "}\n";
         const std::string expected1("1: void f ( int b@1 ) {\n"
                                     "2: x ( a * b");
         const std::string expected2(" , 10 ) ;\n"
@@ -1509,7 +1531,7 @@ class TestVarID : public TestFixture {
         const char code[] ="void f() {\n"
                             "    int a = 0;\n"
                             "    int b = c - (foo::bar * a);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: void f ( ) {\n"
                                 "2: int a@1 ; a@1 = 0 ;\n"
@@ -1521,16 +1543,16 @@ class TestVarID : public TestFixture {
 
     void varidFunctionCall4() {
         // Ticket #3280
-        const char code1[] = "void f() { int x; fun(a,b*x); }";
+        const char code1[] = "void f() { int x; fun(a,b*x); }\n";
         ASSERT_EQUALS("1: void f ( ) { int x@1 ; fun ( a , b * x@1 ) ; }\n",
                       tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
-        const char code2[] = "void f(int a) { int x; fun(a,b*x); }";
+        const char code2[] = "void f(int a) { int x; fun(a,b*x); }\n";
         ASSERT_EQUALS("1: void f ( int a@1 ) { int x@2 ; fun ( a@1 , b * x@2 ) ; }\n",
                       tokenize(code2, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varidFunctionCall5() {
-        const char code[] = "void foo() { (f(x[2]))(x[2]); }";
+        const char code[] = "void foo() { (f(x[2]))(x[2]); }\n";
         ASSERT_EQUALS("1: void foo ( ) { f ( x [ 2 ] ) ( x [ 2 ] ) ; }\n",
                       tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
@@ -1545,7 +1567,7 @@ class TestVarID : public TestFixture {
             "std::list<boost::wave::token_id> tokens;\n"
             "static std::vector<CvsProcess*> ex1;\n"
             "extern std::vector<CvsProcess*> ex2;\n"
-            "std::map<int, 1> m;");
+            "std::map<int, 1> m;\n");
 
         const char expected[] = "1: list < int > ints@1 ;\n"
                                 "2: list < int > :: iterator it@2 ;\n"
@@ -1561,7 +1583,7 @@ class TestVarID : public TestFixture {
     }
 
     void varidStl2() {
-        const std::string actual = tokenize("std::bitset<static_cast<int>(2)> x;");
+        const std::string actual = tokenize("std::bitset<static_cast<int>(2)> x;\n");
 
         const char expected[] = "1: std :: bitset < static_cast < int > ( 2 ) > x@1 ;\n";
 
@@ -1570,7 +1592,7 @@ class TestVarID : public TestFixture {
 
     void varid_newauto() {
         ASSERT_EQUALS("1: void f ( ) { const new auto ( 0 ) ; }\n",
-                      tokenize("void f(){new const auto(0);}"));
+                      tokenize("void f(){new const auto(0);}\n"));
     }
 
     void varid_delete() {
@@ -1579,7 +1601,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "  int *a;\n"
             "  delete a;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -1630,7 +1652,7 @@ class TestVarID : public TestFixture {
                 "void f3(const std::string &s)\n"
                 "{\n"
                 "    s.size();\n"
-                "}");
+                "}\n");
 
             const char expected[] = "1: void f1 ( int & p@1 )\n"
                                     "2: {\n"
@@ -1649,13 +1671,13 @@ class TestVarID : public TestFixture {
         }
 
         {
-            const std::string actual = tokenize("void f(struct foobar);", dinit(TokenizeOptions, $.cpp = false));
+            const std::string actual = tokenize("void f(struct foobar);\n", dinit(TokenizeOptions, $.cpp = false));
             const char expected[] = "1: void f ( struct foobar ) ;\n";
             ASSERT_EQUALS(expected, actual);
         }
 
         {
-            const std::string actual = tokenize("bool f(X x, int=3);");
+            const std::string actual = tokenize("bool f(X x, int=3);\n");
             const char expected[] = "1: bool f ( X x@1 , int = 3 ) ;\n";
             ASSERT_EQUALS(expected, actual);
         }
@@ -1692,7 +1714,7 @@ class TestVarID : public TestFixture {
     }
 
     void varid_sizeof() {
-        const char code[] = "x = sizeof(a*b);";
+        const char code[] = "x = sizeof(a*b);\n";
         const char expected[] = "1: x = sizeof ( a * b ) ;\n";
         ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
@@ -1704,7 +1726,7 @@ class TestVarID : public TestFixture {
             "    std::vector<int> b;\n"
             "    std::vector<int> &a = b;\n"
             "    std::vector<int> *c = &b;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -1724,7 +1746,7 @@ class TestVarID : public TestFixture {
                 "public:\n"
                 "    std::string name1;\n"
                 "    std::string name2;\n"
-                "};");
+                "};\n");
 
             const char expected[] = "1: class Foo\n"
                                     "2: {\n"
@@ -1750,7 +1772,7 @@ class TestVarID : public TestFixture {
                 "    POINT pOutput = { 0 , 0 };\n"
                 "    int x = pOutput.x;\n"
                 "    int y = pOutput.y;\n"
-                "}");
+                "}\n");
 
             const char expected[] = "1: class foo\n"
                                     "2: {\n"
@@ -1785,7 +1807,7 @@ class TestVarID : public TestFixture {
             "void Bar::f()\n"
             "{\n"
             "    foo.x = x;\n"
-            "}");
+            "}\n");
         const char expected[] = "1: struct Foo {\n"
                                 "2: int x@1 ;\n"
                                 "3: } ;\n"
@@ -1809,7 +1831,7 @@ class TestVarID : public TestFixture {
                             "        Bar x(*this);\n"  // <- ..
                             "    }\n"
                             "    int x;\n"   // <- .. don't assign same varid
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: void blah ( ) {\n"
                       "3: Bar x@1 ( * this ) ;\n"
@@ -1821,7 +1843,7 @@ class TestVarID : public TestFixture {
     void varid_in_class4() {
         const char code[] = "class Foo {\n"
                             "public: class C;\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: public: class C ;\n"
                       "3: } ;\n",
@@ -1831,7 +1853,7 @@ class TestVarID : public TestFixture {
     void varid_in_class5() {
         const char code[] = "struct Foo {\n"
                             "    std::vector<::X> v;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: struct Foo {\n"
                       "2: std :: vector < :: X > v@1 ;\n"
                       "3: }\n",
@@ -1844,7 +1866,7 @@ class TestVarID : public TestFixture {
                             "        std::stringstream sst;\n"
                             "        sst.str();\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: void f ( const char * str@1 ) const {\n"
                       "3: std :: stringstream sst@2 ;\n"
@@ -1860,7 +1882,7 @@ class TestVarID : public TestFixture {
                             "        abc.a = 0;\n"
                             "    }\n"
                             "    struct ABC abc;\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: void f ( ) {\n"
                       "3: abc@1 . a@2 = 0 ;\n"
@@ -1875,7 +1897,7 @@ class TestVarID : public TestFixture {
                             "  UNKNOWN_MACRO(A)\n"
                             "private:\n"
                             "  int x;\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: UNKNOWN_MACRO ( A )\n"
                       "3: private:\n"
@@ -1892,7 +1914,7 @@ class TestVarID : public TestFixture {
                              "};\n"
                              "void A::setVar() {\n"
                              "  this->var = var;\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: int var@1 ;\n"
                       "3: public:\n"
@@ -1909,7 +1931,7 @@ class TestVarID : public TestFixture {
                              "};\n"
                              "void Foo::Clone(FooBase& g) {\n"
                              "    g->m_bar = m_bar;\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: class Foo : public FooBase {\n"
                       "2: void Clone ( FooBase & g@1 ) ;\n"
                       "3: short m_bar@2 ;\n"
@@ -1927,7 +1949,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "void Foo::Clone(FooBase& g) {\n"
                             "    ((FooBase)g)->m_bar = m_bar;\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: class Foo : public FooBase {\n"
                       "2: void Clone ( FooBase & g@1 ) ;\n"
                       "3: short m_bar@2 ;\n"
@@ -1942,7 +1964,7 @@ class TestVarID : public TestFixture {
         const char code1[] = "class Foo {\n"
                              "    union { float a; int b; };\n"
                              "    void f() { a=0; }\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: union { float a@1 ; int b@2 ; } ;\n"
                       "3: void f ( ) { a@1 = 0 ; }\n"
@@ -1952,7 +1974,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "class Foo {\n"
                              "    void f() { a=0; }\n"
                              "    union { float a; int b; };\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: void f ( ) { a@1 = 0 ; }\n"
                       "3: union { float a@1 ; int b@2 ; } ;\n"
@@ -1968,7 +1990,7 @@ class TestVarID : public TestFixture {
                              "    };\n"
                              "    g(abcd);\n"
                              "    h(a, b, c, d);\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: void f ( ) {\n"
                       "2: union {\n"
                       "3: struct {\n"
@@ -1985,7 +2007,7 @@ class TestVarID : public TestFixture {
         const char code4[] = "class Foo {\n"
                              "    void f(float a) { this->a = a; }\n"
                              "    union { float a; int b; };\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: void f ( float a@1 ) { this . a@2 = a@1 ; }\n"
                       "3: union { float a@2 ; int b@3 ; } ;\n"
@@ -1997,7 +2019,7 @@ class TestVarID : public TestFixture {
         const char code[] = "class Foo {\n"
                             "private:\n"
                             "    void f(void);\n"
-                            "};";
+                            "};\n";
         ASSERT_EQUALS("1: class Foo {\n"
                       "2: private:\n"
                       "3: void f ( ) ;\n"
@@ -2006,13 +2028,13 @@ class TestVarID : public TestFixture {
     }
 
     void varid_in_class13() {
-        const char code1[] = "struct a { char typename; };";
+        const char code1[] = "struct a { char typename; };\n";
         ASSERT_EQUALS("1: struct a { char typename@1 ; } ;\n",
                       tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("1: struct a { char typename ; } ;\n",  // not valid C++ code
                       tokenize(code1));
 
-        const char code2[] = "struct a { char typename[2]; };";
+        const char code2[] = "struct a { char typename[2]; };\n";
         ASSERT_EQUALS("1: struct a { char typename@1 [ 2 ] ; } ;\n",
                       tokenize(code2, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("1: struct a { char typename [ 2 ] ; } ;\n",  // not valid C++ code
@@ -2092,7 +2114,7 @@ class TestVarID : public TestFixture {
                              "    FOO Set(BAR);\n"
                              "    int method_with_class(B<B> b);\n"
                              "    bool function(std::map<int, int, MYless> & m);\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Fred {\n"
                       "2: int method_with_internal ( X & ) ;\n"
                       "3: int method_with_internal ( X * ) ;\n"
@@ -2110,7 +2132,7 @@ class TestVarID : public TestFixture {
                              "SomeType someVar1(i, i);\n"
                              "SomeType someVar2(j, j);\n"
                              "SomeType someVar3(j, 1);\n"
-                             "SomeType someVar4(new bar);";
+                             "SomeType someVar4(new bar);\n";
         ASSERT_EQUALS("1: int i@1 ;\n"
                       "2: SomeType someVar1@2 ( i@1 , i@1 ) ;\n"
                       "3: SomeType someVar2 ( j , j ) ;\n" // This one could be a function
@@ -2128,7 +2150,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "A::B::B() :\n"
                             "    i(0)\n"
-                            "{}";
+                            "{}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: class B ;\n"
                       "3: } ;\n"
@@ -2148,7 +2170,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "Fred::~Fred() {\n"
                             "    free(str1);\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: class Fred {\n"
                       "2: char * str1@1 ;\n"
                       "3: ~ Fred ( ) ;\n"
@@ -2166,7 +2188,7 @@ class TestVarID : public TestFixture {
                             "    cacheEntry();\n"
                             "};\n"
                             "\n"
-                            "template<class C> cacheEntry<C>::cacheEntry() : m_key() {}";
+                            "template<class C> cacheEntry<C>::cacheEntry() : m_key() {}\n";
 
         ASSERT_EQUALS("1: template < class C > class cacheEntry {\n"
                       "2: protected:\n"
@@ -2186,7 +2208,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "\n"
                             "template <typename t1,typename t2>\n"
-                            "A::B<t1,t2>::B() : x(9) {}";
+                            "A::B<t1,t2>::B() : x(9) {}\n";
 
         const char expected[] = "1: template < typename t1 , typename t2 >\n"
                                 "2: class A :: B {\n"
@@ -2293,7 +2315,7 @@ class TestVarID : public TestFixture {
                        "4: if ( v@2 . front ( ) . i@3 ) { }\n"
                        "5: }\n"
                        "6: } ;\n";
-            ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.s = &s)));
+            ASSERT_EQUALS(expected, tokenize(code, s));
         }
 
         {
@@ -2311,7 +2333,7 @@ class TestVarID : public TestFixture {
                        "5: std :: vector < U * > * p@2 ; p@2 = g ( ) ;\n"
                        "6: auto t@3 ; t@3 = p@2 . front ( ) . t@4 ;\n"
                        "7: }\n";
-            ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.s = &s)));
+            ASSERT_EQUALS(expected, tokenize(code, s));
         }
     }
 
@@ -2368,6 +2390,40 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varid_in_class29() {
+        const char code[] = "struct S {\n" // #14486
+                            "    const int& r;\n"
+                            "    explicit S(const int& r) : r(r) {}\n"
+                            "    static void f() {\n"
+                            "        struct T : std::vector<int> {\n"
+                            "            bool g() const { return empty(); }\n"
+                            "        };\n"
+                            "    }\n"
+                            "};\n";
+        const char expected[] = "1: struct S {\n"
+                                "2: const int & r@1 ;\n"
+                                "3: explicit S ( const int & r@2 ) : r@1 ( r@2 ) { }\n"
+                                "4: static void f ( ) {\n"
+                                "5: struct T : std :: vector < int > {\n"
+                                "6: bool g ( ) const { return empty ( ) ; }\n"
+                                "7: } ;\n"
+                                "8: }\n"
+                                "9: } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void varid_in_class30() {
+        const char code[] = "void* p;\n" // #13443
+                            "struct S {\n"
+                            "    void p();\n"
+                            "};\n";
+        const char expected[] = "1: void * p@1 ;\n"
+                                "2: struct S {\n"
+                                "3: void p ( ) ;\n"
+                                "4: } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varid_namespace_1() { // #7272
         const char code[] = "namespace Blah {\n"
                             "  struct foo { int x;};\n"
@@ -2375,7 +2431,7 @@ class TestVarID : public TestFixture {
                             "    int x;\n"
                             "    union { char y; };\n"
                             "  };\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace Blah {\n"
                       "2: struct foo { int x@1 ; } ;\n"
                       "3: struct bar {\n"
@@ -2397,7 +2453,7 @@ class TestVarID : public TestFixture {
                             "\n"
                             "void C::dostuff() {\n"
                             "   X = 0;\n"  // X@2
-                            "}";
+                            "}\n";
 
         const std::string actual = tokenize(code);
 
@@ -2428,7 +2484,7 @@ class TestVarID : public TestFixture {
                             "void Bar::f() {\n"
                             "  type = 0;\n"  // <- ... and here
                             "}\n"
-                            "}";
+                            "}\n";
 
         const std::string actual = tokenize(code);
 
@@ -2443,7 +2499,7 @@ class TestVarID : public TestFixture {
                             "    void dostuff();\n"
                             "  };\n"
                             "  void bar::dostuff() { int x2 = x * 2; }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace X {\n"
                       "2: struct foo { int x@1 ; } ;\n"
                       "3: struct bar : public foo {\n"
@@ -2462,7 +2518,7 @@ class TestVarID : public TestFixture {
                             "    };\n"
                             "    void bar::dostuff() { int x2 = x * 2; }\n"
                             "  }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace X {\n"
                       "2: struct foo { int x@1 ; } ;\n"
                       "3: namespace Y {\n"
@@ -2484,7 +2540,7 @@ class TestVarID : public TestFixture {
                             "            std::map<Vec2i, int>::iterator iter;\n"
                             "        }\n"
                             "    }\n"
-                            "}";
+                            "}\n";
         ASSERT_EQUALS("1: namespace N {\n"
                       "2: namespace O {\n"
                       "3: U :: U ( int * map@1 ) : id ( 0 ) {\n"
@@ -2501,7 +2557,7 @@ class TestVarID : public TestFixture {
         const char code1[] = "class A {\n"
                              "  A() : x(0) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( ) : x@1 ( 0 ) { }\n"
                       "3: int x@1 ;\n"
@@ -2511,7 +2567,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "class A {\n"
                              "  A(int x) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2522,7 +2578,7 @@ class TestVarID : public TestFixture {
                              "  A(int x);\n"
                              "  int x;\n"
                              "};\n"
-                             "A::A(int x) : x(x) {}";
+                             "A::A(int x) : x(x) {}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) ;\n"
                       "3: int x@2 ;\n"
@@ -2543,7 +2599,7 @@ class TestVarID : public TestFixture {
         const char code5[] = "class A {\n"
                              "  A(int x) noexcept : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) noexcept ( true ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2553,7 +2609,7 @@ class TestVarID : public TestFixture {
         const char code6[] = "class A {\n"
                              "  A(int x) noexcept(true) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) noexcept ( true ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2563,7 +2619,7 @@ class TestVarID : public TestFixture {
         const char code7[] = "class A {\n"
                              "  A(int x) noexcept(false) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) noexcept ( false ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2573,7 +2629,7 @@ class TestVarID : public TestFixture {
         const char code8[] = "class Foo : public Bar {\n"
                              "  explicit Foo(int i) : Bar(mi = i) { }\n"
                              "  int mi;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class Foo : public Bar {\n"
                       "2: explicit Foo ( int i@1 ) : Bar ( mi@2 = i@1 ) { }\n"
                       "3: int mi@2 ;\n"
@@ -2584,7 +2640,7 @@ class TestVarID : public TestFixture {
         const char code9[] = "class A {\n"
                              "  A(int x) : y(a?0:1), x(x) {}\n"
                              "  int x, y;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: A ( int x@1 ) : y@3 ( a ? 0 : 1 ) , x@2 ( x@1 ) { }\n"
                       "3: int x@2 ; int y@3 ;\n"
@@ -2597,7 +2653,7 @@ class TestVarID : public TestFixture {
                               "  A(const Matrix &m) throw (e);\n"
                               "};\n"
                               "A::A(const Matrix &m) throw (e) : work(0)\n"
-                              "{}";
+                              "{}\n";
         ASSERT_EQUALS("1: class A {\n"
                       "2: double * work@1 ;\n"
                       "3: A ( const Matrix & m@2 ) throw ( e ) ;\n"
@@ -2609,7 +2665,7 @@ class TestVarID : public TestFixture {
         const char code11[] = "struct S {\n" // #12733
                               "    explicit S(int& r) : a{ int{ 1 } }, b{ r } {}\n"
                               "    int a, &b;\n"
-                              "};";
+                              "};\n";
         ASSERT_EQUALS("1: struct S {\n"
                       "2: explicit S ( int & r@1 ) : a@2 { int { 1 } } , b@3 { r@1 } { }\n"
                       "3: int a@2 ; int & b@3 ;\n"
@@ -2665,7 +2721,7 @@ class TestVarID : public TestFixture {
         const char code1[] = "class A : B<C,D> {\n"
                              "  A() : B<C,D>(), x(0) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A : B < C , D > {\n"
                       "2: A ( ) : B < C , D > ( ) , x@1 ( 0 ) { }\n"
                       "3: int x@1 ;\n"
@@ -2675,7 +2731,7 @@ class TestVarID : public TestFixture {
         const char code2[] = "class A : B<C,D> {\n"
                              "  A(int x) : x(x) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A : B < C , D > {\n"
                       "2: A ( int x@1 ) : x@2 ( x@1 ) { }\n"
                       "3: int x@2 ;\n"
@@ -2686,7 +2742,7 @@ class TestVarID : public TestFixture {
                              "  A(int x);\n"
                              "  int x;\n"
                              "};\n"
-                             "A::A(int x) : x(x) {}";
+                             "A::A(int x) : x(x) {}\n";
         ASSERT_EQUALS("1: class A : B < C , D > {\n"
                       "2: A ( int x@1 ) ;\n"
                       "3: int x@2 ;\n"
@@ -2710,7 +2766,7 @@ class TestVarID : public TestFixture {
                              "};\n"
                              "BCLass::BCLass() : Ticket<void>() {\n"
                              "  member = 0;\n"
-                             "}";
+                             "}\n";
         ASSERT_EQUALS("1: class BCLass : public Ticket < void > {\n"
                       "2: BCLass ( ) ;\n"
                       "3: PClass * member@1 ;\n"
@@ -2725,7 +2781,7 @@ class TestVarID : public TestFixture {
         const char code1[] = "class A : public B::C {\n"
                              "  A() : B::C(), x(0) {}\n"
                              "  int x;\n"
-                             "};";
+                             "};\n";
         ASSERT_EQUALS("1: class A : public B :: C {\n"
                       "2: A ( ) : B :: C ( ) , x@1 ( 0 ) { }\n"
                       "3: int x@1 ;\n"
@@ -2740,7 +2796,7 @@ class TestVarID : public TestFixture {
                 "{\n"
                 "public:\n"
                 "    void operator=(const Foo &);\n"
-                "};");
+                "};\n");
 
             const char expected[] = "1: class Foo\n"
                                     "2: {\n"
@@ -2754,7 +2810,7 @@ class TestVarID : public TestFixture {
             const std::string actual = tokenize(
                 "struct Foo {\n"
                 "    void * operator new [](int);\n"
-                "};");
+                "};\n");
             const char expected[] = "1: struct Foo {\n"
                                     "2: void * operatornew[] ( int ) ;\n"
                                     "3: } ;\n";
@@ -2766,7 +2822,7 @@ class TestVarID : public TestFixture {
     void varid_throw() {  // ticket #1723
         const std::string actual = tokenize(
             "UserDefinedException* pe = new UserDefinedException();\n"
-            "throw pe;");
+            "throw pe;\n");
 
         const char expected[] = "1: UserDefinedException * pe@1 ; pe@1 = new UserDefinedException ( ) ;\n"
                                 "2: throw pe@1 ;\n";
@@ -2780,7 +2836,7 @@ class TestVarID : public TestFixture {
                             "    int a[10];\n"
                             "    AAA\n"
                             "    a[0] = 0;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( ) {\n"
                                 "2: int a@1 [ 10 ] ;\n"
                                 "3: AAA\n"
@@ -2791,8 +2847,8 @@ class TestVarID : public TestFixture {
 
     void varid_using() {
         // #3648
-        const char code[] = "using std::size_t;";
-        const char expected[] = "1: using unsigned long ;\n";
+        const char code[] = "using std::size_t;\n";
+        const char expected[] = "1: ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
@@ -2800,7 +2856,7 @@ class TestVarID : public TestFixture {
         const char code[] = "void f() {\n"
                             "    try { dostuff(); }\n"
                             "    catch (exception &e) { }\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( ) {\n"
                                 "2: try { dostuff ( ) ; }\n"
                                 "3: catch ( exception & e@1 ) { }\n"
@@ -2809,20 +2865,20 @@ class TestVarID : public TestFixture {
     }
 
     void varid_functionPrototypeTemplate() {
-        ASSERT_EQUALS("1: function < void ( ) > fptr@1 ;\n", tokenize("function<void(void)> fptr;"));
+        ASSERT_EQUALS("1: function < void ( ) > fptr@1 ;\n", tokenize("function<void(void)> fptr;\n"));
     }
 
     void varid_templatePtr() {
-        ASSERT_EQUALS("1: std :: map < int , FooTemplate < int > * > dummy_member@1 [ 1 ] ;\n", tokenize("std::map<int, FooTemplate<int>*> dummy_member[1];"));
+        ASSERT_EQUALS("1: std :: map < int , FooTemplate < int > * > dummy_member@1 [ 1 ] ;\n", tokenize("std::map<int, FooTemplate<int>*> dummy_member[1];\n"));
     }
 
     void varid_templateNamespaceFuncPtr() {
-        ASSERT_EQUALS("1: KeyListT < float , & NIFFile :: getFloat > mKeyList@1 [ 4 ] ;\n", tokenize("KeyListT<float, &NIFFile::getFloat> mKeyList[4];"));
+        ASSERT_EQUALS("1: KeyListT < float , & NIFFile :: getFloat > mKeyList@1 [ 4 ] ;\n", tokenize("KeyListT<float, &NIFFile::getFloat> mKeyList[4];\n"));
     }
 
     void varid_templateArray() {
         ASSERT_EQUALS("1: VertexArrayIterator < float [ 2 ] > attrPos@1 ; attrPos@1 = m_AttributePos . GetIterator < float [ 2 ] > ( ) ;\n",
-                      tokenize("VertexArrayIterator<float[2]> attrPos = m_AttributePos.GetIterator<float[2]>();"));
+                      tokenize("VertexArrayIterator<float[2]> attrPos = m_AttributePos.GetIterator<float[2]>();\n"));
     }
 
     void varid_templateParameter() {
@@ -2855,7 +2911,7 @@ class TestVarID : public TestFixture {
 
     void varid_templateUsing() { // #5781 #7273
         const char code[] = "template<class T> using X = Y<T,4>;\n"
-                            "X<int> x;";
+                            "X<int> x;\n";
         ASSERT_EQUALS("2: Y < int , 4 > x@1 ;\n",
                       tokenize(code));
     }
@@ -2874,62 +2930,62 @@ class TestVarID : public TestFixture {
     }
 
     void varid_not_template_in_condition() {
-        const char code1[] = "void f() { if (x<a||x>b); }";
+        const char code1[] = "void f() { if (x<a||x>b); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( x < a || x > b ) { ; } }\n", tokenize(code1));
 
-        const char code2[] = "void f() { if (1+x<a||x>b); }";
+        const char code2[] = "void f() { if (1+x<a||x>b); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( 1 + x < a || x > b ) { ; } }\n", tokenize(code2));
 
-        const char code3[] = "void f() { if (x<a||x>b+1); }";
+        const char code3[] = "void f() { if (x<a||x>b+1); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( x < a || x > b + 1 ) { ; } }\n", tokenize(code3));
 
-        const char code4[] = "void f() { if ((x==13) && (x<a||x>b)); }";
+        const char code4[] = "void f() { if ((x==13) && (x<a||x>b)); }\n";
         ASSERT_EQUALS("1: void f ( ) { if ( ( x == 13 ) && ( x < a || x > b ) ) { ; } }\n", tokenize(code4));
     }
 
     void varid_cppcast() {
         ASSERT_EQUALS("1: const_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("const_cast<int *>(code)[0] = 0;"));
+                      tokenize("const_cast<int *>(code)[0] = 0;\n"));
 
         ASSERT_EQUALS("1: dynamic_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("dynamic_cast<int *>(code)[0] = 0;"));
+                      tokenize("dynamic_cast<int *>(code)[0] = 0;\n"));
 
         ASSERT_EQUALS("1: reinterpret_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("reinterpret_cast<int *>(code)[0] = 0;"));
+                      tokenize("reinterpret_cast<int *>(code)[0] = 0;\n"));
 
         ASSERT_EQUALS("1: static_cast < int * > ( code ) [ 0 ] = 0 ;\n",
-                      tokenize("static_cast<int *>(code)[0] = 0;"));
+                      tokenize("static_cast<int *>(code)[0] = 0;\n"));
     }
 
     void varid_variadicFunc() {
-        ASSERT_EQUALS("1: int foo ( ... ) ;\n", tokenize("int foo(...);"));
+        ASSERT_EQUALS("1: int foo ( ... ) ;\n", tokenize("int foo(...);\n"));
     }
 
     void varid_typename() {
-        ASSERT_EQUALS("1: template < int d , class A , class B > struct S { } ;\n", tokenize("template<int d, class A, class B> struct S {};"));
+        ASSERT_EQUALS("1: template < int d , class A , class B > struct S { } ;\n", tokenize("template<int d, class A, class B> struct S {};\n"));
 
-        ASSERT_EQUALS("1: template < int d , typename A , typename B > struct S { } ;\n", tokenize("template<int d, typename A, typename B> struct S {};"));
+        ASSERT_EQUALS("1: template < int d , typename A , typename B > struct S { } ;\n", tokenize("template<int d, typename A, typename B> struct S {};\n"));
 
-        ASSERT_EQUALS("1: A a@1 ;\n", tokenize("typename A a;"));
+        ASSERT_EQUALS("1: A a@1 ;\n", tokenize("typename A a;\n"));
     }
 
     void varid_rvalueref() {
-        ASSERT_EQUALS("1: int && a@1 ;\n", tokenize("int&& a;"));
+        ASSERT_EQUALS("1: int && a@1 ;\n", tokenize("int&& a;\n"));
 
-        ASSERT_EQUALS("1: void foo ( int && a@1 ) { }\n", tokenize("void foo(int&& a) {}"));
+        ASSERT_EQUALS("1: void foo ( int && a@1 ) { }\n", tokenize("void foo(int&& a) {}\n"));
 
         ASSERT_EQUALS("1: class C {\n"
                       "2: C ( int && a@1 ) ;\n"
                       "3: } ;\n",
                       tokenize("class C {\n"
                                "    C(int&& a);\n"
-                               "};"));
+                               "};\n"));
 
-        ASSERT_EQUALS("1: void foo ( int && ) ;\n", tokenize("void foo(int&&);"));
+        ASSERT_EQUALS("1: void foo ( int && ) ;\n", tokenize("void foo(int&&);\n"));
     }
 
     void varid_arrayFuncPar() {
-        ASSERT_EQUALS("1: void check ( const char fname@1 [ ] = 0 ) { }\n", tokenize("void check( const char fname[] = 0) { }"));
+        ASSERT_EQUALS("1: void check ( const char fname@1 [ ] = 0 ) { }\n", tokenize("void check( const char fname[] = 0) { }\n"));
     }
 
     void varid_sizeofPassed() {
@@ -2942,7 +2998,7 @@ class TestVarID : public TestFixture {
                                "    const char* argv[] = { \"./test_runner\", \"TestClass\" };\n"
                                "    options args(sizeof argv / sizeof argv[0], argv);\n"
                                "    args.which_test();\n"
-                               "}"));
+                               "}\n"));
     }
 
     void varid_classInFunction() {
@@ -2957,7 +3013,7 @@ class TestVarID : public TestFixture {
                                "        void reportErr(ErrorLogger::ErrorMessage &msg) {\n"
                                "        }\n"
                                "    };\n"
-                               "}"));
+                               "}\n"));
     }
 
     void varid_pointerToArray() {
@@ -2982,7 +3038,7 @@ class TestVarID : public TestFixture {
                                "    int f2(int i) { return a4[i]; }\n"
                                "    int f3(int(&a5)[10], int i) { return a5[i]; }\n"
                                "};\n"
-                               "int f4(int(&a6)[10], int i) { return a6[i]; }"));
+                               "int f4(int(&a6)[10], int i) { return a6[i]; }\n"));
     }
 
     void varid_cpp11initialization() {
@@ -2995,15 +3051,15 @@ class TestVarID : public TestFixture {
                                "std::vector<int> vec{1, 2, 3};\n"
                                "namespace n { int z; };\n"
                                "int& j{i};\n"
-                               "int k{1}, l{2};"));
+                               "int k{1}, l{2};\n"));
 
         // #6030
         ASSERT_EQUALS("1: struct S3 : public S1 , public S2 { } ;\n",
-                      tokenize("struct S3 : public S1, public S2 { };"));
+                      tokenize("struct S3 : public S1, public S2 { };\n"));
 
         // #6058
         ASSERT_EQUALS("1: class Scope { } ;\n",
-                      tokenize("class CPPCHECKLIB Scope { };"));
+                      tokenize("class CPPCHECKLIB Scope { };\n"));
 
         // #6073 #6253
         ASSERT_EQUALS("1: class A : public B , public C :: D , public E < F > :: G < H > {\n"
@@ -3017,7 +3073,12 @@ class TestVarID : public TestFixture {
                                "    A(int i): B{i}, C::D{i}, E<F>::G<H>{i} ,i{i} {\n"
                                "        int j{i};\n"
                                "    }\n"
-                               "};"));
+                               "};\n"));
+
+        ASSERT_EQUALS("1: struct Sx { int i@1 ; } ;\n" // #14733
+                      "2: struct Sx sx@2 { 0 } ;\n",
+                      tokenize("struct Sx { int i; };\n"
+                               "struct Sx sx{ 0 }; \n"));
     }
 
     void varid_inheritedMembers() {
@@ -3038,7 +3099,7 @@ class TestVarID : public TestFixture {
                                "};\n"
                                "void B::f() {\n"
                                "    a = 0;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: class A {\n"
                       "2: int a@1 ;\n"
@@ -3057,7 +3118,7 @@ class TestVarID : public TestFixture {
                                "};\n"
                                "void B::f() {\n"
                                "    a = 0;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: class A {\n"
                       "2: int a@1 ;\n"
@@ -3076,7 +3137,7 @@ class TestVarID : public TestFixture {
                                "};\n"
                                "void B::f() {\n"
                                "    a = 0;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: class A {\n"
                       "2: int a@1 ;\n"
@@ -3093,7 +3154,7 @@ class TestVarID : public TestFixture {
                                "    void f() {\n"
                                "        a = 0;\n"
                                "    }\n"
-                               "};"));
+                               "};\n"));
     }
 
     void varid_header() {
@@ -3104,7 +3165,7 @@ class TestVarID : public TestFixture {
                       tokenizeHeader("class A;\n"
                                      "struct B {\n"
                                      "    void setData(const A & a);\n"
-                                     "}; ", "test.h"));
+                                     "}; \n", "test.h"));
         ASSERT_EQUALS("1: class A ;\n"
                       "2: struct B {\n"
                       "3: void setData ( const A & a@1 ) ;\n"
@@ -3112,7 +3173,7 @@ class TestVarID : public TestFixture {
                       tokenizeHeader("class A;\n"
                                      "struct B {\n"
                                      "    void setData(const A & a);\n"
-                                     "}; ", "test.hpp"));
+                                     "}; \n", "test.hpp"));
         ASSERT_EQUALS("1: void f ( )\n"
                       "2: {\n"
                       "3: int class@1 ;\n"
@@ -3120,7 +3181,7 @@ class TestVarID : public TestFixture {
                       tokenizeHeader("void f()\n"
                                      "{\n"
                                      "    int class;\n"
-                                     "}", "test.h"));
+                                     "}\n", "test.h"));
     }
 
     void varid_rangeBasedFor() {
@@ -3131,7 +3192,7 @@ class TestVarID : public TestFixture {
                       tokenize("void reset(Foo array) {\n"
                                "    for (auto& e : array)\n"
                                "        foo(e);\n"
-                               "};"));
+                               "};\n"));
 
         ASSERT_EQUALS("1: void reset ( Foo array@1 ) {\n"
                       "2: for ( auto e@2 : array@1 ) {\n"
@@ -3140,7 +3201,7 @@ class TestVarID : public TestFixture {
                       tokenize("void reset(Foo array) {\n"
                                "    for (auto e : array)\n"
                                "        foo(e);\n"
-                               "};"));
+                               "};\n"));
 
         // Labels are no variables
         ASSERT_EQUALS("1: void foo ( ) {\n"
@@ -3160,7 +3221,7 @@ class TestVarID : public TestFixture {
                                "        delta = 1;\n"
                                "        break;\n"
                                "    }\n"
-                               "}", dinit(TokenizeOptions, $.cpp = false)));
+                               "}\n", dinit(TokenizeOptions, $.cpp = false)));
 
         ASSERT_EQUALS("1: int * f ( ) {\n" // #11838
                       "2: int * label@1 ; label@1 = 0 ;\n"
@@ -3171,7 +3232,7 @@ class TestVarID : public TestFixture {
                                "    int* label = 0;\n"
                                "label:\n"
                                "    return label;\n"
-                               "}"));
+                               "}\n"));
     }
 
     void varid_structinit() { // #6406
@@ -3180,21 +3241,21 @@ class TestVarID : public TestFixture {
                       "3: }\n",
                       tokenize("void foo() {\n"
                                "  struct ABC abc = {.a=0,.b=1};\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: void foo ( ) {\n"
                       "2: struct ABC abc@1 ; abc@1 = { . a@2 = abc@1 . a@2 , . b@3 = abc@1 . b@3 } ;\n"
                       "3: }\n",
                       tokenize("void foo() {\n"
                                "  struct ABC abc = {.a=abc.a,.b=abc.b};\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: void foo ( ) {\n"
                       "2: struct ABC abc@1 ; abc@1 = { . a@2 { abc@1 . a@2 } , . b@3 = { abc@1 . b@3 } } ;\n"
                       "3: }\n",
                       tokenize("void foo() {\n"
                                "  struct ABC abc = {.a { abc.a },.b= { abc.b } };\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: struct T { int a@1 ; } ;\n" // #13123
                       "2: void f ( int a@2 ) {\n"
@@ -3223,10 +3284,10 @@ class TestVarID : public TestFixture {
 
     void varid_arrayinit() {
         // #7579 - no variable declaration in rhs
-        ASSERT_EQUALS("1: void foo ( int * a@1 ) { int b@2 [ 1 ] = { x * a@1 [ 0 ] } ; }\n", tokenize("void foo(int*a) { int b[] = { x*a[0] }; }"));
+        ASSERT_EQUALS("1: void foo ( int * a@1 ) { int b@2 [ 1 ] = { x * a@1 [ 0 ] } ; }\n", tokenize("void foo(int*a) { int b[] = { x*a[0] }; }\n"));
 
         // #12402
-        ASSERT_EQUALS("1: void f ( ) { void ( * p@1 [ 1 ] ) ( int ) = { [ ] ( int i@2 ) { } } ; }\n", tokenize("void f() { void (*p[1])(int) = { [](int i) {} }; }"));
+        ASSERT_EQUALS("1: void f ( ) { void ( * p@1 [ 1 ] ) ( int ) = { [ ] ( int i@2 ) { } } ; }\n", tokenize("void f() { void (*p[1])(int) = { [](int i) {} }; }\n"));
     }
 
     void varid_lambda_arg() {
@@ -3234,7 +3295,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] = "static void func(int ec) {\n"
                                 "    func2([](const std::error_code& ec) { return ec; });\n"
-                                "}";
+                                "}\n";
             const char exp[] = "1: static void func ( int ec@1 ) {\n"
                                "2: func2 ( [ ] ( const std :: error_code & ec@2 ) { return ec@2 ; } ) ;\n"
                                "3: }\n";
@@ -3243,7 +3304,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] = "static void func(int ec) {\n"
                                 "    func2([](int x, const std::error_code& ec) { return x + ec; });\n"
-                                "}";
+                                "}\n";
             const char exp[] = "1: static void func ( int ec@1 ) {\n"
                                "2: func2 ( [ ] ( int x@2 , const std :: error_code & ec@3 ) { return x@2 + ec@3 ; } ) ;\n"
                                "3: }\n";
@@ -3292,7 +3353,7 @@ class TestVarID : public TestFixture {
             const char code[] = "static void func() {\n"
                                 "    auto x = []() mutable {};\n"
                                 "    dostuff(x);\n"
-                                "}";
+                                "}\n";
             const char exp[] = "1: static void func ( ) {\n"
                                "2: auto x@1 ; x@1 = [ ] ( ) mutable { } ;\n"
                                "3: dostuff ( x@1 ) ;\n"
@@ -3308,31 +3369,31 @@ class TestVarID : public TestFixture {
     }
 
     void varid_trailing_return1() { // #8889
-        const char code1[] = "struct Fred {\n"
-                             "    auto foo(const Fred & other) -> Fred &;\n"
-                             "    auto bar(const Fred & other) -> Fred & {\n"
-                             "        return *this;\n"
-                             "    }\n"
-                             "};\n"
-                             "auto Fred::foo(const Fred & other) -> Fred & {\n"
-                             "    return *this;\n"
-                             "}";
-        const char exp1[] = "1: struct Fred {\n"
-                            "2: auto foo ( const Fred & other@1 ) . Fred & ;\n"
-                            "3: auto bar ( const Fred & other@2 ) . Fred & {\n"
-                            "4: return * this ;\n"
-                            "5: }\n"
-                            "6: } ;\n"
-                            "7: auto Fred :: foo ( const Fred & other@3 ) . Fred & {\n"
-                            "8: return * this ;\n"
-                            "9: }\n";
-        ASSERT_EQUALS(exp1, tokenize(code1));
+        const char code[] = "struct Fred {\n"
+                            "    auto foo(const Fred & other) -> Fred &;\n"
+                            "    auto bar(const Fred & other) -> Fred & {\n"
+                            "        return *this;\n"
+                            "    }\n"
+                            "};\n"
+                            "auto Fred::foo(const Fred & other) -> Fred & {\n"
+                            "    return *this;\n"
+                            "}\n";
+        const char exp[] = "1: struct Fred {\n"
+                           "2: auto foo ( const Fred & other@1 ) . Fred & ;\n"
+                           "3: auto bar ( const Fred & other@2 ) . Fred & {\n"
+                           "4: return * this ;\n"
+                           "5: }\n"
+                           "6: } ;\n"
+                           "7: auto Fred :: foo ( const Fred & other@3 ) . Fred & {\n"
+                           "8: return * this ;\n"
+                           "9: }\n";
+        ASSERT_EQUALS(exp, tokenize(code));
     }
 
     void varid_trailing_return2() { // #9066
-        const char code1[] = "auto func(int arg) -> bar::quux {}";
-        const char exp1[] = "1: auto func ( int arg@1 ) . bar :: quux { }\n";
-        ASSERT_EQUALS(exp1, tokenize(code1));
+        const char code[] = "auto func(int arg) -> bar::quux {}\n";
+        const char exp[] = "1: auto func ( int arg@1 ) . bar :: quux { }\n";
+        ASSERT_EQUALS(exp, tokenize(code));
     }
 
     void varid_trailing_return3() { // #11423
@@ -3348,15 +3409,15 @@ class TestVarID : public TestFixture {
     }
 
     void varid_parameter_pack() { // #9383
-        const char code1[] = "template <typename... Rest>\n"
-                             "void func(Rest... parameters) {\n"
-                             "    foo(parameters...);\n"
-                             "}\n";
-        const char exp1[] = "1: template < typename ... Rest >\n"
-                            "2: void func ( Rest ... parameters@1 ) {\n"
-                            "3: foo ( parameters@1 ... ) ;\n"
-                            "4: }\n";
-        ASSERT_EQUALS(exp1, tokenize(code1));
+        const char code[] = "template <typename... Rest>\n"
+                            "void func(Rest... parameters) {\n"
+                            "    foo(parameters...);\n"
+                            "}\n";
+        const char exp[] = "1: template < typename ... Rest >\n"
+                           "2: void func ( Rest ... parameters@1 ) {\n"
+                           "3: foo ( parameters@1 ... ) ;\n"
+                           "4: }\n";
+        ASSERT_EQUALS(exp, tokenize(code));
     }
 
     void varid_for_auto_cpp17() {
@@ -3365,24 +3426,24 @@ class TestVarID : public TestFixture {
                             "    x+y+z;\n"
                             "  }\n"
                             "  x+y+z;\n"
-                            "}";
-        const char exp1[] = "1: void f ( ) {\n"
-                            "2: for ( auto [ x@1 , y@2 , z@3 ] : xyz ) {\n"
-                            "3: x@1 + y@2 + z@3 ;\n"
-                            "4: }\n"
-                            "5: x + y + z ;\n"
-                            "6: }\n";
-        ASSERT_EQUALS(exp1, tokenize(code));
+                            "}\n";
+        const char exp[] = "1: void f ( ) {\n"
+                           "2: for ( auto [ x@1 , y@2 , z@3 ] : xyz ) {\n"
+                           "3: x@1 + y@2 + z@3 ;\n"
+                           "4: }\n"
+                           "5: x + y + z ;\n"
+                           "6: }\n";
+        ASSERT_EQUALS(exp, tokenize(code));
     }
 
     void varid_not() { // #9689 'not x'
-        const char code1[] = "void foo(int x) const {\n"
-                             "  if (not x) {}\n"
-                             "}";
-        const char exp1[] = "1: void foo ( int x@1 ) const {\n"
-                            "2: if ( ! x@1 ) { }\n"
-                            "3: }\n";
-        ASSERT_EQUALS(exp1, tokenize(code1));
+        const char code[] = "void foo(int x) const {\n"
+                            "  if (not x) {}\n"
+                            "}\n";
+        const char exp[] = "1: void foo ( int x@1 ) const {\n"
+                           "2: if ( ! x@1 ) { }\n"
+                           "3: }\n";
+        ASSERT_EQUALS(exp, tokenize(code));
     }
 
     void varid_declInIfCondition() {
@@ -3394,7 +3455,7 @@ class TestVarID : public TestFixture {
                       tokenize("void f(int x) {\n"
                                "  if (int x = 0) { x; }\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
         // if, else
         ASSERT_EQUALS("1: void f ( int x@1 ) {\n"
                       "2: if ( int x@2 = 0 ) { x@2 ; }\n"
@@ -3405,7 +3466,7 @@ class TestVarID : public TestFixture {
                                "  if (int x = 0) { x; }\n"
                                "  else { x; }\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
         // if, else if
         ASSERT_EQUALS("1: void f ( int x@1 ) {\n"
                       "2: if ( int x@2 = 0 ) { x@2 ; }\n"
@@ -3416,7 +3477,7 @@ class TestVarID : public TestFixture {
                                "  if (int x = 0) x;\n"
                                "  else if (void* x = &x) x;\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
         // if, else if, else
         ASSERT_EQUALS("1: void f ( int x@1 ) {\n"
                       "2: if ( int x@2 = 0 ) { x@2 ; }\n"
@@ -3429,7 +3490,7 @@ class TestVarID : public TestFixture {
                                "  else if (void* x = &x) x;\n"
                                "  else x;\n"
                                "  x;\n"
-                               "}"));
+                               "}\n"));
 
         ASSERT_EQUALS("1: const char * f ( int * ) ;\n" // #12924
                       "2: void g ( int i@1 ) {\n"
@@ -3442,26 +3503,26 @@ class TestVarID : public TestFixture {
     }
 
     void varid_globalScope() {
-        const char code1[] = "int a[5];\n"
-                             "namespace Z { struct B { int a[5]; } b; }\n"
-                             "void f() {\n"
-                             "  int a[5];\n"
-                             "  memset(a, 123, 5);\n"
-                             "  memset(::a, 123, 5);\n"
-                             "  memset(Z::b.a, 123, 5);\n"
-                             "  memset(::Z::b.a, 123, 5);\n"
-                             "}";
-
-        const char exp1[] = "1: int a@1 [ 5 ] ;\n"
-                            "2: namespace Z { struct B { int a@2 [ 5 ] ; } ; struct B b@3 ; }\n"
-                            "3: void f ( ) {\n"
-                            "4: int a@4 [ 5 ] ;\n"
-                            "5: memset ( a@4 , 123 , 5 ) ;\n"
-                            "6: memset ( :: a@1 , 123 , 5 ) ;\n"
-                            "7: memset ( Z :: b@3 . a , 123 , 5 ) ;\n"
-                            "8: memset ( :: Z :: b@3 . a , 123 , 5 ) ;\n"
-                            "9: }\n";
-        ASSERT_EQUALS(exp1, tokenize(code1));
+        const char code[] = "int a[5];\n"
+                            "namespace Z { struct B { int a[5]; } b; }\n"
+                            "void f() {\n"
+                            "  int a[5];\n"
+                            "  memset(a, 123, 5);\n"
+                            "  memset(::a, 123, 5);\n"
+                            "  memset(Z::b.a, 123, 5);\n"
+                            "  memset(::Z::b.a, 123, 5);\n"
+                            "}\n";
+
+        const char exp[] = "1: int a@1 [ 5 ] ;\n"
+                           "2: namespace Z { struct B { int a@2 [ 5 ] ; } ; struct B b@3 ; }\n"
+                           "3: void f ( ) {\n"
+                           "4: int a@4 [ 5 ] ;\n"
+                           "5: memset ( a@4 , 123 , 5 ) ;\n"
+                           "6: memset ( :: a@1 , 123 , 5 ) ;\n"
+                           "7: memset ( Z :: b@3 . a , 123 , 5 ) ;\n"
+                           "8: memset ( :: Z :: b@3 . a , 123 , 5 ) ;\n"
+                           "9: }\n";
+        ASSERT_EQUALS(exp, tokenize(code));
     }
 
     void varid_function_pointer_args() {
@@ -3485,11 +3546,27 @@ class TestVarID : public TestFixture {
 
         const char code3[] = "void f (void (*g) (int i, IN int n)) {}\n";
         ASSERT_EQUALS("1: void f ( void ( * g@1 ) ( int , IN int ) ) { }\n", tokenize(code3));
+
+        const char code4[] = "void f() {\n" // #14439
+                             "    int* p;\n"
+                             "    void (*a[1])(int* p) = { 0 };\n"
+                             "}\n";
+        ASSERT_EQUALS("1: void f ( ) {\n"
+                      "2: int * p@1 ;\n"
+                      "3: void ( * a@2 [ 1 ] ) ( int * ) = { 0 } ;\n"
+                      "4: }\n",
+                      tokenize(code4));
+
+        const char code5[] = "int *p;\n"
+                             "void (*a[1])(int* p) = { 0 } ;\n";
+        ASSERT_EQUALS("1: int * p@1 ;\n"
+                      "2: void ( * a@2 [ 1 ] ) ( int * ) = { 0 } ;\n"
+                      , tokenize(code5));
     }
 
     void varid_alignas() {
         const char code[] = "extern alignas(16) int x;\n"
-                            "alignas(16) int x;";
+                            "alignas(16) int x;\n";
         const char expected[] = "1: extern alignas ( 16 ) int x@1 ;\n"
                                 "2: alignas ( 16 ) int x@2 ;\n";
         ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
@@ -3512,7 +3589,7 @@ class TestVarID : public TestFixture {
             "Fred::foo1()\n"
             "{\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: {\n"
@@ -3548,7 +3625,7 @@ class TestVarID : public TestFixture {
             "void Fred::f()\n"
             "{\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: { void f ( ) ; } ;\n"
@@ -3580,7 +3657,7 @@ class TestVarID : public TestFixture {
             "void A::f()\n"
             "{\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: { int i@1 ; void f ( ) ; } ;\n"
@@ -3608,7 +3685,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    if (i) { }\n"
             "    i = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class Fred\n"
                                 "2: { int i@1 ; void f ( ) ; } ;\n"
@@ -3630,7 +3707,7 @@ class TestVarID : public TestFixture {
             "    A *a;\n"
             "    B() : a(new A)\n"
             "    { }\n"
-            "};");
+            "};\n");
 
         const char expected[] = "1: class A { } ;\n"
                                 "2: class B\n"
@@ -3655,7 +3732,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "  char buf[2];\n"
             "  A::buf[10] = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: class A\n"
                                 "2: {\n"
@@ -3678,7 +3755,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "  char buf[2];\n"
             "  A::buf[10] = 0;\n"
-            "}");
+            "}\n");
 
         const char expected[] = "1: int main ( )\n"
                                 "2: {\n"
@@ -3718,7 +3795,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "void Fred::f(Str &cl) {\n"
                             "    sizeof(cl);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: class A {\n"
                                 "2: public:\n"
@@ -3808,7 +3885,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] ="class A {\n"
                                 "friend class B;\n"
-                                "}";
+                                "}\n";
 
             const char expected[] = "1: class A {\n"
                                     "2: friend class B ;\n"
@@ -3820,7 +3897,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] ="class A {\n"
                                 "private: friend class B;\n"
-                                "}";
+                                "}\n";
 
             const char expected[] = "1: class A {\n"
                                     "2: private: friend class B ;\n"
@@ -3836,7 +3913,7 @@ class TestVarID : public TestFixture {
                             "    int b;\n"
                             "    A();\n"
                             "};\n"
-                            "A::A() : a(0) { b = 1; }";
+                            "A::A() : a(0) { b = 1; }\n";
         const char expected[] = "1: class A {\n"
                                 "2: int a@1 ;\n"
                                 "3: int b@2 ;\n"
@@ -3856,7 +3933,7 @@ class TestVarID : public TestFixture {
                             "};\n"
                             "void A::setPFun(int mode) {\n"
                             "    pFun = &A::funcNorm;\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: struct A ;\n"
                                 "2:\n"
                                 "3: struct A {\n"
@@ -3876,7 +3953,7 @@ class TestVarID : public TestFixture {
                             "    A(int i): B(i), C::D(i), i(i) {\n"
                             "        int j(i);\n"
                             "    }\n"
-                            "};";
+                            "};\n";
         const char expected[] = "1: class A : public B , public C :: D {\n"
                                 "2: int i@1 ;\n"
                                 "3: A ( int i@2 ) : B ( i@2 ) , C :: D ( i@2 ) , i@1 ( i@2 ) {\n"
@@ -3889,7 +3966,7 @@ class TestVarID : public TestFixture {
                              "    std::vector<int> v;\n"
                              "    int i;\n"
                              "    S(int i) : v({ 0 }), i(i) {}\n"
-                             "};";
+                             "};\n";
         const char expected2[] = "1: struct S {\n"
                                  "2: std :: vector < int > v@1 ;\n"
                                  "3: int i@2 ;\n"
@@ -3904,7 +3981,7 @@ class TestVarID : public TestFixture {
                             "    int b;\n"
                             "    A();\n"
                             "};\n"
-                            "A::A() : a{0} { b = 1; }";
+                            "A::A() : a{0} { b = 1; }\n";
         const char expected[] = "1: class A {\n"
                                 "2: int a@1 ;\n"
                                 "3: int b@2 ;\n"
@@ -3919,7 +3996,7 @@ class TestVarID : public TestFixture {
                             "  int a;\n"
                             "  A();\n"
                             "};\n"
-                            "A::A() : ::B(), a(0) {}";
+                            "A::A() : ::B(), a(0) {}\n";
         const char expected[] = "1: class A : public :: B {\n"
                                 "2: int a@1 ;\n"
                                 "3: A ( ) ;\n"
@@ -3933,7 +4010,7 @@ class TestVarID : public TestFixture {
                             "  int (*p)[2];\n"
                             "  S();\n"
                             "};\n"
-                            "S::S() { p[0] = 0; }";
+                            "S::S() { p[0] = 0; }\n";
         const char expected[] = "1: struct S {\n"
                                 "2: int ( * p@1 ) [ 2 ] ;\n"
                                 "3: S ( ) ;\n"
@@ -3942,6 +4019,14 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varidclass21() {
+        const char code[] = "struct T { static bool b; };\n" // #14972
+                            "bool T::b(!false);\n";
+        const char expected[] = "1: struct T { static bool b@1 ; } ;\n"
+                                "2: bool T :: b@1 ( ! false ) ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varidenum1() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"
@@ -4080,7 +4165,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "int main() {\n"
                             "    return foo(A::buf);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: namespace A {\n"
                                 "2: char buf@1 [ 20 ] ;\n"
@@ -4100,7 +4185,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "int main() {\n"
                             "  return foo(A::B::buf);\n"
-                            "}";
+                            "}\n";
 
         const char expected[] = "1: namespace A {\n"
                                 "2: namespace B {\n"
@@ -4148,7 +4233,7 @@ class TestVarID : public TestFixture {
                             "    }\n"
                             "}\n"
                             "using namespace A::B;\n"
-                            "C::C() : m(42) {}";
+                            "C::C() : m(42) {}\n";
 
         const char expected[] = "1: namespace A {\n"
                                 "2: namespace B {\n"
@@ -4169,7 +4254,7 @@ class TestVarID : public TestFixture {
                             "{\n"
                             "    foo.size = 0;\n"
                             "    return ((uint8_t)(foo).size);\n"
-                            "}";
+                            "}\n";
         const char expected[] = "1: void f ( Foo foo@1 )\n"
                                 "2: {\n"
                                 "3: foo@1 . size@2 = 0 ;\n"
@@ -4179,17 +4264,43 @@ class TestVarID : public TestFixture {
     }
 
     void decltype1() {
-        const char code[] = "void foo(int x, decltype(A::b) *p);";
+        const char code[] = "void foo(int x, decltype(A::b) *p);\n";
         const char expected[] = "1: void foo ( int x@1 , decltype ( A :: b ) * p@2 ) ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void decltype2() {
-        const char code[] = "int x; decltype(x) y;";
+        const char code[] = "int x; decltype(x) y;\n";
         const char expected[] = "1: int x@1 ; decltype ( x@1 ) y@2 ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void typeof1() {
+        const char code[] = "int x; typeof(x) y;\n";
+        const char expected[] = "1: int x@1 ; typeof ( x@1 ) y@2 ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void typeof2() {
+        const char code[] = "int x; typeof(x) *y;\n";
+        const char expected[] = "1: int x@1 ; typeof ( x@1 ) * y@2 ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void typeof3() {
+        const char code[] = "int x; const typeof(x) *const y;\n";
+        const char expected[] = "1: int x@1 ; const typeof ( x@1 ) * const y@2 ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void typeof4() {
+        const char code[] = "int x; __typeof(x) y;\n";
+        const char expected[] = "1: int x@1 ; __typeof ( x@1 ) y@2 ;\n";
+        TokenizeOptions options;
+        options.cpp = false;
+        ASSERT_EQUALS(expected, tokenize(code, options));
+    }
+
     void exprid1() {
         const std::string actual = tokenizeExpr(
             "struct A {\n"
@@ -4308,7 +4419,7 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenizeExpr(code));
 
         const char code2[] = "struct S { std::function<void()>* p; };\n"
-                             "S f() { return S{ std::make_unique<std::function<void()>>([]() {}).release()}; }";
+                             "S f() { return S{ std::make_unique<std::function<void()>>([]() {}).release()}; }\n";
         const char expected2[] = "1: struct S { std :: function < void ( ) > * p ; } ;\n"
                                  "2: S f ( ) { return S@UNIQUE {@UNIQUE std ::@UNIQUE make_unique < std :: function < void ( ) > > (@UNIQUE [ ] ( ) { } ) .@UNIQUE release (@UNIQUE ) } ; }\n";
         ASSERT_EQUALS(expected2, tokenizeExpr(code2));
@@ -4416,7 +4527,7 @@ class TestVarID : public TestFixture {
                           "2: struct T { struct S s ; } ;\n"
                           "3: struct U { struct T t ; } ;\n"
                           "4: void f ( ) {\n"
-                          "5: struct U u@4 ; u@4 = { .@UNIQUE t@5 = { . s = { . s = 1 } } } ;\n"
+                          "5: struct U u@4 ; u@4 = { .@UNIQUE t@5 = { .@UNIQUE s@6 = { .@UNIQUE s@7 = 1 } } } ;\n"
                           "6: }\n";
         ASSERT_EQUALS(exp, tokenizeExpr(code));
     }
@@ -4431,11 +4542,29 @@ class TestVarID : public TestFixture {
         const char* exp = "1: int f ( double a@1 , double b@2 , double c@3 ) {\n"
                           "2: return static_cast < int > ( std :: ceil ( std :: min ( a@1 , std :: min ( b@2 , c@3 ) ) ) ) ;\n"
                           "3: }\n";
-        ASSERT_EQUALS(exp, tokenize(code, dinit(TokenizeOptions, $.s = &s))); // don't crash
+        ASSERT_EQUALS(exp, tokenize(code, s)); // don't crash
+    }
+
+    void exprid15()
+    {
+        // #14717
+        const char code[] = "#define MAX(a, b) (((a) > (b)) ? (a) : (b))\n"
+                            "\n"
+                            "void f(char *d) {\n"
+                            "    const char *p = &d[0];\n"
+                            "    int a = 1 / MAX(1, p[0]);\n"
+                            "    a = 1 / MAX(1, p[1]);\n"
+                            "}\n";
+        const char exp[] = "3: void f ( char * d ) {\n"
+                           "4: const char * p@2 ; p@2 =@UNIQUE &@UNIQUE d@1 [@UNIQUE 0 ] ;\n"
+                           "5: int a@3 ; a@3 =@UNIQUE 1 /@UNIQUE $( $( 1 $>@UNIQUE $( p@2 [@9 0 ] $) $) $?@UNIQUE $( 1 $) $:@UNIQUE $( p@2 [@9 0 ] $) $) ;\n"
+                           "6: a@3 =@UNIQUE 1 /@UNIQUE $( $( 1 $>@UNIQUE $( p@2 [@15 1 ] $) $) $?@UNIQUE $( 1 $) $:@UNIQUE $( p@2 [@15 1 ] $) $) ;\n"
+                           "7: }\n";
+        ASSERT_EQUALS(exp, tokenizeExpr(code));
     }
 
     void structuredBindings() {
-        const char code[] = "int foo() { auto [x,y] = xy(); return x+y; }";
+        const char code[] = "int foo() { auto [x,y] = xy(); return x+y; }\n";
         ASSERT_EQUALS("1: int foo ( ) { auto [ x@1 , y@2 ] = xy ( ) ; return x@1 + y@2 ; }\n",
                       tokenize(code));
     }
diff --git a/test/tools/donate_cpu_lib_test.py b/test/tools/donate_cpu_lib_test.py
index e00a3d296a0..141781192aa 100644
--- a/test/tools/donate_cpu_lib_test.py
+++ b/test/tools/donate_cpu_lib_test.py
@@ -58,6 +58,7 @@ def test_library_includes(tmpdir):
     _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'opengl'], '#include\t  <GL/glut.h>')
     _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'nspr'], '#include\t"prtypes.h"')
     _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'lua'], '#include  \t<lua.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'microsoft_gsl'], '#include <gsl/gsl>')
 
 def test_match_multiple_time(tmpdir):
     libinc = LibraryIncludes()
diff --git a/test/tools/htmlreport/test_htmlreport.py b/test/tools/htmlreport/test_htmlreport.py
index 6f8713f4f55..f84fd279fb3 100755
--- a/test/tools/htmlreport/test_htmlreport.py
+++ b/test/tools/htmlreport/test_htmlreport.py
@@ -107,6 +107,13 @@ def testAddTimestamp(self):
 
             output_directory.cleanup()
 
+    def testSeverityFilterBar(self):
+        with runCheck(
+            xml_filename=os.path.join(TEST_TOOLS_DIR, 'example.xml'),
+        ) as (report, output_directory):
+            self.assertIn('onclick="toggleSeverity(this)"', report)
+            output_directory.cleanup()
+
 
 @contextlib.contextmanager
 def runCheck(source_filename=None, xml_version='1', xml_filename=None, checkers_filename=None):
diff --git a/tools/bisect/bisect.sh b/tools/bisect/bisect.sh
index cf0d4cd5b96..067cd9606aa 100644
--- a/tools/bisect/bisect.sh
+++ b/tools/bisect/bisect.sh
@@ -26,7 +26,7 @@ mkdir -p "$bisect_dir" || exit 1
 cd "$bisect_dir" || exit 1
 
 if [ ! -d 'cppcheck' ]; then
-  git clone https://github.com/danmar/cppcheck.git || exit 1
+  git clone https://github.com/cppcheck-opensource/cppcheck.git || exit 1
 fi
 
 bisect_repo_dir="$bisect_dir/cppcheck"
diff --git a/tools/bisect/bisect_common.py b/tools/bisect/bisect_common.py
index 9b296ad0c17..10494d36512 100644
--- a/tools/bisect/bisect_common.py
+++ b/tools/bisect/bisect_common.py
@@ -31,8 +31,9 @@ def build_cppcheck(bisect_path):
     # TODO: older versions do not build because of include changes in libstdc++ - check compiler version and try to use an earlier one
     # TODO: make jobs configurable
     # TODO: use "make install"?
-    # TODO: allow CXXFLAGS overrides to workaround compiling issues in older versions
+    # TODO: use CXXOPTS overrides to workaround compiling issues in older versions
     print('building {}'.format(commit_hash))
+    # we always need to use CXXFLAGS because we need to support older versions
     subprocess.check_call(['make', '-C', bisect_repo_dir, '-j6', 'MATCHCOMPILER=yes', 'CXXFLAGS=-O2 -w -pipe', '-s'])
 
     # TODO: remove folder if installation failed
diff --git a/tools/check-errorids.sh b/tools/check-errorids.sh
new file mode 100755
index 00000000000..8bd343411cc
--- /dev/null
+++ b/tools/check-errorids.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+#set -x
+
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+
+# TODO: exclude testinternal.cpp
+echo 'no --errorlist entry:'
+grep -h -o -P '\[[a-zA-Z0-9_]+\]\\n\"' $SCRIPT_DIR/../test/*.cpp | tr -d '[]\"' | sed 's/\\n$//' | sort -u | \
+while read -r id; do
+  if [ ${#id} -lt 4 ]; then
+    continue
+  fi
+  $SCRIPT_DIR/../cppcheck --errorlist | grep "id=\"$id\"" > /dev/null
+  # shellcheck disable=SC2181
+  if [ $? -ne 0 ]; then
+    echo $id
+  fi
+done
+
+echo ''
+
+echo 'no test coverage:'
+$SCRIPT_DIR/../cppcheck --errorlist | grep -h -o -P 'id=\"[a-zA-Z0-9_]*\"' | sed 's/\id=//' | tr -d '\"' | sort -u | \
+while read -r id; do
+  grep -h -o -P "\[$id\][\\\\n]*\"" $SCRIPT_DIR/../test/*.cpp > /dev/null
+  # shellcheck disable=SC2181
+  if [ $? -ne 0 ]; then
+    echo $id
+  fi
+done
\ No newline at end of file
diff --git a/tools/ci.py b/tools/ci.py
deleted file mode 100644
index c50ed35822d..00000000000
--- a/tools/ci.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env python3
-
-# continuous integration
-# build daily reports (doxygen,coverage,etc)
-
-import datetime
-import time
-import subprocess
-import pexpect
-import glob
-import sys
-
-
-# Upload file to sourceforge web server using scp
-def upload(file_to_upload, destination):
-    try:
-        password = sys.argv[1]
-        child = pexpect.spawn(
-            'scp ' + file_to_upload + ' danielmarjamaki,cppcheck@web.sourceforge.net:' + destination)
-        # child.expect(
-        #    'danielmarjamaki,cppcheck@web.sourceforge.net\'s password:')
-        child.expect('Password:')
-        child.sendline(password)
-        child.interact()
-    except (IOError, OSError, pexpect.TIMEOUT):
-        pass
-
-
-# git push
-def gitpush():
-    try:
-        password = sys.argv[1]
-        child = pexpect.spawn('git push')
-        child.expect("Enter passphrase for key '/home/daniel/.ssh/id_rsa':")
-        child.sendline(password)
-        child.interact()
-    except (IOError, OSError, pexpect.TIMEOUT):
-        pass
-
-
-def iconv(filename):
-    with subprocess.Popen(['file', '-i', filename],
-                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT) as p:
-        # TODO: handle p.returncode?
-        stdout, _ = p.communicate()
-    if 'charset=iso-8859-1' in stdout:
-        # TODO: handle exitcode?
-        subprocess.call(
-            ["iconv", filename, "--from=ISO-8859-1", "--to=UTF-8", "-o", filename])
-
-
-# Generate daily webreport
-def generate_webreport():
-    for filename in glob.glob('*/*.cpp'):
-        iconv(filename)
-    # TODO: handle exitcode?
-    subprocess.call(
-        ["git", "commit", "-a", "-m", '"automatic conversion from iso-8859-1 formatting to utf-8"'])
-    gitpush()
-
-    # TODO: handle exitcode?
-    subprocess.call(["rm", "-rf", "devinfo"])
-    # TODO: handle exitcode?
-    subprocess.call(['nice', "./webreport.sh"])
-    upload('-r devinfo', 'htdocs/')
-    # TODO: handle exitcode?
-    subprocess.call(["make", "clean"])
-    # TODO: handle exitcode?
-    subprocess.call(["rm", "-rf", "devinfo"])
-
-
-# Perform a git pull.
-def gitpull():
-    try:
-        password = sys.argv[1]
-        child = pexpect.spawn('git pull')
-        child.expect("Enter passphrase for key '/home/daniel/.ssh/id_rsa':")
-        child.sendline(password)
-        child.expect('Already up-to-date.')
-        child.interact()
-
-    except (IOError, OSError, pexpect.TIMEOUT):
-        pass
-    except pexpect.EOF:
-        return True
-
-    return False
-
-
-t0 = None
-while True:
-    if datetime.date.today() != t0:
-        print("generate daily reports")
-        t0 = datetime.date.today()
-        gitpull()
-        generate_webreport()
-    time.sleep(60)
diff --git a/tools/compare-valueflow-options.py b/tools/compare-valueflow-options.py
index b6a31d701de..11b7cf87d42 100755
--- a/tools/compare-valueflow-options.py
+++ b/tools/compare-valueflow-options.py
@@ -2,7 +2,7 @@
 
 # Compare results and timings of different valueflow options
 # Example usage:
-# cd ~/cppcheck && make CXXFLAGS=-O2 MATCHCOMPILER=yes
+# cd ~/cppcheck && make CXXOPTS=-O2 MATCHCOMPILER=yes
 # python3 compare-valueflow-options.py --cppcheck-path=~/cppcheck --packages-path=~/daca2-packages
 
 import donate_cpu_lib as lib
diff --git a/tools/dmake/CMakeLists.txt b/tools/dmake/CMakeLists.txt
index 5af693eb179..cbe7040ef2f 100644
--- a/tools/dmake/CMakeLists.txt
+++ b/tools/dmake/CMakeLists.txt
@@ -1,23 +1,8 @@
-# TODO: when using ccache and matchcompiler this will accessed before the file was generated and thus the build fails
-set(srcs_lib pathmatch.cpp path.cpp utils.cpp)
-foreach(file ${srcs_lib})
-    if (NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
-        set(src "${CMAKE_BINARY_DIR}/lib/build/mc_${file}")
-        set_source_files_properties(${src} PROPERTIES GENERATED TRUE)
-    else()
-        set(src "${CMAKE_SOURCE_DIR}/lib/${file}")
-    endif()
-    set(srcs_tools ${srcs_tools} ${src})
-endforeach()
 
 add_executable(dmake EXCLUDE_FROM_ALL
         dmake.cpp
-        ${CMAKE_SOURCE_DIR}/cli/filelister.cpp
-        ${srcs_tools}
-        $<TARGET_OBJECTS:simplecpp_objs>
 )
-target_include_directories(dmake PRIVATE ${CMAKE_SOURCE_DIR}/cli ${CMAKE_SOURCE_DIR}/lib)
-target_externals_include_directories(dmake PRIVATE ${CMAKE_SOURCE_DIR}/externals/simplecpp)
+target_link_libraries(dmake cppcheck-core cli simplecpp)
 if (WIN32 AND NOT BORLAND)
     if(NOT MINGW)
         target_link_libraries(dmake Shlwapi.lib)
diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
index f85f65ae0d4..eaf0a727646 100644
--- a/tools/dmake/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -33,6 +33,7 @@
 
 #include "../cli/filelister.h"
 #include "../lib/filesettings.h"
+#include "../lib/path.h"
 #include "../lib/pathmatch.h"
 #include "../lib/utils.h"
 
@@ -89,6 +90,8 @@ static void getDeps(std::string filename, std::vector<std::string> &depfiles)
          * Files are searched according to the following priority:
          * [test, tools] -> cli -> lib -> externals
          */
+        if (startsWith(filename, "frontend/"))
+            getDeps("lib" + filename.substr(filename.find('/')), depfiles);
         if (startsWith(filename, "cli/"))
             getDeps("lib" + filename.substr(filename.find('/')), depfiles);
         else if (startsWith(filename, "test/"))
@@ -168,7 +171,7 @@ static std::string getCppFiles(std::vector<std::string> &files, const std::strin
     std::list<FileWithDetails> filelist;
     const std::set<std::string> extra;
     const std::vector<std::string> masks;
-    const PathMatch matcher(masks);
+    const PathMatch matcher(masks, Path::getCurrentPath());
     std::string err = FileLister::addFiles(filelist, path, extra, recursive, matcher);
     if (!err.empty())
         return err;
@@ -247,7 +250,7 @@ static int write_vcxproj(const std::string &proj_name, const std::function<void(
     return EXIT_SUCCESS;
 }
 
-enum ClType : std::uint8_t { Compile, Include, Precompile };
+enum ClType : std::uint8_t { Compile, Include, Precompile, NoPch };
 
 static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
 {
@@ -268,6 +271,18 @@ static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
         outstr += "    </ClCompile>\r\n";
         return outstr;
     }
+    if (type == NoPch) {
+        outstr += R"(    <ClCompile Include=")";
+        outstr += file;
+        outstr += R"(">)";
+        outstr += "\r\n";
+        outstr += R"(      <PrecompiledHeader>NotUsing</PrecompiledHeader>)";
+        outstr += "\r\n";
+        outstr += R"(      <ForcedIncludeFiles></ForcedIncludeFiles>)";
+        outstr += "\r\n";
+        outstr += "    </ClCompile>\r\n";
+        return outstr;
+    }
     outstr += "    <";
     outstr += (type == Compile) ? "ClCompile" : "ClInclude";
     outstr += R"( Include=")";
@@ -282,6 +297,7 @@ static std::vector<std::string> prioritizelib(const std::vector<std::string>& li
     std::map<std::string, std::size_t> priorities;
     std::size_t prio = libfiles.size();
     for (const auto &l : libfiles) {
+        // cppcheck-suppress useStlAlgorithm - std::transform is cumbersome
         priorities.emplace(l, prio--);
     }
     priorities["lib/valueflow.cpp"] = 1000;
@@ -349,23 +365,29 @@ static void write_ossfuzz_makefile(std::vector<std::string> libfiles_prio, std::
 
     fout << "# This file is generated by dmake, do not edit.\n";
     fout << '\n';
-    fout << "# make CXX=clang++ MATCHCOMPILER=yes CXXFLAGS=\"-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=address -fsanitize-address-use-after-scope -DHAVE_BOOST\" LIB_FUZZING_ENGINE=\"-fsanitize=fuzzer\" oss-fuzz-client\n";
+    fout << "# make CXX=clang++ MATCHCOMPILER=yes CXXOPTS=\"-O1 -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -fsanitize-address-use-after-scope\" CPPOPTS=\"-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DHAVE_BOOST\" LIB_FUZZING_ENGINE=\"-fsanitize=fuzzer\" oss-fuzz-client\n";
     fout << '\n';
     fout << "MATCHCOMPILER=yes\n"; // always need to enable the matchcompiler so the library files are being copied
     makeMatchcompiler(fout, "../", "--read-dir ../lib");
 
     fout << "INCS=-I../lib -isystem../externals/simplecpp -isystem../externals/tinyxml2 -isystem../externals/picojson\n";
-    fout << "CPPFLAGS=-std=c++11 -g -w $(INCS)\n";
+    fout << '\n';
+    fout << "override CXXFLAGS+=-std=c++11 -g -w\n";
+    fout << "override CPPFLAGS+=$(INCS)\n";
+    fout << '\n';
+    fout << "override CXXFLAGS += $(CXXOPTS)\n";
+    fout << "override CPPFLAGS += $(CPPOPTS)\n";
+    fout << "override LDFLAGS += $(LDOPTS)\n";
     fout << '\n';
     fout << "LIBOBJ =      " << objfiles(libfiles_prio) << "\n";
     fout << '\n';
     fout << "EXTOBJ =      " << objfiles(extfiles) << "\n";
     fout << '\n';
     fout << "oss-fuzz-client: $(EXTOBJ) $(LIBOBJ) main.o type2.o\n";
-    fout << "\t${CXX} $(CPPFLAGS) ${CXXFLAGS} -o $@ $^ ${LIB_FUZZING_ENGINE}\n";
+    fout << "\t${CXX} ${CXXFLAGS} -o $@ $^ ${LIB_FUZZING_ENGINE}\n";
     fout << '\n';
     fout << "no-fuzz: $(EXTOBJ) $(LIBOBJ) main_nofuzz.o type2.o\n";
-    fout << "\t${CXX} $(CPPFLAGS) ${CXXFLAGS} -o $@ $^\n";
+    fout << "\t${CXX} ${CXXFLAGS} -o $@ $^\n";
     fout << '\n';
     fout << "translate: translate.o type2.o\n";
     fout << "\t${CXX} -std=c++11 -g ${CXXFLAGS} -o $@ type2.cpp translate.cpp\n";
@@ -432,6 +454,13 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
+    std::vector<std::string> frontendfiles;
+    err = getCppFiles(frontendfiles, "frontend/", false);
+    if (!err.empty()) {
+        std::cerr << err << std::endl;
+        return EXIT_FAILURE;
+    }
+
     std::vector<std::string> clifiles;
     err = getCppFiles(clifiles, "cli/", false);
     if (!err.empty()) {
@@ -453,7 +482,7 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
-    if (libfiles.empty() && clifiles.empty() && testfiles.empty()) {
+    if (libfiles.empty() && frontendfiles.empty() && clifiles.empty() && testfiles.empty()) {
         std::cerr << "No files found. Are you in the correct directory?" << std::endl;
         return EXIT_FAILURE;
     }
@@ -467,12 +496,14 @@ int main(int argc, char **argv)
     }
     libfiles_h.emplace("analyzer.h");
     libfiles_h.emplace("calculate.h");
+    libfiles_h.emplace("check.h");
     libfiles_h.emplace("config.h");
     libfiles_h.emplace("filesettings.h");
     libfiles_h.emplace("findtoken.h");
     libfiles_h.emplace("json.h");
     libfiles_h.emplace("matchcompiler.h");
     libfiles_h.emplace("precompiled.h");
+    libfiles_h.emplace("rule.h");
     libfiles_h.emplace("smallvector.h");
     libfiles_h.emplace("sourcelocation.h");
     libfiles_h.emplace("tokenrange.h");
@@ -481,6 +512,13 @@ int main(int argc, char **argv)
     libfiles_h.emplace("vf_analyze.h");
     libfiles_h.emplace("xml.h");
 
+    std::vector<std::string> frontendfiles_h;
+    for (const std::string &frontendfile : frontendfiles) {
+        std::string fname(frontendfile.substr(9));
+        fname.erase(fname.find(".cpp"));
+        frontendfiles_h.emplace_back(fname + ".h");
+    }
+
     std::vector<std::string> clifiles_h;
     for (const std::string &clifile : clifiles) {
         std::string fname(clifile.substr(4));
@@ -504,19 +542,27 @@ int main(int argc, char **argv)
             const std::string c = clifile.substr(4);
             outstr += make_vcxproj_cl_entry(c, c == "executor.cpp" ? Precompile : Compile);
         }
+        for (const std::string &frontendfile: frontendfiles) {
+            const std::string c = "..\\frontend\\" + frontendfile.substr(9);
+            outstr += make_vcxproj_cl_entry(c, Compile);
+        }
     }, [&](std::string &outstr){
         for (const std::string &clifile_h: clifiles_h) {
             outstr += make_vcxproj_cl_entry(clifile_h, Include);
         }
+        for (const std::string &frontendfile_h: frontendfiles_h) {
+            const std::string h = "..\\frontend\\" + frontendfile_h;
+            outstr += make_vcxproj_cl_entry(h, Include);
+        }
     });
 
     write_vcxproj("lib/cppcheck.vcxproj", [&](std::string &outstr){
-        outstr += make_vcxproj_cl_entry(R"(..\externals\simplecpp\simplecpp.cpp)", Compile);
-        outstr += make_vcxproj_cl_entry(R"(..\externals\tinyxml2\tinyxml2.cpp)", Compile);
+        outstr += make_vcxproj_cl_entry(R"(..\externals\simplecpp\simplecpp.cpp)", NoPch);
+        outstr += make_vcxproj_cl_entry(R"(..\externals\tinyxml2\tinyxml2.cpp)", NoPch);
 
         for (const std::string &libfile: libfiles_prio) {
             const std::string l = libfile.substr(4);
-            outstr += make_vcxproj_cl_entry(l, l == "check.cpp" ? Precompile : Compile);
+            outstr += make_vcxproj_cl_entry(l, l == "checkimpl.cpp" ? Precompile : Compile);
         }
     }, [&](std::string &outstr){
         outstr += make_vcxproj_cl_entry(R"(..\externals\simplecpp\simplecpp.h)", Include);
@@ -535,6 +581,11 @@ int main(int argc, char **argv)
             outstr += make_vcxproj_cl_entry(c, Compile);
         }
 
+        for (const std::string &frontendfile: frontendfiles) {
+            const std::string c = "..\\frontend\\" + frontendfile.substr(9);
+            outstr += make_vcxproj_cl_entry(c, Compile);
+        }
+
         for (const std::string &testfile: testfiles) {
             const std::string t = testfile.substr(5);
             outstr += make_vcxproj_cl_entry(t, t == "fixture.cpp" ? Precompile : Compile);
@@ -545,6 +596,11 @@ int main(int argc, char **argv)
             outstr += make_vcxproj_cl_entry(c, Include);
         }
 
+        for (const std::string &frontendfile_h: frontendfiles_h) {
+            const std::string h = "..\\frontend\\" + frontendfile_h;
+            outstr += make_vcxproj_cl_entry(h, Include);
+        }
+
         for (const std::string &testfile_h: testfiles_h) {
             outstr += make_vcxproj_cl_entry(testfile_h, Include);
         }
@@ -581,7 +637,7 @@ int main(int argc, char **argv)
          << "endif\n\n";
 
     // enable backtrac
-    fout << "RDYNAMIC=-rdynamic\n";
+    fout << "RDYNAMIC?=-rdynamic\n";
 
     // The _GLIBCXX_DEBUG doesn't work in cygwin or other Win32 systems.
     fout << "# Set the CPPCHK_GLIBCXX_DEBUG flag. This flag is not used in release Makefiles.\n"
@@ -674,7 +730,8 @@ int main(int argc, char **argv)
 
     // Makefile settings..
     if (release) {
-        makeConditionalVariable(fout, "CXXFLAGS", "-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-multichar");
+        makeConditionalVariable(fout, "CXXFLAGS", "-O2 -Wall -Wno-sign-compare -Wno-multichar");
+        fout << "override CPPFLAGS += -DNDEBUG\n\n";
     } else {
         makeConditionalVariable(fout, "CXXFLAGS",
                                 "-pedantic "
@@ -691,8 +748,8 @@ int main(int argc, char **argv)
                                 "-Wno-sign-compare "
                                 "-Wno-multichar "
                                 "-Woverloaded-virtual "
-                                "$(CPPCHK_GLIBCXX_DEBUG) "
                                 "-g");
+        //fout << "override CPPFLAGS += $(CPPCHK_GLIBCXX_DEBUG)\n\n"; // TODO: when using CXXOPTS this would always be set - need to handle this differently
     }
 
     fout << "ifeq (g++, $(findstring g++,$(CXX)))\n"
@@ -706,7 +763,8 @@ int main(int argc, char **argv)
          << "    ifeq ($(PCRE_CONFIG),)\n"
          << "        $(error Did not find pcre-config)\n"
          << "    endif\n"
-         << "    override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)\n"
+         << "    override CXXFLAGS += $(shell $(PCRE_CONFIG) --cflags)\n"
+         << "    override CPPFLAGS += -DHAVE_RULES\n"
          << "    ifdef LIBS\n"
          << "        LIBS += $(shell $(PCRE_CONFIG) --libs)\n"
          << "    else\n"
@@ -716,10 +774,26 @@ int main(int argc, char **argv)
          << "    $(error invalid HAVE_RULES value '$(HAVE_RULES)')\n"
          << "endif\n\n";
 
+    fout << "# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally\n"
+         << "REQUIRE_ESCAPE=$(shell echo \"\\#define DEF\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "ifeq ($(REQUIRE_ESCAPE),1)\n"
+         << "    HAVE_EXECINFO_H=$(shell echo \"\\#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "else\n"
+         << "    HAVE_EXECINFO_H=$(shell echo \"#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "endif\n"
+         << "override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)\n\n";
+
+    fout << "override CXXFLAGS += $(CXXOPTS)\n";
+    fout << "override CPPFLAGS += $(CPPOPTS)\n";
+    fout << "override LDFLAGS += $(LDOPTS)\n\n";
+
     makeConditionalVariable(fout, "PREFIX", "/usr");
     makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2");
-    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2");
-    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml2");
+    makeConditionalVariable(fout, "INCLUDE_FOR_FE", "-Ilib");
+    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Ifrontend -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2");
+    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Ifrontend -Icli -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2");
+
+    makeConditionalVariable(fout, "CFLAGS_FOR_TEST", "-Wno-dollar-in-identifier-extension");
 
     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
@@ -730,13 +804,14 @@ int main(int argc, char **argv)
     fout << "\n###### Object Files\n\n";
     fout << "LIBOBJ =      " << objfiles(libfiles_prio) << "\n\n";
     fout << "EXTOBJ =      " << objfiles(extfiles) << "\n\n";
+    fout << "FEOBJ =       " << objfiles(frontendfiles) << "\n\n";
     fout << "CLIOBJ =      " << objfiles(clifiles) << "\n\n";
     fout << "TESTOBJ =     " << objfiles(testfiles) << "\n\n";
 
     fout << ".PHONY: run-dmake tags\n\n";
     fout << "\n###### Targets\n\n";
-    fout << "cppcheck: $(EXTOBJ) $(LIBOBJ) $(CLIOBJ)\n";
-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+    fout << "cppcheck: $(EXTOBJ) $(LIBOBJ) $(FEOBJ) $(CLIOBJ)\n";
+    fout << "\t$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
     fout << "all:\tcppcheck testrunner\n\n";
     std::string testrunner_clifiles_o;
     for (const std::string &clifile: clifiles) {
@@ -746,8 +821,8 @@ int main(int argc, char **argv)
         const std::string o = clifile.substr(0, clifile.length()-3) + 'o';
         testrunner_clifiles_o += o;
     }
-    fout << "testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ)" << testrunner_clifiles_o << "\n";
-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+    fout << "testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) $(FEOBJ)" << testrunner_clifiles_o << "\n";
+    fout << "\t$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
     fout << "test:\tall\n";
     fout << "\t./testrunner\n\n";
     fout << "check:\tall\n";
@@ -759,7 +834,7 @@ int main(int argc, char **argv)
     fout << "run-dmake: dmake\n";
     fout << "\t./dmake" << (release ? " --release" : "") << "\n\n"; // Make CI in release builds happy
     fout << "clean:\n";
-    fout << "\trm -f build/*.cpp build/*.o lib/*.o cli/*.o test/*.o tools/dmake/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1\n\n";
+    fout << "\trm -f build/*.cpp build/*.o lib/*.o cli/*.o frontend/*.o test/*.o tools/dmake/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1\n\n";
     fout << "man:\tman/cppcheck.1\n\n";
     fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
     fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
@@ -831,12 +906,17 @@ int main(int argc, char **argv)
     fout << ".PHONY: validateRules\n";
     fout << "validateRules:\n";
     fout << "\txmllint --noout rules/*.xml\n";
+    fout << ".PHONY: check-nonneg\n";
+    fout << "check-nonneg:\n";
+    // TODO: how to use provided number of jobs?
+    fout << "\tls lib/*.cpp | xargs -n 1 -P $$(nproc) g++ -fsyntax-only -DNONNEG $(CXXFLAGS) $(INCLUDE_FOR_LIB)\n";
 
     fout << "\n###### Build\n\n";
 
     compilefiles(fout, libfiles_prio, "${INCLUDE_FOR_LIB}");
+    compilefiles(fout, frontendfiles, "${INCLUDE_FOR_FE}");
     compilefiles(fout, clifiles, "${INCLUDE_FOR_CLI}");
-    compilefiles(fout, testfiles, "${INCLUDE_FOR_TEST}");
+    compilefiles(fout, testfiles, "${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST}");
     compilefiles(fout, extfiles, "");
     compilefiles(fout, toolsfiles, "${INCLUDE_FOR_LIB}");
 
diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py
index 03040574b45..63a55f5b338 100755
--- a/tools/donate-cpu-server.py
+++ b/tools/donate-cpu-server.py
@@ -26,10 +26,10 @@
 # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
 # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
 # changes)
-SERVER_VERSION = "1.3.65"
+SERVER_VERSION = "1.3.69"
 
 # TODO: fetch from GitHub tags
-OLD_VERSION = '2.17.0'
+OLD_VERSION = '2.21.0'
 
 HEAD_MARKER = 'head results:'
 INFO_MARKER = 'info messages:'
diff --git a/tools/donate_cpu_lib.py b/tools/donate_cpu_lib.py
index 04f9daf16b2..ed345cb10c9 100644
--- a/tools/donate_cpu_lib.py
+++ b/tools/donate_cpu_lib.py
@@ -16,12 +16,12 @@
 # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
 # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
 # changes)
-CLIENT_VERSION = "1.3.67"
+CLIENT_VERSION = "1.4.0"
 
 # Timeout for analysis with Cppcheck in seconds
 CPPCHECK_TIMEOUT = 30 * 60
 
-CPPCHECK_REPO_URL = "https://github.com/danmar/cppcheck.git"
+CPPCHECK_REPO_URL = "https://github.com/cppcheck-opensource/cppcheck.git"
 
 # Return code that is used to mark a timed out analysis
 RETURN_CODE_TIMEOUT = -999
@@ -133,7 +133,7 @@ def checkout_cppcheck_version(repo_path, version, cppcheck_path):
         hash_old = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=cppcheck_path).strip()
 
         print('Pulling {}'.format(version))
-        # --rebase is a workaround for a dropped commit - see https://github.com/danmar/cppcheck/pull/6904
+        # --rebase is a workaround for a dropped commit - see https://github.com/cppcheck-opensource/cppcheck/pull/6904
         # TODO: drop the commit in question
         # TOD: remove --rebase
         subprocess.check_call(['git', 'pull', '--rebase'], cwd=cppcheck_path)
@@ -217,6 +217,7 @@ def compile_cppcheck(cppcheck_path):
             # TODO: processes still exhaust all threads of the system
             subprocess.check_call([__make_cmd, '-t:cli', os.path.join(cppcheck_path, 'cppcheck.sln'), '/property:Configuration=Release;Platform=x64'], cwd=cppcheck_path, env=build_env)
         else:
+            # TODO: use CXXOPTS instead
             build_cmd = [__make_cmd, __jobs, 'MATCHCOMPILER=yes', 'CXXFLAGS=-O2 -g -w']
             build_env = os.environ
             if __make_cmd == 'mingw32-make':
@@ -683,7 +684,8 @@ def upload_nodata(package):
 
 class LibraryIncludes:
     def __init__(self):
-        include_mappings = {'boost': ['<boost/'],
+        include_mappings = {'avr': ['<avr/'],
+                            'boost': ['<boost/'],
                             'bsd': ['<sys/queue.h>', '<sys/tree.h>', '<sys/uio.h>','<bsd/', '<fts.h>', '<db.h>', '<err.h>', '<vis.h>'],
                             'cairo': ['<cairo.h>'],
                             'cppunit': ['<cppunit/'],
@@ -700,6 +702,7 @@ def __init__(self):
                             'mfc': ['<afx.h>', '<afxwin.h>', '<afxext.h>'],
                             'microsoft_atl': ['<atlbase.h>'],
                             'microsoft_sal': ['<sal.h>'],
+                            'microsoft_unittest': ['<CppUnitTest.h>'],
                             'motif': ['<X11/', '<Xm/'],
                             'nspr': ['<prtypes.h>', '"prtypes.h"'],
                             'ntl': ['<ntl/', '"ntl/'],
@@ -712,12 +715,15 @@ def __init__(self):
                             'qt': ['<QAbstractSeries>', '<QAction>', '<QActionGroup>', '<QApplication>', '<QByteArray>', '<QChartView>', '<QClipboard>', '<QCloseEvent>', '<QColor>', '<QColorDialog>', '<QComboBox>', '<QCoreApplication>', '<QCryptographicHash>', '<QDate>', '<QDateTime>', '<QDateTimeAxis>', '<QDebug>', '<QDesktopServices>', '<QDialog>', '<QDialogButtonBox>', '<QDir>', '<QElapsedTimer>', '<QFile>', '<QFileDialog>', '<QFileInfo>', '<QFileInfoList>', '<QFlags>', '<QFont>', '<QFormLayout>', '<QHelpContentWidget>', '<QHelpEngine>', '<QHelpIndexWidget>', '<QImageReader>', '<QInputDialog>', '<QKeyEvent>', '<QLabel>', '<QLineSeries>', '<QList>', '<qlist.h>', '<QLocale>', '<QMainWindow>', '<QMap>', '<QMenu>', '<QMessageBox>', '<QMetaType>', '<QMimeData>', '<QMimeDatabase>', '<QMimeType>', '<QMutex>', '<QObject>', '<qobjectdefs.h>', '<QPainter>', '<QPlainTextEdit>', '<QPrintDialog>', '<QPrinter>', '<QPrintPreviewDialog>', '<QProcess>', '<QPushButton>', '<QQueue>', '<QReadWriteLock>', '<QRegularExpression>', '<QRegularExpressionValidator>', '<QSet>', '<QSettings>', '<QShortcut>', '<QSignalMapper>', '<QStandardItemModel>', '<QString>', '<qstring.h>', '<QStringList>', '<QSyntaxHighlighter>', '<QTest>', '<QTextBrowser>', '<QTextDocument>', '<QTextEdit>', '<QTextStream>', '<QThread>', '<QTimer>', '<QTranslator>', '<QTreeView>', '<QtWidgets>', '<QUrl>', '<QValueAxis>', '<QVariant>', '<QWaitCondition>', '<QWidget>', '<QXmlStreamReader>', '<QXmlStreamWriter>', '<QtGui'],
                             'ruby': ['<ruby.h>', '<ruby/', '"ruby.h"'],
                             'sdl': ['<SDL.h>', '<SDL/SDL.h>', '<SDL2/SDL.h>'],
-                            #'selinux': ['<selinux/'],
+                            'selinux': ['<selinux/'],
+                            'sfml': ['<SFML/'],
                             'sqlite3': ['<sqlite3.h>', '"sqlite3.h"'],
                             'tinyxml2': ['<tinyxml2', '"tinyxml2'],
                             'wxsqlite3': ['<wx/wxsqlite3', '"wx/wxsqlite3'],
                             'wxwidgets': ['<wx/', '"wx/'],
+                            'zephyr': ['<zephyr/'],
                             'zlib': ['<zlib.h>'],
+                            'microsoft_gsl': ['<gsl/gsl>'],
                             }
 
         self.__library_includes_re = {}
diff --git a/tools/get_checkers.py b/tools/get_checkers.py
index a75535af0e2..48455200fb5 100644
--- a/tools/get_checkers.py
+++ b/tools/get_checkers.py
@@ -2,6 +2,33 @@
 import glob
 import os
 import re
+import sys
+import requests
+
+try:
+    from tqdm import tqdm
+except ImportError:
+    # Fallback: passthrough iterator if tqdm is not installed
+    def tqdm(iterable, total=None, desc=None, **kwargs):
+        if desc:
+            print(desc, file=sys.stderr)
+        return iterable
+
+def print_checkers(glob_pattern:str):
+    checkers = {}
+    for filename in glob.glob(glob_pattern):
+        for line in open(filename,'rt'):
+            res = re.match(r'[ \t]*logChecker\(\s*"([^"]+)"\s*\);.*', line)
+            if res is None:
+                continue
+            if line.find('//') > 0:
+                req = line[line.find('//')+2:].strip()
+            else:
+                req = ''
+            checkers[res.group(1)] = req
+    for c,req in dict(sorted(checkers.items())).items():
+        print('        {"%s","%s"},' % (c, req))
+
 
 print("""/*
  * Cppcheck - A tool for static C/C++ code analysis
@@ -28,301 +55,87 @@
 
 namespace checkers {
     const std::map<std::string, std::string> allCheckers{""" % (datetime.date.today().year,))
-
-for filename in glob.glob(os.path.expanduser('~/cppchecksolutions/cppcheck/lib/*.cpp')):
-    for line in open(filename,'rt'):
-        res = re.match(r'[ \t]*logChecker\(\s*"([:_a-zA-Z0-9]+)"\s*\);.*', line)
-        if res is None:
-            continue
-        req = ''
-        if line.find('//')>0:
-            req = line[line.find('//')+2:].strip()
-        print('        {"%s","%s"},' % (res.group(1), req))
+print_checkers(os.path.expanduser('~/cppchecksolutions/cppcheck/lib/*.cpp'))
 print("    };\n")
 
-print('    const std::map<std::string, std::string> premiumCheckers{')
-premium_checkers = []
-for filename in sorted(glob.glob(os.path.expanduser('~/cppchecksolutions/addon/src/*.cpp'))):
-    for line in open(filename,'rt'):
-        res = re.match(r'[ \t]*logChecker\("([^"]+)"\);.*', line)
-        if res is None:
-            continue
-        if line.find('//') > 0:
-            req = line[line.find('//')+2:].strip()
-        else:
-            req = ''
-        premium_checkers.append('        {"%s","%s"}' % (res.group(1), req))
-print(',\n'.join(sorted(premium_checkers)))
-print('    };')
-
-
 print("""
     const char Req[] = "Required";
     const char Adv[] = "Advisory";
     const char Man[] = "Mandatory";
     const char Doc[] = "Document";
+    const char Dis[] = "Disapplied";""")
 
-    const std::vector<MisraInfo> misraC2012Directives =
-    {
-        {1,1,Req,0},
-        {2,1,Req,0},
-        {3,1,Req,0},
-        {4,1,Req,0},
-        {4,2,Adv,0},
-        {4,3,Req,0},
-        {4,4,Adv,0},
-        {4,5,Adv,0},
-        {4,6,Adv,3},
-        {4,7,Req,0},
-        {4,8,Adv,0},
-        {4,9,Adv,3},
-        {4,10,Req,0},
-        {4,11,Req,3},
-        {4,12,Req,0},
-        {4,13,Adv,0},
-        {4,14,Req,2},
-        {4,15,Req,3},
-        {5,1,Req,4},
-        {5,2,Req,4},
-        {5,3,Req,4},
-    };
+for version in (2012, 2023, 2025):
+    with open(os.path.expanduser('~/cppchecksolutions/addon/coverage/misra-c-%i.txt' % version), 'rt') as f:
+        all_guidelines = f.read()
 
-    const std::vector<MisraInfo> misraC2012Rules =
-    {
-        {1,1,Req,0},
-        {1,2,Adv,0},
-        {1,3,Req,0},
-        {1,4,Req,2}, // amendment 2
-        {1,5,Req,3}, // Amendment 3
-        {2,1,Req,0},
-        {2,2,Req,0},
-        {2,3,Adv,0},
-        {2,4,Adv,0},
-        {2,5,Adv,0},
-        {2,6,Adv,0},
-        {2,7,Adv,0},
-        {2,8,Adv,0},
-        {3,1,Req,0},
-        {3,2,Req,0},
-        {4,1,Req,0},
-        {4,2,Adv,0},
-        {5,1,Req,0},
-        {5,2,Req,0},
-        {5,3,Req,0},
-        {5,4,Req,0},
-        {5,5,Req,0},
-        {5,6,Req,0},
-        {5,7,Req,0},
-        {5,8,Req,0},
-        {5,9,Adv,0},
-        {6,1,Req,0},
-        {6,2,Req,0},
-        {6,3,Req,0},
-        {7,1,Req,0},
-        {7,2,Req,0},
-        {7,3,Req,0},
-        {7,4,Req,0},
-        {7,5,Man,0},
-        {7,6,Req,0},
-        {8,1,Req,0},
-        {8,2,Req,0},
-        {8,3,Req,0},
-        {8,4,Req,0},
-        {8,5,Req,0},
-        {8,6,Req,0},
-        {8,7,Adv,0},
-        {8,8,Req,0},
-        {8,9,Adv,0},
-        {8,10,Req,0},
-        {8,11,Adv,0},
-        {8,12,Req,0},
-        {8,13,Adv,0},
-        {8,14,Req,0},
-        {8,15,Req,0},
-        {8,16,Adv,0},
-        {8,17,Adv,0},
-        {9,1,Man,0},
-        {9,2,Req,0},
-        {9,3,Req,0},
-        {9,4,Req,0},
-        {9,5,Req,0},
-        {9,6,Req,0},
-        {9,7,Man,0},
-        {10,1,Req,0},
-        {10,2,Req,0},
-        {10,3,Req,0},
-        {10,4,Req,0},
-        {10,5,Adv,0},
-        {10,6,Req,0},
-        {10,7,Req,0},
-        {10,8,Req,0},
-        {11,1,Req,0},
-        {11,2,Req,0},
-        {11,3,Req,0},
-        {11,4,Adv,0},
-        {11,5,Adv,0},
-        {11,6,Req,0},
-        {11,7,Req,0},
-        {11,8,Req,0},
-        {11,9,Req,0},
-        {11,10,Req,0},
-        {12,1,Adv,0},
-        {12,2,Req,0},
-        {12,3,Adv,0},
-        {12,4,Adv,0},
-        {12,5,Man,1}, // amendment 1
-        {12,6,Req,4}, // amendment 4
-        {13,1,Req,0},
-        {13,2,Req,0},
-        {13,3,Adv,0},
-        {13,4,Adv,0},
-        {13,5,Req,0},
-        {13,6,Man,0},
-        {14,1,Req,0},
-        {14,2,Req,0},
-        {14,3,Req,0},
-        {14,4,Req,0},
-        {15,1,Adv,0},
-        {15,2,Req,0},
-        {15,3,Req,0},
-        {15,4,Adv,0},
-        {15,5,Adv,0},
-        {15,6,Req,0},
-        {15,7,Req,0},
-        {16,1,Req,0},
-        {16,2,Req,0},
-        {16,3,Req,0},
-        {16,4,Req,0},
-        {16,5,Req,0},
-        {16,6,Req,0},
-        {16,7,Req,0},
-        {17,1,Req,0},
-        {17,2,Req,0},
-        {17,3,Man,0},
-        {17,4,Man,0},
-        {17,5,Adv,0},
-        {17,6,Man,0},
-        {17,7,Req,0},
-        {17,8,Adv,0},
-        {17,9,Man,0},
-        {17,10,Req,0},
-        {17,11,Adv,0},
-        {17,12,Adv,0},
-        {17,13,Req,0},
-        {18,1,Req,0},
-        {18,2,Req,0},
-        {18,3,Req,0},
-        {18,4,Adv,0},
-        {18,5,Adv,0},
-        {18,6,Req,0},
-        {18,7,Req,0},
-        {18,8,Req,0},
-        {18,9,Req,0},
-        {18,10,Man,0},
-        {19,1,Man,0},
-        {19,2,Adv,0},
-        {20,1,Adv,0},
-        {20,2,Req,0},
-        {20,3,Req,0},
-        {20,4,Req,0},
-        {20,5,Adv,0},
-        {20,6,Req,0},
-        {20,7,Req,0},
-        {20,8,Req,0},
-        {20,9,Req,0},
-        {20,10,Adv,0},
-        {20,11,Req,0},
-        {20,12,Req,0},
-        {20,13,Req,0},
-        {20,14,Req,0},
-        {21,1,Req,0},
-        {21,2,Req,0},
-        {21,3,Req,0},
-        {21,4,Req,0},
-        {21,5,Req,0},
-        {21,6,Req,0},
-        {21,7,Req,0},
-        {21,8,Req,0},
-        {21,9,Req,0},
-        {21,10,Req,0},
-        {21,11,Req,0},
-        {21,12,Adv,0},
-        {21,13,Man,1}, // Amendment 1
-        {21,14,Req,1}, // Amendment 1
-        {21,15,Req,1}, // Amendment 1
-        {21,16,Req,1}, // Amendment 1
-        {21,17,Req,1}, // Amendment 1
-        {21,18,Man,1}, // Amendment 1
-        {21,19,Man,1}, // Amendment 1
-        {21,20,Man,1}, // Amendment 1
-        {21,21,Req,3}, // Amendment 3
-        {21,22,Man,3}, // Amendment 3
-        {21,23,Req,3}, // Amendment 3
-        {21,24,Req,3}, // Amendment 3
-        {21,25,Req,4}, // Amendment 4
-        {21,26,Req,4}, // Amendment 4
-        {22,1,Req,0},
-        {22,2,Man,0},
-        {22,3,Req,0},
-        {22,4,Man,0},
-        {22,5,Man,0},
-        {22,6,Man,0},
-        {22,7,Req,1}, // Amendment 1
-        {22,8,Req,1}, // Amendment 1
-        {22,9,Req,1}, // Amendment 1
-        {22,10,Req,1}, // Amendment 1
-        {22,11,Req,4}, // Amendment 4
-        {22,12,Man,4}, // Amendment 4
-        {22,13,Req,4}, // Amendment 4
-        {22,14,Man,4}, // Amendment 4
-        {22,15,Req,4}, // Amendment 4
-        {22,16,Req,4}, // Amendment 4
-        {22,17,Req,4}, // Amendment 4
-        {22,18,Req,4}, // Amendment 4
-        {22,19,Req,4}, // Amendment 4
-        {22,20,Man,4}, // Amendment 4
-        {23,1,Adv,3}, // Amendment 3
-        {23,2,Req,3}, // Amendment 3
-        {23,3,Adv,3}, // Amendment 3
-        {23,4,Req,3}, // Amendment 3
-        {23,5,Adv,3}, // Amendment 3
-        {23,6,Req,3}, // Amendment 3
-        {23,7,Adv,3}, // Amendment 3
-        {23,8,Req,3}, // Amendment 3
-    };
+    if version == 2012:
+        amd = {'4.6':3,'4.9':3,'4.11':3,'4.14':2,'4.15':3,'5.1':4,'5.2':4,'5.3':4}
+    else:
+        amd = {}
 
-    const std::map<std::string, std::string> misraRuleSeverity{
-        {"1.1", "error"}, //{"syntaxError", "unknownMacro"}},
-        {"1.3", "error"}, //most "error"
-        {"2.1", "style"}, //{"alwaysFalse", "duplicateBreak"}},
-        {"2.2", "style"}, //{"alwaysTrue", "redundantCondition", "redundantAssignment", "redundantAssignInSwitch", "unreadVariable"}},
-        {"2.6", "style"}, //{"unusedLabel"}},
-        {"2.8", "style"}, //{"unusedVariable"}},
-        {"5.3", "style"}, //{"shadowVariable"}},
-        {"8.3", "style"}, //{"funcArgNamesDifferent"}}, // inconclusive
-        {"8.13", "style"}, //{"constPointer"}},
-        {"9.1", "error"}, //{"uninitvar"}},
-        {"14.3", "style"}, //{"alwaysTrue", "alwaysFalse", "compareValueOutOfTypeRangeError", "knownConditionTrueFalse"}},
-        {"13.2", "error"}, //{"unknownEvaluationOrder"}},
-        {"13.6", "style"}, //{"sizeofCalculation"}},
-        {"17.4", "error"}, //{"missingReturn"}},
-        {"17.5", "warning"}, //{"argumentSize"}},
-        {"18.1", "error"}, //{"pointerOutOfBounds"}},
-        {"18.2", "error"}, //{"comparePointers"}},
-        {"18.3", "error"}, //{"comparePointers"}},
-        {"18.6", "error"}, //{"danglingLifetime"}},
-        {"19.1", "error"}, //{"overlappingWriteUnion", "overlappingWriteFunction"}},
-        {"20.6", "error"}, //{"preprocessorErrorDirective"}},
-        {"21.13", "error"}, //{"invalidFunctionArg"}},
-        {"21.17", "error"}, //{"bufferAccessOutOfBounds"}},
-        {"21.18", "error"}, //{"bufferAccessOutOfBounds"}},
-        {"22.1", "error"}, //{"memleak", "resourceLeak", "memleakOnRealloc", "leakReturnValNotUsed", "leakNoVarFunctionCall"}},
-        {"22.2", "error"}, //{"autovarInvalidDeallocation"}},
-        {"22.3", "error"}, //{"incompatibleFileOpen"}},
-        {"22.4", "error"}, //{"writeReadOnlyFile"}},
-        {"22.6", "error"}, //{"useClosedFile"}}
-    };
+    print('    const std::vector<MisraInfo> misraC%iDirectives{' % version)
+    for line in all_guidelines.split('\n'):
+        res = re.match(r'Dir\s+(\d+)[.](\d+)\s+(\w+).*', line)
+        if res:
+            a = amd.get('%s.%s' % (res.group(1), res.group(2)), 0)
+            print('        {%s,%s,%s,%i},' % (res.group(1), res.group(2), res.group(3)[:3], a))
+    print('    };')
+
+    if version == 2012:
+        amd = {'1.4':2,
+               '1.5':3,
+               '12.5':1,
+               '12.6':4,
+               '21.13':1,
+               '21.14':1,
+               '21.15':1,
+               '21.16':1,
+               '21.17':1,
+               '21.18':1,
+               '21.19':1,
+               '21.20':1,
+               '21.21':3,
+               '21.22':3,
+               '21.23':3,
+               '21.24':3,
+               '21.25':4,
+               '21.26':4,
+               '22.7':1,
+               '22.8':1,
+               '22.9':1,
+               '22.10':1,
+               '22.11':4,
+               '22.12':4,
+               '22.13':4,
+               '22.14':4,
+               '22.15':4,
+               '22.16':4,
+               '22.17':4,
+               '22.18':4,
+               '22.19':4,
+               '22.20':4,
+               '23.1':3,
+               '23.2':3,
+               '23.3':3,
+               '23.4':3,
+               '23.5':3,
+               '23.6':3,
+               '23.7':3,
+               '23.8':3 }
+    else:
+        amd = {}
+
+    print('    const std::vector<MisraInfo> misraC%iRules{' % version)
+    for line in all_guidelines.split('\n'):
+        res = re.match(r'Rule\s+(\d+)[.](\d+)\s+(\w+).*', line)
+        if res:
+            a = amd.get('%s.%s' % (res.group(1), res.group(2)), 0)
+            comment = '' if a == 0 else ' // Amendment %i' % a
+            print('        {%s,%s,%s,%i},%s' % (res.group(1), res.group(2), res.group(3)[:3], a, comment))
+    print('    };')
 
+print("""
     const std::vector<MisraCppInfo> misraCpp2008Rules =
     {
         {0,1,1,Req},
@@ -553,6 +366,14 @@
         {27,0,1,Req}
     };
 
+    const std::vector<MisraCppInfo> misraCpp2023Directives =
+    {
+        {0,3,1,Adv},
+        {0,3,2,Req},
+        {5,7,2,Adv},
+        {15,8,1,Req},
+    };
+
     const std::vector<MisraCppInfo> misraCpp2023Rules =
     {
         {0,0,1,Req},
@@ -563,15 +384,12 @@
         {0,2,2,Req},
         {0,2,3,Adv},
         {0,2,4,Adv},
-        {0,3,1,Adv},
-        {0,3,2,Req},
         {4,1,1,Req},
         {4,1,2,Adv},
         {4,1,3,Req},
         {4,6,1,Req},
         {5,0,1,Adv},
         {5,7,1,Req},
-        {5,7,2,Adv},
         {5,7,3,Req},
         {5,10,1,Req},
         {5,13,1,Req},
@@ -677,7 +495,6 @@
         {15,1,3,Req},
         {15,1,4,Adv},
         {15,1,5,Req},
-        {15,8,1,Req},
         {16,5,2,Req},
         {16,6,1,Adv},
         {17,8,1,Req},
@@ -1099,195 +916,68 @@
     {"a27-0-2", checkers::Adv},
     {"a27-0-3", checkers::Req},
 };
+""")
 
-std::vector<checkers::Info> checkers::certCInfo{
-    {"PRE30-C", "L3"},
-    {"PRE31-C", "L3"},
-    {"PRE32-C", "L3"},
-    {"DCL30-C", "L2"},
-    {"DCL31-C", "L3"},
-    {"DCL36-C", "L2"},
-    {"DCL37-C", "L3"},
-    {"DCL38-C", "L3"},
-    {"DCL39-C", "L3"},
-    {"DCL40-C", "L3"},
-    {"DCL41-C", "L3"},
-    {"EXP30-C", "L2"},
-    {"EXP32-C", "L2"},
-    {"EXP33-C", "L1"},
-    {"EXP34-C", "L1"},
-    {"EXP35-C", "L3"},
-    {"EXP36-C", "L3"},
-    {"EXP37-C", "L3"},
-    {"EXP39-C", "L3"},
-    {"EXP40-C", "L3"},
-    {"EXP42-C", "L2"},
-    {"EXP43-C", "L3"},
-    {"EXP44-C", "L3"},
-    {"EXP45-C", "L2"},
-    {"EXP46-C", "L2"},
-    {"INT30-C", "L2"},
-    {"INT31-C", "L2"},
-    {"INT32-C", "L2"},
-    {"INT33-C", "L2"},
-    {"INT34-C", "L3"},
-    {"INT35-C", "L3"},
-    {"INT36-C", "L3"},
-    {"FLP30-C", "L2"},
-    {"FLP32-C", "L2"},
-    {"FLP34-C", "L3"},
-    {"FLP36-C", "L3"},
-    {"FLP37-C", "L3"},
-    {"ARR30-C", "L2"},
-    {"ARR32-C", "L2"},
-    {"ARR36-C", "L2"},
-    {"ARR37-C", "L2"},
-    {"ARR38-C", "L1"},
-    {"ARR39-C", "L2"},
-    {"STR30-C", "L2"},
-    {"STR31-C", "L1"},
-    {"STR32-C", "L1"},
-    {"STR34-C", "L2"},
-    {"STR37-C", "L3"},
-    {"STR38-C", "L1"},
-    {"MEM30-C", "L1"},
-    {"MEM31-C", "L2"},
-    {"MEM33-C", "L3"},
-    {"MEM34-C", "L1"},
-    {"MEM35-C", "L2"},
-    {"MEM36-C", "L3"},
-    {"FIO30-C", "L1"},
-    {"FIO32-C", "L3"},
-    {"FIO34-C", "L1"},
-    {"FIO37-C", "L1"},
-    {"FIO38-C", "L3"},
-    {"FIO39-C", "L2"},
-    {"FIO40-C", "L3"},
-    {"FIO41-C", "L3"},
-    {"FIO42-C", "L3"},
-    {"FIO44-C", "L3"},
-    {"FIO45-C", "L2"},
-    {"FIO46-C", "L3"},
-    {"FIO47-C", "L2"},
-    {"ENV30-C", "L3"},
-    {"ENV31-C", "L3"},
-    {"ENV32-C", "L1"},
-    {"ENV33-C", "L1"},
-    {"ENV34-C", "L3"},
-    {"SIG30-C", "L1"},
-    {"SIG31-C", "L2"},
-    {"SIG34-C", "L3"},
-    {"SIG35-C", "L3"},
-    {"ERR30-C", "L2"},
-    {"ERR32-C", "L3"},
-    {"ERR33-C", "L1"},
-    {"CON30-C", "L3"},
-    {"CON31-C", "L3"},
-    {"CON32-C", "L2"},
-    {"CON33-C", "L3"},
-    {"CON34-C", "L3"},
-    {"CON35-C", "L3"},
-    {"CON36-C", "L3"},
-    {"CON37-C", "L2"},
-    {"CON38-C", "L3"},
-    {"CON39-C", "L2"},
-    {"CON40-C", "L2"},
-    {"CON41-C", "L3"},
-    {"MSC30-C", "L2"},
-    {"MSC32-C", "L1"},
-    {"MSC33-C", "L1"},
-    {"MSC37-C", "L2"},
-    {"MSC38-C", "L3"},
-    {"MSC39-C", "L3"},
-    {"MSC40-C", "L3"},
-};
+# SEI CERT is available as markdown files at
+# https://github.com/cmu-sei/secure-coding-standards
+CERT_REPO = 'cmu-sei/secure-coding-standards'
+CERT_BRANCH = 'main'
 
-std::vector<checkers::Info> checkers::certCppInfo{
-    {"DCL50-CPP", "L1"},
-    {"DCL51-CPP", "L3"},
-    {"DCL52-CPP", "L3"},
-    {"DCL53-CPP", "L3"},
-    {"DCL54-CPP", "L2"},
-    {"DCL55-CPP", "L3"},
-    {"DCL56-CPP", "L3"},
-    {"DCL57-CPP", "L3"},
-    {"DCL58-CPP", "L3"},
-    {"DCL59-CPP", "L3"},
-    {"DCL60-CPP", "L3"},
-    {"EXP50-CPP", "L2"},
-    {"EXP51-CPP", "L3"},
-    {"EXP52-CPP", "L3"},
-    {"EXP53-CPP", "L1"},
-    {"EXP54-CPP", "L2"},
-    {"EXP55-CPP", "L2"},
-    {"EXP56-CPP", "L3"},
-    {"EXP57-CPP", "L3"},
-    {"EXP58-CPP", "L3"},
-    {"EXP59-CPP", "L3"},
-    {"EXP60-CPP", "L1"},
-    {"EXP61-CPP", "L2"},
-    {"EXP62-CPP", "L2"},
-    {"EXP63-CPP", "L2"},
-    {"INT50-CPP", "L3"},
-    {"CTR50-CPP", "L2"},
-    {"CTR51-CPP", "L2"},
-    {"CTR52-CPP", "L1"},
-    {"CTR53-CPP", "L2"},
-    {"CTR54-CPP", "L2"},
-    {"CTR55-CPP", "L1"},
-    {"CTR56-CPP", "L2"},
-    {"CTR57-CPP", "L3"},
-    {"CTR58-CPP", "L3"},
-    {"STR50-CPP", "L1"},
-    {"STR51-CPP", "L1"},
-    {"STR52-CPP", "L2"},
-    {"STR53-CPP", "L2"},
-    {"MEM50-CPP", "L1"},
-    {"MEM51-CPP", "L1"},
-    {"MEM52-CPP", "L1"},
-    {"MEM53-CPP", "L1"},
-    {"MEM54-CPP", "L1"},
-    {"MEM55-CPP", "L1"},
-    {"MEM56-CPP", "L1"},
-    {"MEM57-CPP", "L2"},
-    {"FIO50-CPP", "L2"},
-    {"FIO51-CPP", "L3"},
-    {"ERR50-CPP", "L3"},
-    {"ERR51-CPP", "L3"},
-    {"ERR52-CPP", "L3"},
-    {"ERR53-CPP", "L3"},
-    {"ERR54-CPP", "L1"},
-    {"ERR55-CPP", "L2"},
-    {"ERR56-CPP", "L2"},
-    {"ERR57-CPP", "L3"},
-    {"ERR58-CPP", "L2"},
-    {"ERR59-CPP", "L1"},
-    {"ERR60-CPP", "L3"},
-    {"ERR61-CPP", "L3"},
-    {"ERR62-CPP", "L3"},
-    {"OOP50-CPP", "L3"},
-    {"OOP51-CPP", "L3"},
-    {"OOP52-CPP", "L2"},
-    {"OOP53-CPP", "L3"},
-    {"OOP54-CPP", "L3"},
-    {"OOP55-CPP", "L2"},
-    {"OOP56-CPP", "L3"},
-    {"OOP57-CPP", "L2"},
-    {"OOP58-CPP", "L2"},
-    {"CON50-CPP", "L3"},
-    {"CON51-CPP", "L2"},
-    {"CON52-CPP", "L2"},
-    {"CON53-CPP", "L3"},
-    {"CON54-CPP", "L3"},
-    {"CON55-CPP", "L3"},
-    {"CON56-CPP", "L3"},
-    {"MSC50-CPP", "L2"},
-    {"MSC51-CPP", "L1"},
-    {"MSC52-CPP", "L3"},
-    {"MSC53-CPP", "L2"},
-    {"MSC54-CPP", "L2"},
-};
+# Cache git tree
+_cert_tree = None
 
-""")
+def listCertFiles(content_subdir:str):
+    """Lists the rules and recommendation files for one part of the standard."""
+    global _cert_tree
+    if _cert_tree is None:
+        url = 'https://api.github.com/repos/%s/git/trees/%s?recursive=1' % (CERT_REPO, CERT_BRANCH)
+        _cert_tree = requests.get(url, timeout=50).json()['tree']
+    prefix = 'content/' + content_subdir
+    files = []
+    for entry in _cert_tree:
+        path = entry['path']
+        if entry['type'] != 'blob' or not path.startswith(prefix) or not path.endswith('.md'):
+            continue
+        if 'index' in path.rsplit('/', 1)[-1].lower():
+            continue
+        files.append(path)
+    return sorted(files)
+
+def printCertCInfo(content_subdir:str):
+    """Fetches CERT C rules information."""
+    paths = listCertFiles(content_subdir)
+    rules = {}
+    for path in tqdm(paths, total=len(paths), desc=f'Fetching {content_subdir}', file=sys.stderr):
+        raw = 'https://raw.githubusercontent.com/%s/%s/%s' % (CERT_REPO, CERT_BRANCH, path)
+        text = requests.get(raw, timeout=30).text
+        res = re.search(r'^#\s+([A-Z]{3}\d{2}-C(?:PP)?)\b', text, re.MULTILINE)
+        if res is None:
+            continue
+        head = re.search(r'^#{0,4}\s*Risk Assessments?\s*$', text, re.MULTILINE)
+        if head is None:
+            continue
+        section = text[head.end():]
+        nexthead = re.search(r'^#{1,4}\s+\S', section, re.MULTILINE)
+        if nexthead:
+            section = section[:nexthead.start()]
+        level = re.search(r'\bL[1-3]\b', section)
+        if level is None:
+            continue
+        rules[res.group(1)] = level.group(0)
+    for rule_id, level in dict(sorted(rules.items())).items():
+        print('    {"%s", "%s"},' % (rule_id, level))
+
+
+
+print('std::vector<checkers::Info> checkers::certCInfo{')
+printCertCInfo('4.sei-cert-c-coding-standard/03.rules/')
+print('    // Recommendations')
+printCertCInfo('4.sei-cert-c-coding-standard/08.recommendations/')
+print('};')
+print('')
+print('std::vector<checkers::Info> checkers::certCppInfo{')
+printCertCInfo('5.sei-cert-cpp-coding-standard/3.rules/')
+print('};')
+print('')
 
 
diff --git a/tools/matchcompiler.py b/tools/matchcompiler.py
index 4d9e7903d37..bb03b6822e2 100755
--- a/tools/matchcompiler.py
+++ b/tools/matchcompiler.py
@@ -206,7 +206,7 @@ def _compilePattern(self, pattern, nr, varid,
                 arg2 = ', const int varid'
 
             ret = '// pattern: ' + pattern + '\n'
-            ret += 'static inline bool match' + \
+            ret += 'MAYBE_UNUSED static inline bool match' + \
                 str(nr) + '(' + tokenType + '* tok' + arg2 + ') {\n'
             returnStatement = 'return false;\n'
 
@@ -290,7 +290,7 @@ def _compileFindPattern(self, pattern, findmatchnr, endToken, varId):
             more_args += ', int varid'
 
         ret = '// pattern: ' + pattern + '\n'
-        ret += 'template<class T> static inline T * findmatch' + \
+        ret += 'template<class T> MAYBE_UNUSED static inline T * findmatch' + \
             str(findmatchnr) + '(T * start_tok' + more_args + ') {\n'
         ret += '    for (; start_tok' + endCondition + \
             '; start_tok = start_tok->next()) {\n'
@@ -373,7 +373,7 @@ def _compileVerifyTokenMatch(
         if varId:
             more_args = ', const int varid'
 
-        ret = 'static inline bool match_verify' + \
+        ret = 'MAYBE_UNUSED static inline bool match_verify' + \
             str(verifyNumber) + '(const Token *tok' + more_args + ') {\n'
 
         origMatchName = 'Match'
@@ -509,7 +509,7 @@ def _compileVerifyTokenFindMatch(
         if varId:
             more_args += ', const int varid'
 
-        ret = 'template < class T > static inline T * findmatch_verify' + \
+        ret = 'template < class T > MAYBE_UNUSED static inline T * findmatch_verify' + \
             str(verifyNumber) + '(T * tok' + more_args + ') {\n'
 
         origFindMatchName = 'findmatch'
@@ -721,6 +721,20 @@ def convertFile(self, srcname, destname, line_directive):
         if len(self._rawMatchFunctions):
             header += '#include "errorlogger.h"\n'
             header += '#include "token.h"\n'
+            header += '#if defined(__clang__)\n'
+            header += '#include "config.h"\n'
+            header += '#define MAYBE_UNUSED [[maybe_unused]]\n'  # this attribute is also available in earlier standards
+            header += 'SUPPRESS_WARNING_CLANG_PUSH("-Wc++17-attribute-extensions")\n'  # suppress waning about using above attribute in earlier standard
+            header += '#else\n'
+            header += '#define MAYBE_UNUSED\n'
+            header += '#endif\n'
+
+        footer = ''
+        if len(self._rawMatchFunctions):
+            footer += '#if defined(__clang__)\n'
+            footer += 'SUPPRESS_WARNING_CLANG_POP\n'
+            footer += '#endif\n'
+            footer += '#undef MAYBE_UNUSED\n'
 
         with io.open(destname, 'wt', encoding="utf-8") as fout:
             if modified or len(self._rawMatchFunctions):
@@ -728,6 +742,8 @@ def convertFile(self, srcname, destname, line_directive):
                 fout.write(strFunctions)
             fout.write(lineno)
             fout.write(code)
+            if modified or len(self._rawMatchFunctions):
+                fout.write(footer)
 
 
 def main():
diff --git a/tools/readme.md b/tools/readme.md
index 436f3322b1d..4f914b3cce6 100644
--- a/tools/readme.md
+++ b/tools/readme.md
@@ -78,3 +78,8 @@ Script to compare result of working Cppcheck from your branch with main branch.
 This tool lets you comfortably look at Cppcheck analysis results for daca packages. It automatically
 downloads the package, extracts it and jumps to the corresponding source code for a Cppcheck
 message.
+
+### * tools/check-errorids.sh
+
+Script to compare the error IDs in the expected `testrunner` output (without executing it) with the `--errorlist` output.
+It will report missing test coverage for an ID and missing IDs in the `--errorlist` output.
diff --git a/tools/release-set-version.py b/tools/release-set-version.py
new file mode 100644
index 00000000000..f5052cc9035
--- /dev/null
+++ b/tools/release-set-version.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+#
+# Update Cppcheck version
+#
+# Usage:
+# release: python3 release-set-version.py 2.18.0
+# debug:   python3 release-set-version.py 2.18.99
+
+import glob
+import re
+import subprocess
+import sys
+
+
+def git(args):
+    return subprocess.check_output(['git'] + args).decode('utf-8').strip()
+
+
+def sed(args):
+    return subprocess.check_output(['sed'] + args).decode('utf-8').strip()
+
+
+def egrep(args):
+    try:
+        return subprocess.check_output(['egrep'] + args).decode('utf-8').strip()
+    except Exception:
+        return ''
+
+
+# is there uncommitted changes in folder
+def is_uncommitted_changes():
+    for f in git(['status', '--short']).split('\n'):
+        if not f.startswith('??'):
+            return True
+    return False
+
+
+# get current git branch
+def get_current_branch():
+    return git(['branch', '--show-current'])
+
+
+def set_version(new_version:str):
+    if re.match(r'2[.][0-9][0-9][.][0-9]{1,2}([.][0-9])?', new_version) is None:
+        print(f'Aborting, invalid version {new_version}')
+        return
+
+    v = new_version.split('.')
+
+    if is_uncommitted_changes():
+        print('Aborting, there are uncommitted changes')
+        #return
+
+    is_dev_version = (len(v) == 3 and v[-1] == '99')
+
+    if not is_dev_version:
+        expected_branch = v[0] + '.' + v[1] + '.x'
+        if get_current_branch() != expected_branch:
+            print(f'Aborting, must be executed from {expected_branch} branch')
+            return
+
+    v3 = '.'.join(v[:3])
+
+    cppcheck_version_string = (v[0] + '.' + str(int(v[1])+1) + ' dev') if is_dev_version else new_version
+    cppcheck_version = ','.join((v+['0','0','0','0'])[:4])
+
+    def check_sed(args):
+        file = args[-1]
+        res = re.match(r's/([^/]+)/.*', args[-2])
+        if res is None:
+            raise Exception('Failed to verify sed call argument ' + args[-2])
+        pattern = res.group(1)
+        if len(egrep([pattern, file])) < 4:
+            print(f"WARNING: pattern '{pattern}' not found in file {file}")
+        sed(args)
+
+    check_sed(['-i', '-r', f's/version 2[.][0-9]+([.][0-9]+)*/version {new_version}/', 'cli/main.cpp'])
+    check_sed(['-i', '-r', f's/VERSION 2[.][0-9]+[.]99/VERSION {v3}/', 'CMakeLists.txt']) # version must have 3 parts.
+    check_sed(['-i', '-r', f's/#define CPPCHECK_VERSION_STRING .*/#define CPPCHECK_VERSION_STRING "{cppcheck_version_string}"/', 'lib/version.h'])
+    check_sed(['-i', '-r', f's/#define CPPCHECK_VERSION .*/#define CPPCHECK_VERSION {cppcheck_version}/', 'lib/version.h'])
+    check_sed(['-i', '-r', f's/<[?]define ProductName[ ]*=.*/<?define ProductName = "Cppcheck $(var.Platform) {cppcheck_version_string}" ?>/', 'win_installer/productInfo.wxi'])
+    check_sed(['-i', '-r', f's/<[?]define ProductVersion[ ]*=.*/<?define ProductVersion = "{new_version}" ?>/', 'win_installer/productInfo.wxi'])
+    for g in glob.glob('man/*.md'):
+        check_sed(['-i', '-r', f's/subtitle: Version 2\\.[0-9].*/subtitle: Version {cppcheck_version_string}/', g])
+    print('Versions have been changed.')
+    print('')
+    print('Please double check these results below:')
+    for p in ('[^.0-9]2[.][0-9]+[.][0-9]', '2[.][0-9]+ dev'):
+        for ext in ('cpp', 'h', 'md'):
+            for g in glob.glob(f'*/*.{ext}'):
+                s = egrep([p, g])
+                if s != '':
+                    print(f'{g}: {s}')
+    print('')
+    print("Please double check output of 'git diff'")
+    commit_message = f'bumped version to {new_version}' if is_dev_version else f'{new_version}: Set version'
+    print(f"git commit -a -m {commit_message}")
+
+if len(sys.argv) != 2:
+    print('Syntax: python3 release-set-version.py [version]')
+    sys.exit(1)
+
+set_version(sys.argv[-1])
+
diff --git a/tools/test-my-pr.py b/tools/test-my-pr.py
index de897c09bd6..0a630c57c90 100755
--- a/tools/test-my-pr.py
+++ b/tools/test-my-pr.py
@@ -8,9 +8,13 @@
 import donate_cpu_lib as lib
 import argparse
 import glob
+import gzip
+import natsort
 import os
 import sys
 import random
+import re
+import requests
 import subprocess
 
 
@@ -20,14 +24,108 @@ def format_float(a, b=1):
     return 'N/A'
 
 
+def ftp_get(url):
+    try:
+        response = requests.get(url, timeout=300)
+        response.raise_for_status()
+        return response.content
+    except requests.RequestException as err:
+        print('Failed to fetch {}: {}'.format(url, err))
+    return None
+
+
+def latestvername(names):
+    s = natsort.natsorted(names, key=lambda x: x[x.index('_')+1:x.index('.orig.tar')])
+    return s[-1]
+
+
+def getpackages():
+    debian = 'https://ftp.debian.org/debian/'
+
+    data = ftp_get(debian + 'ls-lR.gz')
+    if data is None:
+        print('Failed to fetch ls-lR.gz')
+        sys.exit(1)
+
+    lines = gzip.decompress(data).decode('utf-8', errors='replace').splitlines()
+
+    # Example content in ls-lR:
+    #./pool/main/0/0xffff:
+    #total 1452
+    #-rw-r--r-- 2 dak debadmin  6524 Dec 25  2016 0xffff_0.7-2.debian.tar.xz
+    #-rw-r--r-- 2 dak debadmin  1791 Dec 25  2016 0xffff_0.7-2.dsc
+    #-rw-r--r-- 2 dak debadmin 57168 Dec 25  2016 0xffff_0.7-2_amd64.deb
+    #-rw-r--r-- 2 dak debadmin 48578 Dec 26  2016 0xffff_0.7-2_arm64.deb
+    #-rw-r--r-- 2 dak debadmin 56730 Dec 26  2016 0xffff_0.7-2_armel.deb
+    #-rw-r--r-- 2 dak debadmin 57296 Dec 26  2016 0xffff_0.7-2_armhf.deb
+    #-rw-r--r-- 2 dak debadmin 60254 Dec 26  2016 0xffff_0.7-2_i386.deb
+    #-rw-r--r-- 2 dak debadmin 53130 Dec 26  2016 0xffff_0.7-2_mips.deb
+    #-rw-r--r-- 2 dak debadmin 52542 Dec 26  2016 0xffff_0.7-2_mips64el.deb
+    #-rw-r--r-- 2 dak debadmin 53712 Dec 26  2016 0xffff_0.7-2_mipsel.deb
+    #-rw-r--r-- 2 dak debadmin 51908 Dec 26  2016 0xffff_0.7-2_ppc64el.deb
+    #-rw-r--r-- 2 dak debadmin 53548 Dec 26  2016 0xffff_0.7-2_s390x.deb
+    #-rw-r--r-- 2 dak debadmin 65248 Dec 25  2016 0xffff_0.7.orig.tar.gz
+    #-rw-r--r-- 2 dak debadmin  6884 Jul 19 19:08 0xffff_0.8-1.debian.tar.xz
+    #-rw-r--r-- 2 dak debadmin  1807 Jul 19 19:08 0xffff_0.8-1.dsc
+    #-rw-r--r-- 2 dak debadmin 58908 Jul 19 19:08 0xffff_0.8-1_amd64.deb
+    #-rw-r--r-- 2 dak debadmin 51340 Jul 19 19:58 0xffff_0.8-1_arm64.deb
+    #-rw-r--r-- 2 dak debadmin 57612 Jul 19 20:13 0xffff_0.8-1_armel.deb
+    #-rw-r--r-- 2 dak debadmin 58584 Jul 19 19:58 0xffff_0.8-1_armhf.deb
+    #-rw-r--r-- 2 dak debadmin 57544 Jul 19 20:23 0xffff_0.8-1_hurd-i386.deb
+    #-rw-r--r-- 2 dak debadmin 62048 Jul 19 23:54 0xffff_0.8-1_i386.deb
+    #-rw-r--r-- 2 dak debadmin 55080 Jul 23 19:07 0xffff_0.8-1_kfreebsd-amd64.deb
+    #-rw-r--r-- 2 dak debadmin 58392 Jul 23 19:07 0xffff_0.8-1_kfreebsd-i386.deb
+    #-rw-r--r-- 2 dak debadmin 54144 Jul 19 22:28 0xffff_0.8-1_mips.deb
+    #-rw-r--r-- 2 dak debadmin 53648 Jul 20 00:56 0xffff_0.8-1_mips64el.deb
+    #-rw-r--r-- 2 dak debadmin 54740 Jul 19 22:58 0xffff_0.8-1_mipsel.deb
+    #-rw-r--r-- 2 dak debadmin 57424 Jul 19 19:58 0xffff_0.8-1_ppc64el.deb
+    #-rw-r--r-- 2 dak debadmin 53764 Jul 19 22:28 0xffff_0.8-1_s390x.deb
+    #-rw-r--r-- 2 dak debadmin 64504 Jul 19 19:08 0xffff_0.8.orig.tar.gz
+    #
+
+    path = None
+    previous_path = ''
+    archives = []
+    filename = None
+    filenames = []
+    for line in lines:
+        line = line.strip()
+        if len(line) < 4:
+            if filename:
+                res1 = re.match(r'(.*)-[0-9.]+$', path)
+                if res1 is None:
+                    res1 = re.match(r'(.*)[-.][0-9.]+$', path)
+                res2 = re.match(r'(.*)-[0-9.]+$', previous_path)
+                if res2 is None:
+                    res2 = re.match(r'(.*)[-.][0-9.]+$', previous_path)
+                if res1 is None or res2 is None or res1.group(1) != res2.group(1):
+                    archives.append(path + '/' + latestvername(filenames))
+                else:
+                    archives[-1] = path + '/' + latestvername(filenames)
+            if path:
+                previous_path = path
+            path = None
+            filename = None
+            filenames = []
+        elif line.startswith('./pool/main/'):
+            path = debian + line[2:-1]
+        elif path and line.endswith(('.orig.tar.gz', '.orig.tar.bz2', '.orig.tar.xz')):
+            filename = line[1 + line.rfind(' '):]
+            filenames.append(filename)
+
+    return archives
+
+
+
+
 if __name__ == "__main__":
     __my_script_name = os.path.splitext(os.path.basename(sys.argv[0]))[0]
     __work_path = os.path.expanduser(os.path.join('~', 'cppcheck-' + __my_script_name + '-workfolder'))
 
     parser = argparse.ArgumentParser(description='Run this script from your branch with proposed Cppcheck patch to verify your patch against current main. It will compare output of testing bunch of opensource packages')
     parser.add_argument('-j', default=1, type=int, help='Concurency execution threads')
+    parser.add_argument('-n', '--max-packages', default=256, type=int, help='Maximum number of packages to test')
     package_group = parser.add_mutually_exclusive_group()
-    package_group.add_argument('-p', default=256, type=int, help='Count of packages to check')
     package_group.add_argument('--packages', nargs='+', help='Check specific packages and then stop.')
     package_group.add_argument('--packages-path', default=None, type=str, help='Check packages in path.')
     parser.add_argument('-o', default='my_check_diff.log', help='Filename of result inside a working path dir')
@@ -40,6 +138,18 @@ def format_float(a, b=1):
 
     print(args)
 
+    if args.packages_path:
+        # You can download packages using daca2-download.py
+        args.packages = glob.glob(os.path.join(args.packages_path, '*.tar.xz'))
+        random.shuffle(args.packages)
+    elif args.packages is None:
+        args.packages = getpackages()
+        random.shuffle(args.packages)
+
+    packages_to_process = min(args.max_packages, len(args.packages))
+
+    print('\n'.join(args.packages[:20]))
+
     if not lib.check_requirements():
         print("Error: Check requirements")
         sys.exit(1)
@@ -52,7 +162,7 @@ def format_float(a, b=1):
     main_dir = os.path.join(work_path, 'tree-main')
 
     lib.set_jobs('-j' + str(args.j))
-    result_file = os.path.join(work_path, args.o)
+    result_file = os.path.abspath(os.path.join(work_path, args.o))
     (f, ext) = os.path.splitext(result_file)
     timing_file = f + '_timing' + ext
     your_repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
@@ -75,8 +185,7 @@ def format_float(a, b=1):
         sys.exit(1)
 
     try:
-        os.chdir(your_repo_dir)
-        commit_id = (subprocess.check_output(['git', 'merge-base', 'origin/main', 'HEAD'])).strip().decode('ascii')
+        commit_id = (subprocess.check_output(['git', 'merge-base', 'origin/main', 'HEAD'], cwd=your_repo_dir)).strip().decode('ascii')
         with open(result_file, 'a') as myfile:
             myfile.write('Common ancestor: ' + commit_id + '\n\n')
         package_width = '140'
@@ -85,7 +194,6 @@ def format_float(a, b=1):
             myfile.write('{:{package_width}} {:{timing_width}} {:{timing_width}} {:{timing_width}}\n'.format(
                 'Package', 'main', 'your', 'Factor', package_width=package_width, timing_width=timing_width))
 
-        os.chdir(main_dir)
         subprocess.check_call(['git', 'fetch', '--depth=1', 'origin', commit_id])
         subprocess.check_call(['git', 'checkout', '-f', commit_id])
     except BaseException as e:
@@ -102,35 +210,17 @@ def format_float(a, b=1):
         print('Failed to compile your version of Cppcheck')
         sys.exit(1)
 
-    if args.packages_path:
-        # You can download packages using daca2-download.py
-        args.packages = glob.glob(os.path.join(args.packages_path, '*.tar.xz'))
-        args.p = len(args.packages)
-        packages_idxs = list(range(args.p))
-        random.shuffle(packages_idxs)
-    elif args.packages:
-        args.p = len(args.packages)
-        packages_idxs = []
-    else:
-        packages_count = lib.get_packages_count()
-        if not packages_count:
-            print("network or server might be temporarily down..")
-            sys.exit(1)
-
-        packages_idxs = list(range(packages_count))
-        random.shuffle(packages_idxs)
-
     packages_processed = 0
     crashes = []
     timeouts = []
 
-    while (packages_processed < args.p and len(packages_idxs) > 0) or args.packages:
-        if args.packages:
-            package = args.packages.pop()
-        else:
-            package = lib.get_package(packages_idxs.pop())
+    while packages_processed < packages_to_process and args.packages:
+        package = args.packages.pop()
+        packages_processed += 1
+        print('Processing package {} of {}'.format(packages_processed, packages_to_process))
 
-        if package.startswith('ftp://') or package.startswith('http://'):
+
+        if package.startswith('ftp://') or package.startswith('https://'):
             tgz = lib.download_package(work_path, package, None)
             if tgz is None:
                 print("No package downloaded")
@@ -213,9 +303,6 @@ def format_float(a, b=1):
                     format_float(time_your), format_float(time_your, time_main),
                     package_width=package_width, timing_width=timing_width))
 
-        packages_processed += 1
-        print(str(packages_processed) + ' of ' + str(args.p) + ' packages processed\n')
-
     with open(result_file, 'a') as myfile:
         myfile.write('\n\ncrashes\n')
         myfile.write('\n'.join(crashes))
diff --git a/tools/triage/CMakeLists.txt b/tools/triage/CMakeLists.txt
index 7fe6e403b42..d0f9fce1599 100644
--- a/tools/triage/CMakeLists.txt
+++ b/tools/triage/CMakeLists.txt
@@ -26,10 +26,6 @@ CheckOptions:
     target_include_directories(triage PRIVATE ${PROJECT_SOURCE_DIR}/lib/ ${PROJECT_SOURCE_DIR}/gui/)
     target_link_libraries(triage ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB})
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if(QT_VERSION VERSION_LESS "6.0.0")
-            # Q_UNUSED() in generated code - see https://bugreports.qt.io/browse/QTBUG-82978
-            target_compile_options_safe(triage -Wno-extra-semi-stmt)
-        endif()
         if(QT_VERSION VERSION_LESS "6.4.0")
             # caused by Qt generated moc code - see https://bugreports.qt.io/browse/QTBUG-100915
             target_compile_options_safe(triage -Wno-redundant-parens)
@@ -39,8 +35,8 @@ CheckOptions:
         # QBrush fails to compile before 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-134038
         target_compile_definitions(triage PRIVATE -DQT_NO_QPAIR)
     endif()
-    if(QT_VERSION VERSION_EQUAL "6.9.0")
-        # caused by Qt generated moc code in 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # caused by Qt generated moc code starting with 6.9.0 - see https://bugreports.qt.io/browse/QTBUG-135638
         target_compile_options_safe(triage -Wno-ctad-maybe-unsupported)
     endif()
     target_compile_definitions(triage PRIVATE -DQT_NO_FOREACH)
diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp
index 78706dd4737..18b6bb09533 100644
--- a/tools/triage/mainwindow.cpp
+++ b/tools/triage/mainwindow.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -58,6 +58,9 @@
 #include <QTextStream>
 #include <QTreeView>
 #include <QtCore>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtLogging>
+#endif
 
 class QWidget;
 
@@ -74,10 +77,11 @@ MainWindow::MainWindow(QWidget *parent) :
     srcFiles{"*.cpp", "*.cxx", "*.cc", "*.c++", "*.C", "*.c", "*.cl"}
 {
     ui->setupUi(this);
+    // NOLINTNEXTLINE(bugprone-random-generator-seed) - the random numbers are not used in a security context so this should be sufficient
     std::srand(static_cast<unsigned int>(std::time(nullptr)));
     QDir workFolder(WORK_FOLDER);
     if (!workFolder.exists()) {
-        workFolder.mkdir(WORK_FOLDER);
+        (void)workFolder.mkdir(WORK_FOLDER);
     }
 
     ui->results->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -109,7 +113,7 @@ void MainWindow::loadFile()
     if (fileName.isEmpty())
         return;
     QFile file(fileName);
-    file.open(QIODevice::ReadOnly | QIODevice::Text);
+    (void)file.open(QIODevice::ReadOnly | QIODevice::Text); // TODO: check result
     QTextStream textStream(&file);
     load(textStream);
 }
@@ -133,7 +137,7 @@ void MainWindow::load(QTextStream &textStream)
         QString line = textStream.readLine();
         if (line.isNull())
             break;
-        if (line.startsWith("ftp://") || (line.startsWith(DACA2_PACKAGES) && line.endsWith(".tar.xz"))) {
+        if (line.startsWith("ftp://") || line.startsWith("https://") || (line.startsWith(DACA2_PACKAGES) && line.endsWith(".tar.xz"))) {
             local = line.startsWith(DACA2_PACKAGES) && line.endsWith(".tar.xz");
             url = line;
             if (!errorMessage.isEmpty())
@@ -177,12 +181,12 @@ void MainWindow::refreshResults()
     filter(ui->version->currentText());
 }
 
-void MainWindow::filter(const QString& filter)
+void MainWindow::filter(const QString& filterStr)
 {
     QStringList allErrors;
 
     for (const QString &errorItem : mAllErrors) {
-        if (filter.isEmpty()) {
+        if (filterStr.isEmpty()) {
             allErrors << errorItem;
             continue;
         }
@@ -191,7 +195,7 @@ void MainWindow::filter(const QString& filter)
         if (lines.size() < 2)
             continue;
 
-        if (lines[1].startsWith(filter))
+        if (lines[1].startsWith(filterStr))
             allErrors << errorItem;
     }
 
@@ -289,7 +293,7 @@ void MainWindow::showResult(QListWidgetItem *item)
 {
     ui->statusBar->clearMessage();
     const bool local = item->text().startsWith(DACA2_PACKAGES);
-    if (!item->text().startsWith("ftp://") && !local)
+    if (!item->text().startsWith("ftp://") && !item->text().startsWith("https://") && !local)
         return;
     const QStringList lines = item->text().split("\n");
     if (lines.size() < 2)
diff --git a/tools/triage/mainwindow.h b/tools/triage/mainwindow.h
index 999740fb59d..263d9953e60 100644
--- a/tools/triage/mainwindow.h
+++ b/tools/triage/mainwindow.h
@@ -1,6 +1,6 @@
 /* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * Copyright (C) 2007-2026 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
@@ -46,7 +46,7 @@ class MainWindow : public QMainWindow {
 public slots:
     void loadFile();
     void loadFromClipboard();
-    void filter(const QString& filter);
+    void filter(const QString& filterStr);
     void showResult(QListWidgetItem *item);
     void refreshResults();
     void fileTreeFilter(const QString &str);
diff --git a/tools/triage/triage.pro b/tools/triage/triage.pro
index 1bda43f40a7..d11a2784d5d 100644
--- a/tools/triage/triage.pro
+++ b/tools/triage/triage.pro
@@ -1,17 +1,18 @@
-lessThan(QT_MAJOR_VERSION, 5): error(requires >= Qt 5 (You used: $$QT_VERSION))
 QT += core gui widgets
 TARGET = triage
 TEMPLATE = app
-QMAKE_CXXFLAGS += -std=c++11
-INCLUDEPATH += ../../gui
+QMAKE_CXXFLAGS += -std=c++17
+INCLUDEPATH += ../../gui ../../lib
 MOC_DIR = temp
 OBJECTS_DIR = temp
 UI_DIR = temp
-SOURCES += main.cpp\
+SOURCES += main.cpp \
         mainwindow.cpp \
         ../../gui/codeeditorstyle.cpp \
-        ../../gui/codeeditor.cpp
+        ../../gui/codeeditor.cpp \
+        ../../lib/utils.cpp
 HEADERS  += mainwindow.h \
         ../../gui/codeeditorstyle.h \
-        ../../gui/codeeditor.h
+        ../../gui/codeeditor.h \
+        ../../lib/utils.h
 FORMS    += mainwindow.ui
diff --git a/tools/triage_py/triage_version.py b/tools/triage_py/triage_version.py
index ae41f19dcdf..c87af3bcdf8 100644
--- a/tools/triage_py/triage_version.py
+++ b/tools/triage_py/triage_version.py
@@ -4,6 +4,7 @@
 import sys
 import argparse
 import time
+import difflib
 
 from packaging.version import Version
 
@@ -21,6 +22,7 @@
 parser.add_argument('--no-quiet', action='store_true', default=False, help='do not specify -q')
 parser.add_argument('--perf', action='store_true', default=False, help='output duration of execution in seconds (CSV format)')
 parser.add_argument('--start', default=None, help='specify the start version/commit')
+parser.add_argument('--diff', action='store_true', help='show differences as unified diff')
 package_group = parser.add_mutually_exclusive_group()
 package_group.add_argument('--no-stderr', action='store_true', default=False, help='do not display stdout')
 package_group.add_argument('--no-stdout', action='store_true', default=False, help='do not display stderr')
@@ -110,8 +112,10 @@ def sort_commit_hashes(commits):
 if verbose:
     print("analyzing '{}'".format(input_file))
 
+last_udiff_version = ''
 last_ec = None
 last_out = None
+last_udiff = None
 
 if args.perf:
     print('version,time')
@@ -247,6 +251,7 @@ def sort_commit_hashes(commits):
         continue
 
     do_print = False
+    udiff = None
 
     if last_ec != ec:
         if verbose:
@@ -257,10 +262,16 @@ def sort_commit_hashes(commits):
         if verbose:
             print("{}: output changed".format(version))
         do_print = True
+        if args.diff:
+            udiff = difflib.unified_diff(last_out.splitlines(True), out.splitlines(True), fromfile=last_udiff_version, tofile=version)
+            last_udiff_version = version
 
     if do_print:
         print(last_ec)
         print(last_out)
+        if last_udiff:
+            sys.stdout.writelines(last_udiff)
+            sys.stdout.write('\n')
 
     # do not print intermediate versions with --compact
     if not args.compact or do_print:
@@ -271,10 +282,15 @@ def sort_commit_hashes(commits):
 
     last_ec = ec
     last_out = out
+    if udiff:
+        last_udiff = udiff
 
 if do_compare:
     print(last_ec)
     print(last_out)
+    if last_udiff:
+        sys.stdout.writelines(last_udiff)
+        sys.stdout.write('\n')
 
 if verbose:
     print('done')
diff --git a/valgrind/testrunner.supp b/valgrind/testrunner.supp
index 98e30d241ce..558e74a2aca 100644
--- a/valgrind/testrunner.supp
+++ b/valgrind/testrunner.supp
@@ -14,3 +14,9 @@
    obj:*
    obj:*
 }
+{
+   TestRegEx::partialmatch false positive
+   Memcheck:Cond
+   obj:*
+   obj:*
+}
diff --git a/webreport.sh b/webreport.sh
deleted file mode 100755
index af9aec46aae..00000000000
--- a/webreport.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-./generate_coverage_report
-
-rm -rf devinfo
-mkdir devinfo
-
-mv coverage_report devinfo/
-
-doxygen 2> devinfo/doxygen-errors.txt
-mv doxyoutput/html devinfo/doxyoutput
-
-cd addons || exit 1
-doxygen cppcheckdata.doxyfile
-mv html ../devinfo/cppcheckdata
-cd ..
-
-# Detect duplicate code..
-~/pmd-4.2.6/bin/cpd.sh lib/ > devinfo/cpd.txt
-#java -jar ~/simian-2.4.0/bin/simian-2.4.0.jar -language=c++ -reportDuplicateText -threshold=10 lib/*.cpp lib/*.h > devinfo/simian.txt
-
diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index 7bc613d1669..ae7fc8329f3 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -9,6 +9,6 @@
   <?define AddonsDir = "files\addons" ?>
   <?define QtDllDir = "files" ?>
 
-  <?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm" ?>
+  <?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v145\MergeModules\Microsoft_VC145_CRT_x64.msm" ?>
   <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
 </Include>
diff --git a/win_installer/cppcheck.wixproj b/win_installer/cppcheck.wixproj
index 2e555cb5999..6cf93fb02bf 100644
--- a/win_installer/cppcheck.wixproj
+++ b/win_installer/cppcheck.wixproj
@@ -31,7 +31,6 @@
   <ItemGroup>
     <Content Include="config.wxi" />
     <Content Include="productInfo.wxi" />
-    <Content Include="readme.txt" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <Target Name="All" DependsOnTargets="Clean;Validate;Build" />
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 703e340ec9b..91d08c1c946 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -107,6 +107,7 @@
               <File Id='lua.cfg' Name='lua.cfg' Source='$(var.CfgsDir)\lua.cfg' />
               <File Id='mfc.cfg' Name='mfc.cfg' Source='$(var.CfgsDir)\mfc.cfg' />
               <File Id='microsoft_atl.cfg' Name='microsoft_atl.cfg' Source='$(var.CfgsDir)\microsoft_atl.cfg' />
+              <File Id='microsoft_gsl.cfg' Name='microsoft_gsl.cfg' Source='$(var.CfgsDir)\microsoft_gsl.cfg' />
               <File Id='microsoft_sal.cfg' Name='microsoft_sal.cfg' Source='$(var.CfgsDir)\microsoft_sal.cfg' />
               <File Id='microsoft_unittest.cfg' Name='microsoft_unittest.cfg' Source='$(var.CfgsDir)\microsoft_unittest.cfg' />
               <File Id='motif.cfg' Name='motif.cfg' Source='$(var.CfgsDir)\motif.cfg' />
@@ -149,8 +150,8 @@
               <File Id='mips32.xml' Name='mips32.xml' Source='$(var.PtfsDir)\mips32.xml' />
               <File Id='cray_sv1.xml' Name='cray_sv1.xml' Source='$(var.PtfsDir)\cray_sv1.xml' />
               <File Id='msp430_eabi_large_datamodel.xml' Name='msp430_eabi_large_datamodel.xml' Source='$(var.PtfsDir)\msp430_eabi_large_datamodel.xml' />
-              <File Id='unix32unsigned.xml' Name='unix32-unsigned.xml' Source='$(var.PtfsDir)\unix32-unsigned.xml' />
-              <File Id='unix64unsigned.xml' Name='unix64-unsigned.xml' Source='$(var.PtfsDir)\unix64-unsigned.xml' />
+              <File Id='riscv32.xml' Name='riscv32.xml' Source='$(var.PtfsDir)\riscv32.xml' />
+              <File Id='riscv64.xml' Name='riscv64.xml' Source='$(var.PtfsDir)\riscv64.xml' />
             </Component>
           </Directory>
           <Directory Id='AddonsFolder' Name='addons'>
@@ -174,7 +175,6 @@
           </Directory>
           <Component Id='BaseDocs' Guid='$(var.basedocsGUID)'>
             <File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' />
-            <File Id='readme.txt' Name='readme.txt' DiskId='1' Source='..\readme.txt' />
             <File Id='GPLv3.txt' Name='GPLv3.txt' DiskId='1' Source='GPLv3.txt' />
             <File Id='picojson_license.txt' Name='picojson-license.txt' DiskId='1' Source='../externals/picojson/LICENSE' />
             <File Id='simplecpp_license.txt' Name='simplecpp-license.txt' DiskId='1' Source='../externals/simplecpp/LICENSE' />
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index f82ad89f144..85e73ea3ca2 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.18 dev" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.22 dev" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.17.99" ?>
+  <?define ProductVersion = "2.21.99" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>